Index: generic/xotcl.c =================================================================== diff -u -rebd253f47f14822a54b86b379622f6509cbbc4fe -ra976b7c6a116f584114d2612494aaaa8e8028387 --- generic/xotcl.c (.../xotcl.c) (revision ebd253f47f14822a54b86b379622f6509cbbc4fe) +++ generic/xotcl.c (.../xotcl.c) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -624,7 +624,7 @@ ObjStr(tov[0]), ObjStr(tov[1]), objc);*/ result = DoDispatch(cd, interp, objc, tov, flags); /*fprintf(stderr, " callMethod returns %d\n", result);*/ - FREE_ON_STACK(tov); + FREE_ON_STACK(Tcl_Obj *,tov); return result; } @@ -647,7 +647,7 @@ result = DoDispatch(cd, interp, objc, tov, flags); - FREE_ON_STACK(tov); + FREE_ON_STACK(Tcl_Obj *, tov); return result; } @@ -2278,15 +2278,15 @@ if (Tcl_EvalObjv(interp, 3, ov, 0) != TCL_OK) { XOTcl_PopFrame(interp, obj); DECR_REF_COUNT(savedResult); - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); return 0; } DECR_REF_COUNT(result); result = Tcl_DuplicateObj(Tcl_GetObjResult(interp)); INCR_REF_COUNT(result); Tcl_SetObjResult(interp, savedResult); DECR_REF_COUNT(savedResult); - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); } else { valueString = Tcl_GetStringFromObj(valueObject,&valueLength); Tcl_AppendToObj(result, valueString, valueLength); @@ -3465,7 +3465,7 @@ for (m = startCl->opt->isClassMixinOf; m; m = m->next) { /* we should have no deleted commands in the list */ - assert(Tcl_Command_cmdEpoch(m->cmdPtr) == NULL); + assert(Tcl_Command_cmdEpoch(m->cmdPtr) == 0); cl = XOTclGetClassFromCmdPtr(m->cmdPtr); assert(cl); @@ -3488,7 +3488,7 @@ for (m = startCl->opt->isObjectMixinOf; m; m = m->next) { /* we should have no deleted commands in the list */ - assert(Tcl_Command_cmdEpoch(m->cmdPtr) == NULL); + assert(Tcl_Command_cmdEpoch(m->cmdPtr) == 0); obj = XOTclGetObjectFromCmdPtr(m->cmdPtr); assert(obj); @@ -3543,7 +3543,7 @@ for (m = startCl->opt->isClassMixinOf; m; m = m->next) { /* we should have no deleted commands in the list */ - assert(Tcl_Command_cmdEpoch(m->cmdPtr) == NULL); + assert(Tcl_Command_cmdEpoch(m->cmdPtr) == 0); cl = XOTclGetClassFromCmdPtr(m->cmdPtr); assert(cl); @@ -3581,7 +3581,7 @@ for (m = startCl->opt->instmixins; m; m = m->next) { /* we should have no deleted commands in the list */ - assert(Tcl_Command_cmdEpoch(m->cmdPtr) == NULL); + assert(Tcl_Command_cmdEpoch(m->cmdPtr) == 0); cl = XOTclGetClassFromCmdPtr(m->cmdPtr); assert(cl); @@ -5696,7 +5696,7 @@ fprintf(stderr,"?? %s unknown %s\n", ObjStr(obj->cmdName), ObjStr(tov[2])); */ result = DoDispatch(cd, interp, objc+1, tov, flags | XOTCL_CM_NO_UNKNOWN); - FREE_ON_STACK(tov); + FREE_ON_STACK(Tcl_Obj *, tov); } else { /* unknown failed */ return XOTclVarErrMsg(interp, ObjStr(objv[0]), @@ -9113,7 +9113,7 @@ DECR_REF_COUNT(alias); } DECR_REF_COUNT(objv[1]); - FREE_ON_STACK(objv); + FREE_ON_STACK(Tcl_Obj *, objv); return result; } @@ -9485,7 +9485,7 @@ memcpy(ov, objv, sizeof(Tcl_Obj *)*objc); ov[0] = tcd->cmdName; result = callForwarder(tcd, interp, objc, ov); - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); return result; } else { Tcl_Obj **ov, *freeList=NULL; @@ -9596,8 +9596,8 @@ if (tcd->prefix) {DECR_REF_COUNT(ov[1]);} exitforwardmethod: if (freeList) {DECR_REF_COUNT(freeList);} - FREE_ON_STACK(objvmap); - FREE_ON_STACK(OV); + FREE_ON_STACK(int, objvmap); + FREE_ON_STACK(Tcl_Obj *,OV); } return result; } @@ -10727,7 +10727,7 @@ /* fprintf(stderr, "create -- end ... %s\n", ObjStr(tov[1]));*/ if (tmpObj) {DECR_REF_COUNT(tmpObj);} - FREE_ON_STACK(tov); + FREE_ON_STACK(Tcl_Obj *, tov); return result; } @@ -10819,7 +10819,7 @@ memcpy(ov+3, objv+offset, sizeof(Tcl_Obj *)*objc); result = DoDispatch(cd, interp, objc+3, ov, 0); - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); } #if REFCOUNTED @@ -12543,10 +12543,10 @@ xotclMemCountInterpCounter++; #endif } - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); return TCL_OK; interp_error: - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); return TCL_ERROR; } Index: generic/xotcl.h =================================================================== diff -u -rebd253f47f14822a54b86b379622f6509cbbc4fe -ra976b7c6a116f584114d2612494aaaa8e8028387 --- generic/xotcl.h (.../xotcl.h) (revision ebd253f47f14822a54b86b379622f6509cbbc4fe) +++ generic/xotcl.h (.../xotcl.h) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -64,7 +64,6 @@ /* activate/deacticate assert #define NDEBUG 1 */ -#define NDEBUG 1 /* activate/deacticate memory tracing #define XOTCL_MEM_TRACE 1 Index: generic/xotclInt.h =================================================================== diff -u -rebd253f47f14822a54b86b379622f6509cbbc4fe -ra976b7c6a116f584114d2612494aaaa8e8028387 --- generic/xotclInt.h (.../xotclInt.h) (revision ebd253f47f14822a54b86b379622f6509cbbc4fe) +++ generic/xotclInt.h (.../xotclInt.h) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -183,18 +183,18 @@ # define ALLOC_ON_STACK(type,n,var) \ int __##var##_count = (n); type __##var[n+2]; \ type *var = __##var + 1; var[-1] = var[__##var##_count] = (type)0xdeadbeaf -# define FREE_ON_STACK(var) \ - assert(var[-1] == var[__##var##_count] && (void *)var[-1] == (void*)0xdeadbeaf) +# define FREE_ON_STACK(type,var) \ + assert(var[-1] == var[__##var##_count] && var[-1] == (type)0xdeadbeaf) # else # define ALLOC_ON_STACK(type,n,var) type var[(n)] -# define FREE_ON_STACK(var) +# define FREE_ON_STACK(type,var) # endif #elif defined(USE_ALLOCA) # define ALLOC_ON_STACK(type,n,var) type *var = (type *)alloca((n)*sizeof(type)) -# define FREE_ON_STACK(var) +# define FREE_ON_STACK(type,var) #else # define ALLOC_ON_STACK(type,n,var) type *var = (type *)ckalloc((n)*sizeof(type)) -# define FREE_ON_STACK(var) ckfree((char*)var) +# define FREE_ON_STACK(type,var) ckfree((char*)var) #endif #ifdef USE_ALLOCA Index: generic/xotclShadow.c =================================================================== diff -u -rebd253f47f14822a54b86b379622f6509cbbc4fe -ra976b7c6a116f584114d2612494aaaa8e8028387 --- generic/xotclShadow.c (.../xotclShadow.c) (revision ebd253f47f14822a54b86b379622f6509cbbc4fe) +++ generic/xotclShadow.c (.../xotclShadow.c) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -191,6 +191,6 @@ result = Tcl_NRCallObjProc(interp, ti->proc, ti->cd, objc, ov); - FREE_ON_STACK(ov); + FREE_ON_STACK(Tcl_Obj *, ov); return result; } Index: library/lib/makeDoc.xotcl =================================================================== diff -u -r5d0779f5ea5e1537559adcfb2e33d0ce2d8b3688 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- library/lib/makeDoc.xotcl (.../makeDoc.xotcl) (revision 5d0779f5ea5e1537559adcfb2e33d0ce2d8b3688) +++ library/lib/makeDoc.xotcl (.../makeDoc.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,5 +1,5 @@ #$Id: makeDoc.xotcl,v 1.6 2006/09/27 08:12:40 neumann Exp $ -package require XOTcl +package require XOTcl 1.6 namespace import ::xotcl::* @ @File { description { Index: library/lib/pkgIndex.tcl =================================================================== diff -u -rcb607af7c82ac3edcf5a772bb83aaf49d33b9192 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- library/lib/pkgIndex.tcl (.../pkgIndex.tcl) (revision cb607af7c82ac3edcf5a772bb83aaf49d33b9192) +++ library/lib/pkgIndex.tcl (.../pkgIndex.tcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -7,7 +7,6 @@ # in response to "package require" commands. When this # script is sourced, the variable $dir must contain the # full path name of this file's directory. - package ifneeded xotcl::htmllib 0.1 [list source [file join $dir htmllib.xotcl]] package ifneeded xotcl::metadataAnalyzer 0.84 [list source [file join $dir metadataAnalyzer.xotcl]] package ifneeded xotcl::mixinStrategy 0.9 [list source [file join $dir mixinStrategy.xotcl]] Index: tests/UNIVERSAL.test =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/UNIVERSAL.test (.../UNIVERSAL.test) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/UNIVERSAL.test (.../UNIVERSAL.test) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,11 +1,11 @@ # $Id $ #if {[set ::tcl_platform(platform)] == "windows"} {lappend auto_path .} -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 1; namespace import -force xotcl::* set pkgdir [file dir [info script]]/.. lappend auto_path $pkgdir -package require xotcl::test +package require xotcl::test 1 set tclsh [info nameofexecutable] set dir [file dir [info script]] Index: tests/actiweb.test =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/actiweb.test (.../actiweb.test) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/actiweb.test (.../actiweb.test) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -4,10 +4,10 @@ #if {[set ::tcl_platform(platform)] == "windows"} { # lappend auto_path . #} -package require XOTcl; namespace import -force ::xotcl::* +package require XOTcl 1; namespace import -force ::xotcl::* set pkgDir [file dirname [info script]]/.. lappend auto_path $pkgDir -package require xotcl::test +package require xotcl::test 1 #package require xotcl::package; package verbose 1 package require xotcl::comm::httpAccess #package require xotcl::trace Index: tests/forwardtest.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/forwardtest.xotcl (.../forwardtest.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,7 +1,7 @@ # $Id: forwardtest.xotcl,v 1.12 2007/08/14 16:38:27 neumann Exp $ -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* -package require xotcl::test +package require xotcl::test 1 proc ? {cmd expected} { set t [Test new -cmd $cmd] Index: tests/mixinoftest.xotcl =================================================================== diff -u -r0037211cd9632cbb418f9f8ca40a001a51d1598d -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/mixinoftest.xotcl (.../mixinoftest.xotcl) (revision 0037211cd9632cbb418f9f8ca40a001a51d1598d) +++ tests/mixinoftest.xotcl (.../mixinoftest.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,7 +1,7 @@ # testing mixinof -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* -package require xotcl::test +package require xotcl::test 1 proc ? {cmd expected} { set t [Test new -cmd $cmd] Index: tests/persistence.test =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/persistence.test (.../persistence.test) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/persistence.test (.../persistence.test) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,6 +1,6 @@ #!../../src/xotclsh # -*- Tcl -*- $Id: persistence.test,v 1.1 2004/05/23 22:50:39 neumann Exp $ -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 1; namespace import -force xotcl::* @ @File { description { Index: tests/slottest.xotcl =================================================================== diff -u -re98952d7910953b095d701b913244ee4962c2b48 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/slottest.xotcl (.../slottest.xotcl) (revision e98952d7910953b095d701b913244ee4962c2b48) +++ tests/slottest.xotcl (.../slottest.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,7 +1,7 @@ # $Id: slottest.xotcl,v 1.5 2007/08/14 16:38:27 neumann Exp $ -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* -package require xotcl::test +package require xotcl::test 1 proc ? {cmd expected} { set t [Test new -cmd $cmd -count 100] Index: tests/speedtest.xotcl =================================================================== diff -u -r90f13fe04f5c707be3b56808a8a7992adab1855f -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/speedtest.xotcl (.../speedtest.xotcl) (revision 90f13fe04f5c707be3b56808a8a7992adab1855f) +++ tests/speedtest.xotcl (.../speedtest.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,10 +1,13 @@ #memory trace on # $Id: speedtest.xotcl,v 1.10 2007/08/14 16:38:27 neumann Exp $ -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* -lappend auto_path [file dirname [info script]]/.. -package require xotcl::test +#set auto_path [concat [file dirname [info script]]/../library/lib $auto_path] +set auto_path [concat [file dirname [info script]]/../library/lib/ $auto_path] +puts stderr "I AM [pwd] -- [file dirname [info script]]/.. -- auto=$auto_path" +package require xotcl::test 1 + @ @File {description { Regression and speed test for various ways to achieve a similar behaviour. Index: tests/testo.xotcl =================================================================== diff -u -r84396a78ea963f52832233d23dab1d17603a502a -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/testo.xotcl (.../testo.xotcl) (revision 84396a78ea963f52832233d23dab1d17603a502a) +++ tests/testo.xotcl (.../testo.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -12,7 +12,7 @@ # suitability of this software for any purpose. It is provided "as is" # without express or implied warranty. # -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* @ @File {description { Index: tests/testx.xotcl =================================================================== diff -u -rb6d3b46941433b8c7321a6bcbfd9f6a407003559 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/testx.xotcl (.../testx.xotcl) (revision b6d3b46941433b8c7321a6bcbfd9f6a407003559) +++ tests/testx.xotcl (.../testx.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,5 +1,5 @@ #$Id: testx.xotcl,v 1.36 2007/10/12 19:53:32 neumann Exp $ -package require XOTcl +package require XOTcl 1 namespace import -force xotcl::* proc ::errorCheck {got expected msg} { Index: tests/varresolutiontest.xotcl =================================================================== diff -u -r785a9e85df7d7aa8dd80d74c8151ff4a5b016641 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/varresolutiontest.xotcl (.../varresolutiontest.xotcl) (revision 785a9e85df7d7aa8dd80d74c8151ff4a5b016641) +++ tests/varresolutiontest.xotcl (.../varresolutiontest.xotcl) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,7 +1,7 @@ # testing var resolution for namespace-shadowed objects -package require XOTcl -package require xotcl::test +package require XOTcl 1 +package require xotcl::test 1 namespace import -force xotcl::* proc ? {cmd expected {iterations 1000}} { Index: tests/xoRDF.test =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/xoRDF.test (.../xoRDF.test) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/xoRDF.test (.../xoRDF.test) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,7 +1,7 @@ #!../../src/xotclsh # $Id: xoRDF.test,v 1.5 2007/08/14 16:38:27 neumann Exp $ # -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 1; namespace import -force xotcl::* lappend auto_path [file dir [info script]]/.. #package require xotcl::test Index: tests/xocomm.test =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -ra976b7c6a116f584114d2612494aaaa8e8028387 --- tests/xocomm.test (.../xocomm.test) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ tests/xocomm.test (.../xocomm.test) (revision a976b7c6a116f584114d2612494aaaa8e8028387) @@ -1,8 +1,8 @@ #!../../xotcl-0.9.4/xotclsh # $Id: xocomm.test,v 1.4 2005/09/09 21:09:01 neumann Exp $ -package require XOTcl; namespace import -force xotcl::* +package require XOTcl 1; namespace import -force xotcl::* lappend auto_path [file dirname [info script]]/.. -package require xotcl::test +package require xotcl::test 1 @ @File { description {