Index: TODO =================================================================== diff -u -N -r7410d517a30d30ce3bc5b2af2bcfb5e81b30e98d -r729b49eb1dcb08183a0ed41588416a923271811a --- TODO (.../TODO) (revision 7410d517a30d30ce3bc5b2af2bcfb5e81b30e98d) +++ TODO (.../TODO) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -5187,6 +5187,10 @@ - return errors from failing converter registrations - extend regression test (new test set nsf-method.test) +nsf.c +- renamed parameter::get -> parameter::info +- renamed method::get -> cmd::info + ======================================================================== TODO: Index: doc/next-migration.txt =================================================================== diff -u -N -r3fe3b9ed6500be19a27cbd4a0dd212a47b142194 -r729b49eb1dcb08183a0ed41588416a923271811a --- doc/next-migration.txt (.../next-migration.txt) (revision 3fe3b9ed6500be19a27cbd4a0dd212a47b142194) +++ doc/next-migration.txt (.../next-migration.txt) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -2237,9 +2237,9 @@ # (as e.g. returned from "info configure # parameters"). -nsf::parameter::get name /parameter/ -nsf::parameter::get syntax /parameter/ -nsf::parameter::get type /parameter/ +nsf::parameter::info name /parameter/ +nsf::parameter::info syntax /parameter/ +nsf::parameter::info type /parameter/ ---------------- |====================== Index: generic/nsf.c =================================================================== diff -u -N -r403f26de1f34f39943b605903b47ec31c974cf9a -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/nsf.c (.../nsf.c) (revision 403f26de1f34f39943b605903b47ec31c974cf9a) +++ generic/nsf.c (.../nsf.c) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -23310,6 +23310,18 @@ #endif /* +cmd "cmd::info" NsfCmdInfoCmd { + {-argName "subcmd" -required 1 -typeName "methodgetcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|syntax|type|precondition|postcondition|submethods|returns"} + {-argName "methodName" -required 1 -type tclobj} +} {-nxdoc 1} +*/ +static int +NsfCmdInfoCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *methodNameObj) { + + return ListMethodResolve(interp, subcmd, NULL, NULL, methodNameObj, 0); +} + +/* cmd configure NsfConfigureCmd { {-argName "configureoption" -required 1 -type "debug|dtrace|filter|profile|softrecreate|objectsystems|keepcmds|checkresults|checkarguments"} {-argName "value" -required 0 -type tclobj} @@ -24251,19 +24263,7 @@ return result; } -/* -cmd "method::get" NsfMethodGetCmd { - {-argName "subcmd" -required 1 -typeName "methodgetcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|syntax|type|precondition|postcondition|submethods|returns"} - {-argName "methodName" -required 1 -type tclobj} -} {-nxdoc 1} -*/ -static int -NsfMethodGetCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *methodNameObj) { - return ListMethodResolve(interp, subcmd, NULL, NULL, methodNameObj, 0); -} - - /* cmd ::method::property NsfMethodPropertyCmd { {-argName "object" -required 1 -type object} @@ -25035,14 +25035,14 @@ } /* -cmd parameter::get NsfParameterGetCmd { +cmd parameter::info NsfParameterInfoCmd { {-argName "parametersubcmd" -type "default|list|name|syntax|type" -required 1} {-argName "parameterspec" -required 1 -type tclobj} {-argName "varname" -required 0 -type tclobj} } */ static int -NsfParameterGetCmd(Tcl_Interp *interp, int parametersubcmd, Tcl_Obj *parameterspec, Tcl_Obj *varname) { +NsfParameterInfoCmd(Tcl_Interp *interp, int parametersubcmd, Tcl_Obj *parameterspec, Tcl_Obj *varname) { NsfParsedParam parsedParam; Tcl_Obj *paramsObj, *listObj = NULL; Nsf_Param *paramsPtr; @@ -25052,7 +25052,7 @@ assert(parameterspec); if (parametersubcmd != ParametersubcmdDefaultIdx && varname != NULL) { - return NsfPrintError(interp, "parameter::get: provided third arguement is only valid for querying defaults"); + return NsfPrintError(interp, "parameter::info: provided third arguement is only valid for querying defaults"); } paramsObj = Tcl_NewListObj(1, ¶meterspec); Index: generic/nsf.tcl =================================================================== diff -u -N -r3cbf24ff95e38976cdc905ec0e8014d9d754ad6f -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/nsf.tcl (.../nsf.tcl) (revision 3cbf24ff95e38976cdc905ec0e8014d9d754ad6f) +++ generic/nsf.tcl (.../nsf.tcl) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -198,7 +198,7 @@ proc ::nsf::parameter::filter {defs pattern} { set result {} foreach def $defs { - if {[string match $pattern [::nsf::parameter::get name $def]]} { + if {[string match $pattern [::nsf::parameter::info name $def]]} { lappend result $def } } Index: generic/nsfAPI.decls =================================================================== diff -u -N -r403f26de1f34f39943b605903b47ec31c974cf9a -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/nsfAPI.decls (.../nsfAPI.decls) (revision 403f26de1f34f39943b605903b47ec31c974cf9a) +++ generic/nsfAPI.decls (.../nsfAPI.decls) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -74,7 +74,7 @@ } {-nxdoc 1} -cmd parameter::get NsfParameterGetCmd { +cmd parameter::info NsfParameterInfoCmd { {-argName "subcmd" -typeName "parametersubcmd" -type "default|list|name|syntax|type" -required 1} {-argName "spec" -required 1 -type tclobj} {-argName "varname" -required 0 -type tclobj} @@ -94,7 +94,14 @@ {-argName "slotobjs" -required 1 -type tclobj} } +# +# cmd cmds (maybe more later) +# +cmd "cmd::info" NsfCmdInfoCmd { + {-argName "subcmd" -required 1 -typeName "methodgetcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|syntax|type|precondition|postcondition|submethods|returns"} + {-argName "methodName" -required 1 -type tclobj} +} {-nxdoc 1} # # method cmds @@ -138,11 +145,8 @@ {-argName "-per-object" -required 0 -nrargs 0 -type switch} {-argName "methodName" -required 1 -type tclobj} } {-nxdoc 1} -cmd "method::get" NsfMethodGetCmd { - {-argName "subcmd" -required 1 -typeName "methodgetcmd" -type "args|body|definition|exists|registrationhandle|definitionhandle|origin|parameter|syntax|type|precondition|postcondition|submethods|returns"} - {-argName "methodName" -required 1 -type tclobj} -} {-nxdoc 1} + cmd "method::forward" NsfMethodForwardCmd { {-argName "object" -required 1 -type object} {-argName "-per-object" -required 0 -nrargs 0 -type switch} @@ -156,16 +160,20 @@ {-argName "target" -type tclobj} {-argName "args" -type args} } {-nxdoc 1} + + cmd "method::property" NsfMethodPropertyCmd { {-argName "object" -required 1 -type object} {-argName "-per-object" -required 0 -nrargs 0 -type switch} {-argName "methodName" -required 1 -type tclobj} {-argName "methodProperty" -required 1 -type "class-only|call-private|call-protected|redefine-protected|returns|slotobj"} {-argName "value" -type tclobj} } {-nxdoc 1} + cmd "method::registered" NsfMethodRegisteredCmd { {-argName "handle" -required 1 -type tclobj} } {-nxdoc 1} + cmd "method::setter" NsfMethodSetterCmd { {-argName "object" -required 1 -type object} {-argName "-per-object" -required 0 -nrargs 0 -type switch} Index: generic/nsfAPI.h =================================================================== diff -u -N -r403f26de1f34f39943b605903b47ec31c974cf9a -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/nsfAPI.h (.../nsfAPI.h) (revision 403f26de1f34f39943b605903b47ec31c974cf9a) +++ generic/nsfAPI.h (.../nsfAPI.h) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -337,6 +337,8 @@ NSF_nonnull(2) NSF_nonnull(4); static int NsfAsmProcCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); +static int NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) + NSF_nonnull(2) NSF_nonnull(4); static int NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); static int NsfConfigureCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) @@ -369,8 +371,6 @@ NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodForwardCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) - NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodRegisteredCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) @@ -393,7 +393,7 @@ NSF_nonnull(2) NSF_nonnull(4); static int NsfObjectSystemCreateCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); -static int NsfParameterGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) +static int NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); static int NsfParameterInvalidateClassCacheCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []) NSF_nonnull(2) NSF_nonnull(4); @@ -558,6 +558,8 @@ NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(7) NSF_nonnull(8) NSF_nonnull(9); static int NsfAsmProcCmd(Tcl_Interp *interp, int withAd, int withCheckalways, Tcl_Obj *procName, Tcl_Obj *arguments, Tcl_Obj *body) NSF_nonnull(1) NSF_nonnull(4) NSF_nonnull(5) NSF_nonnull(6); +static int NsfCmdInfoCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *methodName) + NSF_nonnull(1) NSF_nonnull(3); static int NsfColonCmd(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) NSF_nonnull(1); static int NsfConfigureCmd(Tcl_Interp *interp, int option, Tcl_Obj *value) @@ -590,8 +592,6 @@ NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodForwardCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *method, Tcl_Obj *withDefault, int withEarlybinding, Tcl_Obj *withOnerror, Tcl_Obj *withPrefix, int withFrame, int withVerbose, Tcl_Obj *target, int nobjc, Tcl_Obj *CONST nobjv[]) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); -static int NsfMethodGetCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *methodName) - NSF_nonnull(1) NSF_nonnull(3); static int NsfMethodPropertyCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *methodName, int methodProperty, Tcl_Obj *value) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(4); static int NsfMethodRegisteredCmd(Tcl_Interp *interp, Tcl_Obj *handle) @@ -614,7 +614,7 @@ NSF_nonnull(1) NSF_nonnull(2); static int NsfObjectSystemCreateCmd(Tcl_Interp *interp, Tcl_Obj *rootClass, Tcl_Obj *rootMetaClass, Tcl_Obj *systemMethods) NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3); -static int NsfParameterGetCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *spec, Tcl_Obj *varname) +static int NsfParameterInfoCmd(Tcl_Interp *interp, int subcmd, Tcl_Obj *spec, Tcl_Obj *varname) NSF_nonnull(1) NSF_nonnull(3); static int NsfParameterInvalidateClassCacheCmd(Tcl_Interp *interp, NsfClass *class) NSF_nonnull(1) NSF_nonnull(2); @@ -756,6 +756,7 @@ NsfClassInfoSuperclassMethodIdx, NsfAsmMethodCreateCmdIdx, NsfAsmProcCmdIdx, + NsfCmdInfoCmdIdx, NsfColonCmdIdx, NsfConfigureCmdIdx, NsfCurrentCmdIdx, @@ -772,7 +773,6 @@ NsfMethodCreateCmdIdx, NsfMethodDeleteCmdIdx, NsfMethodForwardCmdIdx, - NsfMethodGetCmdIdx, NsfMethodPropertyCmdIdx, NsfMethodRegisteredCmdIdx, NsfMethodSetterCmdIdx, @@ -784,7 +784,7 @@ NsfObjectPropertyCmdIdx, NsfObjectQualifyCmdIdx, NsfObjectSystemCreateCmdIdx, - NsfParameterGetCmdIdx, + NsfParameterInfoCmdIdx, NsfParameterInvalidateClassCacheCmdIdx, NsfParameterInvalidateObjectCacheCmdIdx, NsfParameterSpecsCmdIdx, @@ -1444,6 +1444,26 @@ } static int +NsfCmdInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + ParseContext pc; + (void)clientData; + + if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], + method_definitions[NsfCmdInfoCmdIdx].paramDefs, + method_definitions[NsfCmdInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + &pc) == TCL_OK)) { + int subcmd = (int )PTR2INT(pc.clientData[0]); + Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[1]; + + assert(pc.status == 0); + return NsfCmdInfoCmd(interp, subcmd, methodName); + + } else { + return TCL_ERROR; + } +} + +static int NsfColonCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { (void)clientData; @@ -1766,26 +1786,6 @@ } static int -NsfMethodGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - ParseContext pc; - (void)clientData; - - if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfMethodGetCmdIdx].paramDefs, - method_definitions[NsfMethodGetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, - &pc) == TCL_OK)) { - int subcmd = (int )PTR2INT(pc.clientData[0]); - Tcl_Obj *methodName = (Tcl_Obj *)pc.clientData[1]; - - assert(pc.status == 0); - return NsfMethodGetCmd(interp, subcmd, methodName); - - } else { - return TCL_ERROR; - } -} - -static int NsfMethodPropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; (void)clientData; @@ -1999,20 +1999,20 @@ } static int -NsfParameterGetCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { +NsfParameterInfoCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; (void)clientData; if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfParameterGetCmdIdx].paramDefs, - method_definitions[NsfParameterGetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, + method_definitions[NsfParameterInfoCmdIdx].paramDefs, + method_definitions[NsfParameterInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN, &pc) == TCL_OK)) { int subcmd = (int )PTR2INT(pc.clientData[0]); Tcl_Obj *spec = (Tcl_Obj *)pc.clientData[1]; Tcl_Obj *varname = (Tcl_Obj *)pc.clientData[2]; assert(pc.status == 0); - return NsfParameterGetCmd(interp, subcmd, spec, varname); + return NsfParameterInfoCmd(interp, subcmd, spec, varname); } else { return TCL_ERROR; @@ -3308,6 +3308,10 @@ {"arguments", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"body", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} }, +{"::nsf::cmd::info", NsfCmdInfoCmdStub, 2, { + {"subcmd", NSF_ARG_REQUIRED|NSF_ARG_IS_ENUMERATION, 1, ConvertToInfomethodsubcmd, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, + {"methodName", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} +}, {"::nsf::colon", NsfColonCmdStub, 1, { {"args", 0, 1, ConvertToNothing, NULL,NULL,"allargs",NULL,NULL,NULL,NULL,NULL}} }, @@ -3396,10 +3400,6 @@ {"target", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} }, -{"::nsf::method::get", NsfMethodGetCmdStub, 2, { - {"subcmd", NSF_ARG_REQUIRED|NSF_ARG_IS_ENUMERATION, 1, ConvertToInfomethodsubcmd, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, - {"methodName", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} -}, {"::nsf::method::property", NsfMethodPropertyCmdStub, 5, { {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Object, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL}, {"-per-object", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL}, @@ -3450,7 +3450,7 @@ {"rootMetaClass", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"systemMethods", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} }, -{"::nsf::parameter::get", NsfParameterGetCmdStub, 3, { +{"::nsf::parameter::info", NsfParameterInfoCmdStub, 3, { {"subcmd", NSF_ARG_REQUIRED|NSF_ARG_IS_ENUMERATION, 1, ConvertToParametersubcmd, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"spec", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}, {"varname", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}} Index: generic/nsfAPI.nxdocindex =================================================================== diff -u -N -r403f26de1f34f39943b605903b47ec31c974cf9a -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/nsfAPI.nxdocindex (.../nsfAPI.nxdocindex) (revision 403f26de1f34f39943b605903b47ec31c974cf9a) +++ generic/nsfAPI.nxdocindex (.../nsfAPI.nxdocindex) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -13,16 +13,16 @@ set ::nxdoc::include(::nsf::finalize) 1 set ::nxdoc::include(::nsf::interp) 1 set ::nxdoc::include(::nsf::is) 1 -set ::nxdoc::include(::nsf::parameter::get) 0 +set ::nxdoc::include(::nsf::parameter::info) 0 set ::nxdoc::include(::nsf::parameter:invalidate::classcache) 0 set ::nxdoc::include(::nsf::parameter:invalidate::objectcache) 0 set ::nxdoc::include(::nsf::parameter::specs) 0 +set ::nxdoc::include(::nsf::cmd::info) 1 set ::nxdoc::include(::nsf::method::alias) 1 set ::nxdoc::include(::nsf::method::assertion) 1 set ::nxdoc::include(::nsf::method::asmcreate) 0 set ::nxdoc::include(::nsf::method::create) 1 set ::nxdoc::include(::nsf::method::delete) 1 -set ::nxdoc::include(::nsf::method::get) 1 set ::nxdoc::include(::nsf::method::forward) 1 set ::nxdoc::include(::nsf::method::property) 1 set ::nxdoc::include(::nsf::method::registered) 1 Index: generic/predefined.h =================================================================== diff -u -N -r3cbf24ff95e38976cdc905ec0e8014d9d754ad6f -r729b49eb1dcb08183a0ed41588416a923271811a --- generic/predefined.h (.../predefined.h) (revision 3cbf24ff95e38976cdc905ec0e8014d9d754ad6f) +++ generic/predefined.h (.../predefined.h) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -83,7 +83,7 @@ "proc ::nsf::parameter::filter {defs pattern} {\n" "set result {}\n" "foreach def $defs {\n" -"if {[string match $pattern [::nsf::parameter::get name $def]]} {\n" +"if {[string match $pattern [::nsf::parameter::info name $def]]} {\n" "lappend result $def}}\n" "return $result}\n" "set ::nsf::parameter::syntax(::nsf::xotclnext) \"?--noArgs? ?/arg .../?\"\n" Index: library/nx/nx.tcl =================================================================== diff -u -N -r6e7d5ca5b20b1aff33e9f9d33888863838a1df21 -r729b49eb1dcb08183a0ed41588416a923271811a --- library/nx/nx.tcl (.../nx.tcl) (revision 6e7d5ca5b20b1aff33e9f9d33888863838a1df21) +++ library/nx/nx.tcl (.../nx.tcl) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -751,14 +751,14 @@ # # :method "info parameter default" {p:parameter varName:optional} { # if {[info exists varName]} { - # uplevel [list ::nsf::parameter::get default $p $varName] + # uplevel [list ::nsf::parameter::info default $p $varName] # } else { - # ::nsf::parameter::get default $p + # ::nsf::parameter::info default $p # } # } - # :method "info parameter name" {p:parameter} {::nsf::parameter::get name $p} - # :method "info parameter syntax" {p:parameter} {::nsf::parameter::get syntax $p} - # :method "info parameter type" {p:parameter} {::nsf::parameter::get type $p} + # :method "info parameter name" {p:parameter} {::nsf::parameter::info name $p} + # :method "info parameter syntax" {p:parameter} {::nsf::parameter::info syntax $p} + # :method "info parameter type" {p:parameter} {::nsf::parameter::info type $p} :alias "info parent" ::nsf::methods::object::info::parent :alias "info precedence" ::nsf::methods::object::info::precedence @@ -833,7 +833,7 @@ set defs [::nsf::parameter::specs -configure $slots] } set syntax "/[self]/ " - foreach def $defs {append syntax [::nsf::parameter::get syntax $def] " "} + foreach def $defs {append syntax [::nsf::parameter::info syntax $def] " "} return [string trimright $syntax " "] } :alias "info lookup" ::nx::Object::slot::__info::lookup Index: tests/info-variable.test =================================================================== diff -u -N -r4ca122f3c023fe74de3b36c8a65c3145e554aeba -r729b49eb1dcb08183a0ed41588416a923271811a --- tests/info-variable.test (.../info-variable.test) (revision 4ca122f3c023fe74de3b36c8a65c3145e554aeba) +++ tests/info-variable.test (.../info-variable.test) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -50,13 +50,13 @@ #? {Person info parameter syntax age:integer} "/age/" #? {Person info parameter syntax -force:switch} "?-force?" #? {Person info parameter name "a b"} "a" - ? {nsf::parameter::get syntax age:integer} "/age/" - ? {nsf::parameter::get syntax -force:switch} "?-force?" - ? {nsf::parameter::get name "a b"} "a" + ? {nsf::parameter::info syntax age:integer} "/age/" + ? {nsf::parameter::info syntax -force:switch} "?-force?" + ? {nsf::parameter::info name "a b"} "a" - ? {lmap p [Person info configure parameters] {nsf::parameter::get default $p}} "0 0 0 0 0 0" - ? {lmap p [Person info method parameters foo] {nsf::parameter::get default $p}} "1 0 1" + ? {lmap p [Person info configure parameters] {nsf::parameter::info default $p}} "0 0 0 0 0 0" + ? {lmap p [Person info method parameters foo] {nsf::parameter::info default $p}} "1 0 1" nx::Class create Bar { :property {p 9} @@ -74,11 +74,11 @@ :create f1 } - ? {lmap p [Foo info configure parameters] {nsf::parameter::get name $p}} \ + ? {lmap p [Foo info configure parameters] {nsf::parameter::info name $p}} \ "i a b p object-mixin class object-filter __initblock" - ? {lmap p [Foo info configure parameters] {nsf::parameter::get default $p}} \ + ? {lmap p [Foo info configure parameters] {nsf::parameter::info default $p}} \ "0 0 1 1 0 0 0 0" - ? {lmap p [Foo info configure parameters] {nsf::parameter::get type $p}} \ + ? {lmap p [Foo info configure parameters] {nsf::parameter::info type $p}} \ "{} integer integer {} mixinreg class filterreg {}" ? {join [lsort [::Foo info slots]] \n} \ @@ -179,17 +179,17 @@ ? {lmap handle $::vs {::Foo info variable name $handle}} \ "__private(::Foo,p) a b c d e i q" - ? {lmap handle $::ps {nsf::parameter::get name $handle}} \ + ? {lmap handle $::ps {nsf::parameter::info name $handle}} \ "p a b c d e i q" - ? {lmap handle $::ps {nsf::parameter::get default $handle}} \ + ? {lmap handle $::ps {nsf::parameter::info default $handle}} \ "1 0 1 1 1 1 0 0" - ? {lmap handle $::ps {nsf::parameter::get type $handle}} \ + ? {lmap handle $::ps {nsf::parameter::info type $handle}} \ "{} integer integer {} lower lower {} {}" - ? {nsf::parameter::get default "b:integer 123" ::var1} "1" + ? {nsf::parameter::info default "b:integer 123" ::var1} "1" ? {set ::var1} "123" - ? {nsf::parameter::get default "b:integer 123" ::var2} "1" + ? {nsf::parameter::info default "b:integer 123" ::var2} "1" ? {set ::var2} "123" } Index: tests/parameters.test =================================================================== diff -u -N -r23b10a2c736cf33731b0d7b0381314ddec44f2d6 -r729b49eb1dcb08183a0ed41588416a923271811a --- tests/parameters.test (.../parameters.test) (revision 23b10a2c736cf33731b0d7b0381314ddec44f2d6) +++ tests/parameters.test (.../parameters.test) (revision 729b49eb1dcb08183a0ed41588416a923271811a) @@ -2936,7 +2936,7 @@ } # -# Test parameter::get with objects/classes and types +# Test parameter::info with objects/classes and types # nx::test case parameter-get { nx::Class create C { @@ -2947,16 +2947,16 @@ } ? {C info configure parameters foo} "-foo:integer" - ? {nsf::parameter::get type [C info configure parameters foo]} "integer" + ? {nsf::parameter::info type [C info configure parameters foo]} "integer" ? {C info configure parameters o} "-o:object,type=::nx::Object" - ? {nsf::parameter::get type [C info configure parameters o]} "::nx::Object" + ? {nsf::parameter::info type [C info configure parameters o]} "::nx::Object" ? {C info configure parameters c} "-c:class" - ? {nsf::parameter::get type [C info configure parameters c]} "class" + ? {nsf::parameter::info type [C info configure parameters c]} "class" ? {C info configure parameters m} "-m:metaclass" - ? {nsf::parameter::get type [C info configure parameters m]} "metaclass" + ? {nsf::parameter::info type [C info configure parameters m]} "metaclass" } #