diff options
| author | dgp <dgp@users.sourceforge.net> | 2004-01-13 23:15:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2004-01-13 23:15:02 (GMT) |
| commit | c9bd8ac5b1219903842bb5ad5e3f52220aa60701 (patch) | |
| tree | f2698cb54a86867e9b452e99687cf78e827059d2 /generic/tclInt.h | |
| parent | 09c3e3c827f50de5bf0960ebae0ba665da9a0a77 (diff) | |
| download | tcl-c9bd8ac5b1219903842bb5ad5e3f52220aa60701.zip tcl-c9bd8ac5b1219903842bb5ad5e3f52220aa60701.tar.gz tcl-c9bd8ac5b1219903842bb5ad5e3f52220aa60701.tar.bz2 | |
Patch 876451: restores performance of [return]. Also allows forms
such as [return -code error $msg] to be bytecompiled.
* generic/tclInt.h: Factored Tcl_ReturnObjCmd() into two pieces:
* generic/tclCmdMZ.c: TclMergeReturnOptions(), which can parse the
options to [return], check their validity, and create the
corresponding return options dictionary, and TclProcessReturn(),
which takes that return options dictionary and performs the
[return] operation.
* generic/tclCompCmds.c: Rewrote TclCompileReturnCmd() to
call TclMergeReturnOptions() at compile time so the return options
dictionary is computed at compile time (when it is fully known).
The dictionary is pushed on the stack along with the result, and
the code and level values are included in the bytecode as operands.
Also supports optimized compilation of un-[catch]ed [return]s from
procs with default options into the INST_DONE instruction.
* generic/tclExecute.c: Rewrote INST_RETURN instruction to retrieve
the code and level operands, pop the return options from the stack,
and call TclProcessReturn() to perform the [return] operation.
* generic/tclCompile.h: New utilities include TclEmitInt4 macro
* generic/tclCompile.c: and TclWordKnownAtCompileTime().
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 4734cd7..6423e4f 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclInt.h,v 1.139 2003/12/24 04:20:05 davygrvy Exp $ + * RCS: @(#) $Id: tclInt.h,v 1.140 2004/01/13 23:15:03 dgp Exp $ */ #ifndef _TCLINT @@ -1702,6 +1702,10 @@ EXTERN Tcl_Obj * TclLsetFlat _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *CONST indexArray[], Tcl_Obj* valuePtr )); +EXTERN int TclMergeReturnOptions _ANSI_ARGS_((Tcl_Interp *interp, + int objc, Tcl_Obj *CONST objv[], + Tcl_Obj **optionsPtrPtr, int *codePtr, + int *levelPtr)); EXTERN int TclParseBackslash _ANSI_ARGS_((CONST char *src, int numBytes, int *readPtr, char *dst)); EXTERN int TclParseHex _ANSI_ARGS_((CONST char *src, int numBytes, @@ -1710,6 +1714,8 @@ EXTERN int TclParseInteger _ANSI_ARGS_((CONST char *string, int numBytes)); EXTERN int TclParseWhiteSpace _ANSI_ARGS_((CONST char *src, int numBytes, Tcl_Parse *parsePtr, char *typePtr)); +EXTERN int TclProcessReturn _ANSI_ARGS_((Tcl_Interp *interp, + int code, int level, Tcl_Obj *returnOpts)); EXTERN int TclpObjAccess _ANSI_ARGS_((Tcl_Obj *filename, int mode)); EXTERN int TclpObjLstat _ANSI_ARGS_((Tcl_Obj *pathPtr, |