n2o
diff --git a/‎ASTTypechecker.java
Copy file name to clipboardExpand all lines: ASTTypechecker.java
+38-5Lines changed: 38 additions & 5 deletions b/‎ASTTypechecker.java
Copy file name to clipboardExpand all lines: ASTTypechecker.java
+38-5Lines changed: 38 additions & 5 deletions
diff --git a/‎Pascal.pas
Copy file name to clipboardExpand all lines: Pascal.pas
+5-5Lines changed: 5 additions & 5 deletions b/‎Pascal.pas
Copy file name to clipboardExpand all lines: Pascal.pas
+5-5Lines changed: 5 additions & 5 deletions
@@ -8,6 +8,29 @@ public class ASTTypeChecker extends DepthFirstAdapter {
     private HashMap<String, String> symbolTable = new HashMap<String, String>();
     private String result;
 
+    /**
+     * Check if break is only used in a while context
+     */
+    public void caseABreakExpr(ABreakExpr node) {
+        Node parent = node.parent();
+        String parentName;
+
+        do {
+            parent = parent.parent();
+            parentName = parent.getClass().getSimpleName().replaceAll(" ","");
+
+            if (parentName.equals("AWhileExpr")) break;
+
+        } while (!parentName.equals("AStartExpr"));
+
+        if (parentName.equals("AStartExpr")) {
+            System.out.println("# Error: User 'break' only in a 'while' context!");
+            System.exit(1);
+        } else {
+            printValidOperation("break");
+        }
+    }
+
     /**
      * Look up all the declarations and put it into the HashMap
      */
@@ -159,14 +182,24 @@ public void caseAMinusExpr(AMinusExpr node) {
     }
     @Override
     public void caseAUnaryMinusExpr(AUnaryMinusExpr node) {
-        String operation = "unaryminus";
+        String operation = "unary -";
         node.getExpr().apply(this);
 
-        System.out.println("+ "+node.getExpr().getClass().getSimpleName());
+        if (!result.equals("integer") && !node.getExpr().getClass().getSimpleName().equals("AIdentifierExpr") && !node.getExpr().getClass().getSimpleName().equals("ANumberExpr")) {
+            System.out.println("# Error: Syntax of '"+operation+"' is '"+operation+"' 'integer' = 'integer'.");
+            System.exit(1);
+        } else
+            printValidOperation(operation);
+    }
+    @Override
+    public void caseAUnaryPlusExpr(AUnaryPlusExpr node) {
+        String operation = "unary +";
+        node.getExpr().apply(this);
 
-        if (!result.equals("integer") || !node.getExpr().getClass().getSimpleName().equals("AIdentifierExpr"))
-            printErrorArithmeticOperation(operation);
-        else
+        if (!result.equals("integer") && !node.getExpr().getClass().getSimpleName().equals("AIdentifierExpr") && !node.getExpr().getClass().getSimpleName().equals("ANumberExpr")) {
+            System.out.println("# Error: Syntax of '"+operation+"' is '"+operation+"' 'integer' = 'integer'.");
+            System.exit(1);
+        } else
             printValidOperation(operation);
     }
     @Override
 
@@ -3,18 +3,18 @@
 var b: integer; 
 var temp : integer ; 
 var c : boolean;
-
 begin
 
-//if 2=2 and not 2<>2 then writeln(1);
+	if 1<2 then begin writeln(1); end else writeln(2)
+
 //	c := true = 1<2;
-	a := 1;
+	{a := 1;
 	b := 1;
 	while True do 
 	begin 
 		writeln(a);
-		temp := -b;
 		b := a + b;
+		
 		a := temp;
-	end
+	end}
 end.