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

finished SCOPE_REDEFINITION (new), TOKEN_ALIAS_REASSIGNMENT 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 6674]
This commit is contained in:
parrt 2010-02-07 12:44:49 -08:00
parent 2cf2898a04
commit ad5bf33eb4
7 changed files with 128 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tool/resources/org/antlr/v4/tool/templates/messages/languages/en.stg
View File

@ -93,6 +93,8 @@ NO_VIABLE_DFA_ALT(arg,arg2) ::=
SYNTAX_ERROR(arg) ::= "syntax error: <arg>" SYNTAX_ERROR(arg) ::= "syntax error: <arg>"
RULE_REDEFINITION(arg) ::= RULE_REDEFINITION(arg) ::=
"rule <arg> redefinition" "rule <arg> redefinition"
SCOPE_REDEFINITION(arg) ::=
"scope <arg> redefinition"
LEXER_RULES_NOT_ALLOWED(arg) ::= LEXER_RULES_NOT_ALLOWED(arg) ::=
"lexer rule <arg> not allowed in parser" "lexer rule <arg> not allowed in parser"
PARSER_RULES_NOT_ALLOWED(arg) ::= PARSER_RULES_NOT_ALLOWED(arg) ::=
@ -218,7 +220,7 @@ NO_SUCH_RULE_IN_SCOPE(arg,arg2) ::=
TOKEN_ALIAS_CONFLICT(arg,arg2) ::= TOKEN_ALIAS_CONFLICT(arg,arg2) ::=
"cannot alias <arg>; string already assigned to <arg2>" "cannot alias <arg>; string already assigned to <arg2>"
TOKEN_ALIAS_REASSIGNMENT(arg,arg2) ::= TOKEN_ALIAS_REASSIGNMENT(arg,arg2) ::=
"cannot alias <arg>; token name already assigned to <arg2>" "cannot alias <arg>; token name already assigned<if(arg2)> to <arg2><endif>"
TOKEN_VOCAB_IN_DELEGATE(arg,arg2) ::= TOKEN_VOCAB_IN_DELEGATE(arg,arg2) ::=
"tokenVocab option ignored in imported grammar <arg>" "tokenVocab option ignored in imported grammar <arg>"
INVALID_IMPORT(arg,arg2) ::= INVALID_IMPORT(arg,arg2) ::=

2
tool/src/org/antlr/v4/semantics/BasicSemanticTriggers.java
View File

@ -1,4 +1,4 @@
// $ANTLR 3.2.1-SNAPSHOT Jan 26, 2010 15:12:28 BasicSemanticTriggers.g 2010-02-06 15:47:26 // $ANTLR 3.2.1-SNAPSHOT Jan 26, 2010 15:12:28 BasicSemanticTriggers.g 2010-02-07 12:35:41
/* /*
[The "BSD license"] [The "BSD license"]

12
tool/src/org/antlr/v4/semantics/CollectSymbols.g
View File

@ -73,7 +73,7 @@ public List<Rule> rules = new ArrayList<Rule>();
public List<GrammarAST> rulerefs = new ArrayList<GrammarAST>(); public List<GrammarAST> rulerefs = new ArrayList<GrammarAST>();
public List<GrammarAST> terminals = new ArrayList<GrammarAST>(); public List<GrammarAST> terminals = new ArrayList<GrammarAST>();
public List<GrammarAST> strings = new ArrayList<GrammarAST>(); public List<GrammarAST> strings = new ArrayList<GrammarAST>();
public List<GrammarAST> aliases = new ArrayList<GrammarAST>(); public List<GrammarAST> tokensDef = new ArrayList<GrammarAST>();
public List<GrammarAST> scopes = new ArrayList<GrammarAST>(); public List<GrammarAST> scopes = new ArrayList<GrammarAST>();
public List<GrammarAST> actions = new ArrayList<GrammarAST>(); public List<GrammarAST> actions = new ArrayList<GrammarAST>();
Grammar g; // which grammar are we checking Grammar g; // which grammar are we checking
@ -86,7 +86,7 @@ public CollectSymbols(TreeNodeStream input, Grammar g) {
topdown topdown
: globalScope : globalScope
| action | action
| tokenAlias | tokensSection
| rule | rule
| ruleArg | ruleArg
| ruleReturns | ruleReturns
@ -99,7 +99,7 @@ bottomup
; ;
globalScope globalScope
: {inContext("GRAMMAR")}? ^(SCOPE ID ACTION) {scopes.add($ID);} : {inContext("GRAMMAR")}? ^(SCOPE ID ACTION) {scopes.add($SCOPE);}
; ;
action action
@ -107,12 +107,12 @@ action
{actions.add($AT);} {actions.add($AT);}
; ;
tokenAlias tokensSection
: {inContext("TOKENS")}? : {inContext("TOKENS")}?
( ^(ASSIGN t=ID STRING_LITERAL) ( ^(ASSIGN t=ID STRING_LITERAL)
{terminals.add($t); aliases.add($ASSIGN); strings.add($STRING_LITERAL);} {terminals.add($t); tokensDef.add($ASSIGN); strings.add($STRING_LITERAL);}
| t=ID | t=ID
{terminals.add($t);} {terminals.add($t); tokensDef.add($t);}
) )
; ;

133
tool/src/org/antlr/v4/semantics/CollectSymbols.java
View File

@ -1,4 +1,4 @@
// $ANTLR 3.2.1-SNAPSHOT Jan 26, 2010 15:12:28 CollectSymbols.g 2010-02-06 15:47:26 // $ANTLR 3.2.1-SNAPSHOT Jan 26, 2010 15:12:28 CollectSymbols.g 2010-02-07 12:35:41
/* /*
[The "BSD license"] [The "BSD license"]
@ -166,7 +166,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
public List<GrammarAST> rulerefs = new ArrayList<GrammarAST>(); public List<GrammarAST> rulerefs = new ArrayList<GrammarAST>();
public List<GrammarAST> terminals = new ArrayList<GrammarAST>(); public List<GrammarAST> terminals = new ArrayList<GrammarAST>();
public List<GrammarAST> strings = new ArrayList<GrammarAST>(); public List<GrammarAST> strings = new ArrayList<GrammarAST>();
public List<GrammarAST> aliases = new ArrayList<GrammarAST>(); public List<GrammarAST> tokensDef = new ArrayList<GrammarAST>();
public List<GrammarAST> scopes = new ArrayList<GrammarAST>(); public List<GrammarAST> scopes = new ArrayList<GrammarAST>();
public List<GrammarAST> actions = new ArrayList<GrammarAST>(); public List<GrammarAST> actions = new ArrayList<GrammarAST>();
Grammar g; // which grammar are we checking Grammar g; // which grammar are we checking
@ -178,10 +178,10 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// $ANTLR start "topdown" // $ANTLR start "topdown"
// CollectSymbols.g:86:1: topdown : ( globalScope | action | tokenAlias | rule | ruleArg | ruleReturns | ruleref | terminal ); // CollectSymbols.g:86:1: topdown : ( globalScope | action | tokensSection | rule | ruleArg | ruleReturns | ruleref | terminal );
public final void topdown() throws RecognitionException { public final void topdown() throws RecognitionException {
try { try {
// CollectSymbols.g:87:5: ( globalScope | action | tokenAlias | rule | ruleArg | ruleReturns | ruleref | terminal ) // CollectSymbols.g:87:5: ( globalScope | action | tokensSection | rule | ruleArg | ruleReturns | ruleref | terminal )
int alt1=8; int alt1=8;
switch ( input.LA(1) ) { switch ( input.LA(1) ) {
case SCOPE: case SCOPE:
@ -258,10 +258,10 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
} }
break; break;
case 3 : case 3 :
// CollectSymbols.g:89:7: tokenAlias // CollectSymbols.g:89:7: tokensSection
{ {
pushFollow(FOLLOW_tokenAlias_in_topdown112); pushFollow(FOLLOW_tokensSection_in_topdown112);
tokenAlias(); tokensSection();
state._fsp--; state._fsp--;
if (state.failed) return ; if (state.failed) return ;
@ -367,7 +367,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// $ANTLR start "globalScope" // $ANTLR start "globalScope"
// CollectSymbols.g:101:1: globalScope : {...}? ^( SCOPE ID ACTION ) ; // CollectSymbols.g:101:1: globalScope : {...}? ^( SCOPE ID ACTION ) ;
public final void globalScope() throws RecognitionException { public final void globalScope() throws RecognitionException {
GrammarAST ID1=null; GrammarAST SCOPE1=null;
try { try {
// CollectSymbols.g:102:2: ({...}? ^( SCOPE ID ACTION ) ) // CollectSymbols.g:102:2: ({...}? ^( SCOPE ID ACTION ) )
@ -377,15 +377,15 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
if (state.backtracking>0) {state.failed=true; return ;} if (state.backtracking>0) {state.failed=true; return ;}
throw new FailedPredicateException(input, "globalScope", "inContext(\"GRAMMAR\")"); throw new FailedPredicateException(input, "globalScope", "inContext(\"GRAMMAR\")");
} }
match(input,SCOPE,FOLLOW_SCOPE_in_globalScope177); if (state.failed) return ; SCOPE1=(GrammarAST)match(input,SCOPE,FOLLOW_SCOPE_in_globalScope177); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
ID1=(GrammarAST)match(input,ID,FOLLOW_ID_in_globalScope179); if (state.failed) return ; match(input,ID,FOLLOW_ID_in_globalScope179); if (state.failed) return ;
match(input,ACTION,FOLLOW_ACTION_in_globalScope181); if (state.failed) return ; match(input,ACTION,FOLLOW_ACTION_in_globalScope181); if (state.failed) return ;
match(input, Token.UP, null); if (state.failed) return ; match(input, Token.UP, null); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
scopes.add(ID1); scopes.add(SCOPE1);
} }
} }
@ -403,14 +403,13 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// $ANTLR start "action" // $ANTLR start "action"
// CollectSymbols.g:105:1: action : {...}? ^( AT (sc= ID )? ID ACTION ) ; // CollectSymbols.g:105:1: action : {...}? ^( AT ( ID )? ID ACTION ) ;
public final void action() throws RecognitionException { public final void action() throws RecognitionException {
GrammarAST sc=null;
GrammarAST AT2=null; GrammarAST AT2=null;
try { try {
// CollectSymbols.g:106:2: ({...}? ^( AT (sc= ID )? ID ACTION ) ) // CollectSymbols.g:106:2: ({...}? ^( AT ( ID )? ID ACTION ) )
// CollectSymbols.g:106:4: {...}? ^( AT (sc= ID )? ID ACTION ) // CollectSymbols.g:106:4: {...}? ^( AT ( ID )? ID ACTION )
{ {
if ( !((inContext("GRAMMAR"))) ) { if ( !((inContext("GRAMMAR"))) ) {
if (state.backtracking>0) {state.failed=true; return ;} if (state.backtracking>0) {state.failed=true; return ;}
@ -419,7 +418,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
AT2=(GrammarAST)match(input,AT,FOLLOW_AT_in_action198); if (state.failed) return ; AT2=(GrammarAST)match(input,AT,FOLLOW_AT_in_action198); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
// CollectSymbols.g:106:35: (sc= ID )? // CollectSymbols.g:106:33: ( ID )?
int alt2=2; int alt2=2;
int LA2_0 = input.LA(1); int LA2_0 = input.LA(1);
@ -432,17 +431,17 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
} }
switch (alt2) { switch (alt2) {
case 1 : case 1 :
// CollectSymbols.g:106:35: sc= ID // CollectSymbols.g:106:33: ID
{ {
sc=(GrammarAST)match(input,ID,FOLLOW_ID_in_action202); if (state.failed) return ; match(input,ID,FOLLOW_ID_in_action200); if (state.failed) return ;
} }
break; break;
} }
match(input,ID,FOLLOW_ID_in_action205); if (state.failed) return ; match(input,ID,FOLLOW_ID_in_action203); if (state.failed) return ;
match(input,ACTION,FOLLOW_ACTION_in_action207); if (state.failed) return ; match(input,ACTION,FOLLOW_ACTION_in_action205); if (state.failed) return ;
match(input, Token.UP, null); if (state.failed) return ; match(input, Token.UP, null); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
@ -463,9 +462,9 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// $ANTLR end "action" // $ANTLR end "action"
// $ANTLR start "tokenAlias" // $ANTLR start "tokensSection"
// CollectSymbols.g:110:1: tokenAlias : {...}? ( ^( ASSIGN t= ID STRING_LITERAL ) | t= ID ) ; // CollectSymbols.g:110:1: tokensSection : {...}? ( ^( ASSIGN t= ID STRING_LITERAL ) | t= ID ) ;
public final void tokenAlias() throws RecognitionException { public final void tokensSection() throws RecognitionException {
GrammarAST t=null; GrammarAST t=null;
GrammarAST ASSIGN3=null; GrammarAST ASSIGN3=null;
GrammarAST STRING_LITERAL4=null; GrammarAST STRING_LITERAL4=null;
@ -476,7 +475,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
{ {
if ( !((inContext("TOKENS"))) ) { if ( !((inContext("TOKENS"))) ) {
if (state.backtracking>0) {state.failed=true; return ;} if (state.backtracking>0) {state.failed=true; return ;}
throw new FailedPredicateException(input, "tokenAlias", "inContext(\"TOKENS\")"); throw new FailedPredicateException(input, "tokensSection", "inContext(\"TOKENS\")");
} }
// CollectSymbols.g:112:3: ( ^( ASSIGN t= ID STRING_LITERAL ) | t= ID ) // CollectSymbols.g:112:3: ( ^( ASSIGN t= ID STRING_LITERAL ) | t= ID )
int alt3=2; int alt3=2;
@ -499,15 +498,15 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 1 : case 1 :
// CollectSymbols.g:112:5: ^( ASSIGN t= ID STRING_LITERAL ) // CollectSymbols.g:112:5: ^( ASSIGN t= ID STRING_LITERAL )
{ {
ASSIGN3=(GrammarAST)match(input,ASSIGN,FOLLOW_ASSIGN_in_tokenAlias230); if (state.failed) return ; ASSIGN3=(GrammarAST)match(input,ASSIGN,FOLLOW_ASSIGN_in_tokensSection228); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
t=(GrammarAST)match(input,ID,FOLLOW_ID_in_tokenAlias234); if (state.failed) return ; t=(GrammarAST)match(input,ID,FOLLOW_ID_in_tokensSection232); if (state.failed) return ;
STRING_LITERAL4=(GrammarAST)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_tokenAlias236); if (state.failed) return ; STRING_LITERAL4=(GrammarAST)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_tokensSection234); if (state.failed) return ;
match(input, Token.UP, null); if (state.failed) return ; match(input, Token.UP, null); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
terminals.add(t); aliases.add(ASSIGN3); strings.add(STRING_LITERAL4); terminals.add(t); tokensDef.add(ASSIGN3); strings.add(STRING_LITERAL4);
} }
} }
@ -515,9 +514,9 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 2 : case 2 :
// CollectSymbols.g:114:5: t= ID // CollectSymbols.g:114:5: t= ID
{ {
t=(GrammarAST)match(input,ID,FOLLOW_ID_in_tokenAlias250); if (state.failed) return ; t=(GrammarAST)match(input,ID,FOLLOW_ID_in_tokensSection248); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
terminals.add(t); terminals.add(t); tokensDef.add(t);
} }
} }
@ -537,7 +536,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
} }
return ; return ;
} }
// $ANTLR end "tokenAlias" // $ANTLR end "tokensSection"
// $ANTLR start "rule" // $ANTLR start "rule"
@ -550,10 +549,10 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// CollectSymbols.g:119:5: ( ^( RULE name= ID ( . )+ ) ) // CollectSymbols.g:119:5: ( ^( RULE name= ID ( . )+ ) )
// CollectSymbols.g:119:9: ^( RULE name= ID ( . )+ ) // CollectSymbols.g:119:9: ^( RULE name= ID ( . )+ )
{ {
RULE5=(GrammarAST)match(input,RULE,FOLLOW_RULE_in_rule272); if (state.failed) return ; RULE5=(GrammarAST)match(input,RULE,FOLLOW_RULE_in_rule270); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
name=(GrammarAST)match(input,ID,FOLLOW_ID_in_rule276); if (state.failed) return ; name=(GrammarAST)match(input,ID,FOLLOW_ID_in_rule274); if (state.failed) return ;
// CollectSymbols.g:119:25: ( . )+ // CollectSymbols.g:119:25: ( . )+
int cnt4=0; int cnt4=0;
loop4: loop4:
@ -619,7 +618,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// CollectSymbols.g:128:2: ( RULE ) // CollectSymbols.g:128:2: ( RULE )
// CollectSymbols.g:128:4: RULE // CollectSymbols.g:128:4: RULE
{ {
match(input,RULE,FOLLOW_RULE_in_finishRule298); if (state.failed) return ; match(input,RULE,FOLLOW_RULE_in_finishRule296); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
currentRule = null; currentRule = null;
} }
@ -651,7 +650,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
if (state.backtracking>0) {state.failed=true; return ;} if (state.backtracking>0) {state.failed=true; return ;}
throw new FailedPredicateException(input, "ruleArg", "inContext(\"RULE\")"); throw new FailedPredicateException(input, "ruleArg", "inContext(\"RULE\")");
} }
ARG_ACTION6=(GrammarAST)match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleArg313); if (state.failed) return ; ARG_ACTION6=(GrammarAST)match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleArg311); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
currentRule.arg = ARG_ACTION6; currentRule.arg = ARG_ACTION6;
} }
@ -679,10 +678,10 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// CollectSymbols.g:136:2: ( ^( RETURNS ARG_ACTION ) ) // CollectSymbols.g:136:2: ( ^( RETURNS ARG_ACTION ) )
// CollectSymbols.g:136:4: ^( RETURNS ARG_ACTION ) // CollectSymbols.g:136:4: ^( RETURNS ARG_ACTION )
{ {
match(input,RETURNS,FOLLOW_RETURNS_in_ruleReturns328); if (state.failed) return ; match(input,RETURNS,FOLLOW_RETURNS_in_ruleReturns326); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
ARG_ACTION7=(GrammarAST)match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleReturns330); if (state.failed) return ; ARG_ACTION7=(GrammarAST)match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleReturns328); if (state.failed) return ;
match(input, Token.UP, null); if (state.failed) return ; match(input, Token.UP, null); if (state.failed) return ;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
@ -757,10 +756,10 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 1 : case 1 :
// CollectSymbols.g:141:5: ^( SCOPE ACTION ) // CollectSymbols.g:141:5: ^( SCOPE ACTION )
{ {
match(input,SCOPE,FOLLOW_SCOPE_in_ruleScopeSpec351); if (state.failed) return ; match(input,SCOPE,FOLLOW_SCOPE_in_ruleScopeSpec349); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
match(input,ACTION,FOLLOW_ACTION_in_ruleScopeSpec353); if (state.failed) return ; match(input,ACTION,FOLLOW_ACTION_in_ruleScopeSpec351); if (state.failed) return ;
match(input, Token.UP, null); if (state.failed) return ; match(input, Token.UP, null); if (state.failed) return ;
@ -769,7 +768,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 2 : case 2 :
// CollectSymbols.g:142:5: ^( SCOPE ( ID )+ ) // CollectSymbols.g:142:5: ^( SCOPE ( ID )+ )
{ {
match(input,SCOPE,FOLLOW_SCOPE_in_ruleScopeSpec361); if (state.failed) return ; match(input,SCOPE,FOLLOW_SCOPE_in_ruleScopeSpec359); if (state.failed) return ;
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
// CollectSymbols.g:142:13: ( ID )+ // CollectSymbols.g:142:13: ( ID )+
@ -788,7 +787,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 1 : case 1 :
// CollectSymbols.g:142:13: ID // CollectSymbols.g:142:13: ID
{ {
match(input,ID,FOLLOW_ID_in_ruleScopeSpec363); if (state.failed) return ; match(input,ID,FOLLOW_ID_in_ruleScopeSpec361); if (state.failed) return ;
} }
break; break;
@ -862,7 +861,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
if (state.backtracking>0) {state.failed=true; return retval;} if (state.backtracking>0) {state.failed=true; return retval;}
throw new FailedPredicateException(input, "terminal", "!inContext(\"TOKENS ASSIGN\")"); throw new FailedPredicateException(input, "terminal", "!inContext(\"TOKENS ASSIGN\")");
} }
STRING_LITERAL8=(GrammarAST)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_terminal385); if (state.failed) return retval; STRING_LITERAL8=(GrammarAST)match(input,STRING_LITERAL,FOLLOW_STRING_LITERAL_in_terminal383); if (state.failed) return retval;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
terminals.add(((GrammarAST)retval.start)); terminals.add(((GrammarAST)retval.start));
strings.add(STRING_LITERAL8); strings.add(STRING_LITERAL8);
@ -873,7 +872,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 2 : case 2 :
// CollectSymbols.g:149:7: TOKEN_REF // CollectSymbols.g:149:7: TOKEN_REF
{ {
match(input,TOKEN_REF,FOLLOW_TOKEN_REF_in_terminal395); if (state.failed) return retval; match(input,TOKEN_REF,FOLLOW_TOKEN_REF_in_terminal393); if (state.failed) return retval;
if ( state.backtracking==1 ) { if ( state.backtracking==1 ) {
terminals.add(((GrammarAST)retval.start)); terminals.add(((GrammarAST)retval.start));
} }
@ -903,7 +902,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
// CollectSymbols.g:153:5: ( ^( RULE_REF ( ARG_ACTION )? ) ) // CollectSymbols.g:153:5: ( ^( RULE_REF ( ARG_ACTION )? ) )
// CollectSymbols.g:153:7: ^( RULE_REF ( ARG_ACTION )? ) // CollectSymbols.g:153:7: ^( RULE_REF ( ARG_ACTION )? )
{ {
RULE_REF9=(GrammarAST)match(input,RULE_REF,FOLLOW_RULE_REF_in_ruleref424); if (state.failed) return ; RULE_REF9=(GrammarAST)match(input,RULE_REF,FOLLOW_RULE_REF_in_ruleref422); if (state.failed) return ;
if ( input.LA(1)==Token.DOWN ) { if ( input.LA(1)==Token.DOWN ) {
match(input, Token.DOWN, null); if (state.failed) return ; match(input, Token.DOWN, null); if (state.failed) return ;
@ -918,7 +917,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
case 1 : case 1 :
// CollectSymbols.g:153:18: ARG_ACTION // CollectSymbols.g:153:18: ARG_ACTION
{ {
match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleref426); if (state.failed) return ; match(input,ARG_ACTION,FOLLOW_ARG_ACTION_in_ruleref424); if (state.failed) return ;
} }
break; break;
@ -952,7 +951,7 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
public static final BitSet FOLLOW_globalScope_in_topdown96 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_globalScope_in_topdown96 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_action_in_topdown104 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_action_in_topdown104 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_tokenAlias_in_topdown112 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_tokensSection_in_topdown112 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule_in_topdown120 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rule_in_topdown120 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleArg_in_topdown128 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleArg_in_topdown128 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleReturns_in_topdown136 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleReturns_in_topdown136 = new BitSet(new long[]{0x0000000000000002L});
@ -963,26 +962,26 @@ public class CollectSymbols extends org.antlr.v4.runtime.tree.TreeFilter {
public static final BitSet FOLLOW_ID_in_globalScope179 = new BitSet(new long[]{0x0000000000010000L}); public static final BitSet FOLLOW_ID_in_globalScope179 = new BitSet(new long[]{0x0000000000010000L});
public static final BitSet FOLLOW_ACTION_in_globalScope181 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_ACTION_in_globalScope181 = new BitSet(new long[]{0x0000000000000008L});
public static final BitSet FOLLOW_AT_in_action198 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_AT_in_action198 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ID_in_action202 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L}); public static final BitSet FOLLOW_ID_in_action200 = new BitSet(new long[]{0x0000000000000000L,0x0000000000800000L});
public static final BitSet FOLLOW_ID_in_action205 = new BitSet(new long[]{0x0000000000010000L}); public static final BitSet FOLLOW_ID_in_action203 = new BitSet(new long[]{0x0000000000010000L});
public static final BitSet FOLLOW_ACTION_in_action207 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_ACTION_in_action205 = new BitSet(new long[]{0x0000000000000008L});
public static final BitSet FOLLOW_ASSIGN_in_tokenAlias230 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_ASSIGN_in_tokensSection228 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ID_in_tokenAlias234 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L}); public static final BitSet FOLLOW_ID_in_tokensSection232 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
public static final BitSet FOLLOW_STRING_LITERAL_in_tokenAlias236 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_STRING_LITERAL_in_tokensSection234 = new BitSet(new long[]{0x0000000000000008L});
public static final BitSet FOLLOW_ID_in_tokenAlias250 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ID_in_tokensSection248 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_in_rule272 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_RULE_in_rule270 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ID_in_rule276 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000003FFFFFFFFFL}); public static final BitSet FOLLOW_ID_in_rule274 = new BitSet(new long[]{0xFFFFFFFFFFFFFFF0L,0x0000003FFFFFFFFFL});
public static final BitSet FOLLOW_RULE_in_finishRule298 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_in_finishRule296 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ARG_ACTION_in_ruleArg313 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ARG_ACTION_in_ruleArg311 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RETURNS_in_ruleReturns328 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_RETURNS_in_ruleReturns326 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ARG_ACTION_in_ruleReturns330 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_ARG_ACTION_in_ruleReturns328 = new BitSet(new long[]{0x0000000000000008L});
public static final BitSet FOLLOW_SCOPE_in_ruleScopeSpec351 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_SCOPE_in_ruleScopeSpec349 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ACTION_in_ruleScopeSpec353 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_ACTION_in_ruleScopeSpec351 = new BitSet(new long[]{0x0000000000000008L});
public static final BitSet FOLLOW_SCOPE_in_ruleScopeSpec361 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_SCOPE_in_ruleScopeSpec359 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ID_in_ruleScopeSpec363 = new BitSet(new long[]{0x0000000000000008L,0x0000000000800000L}); public static final BitSet FOLLOW_ID_in_ruleScopeSpec361 = new BitSet(new long[]{0x0000000000000008L,0x0000000000800000L});
public static final BitSet FOLLOW_STRING_LITERAL_in_terminal385 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_STRING_LITERAL_in_terminal383 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_TOKEN_REF_in_terminal395 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_TOKEN_REF_in_terminal393 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_RULE_REF_in_ruleref424 = new BitSet(new long[]{0x0000000000000004L}); public static final BitSet FOLLOW_RULE_REF_in_ruleref422 = new BitSet(new long[]{0x0000000000000004L});
public static final BitSet FOLLOW_ARG_ACTION_in_ruleref426 = new BitSet(new long[]{0x0000000000000008L}); public static final BitSet FOLLOW_ARG_ACTION_in_ruleref424 = new BitSet(new long[]{0x0000000000000008L});
} }

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

@ -31,6 +31,7 @@ public class SemanticPipeline {
// don't continue if we get errors in this basic check // don't continue if we get errors in this basic check
if ( false ) return; if ( false ) return;
// TODO: can i move to Tool.process? why recurse here?
// NOW DO BASIC / EASY SEMANTIC CHECKS FOR DELEGATES (IF ANY) // NOW DO BASIC / EASY SEMANTIC CHECKS FOR DELEGATES (IF ANY)
if ( g.getImportedGrammars()!=null ) { if ( g.getImportedGrammars()!=null ) {
for (Grammar d : g.getImportedGrammars()) { for (Grammar d : g.getImportedGrammars()) {

52
tool/src/org/antlr/v4/semantics/SymbolChecks.java
View File

@ -1,5 +1,6 @@
package org.antlr.v4.semantics; package org.antlr.v4.semantics;
import org.antlr.v4.parse.ANTLRParser;
import org.antlr.v4.tool.*; import org.antlr.v4.tool.*;
import java.util.*; import java.util.*;
@ -12,7 +13,7 @@ public class SymbolChecks {
Grammar g; Grammar g;
CollectSymbols collector; CollectSymbols collector;
Map<String, Rule> nameToRuleMap = new HashMap<String, Rule>(); Map<String, Rule> nameToRuleMap = new HashMap<String, Rule>();
Map<String, Set<String>> scopeToActionNames = new HashMap<String, Set<String>>(); Map<String, Set<String>> actionScopeToActionNames = new HashMap<String, Set<String>>();
public SymbolChecks(Grammar g, CollectSymbols collector) { public SymbolChecks(Grammar g, CollectSymbols collector) {
this.g = g; this.g = g;
@ -21,13 +22,16 @@ public class SymbolChecks {
System.out.println("rulerefs="+collector.rulerefs); System.out.println("rulerefs="+collector.rulerefs);
System.out.println("terminals="+collector.terminals); System.out.println("terminals="+collector.terminals);
System.out.println("strings="+collector.strings); System.out.println("strings="+collector.strings);
System.out.println("aliases="+collector.aliases); System.out.println("tokensDef="+collector.tokensDef);
System.out.println("actions="+collector.actions); System.out.println("actions="+collector.actions);
System.out.println("scopes="+collector.scopes);
} }
public void examine() { public void examine() {
checkRuleRedefinitions(collector.rules); checkRuleRedefinitions(collector.rules);
checkScopeRedefinitions(collector.scopes);
checkActionRedefinitions(collector.actions); checkActionRedefinitions(collector.actions);
checkTokenAliasRedefinitions(collector.tokensDef);
checkRuleArgs(collector.rulerefs); checkRuleArgs(collector.rulerefs);
} }
@ -45,6 +49,46 @@ public class SymbolChecks {
} }
} }
public void checkScopeRedefinitions(List<GrammarAST> scopes) {
if ( scopes==null ) return;
Set<String> scopeNames = new HashSet<String>();
for (int i=0; i< scopes.size(); i++) {
GrammarAST s = scopes.get(i);
GrammarAST idNode = (GrammarAST)s.getChild(0);
if ( !scopeNames.contains(idNode.getText()) ) {
scopeNames.add(idNode.getText());
}
else {
ErrorManager.grammarError(ErrorType.SCOPE_REDEFINITION,
g.fileName, idNode.token, idNode.getText());
}
}
}
public void checkTokenAliasRedefinitions(List<GrammarAST> aliases) {
if ( aliases==null ) return;
Map<String, GrammarAST> aliasTokenNames = new HashMap<String, GrammarAST>();
for (int i=0; i< aliases.size(); i++) {
GrammarAST a = aliases.get(i);
GrammarAST idNode = a;
if ( a.getType()== ANTLRParser.ASSIGN ) {
idNode = (GrammarAST)a.getChild(0);
}
GrammarAST prev = aliasTokenNames.get(idNode.getText());
if ( prev==null ) {
aliasTokenNames.put(idNode.getText(), a);
}
else {
GrammarAST value = (GrammarAST)prev.getChild(1);
String valueText = null;
if ( value!=null ) valueText = value.getText();
ErrorManager.grammarError(ErrorType.TOKEN_ALIAS_REASSIGNMENT,
g.fileName, idNode.token, idNode.getText(), valueText);
}
}
}
public void checkRuleArgs(List<GrammarAST> rulerefs) { public void checkRuleArgs(List<GrammarAST> rulerefs) {
if ( rulerefs==null ) return; if ( rulerefs==null ) return;
for (GrammarAST ref : rulerefs) { for (GrammarAST ref : rulerefs) {
@ -81,10 +125,10 @@ public class SymbolChecks {
scope = nameNode.getText(); scope = nameNode.getText();
name = ampersandAST.getChild(1).getText(); name = ampersandAST.getChild(1).getText();
} }
Set<String> scopeActions = scopeToActionNames.get(scope); Set<String> scopeActions = actionScopeToActionNames.get(scope);
if ( scopeActions==null ) { // init scope if ( scopeActions==null ) { // init scope
scopeActions = new HashSet<String>(); scopeActions = new HashSet<String>();
scopeToActionNames.put(scope, scopeActions); actionScopeToActionNames.put(scope, scopeActions);
} }
if ( !scopeActions.contains(name) ) { if ( !scopeActions.contains(name) ) {
scopeActions.add(name); scopeActions.add(name);

3
tool/src/org/antlr/v4/tool/ErrorType.java
View File

@ -105,7 +105,8 @@ public enum ErrorType {
UNKNOWN_DYNAMIC_SCOPE_ATTRIBUTE(ErrorSeverity.ERROR, true, true), UNKNOWN_DYNAMIC_SCOPE_ATTRIBUTE(ErrorSeverity.ERROR, true, true),
ISOLATED_RULE_ATTRIBUTE(ErrorSeverity.ERROR, true, true), ISOLATED_RULE_ATTRIBUTE(ErrorSeverity.ERROR, true, true),
INVALID_ACTION_SCOPE(ErrorSeverity.ERROR, true, true), INVALID_ACTION_SCOPE(ErrorSeverity.ERROR, true, true),
ACTION_REDEFINITION(ErrorSeverity.ERROR, true, true), ACTION_REDEFINITION(ErrorSeverity.ERROR, true, true),
SCOPE_REDEFINITION(ErrorSeverity.ERROR, true, true),
INVALID_TEMPLATE_ACTION(ErrorSeverity.ERROR, true, true), INVALID_TEMPLATE_ACTION(ErrorSeverity.ERROR, true, true),
ARG_INIT_VALUES_ILLEGAL(ErrorSeverity.ERROR, true, true), ARG_INIT_VALUES_ILLEGAL(ErrorSeverity.ERROR, true, true),
REWRITE_OR_OP_WITH_NO_OUTPUT_OPTION(ErrorSeverity.ERROR, true, true), REWRITE_OR_OP_WITH_NO_OUTPUT_OPTION(ErrorSeverity.ERROR, true, true),