Index: tests/disposition.test =================================================================== diff -u -rfbdde5cf08cdbbbde43f1d5a8ddc836d66dc09f4 -r5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2 --- tests/disposition.test (.../disposition.test) (revision fbdde5cf08cdbbbde43f1d5a8ddc836d66dc09f4) +++ tests/disposition.test (.../disposition.test) (revision 5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2) @@ -25,12 +25,12 @@ # some testing helpers # :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } + #:class method __objectparameter {} { + # return ${:objectparams} + #} :setObjectParams "" :public class method new args { @@ -323,12 +323,12 @@ nx::Test case dispo-multiplicities { Class create S { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } + #:class method __objectparameter {} { + # return ${:objectparams} + #} :public method foo {args} { set :foo $args return $args @@ -385,13 +385,10 @@ nx::Test case dispo-returns { Class create R { - :public class method setObjectParams {spec} { - set :objectparams $spec - ::nsf::invalidateobjectparameter [current] + :public class method setObjectParams {spec} { + :protected method __objectparameter {} [list return $spec] + ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } } # @@ -453,12 +450,9 @@ nx::Test case dispo-callstack { Class create Callee { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } } # @@ -624,12 +618,9 @@ nx::Test case alias-noarg { Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } :public method foo {args} { set :foo $args return $args @@ -768,12 +759,9 @@ nx::Test case alias-noarg { Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } } C setObjectParams {initcmd:initcmd,noarg} @@ -786,12 +774,9 @@ nx::Test case alias-args { Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } :public method Residualargs args { puts stderr "aliased RESIDUALARGS <[llength $args]>" puts stderr "....... <$args>" @@ -879,12 +864,9 @@ nx::Test case alias-init { Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - return ${:objectparams} - } :method init {} { incr :y } @@ -903,14 +885,9 @@ # Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - if {[info exists :objectparams]} { - return ${:objectparams} - } - } } # A depth-1 submethod ... @@ -1108,14 +1085,9 @@ nx::Test case dispo-configure-transparency { Class create C { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - if {[info exists :objectparams]} { - return ${:objectparams} - } - } } ::proc foo {} { @@ -1206,14 +1178,9 @@ Class create C Class create T { :public class method setObjectParams {spec} { - set :objectparams $spec + :protected method __objectparameter {} [list return $spec] ::nsf::invalidateobjectparameter [current] } - :class method __objectparameter {} { - if {[info exists :objectparams]} { - return ${:objectparams} - } - } } # @@ -1373,7 +1340,7 @@ ? {::xotcl::Class create XD -set x 1} "::XD" #? {c1 eval {info exists :args}} 0 - ? {XD objectparameter} "-mixin:mixinreg,alias,0..n -filter:filterreg,alias,0..n -class:class,alias args:alias,method=residualargs,args" + ? {XD objectparameter} "-instfilter:filterreg,alias,0..n -superclass:alias,0..n -instmixin:mixinreg,alias,0..n {-__default_metaclass ::xotcl::Class} {-__default_superclass ::xotcl::Object} -mixin:mixinreg,alias,0..n -filter:filterreg,alias,0..n -class:class,alias args:alias,method=residualargs,args" # # test passing arguments to init