constant expressions: c precedence and / % ^ (b.1.3); local const usable in constant expressions (b.1.7, b.2.16); zc0 matches

17 files changed, 47 insertions, 32 deletions

diff --git a/tests/conformance/3-expressions/const_expr_array_length.zc b/tests/conformance/3-expressions/const_expr_array_length.zc
index 07434a9..c6f11e3 100644
--- a/tests/conformance/3-expressions/const_expr_array_length.zc
+++ b/tests/conformance/3-expressions/const_expr_array_length.zc
@@ -1,4 +1,4 @@
-// expect: 10/
+// expect: 8/
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 fn main() {
diff --git a/tests/conformance/3-expressions/const_expr_case_label.zc b/tests/conformance/3-expressions/const_expr_case_label.zc
index 3f1e781..0c76d4b 100644
--- a/tests/conformance/3-expressions/const_expr_case_label.zc
+++ b/tests/conformance/3-expressions/const_expr_case_label.zc
@@ -1,9 +1,9 @@
-// expect: nine/
+// expect: seven/
 include rt;
 fn main() {
-	int k = 9;
+	int k = 7;
 	switch (k) {
-	case 1 + 2 * 3: rt.put_s("nine");
+	case 1 + 2 * 3: rt.put_s("seven");
 	default: rt.put_s("other");
 	}
 	rt.put_c(10);
diff --git a/tests/conformance/3-expressions/const_expr_division.zc b/tests/conformance/3-expressions/const_expr_division.zc
new file mode 100644
index 0000000..90db20c
--- /dev/null
+++ b/tests/conformance/3-expressions/const_expr_division.zc
@@ -0,0 +1,7 @@
+// expect: 3/-3/2/
+include rt;
+void pn(int x) { rt.put_n(x); rt.put_c(10); }
+const Z = 6 / 2;
+const N = -7 / 2;
+const P = 1 + 6 / 3 * 2 - 3;
+fn main() { pn(Z); pn(N + 0); pn(P); return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_division_by_zero.zc b/tests/conformance/3-expressions/const_expr_division_by_zero.zc
new file mode 100644
index 0000000..f1011ff
--- /dev/null
+++ b/tests/conformance/3-expressions/const_expr_division_by_zero.zc
@@ -0,0 +1,4 @@
+// expect error: division by zero in a constant expression
+include rt;
+const Z = 1 / (2 - 2);
+fn main() { return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_division_rejected.zc b/tests/conformance/3-expressions/const_expr_division_rejected.zc
deleted file mode 100644
index f095247..0000000
--- a/tests/conformance/3-expressions/const_expr_division_rejected.zc
+++ /dev/null
@@ -1,4 +0,0 @@
-// expect error: expected ';', found '/'
-include rt;
-const Z = 6 / 2;
-fn main() { return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_local_const.zc b/tests/conformance/3-expressions/const_expr_local_const.zc
new file mode 100644
index 0000000..46a8d55
--- /dev/null
+++ b/tests/conformance/3-expressions/const_expr_local_const.zc
@@ -0,0 +1,11 @@
+// expect: 5/11/7/
+include rt;
+void pn(int x) { rt.put_n(x); rt.put_c(10); }
+fn main() {
+	const n = 5;
+	const m = n * 2 + 1;
+	int[m] a;
+	const int k = 7;
+	pn(n); pn(len(a)); switch (7) { case k: pn(k); }
+	return 0;
+}
diff --git a/tests/conformance/3-expressions/const_expr_local_const_rejected.zc b/tests/conformance/3-expressions/const_expr_local_const_rejected.zc
deleted file mode 100644
index edab64e..0000000
--- a/tests/conformance/3-expressions/const_expr_local_const_rejected.zc
+++ /dev/null
@@ -1,7 +0,0 @@
-// expect error: expected a constant
-include rt;
-fn main() {
-	const n = 5;
-	int[n] a;
-	return 0;
-}
diff --git a/tests/conformance/3-expressions/const_expr_modulo.zc b/tests/conformance/3-expressions/const_expr_modulo.zc
new file mode 100644
index 0000000..3f32f46
--- /dev/null
+++ b/tests/conformance/3-expressions/const_expr_modulo.zc
@@ -0,0 +1,6 @@
+// expect: 1/10/
+include rt;
+void pn(int x) { rt.put_n(x); rt.put_c(10); }
+const Z = 7 % 2;
+const Q = 1 + 20 % 7 * 3;
+fn main() { pn(Z); pn(Q - 9); return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_modulo_rejected.zc b/tests/conformance/3-expressions/const_expr_modulo_rejected.zc
deleted file mode 100644
index 4c54ffe..0000000
--- a/tests/conformance/3-expressions/const_expr_modulo_rejected.zc
+++ /dev/null
@@ -1,4 +0,0 @@
-// expect error: zc: line 3:
-include rt;
-const Z = 7 % 2;
-fn main() { return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_neg_not_parens.zc b/tests/conformance/3-expressions/const_expr_neg_not_parens.zc
index 6e96bdc..714990a 100644
--- a/tests/conformance/3-expressions/const_expr_neg_not_parens.zc
+++ b/tests/conformance/3-expressions/const_expr_neg_not_parens.zc
@@ -1,4 +1,4 @@
-// expect: -3/-6/-1/24/
+// expect: -3/-4/-1/24/
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 const A = -3;
diff --git a/tests/conformance/3-expressions/const_expr_left_to_right.zc b/tests/conformance/3-expressions/const_expr_precedence.zc
index 68e26ab..c173959 100644
--- a/tests/conformance/3-expressions/const_expr_left_to_right.zc
+++ b/tests/conformance/3-expressions/const_expr_precedence.zc
@@ -1,8 +1,9 @@
-// expect: 9/5/7/255/
+// expect: 7/5/7/255/16/
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 const X = 1 + 2 * 3;
 const Y = 10 - 2 - 3;
 const V = 1 | 2 + 4;
 const W = ~0 & 255;
-fn main() { pn(X); pn(Y); pn(V); pn(W); return 0; }
+const S = 1 + 3 << 1 + 1 >> 1 - 1 | 6 & 2;
+fn main() { pn(X); pn(Y); pn(V); pn(W); pn(S - 2); return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_xor.zc b/tests/conformance/3-expressions/const_expr_xor.zc
new file mode 100644
index 0000000..30ca0a7
--- /dev/null
+++ b/tests/conformance/3-expressions/const_expr_xor.zc
@@ -0,0 +1,6 @@
+// expect: 5/7/
+include rt;
+void pn(int x) { rt.put_n(x); rt.put_c(10); }
+const Z = 7 ^ 2;
+const Q = 1 ^ 2 | 4 & 4;
+fn main() { pn(Z); pn(Q); return 0; }
diff --git a/tests/conformance/3-expressions/const_expr_xor_rejected.zc b/tests/conformance/3-expressions/const_expr_xor_rejected.zc
deleted file mode 100644
index eb1ad25..0000000
--- a/tests/conformance/3-expressions/const_expr_xor_rejected.zc
+++ /dev/null
@@ -1,4 +0,0 @@
-// expect error: zc: line 3:
-include rt;
-const Z = 7 ^ 2;
-fn main() { return 0; }
diff --git a/tests/conformance/4-statements/switch_label_forms.zc b/tests/conformance/4-statements/switch_label_forms.zc
index cfe2712..ef5e33b 100644
--- a/tests/conformance/4-statements/switch_label_forms.zc
+++ b/tests/conformance/4-statements/switch_label_forms.zc
@@ -1,5 +1,5 @@
 // expect: neg/chr/sum/enum/
-// spec 4.7.1 and 3.14: labels are constant expressions (no precedence: 1 + 1 * 3 is 6)
+// spec 4.7.1 and 3.14: labels are constant expressions (c precedence: 1 + 1 * 3 is 4)
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 enum color { RED, GREEN };
@@ -12,5 +12,5 @@ void t(int k) {
 	}
 	rt.put_c(10);
 }
-fn main() { t(-1); t('a'); t(6); t(1); return 0; }
+fn main() { t(-1); t('a'); t(4); t(1); return 0; }
 // zc0: skip
diff --git a/tests/conformance/5-declarations/global_const_expr_init.zc b/tests/conformance/5-declarations/global_const_expr_init.zc
index 8a9d30b..64a4d06 100644
--- a/tests/conformance/5-declarations/global_const_expr_init.zc
+++ b/tests/conformance/5-declarations/global_const_expr_init.zc
@@ -1,5 +1,5 @@
-// expect: 4/
-// spec 5.3.2 and 3.14.1 (left to right: ((1+2)*2)-2)
+// expect: 3/
+// spec 5.3.2 and 3.14.1 (c precedence: 1+(2*2)-2)
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 int g = 1 + 2 * 2 - 2;
diff --git a/tests/conformance/9-appendix-b/b2_16_local_const_in_const_expr.zc b/tests/conformance/9-appendix-b/b2_16_local_const_in_const_expr.zc
index 70093c9..649321f 100644
--- a/tests/conformance/9-appendix-b/b2_16_local_const_in_const_expr.zc
+++ b/tests/conformance/9-appendix-b/b2_16_local_const_in_const_expr.zc
@@ -1,5 +1,5 @@
 // expect: 5/
-// spec appendix b.2.16 and 3.14.2: a local const is not a constant expression
+// spec 3.14.2 (was appendix b.2.16): a local const is a constant expression
 include rt;
 void pn(int x) { rt.put_n(x); rt.put_c(10); }
 fn main() { const n = 5; int[n] a; pn(5); return 0; }
diff --git a/tests/conformance/known.txt b/tests/conformance/known.txt
index 8eeb0d3..25bc3b7 100644
--- a/tests/conformance/known.txt
+++ b/tests/conformance/known.txt
@@ -4,7 +4,6 @@
 4-statements/o3_outside_function_ordinary_block.zc zy c top-level o3 { } is rejected; spec 4.10.2 says it is an ordinary block
 9-appendix-b/b2_10_recovery_hides_errors.zc zy c appendix b.2.10 confirmed; by design per 8.2
 9-appendix-b/b2_15_duplicate_case.zc zy c appendix b.2.15 confirmed; 4.7.2 says duplicates are allowed
-9-appendix-b/b2_16_local_const_in_const_expr.zc zy c appendix b.2.16 confirmed; 3.14.2 documents it
 2-types/conv_argument_and_return.zc zc0 b types are read and dropped: no conversion, no sized cut (appendix a)
 2-types/conv_assignment_to_float.zc zc0 b types are read and dropped: no conversion, no sized cut (appendix a)
 2-types/conv_f32_rounds.zc zc0 b types are read and dropped: no conversion, no sized cut (appendix a)