Implemented Visual Error Messages, optimiezed code, calculate the right stack height and corrected the right calculation of the label indices

Author: n2o

ASTPrinter.class

@@ -10,11 +10,14 @@
  */
 
 public class CodeGenerator extends DepthFirstAdapter {
-    public String code = "";
-    public HashMap<String, Integer> symbolTable = new HashMap<String, Integer>();
+    private String code = "";
+    private HashMap<String, Integer> symbolTable = new HashMap<String, Integer>();
     private HashMap<String, String> typeTable;
     private String type = "";
     private int countLabels = 0;
+    private int compareCounter = 0;
+    private int breakCounter = 0;
+    private int stackHeight = 1;
 
     public CodeGenerator(HashMap<String, String> symbolTable) {
         typeTable = symbolTable;
@@ -24,45 +27,41 @@ public CodeGenerator(HashMap<String, String> symbolTable) {
     @Override
     public void outAAndExpr(AAndExpr node) {
         code += "\tiand\n";
+        stackHeight--;
         type = "boolean";
     }
     @Override
     public void outAOrExpr(AOrExpr node) {
         code += "\tior\n";
+        stackHeight--;
         type = "boolean";
     }
     @Override
     public void outAXorExpr(AXorExpr node) {
         code += "\tixor\n";
+        stackHeight--;
         type = "boolean";
     }
     @Override
     public void outANotExpr(ANotExpr node) {
         code += "\tineg\n";
         type = "boolean";
     }
-    @Override
-    public void outATrueExpr(ATrueExpr node) {
-        code += "\tbipush 1\n";
-        type = "boolean";
-    }
-    @Override
-    public void outAFalseExpr(AFalseExpr node) {
-        code += "\tbipush 0\n";
-        type = "boolean";
-    }
-
     // Arithmetic operations
     @Override
     public void outAPlusExpr(APlusExpr node) {
         code += "\tiadd\n";
+        stackHeight--;
         type = "integer";
     }
     @Override
     public void outAMinusExpr(AMinusExpr node) {
         code += "\tisub\n";
+        stackHeight--;
         type = "integer";
     }
+
+    // Arithmetic expressions
     @Override                                               // NEED TO TEST THIS!
     public void outAUnaryMinusExpr(AUnaryMinusExpr node) {
         code += "\tineg\n";
@@ -71,11 +70,13 @@ public void outAUnaryMinusExpr(AUnaryMinusExpr node) {
     @Override
     public void outAMultExpr(AMultExpr node) {
         code += "\timul\n";
+        stackHeight--;
         type = "integer";
     }
     @Override
     public void outADivExpr(ADivExpr node) {
         code += "\tidiv\n";
+        stackHeight--;
         type = "integer";
     }
     @Override
@@ -84,16 +85,14 @@ public void outAModExpr(AModExpr node) {
         type = "integer";
     }
 
-    // Comparisons
-
-    // Identifier
+    // Check identifier
     @Override
     public void outAIdentifierExpr(AIdentifierExpr node) {
         boolean check = true;
         String identifier = node.getIdentifier().toString().toLowerCase().replaceAll(" ","");
         Node parent = node;
         String parentName;
-        do {
+        do {        // Needed to check, if we are in a declaration-context
             parent = parent.parent();
             parentName = parent.getClass().getSimpleName().replaceAll(" ","");
             if (parentName.equals("ADeclarationExpr")) check = false;
@@ -102,6 +101,7 @@ public void outAIdentifierExpr(AIdentifierExpr node) {
 
         if (check) {
             code += "\tiload "+symbolTable.get(identifier)+"\n";
+            stackHeight++;
             type = typeTable.get(identifier);
         }
     }
@@ -111,47 +111,137 @@ public void outAIdentifierExpr(AIdentifierExpr node) {
     public void caseAAssignmentExpr(AAssignmentExpr node) {
         node.getExpr().apply(this);
         code += "\tistore "+symbolTable.get(node.getIdentifier().toString().toLowerCase().replaceAll(" ",""))+"\n";
+        stackHeight--;
     }
     @Override
     public void caseANumberExpr(ANumberExpr node) {
-        code += "\tldc "+node.getNumber().toString().replaceAll(" ","")+"\n";
+        code += "\tbipush "+node.getNumber().toString().replaceAll(" ","")+"\n";
+        stackHeight++;
         type = "integer";
     }
     @Override
     public void caseATrueExpr(ATrueExpr node) {
-        code += "\tldc 1\n";
+        code += "\tbipush 1\n";
+        stackHeight++;
         type = "boolean";
     }
     @Override
     public void caseAFalseExpr(AFalseExpr node) {
-        code += "\tldc 0\n";
+        code += "\tbipush 0\n";
+        stackHeight++;
         type = "boolean";
     }
     @Override
     public void caseAPrintExpr(APrintExpr node) {
         String intOrBoolean = "I";
-
         code += "\tgetstatic java/lang/System/out Ljava/io/PrintStream;\n";
         node.getExpr().apply(this);
         if (type.equals("boolean")) intOrBoolean = "Z";
         code += "\tinvokevirtual java/io/PrintStream/println("+intOrBoolean+")V\n";
+        stackHeight++;
     }
 
     // While loop
     @Override
     public void caseAWhileExpr(AWhileExpr node) {
-        code += "\tLabel"+countLabels+":\n";
+        breakCounter = countLabels;
+        int temp = countLabels++;
+        code += "LabelWhileUp"+temp+":\n";
         node.getLeft().apply(this);
-        code += "\ndone\n";
+        code += "\tifeq LabelWhileDown"+temp+"\n";
+        stackHeight--;
+        node.getRight().apply(this);
+        code += "\tgoto LabelWhileUp"+temp+"\n";
+        code += "LabelWhileDown"+temp+":\n";
+    }
+
+    // Break
+    @Override
+    public void caseABreakExpr(ABreakExpr node) {
+        code += "\tgoto LabelWhileDown"+breakCounter+"\n";
+    }
+
+    // If-then Part
+    @Override
+    public void caseAIfThenExpr(AIfThenExpr node) {
+        int temp = countLabels++;
+        node.getLeft().apply(this);
+        code += "\tifeq LabelIfDown"+temp+"\n";
+        stackHeight--;
+        node.getRight().apply(this);
+        code += "LabelIfDown"+temp+":\n";
+    }
+
+    // If-then-else Part
+    @Override
+    public void caseAIfThenElseExpr(AIfThenElseExpr node) {
+        int temp = countLabels++;
+        node.getIf().apply(this);
+        code += "\tifeq LabelIfElse"+temp+"\n";
+        stackHeight--;
+        node.getThen().apply(this);
+        code += "LabelIfElse"+temp+":\n";
+        node.getElse().apply(this);
     }
 
     // Comparisons
     @Override
     public void caseAComparisonExpr(AComparisonExpr node) {
-        String compare = node.getComparison().toString().toLowerCase().replaceAll(" ","");
-        if (compare.equals("<")) {
-            System.out.println("bombe");
-        }
+        int temp = 0;
+        node.getLeft().apply(this);
+        node.getRight().apply(this);
+        code += "\tisub\n";         // To check with zero
+        stackHeight--;
+        temp = compareCounter;
+        node.getComparison().apply(this);   // Add line matching to corresponding symbol
+        code += "\tbipush 0\n";
+        stackHeight++;
+        code += "\tgoto LabelCompEnd"+temp+"\n";
+        code += "LabelTrue"+temp+":\n";
+        code += "\tbipush 1\n";
+        stackHeight++;
+        code += "LabelCompEnd"+temp+":\n";
+    }
+    @Override
+    public void outAGtExpr(AGtExpr node) {
+        code += "\tifgt LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+    @Override
+    public void outAGeExpr(AGeExpr node) {
+        code += "\tifge LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+    @Override
+    public void outALtExpr(ALtExpr node) {
+        code += "\tiflt LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+    @Override
+    public void outALeExpr(ALeExpr node) {
+        code += "\tifle LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+    @Override
+    public void outANeExpr(ANeExpr node) {
+        code += "\tifne LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+    @Override
+    public void outAEqExpr(AEqExpr node) {
+        code += "\tifeq LabelTrue"+(compareCounter++)+"\n";
+        stackHeight--;
+    }
+
+    /********************************* Getter and Setter **************************************/
 
+    public HashMap<String, Integer> getSymbolTable() {
+        return symbolTable;
+    }
+    public String getCode() {
+        return code;
+    }
+    public int getStackHeight() {
+        return stackHeight;
     }
 }

CodeGenerator.java

@@ -0,0 +1,17 @@
+/* This file was generated by SableCC (http://www.sablecc.org/). */
+
+import node.*;
+
+@SuppressWarnings("serial")
+public class CodeGeneratorException extends Exception {
+    private Token token;
+
+    public CodeGeneratorException(@SuppressWarnings("hiding") Token token, String message) {
+        super(message);
+        this.token = token;
+    }
+
+    public Token getToken() {
+        return this.token;
+    }
+}

CodeGeneratorException.java

@@ -0,0 +1,63 @@
+.bytecode 50.0
+.class public Pascal
+.super java/lang/Object
+.method public <init>()V
+	.limit stack 1
+	.limit locals 1
+	aload_0
+	invokespecial java/lang/Object/<init>()V
+	return
+.end method
+	.method public static main([Ljava/lang/String;)V
+	.limit stack 9
+	.limit locals 5
+	bipush 1
+	istore 2
+	bipush 1
+	istore 3
+	iload 3
+	istore 2
+LabelWhileUp0:
+	iload 2
+	bipush 100
+	isub
+	iflt LabelTrue0
+	bipush 0
+	goto LabelCompEnd0
+LabelTrue0:
+	bipush 1
+LabelCompEnd0:
+	ifeq LabelWhileDown0
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	iload 2
+	invokevirtual java/io/PrintStream/println(I)V
+	iload 3
+	istore 1
+	iload 2
+	iload 3
+	iadd
+	istore 3
+	iload 1
+	istore 2
+	iload 2
+	bipush 34
+	isub
+	ifgt LabelTrue1
+	bipush 0
+	goto LabelCompEnd1
+LabelTrue1:
+	bipush 1
+LabelCompEnd1:
+	ifeq LabelIfElse1
+	goto LabelWhileDown0
+LabelIfElse1:
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 0
+	invokevirtual java/io/PrintStream/println(I)V
+	goto LabelWhileUp0
+LabelWhileDown0:
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 10
+	invokevirtual java/io/PrintStream/println(I)V
+	return
+.end method

Pascal.class

@@ -1,18 +1,18 @@
-program fibonacci_test; 
-var a,c : integer; 
-var b : boolean;
+program fibonacci;;
+var a : integer; 
+var b,D: integer; 
+var temp : integer; 
 begin
-	a := 1+4;
-	c := (42 div 4);
-
-	while a < c do
-		a := a+1;
-
-	writeln(a);
-end.
-
-
-{
-	 1 < 2
-	-1 < 0
-}
+a := 1;
+b := 1;
+a := b;
+while a < 100 do 
+	begin 
+		writeln(a);
+		temp := b;
+		b := a + b;
+		a := temp ;
+		if a > 34 then break else writeln(0);
+	end;
+writeln(10)
+end.