Filters: permit variables of prefix types, cleanup around

variables. TODO list added, hopefully complete. Use new features of
filters in bird.conf

1 files changed, 19 insertions, 26 deletions

diff --git a/bird.conf b/bird.conf
index 476ccf30..b1220c32 100644
--- a/bird.conf
+++ b/bird.conf
@@ -13,7 +13,7 @@ function callme (int arg1; int arg2;)
 	print "Function callme called arguments " arg1 " and " arg2;
 
 	case arg1 {
-	2: { print "dva"; print "jeste jednou dva"; }
+	2: print "dva"; print "jeste jednou dva";
 	[ 3 .. 5 ]: print "tri az pet";
 	else: print "neco jineho";
 	}	
@@ -22,37 +22,30 @@ function callme (int arg1; int arg2;)
 function startup () 
 int i;
 prefix px;
-
 { 
-	print "Bird filter language: selftesting...";
+	print "Testing filter language:";
 	i = 4; 
 	i = 1230 + i; 
-	print "Testing arithmetics: 1234 = " i;
-	if i = 4 then { print "*** FAIL: if 0"; quitbird; } else print "test 1 passed";
-	if 1234 = i then print "test 2 passed"; else { print "*** FAIL: if 1 else"; }
-	if 1 <= 1 then print "test 3 passed"; else { print "*** FAIL: test 3"; }
-	if 1234 < 1234 then { print "*** FAIL: test 4"; quitbird; } else print "test 4 passed";
-
-	print "Testing IP addresses: 1.2.3.4 = " 1.2.3.4;
-	print "Testing sets of ints = " [ 1, 2, 3 ];
-	print "Testing sets of ints = " [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 ];
-	print "Testing sets of IPs = " [ 1.2.3.4, 2.3.4.5, 3.4.5.6 ];
-	print "Sets: true = " 1 ~ [ 1, 2, 3 ];
-	print "      false = " 1 ~ [ 2, 3, 4 ];
-	print "a..b: true = " 5 ~ [ 4 .. 7 ];
-	print "      false = " 5 ~ [ 2, 3, 4, 7..11 ];
-	print "IPsets: true = " 1.2.3.4 ~ [ 1.2.3.3..1.2.3.5 ];
-	print "        false = " 1.2.3.4 ~ [ 1.2.3.3, 1.2.3.5 ];
-
-	print "Testing prefixes: 1.2.3.4/18 = " 1.2.3.4/18;
+	print "  arithmetics: 1234 = " i;
+	printn "  if statements ";
+	if i = 4 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 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 ];
+	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);
+
+	px = 1.2.3.4/18;
+	print "Testing prefixes: 1.2.3.4/18 = " px;
 	print "Testing pairs: (1,2) = " (1,2);
 
 	print "Testing functions...";
-	callme ( 1, 2, );
-	callme ( 2, 2, );
-	callme ( 3, 2, );
-	callme ( 4, 2, );
-	callme ( 7, 2, );
+	callme ( 1, 2 );
+	callme ( 2, 2 );
+	callme ( 3, 2 );
+	callme ( 4, 2 );
+	callme ( 7, 2 );
 
 	print "done";
 	quitbird;