diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-18 14:02:43 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-12-18 14:02:43 (GMT) |
commit | 3515f81d8cea51544e1ef5949175795ca8ffa35f (patch) | |
tree | 4edd1194a441f8c5533744f7af5d390c008b0dd4 /generic/tclCompCmdsSZ.c | |
parent | f676347d4bf615c3cbf2bf40e3bd472a854f7944 (diff) | |
parent | ee58f2d325a281f03cf6669e8d7ae2c377a5af2d (diff) | |
download | tcl-3515f81d8cea51544e1ef5949175795ca8ffa35f.zip tcl-3515f81d8cea51544e1ef5949175795ca8ffa35f.tar.gz tcl-3515f81d8cea51544e1ef5949175795ca8ffa35f.tar.bz2 |
Improved the sequence of instructions issued for [subst] when dealing with
simple variable references.
Diffstat (limited to 'generic/tclCompCmdsSZ.c')
-rw-r--r-- | generic/tclCompCmdsSZ.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/generic/tclCompCmdsSZ.c b/generic/tclCompCmdsSZ.c index 9c93fb2..7bead0d 100644 --- a/generic/tclCompCmdsSZ.c +++ b/generic/tclCompCmdsSZ.c @@ -836,6 +836,34 @@ TclSubstCompile( TclEmitPush(literal, envPtr); count++; continue; + case TCL_TOKEN_VARIABLE: + /* + * Check for simple variable access; see if we can only generate + * TCL_OK or TCL_ERROR from the substituted variable read; if so, + * there is no need to generate elaborate exception-management + * code. Note that the first component of TCL_TOKEN_VARIABLE is + * always TCL_TOKEN_TEXT... + */ + + if (tokenPtr->numComponents > 1) { + int i, foundCommand = 0; + + for (i=2 ; i<=tokenPtr->numComponents ; i++) { + if (tokenPtr[i].type == TCL_TOKEN_COMMAND) { + foundCommand = 1; + break; + } + } + if (foundCommand) { + break; + } + } + + envPtr->line = bline; + TclCompileVarSubst(interp, tokenPtr, envPtr); + bline = envPtr->line; + count++; + continue; } while (count > 255) { |