Index: generic/tclAPI.h =================================================================== diff -u -rb8af431b779825e6d2cfa7a8b334158da1ea9370 -r901ceb8f58714e31d28ed3277923fc69c085d252 --- generic/tclAPI.h (.../tclAPI.h) (revision b8af431b779825e6d2cfa7a8b334158da1ea9370) +++ generic/tclAPI.h (.../tclAPI.h) (revision 901ceb8f58714e31d28ed3277923fc69c085d252) @@ -123,8 +123,6 @@ "::xotcl::cmd::ParameterType", "::xotcl::cmd::Class" }; -static int XOTclCheckBooleanArgsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int XOTclCheckRequiredArgsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclCCreateMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); @@ -206,8 +204,6 @@ 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 XOTclCheckBooleanArgs(Tcl_Interp *interp, char *name, Tcl_Obj *value); -static int XOTclCheckRequiredArgs(Tcl_Interp *interp, char *name, Tcl_Obj *value); 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[]); static int XOTclCDeallocMethod(Tcl_Interp *interp, XOTclClass *cl, Tcl_Obj *object); @@ -290,8 +286,6 @@ static int XOTclValuecheckCmd(Tcl_Interp *interp, Tcl_Obj *param, Tcl_Obj *value); enum { - XOTclCheckBooleanArgsIdx, - XOTclCheckRequiredArgsIdx, XOTclCAllocMethodIdx, XOTclCCreateMethodIdx, XOTclCDeallocMethodIdx, @@ -376,44 +370,6 @@ static int -XOTclCheckBooleanArgsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - parseContext pc; - - if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclCheckBooleanArgsIdx].paramDefs, - method_definitions[XOTclCheckBooleanArgsIdx].nrParameters, - &pc) != TCL_OK) { - return TCL_ERROR; - } else { - char *name = (char *)pc.clientData[0]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[1]; - - parseContextRelease(&pc); - return XOTclCheckBooleanArgs(interp, name, value); - - } -} - -static int -XOTclCheckRequiredArgsStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - parseContext pc; - - if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclCheckRequiredArgsIdx].paramDefs, - method_definitions[XOTclCheckRequiredArgsIdx].nrParameters, - &pc) != TCL_OK) { - return TCL_ERROR; - } else { - char *name = (char *)pc.clientData[0]; - Tcl_Obj *value = (Tcl_Obj *)pc.clientData[1]; - - parseContextRelease(&pc); - return XOTclCheckRequiredArgs(interp, name, value); - - } -} - -static int XOTclCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { parseContext pc; XOTclClass *cl = XOTclObjectToClass(clientData); @@ -2000,14 +1956,6 @@ } static methodDefinition method_definitions[] = { -{"::xotcl::cmd::ParameterType::type=boolean", XOTclCheckBooleanArgsStub, 2, { - {"name", 1, 0, convertToString}, - {"value", 0, 0, convertToTclobj}} -}, -{"::xotcl::cmd::ParameterType::type=required", XOTclCheckRequiredArgsStub, 2, { - {"name", 1, 0, convertToString}, - {"value", 0, 0, convertToTclobj}} -}, {"::xotcl::cmd::Class::alloc", XOTclCAllocMethodStub, 1, { {"name", 1, 0, convertToTclobj}} },