X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=compiler%2Fsrc%2Flib%2Ftiger%2Ftiger_test_cases.ml;h=c7ea1fc7a8f407dd18ada1302f089ed13712166a;hb=b762cacb0f9df0b034bb75e67c4b64151e338e92;hp=f0a81d487ed637a0be2df01f78846a04d196e14b;hpb=d3bdde4b6b0b1a8cb41ee4de4fa73cd472ed23a4;p=tiger.ml.git

diff --git a/compiler/src/lib/tiger/tiger_test_cases.ml b/compiler/src/lib/tiger/tiger_test_cases.ml
index f0a81d4..c7ea1fc 100644
--- a/compiler/src/lib/tiger/tiger_test_cases.ml
+++ b/compiler/src/lib/tiger/tiger_test_cases.ml
@@ -1,3 +1,4 @@
+module Error = Tiger_error
 module Test = Tiger_test
 
 let book =
@@ -130,65 +131,67 @@ let book =
         [ IF; LPAREN; INT 5; GT; INT 4; RPAREN; THEN; INT 13; ELSE; STRING " "
         ]
       )
-  ]
-
-(*
-let test_case_from_book_queens =
-  let code =
-    "\
-    /* A program to solve the 8-queens problem */ \n\
- \n\
-    let \n\
-      var N := 8 \n\
- \n\
-      type intArray = array of int \n\
- \n\
-      var row := intArray [ N ] of 0 \n\
-      var col := intArray [ N ] of 0 \n\
-      var diag1 := intArray [N+N-1] of 0 \n\
-      var diag2 := intArray [N+N-1] of 0 \n\
- \n\
-      function printboard() = ( \n\
-        for i := 0 to N-1 do ( \n\
-          for j := 0 to N-1 do print(if col[i]=j then \" O\" else \" .\"); \n\
-          print(\"\n\") \n\
-        ); \n\
-        print(\"\n\") \n\
-      ) \n\
- \n\
-      function try(c:int) = ( \n\
-        /*  for i:= 0 to c do print(\".\"); print(\"\n\"); flush();*/ \n\
-        if c=N \n\
-        then printboard() \n\
-        else \n\
-          for r := 0 to N-1 \n\
-          do \n\
-            if row[r]=0 & diag1[r+c]=0 & diag2[r+7-c]=0 \n\
-            then ( \n\
-              row[r]       := 1; \n\
-              diag1[r+c]   := 1; \n\
-              diag2[r+7-c] := 1; \n\
-              col[c]       := r; \n\
-              try(c+1); \n\
-              row[r]       := 0; \n\
-              diag1[r+c]   := 0; \n\
-              diag2[r+7-c] := 0 \n\
+  ; Test.case
+    "Book test: 8-queens"
+    ~code:
+          "\
+          /* A program to solve the 8-queens problem */ \n\
+       \n\
+          let \n\
+            var N := 8 \n\
+       \n\
+            type intArray = array of int \n\
+       \n\
+            var row := intArray [ N ] of 0 \n\
+            var col := intArray [ N ] of 0 \n\
+            var diag1 := intArray [N+N-1] of 0 \n\
+            var diag2 := intArray [N+N-1] of 0 \n\
+       \n\
+            function printboard() = ( \n\
+              for i := 0 to N-1 do ( \n\
+                for j := 0 to N-1 do print(if col[i]=j then \" O\" else \" .\"); \n\
+                print(\"\n\") \n\
+              ); \n\
+              print(\"\n\") \n\
+            ) \n\
+       \n\
+            function try(c:int) = ( \n\
+              /*  for i:= 0 to c do print(\".\"); print(\"\n\"); flush();*/ \n\
+              if c=N \n\
+              then printboard() \n\
+              else \n\
+                for r := 0 to N-1 \n\
+                do \n\
+                  if row[r]=0 & diag1[r+c]=0 & diag2[r+7-c]=0 \n\
+                  then ( \n\
+                    row[r]       := 1; \n\
+                    diag1[r+c]   := 1; \n\
+                    diag2[r+7-c] := 1; \n\
+                    col[c]       := r; \n\
+                    try(c+1); \n\
+                    row[r]       := 0; \n\
+                    diag1[r+c]   := 0; \n\
+                    diag2[r+7-c] := 0 \n\
+                  ) \n\
             ) \n\
-      ) \n\
-    in \n\
-      try(0) \n\
-    end \n\
-    "
-  in
-  (code, code, [])
-*)
+          in \n\
+            try(0) \n\
+          end \n\
+          "
+  ]
 
 let micro =
   let open Tiger_parser in
   [ (let code = "nil"    in Test.case code ~code ~out_lexing:[NIL])
   ; (let code = "5"      in Test.case code ~code ~out_lexing:[INT 5])
   ; (let code = "-5"     in Test.case code ~code ~out_lexing:[MINUS; INT 5])
-  ; (let code = "f()"    in Test.case code ~code ~out_lexing:[ID "f"; LPAREN; RPAREN])
+  ; ( let code = "f()" in
+      Test.case
+        code
+        ~code
+        ~out_lexing:[ID "f"; LPAREN; RPAREN]
+        ~is_error_expected_semant:Error.is_unknown_id
+    )
   ; (let code = "abc.i"  in Test.case code ~code ~out_lexing:[ID "abc"; DOT; ID "i"])
   ; (let code = "abc[0]" in Test.case code ~code ~out_lexing:[ID "abc"; LBRACK; INT 0; RBRACK])
 
@@ -200,9 +203,14 @@ let micro =
       ~out_lexing:
         [ID "abc"; LBRACK; INT 5; RBRACK; OF; NIL])
 
-  ; (let code = "f(\"a\", 3, foo)" in Test.case code ~code
-      ~out_lexing:
-        [ID "f"; LPAREN; STRING "a"; COMMA; INT 3; COMMA; ID "foo"; RPAREN])
+  ; ( let code = "f(\"a\", 3, foo)" in
+      Test.case
+        code
+        ~code
+        ~out_lexing:
+          [ID "f"; LPAREN; STRING "a"; COMMA; INT 3; COMMA; ID "foo"; RPAREN]
+        ~is_error_expected_semant:Error.is_unknown_id
+    )
   ]
 
 let all =