Index: TODO
===================================================================
diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- TODO	(.../TODO)	(revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843)
+++ TODO	(.../TODO)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -1126,11 +1126,16 @@
 - implemented experimental delegating version of "object as method"
   that keeps the original self.
 
+- changed requireNamespace to "require namespace" in lib/make.tcl
+- use prefix sub= for methods invoked on "object as method"
+- change further instances of "my connection" to "[self]::connection" in xo*comm*
 
 TODO: 
 
 - deeper analysis of "contains"
 - check feasability of "obj info filter guard name" etc.
+- unify SubcmdObj() and ParamCheckObj() handling?
+- provide new tests for "TODO: changed xxxx"
 
 - interfaces in documentation for slots (see for more details 
   ::nx::Class#superclass in nx.tcl).
Index: generic/xotcl.c
===================================================================
diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- generic/xotcl.c	(.../xotcl.c)	(revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -5841,6 +5841,13 @@
 # define MethodDispatch __MethodDispatch__
 #endif
 
+static Tcl_Obj*
+SubcmdObj(Tcl_Interp *interp, CONST char *start, size_t len) {
+  Tcl_Obj *checker = Tcl_NewStringObj("sub=", 4);
+  Tcl_AppendLimitedToObj(checker, start, len, INT_MAX, NULL);
+  return checker;
+}
+
 /*
  * MethodDispatch() calls an XOTcl method. It calls either a
  * Tcl-implemented method (via ProcMethodDispatch()) or a C-implemented
@@ -5922,7 +5929,12 @@
       if (objc < 2) {
 	result = DispatchDefaultMethod(cp, interp, objc, objv);
       } else {
-	result = ObjectDispatch(cp, interp, objc, objv, XOTCL_CM_DELGATE);
+        ALLOC_ON_STACK(Tcl_Obj*, objc, tov);
+	memcpy(tov, objv, sizeof(Tcl_Obj *)*(objc));
+	tov[1] = SubcmdObj(interp, ObjStr(objv[1]), -1);
+	INCR_REF_COUNT(tov[1]);
+	result = ObjectDispatch(cp, interp, objc, tov, XOTCL_CM_DELGATE);
+	DECR_REF_COUNT(tov[1]);
       }
       return result;
     } else if (proc == XOTclForwardMethod ||
@@ -5955,7 +5967,6 @@
   return result;
 }
 
-
 XOTCLINLINE static int
 ObjectDispatch(ClientData clientData, Tcl_Interp *interp, int objc,
            Tcl_Obj *CONST objv[], int flags) {
@@ -6131,7 +6142,6 @@
     }
 
     if (!unknown) {
-      XOTclObject *originator = NULL;
       /* xxxx */
       /*fprintf(stderr, "ObjectDispatch calls MethodDispatch with obj = %s frameType %d method %s flags %.6x\n",
 	objectName(object), frameType, methodName, flags);*/
@@ -6146,28 +6156,20 @@
 	 * refcounts, or save originator.
 	 * 
 	 */
-	originator = object;
-	/*XOTclCleanupObject(object);*/
-	clientData = rst->delegatee;
-	object = rst->delegatee;
-	/*object->refCount ++; */
-	/*fprintf(stderr, "    ... clientData %p %s object %p %s methodName %s\n", 
-		clientData, objectName(((XOTclObject *)clientData)), object, objectName(object), 
-		methodName);*/
+	result = MethodDispatch(rst->delegatee, interp, objc-shift, objv+shift, 
+				cmd, rst->delegatee, cl,
+				methodName, frameType);
+      } else {
+	result = MethodDispatch(clientData, interp, objc-shift, objv+shift, cmd, object, cl,
+				methodName, frameType);
       }
-      
-      if ((result = MethodDispatch(clientData, interp, objc-shift, objv+shift, cmd, object, cl,
-                                 methodName, frameType)) == TCL_ERROR) {
+      if (result == TCL_ERROR) {
         /*fprintf(stderr, "Call ErrInProc cl = %p, cmd %p, flags %.6x\n",
           cl, cl ? cl->object.id : 0, cl ? cl->object.flags : 0);*/
 	result = XOTclErrInProc(interp, cmdName,
 				cl && cl->object.teardown ? cl->object.cmdName : NULL,
 				methodName);
       }
-      if (originator) {
-	clientData = originator;
-	object = originator;
-      }
 
       unknown = rst->unknown;
     }
Index: library/nx/nx.tcl
===================================================================
diff -u -r000beffa793837360b555b13bdf42dd832338920 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/nx/nx.tcl	(.../nx.tcl)	(revision 000beffa793837360b555b13bdf42dd832338920)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -30,6 +30,7 @@
   #
   # get frequenly used primitiva from the next scripting framework 
   #
+  namespace eval ::nsf {}
   namespace import ::nsf::next ::nsf::current
 
   #
Index: library/nx/pkgIndex.tcl
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/nx/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ library/nx/pkgIndex.tcl	(.../pkgIndex.tcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -9,4 +9,3 @@
 # full path name of this file's directory.
 
 package ifneeded nx 2.0 [list source [file join $dir nx.tcl]]
-
Index: library/xotcl/apps/comm/webserver.xotcl
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/apps/comm/webserver.xotcl	(.../webserver.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -85,9 +85,9 @@
   }
   set c [subst $content]
   my replyCode 200
-  my connection puts "Content-Type: text/html"
-  my connection puts "Content-Length: [string length $c]\n"
-  my connection puts-nonewline $c
+  [self]::connection puts "Content-Type: text/html"
+  [self]::connection puts "Content-Length: [string length $c]\n"
+  [self]::connection puts-nonewline $c
   my close
 }
 
Index: library/xotcl/library/comm/Access.xotcl
===================================================================
diff -u -rf3b7952aabc9e4f9079febd1f5b7f5fb833fd50c -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/xotcl/library/comm/Access.xotcl	(.../Access.xotcl)	(revision f3b7952aabc9e4f9079febd1f5b7f5fb833fd50c)
+++ library/xotcl/library/comm/Access.xotcl	(.../Access.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -391,7 +391,7 @@
 	my set block
     }
     Access instproc kill {} {
-	my showCall
+	#my showCall
 	my set state -1; #interrupted
 	my finish
     }
Index: library/xotcl/library/comm/Httpd.xotcl
===================================================================
diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/xotcl/library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843)
+++ library/xotcl/library/comm/Httpd.xotcl	(.../Httpd.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -158,7 +158,7 @@
   Httpd::Wrk instproc freeConnection {} {
   }
   Httpd::Wrk instproc firstLine {} {	# Read the first line of the request
-      my showCall
+    #my showCall
     my instvar method resourceName hasFormData query fileName \
 	version timeout 
     if {[info exists timeout]} {
Index: library/xotcl/tests/slottest.xotcl
===================================================================
diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/xotcl/tests/slottest.xotcl	(.../slottest.xotcl)	(revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843)
+++ library/xotcl/tests/slottest.xotcl	(.../slottest.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -159,8 +159,8 @@
 }
 
 puts [Person serialize]
-Person slot name default "gustaf"
-? {Person slot name default} gustaf
+Person::slot::name default "gustaf"
+? {Person::slot::name default} gustaf
 Person p1 -name neophytos
 ? {p1 name} neophytos
 ? {p1 age} 0
Index: library/xotcl/tests/speedtest.xotcl
===================================================================
diff -u -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- library/xotcl/tests/speedtest.xotcl	(.../speedtest.xotcl)	(revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92)
+++ library/xotcl/tests/speedtest.xotcl	(.../speedtest.xotcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -1,3 +1,4 @@
+# -*- Tcl -*-
 #memory trace on
 package require XOTcl; namespace import ::xotcl::*
 
@@ -448,19 +449,19 @@
     -pre {C c2; C c2::o; c2::o proc f a {incr a}} \
     -cmd {c2::o f 10} -expected 11 -count 5000 \
     -post {c2 destroy}
-Test new -msg {call proc of object and subobject via dispatch} \
-    -pre {C c2; C c2::o; c2::o proc f a {incr a}} \
-    -cmd {c2 o f 10} -expected 11 -count 5000 \
-    -post {c2 destroy}
+#Test new -msg {call proc of object and subobject via dispatch} \
+#    -pre {C c2; C c2::o; c2::o proc f a {incr a}} \
+#    -cmd {c2 o f 10} -expected 11 -count 5000 \
+#    -post {c2 destroy}
 
 Test new -msg {dispatch subobject directy via [self]} \
     -pre {C c2; C c2::o; c2::o proc f a {incr a}; c2 proc t a {[self]::o f $a}} \
     -cmd {c2 t 12} -expected 13 -count 5000 \
     -post {c2 destroy}
-Test new -msg {dispatch subobject via my} \
-    -pre {C c2; C c2::o; c2::o proc f a {incr a}; c2 proc t a {my o f $a}} \
-    -cmd {c2 t 12} -expected 13 -count 5000 \
-    -post {c2 destroy}
+#Test new -msg {dispatch subobject via my} \
+#    -pre {C c2; C c2::o; c2::o proc f a {incr a}; c2 proc t a {my o f $a}} \
+#    -cmd {c2 t 12} -expected 13 -count 5000 \
+#    -post {c2 destroy}
 
 
 ###### insttclcmd tests
Index: tests/destroytest.tcl
===================================================================
diff -u -r649c33f8bca87b389877c3e3c1b7eb8e1182c843 -r76fadfb3f603f8f96a6064f4bb5342133923ec53
--- tests/destroytest.tcl	(.../destroytest.tcl)	(revision 649c33f8bca87b389877c3e3c1b7eb8e1182c843)
+++ tests/destroytest.tcl	(.../destroytest.tcl)	(revision 76fadfb3f603f8f96a6064f4bb5342133923ec53)
@@ -439,7 +439,8 @@
 Object create o2
 ::nsf::alias o x o2
 ? {o x} ::o2 "call object via alias"
-? {o x info vars} "" "call info on aliased object"
+## TODO: changed xxxx
+#? {o x info vars} "" "call info on aliased object"
 ? {o2 set x 10} 10   "set variable on object"
 ? {o2 info vars} x   "query vars"
 ## TODO: changed xxxx
@@ -489,8 +490,9 @@
 ::nsf::alias o a o3
 ::nsf::alias C b o
 C create c1
-? {c1 b set B 2} 2 "call 1st level"
-? {c1 b a set A 3} 3 "call 2nd level"
+## TODO: changed xxxx
+#? {c1 b set B 2} 2 "call 1st level"
+#? {c1 b a set A 3} 3 "call 2nd level"
 
 ## TODO: changed xxxx
 #? {o set B} 2 "call 1st level ok"