Tcl Source Code: Diff

Differences From Artifact [c3ddf26081]:

File generic/tclCompExpr.c — part of check-in [aaebedbc1e] at 2004-09-26 16:36:03 on branch trunk — Report compilation errors at runtime, [Patch 103368] by dgp. (user: msofer size: 27465)

To Artifact [5b53e980b8]:

File generic/tclCompExpr.c — part of check-in [6470fa7251] at 2004-10-06 05:52:20 on branch trunk — * generic/tclBasic.c: * generic/tclBinary.c: * generic/tclCmdAH.c: * generic/tclCmdIL.c: * generic/tclCmdMZ.c: * generic/tclCompExpr.c: * generic/tclDictObj.c: It is a poor practice to directly set or append to the value of the objResult of an interp, because that value might be shared, and in that circumstance a Tcl_Panic() will be the result. Searched for example of this practice and replaced with safer alternatives, often using the Tcl_AppendResult() routine that dkf just rehabilitated. (user: dgp size: 27361)

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19	- +	/* * tclCompExpr.c -- * * This file contains the code to compile Tcl expressions. * * Copyright (c) 1997 Sun Microsystems, Inc. * Copyright (c) 1998-2000 by Scriptics Corporation. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * * RCS: @(#) $Id: tclCompExpr.c,v 1.23 2004/~~09/2~~6 1~~6:36:04 msofer~~ Exp $ * RCS: @(#) $Id: tclCompExpr.c,v 1.24 2004/10/06 05:52:21 dgp Exp $ / #include "tclInt.h" #include "tclCompile.h" / * The stuff below is a bit of a hack so that this file can be used in
︙
834 835 836 837 838 839 840 ~~841 842~~ 843 844 845 846 847 848 849	834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849	- - + +	/* * Look up the MathFunc record for the function. / code = TCL_OK; hPtr = Tcl_FindHashEntry(&iPtr->mathFuncTable, funcName); if (hPtr == NULL) { ~~Tcl_Append~~StringsToObj(Tcl_GetObj~~Result(interp), ~~"unknown math function \"", funcName,~~ "\"", (char ) NULL);~~ Tcl_AppendResult(interp, "unknown math function \"", funcName, "\"", (char ) NULL); code = TCL_ERROR; goto done; } mathFuncPtr = (MathFunc ) Tcl_GetHashValue(hPtr); /* * If not a builtin function, push an object with the function's name.
︙
858 859 860 861 862 863 864 ~~865 866 867~~ 868 869 870 871 872 873 874 875 876 877 ~~878 879 880~~ 881 882 883 884 ~~885 886 887~~ 888 889 890 891 892 893 894	858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891	- - - + + - - - + + - - - + +	/ tokenPtr = exprTokenPtr+2; afterSubexprPtr = exprTokenPtr + (exprTokenPtr->numComponents + 1); if (mathFuncPtr->numArgs > 0) { for (i = 0; i < mathFuncPtr->numArgs; i++) { if (tokenPtr == afterSubexprPtr) { ~~~~Tcl_ResetResult(interp);~~ Tcl_~~AppendToObj(Tcl_G~~etObjResult(interp), "too few arguments for math function", -1);~~ Tcl_SetObjResult(interp, Tcl_NewStringObj( "too few arguments for math function", -1)); code = TCL_ERROR; goto done; } code = CompileSubExpr(tokenPtr, infoPtr, envPtr); if (code != TCL_OK) { goto done; } tokenPtr += (tokenPtr->numComponents + 1); } if (tokenPtr != afterSubexprPtr) { ~~~~Tcl_ResetResult(interp);~~ Tcl_~~AppendToObj(Tcl_G~~etObjResult(interp), "too many arguments for math function", -1);~~ Tcl_SetObjResult(interp, Tcl_NewStringObj( "too many arguments for math function", -1)); code = TCL_ERROR; goto done; } } else if (tokenPtr != afterSubexprPtr) { ~~~~Tcl_ResetResult(interp);~~ Tcl_~~AppendToObj(Tcl_G~~etObjResult(interp), "too many arguments for math function", -1);~~ Tcl_SetObjResult(interp, Tcl_NewStringObj( "too many arguments for math function", -1)); code = TCL_ERROR; goto done; } / * Compile the call on the math function. Note that the "objc" argument * count for non-builtin functions is incremented by 1 to include the
︙