Changes in external/tcl/tclCompExpr.c [adeddd8:d7d2da3] in git

File:

• external/tcl/tclCompExpr.c (modified) (17 diffs)

external/tcl/tclCompExpr.c

@@ -31 +31 @@
 #define ERANGE 34
 #endif
+
+/*
+ * Boolean variable that controls whether expression compilation tracing
+ * is enabled.
+ */
+
+#ifdef TCL_COMPILE_DEBUG
+static int traceCompileExpr = 0;
+#endif /* TCL_COMPILE_DEBUG */
 
 /*
@@ -123 +132 @@
 #define NOT             (COLON + 1)
 #define BIT_NOT         (NOT + 1)
+
+/*
+ * Mapping from tokens to strings; used for debugging messages. These
+ * entries must match the order and number of the token definitions above.
+ */
+
+#ifdef TCL_COMPILE_DEBUG
+static char *tokenStrings[] = {
+    "LITERAL", "FUNCNAME",
+    "[", "]", "(", ")", "$", "\"", ",", "END", "UNKNOWN",
+    "*", "/", "%", "+", "-",
+    "<<", ">>", "<", ">", "<=", ">=", "==", "!=",
+    "&", "^", "|", "&&", "||", "?", ":",
+    "!", "~"
+};
+#endif /* TCL_COMPILE_DEBUG */
 
 /*
@@ -173 +198 @@
                             ExprInfo *infoPtr, CompileEnv *envPtr));
 
+/*
+ * Macro used to debug the execution of the recursive descent parser used
+ * to compile expressions.
+ */
+
+#ifdef TCL_COMPILE_DEBUG
+#define HERE(production, level) \
+    if (traceCompileExpr) { \
+        fprintf(stderr, "%*s%s: token=%s, next=\"%.20s\"\n", \
+                (level), " ", (production), tokenStrings[infoPtr->token], \
+                infoPtr->next); \
+    }
+#else
+#define HERE(production, level)
+#endif /* TCL_COMPILE_DEBUG */
 
 
@@ -237 +277 @@
                                  * to execute the expression. */
     int result;
+
+#ifdef TCL_COMPILE_DEBUG
+    if (traceCompileExpr) {
+        fprintf(stderr, "expr: string=\"%.30s\"\n", string);
+    }
+#endif /* TCL_COMPILE_DEBUG */
 
     /*
@@ -363 +409 @@
     int elseCodeOffset, currCodeOffset, jumpDist, result;
     
+    HERE("condExpr", 1);
     result = CompileLorExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -524 +571 @@
     Tcl_Obj *objPtr;
     
+    HERE("lorExpr", 2);
     result = CompileLandExpr(interp, infoPtr, flags, envPtr);
     if ((result != TCL_OK) || (infoPtr->token != OR)) {
@@ -691 +739 @@
     Tcl_Obj *objPtr;
 
+    HERE("landExpr", 3);
     result = CompileBitOrExpr(interp, infoPtr, flags, envPtr);
     if ((result != TCL_OK) || (infoPtr->token != AND)) {
@@ -850 +899 @@
     int result;
 
+    HERE("bitOrExpr", 4);
     result = CompileBitXorExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -920 +970 @@
     int result;
 
+    HERE("bitXorExpr", 5);
     result = CompileBitAndExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -990 +1041 @@
     int result;
 
+    HERE("bitAndExpr", 6);
     result = CompileEqualityExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1060 +1112 @@
     int op, result;
 
+    HERE("equalityExpr", 7);
     result = CompileRelationalExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1137 +1190 @@
     int op, result;
 
+    HERE("relationalExpr", 8);
     result = CompileShiftExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1223 +1277 @@
     int op, result;
 
+    HERE("shiftExpr", 9);
     result = CompileAddExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1300 +1355 @@
     int op, result;
 
+    HERE("addExpr", 10);
     result = CompileMultiplyExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1377 +1433 @@
     int op, result;
 
+    HERE("multiplyExpr", 11);
     result = CompileUnaryExpr(interp, infoPtr, flags, envPtr);
     if (result != TCL_OK) {
@@ -1456 +1513 @@
     int op, result;
 
+    HERE("unaryExpr", 12);
     op = infoPtr->token;
     if ((op == PLUS) || (op == MINUS) || (op == BIT_NOT) || (op == NOT)) {
@@ -1550 +1608 @@
      */
 
+    HERE("primaryExpr", 13);
     theToken = infoPtr->token;