From 6f298e8ae2938056f26d538a211c23ba4b4fce19 Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 5 May 2005 17:20:21 +0000 Subject: * generic/tclCompCmds.c: Factored common efficiency trick into a macro named CompileWord. --- ChangeLog | 3 ++ generic/tclCompCmds.c | 123 +++++++++++++------------------------------------- 2 files changed, 35 insertions(+), 91 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6f01ce..b2f5f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-05 Don Porter + * generic/tclCompCmds.c: Factored common efficiency trick into + a macro named CompileWord. + * generic/tclCompCmds.c: Replaced all instance of * generic/tclCompile.c: TCL_OUT_LINE_COMPILE with TCL_ERROR. * generic/tclInt.h: Now that we've eradicated the mistaken diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c index 70c2570..97e1ff4 100644 --- a/generic/tclCompCmds.c +++ b/generic/tclCompCmds.c @@ -11,13 +11,31 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompCmds.c,v 1.65 2005/05/05 15:32:20 dgp Exp $ + * RCS: @(#) $Id: tclCompCmds.c,v 1.66 2005/05/05 17:21:03 dgp Exp $ */ #include "tclInt.h" #include "tclCompile.h" /* + * Macro that encapsulates an efficiency trick that avoids a function + * call for the simplest of compiles. The ANSI C "prototype" for this + * macro is: + * + * static void CompileWord _ANSI_ARGS((CompileEnv *envPtr, + * Tcl_Token *tokenPtr, Tcl_Inter *interp)); + */ + +#define CompileWord(envPtr, tokenPtr, interp) \ + if ((tokenPtr)->type == TCL_TOKEN_SIMPLE_WORD) { \ + TclEmitPush(TclRegisterNewLiteral((envPtr), (tokenPtr)[1].start, \ + (tokenPtr)[1].size), (envPtr)); \ + } else { \ + TclCompileTokens((interp), (tokenPtr)+1, (tokenPtr)->numComponents, \ + (envPtr)); \ + } + +/* * Prototypes for procedures defined later in this file: */ @@ -109,13 +127,7 @@ TclCompileAppendCmd(interp, parsePtr, envPtr) if (numWords > 2) { valueTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); - if (valueTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - valueTokenPtr[1].start, valueTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, valueTokenPtr+1, - valueTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, valueTokenPtr, interp); } /* @@ -247,6 +259,7 @@ TclCompileCatchCmd(interp, parsePtr, envPtr) + (parsePtr->tokenPtr->numComponents + 1); if (parsePtr->numWords == 3) { nameTokenPtr = cmdTokenPtr + (cmdTokenPtr->numComponents + 1); + /* DGP */ if (nameTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { name = nameTokenPtr[1].start; nameChars = nameTokenPtr[1].size; @@ -1515,13 +1528,7 @@ TclCompileLappendCmd(interp, parsePtr, envPtr) if (numWords > 2) { valueTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); - if (valueTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - valueTokenPtr[1].start, valueTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, valueTokenPtr+1, - valueTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, valueTokenPtr, interp); } /* @@ -1601,12 +1608,7 @@ TclCompileLassignCmd(interp, parsePtr, envPtr) * Generate code to push list being taken apart by [lassign]. */ tokenPtr = parsePtr->tokenPtr + (parsePtr->tokenPtr->numComponents + 1); - if (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - tokenPtr[1].start, tokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, tokenPtr+1, tokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, tokenPtr, interp); /* * Generate code to assign values from the list to variables @@ -1716,14 +1718,7 @@ TclCompileLindexCmd(interp, parsePtr, envPtr) */ for (i=1 ; itype == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush( - TclRegisterNewLiteral(envPtr, varTokenPtr[1].start, - varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); varTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); } @@ -1791,13 +1786,7 @@ TclCompileListCmd(interp, parsePtr, envPtr) valueTokenPtr = parsePtr->tokenPtr + (parsePtr->tokenPtr->numComponents + 1); for (i = 1; i < numWords; i++) { - if (valueTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - valueTokenPtr[1].start, valueTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, valueTokenPtr+1, - valueTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, valueTokenPtr, interp); valueTokenPtr = valueTokenPtr + (valueTokenPtr->numComponents + 1); } TclEmitInstInt4(INST_LIST, numWords - 1, envPtr); @@ -1839,17 +1828,7 @@ TclCompileLlengthCmd(interp, parsePtr, envPtr) varTokenPtr = parsePtr->tokenPtr + (parsePtr->tokenPtr->numComponents + 1); - if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - /* - * We could simply count the number of elements here and push - * that value, but that is too rare a case to waste the code space. - */ - TclEmitPush(TclRegisterNewLiteral(envPtr, varTokenPtr[1].start, - varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); TclEmitOpcode(INST_LIST_LENGTH, envPtr); return TCL_OK; } @@ -1939,13 +1918,7 @@ TclCompileLsetCmd(interp, parsePtr, envPtr) /* Push an arg */ - if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, varTokenPtr[1].start, - varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); } /* @@ -2208,13 +2181,7 @@ TclCompileRegexpCmd(interp, parsePtr, envPtr) * Push the string arg */ varTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); - if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - varTokenPtr[1].start, varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); if (anchorLeft && anchorRight && !nocase) { TclEmitOpcode(INST_STR_EQ, envPtr); @@ -2312,15 +2279,7 @@ cleanup: */ if (explicitResult) { - if (wordTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - /* Simple word: compile quickly to a simple push */ - TclEmitPush(TclRegisterNewLiteral(envPtr, wordTokenPtr[1].start, - wordTokenPtr[1].size), envPtr); - } else { - /* More complex tokens get compiled */ - TclCompileTokens(interp, wordTokenPtr+1, - wordTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, wordTokenPtr, interp); } else { /* No explict result argument, so default result is empty string */ TclEmitPush(TclRegisterNewLiteral(envPtr, "", 0), envPtr); @@ -2421,13 +2380,7 @@ TclCompileSetCmd(interp, parsePtr, envPtr) if (isAssignment) { valueTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); - if (valueTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, valueTokenPtr[1].start, - valueTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, valueTokenPtr+1, - valueTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, valueTokenPtr, interp); } /* @@ -2576,13 +2529,7 @@ TclCompileStringCmd(interp, parsePtr, envPtr) */ for (i = 0; i < 2; i++) { - if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - varTokenPtr[1].start, varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); varTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); } @@ -2603,13 +2550,7 @@ TclCompileStringCmd(interp, parsePtr, envPtr) */ for (i = 0; i < 2; i++) { - if (varTokenPtr->type == TCL_TOKEN_SIMPLE_WORD) { - TclEmitPush(TclRegisterNewLiteral(envPtr, - varTokenPtr[1].start, varTokenPtr[1].size), envPtr); - } else { - TclCompileTokens(interp, varTokenPtr+1, - varTokenPtr->numComponents, envPtr); - } + CompileWord(envPtr, varTokenPtr, interp); varTokenPtr = varTokenPtr + (varTokenPtr->numComponents + 1); } -- cgit v0.12