Index: generic/nsfAPI.decls =================================================================== diff -u -rcaba76f5ac2943f5a3dfd33550cb578132f40c80 -rcafecba5f922de5329a5db109b697cbf88ae5f1a --- generic/nsfAPI.decls (.../nsfAPI.decls) (revision caba76f5ac2943f5a3dfd33550cb578132f40c80) +++ generic/nsfAPI.decls (.../nsfAPI.decls) (revision cafecba5f922de5329a5db109b697cbf88ae5f1a) @@ -52,22 +52,22 @@ } cmd "dispatch" NsfDispatchCmd { {-argName "object" -required 1 -type object} - {-argName "-intrinsic" -required 0 -nrargs 0} - {-argName "-system" -required 0 -nrargs 0} + {-argName "-intrinsic" -required 0 -nrargs 0 -type switch} + {-argName "-system" -required 0 -nrargs 0 -type switch} {-argName "command" -required 1 -type tclobj} {-argName "args" -type args} } {-nxdoc 1} cmd finalize NsfFinalizeCmd { - {-argName "-keepvars" -required 0 -nrargs 0} + {-argName "-keepvars" -required 0 -nrargs 0 -type switch} } {-nxdoc 1} cmd interp NsfInterpObjCmd { {-argName "name" -required 1} {-argName "args" -type allargs} } {-nxdoc 1} cmd is NsfIsCmd { - {-argName "-complain" -nrargs 0} - {-argName "-configure" -nrargs 0} + {-argName "-complain" -nrargs 0 -type switch} + {-argName "-configure" -nrargs 0 -type switch} {-argName "-name" -required 0} {-argName "constraint" -required 1 -type tclobj} {-argName "value" -required 1 -type tclobj} @@ -89,8 +89,8 @@ } cmd parameter::specs NsfParameterSpecsCmd { - {-argName "-configure" -nrargs 0 -required 0} - {-argName "-nonposargs" -nrargs 0 -required 0} + {-argName "-configure" -nrargs 0 -required 0 -type switch} + {-argName "-nonposargs" -nrargs 0 -required 0 -type switch} {-argName "slotobjs" -required 1 -type tclobj} } @@ -114,7 +114,7 @@ cmd "method::create" NsfMethodCreateCmd { {-argName "object" -required 1 -type object} {-argName "-checkalways" -required 0 -nrargs 0 -type switch} - {-argName "-inner-namespace" -nrargs 0} + {-argName "-inner-namespace" -nrargs 0 -type switch} {-argName "-per-object" -required 0 -nrargs 0 -type switch} {-argName "-reg-object" -required 0 -type object} {-argName "methodName" -required 1 -type tclobj} @@ -127,7 +127,7 @@ cmd "method::asmcreate" NsfAsmMethodCreateCmd { {-argName "object" -required 1 -type object} {-argName "-checkalways" -required 0 -nrargs 0 -type switch} - {-argName "-inner-namespace" -nrargs 0} + {-argName "-inner-namespace" -nrargs 0 -type switch} {-argName "-per-object" -required 0 -nrargs 0 -type switch} {-argName "-reg-object" -required 0 -nrargs 1 -type object} {-argName "name" -required 1 -type tclobj} @@ -145,10 +145,11 @@ {-argName "-per-object" -required 0 -nrargs 0 -type switch} {-argName "method" -required 1 -type tclobj} {-argName "-default" -type tclobj} - {-argName "-earlybinding" -nrargs 0} + {-argName "-earlybinding" -nrargs 0 -type switch} + {-argName "-onerror" -type tclobj} {-argName "-prefix" -type tclobj} {-argName "-frame" -nrargs 1 -type "object|method|default" -default default} - {-argName "-verbose" -nrargs 0} + {-argName "-verbose" -nrargs 0 -type switch} {-argName "target" -type tclobj} {-argName "args" -type args} } {-nxdoc 1} @@ -198,9 +199,9 @@ } {-nxdoc 1} cmd my NsfMyCmd { - {-argName "-intrinsic" -nrargs 0} - {-argName "-local" -nrargs 0} - {-argName "-system" -nrargs 0} + {-argName "-intrinsic" -nrargs 0 -type switch} + {-argName "-local" -nrargs 0 -type switch} + {-argName "-system" -nrargs 0 -type switch} {-argName "methodName" -required 1 -type tclobj} {-argName "args" -type args} } {-nxdoc 1} @@ -220,12 +221,18 @@ {-argName "body" -required 1 -type tclobj} } {-nxdoc 1} -cmd relation NsfRelationCmd { +cmd relation::get NsfRelationGetCmd { {-argName "object" -required 1 -type object} {-argName "type" -required 1 -typeName "relationtype" -type "object-mixin|class-mixin|object-filter|class-filter|class|superclass|rootclass"} +} {-nxdoc 1} + +cmd relation::set NsfRelationSetCmd { + {-argName "object" -required 1 -type object} + {-argName "type" -required 1 -typeName "relationtype" -type "object-mixin|class-mixin|object-filter|class-filter|class|superclass|rootclass"} {-argName "value" -required 0 -type tclobj} } {-nxdoc 1} + cmd current NsfCurrentCmd { {-argName "option" -required 0 -typeName "currentoption" -type "proc|method|methodpath|object|class|activelevel|args|activemixin|calledproc|calledmethod|calledclass|callingproc|callingmethod|callingclass|callinglevel|callingobject|filterreg|isnextcall|nextmethod"} } {-nxdoc 1} @@ -236,22 +243,28 @@ # var cmds # cmd "var::exists" NsfVarExistsCmd { - {-argName "-array" -required 0 -nrargs 0} + {-argName "-array" -required 0 -nrargs 0 -type switch} {-argName "object" -required 1 -type object} {-argName "varName" -required 1} } {-nxdoc 1} +cmd "var::get" NsfVarGetCmd { + {-argName "-array" -required 0 -nrargs 0 -type switch} + {-argName "object" -required 1 -type object} + {-argName "varName" -required 1 -type tclobj} +} {-nxdoc 1} + cmd "var::import" NsfVarImportCmd { {-argName "object" -required 1 -type object} {-argName "args" -type args} } {-nxdoc 1} cmd "var::set" NsfVarSetCmd { - {-argName "-array" -required 0 -nrargs 0} + {-argName "-array" -required 0 -nrargs 0 -type switch} {-argName "object" -required 1 -type object} {-argName "varName" -required 1 -type tclobj} {-argName "value" -required 0 -type tclobj} } {-nxdoc 1} cmd "var::unset" NsfVarUnsetCmd { - {-argName "-nocomplain" -required 0 -nrargs 0} + {-argName "-nocomplain" -required 0 -nrargs 0 -type switch} {-argName "object" -required 1 -type object} {-argName "varName" -required 1 -type tclobj} } {-nxdoc 1} @@ -260,8 +273,8 @@ # object methods # objectMethod autoname NsfOAutonameMethod { - {-argName "-instance" -nrargs 0} - {-argName "-reset" -nrargs 0} + {-argName "-instance" -nrargs 0 -type switch} + {-argName "-reset" -nrargs 0 -type switch} {-argName "name" -required 1 -type tclobj} } @@ -379,12 +392,11 @@ {-argName "filter" -required 1} } objectInfoMethod filtermethods NsfObjInfoFiltermethodsMethod { - {-argName "-guards" -nrargs 0} - {-argName "-order" -nrargs 0} + {-argName "-guards" -nrargs 0 -type switch} {-argName "pattern"} } objectInfoMethod forward NsfObjInfoForwardMethod { - {-argName "-definition" -nrargs 0} + {-argName "-definition" -nrargs 0 -type switch} {-argName "name"} } objectInfoMethod hasmixin NsfObjInfoHasMixinMethod { @@ -401,18 +413,26 @@ objectInfoMethod lookupfilter NsfObjInfoLookupFilterMethod { {-argName "filter" -required 1} } +objectInfoMethod lookupfilters NsfObjInfoLookupFiltersMethod { + {-argName "-guards" -nrargs 0 -type switch} + {-argName "pattern"} +} objectInfoMethod lookupmethod NsfObjInfoLookupMethodMethod { {-argName "name" -required 1 -type tclobj} } objectInfoMethod lookupmethods NsfObjInfoLookupMethodsMethod { {-argName "-callprotection" -type "all|public|protected|private" -default all} - {-argName "-incontext" -nrargs 0} + {-argName "-incontext" -nrargs 0 -type switch} {-argName "-type" -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter|nsfproc"} - {-argName "-nomixins" -nrargs 0} - {-argName "-path" -nrargs 0} + {-argName "-nomixins" -nrargs 0 -type switch} + {-argName "-path" -nrargs 0 -type switch} {-argName "-source" -type "all|application|system" -default all} {-argName "pattern" -required 0} } +objectInfoMethod lookupmixins NsfObjInfoLookupMixinsMethod { + {-argName "-guards" -nrargs 0 -type switch} + {-argName "pattern" -type objpattern} +} objectInfoMethod lookupslots NsfObjInfoLookupSlotsMethod { {-argName "-source" -type "all|application|system" -default all} {-argName "-type" -required 0 -type class} @@ -425,13 +445,12 @@ objectInfoMethod methods NsfObjInfoMethodsMethod { {-argName "-callprotection" -type "all|public|protected|private" -default all} {-argName "-type" -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter|nsfproc"} - {-argName "-path" -nrargs 0} + {-argName "-path" -nrargs 0 -type switch} {-argName "pattern" -required 0} } objectInfoMethod mixinclasses NsfObjInfoMixinclassesMethod { - {-argName "-guards" -nrargs 0} - {-argName "-heritage" -nrargs 0} + {-argName "-guards" -nrargs 0 -type switch} {-argName "pattern" -type objpattern} } objectInfoMethod mixinguard NsfObjInfoMixinguardMethod { @@ -446,7 +465,7 @@ {-argName "pattern" -required 0} } objectInfoMethod precedence NsfObjInfoPrecedenceMethod { - {-argName "-intrinsic" -nrargs 0} + {-argName "-intrinsic" -nrargs 0 -type switch} {-argName "pattern" -required 0} } objectInfoMethod slotobjects NsfObjInfoSlotobjectsMethod { @@ -464,18 +483,18 @@ {-argName "filter" -required 1} } classInfoMethod filtermethods NsfClassInfoFiltermethodsMethod { - {-argName "-guards" -nrargs 0} + {-argName "-guards" -nrargs 0 -type switch} {-argName "pattern"} } classInfoMethod forward NsfClassInfoForwardMethod { - {-argName "-definition" -nrargs 0} + {-argName "-definition" -nrargs 0 -type switch} {-argName "name"} } classInfoMethod heritage NsfClassInfoHeritageMethod { {-argName "pattern"} } classInfoMethod instances NsfClassInfoInstancesMethod { - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "pattern" -type objpattern} } @@ -485,38 +504,38 @@ } classInfoMethod methods NsfClassInfoMethodsMethod { {-argName "-callprotection" -type "all|public|protected|private" -default all} - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "-type" -nrargs 1 -typeName "methodtype" -type "all|scripted|builtin|alias|forwarder|object|setter|nsfproc"} - {-argName "-path" -nrargs 0} + {-argName "-path" -nrargs 0 -type switch} {-argName "-source" -nrargs 1 -type "all|application|system" -default all} {-argName "pattern"} } classInfoMethod mixinclasses NsfClassInfoMixinclassesMethod { - {-argName "-closure" -nrargs 0} - {-argName "-guards" -nrargs 0} - {-argName "-heritage" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} + {-argName "-guards" -nrargs 0 -type switch} + {-argName "-heritage" -nrargs 0 -type switch} {-argName "pattern" -type objpattern} } classInfoMethod mixinguard NsfClassInfoMixinguardMethod { {-argName "mixin" -required 1} } classInfoMethod mixinof NsfClassInfoMixinOfMethod { - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "-scope" -required 0 -type "all|class|object"} {-argName "pattern" -type objpattern} } classInfoMethod slotobjects NsfClassInfoSlotobjectsMethod { - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "-source" -type "all|application|system" -default all} {-argName "-type" -required 0 -type class} {-argName "pattern" -required 0} } classInfoMethod subclass NsfClassInfoSubclassMethod { - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "pattern" -type objpattern} } classInfoMethod superclass NsfClassInfoSuperclassMethod { - {-argName "-closure" -nrargs 0} + {-argName "-closure" -nrargs 0 -type switch} {-argName "pattern" -type tclobj} }