diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-30 15:25:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-30 15:25:48 (GMT) |
| commit | 438dbdc047dbc22f234da2b77c0ff395fc503bab (patch) | |
| tree | f515b3464b21496b520bc6ce33fd4567d11190d8 /generic | |
| parent | a24454331a3bdfcf0c0c5919ad315be020b490c9 (diff) | |
| parent | cb6ae544245fea42d68f1f1c0c3ab5fd92babcaf (diff) | |
| download | tcl-438dbdc047dbc22f234da2b77c0ff395fc503bab.zip tcl-438dbdc047dbc22f234da2b77c0ff395fc503bab.tar.gz tcl-438dbdc047dbc22f234da2b77c0ff395fc503bab.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclInterp.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/generic/tclInterp.c b/generic/tclInterp.c index c990dc0..69d2b13 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -621,36 +621,48 @@ NRInterpCmd( static const char *const options[] = { "alias", "aliases", "bgerror", "cancel", "children", "create", "debug", "delete", - "eval", "exists", "expose", - "hide", "hidden", "issafe", - "invokehidden", "limit", "marktrusted", "recursionlimit", + "eval", "exists", "expose", "hide", + "hidden", "issafe", "invokehidden", + "limit", "marktrusted", "recursionlimit", + "share", #ifndef TCL_NO_DEPRECATED "slaves", #endif + "target", "transfer", NULL + }; + static const char *const optionsNoSlaves[] = { + "alias", "aliases", "bgerror", "cancel", + "children", "create", "debug", "delete", + "eval", "exists", "expose", + "hide", "hidden", "issafe", + "invokehidden", "limit", "marktrusted", "recursionlimit", "share", "target", "transfer", NULL }; enum option { OPT_ALIAS, OPT_ALIASES, OPT_BGERROR, OPT_CANCEL, OPT_CHILDREN, OPT_CREATE, OPT_DEBUG, OPT_DELETE, - OPT_EVAL, OPT_EXISTS, OPT_EXPOSE, - OPT_HIDE, OPT_HIDDEN, OPT_ISSAFE, - OPT_INVOKEHID, OPT_LIMIT, OPT_MARKTRUSTED,OPT_RECLIMIT, + OPT_EVAL, OPT_EXISTS, OPT_EXPOSE, OPT_HIDE, + OPT_HIDDEN, OPT_ISSAFE, OPT_INVOKEHID, + OPT_LIMIT, OPT_MARKTRUSTED, OPT_RECLIMIT, OPT_SHARE, #ifndef TCL_NO_DEPRECATED OPT_SLAVES, #endif - OPT_SHARE, OPT_TARGET, OPT_TRANSFER + OPT_TARGET, OPT_TRANSFER }; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "cmd ?arg ...?"); return TCL_ERROR; } - if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, - &index) != TCL_OK) { + if (Tcl_GetIndexFromObj(NULL, objv[1], options, + "option", 0, &index) != TCL_OK) { + /* Don't report the "slaves" option as possibility */ + Tcl_GetIndexFromObj(interp, objv[1], optionsNoSlaves, + "option", 0, &index); return TCL_ERROR; } - switch ((enum option) index) { + switch ((enum option)index) { case OPT_ALIAS: { Tcl_Interp *parentInterp; |