- go parser parses itself

SVN=126408

usr/gri/src/scanner.go

@@ -18,7 +18,7 @@ export
 	AND_ASSIGN, OR_ASSIGN, XOR_ASSIGN, SHL_ASSIGN, SHR_ASSIGN,
 	CAND, COR,
 	BREAK, CASE, CHAN, CONST, CONTINUE, DEFAULT, ELSE, EXPORT, FALLTHROUGH, FALSE,
-	FOR, FUNC, GO, GOTO, IF, IMPORT, INTERFACE, MAP, NEW, NIL, PACKAGE, RANGE,
+	FOR, FUNC, GO, GOTO, IF, IMPORT, INTERFACE, IOTA, MAP, NEW, NIL, PACKAGE, RANGE,
 	RETURN, SELECT, STRUCT, SWITCH, TRUE, TYPE, VAR
 	
 	
@@ -103,6 +103,7 @@ const (
 	IF;
 	IMPORT;
 	INTERFACE;
+	IOTA;
 	MAP;
 	NEW;
 	NIL;
@@ -140,8 +141,8 @@ func TokenName(tok int) string {
 	case RPAREN: return ")";
 	case LBRACK: return "[";
 	case RBRACK: return "]";
-	case LBRACE: return "{";
-	case RBRACE: return "}";
+	case LBRACE: return "LBRACE";
+	case RBRACE: return "RBRACE";
 
 	case ASSIGN: return "=";
 	case DEFINE: return ":=";
@@ -203,6 +204,7 @@ func TokenName(tok int) string {
 	case IF: return "if";
 	case IMPORT: return "import";
 	case INTERFACE: return "interface";
+	case IOTA: return "iota";
 	case MAP: return "map";
 	case NEW: return "new";
 	case NIL: return "nil";

usr/gri/src/test_parser.go

@@ -8,7 +8,7 @@ import Scanner "scanner"
 import Parser "parser"
 
 
-func Parse(src string, verbose bool) {
+func Parse(src string, verbose int) {
 	S := new(Scanner.Scanner);
 	S.Open(src);
 	
@@ -20,10 +20,14 @@ func Parse(src string, verbose bool) {
 
 
 func main() {
-	verbose := false;
+	verbose := 0;
 	for i := 1; i < sys.argc(); i++ {
-		if sys.argv(i) == "-v" {
-			verbose = true;
+		switch sys.argv(i) {
+		case "-v":
+			verbose = 1;
+			continue;
+		case "-vv":
+			verbose = 2;
 			continue;
 		}