Typing: add check type of Assign expression

zhangshuwei · zhangshuwei · commit 94f8475b82a6 · 2018-02-25T10:37:34.000+01:00
diff --git a/phase2/Main/Compile.ml b/phase2/Main/Compile.ml
@@ -5,11 +5,11 @@ let execute lexbuf verbose =
     let ast = compilationUnit Lexer.token lexbuf in
     print_endline "successfull parsing";
 
-    (*if verbose then AST.print_program ast;
+    if verbose then AST.print_program ast;
     print_endline "===================";
     Typing.typing ast;
     if verbose then AST.print_program ast;
-    print_endline "successfull typing";*)
+    print_endline "successfull typing";
     Compilation.compileAST ast;
     print_endline "compile successfull";
 
diff --git a/phase2/Typing/Typing.ml b/phase2/Typing/Typing.ml
@@ -180,7 +180,11 @@ let rec verify_expression env current_env e =
       e.etype <- verify_name s env current_env
   | ArrayInit el -> () (*TODO*)
   | Array (e,el) -> () (*TODO*)
-  | AssignExp (e1,op,e2) -> () (*TODO*) 
+  | AssignExp (e1,op,e2) ->
+    verify_expression env current_env e1;
+    verify_expression env current_env e2;
+    verify_assignop_type e1.etype e2.etype;
+    e.etype <- e1.etype
   | Post (e,op) -> () (*TODO*)
   | Pre (op,e) -> () (*TODO*)
   | Op (e1,op,e2) -> 
diff --git a/phase2/tests/test.java b/phase2/tests/test.java
@@ -14,6 +14,7 @@ public I(int e) {
 	String mystring2 = func1(i);
 	private String func1 (int a) {
 		int b = 1;
+		b += (5+4);
 		return "YES";
 	}
 
