Index: doc/next-migration.txt =================================================================== diff -u -N -r5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2 -r6032368ef2e223f6056c187f30c10792afc9923a --- doc/next-migration.txt (.../next-migration.txt) (revision 5d1617640ad71fd52b069f81cfcadbe4cbb6f2a2) +++ doc/next-migration.txt (.../next-migration.txt) (revision 6032368ef2e223f6056c187f30c10792afc9923a) @@ -400,7 +400,7 @@ |[source,tcl] ---------------- -# Define method 'foo' and class +# Define instance method 'foo' and object # method 'bar' for a Class 'C' with separate # toplevel commands @@ -410,22 +410,22 @@ ---------------- |[source,tcl] ---------------- -# Define method and class method +# Define instance method and object method # in the init-block of a class Class create C { :method foo args {...} - :class method bar args {...} + :object method bar args {...} } ---------------- [source,tcl] ---------------- -# Define method and class method +# Define instance method and object method # with separate commands Class create C C method foo args {...} -C class method bar args {...} +C object method bar args {...} ---------------- |[source,tcl] @@ -440,24 +440,24 @@ |[source,tcl] ---------------- -# Define class method and set +# Define object method and set # instance variable in the init-block of # an object Object create o { set :x 1 - :method foo args {...} + :object method foo args {...} } ---------------- [source,tcl] ---------------- -# Define class method and set +# Define object method and set # instance variable with separate # commands Object create o o eval {set :x 1} -o method foo args {...} +o object method foo args {...} ---------------- |=========================== @@ -528,11 +528,11 @@ Class create C { :forward f1 ... - :class forward f2 ... + :object forward f2 ... } Object create o { - :forward f3 ... + :object forward f3 ... } ---------------- @@ -591,11 +591,11 @@ Class create C { :alias a1 ... - :class alias a2 ... + :object alias a2 ... } Object create o { - :alias a3 ... + :object alias a3 ... } ---------------- |=========================== @@ -723,12 +723,12 @@ ---------------- # Deletion of Methods # -/obj/ delete method /name/ -/cls/ ?class? delete method /name/ +/obj/ delete object method /name/ +/cls/ delete method /name/ # Deletion of Properties -/obj/ delete property /name/ -/cls/ ?class? delete property /name/ +/obj/ delete object property /name/ +/cls/ delete property /name/ ---------------- |====================== @@ -781,7 +781,7 @@ } } Object create o { - :public method baz {} {...} + :public object method baz {} {...} } ---------------- |====================== @@ -1097,12 +1097,12 @@ |[source,tcl] ---------------- -# Define a class variable "V" with value 100 and -# an instance variable "x". "class variable" works -# similar to "class method". +# Define a object variable "V" with value 100 and +# an instance variable "x". "object variable" works +# similar to "object method". Class create Foo { - :class variable V 100 + :object variable V 100 :variable x 1 } ---------------- @@ -1231,17 +1231,16 @@ |[source,tcl] ---------------- -# Define a class property and an object -# property +# Define instance and object properties Class create C { :property x :property {y 1} - :class property cp + :object property cp } Object create o { - :property op + :object property op } ---------------- @@ -1550,7 +1549,7 @@ # Define a method that has to return a # non-empty list of objects - :public class method instances {} \ + :public object method instances {} \ -returns object,1..n { return [:info instances] } @@ -1602,8 +1601,8 @@ # Register per-object mixin and guard for # a class -/cls/ class mixin ... -/cls/ class mixin guard /mixin/ ?condition? +/cls/ object mixin ... +/cls/ object mixin guard /mixin/ ?condition? ---------------- |[source,tcl] ---------------- @@ -1615,8 +1614,8 @@ # Register per-object mixin and guard for # an object -/obj/ mixin ... -/obj/ mixin guard /mixin/ ?condition? +/obj/ object mixin ... +/obj/ object mixin guard /mixin/ ?condition? ---------------- |====================== @@ -1661,8 +1660,8 @@ # Register per-object filter and guard for # an object -/obj/ filter ... -/obj/ filter guard /filter/ ?condition? +/obj/ object filter ... +/obj/ object filter guard /filter/ ?condition? ---------------- |====================== @@ -1768,55 +1767,55 @@ ---------------- |[source,tcl] ---------------- -/obj/ info methods ?pattern? +/obj/ info object methods ?pattern? ---------------- |[source,tcl] ---------------- /obj/ info parametercmd ?pattern? ---------------- |[source,tcl] ---------------- -/obj/ info methods -methodtype setter ?pattern? +/obj/ info object methods -methodtype setter ?pattern? ---------------- |[source,tcl] ---------------- /obj/ info procs ?pattern? ---------------- |[source,tcl] ---------------- -/obj/ info methods -methodtype scripted ?pattern? +/obj/ info object methods -methodtype scripted ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/obj/ info methods -methodtype alias ?pattern? +/obj/ info object methods -methodtype alias ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/obj/ info methods -methodtype forwarder ?pattern? +/obj/ info object methods -methodtype forwarder ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/obj/ info methods -methodtype object ?pattern? +/obj/ info object methods -methodtype object ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/obj/ info methods -callprotection public\|protected ... +/obj/ info object methods -callprotection public\|protected ... ---------------- |====================== @@ -1836,55 +1835,55 @@ ---------------- |[source,tcl] ---------------- -/cls/ class info methods ?pattern? +/cls/ info methods ?pattern? ---------------- |[source,tcl] ---------------- /cls/ info parametercmd ?pattern? ---------------- |[source,tcl] ---------------- -/cls/ class info methods -methodtype setter ?pattern? +/cls/ info methods -methodtype setter ?pattern? ---------------- |[source,tcl] ---------------- /cls/ info procs ?pattern? ---------------- |[source,tcl] ---------------- -/cls/ class info methods -methodtype scripted ?pattern? +/cls/ info methods -methodtype scripted ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/cls/ class info methods -methodtype alias ?pattern? +/cls/ info methods -methodtype alias ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/cls/ class info methods -methodtype forwarder ?pattern? +/cls/ info methods -methodtype forwarder ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/cls/ class info methods -methodtype object ?pattern? +/cls/ info methods -methodtype object ?pattern? ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/cls/ class info methods \ +/cls/ info methods \ -callprotection public\|protected ... ---------------- |====================== @@ -1911,20 +1910,11 @@ ---------------- |[source,tcl] ---------------- -/obj/ info method exists /methodName/ -/obj/ info methods /methodName/ +/obj/ info object method exists /methodName/ +/obj/ info object methods /methodName/ +/cls/ info method exists /methodName/ +/cls/ info methods /methodName/ ---------------- -|[source,tcl] ----------------- -/obj\|cls/ info \ - [inst](commands\|procs\|parametercmd) \ - ?pattern? ----------------- -|[source,tcl] ----------------- -/cls/ ?class? info method exists /methodName/ -/cls/ ?class? info methods /methodName/ ----------------- |====================== @@ -2127,63 +2117,63 @@ ---------------- |[source,tcl] ---------------- -/obj/ info method definition /methodName/ +/obj/ info object method definition /methodName/ ---------------- |[source,tcl] ---------------- /obj/ info body /methodName/ ---------------- |[source,tcl] ---------------- -/obj/ info method body /methodName/ +/obj/ info object method body /methodName/ ---------------- |[source,tcl] ---------------- /obj/ info args /methodName/ ---------------- |[source,tcl] ---------------- -/obj/ info method args /methodName/ +/obj/ info object method args /methodName/ ---------------- |[source,tcl] ---------------- /obj/ info nonposargs /methodName/ ---------------- |[source,tcl] ---------------- -/obj/ info method parameter /methodName/ +/obj/ info object method parameter /methodName/ ---------------- |[source,tcl] --------------- /obj/ info default /methodName/ ----------------- |[source,tcl] ---------------- -# not needed, part of "info method parameter" +# not needed, part of "info ?object? method parameter" ---------------- |[source,tcl] ---------------- /obj/ info pre /methodName/ ---------------- |[source,tcl] ---------------- -/obj/ info method precondition /methodName/ +/obj/ info object method precondition /methodName/ ---------------- |[source,tcl] ---------------- /obj/ info post /methodName/ ---------------- |[source,tcl] ---------------- -/obj/ info method postcondition /methodName/ +/obj/ info object method postcondition /methodName/ ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/obj/ info method parametersyntax /methodName/ +/obj/ info object method parametersyntax /methodName/ ---------------- |====================== @@ -2335,7 +2325,7 @@ # method-handles instead of triples # (applies to all three variants) -/obj/ info filter methods \ +/obj/ info object filter methods \ ?-guards? ?-order? ?pattern? ---------------- |[source,tcl] @@ -2344,15 +2334,15 @@ ---------------- |[source,tcl] ---------------- -/obj/ info filter guard /name/ +/obj/ info object filter guard /name/ ---------------- |[source,tcl] ---------------- /cls/ info filter ?-guards? ?-order? ?pattern? ---------------- |[source,tcl] ---------------- -/cls/ class info filter methods \ +/cls/ info filter methods \ ?-guards? ?-order? ?pattern? ---------------- |[source,tcl] @@ -2361,7 +2351,7 @@ ---------------- |[source,tcl] ---------------- -/cls/ class info filter guard /name/ +/cls/ info filter guard /name/ ---------------- |[source,tcl] ---------------- @@ -2387,7 +2377,7 @@ ---------------- |[source,tcl] ---------------- -/obj/ info mixin classes \ +/obj/ info object mixin classes \ ?-guards? ?-heritage? ?pattern? ---------------- |[source,tcl] @@ -2396,15 +2386,15 @@ ---------------- |[source,tcl] ---------------- -/obj/ info mixin guard /name/ +/obj/ info object mixin guard /name/ ---------------- |[source,tcl] ---------------- /cls/ info mixin ?-guards? ?-order? ?pattern? ---------------- |[source,tcl] ---------------- -/cls/ class info mixin classes \ +/cls/ info mixin classes \ ?-guards? ?-heritage? ?pattern? ---------------- |[source,tcl] @@ -2413,7 +2403,7 @@ ---------------- |[source,tcl] ---------------- -/cls/ class info mixin guard /name/ +/cls/ info mixin guard /name/ ---------------- |[source,tcl] ---------------- @@ -2478,29 +2468,29 @@ # can be used e.g. for aliases. "handle" is the short # form of "definitionhandle". # -/obj/ info method handle /methodName/ -/cls/ ?class? info method handle /methodName/ +/obj/ info object method handle /methodName/ +/cls/ info method handle /methodName/ # # For ensemble methods (method name contains # spaces) one can query as well the registration # handle, which is the handle to the root of the # ensemble; the definiton handle points to the # leaf of the ensemble. # -/obj/ info method registrationhandle /methodName/ -/cls/ ?class? info method registrationhandle /methodName/ +/obj/ info object method registrationhandle /methodName/ +/cls/ info method registrationhandle /methodName/ # # For aliases, one can query the original definition # via "info method origin" # /obj/ info method origin /methodName/ -/cls/ ?class? info method origin /methodName/ +/cls/ info method origin /methodName/ ---------------- |====================== ==== List type of a method -The method +info method type+ is new in NX to obtain the type of the +The method +info ?object? method type+ is new in NX to obtain the type of the specified method. [options="header",cols="asciidoc,asciidoc",frame="none",valign="middle"] @@ -2513,15 +2503,15 @@ ---------------- |[source,tcl] ---------------- -/obj/ info method type /methodName/ +/obj/ info object method type /methodName/ ---------------- |[source,tcl] ---------------- # n.a. ---------------- |[source,tcl] ---------------- -/cls/ ?class? info method type /methodName/ +/cls/ ?object? info method type /methodName/ ---------------- |======================