AST toString fixes.

mpartel · Mar 18, 2013 · 847e711 · 847e711
1 parent cf12368
commit 847e711
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/minicompiler/ast/IfStatement.java b/src/main/java/minicompiler/ast/IfStatement.java
@@ -20,6 +20,10 @@ public IfStatement(Expr condition, Statement thenClause) {
     public void accept(AstVisitor v) {
         v.visit(this);
     }
+
+    public boolean hasElseClause() {
+        return !(elseClause instanceof EmptyStatement);
+    }
 
     @Override
     public boolean equals(Object obj) {
@@ -41,10 +45,10 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        if (elseClause instanceof EmptyStatement) {
-            return "if (" + condition + ") " + thenClause;
+        if (hasElseClause()) {
+            return "if " + condition + " then " + thenClause + " else " + elseClause;
         } else {
-            return "if (" + condition + ") " + thenClause + " else " + elseClause;
+            return "if " + condition + " then " + thenClause;
         }
     }
 }
diff --git a/src/main/java/minicompiler/ast/WhileLoop.java b/src/main/java/minicompiler/ast/WhileLoop.java
@@ -32,6 +32,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "while (" + head + ") { " + body + " }";
+        return "while " + head + " do " + body;
     }
 }