Index: generic/nsf.decls
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsf.decls	(.../nsf.decls)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ generic/nsf.decls	(.../nsf.decls)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -30,149 +30,107 @@
 declare 2 generic {
     struct Nsf_Class *NsfIsClass(Tcl_Interp *interp, ClientData cd)
 }
-#declare 3 generic {
-#
-#}
-declare 4 generic {
+declare 3 generic {
     struct Nsf_Object *NsfGetObject(Tcl_Interp *interp, CONST char *name)
 }
-declare 5 generic {
+declare 4 generic {
     struct Nsf_Class *NsfGetClass(Tcl_Interp *interp, CONST char *name)
 }
-declare 6 generic {
+declare 5 generic {
     int NsfCreateObject(Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl)
 }
-#declare 7 generic {
-#
-#}
-#declare 8 generic {
-#    int NsfCreateClass(Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl)
-#}
-declare 9 generic {
+declare 6 generic {
     int NsfDeleteObject(Tcl_Interp *interp, struct Nsf_Object *obj)
 }
-#declare 10 generic {
-#    int NsfDeleteClass(Tcl_Interp *interp, struct Nsf_Class *cl)
-#}
-#declare 11 generic {
-#    int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
-#                         CONST char* nm, Tcl_ObjCmdProc* proc,
-#	                 ClientData cd, Tcl_CmdDeleteProc *dp)
-#}
-#declare 12 generic {
-#    int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
-#                         CONST char* nm, Tcl_ObjCmdProc* proc,
-#	                 ClientData cd, Tcl_CmdDeleteProc *dp)
-#}
-declare 13 generic {
+declare 7 generic {
     int NsfRemoveObjectMethod(Tcl_Interp *interp,struct Nsf_Object *obj, CONST char *nm)
 }
-declare 14 generic {
+declare 8 generic {
     int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm)
 }
-declare 15 generic {
+declare 9 generic {
     Tcl_Obj *NsfOSetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
 	       Tcl_Obj *name, Tcl_Obj *value, int flgs)
 }
-declare 16 generic {
+declare 10 generic {
     Tcl_Obj *NsfOGetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
 	       Tcl_Obj *name, int flgs)
 }
-#declare 17 generic {
-#    int	NsfInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
-#	     char *name, char *destName)
-#}
-#declare 18 generic {
-#
-#}
-declare 19 generic {
+declare 11 generic {
     Tcl_Obj *Nsf_ObjSetVar2(struct Nsf_Object *obj,
                  Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2,
 		 Tcl_Obj *value,int flgs)
 }
-declare 20 generic {
+declare 12 generic {
     Tcl_Obj *Nsf_ObjGetVar2(struct Nsf_Object *obj, 
                  Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2,
 		 int flgs)
 }
-declare 21 generic {
+declare 13 generic {
     int NsfUnsetInstVar2(struct Nsf_Object *obj, Tcl_Interp *interp, 
                            CONST char *name1, CONST char *name2, 
 		           int flgs)
 }
-#declare 22 generic {
-#    int Nsf_TraceObjCmd(ClientData cd, Tcl_Interp *interp,
-#                          int objc, Tcl_Obj *CONST objv[])
-#}
-declare 23 generic {
+declare 14 generic {
     int NsfErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc *type)
 }
-declare 24 generic {
+declare 15 generic {
     int NsfVarErrMsg(Tcl_Interp  *interp, ...)
 }
-declare 25 generic {
+declare 16 generic {
     int NsfErrInProc (Tcl_Interp *interp, Tcl_Obj *objName,
 		Tcl_Obj *clName, CONST char *procName)
 }
-#declare 26 generic {
-#
-#}
-declare 27 generic {
+declare 17 generic {
    int NsfErrBadVal_(Tcl_Interp *interp, char *expected, char *value)
 }
-declare 28 generic {
+declare 18 generic {
     int NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName)
 }
-declare 29 generic {
+declare 19 generic {
     void NsfStackDump (Tcl_Interp *interp)
 }
-#declare 30 generic {
-#    void NsfCallStackDump (Tcl_Interp *interp)
-#}
-#declare 31 generic {
-#    void NsfDeprecatedMsg(char *oldCmd, char *newCmd)
-#}
-declare 32 generic {
+declare 20 generic {
     void NsfSetObjClientData(Nsf_Object *obj, ClientData data)
 }
-declare 33 generic {
+declare 21 generic {
     ClientData NsfGetObjClientData(Nsf_Object *obj)
 }
-declare 34 generic {
+declare 22 generic {
     void NsfSetClassClientData(Nsf_Class *cl, ClientData data)
 }
-declare 35 generic {
+declare 23 generic {
     ClientData NsfGetClassClientData(Nsf_Class *cl)
 }
-declare 36 generic {
+declare 24 generic {
     void NsfRequireObjNamespace(Tcl_Interp *interp, Nsf_Object *obj)
 }
-declare 37 generic {
+declare 25 generic {
     int NsfErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value)
 }
-declare 38 generic {
+declare 26 generic {
         int NsfNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 }
-declare 39 generic {
+declare 27 generic {
         int  NsfCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, 
                 Tcl_Obj *method, Tcl_Obj *arg,
        	         int objc, Tcl_Obj *CONST objv[], int flags)
 }
-declare 40 generic {
+declare 28 generic {
     int NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, 
                                      char *arglist)
 }
-declare 41 generic {
+declare 29 generic {
     int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 42 generic {
+declare 30 generic {
    int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 43 generic {
+declare 31 generic {
     int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data,
             int objc, Tcl_Obj *CONST objv[])
 }