diff options
| author | dgp <dgp@users.sourceforge.net> | 2011-05-02 20:10:00 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2011-05-02 20:10:00 (GMT) |
| commit | 9af810992a3d08e5964ca72b8b6221e120fb42d8 (patch) | |
| tree | a52dbc4a8914a59243eb5871aa40958b6f8f5ccc /generic | |
| parent | 18503cb00a32b1fcb0cb46b7b3649903f38c989a (diff) | |
| download | tcl-9af810992a3d08e5964ca72b8b6221e120fb42d8.zip tcl-9af810992a3d08e5964ca72b8b6221e120fb42d8.tar.gz tcl-9af810992a3d08e5964ca72b8b6221e120fb42d8.tar.bz2 | |
Tests for expanded literals quoting detection.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclParse.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclParse.c b/generic/tclParse.c index c8d2012..96c2a10 100644 --- a/generic/tclParse.c +++ b/generic/tclParse.c @@ -496,6 +496,7 @@ Tcl_ParseCommand( * tokens representing the expanded list. */ + CONST char *listStart; int growthNeeded = wordIndex + 2*elemCount - parsePtr->numTokens; parsePtr->numWords += elemCount - 1; @@ -514,7 +515,7 @@ Tcl_ParseCommand( * word value. */ - nextElem = tokenPtr[1].start; + listStart = nextElem = tokenPtr[1].start; while (nextElem < listEnd) { int quoted; @@ -528,8 +529,9 @@ Tcl_ParseCommand( &(tokenPtr->start), &nextElem, &(tokenPtr->size), NULL); - quoted = tokenPtr->start[-1] == '{' - || tokenPtr->start[-1] == '"'; + quoted = (tokenPtr->start[-1] == '{' + || tokenPtr->start[-1] == '"') + && tokenPtr->start > listStart; tokenPtr[-1].start = tokenPtr->start - quoted; tokenPtr[-1].size = tokenPtr->start + tokenPtr->size - tokenPtr[-1].start + quoted; |