1 less shift/reduce conflict

print now takes arguments separated by ,

[ 1.2.3.0/24 .. 3.4.5.0/8 ] is now forbidden

[ 1.2.3.0/8 ] now actually works

1 files changed, 20 insertions, 14 deletions

diff --git a/filter/test.conf b/filter/test.conf
index 22dba29..1677cd2 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -13,7 +13,7 @@ int local1;
 int local2;
 int i;
 {
-	printn "Function callme called arguments " arg1 " and " arg2 ":";
+	printn "Function callme called arguments ", arg1, " and ", arg2, ":" ;
 	i = arg2;
 
 	case arg1 {
@@ -38,23 +38,29 @@ ip p;
 	i = 4; 
 	i = 1230 + i; 
 	i = ( i + 0 );
-	print "  arithmetics: 1234 = " i;
+	print "  arithmetics: 1234 = ", i;
 	printn "  if statements ";
-	if i = 4 then { print "*** FAIL: if 0"; quitbird; } else printn ".";
+	print "what happens here?";
+	printn ".";
+	if (i = 4) then { print "*** FAIL: if 0"; quitbird; } else printn ".";
+#	if !(i = 3) then { print "*** FAIL: if 0"; quitbird; } else printn ".";
 	if 1234 = i then printn "."; else { print "*** FAIL: if 1 else"; }
-	if 1 <= 1 then printn "."; else { print "*** FAIL: test 3"; }
+#	if 1 <= 1 then printn "."; else { print "*** FAIL: test 3"; }
 	if 1234 < 1234 then { print "*** FAIL: test 4"; quitbird; } else print "ok";
-	print "  data types; must be true: " 1.2.3.4 = 1.2.3.4 "," 1 ~ [1,2,3] "," 5 ~ [1..20] "," 2 ~ [ 1, 2, 3 ] "," 5 ~ [ 4 .. 7 ] "," 1.2.3.4 ~ [ 1.2.3.3..1.2.3.5 ] "," 1.2.3.4 ~ 1.0.0.0/8 "," 1.0.0.0/8 ~ 1.0.0.0/8 "," 1.0.0.0/8 ~ [ 1.0.0.0/8+ ] "," 1.2.0.0/16 ~ [ 1.0.0.0/8{ 15 , 16 } ] "," defined(1) "," defined(1.2.3.4) "," 1 != 2 "," 1 <= 2;
-	print "  data types: must be false: " 1 ~ [ 2, 3, 4 ] "," 5 ~ [ 2, 3, 4, 7..11 ] "," 1.2.3.4 ~ [ 1.2.3.3, 1.2.3.5 ] "," (1,2) > (2,2) "," (1,1) > (1,1) "," 1.0.0.0/8 ~ [ 1.0.0.0/8- ] "," 1.2.0.0/17 ~ [ 1.0.0.0/8{ 15 , 16 } ];
+	print "  must be true: ", 1.2.0.0/16 ~ [ 1.0.0.0/8{ 15 , 17 } ];
+	print "  data types; must be true: ", 1.2.3.4 = 1.2.3.4, ",", 1 ~ [1,2,3], ",", 5 ~ [1..20], ",", 2 ~ [ 1, 2, 3 ], ",", 5 ~ [ 4 .. 7 ], ",", 1.2.3.4 ~ [ 1.2.3.3..1.2.3.5 ], ",", 1.2.3.4 ~ 1.0.0.0/8, ",", 1.0.0.0/8 ~ 1.0.0.0/8, ",", 1.0.0.0/8 ~ [ 1.0.0.0/8+ ];
+
+#	print "  must be true: ", defined(1), ",", defined(1.2.3.4), ",", 1 != 2, ",", 1 <= 2;
+	print "  data types: must be false: ", 1 ~ [ 2, 3, 4 ], ",", 5 ~ [ 2, 3, 4, 7..11 ], ",", 1.2.3.4 ~ [ 1.2.3.3, 1.2.3.5 ], ",", (1,2) > (2,2), ",", (1,1) > (1,1), ",", 1.0.0.0/8 ~ [ 1.0.0.0/8- ], ",", 1.2.0.0/17 ~ [ 1.0.0.0/8{ 15 , 16 } ];
 
 	px = 1.2.0.0/18;
-	print "Testing prefixes: 1.2.0.0/18 = " px;
+	print "Testing prefixes: 1.2.0.0/18 = ", px;
 	p = 127.1.2.3;
-	print "Testing mask : 127.0.0.0 = " p.mask(8);
-	print "Testing pairs: (1,2) = " (1,2);
-	print "Testing enums: " RTS_DUMMY " " RTS_STATIC;
+	print "Testing mask : 127.0.0.0 = ", p.mask(8);
+	print "Testing pairs: (1,2) = ", (1,2);
+	print "Testing enums: ", RTS_DUMMY, " ", RTS_STATIC;
 
-	print "What will this do? " [ 1, 2, 1, 1, 1, 3, 4, 1, 1, 1, 5 ];
+	print "What will this do? ", [ 1, 2, 1, 1, 1, 3, 4, 1, 1, 1, 5 ];
 
 	print "Testing functions...";
 #	callme ( 1, 2 );
@@ -65,7 +71,7 @@ ip p;
 	callme ( 7, 2 );
 
 	i = fifteen();
-	print "Testing function calls: 15 = " i;
+	print "Testing function calls: 15 = ", i;
 
 	print "done";
 	quitbird;
@@ -75,8 +81,8 @@ ip p;
 filter testf 
 int j; 
 { 
-	print "Heya, filtering route to " net.ip " prefixlen " net.len " source " source;
-	print "This route was from " from;
+	print "Heya, filtering route to ", net.ip, " prefixlen ", net.len, " source ", source;
+	print "This route was from ", from;
 	j = 7;
 	j = 17;
 	if rip_metric > 15 then {