Changeset 184

Timestamp:

10/08/09 11:26:04 (7 weeks ago)

Author:

lb

Message:

ParserState? with parsetree support

Files:

• trunk/cpp_analysis/src/xtc/lang/c4/C4ParserState.java (modified) (2 diffs)

trunk/cpp_analysis/src/xtc/lang/c4/C4ParserState.java

@@ -739 +739 @@
         macroValue = new Visitor() {
           public String visitObjectMacroValueSupported(GNode n) {
-            String dispatched = dispatch(n.getGeneric(0)).toString();
+                String dispatched = dispatch(n.getGeneric(0)).toString();
             return dispatched;
 
@@ -826 +826 @@
           public String visitLogicalOrExpression(GNode n) {
             long tmp1 = 0, tmp2 = 0, result = 0;
+            int pos2 = n.size()-1;
+            String tmpS1, tmpS2;
+           
+            tmpS1 = dispatch((Node)n.get(0)).toString();
+            tmp1  = string2long(tmpS1);
+               
+            tmpS2 = dispatch((Node)n.get(pos2)).toString();
+            tmp2  = string2long(tmpS2);
+
+            result = ( tmp1 != 0 ) || ( tmp2 != 0 ) ?  1 : 0;
+
+            return Long.toString(result);
+          }
+
+          public String visitLogicalAndExpression(GNode n) {
+            long tmp1 = 0, tmp2 = 0, result = 0;
+            int pos2 = n.size()-1;
             String tmpS1, tmpS2;
             tmpS1 = dispatch((Node)n.get(0)).toString();
             tmp1  = string2long(tmpS1);
 
-            tmpS2 = dispatch((Node)n.get(1)).toString();
-            tmp2  = string2long(tmpS2);
-
-            result = ( tmp1 != 0 ) || ( tmp2 != 0 ) ?  1 : 0;
-
-            return Long.toString(result);
-          }
-
-          public String visitLogicalAndExpression(GNode n) {
-            long tmp1 = 0, tmp2 = 0, result = 0;
-            String tmpS1, tmpS2;
-            tmpS1 = dispatch((Node)n.get(0)).toString();
-            tmp1  = string2long(tmpS1);
-
-            tmpS2 = dispatch((Node)n.get(1)).toString();
+            tmpS2 = dispatch((Node)n.get(pos2)).toString();
             tmp2  = string2long(tmpS2);