diff options
| author | andreas_kupries <akupries@shaw.ca> | 2008-07-22 22:24:19 (GMT) |
|---|---|---|
| committer | andreas_kupries <akupries@shaw.ca> | 2008-07-22 22:24:19 (GMT) |
| commit | 0ed5c6869b7c4c0b89033e5f79d317cdcc947c3f (patch) | |
| tree | e1d66e337f44de075be7bca2d30d0e86c2bf2abd | |
| parent | 6df65aa18ab8b9cb1f2791881680962f47e22804 (diff) | |
| download | tcl-0ed5c6869b7c4c0b89033e5f79d317cdcc947c3f.zip tcl-0ed5c6869b7c4c0b89033e5f79d317cdcc947c3f.tar.gz tcl-0ed5c6869b7c4c0b89033e5f79d317cdcc947c3f.tar.bz2 | |
* generic/tclCompile.c: Made the new TclEnterCmdWordIndex
* generic/tclCompile.h: static, and ansified.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclCompile.c | 25 | ||||
| -rw-r--r-- | generic/tclCompile.h | 5 |
3 files changed, 19 insertions, 16 deletions
@@ -1,5 +1,8 @@ 2008-07-22 Andreas Kupries <andreask@activestate.com> + * generic/tclCompile.c: Made the new TclEnterCmdWordIndex + * generic/tclCompile.h: static, and ansified. + * generic/tclBasic.c: Ansified the new functions. * generic/tclBasic.c: Reworked the handling of bytecode literals @@ -17,7 +20,7 @@ * generic/tclExecute.c: let GetCommandSource use it. This solves * generic/tclInt.h: [Bug 2017146]. Thx dgp for the analysis. -2008-07-22 Andreas Kupries <andreask@activestate.com> +2008-07-21 Andreas Kupries <andreask@activestate.com> * generic/tclBasic.c: Extended the existing TIP #280 system (info * generic/tclCmdAH.c: frame), added the ability to track the diff --git a/generic/tclCompile.c b/generic/tclCompile.c index 79a9313..c754ef1 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.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: tclCompile.c,v 1.151 2008/07/22 21:41:51 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.152 2008/07/22 22:24:21 andreas_kupries Exp $ */ #include "tclInt.h" @@ -433,6 +433,9 @@ static void EnterCmdWordData(ExtCmdLoc *eclPtr, int srcOffset, Tcl_Token *tokenPtr, const char *cmd, int len, int numWords, int line, int **lines); +static void EnterCmdWordIndex (ExtCmdLoc *eclPtr, Tcl_Obj* obj, + int pc, int word); + /* * The structure below defines the bytecode Tcl object type by means of * procedures that can be invoked by generic object code. @@ -1461,10 +1464,10 @@ TclCompileScript( tokenPtr[1].start, tokenPtr[1].size); if (eclPtr->type == TCL_LOCATION_SOURCE) { - TclEnterCmdWordIndex (eclPtr, - envPtr->literalArrayPtr[objIndex].objPtr, - envPtr->codeNext - envPtr->codeStart, - wordIdx); + EnterCmdWordIndex (eclPtr, + envPtr->literalArrayPtr[objIndex].objPtr, + envPtr->codeNext - envPtr->codeStart, + wordIdx); } } TclEmitPush(objIndex, envPtr); @@ -2465,12 +2468,12 @@ EnterCmdWordData( eclPtr->nuloc ++; } -void -TclEnterCmdWordIndex (eclPtr, obj, pc, word) - ExtCmdLoc *eclPtr; - Tcl_Obj* obj; - int pc; - int word; +static void +EnterCmdWordIndex ( + ExtCmdLoc *eclPtr, + Tcl_Obj* obj, + int pc, + int word) { ExtIndex* eiPtr; diff --git a/generic/tclCompile.h b/generic/tclCompile.h index ec3cbbf..63df8ce 100644 --- a/generic/tclCompile.h +++ b/generic/tclCompile.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.h,v 1.95 2008/07/22 21:41:55 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCompile.h,v 1.96 2008/07/22 22:24:21 andreas_kupries Exp $ */ #ifndef _TCLCOMPILATION @@ -148,9 +148,6 @@ typedef struct ExtCmdLoc { int nueiloc; } ExtCmdLoc; -EXTERN void TclEnterCmdWordIndex (ExtCmdLoc *eclPtr, Tcl_Obj* obj, - int pc, int word); - /* * CompileProcs need the ability to record information during compilation that * can be used by bytecode instructions during execution. The AuxData |