Automated all the testcases

Author: n2o

Diff for: CodeGenerator.class

@@ -5,7 +5,6 @@
 
 /**
  * Need to test:
- *  - UnaryMinus
  *  - UnaryPlus not necessary?
  */
 
@@ -44,7 +43,13 @@ public void outAXorExpr(AXorExpr node) {
     }
     @Override
     public void outANotExpr(ANotExpr node) {
-        code += "\tineg\n";
+        int temp = countLabels++;
+        code += "\tifeq LabelNotTrue"+temp+"\n";
+        code += "\tbipush 0\n";
+        code += "\tgoto LabelNotEnd"+temp+"\n";
+        code += "LabelNotTrue"+temp+":\n";
+        code += "\tbipush 1\n";
+        code += "\tLabelNotEnd"+temp+":\n";
         type = "boolean";
     }
     // Arithmetic operations
@@ -115,7 +120,11 @@ public void caseAAssignmentExpr(AAssignmentExpr node) {
     }
     @Override
     public void caseANumberExpr(ANumberExpr node) {
-        code += "\tbipush "+node.getNumber().toString().replaceAll(" ","")+"\n";
+        int number = Integer.parseInt(node.getNumber().toString().replaceAll(" ", ""));
+        if (number > 255)
+            code += "\tldc "+number+"\n";
+        else
+            code += "\tbipush "+number+"\n";
         stackHeight++;
         type = "integer";
     }
@@ -144,7 +153,6 @@ public void caseAPrintExpr(APrintExpr node) {
     // While loop
     @Override
     public void caseAWhileExpr(AWhileExpr node) {
-        breakCounter = countLabels;
         int temp = countLabels++;
         code += "LabelWhileUp"+temp+":\n";
         node.getLeft().apply(this);
@@ -153,12 +161,13 @@ public void caseAWhileExpr(AWhileExpr node) {
         node.getRight().apply(this);
         code += "\tgoto LabelWhileUp"+temp+"\n";
         code += "LabelWhileDown"+temp+":\n";
+        code += "LabelBreakDown"+(breakCounter++)+":\n";
     }
 
     // Break
     @Override
     public void caseABreakExpr(ABreakExpr node) {
-        code += "\tgoto LabelWhileDown"+breakCounter+"\n";
+        code += "\tgoto LabelBreakDown"+breakCounter+"\n";
     }
 
     // If-then Part
@@ -180,8 +189,10 @@ public void caseAIfThenElseExpr(AIfThenElseExpr node) {
         code += "\tifeq LabelIfElse"+temp+"\n";
         stackHeight--;
         node.getThen().apply(this);
+        code += "\tgoto LabelIfElseEnd"+temp+"\n";
         code += "LabelIfElse"+temp+":\n";
         node.getElse().apply(this);
+        code += "LabelIfElseEnd"+temp+":\n";
     }
 
     // Comparisons

Diff for: CodeGenerator.java

@@ -0,0 +1,10 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: cmeter
+ * Date: 10.01.13
+ * Time: 19:53
+ * To change this template use File | Settings | File Templates.
+ */
+public class Liveness {
+    
+}

Diff for: CodeGeneratorException.class

@@ -9,19 +9,19 @@
 	return
 .end method
 	.method public static main([Ljava/lang/String;)V
-	.limit stack 17
-	.limit locals 5
-	bipush 1
-	istore 2
+	.limit stack 14
+	.limit locals 4
 	bipush 1
+	istore 1
+	iload 1
 	istore 3
 	iload 3
+	iload 1
+	iadd
 	istore 2
-	bipush 1
-	istore 4
 LabelWhileUp0:
-	iload 2
-	bipush 100
+	iload 1
+	bipush 10
 	isub
 	iflt LabelTrue0
 	bipush 0
@@ -30,73 +30,62 @@ 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
+	iload 1
+	bipush 1
+	iadd
 	istore 1
-	iload 2
+LabelWhileUp1:
 	iload 3
-	iadd
-	istore 3
-	iload 1
-	istore 2
-	iload 2
-	bipush 34
+	bipush 10
 	isub
-	ifgt LabelTrue1
+	iflt LabelTrue1
 	bipush 0
 	goto LabelCompEnd1
 LabelTrue1:
 	bipush 1
 LabelCompEnd1:
-	ifeq LabelIfElse1
-	goto LabelWhileDown0
-LabelIfElse1:
-	getstatic java/lang/System/out Ljava/io/PrintStream;
-	iload 2
-	invokevirtual java/io/PrintStream/println(I)V
+	ifeq LabelWhileDown1
+	iload 3
 	bipush 1
-	bipush 2
+	iadd
+	istore 3
+	goto LabelWhileUp1
+LabelWhileDown1:
+LabelBreakDown0:
+LabelWhileUp2:
+	iload 2
+	bipush 10
 	isub
 	iflt LabelTrue2
 	bipush 0
 	goto LabelCompEnd2
 LabelTrue2:
 	bipush 1
 LabelCompEnd2:
-	ifeq LabelIfElse2
+	ifeq LabelWhileDown2
 	getstatic java/lang/System/out Ljava/io/PrintStream;
-	bipush 0
+	iload 2
 	invokevirtual java/io/PrintStream/println(I)V
-LabelIfElse2:
+	goto LabelBreakDown1
 	getstatic java/lang/System/out Ljava/io/PrintStream;
-	bipush 100
+	ldc 111111
 	invokevirtual java/io/PrintStream/println(I)V
-LabelWhileUp3:
-	iload 4
-	bipush 5
-	isub
-	iflt LabelTrue3
-	bipush 0
-	goto LabelCompEnd3
-LabelTrue3:
-	bipush 1
-LabelCompEnd3:
-	ifeq LabelWhileDown3
+	goto LabelWhileUp2
+LabelWhileDown2:
+LabelBreakDown1:
+	goto LabelBreakDown2
 	getstatic java/lang/System/out Ljava/io/PrintStream;
-	iload 4
+	ldc 222222
+	invokevirtual java/io/PrintStream/println(I)V
+	goto LabelBreakDown2
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	ldc 333333
 	invokevirtual java/io/PrintStream/println(I)V
-	iload 4
-	bipush 1
-	iadd
-	istore 4
-	goto LabelWhileUp3
-LabelWhileDown3:
 	goto LabelWhileUp0
 LabelWhileDown0:
+LabelBreakDown2:
 	getstatic java/lang/System/out Ljava/io/PrintStream;
-	bipush 10
+	ldc 999999
 	invokevirtual java/io/PrintStream/println(I)V
 	return
 .end method

Diff for: Liveness.java

@@ -1,28 +1,27 @@
-program fibonacci;
-var a : integer; 
-var b,D: integer; 
-var temp : integer; 
+program parenthesis;
+var a,c,b : integer;
 begin
-a := 1;
-b := 1;
-a := b;
-d := 1;
-while a < 100 do 
-	begin 
-		writeln(a);
-		temp := b;
-		b := a + b;
-		a := temp ;
-		if a > 34 then break else
-		    begin
-		        writeln(a);
-		        if 1 < 2 then writeln(0) else writeln(100);
-		        while d < 5 do
-                    begin
-                        writeln(d);
-                        d := d+1;
-                    end;
-		    end;
-	end;
-writeln(10)
+	a := 1;
+	b := a;
+	c := b+a;
+
+	while a < 10 do
+		begin
+			a := a+1;
+			while b < 10 do
+				b := b+1;
+				begin
+					while c < 10 do
+						begin
+							writeln(c);
+							break;
+							writeln(111111);
+						end;
+					break;
+					writeln(222222);
+				end;
+			break;
+			writeln(333333);
+		end
+	writeln(999999);
 end.

Diff for: Pascal.class

@@ -33,18 +33,19 @@ public static void main(String[] args) throws LexerException, IOException, Parse
             fileName = args[1];
         }
         try {
-            if (args[0].equals("-compile")) {       // Compile section
-                String zeile;
-                fileName = args[1];
-                FileReader fr = new FileReader(fileName);
-                BufferedReader br = new BufferedReader(fr);
+            String zeile;
+            fileName = args[1];
+            FileReader fr = new FileReader(fileName);
+            BufferedReader br = new BufferedReader(fr);
 
+            zeile = br.readLine();
+            while (zeile != null) {
+                input += zeile+"\n";
                 zeile = br.readLine();
-                while (zeile != null) {
-                    input += zeile+"\n";
-                    zeile = br.readLine();
-                }
-                br.close();
+            }
+            br.close();
+
+            if (args[0].equals("-compile")) {       // Compile section
                 parse(input, fileName.substring(0, fileName.lastIndexOf('.')));
 
             } else if (args[0].equals("-liveness")) {
@@ -71,9 +72,9 @@ private static void printErrorLine(String message, String input) {
         int pos = Integer.parseInt(message.substring(message.indexOf(',') + 1, message.indexOf(']')));
         String[] split = input.split("\n");
 
+        if (line > split.length) line--;
         System.out.println("# "+split[line-1]);
         System.out.print("#");
-        pos += 0;
         while (pos != 0) {
             System.out.print(" ");
             pos--;
@@ -105,7 +106,6 @@ private static void parse(String input, String fileName) throws ParserException,
         start.apply(codeGenerator);
 
         output = createOutput(codeGenerator, fileName);
-//        System.out.println(output);
 
         Writer wout = new BufferedWriter(                      // Write everything to the outputfile.j
                 new OutputStreamWriter(