Move typechecker tests into tests/typecheck-{pass,fail}

polybuildr · polybuildr · commit d90ff422f4dc · 2017-05-16T21:37:09.000+03:00
diff --git a/src/main.rs b/src/main.rs
@@ -40,9 +40,6 @@ mod function;
 #[cfg(test)]
 mod interpreter_test;
 
-#[cfg(test)]
-mod typechecker_test;
-
 #[cfg(all(test, feature = "file-tests"))]
 mod file_test {
     include!(concat!(env!("OUT_DIR"), "/file_tests.rs"));
diff --git a/src/typechecker_test.rs b/src/typechecker_test.rs
diff --git a/tests/run-pass/int-float-subscript.bl b/tests/run-pass/int-float-subscript.bl
@@ -0,0 +1 @@
+assert_eq((1, 2, 3)[1.0], 2);
diff --git a/tests/typecheck-fail/add-type-error.bl b/tests/typecheck-fail/add-type-error.bl
@@ -0,0 +1,3 @@
+1 + true;
+true + 1;
+false + true;
diff --git a/tests/typecheck-fail/add-type-error.err b/tests/typecheck-fail/add-type-error.err
@@ -0,0 +1 @@
+[(RuntimeError(BinaryTypeError(Add, Number, Bool)), (0, 8)), (RuntimeError(BinaryTypeError(Add, Bool, Number)), (10, 18)), (RuntimeError(BinaryTypeError(Add, Bool, Bool)), (20, 32))]
diff --git a/tests/typecheck-fail/bool-unary-minus.bl b/tests/typecheck-fail/bool-unary-minus.bl
@@ -0,0 +1 @@
+-false;
diff --git a/tests/typecheck-fail/bool-unary-minus.err b/tests/typecheck-fail/bool-unary-minus.err
@@ -0,0 +1 @@
+[(RuntimeError(UnaryTypeError(Neg, Bool)), (1, 6))]
diff --git a/tests/typecheck-fail/closure-reference-error.bl b/tests/typecheck-fail/closure-reference-error.bl
@@ -0,0 +1,4 @@
+fn f() {
+    return x;
+}
+f() + 1;
diff --git a/tests/typecheck-fail/closure-reference-error.err b/tests/typecheck-fail/closure-reference-error.err
@@ -0,0 +1 @@
+[(InsideFunctionCall((RuntimeError(ReferenceError("x")), (20, 21))), (25, 28))]
diff --git a/tests/typecheck-fail/fn-type-error.bl b/tests/typecheck-fail/fn-type-error.bl
@@ -0,0 +1,8 @@
+fn add(a, b) {
+    return a + b;
+}
+
+add(true, true);
+add(1, 1);
+add(true, 1);
+add(false, false);
diff --git a/tests/typecheck-fail/fn-type-error.err b/tests/typecheck-fail/fn-type-error.err
@@ -0,0 +1 @@
+[(InsideFunctionCall((RuntimeError(BinaryTypeError(Add, Bool, Bool)), (26, 31))), (36, 51)), (InsideFunctionCall((RuntimeError(BinaryTypeError(Add, Bool, Number)), (26, 31))), (64, 76))]
diff --git a/tests/typecheck-fail/multiple-types-from-branch.bl b/tests/typecheck-fail/multiple-types-from-branch.bl
@@ -0,0 +1,16 @@
+var x = 5;
+if true {
+    x = true;
+} else {
+    x = 10;
+}
+var x = 1;
+if 1 {
+    if 2 {
+        x = true;
+    } else {
+        x = 1;
+    }
+} else {
+    x = 5;
+}
diff --git a/tests/typecheck-fail/multiple-types-from-branch.err b/tests/typecheck-fail/multiple-types-from-branch.err
@@ -0,0 +1 @@
+[(MultipleTypesFromBranchWarning("x"), (11, 58)), (MultipleTypesFromBranchWarning("x"), (80, 139))]
diff --git a/tests/typecheck-fail/non-integral-subscript.bl b/tests/typecheck-fail/non-integral-subscript.bl
@@ -0,0 +1 @@
+(1, 2, 3)[true];
diff --git a/tests/typecheck-fail/non-integral-subscript.err b/tests/typecheck-fail/non-integral-subscript.err
@@ -0,0 +1 @@
+[(RuntimeError(NonIntegralSubscript(Bool)), (10, 14))]
diff --git a/tests/typecheck-fail/none-error-for-builtin.bl b/tests/typecheck-fail/none-error-for-builtin.bl
@@ -0,0 +1 @@
+-println(10);
diff --git a/tests/typecheck-fail/none-error-for-builtin.err b/tests/typecheck-fail/none-error-for-builtin.err
@@ -0,0 +1 @@
+[(PossibleNoneError(Some("println")), (1, 12))]
diff --git a/tests/typecheck-fail/reference-err.bl b/tests/typecheck-fail/reference-err.bl
@@ -0,0 +1,10 @@
+var x = 5;
+x;
+y;
+{
+    var z = 5;
+    z;
+    x;
+    y;
+}
+z;
diff --git a/tests/typecheck-fail/reference-err.err b/tests/typecheck-fail/reference-err.err
@@ -0,0 +1 @@
+[(RuntimeError(ReferenceError("y")), (14, 15)), (RuntimeError(ReferenceError("y")), (52, 53)), (RuntimeError(ReferenceError("z")), (57, 58))]
diff --git a/tests/typecheck-pass/arithmetic.bl b/tests/typecheck-pass/arithmetic.bl
@@ -0,0 +1,3 @@
+(1 + 3 / (1 + 1)) * 12 - 1;
+3 - 5 + 12 / 4 - 1;
+-10 / 4 + -5 - 12;
diff --git a/tests/typecheck-pass/basic-bindings.bl b/tests/typecheck-pass/basic-bindings.bl
@@ -1,5 +1,10 @@
 var a = 5;
+a;
 var b = 22.5;
+b;
 var c = true;
+c;
 var d = "Check string.";
+d;
 var e = ("A", 1, false, 12.109);
+e;
diff --git a/tests/typecheck-pass/closure.bl b/tests/typecheck-pass/closure.bl
@@ -0,0 +1,5 @@
+var x = 5;
+fn f() {
+    return x;
+}
+f() + 1;
diff --git a/tests/typecheck-pass/fn-arg-match.bl b/tests/typecheck-pass/fn-arg-match.bl
@@ -0,0 +1,6 @@
+fn f0() {}
+f0();
+fn f1(x) {}
+f1(1);
+fn f2(x, y) {}
+f2(1, 2);
diff --git a/tests/typecheck-pass/int-float-subscript.bl b/tests/typecheck-pass/int-float-subscript.bl
@@ -0,0 +1 @@
+(1, 2, 3)[1.0];
diff --git a/tests/typecheck-pass/misc-binary-ops.bl b/tests/typecheck-pass/misc-binary-ops.bl
@@ -0,0 +1,3 @@
+5 + 5.5 < 10 - 2 and 5;
+1 < 2 and 3 > 2 or false;
+1 < 2 and 3 + 1 or -5 - 1 and "Hello" + "world";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+1 + true;`
	`2`	`+true + 1;`
	`3`	`+false + true;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[(RuntimeError(BinaryTypeError(Add, Number, Bool)), (0, 8)), (RuntimeError(BinaryTypeError(Add, Bool, Number)), (10, 18)), (RuntimeError(BinaryTypeError(Add, Bool, Bool)), (20, 32))]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[(RuntimeError(UnaryTypeError(Neg, Bool)), (1, 6))]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[(InsideFunctionCall((RuntimeError(ReferenceError("x")), (20, 21))), (25, 28))]`