Index: generic/tclAPI.h =================================================================== diff -u -rbc6eb608936be7ce3ab17f64981902a4f51194d1 -r08e94eff6214a9b51f96c9bd14dd521e89589b6e --- generic/tclAPI.h (.../tclAPI.h) (revision bc6eb608936be7ce3ab17f64981902a4f51194d1) +++ generic/tclAPI.h (.../tclAPI.h) (revision 08e94eff6214a9b51f96c9bd14dd521e89589b6e) @@ -209,11 +209,11 @@ static int XOTclNSCopyCmdsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclNSCopyVarsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclObjectpropertyCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); +static int XOTclParametercheckCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclQualifyObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclRelationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclSetInstvarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int XOTclValuecheckCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclCAllocMethod(Tcl_Interp *interp, XOTclClass *cl, Tcl_Obj *name); static int XOTclCCreateMethod(Tcl_Interp *interp, XOTclClass *cl, char *name, int objc, Tcl_Obj *CONST objv[]); @@ -290,11 +290,11 @@ static int XOTclNSCopyCmds(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs); static int XOTclNSCopyVars(Tcl_Interp *interp, Tcl_Obj *fromNs, Tcl_Obj *toNs); static int XOTclObjectpropertyCmd(Tcl_Interp *interp, Tcl_Obj *object, int objectkind, Tcl_Obj *value); +static int XOTclParametercheckCmd(Tcl_Interp *interp, int withNocomplain, Tcl_Obj *param, Tcl_Obj *value); static int XOTclQualifyObjCmd(Tcl_Interp *interp, Tcl_Obj *name); static int XOTclRelationCmd(Tcl_Interp *interp, XOTclObject *object, int relationtype, Tcl_Obj *value); static int XOTclSetInstvarCmd(Tcl_Interp *interp, XOTclObject *object, Tcl_Obj *variable, Tcl_Obj *value); static int XOTclSetterCmd(Tcl_Interp *interp, XOTclObject *object, int withPer_object, Tcl_Obj *parameter); -static int XOTclValuecheckCmd(Tcl_Interp *interp, int withNocomplain, Tcl_Obj *param, Tcl_Obj *value); enum { XOTclCAllocMethodIdx, @@ -372,11 +372,11 @@ XOTclNSCopyCmdsIdx, XOTclNSCopyVarsIdx, XOTclObjectpropertyCmdIdx, + XOTclParametercheckCmdIdx, XOTclQualifyObjCmdIdx, XOTclRelationCmdIdx, XOTclSetInstvarCmdIdx, - XOTclSetterCmdIdx, - XOTclValuecheckCmdIdx + XOTclSetterCmdIdx } XOTclMethods; @@ -1859,6 +1859,26 @@ } static int +XOTclParametercheckCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + parseContext pc; + + if (ArgumentParse(interp, objc, objv, NULL, objv[0], + method_definitions[XOTclParametercheckCmdIdx].paramDefs, + method_definitions[XOTclParametercheckCmdIdx].nrParameters, + &pc) != TCL_OK) { + return TCL_ERROR; + } else { + int withNocomplain = (int )PTR2INT(pc.clientData[0]); + Tcl_Obj *param = (Tcl_Obj *)pc.clientData[1]; + Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2]; + + parseContextRelease(&pc); + return XOTclParametercheckCmd(interp, withNocomplain, param, value); + + } +} + +static int XOTclQualifyObjCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { parseContext pc; @@ -1936,26 +1956,6 @@ } } -static int -XOTclValuecheckCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - parseContext pc; - - if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclValuecheckCmdIdx].paramDefs, - method_definitions[XOTclValuecheckCmdIdx].nrParameters, - &pc) != TCL_OK) { - return TCL_ERROR; - } else { - int withNocomplain = (int )PTR2INT(pc.clientData[0]); - Tcl_Obj *param = (Tcl_Obj *)pc.clientData[1]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[2]; - - parseContextRelease(&pc); - return XOTclValuecheckCmd(interp, withNocomplain, param, value); - - } -} - static methodDefinition method_definitions[] = { {"::xotcl::cmd::Class::alloc", XOTclCAllocMethodStub, 1, { {"name", 1, 0, convertToTclobj}} @@ -2295,6 +2295,11 @@ {"objectkind", 0, 0, convertToObjectkind}, {"value", 0, 0, convertToTclobj}} }, +{"::xotcl::parametercheck", XOTclParametercheckCmdStub, 3, { + {"-nocomplain", 0, 0, convertToString}, + {"param", 0, 0, convertToTclobj}, + {"value", 0, 0, convertToTclobj}} +}, {"::xotcl::__qualify", XOTclQualifyObjCmdStub, 1, { {"name", 1, 0, convertToTclobj}} }, @@ -2312,11 +2317,6 @@ {"object", 1, 0, convertToObject}, {"-per-object", 0, 0, convertToString}, {"parameter", 0, 0, convertToTclobj}} -}, -{"::xotcl::valuecheck", XOTclValuecheckCmdStub, 3, { - {"-nocomplain", 0, 0, convertToString}, - {"param", 0, 0, convertToTclobj}, - {"value", 0, 0, convertToTclobj}} },{NULL} };