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

rm ForcedAction 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9873]
This commit is contained in:
parrt 2012-01-20 15:12:32 -08:00
parent 252cfbda78
commit ec5e3e51b1
5 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -427,8 +427,6 @@ setState(<w.stateNumber>);
Action(a, chunks) ::= "<chunks>" Action(a, chunks) ::= "<chunks>"
ForcedAction(a, chunks) ::= "<chunks>"
ArgAction(a, chunks) ::= "<chunks>" ArgAction(a, chunks) ::= "<chunks>"
SemPred(p, chunks, failChunks) ::= << SemPred(p, chunks, failChunks) ::= <<

4
tool/src/org/antlr/v4/codegen/OutputModelController.java
View File

@ -289,7 +289,7 @@ public class OutputModelController {
raf = new RuleActionFunction(delegate, r, ctxType); raf = new RuleActionFunction(delegate, r, ctxType);
lexer.actionFuncs.put(r, raf); lexer.actionFuncs.put(r, raf);
} }
raf.actions.put(g.lexerActions.get(a), new ForcedAction(delegate, a)); raf.actions.put(g.lexerActions.get(a), new Action(delegate, a));
} }
if ( a instanceof PredAST ) { if ( a instanceof PredAST ) {
@ -302,7 +302,7 @@ public class OutputModelController {
// lexer sees {{...}} and {..} as same; neither are done until accept // lexer sees {{...}} and {..} as same; neither are done until accept
RuleActionFunction raf = new RuleActionFunction(delegate, r, ctxType); RuleActionFunction raf = new RuleActionFunction(delegate, r, ctxType);
lexer.actionFuncs.put(r, raf); lexer.actionFuncs.put(r, raf);
raf.actions.put(g.lexerActions.get(a), new ForcedAction(delegate, a)); raf.actions.put(g.lexerActions.get(a), new Action(delegate, a));
} }
} }
} }

2
tool/src/org/antlr/v4/codegen/ParserFactory.java
View File

@ -85,8 +85,6 @@ public class ParserFactory extends DefaultOutputModelFactory {
public List<SrcOp> action(GrammarAST ast) { return list(new Action(this, ast)); } public List<SrcOp> action(GrammarAST ast) { return list(new Action(this, ast)); }
public List<SrcOp> forcedAction(GrammarAST ast) { return list(new ForcedAction(this, ast)); }
public List<SrcOp> sempred(GrammarAST ast) { return list(new SemPred(this, ast)); } public List<SrcOp> sempred(GrammarAST ast) { return list(new SemPred(this, ast)); }
public List<SrcOp> ruleRef(GrammarAST ID, GrammarAST label, GrammarAST args) { public List<SrcOp> ruleRef(GrammarAST ID, GrammarAST label, GrammarAST args) {

39
tool/src/org/antlr/v4/codegen/model/ForcedAction.java
View File

@ -1,39 +0,0 @@
/*
[The "BSD license"]
Copyright (c) 2011 Terence Parr
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.antlr.v4.codegen.model;
import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.tool.ast.GrammarAST;
public class ForcedAction extends Action {
public ForcedAction(OutputModelFactory factory, GrammarAST ast) {
super(factory, ast);
}
}

2
tool/src/org/antlr/v4/parse/ANTLRParser.g
View File

@ -568,7 +568,7 @@ lexerAltList
lexerAlt lexerAlt
: lexerElements : lexerElements
( lexerActions -> ^(LEXER_ALT_ACTION lexerElements lexerActions) ( lexerActions -> ^(LEXER_ALT_ACTION<AltAST> lexerElements lexerActions)
| -> lexerElements | -> lexerElements
) )
; ;