summaryrefslogtreecommitdiffstats
path: root/generic/tclCompile.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-12-23 15:19:12 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-12-23 15:19:12 (GMT)
commit84864592a63d193a6d37a00b30919dbeeaa06e0b (patch)
treeb84a57f1ab697967ebc0dd34a1387ba8f0b80176 /generic/tclCompile.h
parent3d03d92371473a9fc9f9e8c054042b59717ad120 (diff)
parentef6f1ba2c34bd3243b54d46d23d37392d7bf34ba (diff)
downloadtcl-84864592a63d193a6d37a00b30919dbeeaa06e0b.zip
tcl-84864592a63d193a6d37a00b30919dbeeaa06e0b.tar.gz
tcl-84864592a63d193a6d37a00b30919dbeeaa06e0b.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclCompile.h')
-rw-r--r--generic/tclCompile.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index c097d6b..800e6af 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -1151,6 +1151,10 @@ MODULE_SCOPE void TclFinalizeLoopExceptionRange(CompileEnv *envPtr,
MODULE_SCOPE char * TclLiteralStats(LiteralTable *tablePtr);
MODULE_SCOPE int TclLog2(int value);
#endif
+MODULE_SCOPE int TclLocalScalar(const char *bytes, int numBytes,
+ CompileEnv *envPtr);
+MODULE_SCOPE int TclLocalScalarFromToken(Tcl_Token *tokenPtr,
+ CompileEnv *envPtr);
MODULE_SCOPE void TclOptimizeBytecode(void *envPtr);
#ifdef TCL_COMPILE_DEBUG
MODULE_SCOPE void TclPrintByteCodeObj(Tcl_Interp *interp,
@@ -1678,11 +1682,9 @@ MODULE_SCOPE int TclPushProcCallFrame(ClientData clientData,
#define AnonymousLocal(envPtr) \
(TclFindCompiledLocal(NULL, /*nameChars*/ 0, /*create*/ 1, (envPtr)))
#define LocalScalar(chars,len,envPtr) \
- (!TclIsLocalScalar((chars), (len)) ? -1 : \
- TclFindCompiledLocal((chars), (len), /*create*/ 1, (envPtr)))
+ TclLocalScalar(chars, len, envPtr)
#define LocalScalarFromToken(tokenPtr,envPtr) \
- ((tokenPtr)->type != TCL_TOKEN_SIMPLE_WORD ? -1 : \
- LocalScalar((tokenPtr)[1].start, (tokenPtr)[1].size, (envPtr)))
+ TclLocalScalarFromToken(tokenPtr, envPtr)
/*
* Flags bits used by TclPushVarName.