summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-07-24 12:13:01 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-07-24 12:13:01 (GMT)
commit8f13e41a87de841f8b7552e04e74caeaca8b4b5b (patch)
tree1b45a8687e9681ed266b8c4050a00cd7a7030b49 /generic
parent1ea19bb4bad3984855b928d2a5213314b1111e47 (diff)
downloadtcl-8f13e41a87de841f8b7552e04e74caeaca8b4b5b.zip
tcl-8f13e41a87de841f8b7552e04e74caeaca8b4b5b.tar.gz
tcl-8f13e41a87de841f8b7552e04e74caeaca8b4b5b.tar.bz2
more disabled code removal
Diffstat (limited to 'generic')
-rw-r--r--generic/tclAssembly.c7
-rw-r--r--generic/tclEnsemble.c46
2 files changed, 0 insertions, 53 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 9b9b6f8..6bf2fa8 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -930,11 +930,9 @@ TclCompileAssembleCmd(
{
Tcl_Token *tokenPtr; /* Token in the input script */
-#if 1
int numCommands = envPtr->numCommands;
int offset = envPtr->codeNext - envPtr->codeStart;
int depth = envPtr->currStackDepth;
-#endif
/*
* Make sure that the command has a single arg that is a simple word.
@@ -956,7 +954,6 @@ TclCompileAssembleCmd(
if (TCL_ERROR == TclAssembleCode(envPtr, tokenPtr[1].start,
tokenPtr[1].size, TCL_EVAL_DIRECT)) {
-#if 1
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (\"%.*s\" body, line %d)",
parsePtr->tokenPtr->size, parsePtr->tokenPtr->start,
@@ -965,10 +962,6 @@ TclCompileAssembleCmd(
envPtr->codeNext = envPtr->codeStart + offset;
envPtr->currStackDepth = depth;
TclCompileSyntaxError(interp, envPtr);
-#else
- Tcl_ResetResult(interp);
- return TCL_ERROR;
-#endif
}
return TCL_OK;
}
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index bab63c9..ad11785 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -3205,7 +3205,6 @@ CompileBasicNArgCommand(
* compiled. */
CompileEnv *envPtr) /* Holds resulting instructions. */
{
-#if 1
Tcl_Obj *objPtr = Tcl_NewObj();
Tcl_IncrRefCount(objPtr);
@@ -3213,51 +3212,6 @@ CompileBasicNArgCommand(
TclCompileInvocation(interp, parsePtr->tokenPtr, objPtr,
parsePtr->numWords, envPtr);
Tcl_DecrRefCount(objPtr);
-#else
- Tcl_Token *tokenPtr;
- Tcl_Obj *objPtr;
- char *bytes;
- int length, i, literal;
- DefineLineInformation;
-
- /*
- * Push the name of the command we're actually dispatching to as part of
- * the implementation.
- */
-
- objPtr = Tcl_NewObj();
- Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr);
- bytes = Tcl_GetStringFromObj(objPtr, &length);
- literal = TclRegisterNewCmdLiteral(envPtr, bytes, length);
- TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, literal), cmdPtr);
- TclEmitPush(literal, envPtr);
- TclDecrRefCount(objPtr);
-
- /*
- * Push the words of the command.
- */
-
- tokenPtr = TokenAfter(parsePtr->tokenPtr);
- for (i=1 ; i<parsePtr->numWords ; i++) {
- if (tokenPtr->type == TCL_TOKEN_SIMPLE_WORD) {
- PushLiteral(envPtr, tokenPtr[1].start, tokenPtr[1].size);
- } else {
- SetLineInformation(i);
- CompileTokens(envPtr, tokenPtr, interp);
- }
- tokenPtr = TokenAfter(tokenPtr);
- }
-
- /*
- * Do the standard dispatch.
- */
-
- if (i <= 255) {
- TclEmitInstInt1(INST_INVOKE_STK1, i, envPtr);
- } else {
- TclEmitInstInt4(INST_INVOKE_STK4, i, envPtr);
- }
-#endif
return TCL_OK;
}