test: Fixes and further merging

Author: phorward

tests/if_else.lgx

@@ -33,3 +33,6 @@
 
 "a" if False else "b"
 #expect:"b"
+
+700 + 1 if True else "b"
+#EXPECT:701

tests/op_and.lgx

@@ -29,15 +29,6 @@ False and True
 
 ##################################
 
-not True
-#expect:False
-
-not False
-#expect:True
-
-not (True and False)
-#expect:True
-
 "hello" and "world" + 4
 #EXPECT:"world4"
 
@@ -47,5 +38,3 @@ not (True and False)
 "hello" and "world" or "kaputt" and + 4
 #EXPECT:"world"
 
-700 + 1 if True else "b"
-#EXPECT:701

tests/op_and_or.lgx

@@ -1,2 +1,12 @@
+
+not True
+#expect:False
+
+not False
+#expect:True
+
+not (True and False)
+#expect:True
+
 not (False or True)
 #expect:False

tests/op_not.lgx

@@ -1,22 +1,3 @@
-5 + 3
-#expect:8
-
-"a" + "b"
-#expect:"ab"
-
-1 + "b"
-#expect:"1b"
-
-1 + 2 + 3 + 4
-#expect:10
-
-5 + 0
-#expect:5
-
-0 + 0
-#expect:0
-
-##################################
 
 5 - 3
 #expect:2
@@ -35,89 +16,3 @@
 
 "ab" - "b"
 #expect:0
-
-##################################
-
-5 * 3
-#expect:15
-
-5 * 0
-#expect:0
-
-0 * 0
-#expect:0
-
-3 * "HelloWorld"
-#EXPECT:"HelloWorldHelloWorldHelloWorld"
-
-#bug: TypeError: int() argument must be a string, a bytes-like object or a real number, not 'list'
-#[1, 2] * 2
-##expect:[1, 2, 1, 2]
-
-##################################
-
-6 / 3
-#expect:2
-
-5 / 2
-#expect:2.5
-
-5 / 1
-#expect:5
-
-0 / 5
-#expect:0
-
-5 / 0
-#expect:"#ERR:division by zero"
-
-##################################
-
-6 // 3
-#expect:2
-
-5 // 2
-#expect:2
-
-5 // 1
-#expect:5
-
-0 // 5
-#expect:0
-
-5 // 0
-#expect:"#ERR:division by zero"
-
-##################################
-
-5 % 3
-#expect:2
-
-5 % 2
-#expect:1
-
-5 % 1
-#expect:0
-
-0 % 5
-#expect:0
-
-5 % 0
-#expect:"#ERR:modulo by zero"
-
-##################################
-
-2 ** 3
-#expect:8
-
-5 ** 2
-#expect:25
-
-5 ** 1
-#expect:5
-
-5 ** 0
-#expect:1
-
-0 ** 5
-#expect:0

tests/op_sub.lgx

@@ -1,3 +1,5 @@
+## Unary plus
+
 +5
 #expect:5
 
@@ -16,7 +18,7 @@
 +(+7)
 #expect:7
 
-##################################
+## Unary minus
 
 -5
 #expect:-5
@@ -36,7 +38,7 @@
 -(+7)
 #expect:-7
 
-##################################
+### Complement
 
 ~5
 #expect:-6
@@ -54,4 +56,4 @@
 #expect:2
 
 ~(+7)
-#expect:-8
+#expect:-8