Index: xotcl/ChangeLog
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/ChangeLog	(.../ChangeLog)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/ChangeLog	(.../ChangeLog)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,3 +1,26 @@
+2007-09-00: <Gustaf.Neumann@wu-wien.ac.at>
+    * Release of XOTcl 1.5.5
+
+2007-08-16: <Gustaf.Neumann@wu-wien.ac.at>
+    * fix introspection problem for copied objects and classes
+      (remove superfluous ::xotcl::initProcNS)
+      Must have been a bug from before XOTcl 1.0
+
+   * allow to load xotcl compiled for Tcl 8.4 to be loaded
+      into a tclsh8.5 (again, substantial change).
+      the behavior can be turned of by setting 
+      FORWARD_COMPATIBLE to 0
+
+      One can now test now 4 versions:
+      a) a native version for Tcl 8.4 (without compatibility layer)
+      b) a native version for Tcl 8.5
+      c) a version compiled for Tcl 8.4 with compatibility layer in tclsh8.4
+      d) a version compiled for Tcl 8.4 with compatibility layer in tclsh8.5 
+
+      My tests showed that the overhead is for the compatibility
+      layer is between 1.1 and 2.3%, the difference between 
+      tcl8.5 and tcl8.4 is much larger.
+
 2007-08-10: <Gustaf.Neumann@wu-wien.ac.at>
     * Release of XOTcl 1.5.4
 
Index: xotcl/Makefile
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/Makefile	(.../Makefile)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/Makefile	(.../Makefile)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -12,14 +12,14 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.45 2007/08/14 16:38:26 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.46 2007/09/05 19:09:22 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
 # have been added in a customized configure script.
 #========================================================================
 
-#XOTCL_VERSION 	= 1.5.4
+#XOTCL_VERSION 	= 1.5.5
 XOTCL_VERSION 	= 1.5
 
 src_lib_dir 	= ${srcdir}/library
@@ -98,8 +98,8 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotcl1.5.4.dylib
-PKG_STUB_LIB_FILE = libxotclstub1.5.4.a
+PKG_LIB_FILE	= libxotcl1.5.5.dylib
+PKG_STUB_LIB_FILE = libxotclstub1.5.5.a
 
 lib_BINARIES	= $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
 BINARIES	= $(lib_BINARIES)
@@ -126,7 +126,7 @@
 INSTALL_SCRIPT	= ${INSTALL}
 
 PACKAGE_NAME	= xotcl
-PACKAGE_VERSION	= 1.5.4
+PACKAGE_VERSION	= 1.5.5
 CC		= gcc -pipe
 CFLAGS_DEFAULT	= -Os
 CFLAGS_WARNING	= -Wall -Wno-implicit-int
@@ -153,9 +153,9 @@
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= ${DL_LIBS} ${LIBS} ${MATH_LIBS}
 
-pkgdatadir	= /usr/local/aolserver-4.5/share/xotcl1.5.4
-pkglibdir	= /usr/local/aolserver-4.5/lib/xotcl1.5.4
-pkgincludedir	= /usr/local/aolserver-4.5/include/xotcl1.5.4
+pkgdatadir	= /usr/local/aolserver-4.5/share/xotcl1.5.5
+pkglibdir	= /usr/local/aolserver-4.5/lib/xotcl1.5.5
+pkgincludedir	= /usr/local/aolserver-4.5/include/xotcl1.5.5
 
 # XOTCLSH = xotclsh
 
@@ -176,15 +176,15 @@
 SHARED_BUILD	= 1
 
 INCLUDES	=  -I"/usr/local/src/tcl8.4.14/generic" -I"/usr/local/src/tcl8.4.14/unix" -I./generic
-EXTRA_CFLAGS	=  -DXOTCLVERSION=\"1.5\" -DXOTCLPATCHLEVEL=\".4\" 	 -DHAVE_TCL_COMPILE_H=1
+EXTRA_CFLAGS	=  -DXOTCLVERSION=\"1.5\" -DXOTCLPATCHLEVEL=\".5\" 	 -DHAVE_TCL_COMPILE_H=1
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.4\" -DPACKAGE_STRING=\"xotcl\ 1.5.4\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.4\" -DPACKAGE_STRING=\"xotcl\ 1.5.4\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.5\" -DPACKAGE_STRING=\"xotcl\ 1.5.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.5\" -DPACKAGE_STRING=\"xotcl\ 1.5.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
 
 CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache/
 
Index: xotcl/configure
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/configure	(.../configure)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/configure	(.../configure)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xotcl 1.5.4.
+# Generated by GNU Autoconf 2.59 for xotcl 1.5.5.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
 # Identity of this package.
 PACKAGE_NAME='xotcl'
 PACKAGE_TARNAME='xotcl'
-PACKAGE_VERSION='1.5.4'
-PACKAGE_STRING='xotcl 1.5.4'
+PACKAGE_VERSION='1.5.5'
+PACKAGE_STRING='xotcl 1.5.5'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -777,7 +777,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xotcl 1.5.4 to adapt to many kinds of systems.
+\`configure' configures xotcl 1.5.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -834,7 +834,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xotcl 1.5.4:";;
+     short | recursive ) echo "Configuration of xotcl 1.5.5:";;
    esac
   cat <<\_ACEOF
 
@@ -979,7 +979,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xotcl configure 1.5.4
+xotcl configure 1.5.5
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -993,7 +993,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xotcl $as_me 1.5.4, which was
+It was created by xotcl $as_me 1.5.5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1572,7 +1572,7 @@
 # do not modify the following lines manually, they are generated with changeXOTclVersion
 XOTCL_MAJOR_VERSION=1
 XOTCL_MINOR_VERSION=5
-XOTCL_RELEASE_LEVEL=.4
+XOTCL_RELEASE_LEVEL=.5
 
 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION}
 NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION}
@@ -10583,7 +10583,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xotcl $as_me 1.5.4, which was
+This file was extended by xotcl $as_me 1.5.5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10638,7 +10638,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xotcl config.status 1.5.4
+xotcl config.status 1.5.5
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -11256,3 +11256,5 @@
 
 
 
+
+
Index: xotcl/configure.in
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/configure.in	(.../configure.in)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/configure.in	(.../configure.in)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -11,7 +11,7 @@
 # for this package, and can be a relative path, such as:
 #
 #--------------------------------------------------------------------
-define(XOTclVersion, 1.5.4)
+define(XOTclVersion, 1.5.5)
 AC_INIT([xotcl], [XOTclVersion])
 
 #--------------------------------------------------------------------
@@ -104,7 +104,7 @@
 # do not modify the following lines manually, they are generated with changeXOTclVersion
 XOTCL_MAJOR_VERSION=1
 XOTCL_MINOR_VERSION=5
-XOTCL_RELEASE_LEVEL=.4
+XOTCL_RELEASE_LEVEL=.5
 
 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION}
 NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION}
@@ -489,3 +489,5 @@
 
 
 
+
+
Index: xotcl/doc/langRef-xotcl.pdf
===================================================================
diff -u -N -r20e421dc641dc39b53106b1296ac7e09d0b206f2 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
Binary files differ
Index: xotcl/doc/langRef.xotcl
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/doc/langRef.xotcl	(.../langRef.xotcl)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/doc/langRef.xotcl	(.../langRef.xotcl)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,5 +1,5 @@
-# $Id: langRef.xotcl,v 1.17 2007/08/14 16:38:26 neumann Exp $
-package provide XOTcl-langRef 1.5.4
+# $Id: langRef.xotcl,v 1.18 2007/09/05 19:09:22 neumann Exp $
+package provide XOTcl-langRef 1.5.5
 package require XOTcl
 
 @ @File {
@@ -124,7 +124,7 @@
     </dl>
 
   }
-  date { $Date: 2007/08/14 16:38:26 $ }
+  date { $Date: 2007/09/05 19:09:22 $ }
 }
 
 ##
Index: xotcl/doc/tutorial.html
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/doc/tutorial.html	(.../tutorial.html)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/doc/tutorial.html	(.../tutorial.html)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<!-- $Id: tutorial.html,v 1.19 2007/08/14 16:38:26 neumann Exp $ -->
+<!-- $Id: tutorial.html,v 1.20 2007/09/05 19:09:22 neumann Exp $ -->
 <HTML>
 <HEAD>
 	<TITLE>XOTcl - Tutorial</TITLE>
 	<META NAME="AUTHOR" CONTENT="Gustaf Neumann and Uwe Zdun">
-	<META NAME="DOCNUMBER" CONTENT="1.5.4">
+	<META NAME="DOCNUMBER" CONTENT="1.5.5">
 	<META NAME="CHANGEDBY" CONTENT="Gustaf Neumann">
 <STYLE>
 BODY	{
@@ -59,7 +59,7 @@
 			<IMG SRC="logo-100.jpg" NAME="Graphic1" ALIGN=RIGHT WIDTH=102 HEIGHT=42 BORDER=0></TD>
 	</TR>
 </TABLE>
-<p align=right>Version: 1.5.2</p>
+<p align=right>Version: 1.5.5</p>
 
 <UL>
 	<LI>
Index: xotcl/doc/tutorial.pdf
===================================================================
diff -u -N -r20e421dc641dc39b53106b1296ac7e09d0b206f2 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
Binary files differ
Index: xotcl/doc/xo-daemon.html
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/doc/xo-daemon.html	(.../xo-daemon.html)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/doc/xo-daemon.html	(.../xo-daemon.html)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -76,7 +76,7 @@
           <em> Date:</em>
         </TD>
         <TD VALIGN="top">
-          [::xotcl::rcs date {$Date: 2007/08/14 16:38:26 $}]
+          [::xotcl::rcs date {$Date: 2007/09/05 19:09:22 $}]
         </TD>
       </TR>
     </TABLE>
Index: xotcl/doc/xo-whichPkg.html
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/doc/xo-whichPkg.html	(.../xo-whichPkg.html)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/doc/xo-whichPkg.html	(.../xo-whichPkg.html)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -50,7 +50,7 @@
           <em> Date:</em>
         </TD>
         <TD VALIGN="top">
-          [::xotcl::rcs date {$Date: 2007/08/14 16:38:26 $}]
+          [::xotcl::rcs date {$Date: 2007/09/05 19:09:22 $}]
         </TD>
       </TR>
     </TABLE>
Index: xotcl/generic/predefined.h
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/predefined.h	(.../predefined.h)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/generic/predefined.h	(.../predefined.h)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,5 +1,5 @@
 static char cmd[] = 
-"# $Id: predefined.h,v 1.16 2007/08/14 16:38:26 neumann Exp $\n"
+"# $Id: predefined.h,v 1.17 2007/09/05 19:09:22 neumann Exp $\n"
 "foreach cmd [info command ::xotcl::Object::instcmd::*] {\n"
 "::xotcl::alias ::xotcl::Object [namespace tail $cmd] $cmd}\n"
 "foreach cmd {array append eval incr lappend trace subst unset} {\n"
@@ -529,11 +529,11 @@
 "foreach e [list TMPDIR TEMP TMP] {\n"
 "if {[info exists ::env($e)] \\\n"
 "&& [file isdirectory $::env($e)] \\\n"
-"&& [file iswritable $::env($e)]} {\n"
+"&& [file writable $::env($e)]} {\n"
 "return $::env($e)}}\n"
 "if {$::tcl_platform(platform) eq \"windows\"} {\n"
 "foreach d [list \"C:\\\\TEMP\" \"C:\\\\TMP\" \"\\\\TEMP\" \"\\\\TMP\"] {\n"
-"if {[file isdirectory $d] && [file iswritable $d]} {\n"
+"if {[file isdirectory $d] && [file writable $d]} {\n"
 "return $d}}}\n"
 "return /tmp}\n"
 "";
Index: xotcl/generic/predefined.xotcl
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/predefined.xotcl	(.../predefined.xotcl)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/generic/predefined.xotcl	(.../predefined.xotcl)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,4 +1,4 @@
-# $Id: predefined.xotcl,v 1.15 2007/08/14 16:38:26 neumann Exp $
+# $Id: predefined.xotcl,v 1.16 2007/09/05 19:09:22 neumann Exp $
 # provide the standard command set for ::xotcl::Object
 foreach cmd [info command ::xotcl::Object::instcmd::*] {
   ::xotcl::alias ::xotcl::Object [namespace tail $cmd] $cmd 
@@ -12,6 +12,7 @@
   ::xotcl::alias ::xotcl::Class [namespace tail $cmd] $cmd 
 }
 unset cmd
+
 # init must exist on Object. per default it is empty.
 ::xotcl::Object instproc init args {}
 
@@ -864,13 +865,13 @@
   foreach e [list TMPDIR TEMP TMP] {
     if {[info exists ::env($e)] \
             && [file isdirectory $::env($e)] \
-            && [file iswritable $::env($e)]} {
+            && [file writable $::env($e)]} {
       return $::env($e)
     }
   }
   if {$::tcl_platform(platform) eq "windows"} {
     foreach d [list "C:\\TEMP" "C:\\TMP" "\\TEMP" "\\TMP"] {
-      if {[file isdirectory $d] && [file iswritable $d]} {
+      if {[file isdirectory $d] && [file writable $d]} {
         return $d
       }
     }
Index: xotcl/generic/xotcl.c
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/xotcl.c	(.../xotcl.c)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/generic/xotcl.c	(.../xotcl.c)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,8 +1,8 @@
-/* $Id: xotcl.c,v 1.47 2007/08/14 16:38:26 neumann Exp $
+/* $Id: xotcl.c,v 1.48 2007/09/05 19:09:22 neumann Exp $
  *
- *  XOTcl - Extended OTcl
+ *  XOTcl - Extended Object Tcl
  *
- *  Copyright (C) 1999-2006 Gustaf Neumann (a), Uwe Zdun (a)
+ *  Copyright (C) 1999-2007 Gustaf Neumann (a), Uwe Zdun (a)
  *
  * (a) Vienna University of Economics and Business Administration
  *     Institute. of Information Systems and New Media
@@ -197,25 +197,229 @@
 }
 #endif
 
+/*
+ * Var Reform Compatibility support
+ */
 
-#if defined(PRE85)
+#if !defined(TclOffset)
+#ifdef offsetof
+#define TclOffset(type, field) ((int) offsetof(type, field))
+#else
+#define TclOffset(type, field) ((int) ((char *) &((type *) 0)->field))
+#endif
+#endif
+
+#if defined(PRE85) && FORWARD_COMPATIBLE
+/*
+ * Define the types missing for the forward compatible mode
+ */
+typedef Var * (Tcl_VarHashCreateVarFunction) _ANSI_ARGS_(
+  (TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr)
+);
+typedef void (Tcl_InitVarHashTableFunction) _ANSI_ARGS_(
+  (TclVarHashTable *tablePtr, Namespace *nsPtr)
+);
+typedef void (Tcl_CleanupVarFunction) _ANSI_ARGS_ (
+  (Var * varPtr, Var *arrayPtr)
+);
+typedef Var * (Tcl_DeleteVarFunction) _ANSI_ARGS_ (
+  (Interp *iPtr, TclVarHashTable *tablePtr)
+);
+typedef Var * (lookupVarFromTableFunction) _ANSI_ARGS_ (
+  (TclVarHashTable *varTable, CONST char *simpleName, XOTclObject *obj)
+);
+
+
+typedef struct TclVarHashTable85 {
+    Tcl_HashTable table;
+    struct Namespace *nsPtr;
+} TclVarHashTable85;
+
+typedef struct Var85 {
+    int flags;
+    union {
+        Tcl_Obj *objPtr;
+        TclVarHashTable85 *tablePtr;
+        struct Var85 *linkPtr; 
+    } value;
+} Var85;
+
+typedef struct VarInHash {
+    Var85 var;
+    int refCount;
+    Tcl_HashEntry entry;
+} VarInHash;
+
+
+typedef struct Tcl_CallFrame85 {
+    Tcl_Namespace *nsPtr;
+    int dummy1;
+    int dummy2;
+    char *dummy3;
+    char *dummy4;
+    char *dummy5;
+    int dummy6;
+    char *dummy7;
+    char *dummy8;
+    int dummy9;
+    char *dummy10;
+    char *dummy11;
+    char *dummy12;
+} Tcl_CallFrame85;
+
+typedef struct CallFrame85 {
+    Namespace *nsPtr;
+    int isProcCallFrame;
+    int objc; 
+    Tcl_Obj *CONST *objv;
+    struct CallFrame *callerPtr;
+    struct CallFrame *callerVarPtr;
+    int level;
+    Proc *procPtr;
+    TclVarHashTable *varTablePtr;
+    int numCompiledLocals;
+    Var85 *compiledLocals; 
+    ClientData clientData;
+    void *localCachePtr;
+} CallFrame85;
+
 /* 
- * for backward compatibility
+ * These are global variables, but thread-safe, since they
+ * are only set during initialzation and they are never changed,
+ * and the variables are single words.
  */
-#define VarHashGetValue(hPtr) \
-  (Var *) Tcl_GetHashValue(hPtr)
-#define TclIsVarTraced(varPtr)                  \
-  (varPtr->tracePtr != NULL)
-#define VarHashTable(t) t
-#define TclVarHashTable Tcl_HashTable
-#define TclInitVarHashTable(tablePtr, nsPtr) \
-  Tcl_InitHashTable((tablePtr), TCL_STRING_KEYS)
-#define VarHashRefCount(varPtr) (varPtr)->refCount
+static int forwardCompatibleMode;
 
+static Tcl_VarHashCreateVarFunction  *tclVarHashCreateVar;
+static Tcl_InitVarHashTableFunction  *tclInitVarHashTable;
+static Tcl_CleanupVarFunction        *tclCleanupVar;
+static lookupVarFromTableFunction    *lookupVarFromTable;
+
+static int varRefCountOffset;
+static int varHashTableSize;
+
+# define VarHashRefCount(varPtr) \
+    (*((int *) (((char *)(varPtr))+varRefCountOffset)))
+
+# define VarHashGetValue(hPtr) \
+    (forwardCompatibleMode ? \
+        (Var *) ((char *)hPtr - TclOffset(VarInHash, entry)) : \
+     	(Var *) Tcl_GetHashValue(hPtr) \
+     )
+
+#define VarHashGetKey(varPtr) \
+  (((VarInHash *)(varPtr))->entry.key.objPtr)
+
+#define VAR_TRACED_READ85        0x10       /* TCL_TRACE_READS  */
+#define VAR_TRACED_WRITE85       0x20       /* TCL_TRACE_WRITES */
+#define VAR_TRACED_UNSET85       0x40       /* TCL_TRACE_UNSETS */
+#define VAR_TRACED_ARRAY85       0x800      /* TCL_TRACE_ARRAY  */
+#define VAR_TRACE_ACTIVE85       0x2000
+#define VAR_SEARCH_ACTIVE85      0x4000
+#define VAR_ALL_TRACES85 \
+   (VAR_TRACED_READ85|VAR_TRACED_WRITE85|VAR_TRACED_ARRAY85|VAR_TRACED_UNSET85)
+
+#define VAR_ARRAY85            0x1
+#define VAR_LINK85             0x2
+
+#define varFlags(varPtr) \
+    (forwardCompatibleMode ? \
+     ((Var85 *)varPtr)->flags : \
+        (varPtr)->flags \
+     )
+#undef TclIsVarScalar
+#define TclIsVarScalar(varPtr) \
+    (forwardCompatibleMode ? \
+     !(((Var85 *)varPtr)->flags & (VAR_ARRAY85|VAR_LINK85)) : \
+        ((varPtr)->flags & VAR_SCALAR) \
+     )
+#undef TclIsVarArray
+#define TclIsVarArray(varPtr) \
+    (forwardCompatibleMode ? \
+     (((Var85 *)varPtr)->flags & VAR_ARRAY85) : \
+        ((varPtr)->flags & VAR_ARRAY) \
+     )
+#define TclIsVarNamespaceVar(varPtr) \
+    (forwardCompatibleMode ? \
+     (((Var85 *)varPtr)->flags & VAR_NAMESPACE_VAR) : \
+        ((varPtr)->flags & VAR_NAMESPACE_VAR) \
+     )
+
+#define TclIsVarTraced(varPtr) \
+    (forwardCompatibleMode ? \
+     (((Var85 *)varPtr)->flags & VAR_ALL_TRACES85) : \
+       (varPtr->tracePtr != NULL)  \
+     )
+#undef TclIsVarLink
+#define TclIsVarLink(varPtr) \
+    (forwardCompatibleMode ? \
+     (((Var85 *)varPtr)->flags & VAR_LINK85) : \
+       (varPtr->flags & VAR_LINK) \
+     )
+#undef TclIsVarUndefined
+#define TclIsVarUndefined(varPtr) \
+    (forwardCompatibleMode ? \
+       (((Var85 *)varPtr)->value.objPtr == NULL) : \
+       (varPtr->flags & VAR_UNDEFINED) \
+     )
+#undef TclSetVarLink
+#define TclSetVarLink(varPtr)  \
+    if (forwardCompatibleMode) \
+        ((Var85 *)varPtr)->flags = (((Var85 *)varPtr)->flags & ~VAR_ARRAY85) | VAR_LINK85; \
+ else \
+       (varPtr)->flags = ((varPtr)->flags & ~(VAR_SCALAR|VAR_ARRAY)) | VAR_LINK
+
+#undef TclClearVarUndefined
+#define TclClearVarUndefined(varPtr) \
+    if (!forwardCompatibleMode) \
+        (varPtr)->flags &= ~VAR_UNDEFINED
+
+#undef Tcl_CallFrame_compiledLocals
+#define Tcl_CallFrame_compiledLocals(cf)     \
+   (forwardCompatibleMode ?                  \
+    (Var *)(((CallFrame85 *)cf)->compiledLocals) :        \
+     (((CallFrame*)cf)->compiledLocals)      \
+   )
+
+#define getNthVar(varPtr,i)  \
+   (forwardCompatibleMode ?  \
+    (Var *)(((Var85 *)varPtr)+(i)) :              \
+    (((Var *)varPtr)+(i))     \
+   )
+
+#define valueOfVar(type,varPtr,field)           \
+   (forwardCompatibleMode ?         \
+    (type *)(((Var85 *)varPtr)->value.field) : \
+    (type *)(((Var *)varPtr)->value.field) \
+   )
+#endif
+
+
+#if !FORWARD_COMPATIBLE
+# define getNthVar(varPtr,i) (((Var *)varPtr)+(i))
+#endif
+
+
+#define TclIsCompiledLocalArgument(compiledLocalPtr) \
+  ((compiledLocalPtr)->flags & VAR_ARGUMENT) 
+#define TclIsCompiledLocalTemporary(compiledLocalPtr) \
+  ((compiledLocalPtr)->flags & VAR_TEMPORARY) 
+
+#if defined(PRE85) && !FORWARD_COMPATIBLE
+# define VarHashGetValue(hPtr) (Var *)Tcl_GetHashValue(hPtr)
+# define VarHashRefCount(varPtr) (varPtr)->refCount
+# define TclIsVarTraced(varPtr)  (varPtr->tracePtr != NULL)
+# define TclIsVarNamespaceVar(varPtr) ((varPtr)->flags & VAR_NAMESPACE_VAR)
+# define varHashTableSize sizeof(TclVarHashTable)
+# define valueOfVar(type,varPtr,field) (type *)(varPtr)->value.field
+#endif
+
+
+#if defined(PRE85)
 /*
  * We need NewVar from tclVar.c ... but its not exported
  */
-static Var *NewVar() {
+static Var *NewVar84() {
   register Var *varPtr;
   
   varPtr = (Var *) ckalloc(sizeof(Var));
@@ -230,8 +434,32 @@
   return varPtr;
 }
 
+static Var *
+VarHashCreateVar84(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) {
+  char *newName = ObjStr(key);
+  Tcl_HashEntry *hPtr = Tcl_CreateHashEntry(tablePtr, newName, newPtr);
+  Var *varPtr;
+  
+  if (newPtr && *newPtr) {
+    varPtr = NewVar84();
+    Tcl_SetHashValue(hPtr, varPtr);
+    varPtr->hPtr = hPtr;
+    varPtr->nsPtr = NULL; /* a local variable */
+  } else {
+    varPtr = (Var *) Tcl_GetHashValue(hPtr);
+  }
+
+  return varPtr;
+}
+
+static void 
+InitVarHashTable84(TclVarHashTable *tablePtr, Namespace *nsPtr) {
+  /* fprintf(stderr,"InitVarHashTable84\n"); */
+  Tcl_InitHashTable((tablePtr), TCL_STRING_KEYS);
+}
+
 static void
-TclCleanupVar(Var * varPtr, Var *arrayPtr) {
+TclCleanupVar84(Var * varPtr, Var *arrayPtr) {
   if (TclIsVarUndefined(varPtr) && (varPtr->refCount == 0)
       && (varPtr->tracePtr == NULL)
       && (varPtr->flags & VAR_IN_HASHTABLE)) {
@@ -251,25 +479,54 @@
     }
   }
 }
-
-static inline Var *
-VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) {
-  char *newName = ObjStr(key);
-  Tcl_HashEntry *hPtr = Tcl_CreateHashEntry(tablePtr, newName, newPtr);
-  Var *varPtr;
+static Var *
+LookupVarFromTable84(TclVarHashTable *varTable, CONST char *simpleName, 
+                     XOTclObject *obj) {
+    Var *varPtr = NULL;
+    Tcl_HashEntry *entryPtr;
   
-  if (newPtr && *newPtr) {
-    varPtr = NewVar();
-    Tcl_SetHashValue(hPtr, varPtr);
-    varPtr->hPtr = hPtr;
-    varPtr->nsPtr = NULL; /* a local variable */
-  } else {
-    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-  }
-
-  return varPtr;
+    if (varTable) {
+        entryPtr = Tcl_FindHashEntry(varTable, simpleName);
+        if (entryPtr) {
+            varPtr = VarHashGetValue(entryPtr);
+        }
+    }
+    return varPtr;
 }
+#endif
 
+
+#if defined(PRE85)
+# if FORWARD_COMPATIBLE
+#  define VarHashCreateVar   (*tclVarHashCreateVar)
+#  define InitVarHashTable   (*tclInitVarHashTable)
+#  define CleanupVar         (*tclCleanupVar)
+#  define LookupVarFromTable (*lookupVarFromTable)
+#  define TclCallFrame       Tcl_CallFrame85
+# else
+#  define VarHashCreateVar   VarHashCreateVar84
+#  define InitVarHashTable   InitVarHashTable84
+#  define CleanupVar         TclCleanupVar84
+#  define LookupVarFromTable LookupVarFromTable84
+#  define TclCallFrame       Tcl_CallFrame
+# endif
+#else
+# define VarHashCreateVar   VarHashCreateVar85
+# define InitVarHashTable   TclInitVarHashTable
+# define CleanupVar         TclCleanupVar
+# define LookupVarFromTable LookupVarFromTable85
+# define TclCallFrame       Tcl_CallFrame
+#endif
+
+
+#if defined(PRE85)
+/* 
+ * for backward compatibility
+ */
+
+#define VarHashTable(t) t
+#define TclVarHashTable Tcl_HashTable
+
 static Var *
 XOTclObjLookupVar(Tcl_Interp *interp, Tcl_Obj *part1Ptr, CONST char *part2, 
              int flags, const char *msg, int createPart1, int createPart2, 
@@ -290,26 +547,14 @@
 
 #define VarHashGetValue(hPtr) \
   ((Var *) ((char *)hPtr - TclOffset(VarInHash, entry)))
-#define VarHashGetKey(varPtr)	\
+#define VarHashGetKey(varPtr) \
   (((VarInHash *)(varPtr))->entry.key.objPtr)
-#define VarHashDeleteEntry(varPtr)                              \
-  Tcl_DeleteHashEntry(&(((VarInHash *) varPtr)->entry))
-#define VarHashTable(varTable)                  \
+#define VarHashTable(varTable) \
   &(varTable)->table
 #define XOTclObjLookupVar TclObjLookupVar
+#define varHashTableSize sizeof(TclVarHashTable)
+#define valueOfVar(type,varPtr,field) (type *)(varPtr)->value.field
 
-static XOTCLINLINE Var *
-VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key,int *newPtr)
-{
-  Tcl_HashEntry *hPtr = Tcl_CreateHashEntry((Tcl_HashTable *) tablePtr,
-                                            (char *) key, newPtr);
-  if (hPtr) {
-    return VarHashGetValue(hPtr);
-  } else {
-    return NULL;
-  }
-}
-
 XOTCLINLINE static Tcl_Namespace *
 ObjFindNamespace(Tcl_Interp *interp, Tcl_Obj *objPtr) {
   Tcl_Namespace *nsPtr;
@@ -322,31 +567,38 @@
 }
 #endif
 
+#if !defined(PRE85) || FORWARD_COMPATIBLE
+static XOTCLINLINE Var *
+VarHashCreateVar85(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr)
+{
+    Var *varPtr = NULL;
+    Tcl_HashEntry *hPtr;
+    hPtr = Tcl_CreateHashEntry((Tcl_HashTable *) tablePtr,
+                               (char *) key, newPtr);
+    if (hPtr) {
+        varPtr = VarHashGetValue(hPtr);
+    }
+    return varPtr;
+}
 
-XOTCLINLINE static Var *
-lookupVarFromVarTable(TclVarHashTable *varTable, CONST char *simpleName, 
-                      XOTclObject *obj) {
-#if defined(PRE85)
-  Var *varPtr = NULL;
-  Tcl_HashEntry *entryPtr;
-  
-  if (varTable) {
-    entryPtr = Tcl_FindHashEntry(varTable, simpleName);
-    if (entryPtr) {
-      varPtr = VarHashGetValue(entryPtr);
+static XOTCLINLINE Var *
+LookupVarFromTable85(TclVarHashTable *tablePtr, CONST char *simpleName, 
+                     XOTclObject *obj) {
+    Var *varPtr = NULL;
+    if (tablePtr) {
+        Tcl_Obj *keyPtr = Tcl_NewStringObj(simpleName, -1);
+        Tcl_IncrRefCount(keyPtr);
+        varPtr = VarHashCreateVar85(tablePtr, keyPtr, NULL);
+        Tcl_DecrRefCount(keyPtr);
     }
-  }
-  return varPtr;
-#else
-  if (varTable) {
-    return TclVarHashFindVar(varTable, simpleName);
-  }
-  return NULL;
-#endif
+    return varPtr;
 }
+#endif
 
 
 
+
+
 /*
  * call an XOTcl method
  */
@@ -1394,8 +1646,16 @@
       for (hPtr = Tcl_FirstHashEntry(varHashTable, &search);  hPtr != NULL;
 	   hPtr = Tcl_NextHashEntry(&search)) {
 #if defined(PRE85)
-	Var *varPtr = (Var *) Tcl_GetHashValue(hPtr);
-	varPtr->nsPtr = (Namespace *)nsPtr;
+          Var *varPtr;
+# if FORWARD_COMPATIBLE
+          if (!forwardCompatibleMode) {
+              varPtr = (Var *) Tcl_GetHashValue(hPtr);
+              varPtr->nsPtr = (Namespace *)nsPtr;
+          }
+# else
+          varPtr = (Var *) Tcl_GetHashValue(hPtr);
+          varPtr->nsPtr = (Namespace *)nsPtr;
+# endif
 #endif
 	hPtr->tablePtr = varHashTable;
       }
@@ -1411,8 +1671,8 @@
  *	        int flags, Tcl_Var *rPtr));
  */
 int
-varResolver(Tcl_Interp *in, CONST char *name, Tcl_Namespace *ns, int flags, Tcl_Var* varPtr) {
-  *varPtr = (Tcl_Var)lookupVarFromVarTable(Tcl_Namespace_varTable(ns), name,NULL);
+varResolver(Tcl_Interp *in, CONST char *name, Tcl_Namespace *ns, int flags, Tcl_Var *varPtr) {
+  *varPtr = (Tcl_Var)LookupVarFromTable(Tcl_Namespace_varTable(ns), name,NULL);
   /*fprintf(stderr,"lookup '%s' successful %d\n",name, *varPtr != NULL);*/
   return *varPtr ? TCL_OK : TCL_ERROR;
 }
@@ -1514,9 +1774,9 @@
 
 /*
  * ensure that a variable exists on object varTable or nsPtr->varTable,
- * if necessary create it. Return Var* if successful, otherwise 0
+ * if necessary create it. Return Var * if successful, otherwise 0
  */
-static Var*
+static Var *
 NSRequireVariableOnObj(Tcl_Interp *in, XOTclObject *obj, char *name, int flgs) {
   XOTcl_FrameDecls;
   Var *varPtr, *arrayPtr;
@@ -1577,7 +1837,7 @@
    * (deleteVars frees the vartable)
    */
   TclDeleteVars((Interp *)in, varTable);
-  TclInitVarHashTable(varTable, (Namespace *)ns);
+  InitVarHashTable(varTable, (Namespace *)ns);
 
   /*
    * Delete all user-defined procs in the namespace
@@ -4227,6 +4487,23 @@
   return result;
 }
 
+static void
+getVarAndNameFromHash(Tcl_HashEntry *hPtr, Var **val, Tcl_Obj **varNameObj) {
+  *val  = VarHashGetValue(hPtr);
+#if defined(PRE85)
+# if FORWARD_COMPATIBLE
+  if (forwardCompatibleMode) {
+      *varNameObj  = VarHashGetKey(*val);
+  } else {
+      *varNameObj  = Tcl_NewStringObj(Tcl_GetHashKey(hPtr->tablePtr, hPtr),-1);
+  }
+# else
+  *varNameObj  = Tcl_NewStringObj(Tcl_GetHashKey(hPtr->tablePtr, hPtr),-1);
+# endif
+#else
+  *varNameObj  = VarHashGetKey(*val);
+#endif
+}
 
 /*
  * Search default values specified through 'parameter' on one class
@@ -4239,36 +4516,34 @@
   Tcl_Namespace *ns = targetClass->object.nsPtr;
   TclVarHashTable *varTable = ns ? Tcl_Namespace_varTable(ns) : targetClass->object.varTable;
 
-  defaults = lookupVarFromVarTable(varTable, "__defaults",(XOTclObject*)targetClass);
-  initcmds = lookupVarFromVarTable(varTable, "__initcmds",(XOTclObject*)targetClass);
+  defaults = LookupVarFromTable(varTable, "__defaults",(XOTclObject*)targetClass);
+  initcmds = LookupVarFromTable(varTable, "__initcmds",(XOTclObject*)targetClass);
 
   if (defaults && TclIsVarArray(defaults)) {
-    TclVarHashTable *tablePtr = defaults->value.tablePtr;
+    TclVarHashTable *tablePtr = valueOfVar(TclVarHashTable,defaults,tablePtr);
     Tcl_HashSearch hSrch;
     Tcl_HashEntry* hPtr = tablePtr ? Tcl_FirstHashEntry(VarHashTable(tablePtr), &hSrch) : 0;
     
-    /*fprintf(stderr, "+++ we have defaults for <%s>\n", className(targetClass));*/
+    /*fprintf(stderr, "+++ we have defaults for %s in <%s>\n", 
+      ObjStr(obj->cmdName),className(targetClass));*/
     
     /* iterate over all elements of the defaults array */
     for (; hPtr != 0; hPtr = Tcl_NextHashEntry(&hSrch)) {
-      Var  *val            = VarHashGetValue(hPtr);
-#if defined(PRE85)
-      char *varName        = Tcl_GetHashKey(tablePtr, hPtr);
-      Tcl_Obj *varNameObj  = Tcl_NewStringObj(varName,-1);
-#else
-      Tcl_Obj *varNameObj  = VarHashGetKey(val);
-#endif
+      Var *val;
+      Tcl_Obj *varNameObj;
 
+      getVarAndNameFromHash(hPtr, &val, &varNameObj);
       INCR_REF_COUNT(varNameObj);
+
       if (TclIsVarScalar(val)) {
-	Tcl_Obj *oldValue;
-	oldValue = XOTclOGetInstVar2((XOTcl_Object*) obj, in, varNameObj, NULL,
+	Tcl_Obj *oldValue = XOTclOGetInstVar2((XOTcl_Object*) obj, 
+                                     in, varNameObj, NULL,
 				     TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1);
 	/** we check whether the variable is already set.
 	    if so, we do not set it again */
 	if (oldValue == NULL) {
-	  char *value = ObjStr(val->value.objPtr), *v;
-	  Tcl_Obj *valueObj = val->value.objPtr;
+          Tcl_Obj *valueObj = valueOfVar(Tcl_Obj,val,objPtr);
+	  char *value = ObjStr(valueObj), *v;
 	  int doSubst = 0;
 	  for (v=value; *v; v++) {
 	    if (*v == '[' && doSubst == 0)
@@ -4315,33 +4590,28 @@
   } 
   
   if (initcmds && TclIsVarArray(initcmds)) {
-    TclVarHashTable *tablePtr = initcmds->value.tablePtr;
+    TclVarHashTable *tablePtr = valueOfVar(TclVarHashTable,initcmds,tablePtr);
     Tcl_HashSearch hSrch;
     Tcl_HashEntry* hPtr = tablePtr ? Tcl_FirstHashEntry(VarHashTable(tablePtr), &hSrch) : 0;
 
     /*fprintf(stderr, "+++ we have initcmds for <%s>\n", className(targetClass));*/
       /* iterate over the elements of initcmds */
     for (; hPtr != 0; hPtr = Tcl_NextHashEntry(&hSrch)) {
+      Var  *val;
+      Tcl_Obj *varNameObj;
 
-      Var  *val            = VarHashGetValue(hPtr);
-#if defined(PRE85)
-      char *varName        = Tcl_GetHashKey(tablePtr, hPtr);
-      Tcl_Obj *varNameObj  = Tcl_NewStringObj(varName,-1);
-#else
-      Tcl_Obj *varNameObj  = VarHashGetKey(val);
-      char *varName        = ObjStr(varNameObj);
-#endif
+      getVarAndNameFromHash(hPtr, &val, &varNameObj);
 
       INCR_REF_COUNT(varNameObj);
       /*fprintf(stderr,"varexists(%s->%s) = %d\n", 
 	      ObjStr(obj->cmdName),
-	      varName, varExists(in, obj, varName, NULL, 0, 0));*/
+	      ObjStr(varNameObj), varExists(in, obj, ObjStr(varNameObj), NULL, 0, 0));*/
 
       if (TclIsVarScalar(val) && 
-	  (!varExists(in, obj, varName, NULL, 0, 0) ||
-	   varExists(in, &targetClass->object, "__defaults", varName, 0,0)
+	  (!varExists(in, obj, ObjStr(varNameObj), NULL, 0, 0) ||
+	   varExists(in, &targetClass->object, "__defaults", ObjStr(varNameObj), 0,0)
 	   )) {
-	Tcl_Obj *valueObj = val->value.objPtr;
+	Tcl_Obj *valueObj = valueOfVar(Tcl_Obj,val,objPtr);
 	char *string = ObjStr(valueObj);
 	int rc;
 	XOTcl_FrameDecls;
@@ -4399,6 +4669,7 @@
       break;
     ml = ml->next;
   }
+
   for (pl = ComputeOrder(cl, cl->order, Super); pl; pl = pl->next) {
     result = SearchDefaultValuesOnClass(in, obj, cmdCl, pl->cl);
     if (result != TCL_OK)
@@ -4478,16 +4749,16 @@
   /*
   fprintf(stderr,"*** callProcCheck: cmd = %p\n",cmd);
   fprintf(stderr,
-	  "cp=%p, isTclProc=%d %p %s, dispatch=%d %p, eval=%d %p, ov[0]=%p oc=%d\n",
+	  "cp=%p, isTclProc=%d %p %s, dispatch=%d %p, forward=%d %p, scoped %p, ov[0]=%p oc=%d\n",
 	  cp,
 	  isTclProc, cmd,
 	  Tcl_GetCommandName(in, cmd),
 	  Tcl_Command_objProc(cmd) == XOTclObjDispatch, XOTclObjDispatch,
 	  Tcl_Command_objProc(cmd) == XOTclForwardMethod, XOTclForwardMethod,
-XOTclObjscopedMethod
+          XOTclObjscopedMethod,
 	  objv[0], objc
-	  );
-  */
+	  );*/
+  
 
 #ifdef CALLSTACK_TRACE
   XOTclCallStackDump(in);
@@ -5165,7 +5436,7 @@
 	 Tcl_HashTable **nonposArgsTable,
 	 Tcl_Interp *in, int objc, Tcl_Obj *objv[], XOTclObject *obj) {
   int result, incr, haveNonposArgs=0;
-  Tcl_CallFrame frame;
+  TclCallFrame frame, *framePtr = &frame;
   Tcl_Obj *ov[4];
   Tcl_HashEntry* hPtr = NULL;
   char *procName = ObjStr(objv[1]);
@@ -5206,10 +5477,11 @@
       Tcl_Obj **npav;
       /* arg = ObjStr(argsv[i]);
          fprintf(stderr, "*** argparse0 arg='%s'\n",arg);*/
+
       rc = Tcl_ListObjGetElements(in, argsv[i], &npac, &npav);
       if (rc == TCL_OK && npac > 0) {
         arg = ObjStr(npav[0]);
-        /*fprintf(stderr, "*** argparse1 arg='%s' rc=%d\n",arg,rc);*/
+        /* fprintf(stderr, "*** argparse1 arg='%s' rc=%d\n",arg,rc);*/
         if (*arg == '-') {
           haveNonposArgs = 1;
           continue;
@@ -5223,8 +5495,8 @@
       Tcl_Obj *nonposArgs = Tcl_NewListObj(i, &argsv[0]);
       INCR_REF_COUNT(ordinaryArgs);
       INCR_REF_COUNT(nonposArgs);
-      /*fprintf(stderr, "nonpos <%s> ordinary <%s>\n",
-	ObjStr(nonposArgs),ObjStr(ordinaryArgs));*/
+      /* fprintf(stderr, "nonpos <%s> ordinary <%s>\n",
+	 ObjStr(nonposArgs),ObjStr(ordinaryArgs));*/
       result = parseNonposArgs(in, procName, nonposArgs, ordinaryArgs,
 			       nonposArgsTable, &haveNonposArgs);
       DECR_REF_COUNT(ordinaryArgs);
@@ -5255,7 +5527,7 @@
   }
 #endif
 
-  Tcl_PushCallFrame(in,&frame,ns,0);
+  Tcl_PushCallFrame(in,(Tcl_CallFrame *)framePtr,ns,0);
 
   result = Tcl_ProcObjCmd(0, in, 4, ov) != TCL_OK;
 #if defined(NAMESPACEINSTPROCS)
@@ -5357,7 +5629,7 @@
   return TCL_OK;
 }
 
-#if !defined(PRE85)
+#if !defined(PRE85) || FORWARD_COMPATIBLE
 static int
 ListVarKeys(Tcl_Interp *in, Tcl_HashTable *tablePtr, char *pattern) {
   Tcl_HashEntry* hPtr;
@@ -5399,7 +5671,15 @@
   TclVarHashTable *varTable = obj->nsPtr ? Tcl_Namespace_varTable(obj->nsPtr) : obj->varTable;
 
 #if defined(PRE85)
+# if FORWARD_COMPATIBLE
+  if (forwardCompatibleMode) {
+      ListVarKeys(in, VarHashTable(varTable), pattern);
+  } else {
+      ListKeys(in, varTable, pattern);
+  }
+# else
   ListKeys(in, varTable, pattern);
+# endif
 #else
   ListVarKeys(in, VarHashTable(varTable), pattern);
 #endif
@@ -5738,7 +6018,7 @@
       CompiledLocal *args = proc->firstLocalPtr;
       Tcl_ResetResult(in);
       for (;args != NULL; args = args->nextPtr) {
-          if TclIsVarArgument(args)
+          if (TclIsCompiledLocalArgument(args))
 	      Tcl_AppendElement(in, args->name);
 
       }
@@ -5778,7 +6058,7 @@
   if (proc) {
     CompiledLocal *ap;
     for (ap = proc->firstLocalPtr; ap != 0; ap = ap->nextPtr) {
-      if (!TclIsVarArgument(ap)) continue;
+      if (!TclIsCompiledLocalArgument(ap)) continue;
       if (strcmp(arg, ap->name) != 0) continue;
 	
       if (ap->defValuePtr != NULL) {
@@ -5861,17 +6141,21 @@
   return TCL_ERROR;
 }
 
+static char *
+StripBodyPrefix(char *body) {
+  if (strncmp(body, "::xotcl::initProcNS\n",20) == 0)
+    body+=20;
+  if (strncmp(body, "::xotcl::interpretNonpositionalArgs $args\n",42) == 0)
+    body+=42;
+  return body;
+}
+
 static int
 ListProcBody(Tcl_Interp *in, Tcl_HashTable *table, char *name) {
   Proc* proc = FindProc(in, table, name);
-
   if (proc) {
     char *body = ObjStr(proc->bodyPtr);
-    if (strncmp(body, "::xotcl::initProcNS\n",20) == 0)
-      body+=20;
-    if (strncmp(body, "::xotcl::interpretNonpositionalArgs $args\n",42) == 0)
-      body+=42;
-    Tcl_SetObjResult(in, Tcl_NewStringObj(body, -1));
+    Tcl_SetObjResult(in, Tcl_NewStringObj(StripBodyPrefix(body), -1));
     return TCL_OK;
   }
   return XOTclErrBadVal(in, "info body", "a tcl method name", name);
@@ -6962,20 +7246,18 @@
  * class init
  */
 static void
-PrimitiveCInit(void* mem, Tcl_Interp *in, char *name, XOTclClass *class) {
-  XOTclClass *cl = (XOTclClass*)mem;
-
-  Tcl_CallFrame frame;
+PrimitiveCInit(XOTclClass *cl, Tcl_Interp *in, char *name) {
+  TclCallFrame frame, *framePtr = &frame;
   Tcl_Namespace* ns;
-  char *n = name;
 
   /*
    * ensure that namespace is newly created during CleanupInitClass
    * ie. kill it, if it exists already
    */
-  if (Tcl_PushCallFrame(in, &frame, RUNTIME_STATE(in)->XOTclClassesNS, 0)!= TCL_OK)
+  if (Tcl_PushCallFrame(in, (Tcl_CallFrame *)framePtr, 
+			RUNTIME_STATE(in)->XOTclClassesNS, 0) != TCL_OK)
     return;
-  ns = NSGetFreshNamespace(in, (ClientData)cl, n);
+  ns = NSGetFreshNamespace(in, (ClientData)cl, name);
   Tcl_PopCallFrame(in);
 
   CleanupInitClass(in, cl, ns, 0);
@@ -7017,7 +7299,7 @@
 
   obj->cmdName = NewXOTclObjectObjName(obj,name,length);
   INCR_REF_COUNT(obj->cmdName);
-  PrimitiveCInit(cl, in, name+2, class);
+  PrimitiveCInit(cl, in, name+2);
 
   objTrace("PrimitiveCCreate", obj);
   return cl;
@@ -7083,7 +7365,7 @@
 }
 
 /*
- * Std initialization:
+ * Std object initialization:
  *   call parameter default values
  *   apply "-" methods (call "configure" with given arguments)
  *   call constructor "init", if it was not called before
@@ -7975,26 +8257,29 @@
     int i, nameLen          = strlen(newNameString);
 
     for (i = 0;  i < localCt;  i++) {    /* look in compiled locals */
-      if (!TclIsVarTemporary(localPtr)) {
+      
+      /* fprintf(stderr,"%d of %d %s flags %x not isTemp %d\n",i,localCt,
+                localPtr->name,localPtr->flags, 
+		!TclIsCompiledLocalTemporary(localPtr));*/
+
+      if (!TclIsCompiledLocalTemporary(localPtr)) {
 	char *localName = localPtr->name;
 	if ((newNameString[0] == localName[0])
 	    && (nameLen == localPtr->nameLength)
 	    && (strcmp(newNameString, localName) == 0)) {
-	  varPtr = localVarPtr;
-	  new = 0;
-	  break;
+            varPtr = getNthVar(localVarPtr,i);
+            new = 0;
+            break;
 	}
       }
-      localVarPtr++;
       localPtr = localPtr->nextPtr;
     }
 
     if (varPtr == NULL) {	/* look in frame's local var hashtable */
       tablePtr = Tcl_CallFrame_varTablePtr(varFramePtr);
       if (tablePtr == NULL) {
-
-	tablePtr = (TclVarHashTable *) ckalloc(sizeof(TclVarHashTable));
-	TclInitVarHashTable(tablePtr, NULL);
+	tablePtr = (TclVarHashTable *) ckalloc(varHashTableSize);
+	InitVarHashTable(tablePtr, NULL);
 	Tcl_CallFrame_varTablePtr(varFramePtr) = tablePtr;
       }
       varPtr = VarHashCreateVar(tablePtr, newName, &new);
@@ -8007,9 +8292,10 @@
       if (varPtr == otherPtr)
 	return XOTclVarErrMsg(in, "can't instvar to variable itself", 
                               (char *) NULL);
+
       if (TclIsVarLink(varPtr)) {
 	/* we try to make the same instvar again ... this is ok */
-	Var *linkPtr = varPtr->value.linkPtr;
+	Var *linkPtr = valueOfVar(Var,varPtr,linkPtr);
 	if (linkPtr == otherPtr) {
 	  return TCL_OK;
 	}
@@ -8022,7 +8308,7 @@
         */
 	VarHashRefCount(linkPtr)--;
 	if (TclIsVarUndefined(linkPtr)) {
-          TclCleanupVar(linkPtr, (Var *) NULL);
+          CleanupVar(linkPtr, (Var *) NULL);
         }
 
       } else if (!TclIsVarUndefined(varPtr)) {
@@ -8033,10 +8319,30 @@
                               "' has traces: can't use for instvar", (char *) NULL);
       }
     }
+
     TclSetVarLink(varPtr);
     TclClearVarUndefined(varPtr);
+#if FORWARD_COMPATIBLE
+    if (forwardCompatibleMode) {
+        Var85 *vPtr = (Var85 *)varPtr;
+        vPtr->value.linkPtr = (Var85 *)otherPtr;
+    } else {
+        varPtr->value.linkPtr = otherPtr;
+    }
+#else
     varPtr->value.linkPtr = otherPtr;
+#endif
     VarHashRefCount(otherPtr)++;
+
+   /*
+   {
+        Var85 *p = (Var85 *)varPtr;
+    fprintf(stderr,"defining an alias var='%s' in obj %s fwd %d flags %x isLink %d isTraced %d isUndefined %d\n",
+            ObjStr(newName), ObjStr(obj->cmdName), forwardCompatibleMode,
+            varFlags(varPtr), 
+            TclIsVarLink(varPtr), TclIsVarTraced(varPtr), TclIsVarUndefined(varPtr));
+    }
+   */
   }
   return TCL_OK;
 }
@@ -10587,9 +10893,11 @@
 
 	arglistObj = Tcl_NewListObj(0, NULL);
 	INCR_REF_COUNT(arglistObj);
+
 	for (localPtr = procPtr->firstLocalPtr;  localPtr != NULL;
 	     localPtr = localPtr->nextPtr) {
-	  if (TclIsVarArgument(localPtr)) {
+
+	  if (TclIsCompiledLocalArgument(localPtr)) {
 	    Tcl_Obj *defVal, *defStringObj = Tcl_NewStringObj(localPtr->name, -1);
 	    INCR_REF_COUNT(defStringObj);
 	    /* check for default values */
@@ -10628,7 +10936,7 @@
 	    Tcl_DStringAppendElement(dsPtr, "instproc");
 	    Tcl_DStringAppendElement(dsPtr, name);
 	    Tcl_DStringAppendElement(dsPtr, ObjStr(arglistObj));
-	    Tcl_DStringAppendElement(dsPtr, ObjStr(procPtr->bodyPtr));
+	    Tcl_DStringAppendElement(dsPtr, StripBodyPrefix(ObjStr(procPtr->bodyPtr)));
 	    if (procs) {
 	      XOTclRequireClassOpt(cl);
 	      AssertionAppendPrePost(in, dsPtr, procs);
@@ -10654,7 +10962,7 @@
 	    Tcl_DStringAppendElement(dsPtr, "proc");
 	    Tcl_DStringAppendElement(dsPtr, name);
 	    Tcl_DStringAppendElement(dsPtr, ObjStr(arglistObj));
-	    Tcl_DStringAppendElement(dsPtr, ObjStr(procPtr->bodyPtr));
+	    Tcl_DStringAppendElement(dsPtr, StripBodyPrefix(ObjStr(procPtr->bodyPtr)));
 	    if (procs) {
 	      XOTclRequireObjectOpt(obj);
 	      AssertionAppendPrePost(in, dsPtr, procs);
@@ -10702,16 +11010,15 @@
 static int
 XOTcl_NSCopyVars(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *CONST objv[]) {
   Tcl_Namespace *ns, *newNs;
-  Var *varPtr = 0;
+  Var *varPtr = NULL;
   Tcl_HashSearch hSrch;
   Tcl_HashEntry* hPtr;
   TclVarHashTable *varTable;
   int rc = TCL_OK;
-  char *varName;
   XOTclObject *obj;
   char *destFullName;
   Tcl_Obj *destFullNameObj;
-  Tcl_CallFrame frame;
+  TclCallFrame frame, *framePtr = &frame;
   Tcl_Obj *varNameObj = NULL;
   Tcl_Obj *nobjv[4];
   int nobjc;
@@ -10732,7 +11039,7 @@
     destFullNameObj = Tcl_NewStringObj(destFullName, -1);
     INCR_REF_COUNT(destFullNameObj);
     varTable = Tcl_Namespace_varTable(ns);
-    Tcl_PushCallFrame(in,&frame,newNs,0);
+    Tcl_PushCallFrame(in,(Tcl_CallFrame *)framePtr,newNs,0);
   } else {
     XOTclObject *newObj;
     if (XOTclObjConvertObject(in, objv[1], &obj) != TCL_OK) {
@@ -10757,16 +11064,10 @@
   /* copy all vars in the namespace */
   hPtr = varTable ? Tcl_FirstHashEntry(VarHashTable(varTable), &hSrch) : 0;
   while (hPtr != NULL) {
-#if defined(PRE85)
-    varPtr = (Var *) Tcl_GetHashValue(hPtr);
-    varName = Tcl_GetHashKey(VarHashTable(varTable), hPtr);
-    varNameObj = Tcl_NewStringObj(varName, -1);
+
+    getVarAndNameFromHash(hPtr, &varPtr, &varNameObj);
     INCR_REF_COUNT(varNameObj);
-#else
-    varPtr     = VarHashGetValue(hPtr);
-    varNameObj = VarHashGetKey(varPtr);
-    varName = ObjStr(varNameObj);
-#endif
+
     if (!TclIsVarUndefined(varPtr) && !TclIsVarLink(varPtr)) {
       if (TclIsVarScalar(varPtr)) {
 	/* it may seem odd that we do not copy obj vars with the
@@ -10775,57 +11076,51 @@
 
 	if (obj) {
 	    nobjv[2] = varNameObj;
-	    nobjv[3] = varPtr->value.objPtr;
+            nobjv[3] = valueOfVar(Tcl_Obj,varPtr,objPtr);
 	    rc = Tcl_EvalObjv(in, nobjc, nobjv, 0);
 	} else {
-	    Tcl_ObjSetVar2(in, varNameObj, NULL, varPtr->value.objPtr, TCL_NAMESPACE_ONLY);
+	    Tcl_ObjSetVar2(in, varNameObj, NULL, 
+                           valueOfVar(Tcl_Obj,varPtr,objPtr),
+                           TCL_NAMESPACE_ONLY);
 	}
       } else {
 	if (TclIsVarArray(varPtr)) {
-	  //// HERE!! PRE85 Why not [array get/set] based? Let the core iterate
-	  TclVarHashTable *aTable = varPtr->value.tablePtr;
+	  /* HERE!! PRE85 Why not [array get/set] based? Let the core iterate*/
+	  TclVarHashTable *aTable = valueOfVar(TclVarHashTable,varPtr,tablePtr);
 	  Tcl_HashSearch ahSrch;
 	  Tcl_HashEntry* ahPtr = aTable ? Tcl_FirstHashEntry(VarHashTable(aTable), &ahSrch) :0;
-	  Tcl_Obj *eltNameObj = NULL;
 	  for (; ahPtr != 0; ahPtr = Tcl_NextHashEntry(&ahSrch)) {
-	    char *eltName;
+	    Tcl_Obj *eltNameObj;
 	    Var *eltVar;
-#if defined(PRE85)
-	    eltName = Tcl_GetHashKey(VarHashTable(aTable), ahPtr);
-	    eltVar = (Var *) Tcl_GetHashValue(ahPtr);
-#else
-	    eltVar     = VarHashGetValue(ahPtr);
-	    eltNameObj = VarHashGetKey(eltVar);
-	    eltName = ObjStr(eltNameObj);
-#endif
+
+	    getVarAndNameFromHash(ahPtr, &eltVar, &eltNameObj);
+
+	    INCR_REF_COUNT(eltNameObj);
+
 	    if (TclIsVarScalar(eltVar)) {
 	      if (obj) {
 		Tcl_Obj *fullVarNameObj = Tcl_DuplicateObj(varNameObj);
 		
 		INCR_REF_COUNT(fullVarNameObj);
-		Tcl_AppendStringsToObj(fullVarNameObj, "(", eltName, ")", NULL);
+		Tcl_AppendStringsToObj(fullVarNameObj, "(", 
+				       ObjStr(eltNameObj), ")", NULL);
 		nobjv[2] = fullVarNameObj;
-		nobjv[3] = eltVar->value.objPtr;
+		nobjv[3] = valueOfVar(Tcl_Obj,eltVar,objPtr);
+
 		rc = Tcl_EvalObjv(in, nobjc, nobjv, 0);
 		DECR_REF_COUNT(fullVarNameObj);
 	      } else {
-#if defined(PRE85)
-		eltNameObj = Tcl_NewStringObj(eltName, -1);
-		INCR_REF_COUNT(eltNameObj);
-#endif
-		Tcl_ObjSetVar2(in, varNameObj, eltNameObj, varPtr->value.objPtr, TCL_NAMESPACE_ONLY);
-#if defined(PRE85)
-		DECR_REF_COUNT(eltNameObj);
-#endif
+		Tcl_ObjSetVar2(in, varNameObj, eltNameObj, 
+			       valueOfVar(Tcl_Obj,eltVar,objPtr),
+                               TCL_NAMESPACE_ONLY);
 	      }
 	    }
+	    DECR_REF_COUNT(eltNameObj);
 	  }
 	}
       }
     }
-#if defined(PRE85)
     DECR_REF_COUNT(varNameObj);
-#endif
     hPtr = Tcl_NextHashEntry(&hSrch);
   }
   if (ns) {
@@ -11271,11 +11566,11 @@
 
   entryPtr = Tcl_FirstHashEntry(varTable, &search);
   while (entryPtr != NULL) {
-    varPtr = (Var *) Tcl_GetHashValue(entryPtr);
-    if (!TclIsVarUndefined(varPtr) || (varPtr->flags & VAR_NAMESPACE_VAR)) {
-      varName = Tcl_GetHashKey(varTable, entryPtr);
-      /* fprintf(stderr, "unsetting var %s\n", varName);*/
-      Tcl_UnsetVar2(in, varName, (char *) NULL, TCL_GLOBAL_ONLY);
+    Tcl_Obj *nameObj;
+    getVarAndNameFromHash(entryPtr, &varPtr, &nameObj);
+    if (!TclIsVarUndefined(varPtr) || TclIsVarNamespaceVar(varPtr)) {
+      /* fprintf(stderr, "unsetting var %s\n", ObjStr(nameObj));*/
+      Tcl_UnsetVar2(in, ObjStr(nameObj), (char *) NULL, TCL_GLOBAL_ONLY);
     }
     entryPtr = Tcl_NextHashEntry(&search);
   }
@@ -11636,6 +11931,46 @@
   fprintf(stderr, "SIZES: obj=%d, tcl_obj=%d, DString=%d, class=%d, namespace=%d, command=%d, HashTable=%d\n", sizeof(XOTclObject), sizeof(Tcl_Obj), sizeof(Tcl_DString), sizeof(XOTclClass), sizeof(Namespace), sizeof(Command), sizeof(Tcl_HashTable));
   */
 
+#if FORWARD_COMPATIBLE
+  {
+      int major, minor, patchlvl, type;
+      Tcl_GetVersion(&major, &minor, &patchlvl, &type);
+      
+      if ((major == 8) && (minor < 5)) {
+          /* 
+           * loading a version of xotcl compiled for 8.4 version 
+           * into a 8.4 Tcl 
+           */
+	/*
+          fprintf(stderr, "loading a version of xotcl compiled for 8.4 version into a 8.4 Tcl\n");
+	*/
+          forwardCompatibleMode = 0;
+          lookupVarFromTable  = LookupVarFromTable84;
+          tclVarHashCreateVar = VarHashCreateVar84;
+          tclInitVarHashTable = InitVarHashTable84;
+          tclCleanupVar       = TclCleanupVar84;
+          varRefCountOffset   = TclOffset(Var, refCount);
+          varHashTableSize    = sizeof(Tcl_HashTable);
+      } else {
+          /* 
+           * loading a version of xotcl compiled for 8.4 version 
+           * into a 8.5 Tcl 
+           */
+	/*
+          fprintf(stderr, "loading a version of xotcl compiled for 8.4 version into a 8.5 Tcl\n");
+	*/
+          forwardCompatibleMode = 1;
+          lookupVarFromTable  = LookupVarFromTable85;
+          tclVarHashCreateVar = VarHashCreateVar85;
+          tclInitVarHashTable = (Tcl_InitVarHashTableFunction*)*((&tclIntStubsPtr->reserved0)+235);
+          tclCleanupVar       = (Tcl_CleanupVarFunction*)*((&tclIntStubsPtr->reserved0)+176);
+          varRefCountOffset   = TclOffset(VarInHash, refCount);
+          varHashTableSize    = sizeof(TclVarHashTable85);
+      }
+
+  }
+#endif
+
   /*
    * Runtime State stored in the client data of the Interp's global
    * Namespace in order to avoid global state information
Index: xotcl/generic/xotcl.h
===================================================================
diff -u -N -r1aa7246cc8e44078c9dbd33e03992478615f314f -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/xotcl.h	(.../xotcl.h)	(revision 1aa7246cc8e44078c9dbd33e03992478615f314f)
+++ xotcl/generic/xotcl.h	(.../xotcl.h)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,6 +1,6 @@
 /* -*- Mode: c++ -*-
  *
- *  $Id: xotcl.h,v 1.11 2006/09/27 08:12:40 neumann Exp $
+ *  $Id: xotcl.h,v 1.12 2007/09/05 19:09:23 neumann Exp $
  *  
  *  Extended Object Tcl (XOTcl)
  *
@@ -54,6 +54,7 @@
 */
 #define NDEBUG 1
 
+
 /* activate/deacticate memory tracing 
 #define XOTCL_MEM_TRACE 1
 #define XOTCL_MEM_COUNT 1
@@ -129,6 +130,14 @@
 # define PRE85
 #endif
 
+#if !defined(FORWARD_COMPATIBLE)
+# if defined(PRE85)
+#  define FORWARD_COMPATIBLE 1
+# else
+#  define FORWARD_COMPATIBLE 0
+# endif
+#endif
+
 #define XOTCL_NONLEAF_METHOD (ClientData)0x01
 
 /* 
Index: xotcl/generic/xotclInt.h
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/xotclInt.h	(.../xotclInt.h)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/generic/xotclInt.h	(.../xotclInt.h)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,5 +1,5 @@
 /* -*- Mode: c++ -*-
- *  $Id: xotclInt.h,v 1.23 2007/08/14 16:38:26 neumann Exp $
+ *  $Id: xotclInt.h,v 1.24 2007/09/05 19:09:23 neumann Exp $
  *  Extended Object Tcl (XOTcl)
  *
  *  Copyright (C) 1999-2006 Gustaf Neumann, Uwe Zdun
@@ -297,27 +297,25 @@
    Note that it is possible that between push and pop
    a obj->nsPtr can be created (e.g. during a read trace)
 */
-#define XOTcl_FrameDecls Tcl_CallFrame frame; int frame_constructed = 1
+#define XOTcl_FrameDecls TclCallFrame frame, *framePtr = &frame; int frame_constructed = 1
 #define XOTcl_PushFrame(interp,obj) \
      if ((obj)->nsPtr) {				     \
        frame_constructed = 0; \
-       Tcl_PushCallFrame(interp, &frame, (obj)->nsPtr, 0);   \
+       Tcl_PushCallFrame(interp, (Tcl_CallFrame*)framePtr, (obj)->nsPtr, 0); \
      } else { \
-       Tcl_CallFrame *framePtr = &frame;		\
        CallFrame *myframe = (CallFrame *)framePtr;		\
-       Tcl_PushCallFrame(interp, &frame, RUNTIME_STATE(interp)->fakeNS, 1);	\
+       Tcl_PushCallFrame(interp, (Tcl_CallFrame*)framePtr, RUNTIME_STATE(interp)->fakeNS, 1);	\
        Tcl_CallFrame_procPtr(myframe) = &RUNTIME_STATE(interp)->fakeProc;	\
        Tcl_CallFrame_varTablePtr(myframe) = (obj)->varTable;	\
      }
 #define XOTcl_PopFrame(interp,obj) \
      if (!(obj)->nsPtr) {	       \
-       Tcl_CallFrame *framePtr = &frame;		\
        CallFrame *myframe = (CallFrame *)framePtr;		\
        if ((obj)->varTable == 0)			    \
          (obj)->varTable = Tcl_CallFrame_varTablePtr(myframe);	\
      } \
      if (frame_constructed) { \
-       register Interp *iPtr = (Interp *) interp; \
+       Interp *iPtr = (Interp *) interp;  \
        register CallFrame *myframe = iPtr->framePtr; \
        Tcl_CallFrame_varTablePtr(myframe) = 0; \
        Tcl_CallFrame_procPtr(myframe) = 0; \
@@ -543,7 +541,7 @@
     XOTE___UNKNOWN, XOTE_ARGS, XOTE_SPLIT, XOTE_COMMA,
     /** these are the redefined tcl commands; leave them
 	together at the end */
-    XOTE_EXPR, XOTE_INCR, XOTE_INFO, XOTE_RENAME, XOTE_SUBST
+    XOTE_EXPR, XOTE_INFO, XOTE_RENAME, XOTE_SUBST
 } XOTclGlobalNames;
 #if !defined(XOTCL_C)
 extern char *XOTclGlobalStrings[];
@@ -561,7 +559,7 @@
   "mkGetterSetter", "format",
   "__#", "-guard", "defaultmethod",
   "__unknown", "args", "split", ",",
-  "expr", "incr", "info", "rename", "subst",
+  "expr", "info", "rename", "subst",
 };
 #endif
 
Index: xotcl/generic/xotclShadow.c
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/generic/xotclShadow.c	(.../xotclShadow.c)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/generic/xotclShadow.c	(.../xotclShadow.c)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,5 +1,5 @@
 /* -*- Mode: c++ -*-
- * $Id: xotclShadow.c,v 1.9 2007/08/14 16:38:26 neumann Exp $
+ * $Id: xotclShadow.c,v 1.10 2007/09/05 19:09:23 neumann Exp $
  *  
  *  Extended Object Tcl (XOTcl)
  *
@@ -111,7 +111,6 @@
 static int
 XOTcl_InfoObjCmd(ClientData cd, Tcl_Interp *in, int objc, Tcl_Obj *CONST objv[]) {
   int result, isBody = 0;
-
   if (objc > 1) {
     char *opt = ObjStr(objv[1]);
     if (isBodyString(opt) && objc > 2)
@@ -122,7 +121,7 @@
   if (isBody && result == TCL_OK) {
     char *body = ObjStr(Tcl_GetObjResult(in));
     if (strncmp(body, "::xotcl::initProcNS\n",20) == 0)
-      body+=20;
+      body += 20;
     Tcl_SetObjResult(in, Tcl_NewStringObj(body, -1));
   }
   return result;
@@ -145,11 +144,10 @@
     /*fprintf(stderr, "+++ load tcl commands %d %d\n", load, initialized);*/
 
 #ifdef USE_TCL_STUBS
-    /* no commands are overloeaded, these are only used for calling 
+    /* no commands are overloaded, these are only used for calling 
        e.g. Tcl_ExprObjCmd(), Tcl_IncrObjCmd() and Tcl_SubstObjCmd(), 
-       which are not avalailable in though the stub table */
+       which are not avalailable in through the stub table */
     rc|= XOTclReplaceCommand(in, XOTE_EXPR,     0, initialized);
-    rc|= XOTclReplaceCommand(in, XOTE_INCR,     0, initialized);
     rc|= XOTclReplaceCommand(in, XOTE_SUBST,    0, initialized);
 #endif
     /* for the following commands, we have to add our own semantics */
Index: xotcl/library/lib/changeXOTclVersion.xotcl
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/lib/changeXOTclVersion.xotcl	(.../changeXOTclVersion.xotcl)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/lib/changeXOTclVersion.xotcl	(.../changeXOTclVersion.xotcl)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -6,7 +6,7 @@
 #
 set XOTCL_MAJOR_VERSION 1
 set XOTCL_MINOR_VERSION 5
-set XOTCL_RELEASE_LEVEL .4
+set XOTCL_RELEASE_LEVEL .5
 
 # example settings: 
 # 1.0
Index: xotcl/library/store/XOTclGdbm/configure
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/store/XOTclGdbm/configure	(.../configure)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/store/XOTclGdbm/configure	(.../configure)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -10780,3 +10780,5 @@
 
 
 
+
+
Index: xotcl/library/store/XOTclGdbm/configure.in
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/store/XOTclGdbm/configure.in	(.../configure.in)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.17 2007/08/14 16:38:26 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -279,3 +279,5 @@
 
 
 
+
+
Index: xotcl/library/store/XOTclSdbm/configure
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/store/XOTclSdbm/configure	(.../configure)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/store/XOTclSdbm/configure	(.../configure)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -10726,3 +10726,5 @@
 
 
 
+
+
Index: xotcl/library/store/XOTclSdbm/configure.in
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/store/XOTclSdbm/configure.in	(.../configure.in)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.17 2007/08/14 16:38:27 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -238,3 +238,5 @@
 
 
 
+
+
Index: xotcl/library/xml/TclExpat-1.1/configure
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/xml/TclExpat-1.1/configure	(.../configure)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/xml/TclExpat-1.1/configure	(.../configure)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -10764,3 +10764,5 @@
 
 
 
+
+
Index: xotcl/library/xml/TclExpat-1.1/configure.in
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/library/xml/TclExpat-1.1/configure.in	(.../configure.in)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -3,7 +3,7 @@
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.17 2007/08/14 16:38:27 neumann Exp $
+# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $
 
 #-----------------------------------------------------------------------
 # Sample configure.in for Tcl Extensions.  The only places you should
@@ -243,3 +243,5 @@
 
 
 
+
+
Index: xotcl/unix/pkgIndex.unix
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/unix/pkgIndex.unix	(.../pkgIndex.unix)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/unix/pkgIndex.unix	(.../pkgIndex.unix)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,4 +1,4 @@
-  package ifneeded XOTcl 1.5.4 [list load \
-    [file join $dir libxotcl1.5.4.dylib] XOTcl]
+  package ifneeded XOTcl 1.5.5 [list load \
+    [file join $dir libxotcl1.5.5.dylib] XOTcl]
 
 
Index: xotcl/unix/xotcl.spec
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/unix/xotcl.spec	(.../xotcl.spec)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/unix/xotcl.spec	(.../xotcl.spec)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -1,10 +1,10 @@
 Summary: Object Oriented Extension for Tcl
 Name: xotcl
-Version: 1.5.4
+Version: 1.5.5
 Release: 0
 License: bsd style open source
 Group: Development/Languages
-Source:  http://www.xotcl.org/xotcl-1.5.4.tar.gz
+Source:  http://www.xotcl.org/xotcl-1.5.5.tar.gz
 URL: http://www.xotcl.org
 Packager: Gustaf.Neumann@wu-wien.ac.at
 Distribution: Fedorea Core 3
@@ -23,7 +23,7 @@
 consult http://www.xotcl.org
 
 %prep
-%setup -q -n xotcl-1.5.4
+%setup -q -n xotcl-1.5.5
 
 
 %build
@@ -35,16 +35,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/usr/lib/libxotcl1.5.4.so
-ln -s xotcl1.5.4/libxotcl1.5.4.so $RPM_BUILD_ROOT/usr/lib
+rm -f $RPM_BUILD_ROOT/usr/lib/libxotcl1.5.5.so
+ln -s xotcl1.5.5/libxotcl1.5.5.so $RPM_BUILD_ROOT/usr/lib
 
 %files
 %defattr(-, root, root)
 %doc doc
 %_bindir/xotclsh
 %_bindir/xowish
-%_prefix/lib/xotcl1.5.4
-%_prefix/lib/libxotcl1.5.4.so
+%_prefix/lib/xotcl1.5.5
+%_prefix/lib/libxotcl1.5.5.so
 %_prefix/lib/xotclexpat*
 %_prefix/lib/xotclgdbm*
 %_prefix/lib/xotclsdbm*
Index: xotcl/xotclConfig.sh
===================================================================
diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -r57972e5a2972b1eb5dd63f6e3d483670117feebf
--- xotcl/xotclConfig.sh	(.../xotclConfig.sh)	(revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209)
+++ xotcl/xotclConfig.sh	(.../xotclConfig.sh)	(revision 57972e5a2972b1eb5dd63f6e3d483670117feebf)
@@ -15,7 +15,7 @@
 XOTCL_VERSION='1.5'
 XOTCL_MAJOR_VERSION='1'
 XOTCL_MINOR_VERSION='5'
-XOTCL_RELEASE_LEVEL='.4'
+XOTCL_RELEASE_LEVEL='.5'
 
 # String to pass to compiles to pick up includes during build
 # (i.e., assuming nothing has been installed)
@@ -24,34 +24,34 @@
 
 # String to pass to compiles to pick up the XOTcl includes from their
 # installed directory.
-XOTCL_INCLUDE_DIR="/usr/local/aolserver-4.5/include/xotcl1.5.4"
+XOTCL_INCLUDE_DIR="/usr/local/aolserver-4.5/include/xotcl1.5.5"
 XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR"
 
 # The name of the XOTcl library (may be either a .a file or a shared library):
-XOTCL_LIB_FILE=libxotcl1.5.4.dylib
+XOTCL_LIB_FILE=libxotcl1.5.5.dylib
 
 # String to pass to linker to pick up the XOTcl library from its
 # build directory.
-XOTCL_BUILD_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.4 -lxotcl1.5.4'
+XOTCL_BUILD_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.5 -lxotcl1.5.5'
 
 # String to pass to linker to pick up the XOTcl library from its
 # installed directory.
-XOTCL_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.4 -lxotcl1.5.4'
+XOTCL_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.5 -lxotcl1.5.5'
 
 # The name of the XOTcl stub library (a .a file):
-# XOTCL_STUB_LIB_FILE=libxotclstub1.5.4.a
+# XOTCL_STUB_LIB_FILE=libxotclstub1.5.5.a
 
 # String to pass to linker to pick up the XOTcl stub library from its
 # build directory.
-XOTCL_BUILD_STUB_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.4 -lxotclstub1.5.4'
+XOTCL_BUILD_STUB_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.5 -lxotclstub1.5.5'
 
 # String to pass to linker to pick up the XOTcl stub library from its
 # installed directory.
-XOTCL_STUB_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.4 -lxotclstub1.5.4'
+XOTCL_STUB_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.5 -lxotclstub1.5.5'
 
 # Name of the xotcl stub library with full path in build and install directory
-XOTCL_BUILD_STUB_LIB_PATH='/Users/neumann/src/xotcl-1.5.4/libxotclstub1.5.4.a'
-XOTCL_STUB_LIB_PATH='/usr/local/aolserver-4.5/lib/xotcl1.5.4/libxotclstub1.5.4.a'
+XOTCL_BUILD_STUB_LIB_PATH='/Users/neumann/src/xotcl-1.5.5/libxotclstub1.5.5.a'
+XOTCL_STUB_LIB_PATH='/usr/local/aolserver-4.5/lib/xotcl1.5.5/libxotclstub1.5.5.a'
 
 # Location of the top-level source directories from which XOTcl
 # was built.  This is the directory that contains generic, unix, etc.
@@ -61,8 +61,8 @@
 XOTCL_SRC_DIR='.'
 
 # shared and unshared library suffix
-XOTCL_SHARED_LIB_SUFFIX=1.5.4.dylib
-XOTCL_UNSHARED_LIB_SUFFIX=1.5.4.a
+XOTCL_SHARED_LIB_SUFFIX=1.5.5.dylib
+XOTCL_UNSHARED_LIB_SUFFIX=1.5.5.a
 
 # the shell in whose installation dirs the xotcl package is installed
 XOTCL_COMPATIBLE_TCLSH=/usr/local/aolserver-4.5/bin/tclsh8.4