Index: generic/gentclAPI.decls =================================================================== diff -u -r1a2ed9fd48d2c4326e27378a9a8accae1c008bad -r90358010d417481db6164f879f01b41e789f09f7 --- generic/gentclAPI.decls (.../gentclAPI.decls) (revision 1a2ed9fd48d2c4326e27378a9a8accae1c008bad) +++ generic/gentclAPI.decls (.../gentclAPI.decls) (revision 90358010d417481db6164f879f01b41e789f09f7) @@ -301,13 +301,13 @@ infoObjectMethod method XOTclObjInfoMethodMethod { {-argName "object" -type object} - {-argName "infomethodsubcmd" -type "args|definition|name|parameter|type|pre|post"} + {-argName "infomethodsubcmd" -type "args|definition|name|parameter|type|precondition|postcondition"} {-argName "name"} } ### TODO move finally to infoclassmethod infoClassMethod method XOTclClassInfoMethodMethod { {-argName "class" -type class} - {-argName "infomethodsubcmd" -type "args|definition|name|parameter|type|pre|post"} + {-argName "infomethodsubcmd" -type "args|definition|name|parameter|type|precondition|postcondition"} {-argName "name"} } Index: generic/tclAPI.h =================================================================== diff -u -r1a2ed9fd48d2c4326e27378a9a8accae1c008bad -r90358010d417481db6164f879f01b41e789f09f7 --- generic/tclAPI.h (.../tclAPI.h) (revision 1a2ed9fd48d2c4326e27378a9a8accae1c008bad) +++ generic/tclAPI.h (.../tclAPI.h) (revision 90358010d417481db6164f879f01b41e789f09f7) @@ -1,12 +1,12 @@ static int convertToInfomethodsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, ClientData *clientData) { int index, result; - static CONST char *opts[] = {"args", "definition", "name", "parameter", "type", "pre", "post", NULL}; + static CONST char *opts[] = {"args", "definition", "name", "parameter", "type", "precondition", "postcondition", NULL}; result = Tcl_GetIndexFromObj(interp, objPtr, opts, "infomethodsubcmd", 0, &index); *clientData = (ClientData) index + 1; return result; } -enum InfomethodsubcmdIdx {InfomethodsubcmdNULL, InfomethodsubcmdArgsIdx, InfomethodsubcmdDefinitionIdx, InfomethodsubcmdNameIdx, InfomethodsubcmdParameterIdx, InfomethodsubcmdTypeIdx, InfomethodsubcmdPreIdx, InfomethodsubcmdPostIdx}; +enum InfomethodsubcmdIdx {InfomethodsubcmdNULL, InfomethodsubcmdArgsIdx, InfomethodsubcmdDefinitionIdx, InfomethodsubcmdNameIdx, InfomethodsubcmdParameterIdx, InfomethodsubcmdTypeIdx, InfomethodsubcmdPreconditionIdx, InfomethodsubcmdPostconditionIdx}; static int convertToMethodtype(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, ClientData *clientData) { int index, result; Index: generic/xotcl.c =================================================================== diff -u -r6a93cc19b601c6972981b1844c198371deccce28 -r90358010d417481db6164f879f01b41e789f09f7 --- generic/xotcl.c (.../xotcl.c) (revision 6a93cc19b601c6972981b1844c198371deccce28) +++ generic/xotcl.c (.../xotcl.c) (revision 90358010d417481db6164f879f01b41e789f09f7) @@ -9667,7 +9667,7 @@ Tcl_Command importedCmd = GetOriginalCommand(cmd); return ListCmdParams(interp, importedCmd, methodName, 0); } - case InfomethodsubcmdPreIdx: + case InfomethodsubcmdPreconditionIdx: { XOTclProcAssertion *procs; if (withPer_object) { @@ -9679,7 +9679,7 @@ if (procs) Tcl_SetObjResult(interp, AssertionList(interp, procs->pre)); return TCL_OK; } - case InfomethodsubcmdPostIdx: + case InfomethodsubcmdPostconditionIdx: { XOTclProcAssertion *procs; if (withPer_object) { Index: library/lib/xotcl1.xotcl =================================================================== diff -u -r1a2ed9fd48d2c4326e27378a9a8accae1c008bad -r90358010d417481db6164f879f01b41e789f09f7 --- library/lib/xotcl1.xotcl (.../xotcl1.xotcl) (revision 1a2ed9fd48d2c4326e27378a9a8accae1c008bad) +++ library/lib/xotcl1.xotcl (.../xotcl1.xotcl) (revision 90358010d417481db6164f879f01b41e789f09f7) @@ -248,8 +248,8 @@ .method instbody {o methodName} { lindex [::xotcl::cmd::ClassInfo::method $o definition $methodName] end } - .method instpre {o methodName} {::xotcl::cmd::ClassInfo::method $o pre $methodName} - .method instpost {o methodName} {::xotcl::cmd::ClassInfo::method $o post $methodName} + .method instpre {o methodName} {::xotcl::cmd::ClassInfo::method $o precondition $methodName} + .method instpost {o methodName} {::xotcl::cmd::ClassInfo::method $o postcondition $methodName} # info options emulated by "info methods" .method instcommands {o {pattern:optional ""}} {