Index: TODO
===================================================================
diff -u -rf69e0909fcb180e1cbcdd316f0a20de1b254af3d -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- TODO	(.../TODO)	(revision f69e0909fcb180e1cbcdd316f0a20de1b254af3d)
+++ TODO	(.../TODO)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -1771,13 +1771,17 @@
 
 - added handling of unstacked csc entries (removed all DEBUG warnings).
 
+- made handling of unstacked entries optional by defining
+  macro CHECK_ACTIVATION_COUNTS)
+- added macro NSF_DEVELOPMENT for toplevel handling
+  if NDEBUG and CHECK_ACTIVATION_COUNTS
+- cleanup of method-modifiers.tcl
+- updated next migration guide
+
 TODO: 
 
-- handling of unstacked entries should be made optional
-- NsfClassListAdd() and friends should be made generic
-- check, whether all CscListRemove() are needed for handling unstacked csc entries
-- finsh up CscListAdd() and CscListRemove()
-- cleanup method-modifiers.tcl
+- provide parametersyntax definitions for XOTcl 2.0 similar
+  to nx
 
 - "-returns" 
   * leave syntax as is for method?
@@ -1977,3 +1981,6 @@
 
   * serializer: handing of xo::at_cleanup in serializer 
      (either generailization or move to OpenACS/aolserver init/naviserver init)
+
+  * NsfClassListAdd() and friends could be made generic
+
Index: doc/next-migration.html
===================================================================
diff -u -r137f717b92ca826ee943e8c4e74d3151859c378a -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- doc/next-migration.html	(.../next-migration.html)	(revision 137f717b92ca826ee943e8c4e74d3151859c378a)
+++ doc/next-migration.html	(.../next-migration.html)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -69,8 +69,6 @@
 respects:
 
 <ul>
-  <li> The Next Scripting Language has a much smaller
-  interface (less predefined methods) than XOTcl.<p>
   
   <li> The Next Scripting Language favors a stronger form of
   encapsulation than XOTcl. Calling the own methods or accessing the
@@ -95,13 +93,36 @@
   variables and invoke methods upon object creation).<p>
 
   <li> The Next Scripting Language provides much more orthogonal means
-  to define and name scripted and c-implemented methods.<p>
+  to define and reuse scripted and C-implemented methods.<p>
 
   <li> The Next Scripting Language provides an orthogonal framework for
   parametrization of methods and objects.<p>
 
+    <li> The Next Scripting Language has a much smaller
+  interface (less predefined methods) than XOTcl:
+  <p>
+  nx:
+  <ul><li># obj_methods: 20
+    <li># class_methods: 7
+    <li># obj_info_methods: 14
+    <li># class_info_methods: 6
+  </ul>
+  <p>
+  XOTcl 2.0:
+  <ul>
+    <li># obj_methods: 52
+    <li># class_methods: 24
+    <li># obj_info_methods: 25
+    <li># class_info_methods: 24
+  </ul>
+  <p>
+  </li>
+
 </ul>  
 
+<p>Below is a small, introductory example showing an implementation of
+a stack in nx and XOTcl.
+
 <pre CLASS="code">
 <strong>Class create</strong> Stack {
 
@@ -386,15 +407,15 @@
       &nbsp;&nbsp;:attribute <i>{y 1}</i><br>
       &nbsp;&nbsp;:class-object attribute <i>oa1</i><br>
       }<br><br>
-      <code>Object create <i>o</i> {<br>
+      Object create <i>o</i> {<br>
       &nbsp;&nbsp;:attribute <i>oa2</i><br>
-      }<br>
+      }<br></code>
       <hr>
-      Class create <i>C</i> \<br>&nbsp;&nbsp; -attributes {<i><br>
+      <code>Class create <i>C</i> \<br>&nbsp;&nbsp; -attributes {<i><br>
       &nbsp;&nbsp;&nbsp;&nbsp;x<br>
       &nbsp;&nbsp;&nbsp;&nbsp;{y 1}<br>
       </i>}<br>
-     </code></td>
+      </code></td>
   </tr>
 </table>
 
@@ -423,8 +444,8 @@
       &nbsp;&nbsp;:public <i>method-definiton-method ...</i><br>
       &nbsp;&nbsp;:protected <i>method-definiton-method ...</i><br>
       &nbsp;&nbsp;:class-object <i>method-definiton-method ...</i><br>
-      &nbsp;&nbsp;:protected object <i>method-definiton-method ...</i><br>
-      &nbsp;&nbsp;:public object <i>method-definiton-method ...</i><br>
+      &nbsp;&nbsp;:protected class-object <i>method-definiton-method ...</i><br>
+      &nbsp;&nbsp;:public class-object <i>method-definiton-method ...</i><br>
       }<br>
      </code></td>
   </tr>
@@ -657,26 +678,25 @@
     <td><code>Class <i>Foo </i> -parameter <i>{a {b 1}}</i><br><br>
       <i class='comment'># Create instance of the class Foo</i><br>
       <i>Foo f1 -a 0</i><br><br>
-      <i class='comment'># Object f1 has a == 0 and b == 1</i><br>
+      <i class='comment'># Object f1 has a == 0 and b == 1</i><br></code>
       <hr>
-      Class <i>Foo </i> -slots <i>{</i><br>
+      <code>Class <i>Foo </i> -slots <i>{</i><br>
       &nbsp;&nbsp;&nbsp;Attribute <i>a</i><br>
       &nbsp;&nbsp;&nbsp;Attribute <i>b</i> -default 1<br>
       }<br>
       <br>
       <i class='comment'># Create instance of the class Foo</i><br>
       <i>Foo f1 -a 0</i><br><br>
       <i class='comment'># Object f1 has a == 0 and b == 1</i><br>
-      
       </code>
    </td>
    <td><code>
      Class create <i>Foo </i> -attributes <i>{a {b 1}}</i><br><br>
       <i class='comment'># Create instance of the class Foo</i><br>
       <i>Foo</i> create <i> f1 -a 0</i><br><br>
-      <i class='comment'># Object f1 has a == 0 and b == 1</i><br>
+      <i class='comment'># Object f1 has a == 0 and b == 1</i><br></code>
      <hr>
-     Class create <i>Foo</i> {<br>
+     <code>Class create <i>Foo</i> {<br>
       &nbsp;&nbsp;&nbsp;:attribute <i>a</i><br>
       &nbsp;&nbsp;&nbsp;:attribute <i>{b 1}</i><br>
       }</br><br>
@@ -732,9 +752,9 @@
    Class create <i>Foo </i> -attributes {<br>
      &nbsp;&nbsp; <i>a</i>:boolean<br>
      &nbsp;&nbsp; {<i>b</i>:integer<i> 1</i>}<br>
-     }</i><br>
+     }</i><br></code>
      <hr>
-     Class create <i>Foo</i> {<br>
+     <code>Class create <i>Foo</i> {<br>
       &nbsp;&nbsp; :attribute <i>a</i>:boolean<br>
       &nbsp;&nbsp; :attribute {<i>b</i>:integer<i> 1</i>}<br>
       }</br>
@@ -750,9 +770,9 @@
    Class create <i>Foo </i> -attributes {<br>
      &nbsp;&nbsp; <i>a</i>:boolean,required<br>
      &nbsp;&nbsp; {<i>b</i>:integer<i> 1</i>}<br>
-     }</i><br>
+     }</i><br></code>
     <hr>
-     Class create <i>Foo</i> {<br>
+     <code>Class create <i>Foo</i> {<br>
       &nbsp;&nbsp; :attribute <i>a</i>:boolean,required</i><br>
       &nbsp;&nbsp; :attribute {<i>b</i>:integer 1}</i><br>
       }</br>
@@ -769,9 +789,9 @@
      &nbsp;&nbsp; ...<br>
      &nbsp;&nbsp; <i>ints</i>:integer,multivalued<br>
      &nbsp;&nbsp; {<i>objs</i>:object,multivalued ""}<br>
-     }</i><br>
+     }</i><br></code>
     <hr>
-     Class create <i>Foo</i> {<br>
+     <code>Class create <i>Foo</i> {<br>
       &nbsp;&nbsp; ...<br>
       &nbsp;&nbsp; :attribute <i>ints</i>:integer,multivalued</i><br>
       &nbsp;&nbsp; :attribute {<i>objs</i>:object,multivalued ""}</i><br>
@@ -1401,7 +1421,7 @@
 <h2>Method Protection</h2>
 
 
-<h2>Incompatibilities between XOTcl 2.0 and XOTcl 1.*</h2>
+<h2>Incompatibilities between XOTcl 1.* and XOTcl 2.0</h2>
 
 <h3>Resolvers</h3>
 
@@ -1410,20 +1430,22 @@
 starting with single colons are used in XOTcl 1.* scripts, conflicts
 will arise.  </p>
 
-<h3>Calling objects like methods</h3>
+<h3>Calling objects via method interface</h3>
 
-<p>Since the next framework uses a different handling of objects
-registered as methods (so called ensemble objects), sub-objects can't
-be called in the same way as before. In XOTcl 1.*, it was possible to
-call e.g. a method <code>foo</code> of the slot object
-<code>Foo::slot::ints</code> via
-<ul><li><code>Foo::slot::ints foo ...</code> or via
+<p>Since the next framework supports the so-called ensemble objects,
+which eas the definition of submethods substantially, objects
+registered as methods have different semantics.  In XOTcl 1.*, it was
+possible to call e.g. a method <code>foo</code> of the slot object 
+<code>Foo::slot::ints</code> via the following two interfaces the same way:
+<ul>
+  <li><code>Foo::slot::ints foo ...</code>
   <li><code>Foo slot ints foo ...</code>
 </ul>
-Now, only the first form
-has the same semantic as before. In the second form (call of objects
-via method) has now the ensemble object semantics, <code>self</code>
-of <code>foo</code> is now the calling object <code>Foo</code>.
+Now, only the first form has the same semantic as before. In the second
+form (invocation of objects via method interface) has now the ensemble object
+semantics. This means that in the second case the <code>current
+obect</code> of method <code>foo</code> is now <code>Foo</code>
+instead of <code>ints</code>.
 
 
 <h3>Slots</h3>
@@ -1457,6 +1479,6 @@
 
 <hr>
 <address></address>
-<!-- hhmts start --> Last modified: Tue Oct  5 20:03:10 CEST 2010 <!-- hhmts end -->
+<!-- hhmts start --> Last modified: Tue Oct 12 11:41:40 CEST 2010 <!-- hhmts end -->
 </body>
 </html>
Index: generic/nsf.c
===================================================================
diff -u -rf69e0909fcb180e1cbcdd316f0a20de1b254af3d -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- generic/nsf.c	(.../nsf.c)	(revision f69e0909fcb180e1cbcdd316f0a20de1b254af3d)
+++ generic/nsf.c	(.../nsf.c)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -218,7 +218,7 @@
 static void GetAllInstances(Tcl_Interp *interp, Tcl_HashTable *destTablePtr, NsfClass *startClass);
 NSF_INLINE static Tcl_Command FindMethod(Tcl_Namespace *nsPtr, CONST char *methodName);
 
-/* prototypes for namespace specific calls*/
+/* prototypes for namespace specific calls */
 static Tcl_Obj *NameInNamespaceObj(Tcl_Interp *interp, CONST char *name, Tcl_Namespace *ns);
 static Tcl_Namespace *CallingNameSpace(Tcl_Interp *interp);
 NSF_INLINE static Tcl_Command NSFindCommand(Tcl_Interp *interp, CONST char *name, Tcl_Namespace *ns);
@@ -262,6 +262,10 @@
 static Tcl_Obj *AliasGet(Tcl_Interp *interp, Tcl_Obj *cmdName, CONST char *methodName, int withPer_object);
 static int AliasDeleteObjectReference(Tcl_Interp *interp, Tcl_Command cmd);
 
+/* prototypes for (class) list handling */
+extern NsfClasses ** NsfClassListAdd(NsfClasses **firstPtrPtr, NsfClass *cl, ClientData clientData);
+extern void NsfClassListFree(NsfClasses *firstPtr);
+
 /* misc prototypes */
 static int NsfDeprecatedCmd(Tcl_Interp *interp, CONST char *what, CONST char *oldCmd, CONST char *newCmd);
 static int SetInstVar(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *nameObj, Tcl_Obj *valueObj);
@@ -754,16 +758,20 @@
   return objPtr;
 }
 
-extern void
-NsfClassListFree(NsfClasses *sl) {
-  NsfClasses *n;
-  for (; sl; sl = n) {
-    n = sl->nextPtr;
-    FREE(NsfClasses, sl);
-  }
-}
-
-/* reverse class list, caller is responsible for freeing data */
+/*
+ *----------------------------------------------------------------------
+ * NsfReverseClasses --
+ *
+ *    Reverse class list. Caller is responsible for freeing data.
+ *
+ * Results:
+ *    Pointer to start of the reversed list
+ *
+ * Side effects:
+ *    Allocates fresh copies of list elements
+ *
+ *----------------------------------------------------------------------
+ */
 static NsfClasses *
 NsfReverseClasses(NsfClasses *sl) {
   NsfClasses *firstPtr = NULL;
@@ -777,9 +785,48 @@
   return firstPtr;
 }
 
+/*
+ *----------------------------------------------------------------------
+ * NsfClassListFree --
+ *
+ *    Frees all elements of the provided
+ *
+ * Results:
+ *    None.
+ *
+ * Side effects:
+ *    Frees memory.
+ *
+ *----------------------------------------------------------------------
+ */
+extern void
+NsfClassListFree(NsfClasses *sl) {
+  NsfClasses *n;
+  for (; sl; sl = n) {
+    n = sl->nextPtr;
+    FREE(NsfClasses, sl);
+  }
+}
+
+/*
+ *----------------------------------------------------------------------
+ * NsfClassListAdd --
+ *
+ *    Add class list entry to the specified list. In case the initial
+ *    list is empty, *firstPtrPtr is updated as well.
+ *
+ * Results:
+ *    Returns address of next pointer.
+ *
+ * Side effects:
+ *    New list element is allocated.
+ *
+ *----------------------------------------------------------------------
+ */
+
 extern NsfClasses **
-NsfClassListAdd(NsfClasses **cList, NsfClass *cl, ClientData clientData) {
-  NsfClasses *l = *cList, *element = NEW(NsfClasses);
+NsfClassListAdd(NsfClasses **firstPtrPtr, NsfClass *cl, ClientData clientData) {
+  NsfClasses *l = *firstPtrPtr, *element = NEW(NsfClasses);
   element->cl = cl;
   element->clientData = clientData;
   element->nextPtr = NULL;
@@ -788,10 +835,54 @@
     while (l->nextPtr) l = l->nextPtr;
     l->nextPtr = element;
   } else
-    *cList = element;
+    *firstPtrPtr = element;
   return &(element->nextPtr);
 }
 
+#if defined(CHECK_ACTIVATION_COUNTS)
+/*
+ *----------------------------------------------------------------------
+ * NsfClassListUnlink --
+ *
+ *    Return removed item with matching key form nsfClasses.
+ *    Key is void to allow not only class pointers as keys.
+ *
+ * Results:
+ *    unlinked element or NULL.
+ *    In case the first element is unlinked, *firstPtrPtr 
+ *    is updated.
+ *
+ * Side effects:
+ *    none.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static NsfClasses *
+NsfClassListUnlink(NsfClasses **firstPtrPtr, void *key) {
+  NsfClasses *entryPtr = NULL, *prevPtr = NULL;
+
+  if (*firstPtrPtr != NULL) {
+    /* list is non-empty */
+    for (entryPtr = *firstPtrPtr; entryPtr; prevPtr = entryPtr, entryPtr = entryPtr->nextPtr) {
+      if ((void *)entryPtr->cl == key) {
+	/* found entry */
+	if (prevPtr) {
+	  /* later item */
+	  prevPtr->nextPtr = entryPtr->nextPtr;
+	} else {
+	  /* first item */
+	  *firstPtrPtr = entryPtr->nextPtr;
+	}
+	break;
+      }
+    }
+  }
+
+  return entryPtr;
+}
+#endif
+
 void
 NsfObjectListFree(NsfObjects *sl) {
   NsfObjects *n;
@@ -3160,8 +3251,9 @@
 static NsfCmdList *
 CmdListRemoveFromList(NsfCmdList **cmdList, NsfCmdList *delCL) {
   register NsfCmdList *c = *cmdList, *del = NULL;
-  if (c == NULL)
+  if (c == NULL) {
     return NULL;
+  }
   if (c == delCL) {
     *cmdList = c->nextPtr;
     del = c;
@@ -6275,7 +6367,7 @@
 	 * NRE-case, we need a CscFinish for all return codes.
 	 */
 #if defined(NRE)
-	CscListRemove(interp, cscPtr);
+	//CscListRemove(interp, cscPtr);
 	CscFinish(interp, cscPtr, "guard failed");
 #endif
 	return result;
@@ -6687,12 +6779,13 @@
   result = MethodDispatchCsc(clientData, interp, objc, objv,
 			     cscPtr, methodName);
 
-  CscListRemove(interp, cscPtr);
 #if defined(NRE)
   if ((cscPtr->flags & NSF_CSC_CALL_IS_NRE) == 0) {
+    CscListRemove(interp, cscPtr);
     CscFinish(interp, cscPtr, "csc cleanup");
   }
 #else
+  CscListRemove(interp, cscPtr);
   CscFinish(interp, cscPtr, "csc cleanup");
 #endif
 
@@ -12264,7 +12357,10 @@
     assert(object);
     assert(object->refCount>0);
     assert(object->cmdName->refCount>0);
+    assert(object->activationCount >= 0);
 
+
+#if defined(CHECK_ACTIVATION_COUNTS)
     if (object->activationCount > 0) {
       Tcl_CallFrame *framePtr;
       int count = 0;
@@ -12302,13 +12398,9 @@
 	/* return NsfVarErrMsg(interp, "wrong activation count for object ",
 	   objectName(object), (char *) NULL);*/
       }
-    } else {
-      if (object->activationCount != 0) {
-	fprintf(stderr, "DEBUG obj %p %s activationcount %d\n",
-		object, objectName(object), object->activationCount);
-      }
-      assert(object->activationCount == 0);
     }
+#endif
+
   }
   /*fprintf(stderr, "all assertions passed\n");*/
   Tcl_DeleteHashTable(tablePtr);
@@ -12893,6 +12985,9 @@
   ObjectSystemsCleanup(interp);
 
 #ifdef DO_CLEANUP
+# if defined(CHECK_ACTIVATION_COUNTS)
+  assert(RUNTIME_STATE(interp)->cscList == NULL);
+# endif
   /*fprintf(stderr, "CLEANUP TOP NS\n");*/
   Tcl_Export(interp, RUNTIME_STATE(interp)->NsfNS, "", 1);
   Tcl_DeleteNamespace(RUNTIME_STATE(interp)->NsfClassesNS);
Index: generic/nsf.h
===================================================================
diff -u -r39b3afac5fee73db5fadf53f7c25f00a650d11e9 -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- generic/nsf.h	(.../nsf.h)	(revision 39b3afac5fee73db5fadf53f7c25f00a650d11e9)
+++ generic/nsf.h	(.../nsf.h)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -74,6 +74,11 @@
 #define NSF_PROFILE
 */
 
+/* are we developing?
+#define NSF_DEVELOPMENT 1
+*/
+#define NSF_DEVELOPMENT 1
+
 /* activate/deacticate assert 
 #define NDEBUG 1
 */
@@ -124,6 +129,19 @@
 # define DO_CLEANUP
 #endif
 
+#ifdef NSF_DEVELOPMENT
+# define CHECK_ACTIVATION_COUNTS 1
+#else
+# define NDEBUG 1
+#endif
+
+
+#if !defined(CHECK_ACTIVATION_COUNTS)
+# define CscListAdd(interp, cscPtr)
+# define CscListRemove(interp, cscPtr)
+#endif
+
+
 /* 
  * A special definition used to allow this header file to be included 
  * in resource files so that they can get obtain version information from
Index: generic/nsfInt.h
===================================================================
diff -u -rf69e0909fcb180e1cbcdd316f0a20de1b254af3d -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- generic/nsfInt.h	(.../nsfInt.h)	(revision f69e0909fcb180e1cbcdd316f0a20de1b254af3d)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -682,7 +682,9 @@
   Tcl_ObjCmdProc *objInterpProc;
   Tcl_Obj **methodObjNames;
   struct NsfShadowTclCommandInfo *tclCommands;
+#if defined(CHECK_ACTIVATION_COUNTS)
   NsfClasses *cscList;
+#endif
   int errorCount;
   /* these flags could move into a bitarray, but are used only once per interp*/
   int unknown;
Index: generic/nsfStack.c
===================================================================
diff -u -rf69e0909fcb180e1cbcdd316f0a20de1b254af3d -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- generic/nsfStack.c	(.../nsfStack.c)	(revision f69e0909fcb180e1cbcdd316f0a20de1b254af3d)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -1,7 +1,54 @@
-static int CscListRemove(Tcl_Interp *interp, NsfCallStackContent *cscPtr);
 
+#ifdef CHECK_ACTIVATION_COUNTS
+static NsfClasses * NsfClassListUnlink(NsfClasses **firstPtrPtr, void *key);
+
 /*
  *----------------------------------------------------------------------
+ * CscListAdd --
+ *
+ *    Add csc entry to the list of unstack entries
+ *
+ * Results:
+ *    none
+ *
+ * Side effects:
+ *    list element added
+ *
+ *----------------------------------------------------------------------
+ */
+static void
+CscListAdd(Tcl_Interp *interp, NsfCallStackContent *cscPtr) {
+  NsfClassListAdd(&RUNTIME_STATE(interp)->cscList, (NsfClass *)cscPtr, NULL);
+}
+
+/*
+ *----------------------------------------------------------------------
+ * CscListRemove --
+ *
+ *    Remove csc entry from the list of unstack entries
+ *
+ * Results:
+ *    true on success or 0
+ *
+ * Side effects:
+ *    list element potentially removed and freed
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+CscListRemove(Tcl_Interp *interp, NsfCallStackContent *cscPtr) {
+  NsfClasses *entryPtr;
+
+  entryPtr = NsfClassListUnlink(&RUNTIME_STATE(interp)->cscList, cscPtr);
+  if (entryPtr) {
+    FREE(NsfClasses, entryPtr);
+  }
+  return (entryPtr != NULL);
+}
+#endif
+
+/*
+ *----------------------------------------------------------------------
  * NsfShowStack --
  *
  *    Print the contents of the callstack to stderr. This function is
@@ -678,7 +725,6 @@
  */
 
 static void CallStackPopAll(Tcl_Interp *interp) {
-  NsfClasses *unstackedEntries = RUNTIME_STATE(interp)->cscList;
 
   NsfShowStack(interp);
 
@@ -705,15 +751,26 @@
       Tcl_CallFrame_varTablePtr(framePtr) = NULL;
     }
 
-    for (; unstackedEntries; unstackedEntries = unstackedEntries->nextPtr) {
+    /* pop the Tcl frame */
+    Tcl_PopCallFrame(interp);
+  }
+
+#if defined(CHECK_ACTIVATION_COUNTS)
+  { int count = 0;
+    NsfClasses *unstackedEntries;
+
+    for (unstackedEntries = RUNTIME_STATE(interp)->cscList; 
+	 unstackedEntries; 
+	 unstackedEntries = unstackedEntries->nextPtr, count ++) {
       NsfCallStackContent *cscPtr = (NsfCallStackContent *)unstackedEntries->cl;
-      CscFinish(interp, cscPtr, "unwind");
       CscListRemove(interp, cscPtr);
+      CscFinish(interp, cscPtr, "unwind");
     }
-
-    /* pop the Tcl frame */
-    Tcl_PopCallFrame(interp);
+    
+    fprintf(stderr, "+++ unwind removed %d unstacked csc entries\n", count);
   }
+#endif
+
 }
 
 /*
@@ -956,41 +1013,3 @@
   /*fprintf(stderr, "CscFinish done\n");*/
 }
 
-
-extern NsfClasses **
-NsfClassListAdd(NsfClasses **cList, NsfClass *cl, ClientData clientData);
-
-static void
-CscListAdd(Tcl_Interp *interp, NsfCallStackContent *cscPtr) {
-  NsfClassListAdd(&RUNTIME_STATE(interp)->cscList, (NsfClass *)cscPtr, NULL);
-  //fprintf(stderr, "added %p, cscList %p\n", cscPtr, RUNTIME_STATE(interp)->cscList);
-}
-
-static int
-CscListRemove(Tcl_Interp *interp, NsfCallStackContent *cscPtr) {
-  NsfClasses *entries = RUNTIME_STATE(interp)->cscList, *nextPtr, *prevPtr;
-  int success = 0;
-
-  //fprintf(stderr, "remove %p, cscList %p\n", cscPtr, RUNTIME_STATE(interp)->cscList);
-  prevPtr = entries;
-  for (; entries; entries = entries->nextPtr) {
-    nextPtr = entries->nextPtr;
-    //fprintf(stderr, "remove checks %p\n", entries->cl);
-    if ((NsfCallStackContent *)entries->cl == cscPtr) {
-      //fprintf(stderr, "+++ found entry %p\n", cscPtr);
-      prevPtr->nextPtr = entries->nextPtr;
-      FREE(NsfClasses, entries);
-      success = 1;
-
-      if (RUNTIME_STATE(interp)->cscList == entries) {
-	//fprintf(stderr, "apparently first entry %p\n", entries);
-	RUNTIME_STATE(interp)->cscList = nextPtr;
-      }
-
-      break;
-    }
-    prevPtr = entries;
-  }
-
-  return success;
-}
Index: tests/method-modifiers.tcl
===================================================================
diff -u -rf69e0909fcb180e1cbcdd316f0a20de1b254af3d -rfbf70aa67bec4deec1078074787aafb8b66b2dde
--- tests/method-modifiers.tcl	(.../method-modifiers.tcl)	(revision f69e0909fcb180e1cbcdd316f0a20de1b254af3d)
+++ tests/method-modifiers.tcl	(.../method-modifiers.tcl)	(revision fbf70aa67bec4deec1078074787aafb8b66b2dde)
@@ -230,34 +230,24 @@
   ? {o bar -y 14 -x 13} "x 13 y 14 {-y 14 -x 13} -- x 13 y 14 {-y 14 -x 13}"
 }
 
-
-
 # 
+# test method attribute with protected/public
+# 
 Test case attribute-method {
 
-  ::nsf::__db_show_stack
-
-puts stderr ======0
   Class create C {
-puts stderr ======A
-    nsf::__db_run_assertions
-puts stderr ======A-done
     set x [:attribute a]
-puts stderr ======B
-    nsf::__db_run_assertions
 
     ? [list set _ $x] "::nsf::classes::C::a"
 
     # attribute with default
     :attribute {b b1}
     :public attribute {c c1}
     :protected attribute {d d1}
+
     set X [:class-object attribute A]
-    puts stderr ======
-    nsf::__db_run_assertions
-puts stderr ======
     ? [list set _ $X] "::C::A"
-#exit
+    
     # class-object attribute with default
     :class-object attribute {B B2}
     :public class-object attribute {C C2}