diff options
Diffstat (limited to 'generic/tclCompExpr.c')
| -rw-r--r-- | generic/tclCompExpr.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index a53a6f1..48208d8 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -10,7 +10,7 @@ * 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.88 2007/10/17 04:35:18 kennykb Exp $ + * RCS: @(#) $Id: tclCompExpr.c,v 1.89 2007/11/11 19:32:14 msofer Exp $ */ #include "tclInt.h" @@ -2057,8 +2057,8 @@ TclCompileExpr( TclAdvanceLines(&envPtr->line, script, script + TclParseAllWhiteSpace(script, numBytes)); - Tcl_ListObjGetElements(NULL, litList, &objc, (Tcl_Obj ***)&litObjv); - Tcl_ListObjGetElements(NULL, funcList, &objc, &funcObjv); + TclListObjGetElements(NULL, litList, &objc, (Tcl_Obj ***)&litObjv); + TclListObjGetElements(NULL, funcList, &objc, &funcObjv); CompileExprTree(interp, opTree, 0, &litObjv, funcObjv, parsePtr->tokenPtr, envPtr, 1 /* optimize */); } else { @@ -2206,7 +2206,8 @@ CompileExprTree( Tcl_DStringInit(&cmdName); Tcl_DStringAppend(&cmdName, "tcl::mathfunc::", -1); - p = Tcl_GetStringFromObj(*funcObjv++, &length); + p = TclGetStringFromObj(*funcObjv, &length); + funcObjv++; Tcl_DStringAppend(&cmdName, p, length); TclEmitPush(TclRegisterNewNSLiteral(envPtr, Tcl_DStringValue(&cmdName), @@ -2345,7 +2346,7 @@ CompileExprTree( Tcl_Obj *const *litObjv = *litObjvPtr; Tcl_Obj *literal = *litObjv; int length; - const char *bytes = Tcl_GetStringFromObj(literal, &length); + const char *bytes = TclGetStringFromObj(literal, &length); TclEmitPush(TclRegisterNewLiteral(envPtr, bytes, length), envPtr); (*litObjvPtr)++; |