diff options
| author | surles <surles@noemail.net> | 1999-04-21 18:16:44 (GMT) |
|---|---|---|
| committer | surles <surles@noemail.net> | 1999-04-21 18:16:44 (GMT) |
| commit | a25fa4a4d88708ff1dcf8d5d4baaa8a231bb6e81 (patch) | |
| tree | ef9e0f2e9d84e84787a71ed5b2d822f6fefac901 /generic/tclParseExpr.c | |
| parent | 4e68dbc1d601df57ce2d6ef3ba9a505c094a02c3 (diff) | |
| download | tcl-a25fa4a4d88708ff1dcf8d5d4baaa8a231bb6e81.zip tcl-a25fa4a4d88708ff1dcf8d5d4baaa8a231bb6e81.tar.gz tcl-a25fa4a4d88708ff1dcf8d5d4baaa8a231bb6e81.tar.bz2 | |
merged the parse changes between TclPro1.2 and Tcl8.1. Fixed bug in Windows makefile caused when the win/pkgIndex.tcl file was replaced
FossilOrigin-Name: 2874a749d4680fc13a6a74f2d24b0eaf1782343a
Diffstat (limited to 'generic/tclParseExpr.c')
| -rw-r--r-- | generic/tclParseExpr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c index 306d5de..fdbeaae 100644 --- a/generic/tclParseExpr.c +++ b/generic/tclParseExpr.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclParseExpr.c,v 1.2 1999/04/16 00:46:51 stanton Exp $ + * RCS: @(#) $Id: tclParseExpr.c,v 1.3 1999/04/21 18:16:46 surles Exp $ */ #include "tclInt.h" @@ -1279,6 +1279,7 @@ ParsePrimaryExpr(infoPtr) if (Tcl_ParseCommand(interp, src, (parsePtr->end - src), 1, &nested) != TCL_OK) { parsePtr->term = nested.term; + parsePtr->errorType = nested.errorType; parsePtr->incomplete = nested.incomplete; return TCL_ERROR; } @@ -1295,6 +1296,7 @@ ParsePrimaryExpr(infoPtr) TCL_STATIC); } parsePtr->term = tokenPtr->start; + parsePtr->errorType = TCL_PARSE_MISSING_BRACKET; parsePtr->incomplete = 1; return TCL_ERROR; } @@ -1514,6 +1516,7 @@ GetLexeme(infoPtr) Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", s, (char *) NULL); } + parsePtr->errorType = TCL_PARSE_BAD_NUMBER; return TCL_ERROR; } if (termPtr != src) { @@ -1537,6 +1540,7 @@ GetLexeme(infoPtr) if (interp != NULL) { TclExprFloatError(interp, doubleValue); } + parsePtr->errorType = TCL_PARSE_BAD_NUMBER; return TCL_ERROR; } @@ -1823,4 +1827,6 @@ LogSyntaxError(infoPtr) ((numBytes > 60)? 60 : numBytes), infoPtr->originalExpr); Tcl_AppendStringsToObj(Tcl_GetObjResult(infoPtr->parsePtr->interp), buffer, (char *) NULL); + infoPtr->parsePtr->errorType = TCL_PARSE_SYNTAX; + infoPtr->parsePtr->term = infoPtr->start; } |