Changeset 820

Timestamp:

06/25/07 23:40:18 (17 months ago)

Author:

volker

Message:

calculate only necessary elements of operands

Files:

• branches/volker_dev/evaluator.c (modified) (22 diffs)

branches/volker_dev/evaluator.c

@@ -973 +973 @@
     RESULT *param[10];
 
-    for (i = 0; i < Root->Children; i++) {
-  EvalTree(Root->Child[i]);
-    }
-
     switch (Root->Token) {
 
@@ -992 +988 @@
   /* prepare parameter list */
   argc = Root->Children;
-  if (argc > 10)
+  if (argc > 10) {
+            error("evaluator: more than 10 children (operands) not supported!");
       argc = 10;
+        }
   for (i = 0; i < argc; i++) {
+            EvalTree(Root->Child[i]);
       param[i] = Root->Child[i]->Result;
   }
@@ -1012 +1011 @@
   case O_LST:   /* expression list: result is last expression */
       i = Root->Children - 1;
+            EvalTree(Root->Child[i]);
       type = Root->Child[i]->Result->type;
       number = Root->Child[i]->Result->number;
@@ -1018 +1018 @@
 
   case O_SET:   /* variable assignment */
+            EvalTree(Root->Child[0]);
       CopyResult(&Root->Variable->value, Root->Child[0]->Result);
       type = Root->Child[0]->Result->type;
@@ -1025 +1026 @@
 
   case O_CND:   /* conditional expression */
+            EvalTree(Root->Child[0]);
       i = 1 + (R2N(Root->Child[0]->Result) == 0.0);
+            EvalTree(Root->Child[i]);
       type = Root->Child[i]->Result->type;
       number = Root->Child[i]->Result->number;
@@ -1033 +1036 @@
   case O_OR:    /* logical OR */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            if (R2N(Root->Child[0]->Result) == 0.0) {
+                /* calculate 2nd operator only, if 1st operator is false */
+                EvalTree(Root->Child[1]);
+            }
       number = ((R2N(Root->Child[0]->Result) != 0.0) || (R2N(Root->Child[1]->Result) != 0.0));
       break;
@@ -1038 +1046 @@
   case O_AND:   /* logical AND */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            if (R2N(Root->Child[0]->Result) != 0.0) {
+                /* calculate 2nd operator only, if 1st operator is true */
+                EvalTree(Root->Child[1]);
+            }
       number = ((R2N(Root->Child[0]->Result) != 0.0) && (R2N(Root->Child[1]->Result) != 0.0));
       break;
@@ -1043 +1056 @@
   case O_EQ:    /* numeric equal */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) == R2N(Root->Child[1]->Result));
       break;
@@ -1048 +1063 @@
   case O_NE:    /* numeric not equal */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) != R2N(Root->Child[1]->Result));
       break;
@@ -1053 +1070 @@
   case O_LT:    /* numeric less than */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) < R2N(Root->Child[1]->Result));
       break;
@@ -1058 +1077 @@
   case O_LE:    /* numeric less equal */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) <= R2N(Root->Child[1]->Result));
       break;
@@ -1063 +1084 @@
   case O_GT:    /* numeric greater than */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) > R2N(Root->Child[1]->Result));
       break;
@@ -1068 +1091 @@
   case O_GE:    /* numeric greater equal */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = (R2N(Root->Child[0]->Result) >= R2N(Root->Child[1]->Result));
       break;
@@ -1073 +1098 @@
   case O_ADD:   /* addition */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) + R2N(Root->Child[1]->Result);
       break;
@@ -1078 +1105 @@
   case O_SUB:   /* subtraction */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) - R2N(Root->Child[1]->Result);
       break;
@@ -1083 +1112 @@
   case O_SGN:   /* sign */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
       number = -R2N(Root->Child[0]->Result);
       break;
@@ -1088 +1118 @@
   case O_CAT:   /* string concatenation */
       type = R_STRING;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       s1 = R2S(Root->Child[0]->Result);
       s2 = R2S(Root->Child[1]->Result);
@@ -1098 +1130 @@
   case O_MUL:   /* multiplication */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = R2N(Root->Child[0]->Result) * R2N(Root->Child[1]->Result);
       break;
@@ -1103 +1137 @@
   case O_DIV:   /* division */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       dummy = R2N(Root->Child[1]->Result);
       if (dummy == 0) {
@@ -1114 +1150 @@
   case O_MOD:   /* modulo */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       dummy = R2N(Root->Child[1]->Result);
       if (dummy == 0) {
@@ -1125 +1163 @@
   case O_POW:   /* x^y */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
+            EvalTree(Root->Child[1]);
       number = pow(R2N(Root->Child[0]->Result), R2N(Root->Child[1]->Result));
       break;
@@ -1130 +1170 @@
   case O_NOT:   /* logical NOT */
       type = R_NUMBER;
+            EvalTree(Root->Child[0]);
       number = (R2N(Root->Child[0]->Result) == 0.0);
       break;