diff options
author | nijtmans <nijtmans> | 2010-03-30 13:17:18 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-03-30 13:17:18 (GMT) |
commit | 99a07b16e988b6a00af29bde329bd9cae3e10cb0 (patch) | |
tree | a55a70484badac0ba698ce8fdce6dd6a81a47044 /generic/tclResult.c | |
parent | 7e552e85798f37d8c50d6a4720359422e664b63d (diff) | |
download | tcl-99a07b16e988b6a00af29bde329bd9cae3e10cb0.zip tcl-99a07b16e988b6a00af29bde329bd9cae3e10cb0.tar.gz tcl-99a07b16e988b6a00af29bde329bd9cae3e10cb0.tar.bz2 |
[FRQ 2974744]: share exception codes (ObjType?):
further optimization, making use of indexType.
Diffstat (limited to 'generic/tclResult.c')
-rw-r--r-- | generic/tclResult.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/generic/tclResult.c b/generic/tclResult.c index 4fcd285..1fcdfba 100644 --- a/generic/tclResult.c +++ b/generic/tclResult.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclResult.c,v 1.59 2010/03/27 22:40:14 nijtmans Exp $ + * RCS: @(#) $Id: tclResult.c,v 1.60 2010/03/30 13:17:18 nijtmans Exp $ */ #include "tclInt.h" @@ -1292,55 +1292,6 @@ TclProcessReturn( /* *---------------------------------------------------------------------- * - * TclGetCompletionCodeFromObj -- - * - * Parses Completion code Code - * - * Results: - * Returns TCL_ERROR if the value is an invalid completion code. - * Otherwise, returns TCL_OK, and writes the completion code to - * the pointer provided. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - -int -TclGetCompletionCodeFromObj( - Tcl_Interp *interp, /* Current interpreter. */ - Tcl_Obj *value, - int *code) /* Argument objects. */ -{ - if (TCL_ERROR == TclGetIntFromObj(NULL, value, code)) { - static const char *const returnCodes[] = { - "ok", "error", "return", "break", "continue", NULL - }; - - if (TCL_ERROR == Tcl_GetIndexFromObj(NULL, value, returnCodes, - NULL, TCL_EXACT, code)) { - /* - * Value is not a legal return code. - */ - - if (interp != NULL) { - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, "bad completion code \"", - TclGetString(value), - "\": must be ok, error, return, break, " - "continue, or an integer", NULL); - Tcl_SetErrorCode(interp, "TCL", "RESULT", "ILLEGAL_CODE", NULL); - } - return TCL_ERROR; - } - } - return TCL_OK; -} - -/* - *---------------------------------------------------------------------- - * * TclMergeReturnOptions -- * * Parses, checks, and stores the options to the [return] command. |