add logical operators

[calc.git] / calc.c

diff --git a/calc.c b/calc.c
index 0134b74ae5d2ddac68961c31dc6bec1584f3f5d6..8aa124a959db68faadbe7cff587e2faa4490db64 100644 (file)
--- a/calc.c
+++ b/calc.c
@@ -252,7 +252,9 @@ int main (int argc, char *argv[])
 // test: echo -e '1\nsto (0)\nsto (11)\nrcl (0)\nrcl (11)' | calc.exe | grep -c invalid | xargs test 4 =
 // test: echo -e '1\nsto (2)\n3\nsto (5, 7)\nsto(9)\ndisp' | calc.exe | grep -q '0 1 0 0 7 0 0 0 7 0'
 // test: echo -e '1+1 == 2' | calc.exe | grep -q '=> 1'
-// test: echo -e '1-cos(3*pi/4) != 0.5^-2' | calc.exe | grep -q '=> 0'
+// test: echo -e '1 + 1 == 2 - 0' | calc.exe | grep -q '=> 1'
+// test: echo -e '1 == 1 + 1 == 1' | calc.exe | grep -q '=> 0'
+// test: echo -e '1-cos(3*pi/4) != 0.5^-2' | calc.exe | grep -q '=> 1'
 // test: echo -e '1 >= 2' | calc.exe | grep -q '=> 0'
 // test: echo -e '2 >= 2' | calc.exe | grep -q '=> 1'
 // test: echo -e '1 <= 2' | calc.exe | grep -q '=> 1'
@@ -262,5 +264,18 @@ int main (int argc, char *argv[])
 // test: echo -e '1 < 2' | calc.exe | grep -q '=> 1'
 // test: echo -e '2 < 2' | calc.exe | grep -q '=> 0'
 // test: echo -e '1 == 1\n1 != 1\n1 >= 1\n1 <= 1\n1 > 1\n1 < 1\nquit' | calc.exe -v 3 | grep -q bye
+// test: echo -e '(3 == 3) & (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) & (2 > 1)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 3) & (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 4) & (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '(3 == 3) | (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) | (2 > 1)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 3) | (2 > 2)' | calc.exe | grep -q '=> 1'
+// test: echo -e '(3 == 4) | (2 > 2)' | calc.exe | grep -q '=> 0'
+// test: echo -e '!(3 == 4)' | calc.exe | grep -q '=> 1'
+// test: echo -e '!(3 == 3)' | calc.exe | grep -q '=> 0'
+// test: echo -e '1 & 1\n1 | 1\n!1\nquit' | calc.exe -v 3 | grep -q bye
+// test: echo -e '(3 == 3) & (4 > 2)' | calc.exe | grep -q '=> 1'
+// test: echo -e '3 == 3 & 4 > 2' | calc.exe | grep -q '=> 1'
 
 /* vim: set ts=4 sw=4 et: */