Merge branch 'sail2' of https://github.com/rems-project/sail into sail2

5 files changed, 41 insertions, 3 deletions

diff --git a/test/typecheck/fail/missing_tick.expect b/test/typecheck/fail/missing_tick.expect
new file mode 100644
index 00000000..b447fdd2
--- /dev/null
+++ b/test/typecheck/fail/missing_tick.expect
@@ -0,0 +1,11 @@
+Type error:
+[missing_tick.sail]:5:16-17
+5 |type foo = bits(x)
+  |                ^
+  | Undefined synonym x
+  | This error was caused by:
+  | [missing_tick.sail]:5:0-18
+  | 5 |type foo = bits(x)
+  |   |^----------------^
+  |   | Types are not well-formed within this type definition. Note that recursive types are forbidden.
+  | 
diff --git a/test/typecheck/fail/missing_tick.sail b/test/typecheck/fail/missing_tick.sail
new file mode 100644
index 00000000..67a468b1
--- /dev/null
+++ b/test/typecheck/fail/missing_tick.sail
@@ -0,0 +1,7 @@
+default Order dec
+$include <vector_dec.sail>
+
+let 'x = 0
+type foo = bits(x)
+
+function y() : unit -> foo = sail_zeros(0)
diff --git a/test/typecheck/fail/struct_incomplete_literal.expect b/test/typecheck/fail/struct_incomplete_literal.expect
new file mode 100644
index 00000000..2178d1a1
--- /dev/null
+++ b/test/typecheck/fail/struct_incomplete_literal.expect
@@ -0,0 +1,8 @@
+Type error:
+[struct_incomplete_literal.sail]:10:20-12:1
+10 |let foo_val : foo = struct {
+   |                    ^-------
+12 |}
+   |^
+   | struct literal missing fields: b
+   | 
diff --git a/test/typecheck/fail/struct_incomplete_literal.sail b/test/typecheck/fail/struct_incomplete_literal.sail
new file mode 100644
index 00000000..f5c07c2e
--- /dev/null
+++ b/test/typecheck/fail/struct_incomplete_literal.sail
@@ -0,0 +1,12 @@
+default Order dec
+
+$include <prelude.sail>
+
+struct foo = {
+  a : int,
+  b : int
+}
+
+let foo_val : foo = struct {
+  a = 1
+}
diff --git a/test/typecheck/run_tests.sh b/test/typecheck/run_tests.sh
index adc30c42..e0720baf 100755
--- a/test/typecheck/run_tests.sh
+++ b/test/typecheck/run_tests.sh
@@ -92,13 +92,13 @@ do
     pushd $DIR/fail > /dev/null;
     if $SAILDIR/sail -no_memo_z3 $(basename $file) 2> result
     then
-        red "Expected failure, but $i $(basename $file) passed" "fail"
+        red "Expected failure, but $(basename $file) passed" "fail"
     else
         if diff ${file%.sail}.expect result;
         then
-            green "failing $i $(basename $file)" "pass"
+            green "failing $(basename $file)" "pass"
         else
-            yellow "failing $i $(basename $file)" "unexpected error"
+            yellow "failing $(basename $file)" "unexpected error"
         fi
     fi;
     rm -f result;