Use keywords in sample grammars

cglong · May 2, 2012 · e06ab69 · e06ab69
1 parent da864cf
commit e06ab69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Grammars/tiny.txt b/Grammars/tiny.txt
@@ -1,4 +1,4 @@
-%Tokens begin end print read ( ) ; ID := , INTNUM + - * %
+%Tokens begin end print read LEFTPAR RIGHTPAR SEMICOLON ID ASSIGN COMMA INTNUM PLUS MINUS MULTIPLY MODULO
 %Non-terminals <Tiny-program> <statement-list> <statement> <id-list> <exp-list> <exp> <bin-op>
 %Start <Tiny-program>
 %Rules

diff --git a/Grammars/tiny_new.txt b/Grammars/tiny_new.txt
@@ -1,4 +1,4 @@
-%Tokens begin end print read ( ) ; ID := , INTNUM + - * %
+%Tokens begin end print read LEFTPAR RIGHTPAR SEMICOLON ID ASSIGN COMMA INTNUM PLUS MINUS MULTIPLY MODULO
 %Non-terminals <Tiny-program> <statement-list> <statement> <id-list> <exp-list> <exp-arith> <exp-mul> <exp-mod> <term>
 %Start <Tiny-program>
 %Rules

diff --git a/src/com/github/cglong/Grammartizer/GrammarReader.java b/src/com/github/cglong/Grammartizer/GrammarReader.java
@@ -43,6 +43,8 @@ else if(words[a].equals("ASSIGN"))
 					t = new Terminal(":=");
 				else if(words[a].equals("COMMA"))
 					t = new Terminal(",");
+				else if(words[a].equals("SEMICOLON"))
+					t = new Terminal(";");
 				else if(words[a].equals("PLUS"))
 					t = new Terminal("+");
 				else if(words[a].equals("MINUS"))