summaryrefslogtreecommitdiffstats
path: root/generic/tclCompCmds.c
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2008-11-17 22:26:53 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2008-11-17 22:26:53 (GMT)
commitdee5b7a791b4b64cdfe7ae6c9981aff8d85848d5 (patch)
tree2feeafa4d0aa3b3a07938ff5db6643a4ee5dc488 /generic/tclCompCmds.c
parentdb2e6bf825388498ab5798bbeca26fce23d4286f (diff)
downloadtcl-dee5b7a791b4b64cdfe7ae6c9981aff8d85848d5.zip
tcl-dee5b7a791b4b64cdfe7ae6c9981aff8d85848d5.tar.gz
tcl-dee5b7a791b4b64cdfe7ae6c9981aff8d85848d5.tar.bz2
Fix [Bug 2251175]: missing backslash substitution on expanded literals.
Diffstat (limited to 'generic/tclCompCmds.c')
-rw-r--r--generic/tclCompCmds.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index 4f7f230..e36d546 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -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: tclCompCmds.c,v 1.148 2008/10/05 20:47:52 nijtmans Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.149 2008/11/17 22:26:53 ferrieux Exp $
*/
#include "tclInt.h"
@@ -4438,7 +4438,7 @@ TclCompileSwitchCmd(
* Keep in sync with TclCompileRegexpCmd.
*/
- if (bodyToken[i]->type == TCL_TOKEN_TEXT) {
+ if (bodyToken[i]->type & (TCL_TOKEN_TEXT|TCL_TOKEN_UNCOLLAPSED_TEXT)) {
Tcl_DString ds;
if (bodyToken[i]->size == 0) {
@@ -4983,8 +4983,8 @@ PushVarName(
}
}
} else if (((n = varTokenPtr->numComponents) > 1)
- && (varTokenPtr[1].type == TCL_TOKEN_TEXT)
- && (varTokenPtr[n].type == TCL_TOKEN_TEXT)
+ && (varTokenPtr[1].type & (TCL_TOKEN_TEXT|TCL_TOKEN_UNCOLLAPSED_TEXT))
+ && (varTokenPtr[n].type & (TCL_TOKEN_TEXT|TCL_TOKEN_UNCOLLAPSED_TEXT))
&& (varTokenPtr[n].start[varTokenPtr[n].size - 1] == ')')) {
/*