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

Merge branch 'lexer-properties' of github.com:sharwell/antlr4

This commit is contained in:
Terence Parr 2012-09-23 11:09:04 -07:00
parent d4d65be663 56c4e0e8b0
commit 1b60543207
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/src/org/antlr/v4/tool/Grammar.java
View File

@ -107,7 +107,7 @@ public class Grammar implements AttributeResolver {
public static Map<String, AttributeDict> grammarAndLabelRefTypeToScope =
new HashMap<String, AttributeDict>() {{
// put("lexer:RULE_LABEL", Rule.predefinedLexerRulePropertiesDict);
put("lexer:RULE_LABEL", Rule.predefinedLexerRulePropertiesDict);
// put("lexer:LEXER_STRING_LABEL", Rule.predefinedLexerRulePropertiesDict);
// put("lexer:TOKEN_LABEL", AttributeDict.predefinedTokenDict);
put("parser:RULE_LABEL", Rule.predefinedRulePropertiesDict);

14
tool/src/org/antlr/v4/tool/Rule.java
View File

@ -58,13 +58,13 @@ public class Rule implements AttributeResolver {
add(new Attribute("ctx"));
}};
// public static AttributeDict predefinedLexerRulePropertiesDict =
// new AttributeDict(AttributeDict.DictType.PREDEFINED_LEXER_RULE) {{
// add(new Attribute("text"));
// add(new Attribute("type"));
// add(new Attribute("channel"));
// add(new Attribute("mode"));
// }};
public static AttributeDict predefinedLexerRulePropertiesDict =
new AttributeDict(AttributeDict.DictType.PREDEFINED_LEXER_RULE) {{
add(new Attribute("text"));
add(new Attribute("type"));
add(new Attribute("channel"));
add(new Attribute("mode"));
}};
public static Set<String> validLexerCommands = new HashSet<String>() {{
// CALLS