diff options
| author | hobbs <hobbs> | 2007-12-07 21:08:43 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2007-12-07 21:08:43 (GMT) |
| commit | aeb2a84dc4e3d3c70aa56a9e7e9f23d5f6f7f4b8 (patch) | |
| tree | bec69f7c4d114859956ed32de8a0c7d54be10346 | |
| parent | 46f0613b28368ae48ed31ea8ebf08fcdeec3a8ce (diff) | |
| download | tcl-aeb2a84dc4e3d3c70aa56a9e7e9f23d5f6f7f4b8.zip tcl-aeb2a84dc4e3d3c70aa56a9e7e9f23d5f6f7f4b8.tar.gz tcl-aeb2a84dc4e3d3c70aa56a9e7e9f23d5f6f7f4b8.tar.bz2 | |
* generic/tclExecute.c (TclExecuteByteCode INST_REGEXP): Use
TCL_REG_NOSUB as we come here without capture vars.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | generic/tclExecute.c | 7 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2007-12-07 Jeff Hobbs <jeffh@ActiveState.com> + * generic/tclExecute.c (TclExecuteByteCode INST_REGEXP): Use + TCL_REG_NOSUB as we come here without capture vars. + * generic/tclIOCmd.c (FinalizeIOCmdTSD, Tcl_PutsObjCmd): cache stdout channel object for [puts $str] calls. diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 2b75c20..e537b4b 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclExecute.c,v 1.353 2007/11/19 17:25:22 das Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.354 2007/12/07 21:08:43 hobbs Exp $ */ #include "tclInt.h" @@ -4239,8 +4239,11 @@ TclExecuteByteCode( valuePtr = OBJ_AT_TOS; /* String */ value2Ptr = OBJ_UNDER_TOS; /* Pattern */ + /* + * Use TCL_REG_NOSUB as we come here without capture vars + */ regExpr = Tcl_GetRegExpFromObj(interp, value2Ptr, - TCL_REG_ADVANCED | (nocase ? TCL_REG_NOCASE : 0)); + TCL_REG_ADVANCED|TCL_REG_NOSUB|(nocase ? TCL_REG_NOCASE : 0)); if (regExpr == NULL) { match = -1; } else { |