diff --git a/sources/zweic/Scanner.scala b/sources/zweic/Scanner.scala index 2c35af0..931a28c 100755 --- a/sources/zweic/Scanner.scala +++ b/sources/zweic/Scanner.scala @@ -39,11 +39,7 @@ keywords("printInt") = PRINTINT; keywords("printChar") = PRINTCHAR; - keywords("val") = VAL; keywords("Int") = INT; - keywords("def") = DEF; - keywords("set") = SET; - keywords("var") = VAR; keywords("class") = CLASS; keywords("new") = NEW; keywords("extends") = EXTENDS; @@ -53,7 +49,6 @@ keywords("or") = OR; keywords("if") = IF; keywords("else") = ELSE; - keywords("do") = DO; keywords("while") = WHILE; /** The current token class. @@ -145,7 +140,6 @@ case ';' => nextCh; return SEMICOLON; case ',' => nextCh; return PERIOD; case '.' => nextCh; return DOT; - case ':' => nextCh; return COLON; case '!' => nextCh; if (ch == '=') { diff --git a/sources/zweic/Tokens.scala b/sources/zweic/Tokens.scala index b951152..30bff5f 100755 --- a/sources/zweic/Tokens.scala +++ b/sources/zweic/Tokens.scala @@ -32,11 +32,7 @@ val PRINTINT = Value("printInt"); val PRINTCHAR = Value("printChar"); - val VAL = Value("val"); val INT = Value("Int"); - val DEF = Value("def"); - val SET = Value("set"); - val VAR = Value("var"); val CLASS = Value("class"); val NEW = Value("new"); val EXTENDS = Value("extends"); @@ -59,7 +55,6 @@ val OR = Value("or"); val IF = Value("if"); val ELSE = Value("else"); - val DO = Value("do"); val WHILE = Value("while"); val LPAREN = Value("("); @@ -70,5 +65,4 @@ val SEMICOLON = Value(";"); val PERIOD = Value(","); val DOT = Value("."); - val COLON = Value(":"); }