Index: tests/destroytest.tcl =================================================================== diff -u -r89b5047e54e47a88a7de75d8523a07ffa5743407 -rf3cb5afe6aa1b6761b4a9909058f64ff7d64ab92 --- tests/destroytest.tcl (.../destroytest.tcl) (revision 89b5047e54e47a88a7de75d8523a07ffa5743407) +++ tests/destroytest.tcl (.../destroytest.tcl) (revision f3cb5afe6aa1b6761b4a9909058f64ff7d64ab92) @@ -3,7 +3,7 @@ Test parameter count 10 -::nx::core::alias ::nx::Object set -objscope ::set +::nsf::alias ::nx::Object set -objscope ::set Class create O -superclass Object { :method init {} { @@ -27,18 +27,18 @@ C method foo {} { puts stderr "==== $::case [current]" :destroy - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 0 "$::case object deleted" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 0 "$::case object deleted" ? "set ::firstDestroy" 1 "firstDestroy called" @@ -52,18 +52,18 @@ C method foo {} { puts stderr "==== $::case [current]" :destroy - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 1 "$::case object deleted" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 1 "$::case object deleted" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -77,18 +77,18 @@ C method foo {} { puts stderr "==== $::case [current]" [:info class] create [current] - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 1 "$::case object deleted" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 1 "$::case object deleted" ? "set ::firstDestroy" 0 "firstDestroy called" # @@ -103,18 +103,18 @@ C method foo {} { puts stderr "==== $::case [current]" rename [current] "" - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 0 "$::case object still exists after proc" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 0 "$::case object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" @@ -130,19 +130,19 @@ C method foo {} { puts stderr "==== $::case [current]" rename [current] "" - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] +puts stderr ======[::nsf::objectproperty c1 object] puts stderr ======[c1 set x] -? {::nx::core::objectproperty c1 object} 1 "$::case object still exists after proc" +? {::nsf::objectproperty c1 object} 1 "$::case object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -158,18 +158,18 @@ C method foo {} { puts stderr "==== $::case [current]" rename o [current] - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 ? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" - ? {::nx::core::objectproperty c1 object} 1 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "$::case object still exists in proc" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 1 "$::case object still exists after proc" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 1 "$::case object still exists after proc" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -189,7 +189,7 @@ } C create c1 c1 foo -? {::nx::core::objectproperty c1 object} 1 "$::case object still exists after proc" +? {::nsf::objectproperty c1 object} 1 "$::case object still exists after proc" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -209,28 +209,28 @@ C method foo {} { puts stderr "==== $::case [current]" namespace delete ::test - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 # # If the following line is commented in, the namespace is deleted # here. Is there a bug with nsPtr->activationCount # #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" - puts stderr "???? [current] exists [::nx::core::objectproperty [current] object]" - ? "::nx::core::objectproperty [current] object" 0 ;# WHY? - puts stderr "???? [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "???? [current] exists [::nsf::objectproperty [current] object]" + ? "::nsf::objectproperty [current] object" 0 ;# WHY? + puts stderr "???? [current] exists [::nsf::objectproperty [current] object]" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "$::case destroy not yet called" } } test::C create test::c1 test::c1 foo -puts stderr ======[::nx::core::objectproperty test::c1 object] -? {::nx::core::objectproperty test::c1 object} 0 "object still exists after proc" +puts stderr ======[::nsf::objectproperty test::c1 object] +? {::nsf::objectproperty test::c1 object} 0 "object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "destroy was called when poping stack frame" -? {::nx::core::objectproperty ::test::C object} 0 "class still exists after proc" +? {::nsf::objectproperty ::test::C object} 0 "class still exists after proc" ? {namespace exists ::test::C} 0 "namespace ::test::C still exists after proc" ? {namespace exists ::test} 1 "parent ::test namespace still exists after proc" ? {namespace exists ::xotcl::classes::test::C} 0 "namespace ::xotcl::classes::test::C still exists after proc" @@ -249,25 +249,25 @@ C method foo {} { puts stderr "==== $::case [current]" namespace delete ::test - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 # # If the following line is commented in, the namespace is deleted # here. Is there a bug with nsPtr->activationCount # #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBBB" - puts stderr "???? [current] exists [::nx::core::objectproperty [current] object]" - ? "::nx::core::objectproperty [current] object" 0 "$::case object still exists in proc";# WHY? - puts stderr "???? [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "???? [current] exists [::nsf::objectproperty [current] object]" + ? "::nsf::objectproperty [current] object" 0 "$::case object still exists in proc";# WHY? + puts stderr "???? [current] exists [::nsf::objectproperty [current] object]" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called"; # NOT YET CALLED } } test::C create test::c1 test::c1 foo -puts stderr ======[::nx::core::objectproperty test::c1 object] -? {::nx::core::objectproperty test::c1 object} 0 "$::case object still exists after proc" +puts stderr ======[::nsf::objectproperty test::c1 object] +? {::nsf::objectproperty test::c1 object} 0 "$::case object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" ;# toplevel destroy was blocked @@ -287,20 +287,20 @@ puts stderr "AAAA" # the following isobject call has a problem in Tcl_GetCommandFromObj(), # which tries to access invalid memory - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBBB" - ? {::nx::core::objectproperty ::o::c1 object} 0 "$::case object still exists in proc" + ? {::nsf::objectproperty ::o::c1 object} 0 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" } C create o::c1 o::c1 foo -puts stderr ======[::nx::core::objectproperty ::o::c1 object] -? {::nx::core::objectproperty ::o::c1 object} 0 "$::case object o::c1 still exists after proc" -? {::nx::core::objectproperty o object} 0 "$::case object o still exists after proc" +puts stderr ======[::nsf::objectproperty ::o::c1 object] +? {::nsf::objectproperty ::o::c1 object} 0 "$::case object o::c1 still exists after proc" +? {::nsf::objectproperty o object} 0 "$::case object o still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" @@ -317,18 +317,18 @@ C method foo {} { puts stderr "==== $::case [current]" o destroy - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" - ? {::nx::core::objectproperty ::o::c1 object} 0 "$::case object still exists in proc" + ? {::nsf::objectproperty ::o::c1 object} 0 "$::case object still exists in proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" } C create o::c1 o::c1 foo -puts stderr ======[::nx::core::objectproperty ::o::c1 object] -? {::nx::core::objectproperty ::o::c1 object} 0 "$::case object still exists after proc" +puts stderr ======[::nsf::objectproperty ::o::c1 object] +? {::nsf::objectproperty ::o::c1 object} 0 "$::case object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -345,18 +345,18 @@ C method foo {} { puts stderr "==== $::case [current]" proc [current] {args} {puts HELLO} - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" - ? {::nx::core::objectproperty c1 object} 0 "$::case object still exists in proc" + ? {::nsf::objectproperty c1 object} 0 "$::case object still exists in proc" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 0 "$::case object still exists after proc" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 0 "$::case object still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" @@ -372,22 +372,22 @@ C method foo {} { puts stderr "==== $::case [current]" C destroy - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" #? [:info class] ::xotcl::Object "object reclassed" ? [:info class] ::C "object reclassed?" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" - ? {::nx::core::objectproperty c1 object} 1 "object still exists in proc" - #? {::nx::core::objectproperty ::C class} 0 "class still exists in proc" - ? {::nx::core::objectproperty ::C class} 1 "class still exists in proc" + ? {::nsf::objectproperty c1 object} 1 "object still exists in proc" + #? {::nsf::objectproperty ::C class} 0 "class still exists in proc" + ? {::nsf::objectproperty ::C class} 1 "class still exists in proc" } C create c1 c1 foo -puts stderr ======[::nx::core::objectproperty c1 object] -? {::nx::core::objectproperty c1 object} 1 "object still exists after proc" +puts stderr ======[::nsf::objectproperty c1 object] +? {::nsf::objectproperty c1 object} 1 "object still exists after proc" ? [c1 info class] ::nx::Object "after proc: object reclassed?" ? "set ::firstDestroy" 0 "firstDestroy called" ? "set ::ObjectDestroy" 0 "ObjectDestroy called" @@ -402,7 +402,7 @@ C method foo {} { puts stderr "==== $::case [current]" C destroy - puts stderr "AAAA [current] exists [::nx::core::objectproperty [current] object]" + puts stderr "AAAA [current] exists [::nsf::objectproperty [current] object]" :set x 1 #? "[current] set x" 1 "$::case can still access [current]" puts stderr "BBB" @@ -412,14 +412,14 @@ ? "set ::ObjectDestroy" 1 "ObjectDestroy called" ? [:info class] ::C "object reclassed" #? [:info class] ::xotcl::Object "object reclassed" - ? {::nx::core::objectproperty ::C::c1 object} 1 "object still exists in proc" - ? {::nx::core::objectproperty ::C class} 1 "class still exists in proc" + ? {::nsf::objectproperty ::C::c1 object} 1 "object still exists in proc" + ? {::nsf::objectproperty ::C class} 1 "class still exists in proc" } C create ::C::c1 C::c1 foo -#puts stderr ======[::nx::core::objectproperty ::C::c1 object] -? {::nx::core::objectproperty ::C::c1 object} 0 "object still exists after proc" -? {::nx::core::objectproperty ::C class} 0 "class still exists after proc" +#puts stderr ======[::nsf::objectproperty ::C::c1 object] +? {::nsf::objectproperty ::C::c1 object} 0 "object still exists after proc" +? {::nsf::objectproperty ::C class} 0 "class still exists after proc" ? "set ::firstDestroy" 1 "firstDestroy called" ? "set ::ObjectDestroy" 1 "ObjectDestroy called" @@ -429,14 +429,14 @@ Object create x Object create x::y x destroy -? {::nx::core::objectproperty x object} 0 "parent object gone" -? {::nx::core::objectproperty x::y object} 0 "child object gone" +? {::nsf::objectproperty x object} 0 "parent object gone" +? {::nsf::objectproperty x::y object} 0 "child object gone" set case "deleting aliased object" Test case deleting-aliased-object Object create o Object create o2 -::nx::core::alias o x o2 +::nsf::alias o x o2 ? {o x} ::o2 "call object via alias" ? {o x info vars} "" "call info on aliased object" ? {o2 set x 10} 10 "set variable on object" @@ -455,27 +455,27 @@ Test case deleting-object-with-alias-to-object Object create o Object create o3 -::nx::core::alias o x o3 +::nsf::alias o x o3 o destroy -? {::nx::core::objectproperty o object} 0 "parent object gone" -? {::nx::core::objectproperty o3 object} 1 "aliased object still here" +? {::nsf::objectproperty o object} 0 "parent object gone" +? {::nsf::objectproperty o3 object} 1 "aliased object still here" o3 destroy -? {::nx::core::objectproperty o3 object} 0 "aliased object destroyed" +? {::nsf::objectproperty o3 object} 0 "aliased object destroyed" set case "create an alias, and delete cmd via aggregation" Test case create-alias-delete-via-aggregation Object create o Object create o3 -::nx::core::alias o x o3 +::nsf::alias o x o3 o::x destroy -? {::nx::core::objectproperty o3 object} 0 "aliased object destroyed" +? {::nsf::objectproperty o3 object} 0 "aliased object destroyed" o destroy set case "create an alias, and recreate obj" Test case create-alias-and-recreate-obj Object create o Object create o3 -::nx::core::alias o x o3 +::nsf::alias o x o3 Object create o3 o3 set a 13 ? {o x set a} 13 "aliased object works after recreate" @@ -486,8 +486,8 @@ Class create C Object create o Object create o3 -::nx::core::alias o a o3 -::nx::core::alias C b o +::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" @@ -505,12 +505,12 @@ Class create C Object create o Object create o3 -::nx::core::alias o a o3 -::nx::core::alias C b o +::nsf::alias o a o3 +::nsf::alias C b o C create c1 C destroy -? {::nx::core::objectproperty o object} 1 "object o still here" -? {::nx::core::objectproperty o3 object} 1 "object o3 still here" +? {::nsf::objectproperty o object} 1 "object o still here" +? {::nsf::objectproperty o3 object} 1 "object o3 still here" o destroy o3 destroy c1 destroy @@ -527,12 +527,12 @@ # reuse the namespace for a class/object Class create ::module - ? {::nx::core::objectproperty ::module class} 1 + ? {::nsf::objectproperty ::module class} 1 # delete the object/class ... and namespace ::module destroy - ? {::nx::core::objectproperty ::module class} 0 + ? {::nsf::objectproperty ::module class} 0 } Test case namespace-import { @@ -546,25 +546,25 @@ Class create ::module { :create mod1 } - ? {::nx::core::objectproperty ::module::Foo class} 1 - ? {::nx::core::objectproperty ::module::foo class} 0 - ? {::nx::core::objectproperty ::module::foo object} 1 - ? {::nx::core::objectproperty ::module class} 1 + ? {::nsf::objectproperty ::module::Foo class} 1 + ? {::nsf::objectproperty ::module::foo class} 0 + ? {::nsf::objectproperty ::module::foo object} 1 + ? {::nsf::objectproperty ::module class} 1 Object create ::o { :requireNamespace } namespace eval ::o {namespace import ::module::*} - ? {::nx::core::objectproperty ::o::Foo class} 1 - ? {::nx::core::objectproperty ::o::foo object} 1 + ? {::nsf::objectproperty ::o::Foo class} 1 + ? {::nsf::objectproperty ::o::foo object} 1 # do not destroy namespace imported objects/classes ::o destroy - ? {::nx::core::objectproperty ::o::Foo class} 0 - ? {::nx::core::objectproperty ::o::foo object} 0 + ? {::nsf::objectproperty ::o::Foo class} 0 + ? {::nsf::objectproperty ::o::foo object} 0 - ? {::nx::core::objectproperty ::module::Foo class} 1 - ? {::nx::core::objectproperty ::module::foo object} 1 + ? {::nsf::objectproperty ::module::Foo class} 1 + ? {::nsf::objectproperty ::module::foo object} 1 ::module destroy }