Everything done for phase 1

Author: n2o

CodeGenerator.java

@@ -234,7 +234,6 @@ public void outAEqExpr(AEqExpr node) {
     }
 
     /********************************* Getter and Setter **************************************/
-
     public HashMap<String, Integer> getSymbolTable() {
         return symbolTable;
     }

Pascal.class

@@ -9,14 +9,16 @@
 	return
 .end method
 	.method public static main([Ljava/lang/String;)V
-	.limit stack 9
+	.limit stack 17
 	.limit locals 5
 	bipush 1
 	istore 2
 	bipush 1
 	istore 3
 	iload 3
 	istore 2
+	bipush 1
+	istore 4
 LabelWhileUp0:
 	iload 2
 	bipush 100
@@ -52,8 +54,45 @@ LabelCompEnd1:
 	goto LabelWhileDown0
 LabelIfElse1:
 	getstatic java/lang/System/out Ljava/io/PrintStream;
+	iload 2
+	invokevirtual java/io/PrintStream/println(I)V
+	bipush 1
+	bipush 2
+	isub
+	iflt LabelTrue2
+	bipush 0
+	goto LabelCompEnd2
+LabelTrue2:
+	bipush 1
+LabelCompEnd2:
+	ifeq LabelIfElse2
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 0
+	invokevirtual java/io/PrintStream/println(I)V
+LabelIfElse2:
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 100
+	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
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	iload 4
 	invokevirtual java/io/PrintStream/println(I)V
+	iload 4
+	bipush 1
+	iadd
+	istore 4
+	goto LabelWhileUp3
+LabelWhileDown3:
 	goto LabelWhileUp0
 LabelWhileDown0:
 	getstatic java/lang/System/out Ljava/io/PrintStream;

Pascal.j

@@ -1,18 +1,28 @@
-program fibonacci;;
+program fibonacci;
 var a : integer; 
 var b,D: integer; 
 var temp : 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 writeln(0);
+		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)
 end.

Pascal.pas

@@ -9,7 +9,6 @@
  *  - Catch uninitialized variables                                       *
  *************************************************************************/
 
-import com.sun.tools.corba.se.idl.IncludeGen;
 import lexer.Lexer;
 import lexer.LexerException;
 import node.Start;
@@ -22,18 +21,21 @@ public class StupsCompiler {
 
 	public static void main(String[] args) throws LexerException, IOException, ParserException {
         String input = "";
-        String fileName = args[1];
+        String fileName = "";
         if (args.length < 2) {  // catch valid number of arguments
             System.out.println("# Error: Not enough arguments.\n# Usage: > java StupsCompiler -argument <Filename.pas>\n# Valid arguments are: compile, liveness.");
             System.exit(1);
         }
         if (!args[1].endsWith(".pas")) {    // catch valid file extension
             System.out.println("# Error: Valid file extension is only '.pas'.");
             System.exit(1);
+        } else {
+            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);
 

StupsCompiler.class

@@ -273,7 +273,7 @@ public void caseAIdentifierExpr(AIdentifierExpr node) {
         String identifier = node.getIdentifier().toString().toLowerCase().replaceAll(" ","");
         checkDeclared(identifier);
         if (varInitialized.get(identifier) == 0) {
-            System.out.println("# Error: Identifier '"+identifier+"' has not been initialized. Terminating...");
+            System.out.println("# Error: Identifier '"+identifier+"' has been declared, but not initialized. Terminating...");
             System.exit(1);
         }
         this.result = symbolTable.get(identifier);
@@ -310,4 +310,4 @@ private void printErrorBooleanOperation(String operation) {
     public HashMap<String, String> getSymbolTable() {
         return symbolTable;
     }
-}
+}

StupsCompiler.java

@@ -9,14 +9,16 @@
 	return
 .end method
 	.method public static main([Ljava/lang/String;)V
-	.limit stack 9
+	.limit stack 17
 	.limit locals 5
 	bipush 1
 	istore 2
 	bipush 1
 	istore 3
 	iload 3
 	istore 2
+	bipush 1
+	istore 4
 LabelWhileUp0:
 	iload 2
 	bipush 100
@@ -52,8 +54,45 @@ LabelCompEnd1:
 	goto LabelWhileDown0
 LabelIfElse1:
 	getstatic java/lang/System/out Ljava/io/PrintStream;
+	iload 2
+	invokevirtual java/io/PrintStream/println(I)V
+	bipush 1
+	bipush 2
+	isub
+	iflt LabelTrue2
+	bipush 0
+	goto LabelCompEnd2
+LabelTrue2:
+	bipush 1
+LabelCompEnd2:
+	ifeq LabelIfElse2
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 0
+	invokevirtual java/io/PrintStream/println(I)V
+LabelIfElse2:
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	bipush 100
+	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
+	getstatic java/lang/System/out Ljava/io/PrintStream;
+	iload 4
 	invokevirtual java/io/PrintStream/println(I)V
+	iload 4
+	bipush 1
+	iadd
+	istore 4
+	goto LabelWhileUp3
+LabelWhileDown3:
 	goto LabelWhileUp0
 LabelWhileDown0:
 	getstatic java/lang/System/out Ljava/io/PrintStream;

TypeChecker.class

@@ -1,18 +1,28 @@
-program fibonacci;;
+program fibonacci;
 var a : integer; 
 var b,D: integer; 
 var temp : 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 writeln(0);
+		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)
 end.