Consolidate shift_expression into binary_expression and write more tests

2 files changed, 23 insertions, 1 deletions

diff --git a/tests/include/tast2.h b/tests/include/tast2.h
index 53b4d64..e72a3b8 100644
--- a/tests/include/tast2.h
+++ b/tests/include/tast2.h
@@ -24,6 +24,16 @@ extern "C" {
 #define MATHEXPR (1 + 2/3*20 - 100)
 #define ANDEXPR (100 & 11000)
 #define CASTEXPR (char) 34
+#define a 100
+#define b 200
+#define EQ1 a <= b
+#define EQ2 a >= b
+#define EQ3 a > b
+#define EQ4 a < b
+#define EQ5 a != b
+#define EQ6 a == b
+
+#define SIZEOF sizeof(char)
 
 #define NULLCHAR '\0'
 #define OCTCHAR '\012'
diff --git a/tests/tast2.nim b/tests/tast2.nim
index e82430b..57bfc90 100644
--- a/tests/tast2.nim
+++ b/tests/tast2.nim
@@ -115,6 +115,18 @@ assert ULLEXPR == (1234.uint64 shl 3)
 assert LEXPR == (1234.int32 shl 4)
 assert LLEXPR == (1234.int64 shl 5)
 
+assert a == 100
+assert b == 200
+
+assert EQ1 == (a <= b)
+assert EQ2 == (a >= b)
+assert EQ3 == (a > b)
+assert EQ4 == (a < b)
+assert EQ5 == (a != b)
+assert EQ6 == (a == b)
+
+assert SIZEOF == 1
+
 assert COERCE == 645635670332'u64
 assert COERCE2 == 645635670332'i64
 
@@ -303,7 +315,7 @@ var a21p: A21p
 a21p = addr a20
 
 assert A22 is object
-testFields(A22, "f1|f2!ptr ptr cint|array[type(123)(255), ptr cint]")
+testFields(A22, "f1|f2!ptr ptr cint|array[123 + type(123)(132), ptr cint]")
 checkPragmas(A22, pHeaderBy, istype = false)
 var a22: A22
 a22.f1 = addr a15.a2[0]