diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-10-23 15:34:01 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-10-23 15:34:01 (GMT) |
| commit | 21068ce2b708810c474f5cc2f6c11438114ad1d6 (patch) | |
| tree | 12582151b0a1ffc8f34e53f9610072afa876a53b /generic | |
| parent | 1356c7f642888ace1fe24f64ea003567fc6a8fdd (diff) | |
| parent | cb8dc8b181dfb98f074698fc7eade5f9dfdbefff (diff) | |
| download | tcl-21068ce2b708810c474f5cc2f6c11438114ad1d6.zip tcl-21068ce2b708810c474f5cc2f6c11438114ad1d6.tar.gz tcl-21068ce2b708810c474f5cc2f6c11438114ad1d6.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclCompile.c | 1 | ||||
| -rw-r--r-- | generic/tclScan.c | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/generic/tclCompile.c b/generic/tclCompile.c index dcd74f1..3c8e4ef 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -4034,7 +4034,6 @@ TclEmitInvoke( int savedStackDepth = envPtr->currStackDepth; int savedExpandCount = envPtr->expandCount; JumpFixup nonTrapFixup; - ExceptionAux *exceptAux = envPtr->exceptAuxArrayPtr + loopRange; if (auxBreakPtr != NULL) { auxBreakPtr = envPtr->exceptAuxArrayPtr + breakRange; diff --git a/generic/tclScan.c b/generic/tclScan.c index ef7eedf..4dfc2d6 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -406,11 +406,14 @@ ValidateFormat( */ case 'd': case 'e': + case 'E': case 'f': case 'g': + case 'G': case 'i': case 'o': case 'x': + case 'X': case 'b': break; case 'u': @@ -743,6 +746,7 @@ Tcl_ScanObjCmd( parseFlag |= TCL_PARSE_OCTAL_ONLY | TCL_PARSE_SCAN_PREFIXES; break; case 'x': + case 'X': op = 'i'; parseFlag |= TCL_PARSE_HEXADECIMAL_ONLY; break; @@ -758,7 +762,9 @@ Tcl_ScanObjCmd( case 'f': case 'e': + case 'E': case 'g': + case 'G': op = 'f'; break; |