From ec5e3e51b1f27ba05d6a93f1c5f9b4d44f5c6321 Mon Sep 17 00:00:00 2001 From: parrt Date: Fri, 20 Jan 2012 15:12:32 -0800 Subject: [PATCH] rm ForcedAction [git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9873] --- .../v4/tool/templates/codegen/Java/Java.stg | 2 - .../v4/codegen/OutputModelController.java | 4 +- .../org/antlr/v4/codegen/ParserFactory.java | 2 - .../antlr/v4/codegen/model/ForcedAction.java | 39 ------------------- tool/src/org/antlr/v4/parse/ANTLRParser.g | 2 +- 5 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 tool/src/org/antlr/v4/codegen/model/ForcedAction.java diff --git a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg index f2e957344..b2d6ce3bf 100644 --- a/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg +++ b/tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg @@ -427,8 +427,6 @@ setState(); Action(a, chunks) ::= "" -ForcedAction(a, chunks) ::= "" - ArgAction(a, chunks) ::= "" SemPred(p, chunks, failChunks) ::= << diff --git a/tool/src/org/antlr/v4/codegen/OutputModelController.java b/tool/src/org/antlr/v4/codegen/OutputModelController.java index e6ff22929..88733829e 100644 --- a/tool/src/org/antlr/v4/codegen/OutputModelController.java +++ b/tool/src/org/antlr/v4/codegen/OutputModelController.java @@ -289,7 +289,7 @@ public class OutputModelController { raf = new RuleActionFunction(delegate, r, ctxType); 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 ) { @@ -302,7 +302,7 @@ public class OutputModelController { // lexer sees {{...}} and {..} as same; neither are done until accept RuleActionFunction raf = new RuleActionFunction(delegate, r, ctxType); 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)); } } } diff --git a/tool/src/org/antlr/v4/codegen/ParserFactory.java b/tool/src/org/antlr/v4/codegen/ParserFactory.java index 55a988f07..0a317fbd0 100644 --- a/tool/src/org/antlr/v4/codegen/ParserFactory.java +++ b/tool/src/org/antlr/v4/codegen/ParserFactory.java @@ -85,8 +85,6 @@ public class ParserFactory extends DefaultOutputModelFactory { public List action(GrammarAST ast) { return list(new Action(this, ast)); } - public List forcedAction(GrammarAST ast) { return list(new ForcedAction(this, ast)); } - public List sempred(GrammarAST ast) { return list(new SemPred(this, ast)); } public List ruleRef(GrammarAST ID, GrammarAST label, GrammarAST args) { diff --git a/tool/src/org/antlr/v4/codegen/model/ForcedAction.java b/tool/src/org/antlr/v4/codegen/model/ForcedAction.java deleted file mode 100644 index 1e60014dd..000000000 --- a/tool/src/org/antlr/v4/codegen/model/ForcedAction.java +++ /dev/null @@ -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); - } -} diff --git a/tool/src/org/antlr/v4/parse/ANTLRParser.g b/tool/src/org/antlr/v4/parse/ANTLRParser.g index 544d59018..61dc27b9d 100644 --- a/tool/src/org/antlr/v4/parse/ANTLRParser.g +++ b/tool/src/org/antlr/v4/parse/ANTLRParser.g @@ -568,7 +568,7 @@ lexerAltList lexerAlt : lexerElements - ( lexerActions -> ^(LEXER_ALT_ACTION lexerElements lexerActions) + ( lexerActions -> ^(LEXER_ALT_ACTION lexerElements lexerActions) | -> lexerElements ) ;