Index: tests/aliastest.xotcl =================================================================== diff -u -r1f0231a5c7cbb8dfef4eaf78335c9ad571863660 -rd56d2a8ee3f246c9891783abb09bd820dbc508e4 --- tests/aliastest.xotcl (.../aliastest.xotcl) (revision 1f0231a5c7cbb8dfef4eaf78335c9ad571863660) +++ tests/aliastest.xotcl (.../aliastest.xotcl) (revision d56d2a8ee3f246c9891783abb09bd820dbc508e4) @@ -111,49 +111,49 @@ ::xotcl::alias T BAR -per-object ::T::FOO ::xotcl::alias T ZAP -per-object ::T::BAR ? {T info methods -methodtype scripted} {foo} -? {lsort [T info -per-object methods -methodtype alias]} {BAR FOO ZAP} -? {lsort [T info -per-object methods -methodtype scripted]} {BAR FOO ZAP bar} +? {lsort [T object info methods -methodtype alias]} {BAR FOO ZAP} +? {lsort [T object info methods -methodtype scripted]} {BAR FOO ZAP bar} ? {t foo} ::T->foo -? {T info -per-object method definition ZAP} {::T alias -per-object ZAP ::T::BAR} +? {T object info method definition ZAP} {::T alias -per-object ZAP ::T::BAR} ? {T FOO} ->foo ? {T BAR} ->foo ? {T ZAP} ->foo ? {T bar} ->bar T method -per-object FOO {} {} ? {T info methods -methodtype scripted} {foo} -? {lsort [T info -per-object methods -methodtype scripted]} {BAR ZAP bar} +? {lsort [T object info methods -methodtype scripted]} {BAR ZAP bar} ? {T BAR} ->foo ? {T ZAP} ->foo rename ::T::BAR "" ? {T info methods -methodtype scripted} {foo} -? {lsort [T info -per-object methods -methodtype scripted]} {ZAP bar} +? {lsort [T object info methods -methodtype scripted]} {ZAP bar} #? {T BAR} ""; # now calling the proc defined above, alias chain seems intact ? {T ZAP} ->foo; # is ok, still pointing to 'foo' #T method -per-object BAR {} {} ? {T info methods -methodtype scripted} {foo} -? {lsort [T info -per-object methods -methodtype scripted]} {ZAP bar} +? {lsort [T object info methods -methodtype scripted]} {ZAP bar} ? {T ZAP} ->foo T method foo {} {} ? {T info methods -methodtype scripted} {} -? {lsort [T info -per-object methods -methodtype scripted]} {bar} +? {lsort [T object info methods -methodtype scripted]} {bar} # # per-object methods as per-object aliases # T method -per-object m1 args { return [self class]->[self proc] } ::xotcl::alias T M1 -per-object ::T::m1 ::xotcl::alias T M11 -per-object ::T::M1 -? {lsort [T info -per-object methods -methodtype scripted]} {M1 M11 bar m1} +? {lsort [T object info methods -methodtype scripted]} {M1 M11 bar m1} ? {T m1} ->m1 ? {T M1} ->m1 ? {T M11} ->m1 T method -per-object M1 {} {} -? {lsort [T info -per-object methods -methodtype scripted]} {M11 bar m1} +? {lsort [T object info methods -methodtype scripted]} {M11 bar m1} ? {T m1} ->m1 ? {T M11} ->m1 T method -per-object m1 {} {} -? {lsort [T info -per-object methods -methodtype scripted]} {bar} +? {lsort [T object info methods -methodtype scripted]} {bar} # # a proc as alias @@ -166,7 +166,7 @@ # ! per-object alias referenced as per-class alias ! # ::xotcl::alias T BAR ::T::FOO2 -? {lsort [T info -per-object methods -methodtype scripted]} {FOO2 bar} +? {lsort [T object info methods -methodtype scripted]} {FOO2 bar} ? {lsort [T info methods -methodtype scripted]} {BAR FOO1} ? {T FOO2} ->foo ? {t FOO1} ::T->foo @@ -175,7 +175,7 @@ # delete proc # rename foo "" -? {lsort [T info -per-object methods -methodtype scripted]} {bar} +? {lsort [T object info methods -methodtype scripted]} {bar} ? {lsort [T info methods -methodtype scripted]} {} # namespaced procs + namespace deletion @@ -210,12 +210,12 @@ U method -per-object bar args { return [self class]->[self proc] } ::xotcl::alias U BAR -per-object ::U::bar -? {lsort [U info -per-object methods -methodtype scripted]} {BAR ZAP bar zap} +? {lsort [U object info methods -methodtype scripted]} {BAR ZAP bar zap} ? {U BAR} ->bar ? {U ZAP} ->zap namespace delete ::U ? {namespace exists ::U} 0 -? {lsort [U info -per-object methods -methodtype scripted]} {} +? {lsort [U object info methods -methodtype scripted]} {} ? {U info callable BAR} "" ? {U info callable ZAP} "" @@ -238,14 +238,14 @@ ::xotcl::alias V FOO1 ::foo ::xotcl::alias V FOO2 -per-object ::foo -? {lsort [V info -per-object methods -methodtype scripted]} {FOO2 bar} +? {lsort [V object info methods -methodtype scripted]} {FOO2 bar} ? {lsort [V info methods -methodtype scripted]} {FOO1 bar} ? {V FOO2} 1-1-1 ? {v FOO1} 2-2-2 V method FOO1 {} {} ? {lsort [V info methods -methodtype scripted]} {bar} rename ::foo "" -? {lsort [V info -per-object methods -methodtype scripted]} {bar} +? {lsort [V object info methods -methodtype scripted]} {bar} #