added parens around unary operator expressions. added runrun target to make that parses the unparse output of a parse (for error checking purposes).

Author: rwcarlsen

parser/Makefile

@@ -45,7 +45,7 @@ Errors.class: Errors.java
 # clean
 ###
 clean:
-	rm -f *~ *.class parser.java Little.jlex.java sym.java
+	rm -f *~ *.class parser.java Little.jlex.java sym.java *.c
 
 ###
 # run provided parser
@@ -58,3 +58,7 @@ test:
 ###
 run: P3.class
 	java -classpath ${CP} P3 test.Little test.c
+
+runrun: P3.class
+	java -classpath ${CP} P3 test.Little test.c
+	java -classpath ${CP} P3 test.c testtest.c

parser/ast.java

@@ -762,8 +762,10 @@ public PlusPlusNode(IdNode id) {
 
   // ** unparse **
   public void unparse(PrintWriter p, int indent) {
+    p.print("(");
     myExp.unparse(p, indent);
     p.print("++");
+    p.print(")");
   }
 }
 
@@ -774,8 +776,10 @@ public MinusMinusNode(IdNode id) {
 
   // ** unparse **
   public void unparse(PrintWriter p, int indent) {
+    p.print("(");
     myExp.unparse(p, indent);
     p.print("--");
+    p.print(")");
   }
 }
 
@@ -786,8 +790,10 @@ public UnaryMinusNode(ExpNode exp) {
 
   // ** unparse **
   public void unparse(PrintWriter p, int indent) {
+    p.print("(");
     p.print("-");
     myExp.unparse(p, indent);
+    p.print(")");
   }
 }
 
@@ -798,8 +804,10 @@ public NotNode(ExpNode exp) {
 
   // ** unparse **
   public void unparse(PrintWriter p, int indent) {
+    p.print("(");
     p.print("!");
     myExp.unparse(p, indent);
+    p.print(")");
   }
 }
 

parser/test.Little

@@ -47,7 +47,20 @@ double myfunc3() {
     int g;
 
     /* nested if statements */
-      if(1 < 2) {}
+      if(1 < 2) {
+        while(a < b) {
+          int swiss;
+          double havarti;
+
+          if(1 < 2) {
+            int d;
+            int e;
+          }
+
+          swiss = 10;
+          havarti = 0.4 + swiss;
+        }
+      }
       f = f + a;
   }
   else {