forgetest1
/
antlr
forked from jasder/antlr
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

fix so tokens { A, B } Actually defines them.

This commit is contained in:
Terence Parr 2012-11-22 11:32:45 -08:00
parent 670b20a5cb
commit 4e84ae28a2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool/src/org/antlr/v4/semantics/SemanticPipeline.java
View File

@ -151,7 +151,10 @@ public class SemanticPipeline {
void assignLexerTokenTypes(Grammar g, List<GrammarAST> tokensDefs) { void assignLexerTokenTypes(Grammar g, List<GrammarAST> tokensDefs) {
Grammar G = g.getOutermostGrammar(); // put in root, even if imported Grammar G = g.getOutermostGrammar(); // put in root, even if imported
for (GrammarAST def : tokensDefs) { for (GrammarAST def : tokensDefs) {
if ( def.getType()== ANTLRParser.TOKEN_REF ) G.defineTokenName(def.getText()); // tokens { id (',' id)* } so must check IDs not TOKEN_REF
if ( Grammar.isTokenName(def.getText()) ) {
G.defineTokenName(def.getText());
}
} }
/* Define token types for nonfragment rules which do not include a 'type(...)' /* Define token types for nonfragment rules which do not include a 'type(...)'