X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=compiler%2Fsrc%2Flib%2Ftiger%2Ftiger_test.ml;h=976fc3d9f0a6d6c96475df7c445aff357738a343;hb=ea3f5e0c5e110e3ff8b8e07fa07add2a231cb549;hp=6a9ca1063a9de72dd8f67177044077c287b9daac;hpb=e69e4e8b68e822e6dc65bfe4040d110eb3c18a71;p=tiger.ml.git

diff --git a/compiler/src/lib/tiger/tiger_test.ml b/compiler/src/lib/tiger/tiger_test.ml
index 6a9ca10..976fc3d 100644
--- a/compiler/src/lib/tiger/tiger_test.ml
+++ b/compiler/src/lib/tiger/tiger_test.ml
@@ -108,6 +108,13 @@ let pass_parsing code : (Tiger_absyn.t, string) result =
   | ast ->
       Ok ast
 
+let pass_semant (absyn_opt : Tiger_absyn.t option) : (unit, string) result =
+  match absyn_opt with
+  | None ->
+      Error "AST not provided"
+  | Some absyn ->
+      Ok (Tiger_semant.transProg absyn)
+
 let s = sprintf
 let p = printf
 let p_ln = print_newline
@@ -120,19 +127,19 @@ let run tests =
     let output_value  = None in
     match f input with
     | exception e ->
-        let c, e =
+        let status_text, error_text =
           (match e with
           | Tiger_error.T e when is_error_expected e ->
-              (Green, Tiger_error.to_string e)
+              ((color Green "OK"), Tiger_error.to_string e)
           | Tiger_error.T e ->
               incr error_count;
-              (Red, Tiger_error.to_string e)
+              ((color Red "ERROR"), Tiger_error.to_string e)
           | e ->
               incr error_count;
-              (Red, Printexc.to_string e)
+              ((color Red "ERROR"), Printexc.to_string e)
           )
         in
-        ( s "%s: %s" (color c "ERROR") e
+        ( s "%s: %s" status_text error_text
         , output_status
         , output_value
         )
@@ -168,13 +175,20 @@ let run tests =
           ~expect_output:out_lexing
           ~is_error_expected
       in
-      let (stat_pars_exe, stat_pars_out_cmp, _) =
+      let (stat_pars_exe, stat_pars_out_cmp, absyn_opt) =
         run_pass
           ~f:pass_parsing
           ~input:code
           ~expect_output:out_parsing
           ~is_error_expected
       in
+      let (stat_semant_exe, stat_semant_out_cmp, _) =
+        run_pass
+          ~f:pass_semant
+          ~input:absyn_opt
+          ~expect_output:(Some ())
+          ~is_error_expected
+      in
       p "%s" bar_sep; p_ln ();
       p "Test: %S" name; p_ln ();
         p_indent 1; p "Lexing:"; p_ln ();
@@ -183,6 +197,9 @@ let run tests =
         p_indent 1; p "Parsing:"; p_ln ();
           p_indent 2; p "exe: %s" stat_pars_exe    ; p_ln ();
           p_indent 2; p "out: %s" stat_pars_out_cmp; p_ln ();
+        p_indent 1; p "Semantic Analysis:"; p_ln ();
+          p_indent 2; p "exe: %s" stat_semant_exe    ; p_ln ();
+          p_indent 2; p "out: %s" stat_semant_out_cmp; p_ln ();
   );
   p "%s" bar_end; p_ln ();
   let failures = !error_count in