diff options
8 files changed, 2701 insertions, 4545 deletions
diff --git a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF index dabb7a62..e2a26b4d 100644 --- a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - org.antlr;bundle-version="3.0.0", - org.junit + org.junit, + org.antlr.patched;bundle-version="3.0.0" Export-Package: org.eclipse.xpand3, org.eclipse.xpand3.declaration, org.eclipse.xpand3.declaration.impl, diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java index 60e38d9b..c35ffba9 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/AbstractXpand3NodeParser.java @@ -4,9 +4,7 @@ import java.util.Set; import org.antlr.runtime.CommonToken; import org.antlr.runtime.RecognitionException; -import org.antlr.runtime.Token; import org.antlr.runtime.TokenStream; -import org.antlr.runtime.tree.CommonTreeAdaptor; import org.eclipse.xpand3.node.CompositeNode; import org.eclipse.xpand3.node.LeafNode; import org.eclipse.xpand3.node.LexedToken; @@ -20,19 +18,12 @@ public abstract class AbstractXpand3NodeParser extends Xpand3Parser { public AbstractXpand3NodeParser(TokenStream input) { super(input); - setTreeAdaptor(new CommonTreeAdaptor() { - @Override - public Object create(Token arg0) { - if (arg0 != null) - createLexedToken((CommonToken) arg0); - return super.create(arg0); - } - }); } protected abstract Set<String> normalizableRules(); - public void ruleStart(String rulename) { + @Override + public void ruleEntered(String rulename) { CompositeNode newOne = NodeFactory.eINSTANCE.createCompositeNode(); newOne.setRule(rulename); if (current != null) { @@ -42,10 +33,10 @@ public abstract class AbstractXpand3NodeParser extends Xpand3Parser { } current = newOne; } - - public void ruleEnd() { + @Override + public void ruleLeft(String ruleName) { CompositeNode parent = (CompositeNode) current.eContainer(); - if (normalizableRules().contains(current.getRule()) + if (parent!=null && normalizableRules().contains(current.getRule()) && current.getChildren().size() == 1 && (current.getChildren().get(0) instanceof CompositeNode)) { Node child = current.getChildren().get(0); @@ -65,9 +56,12 @@ public abstract class AbstractXpand3NodeParser extends Xpand3Parser { throw new RuntimeException(getErrorMessage(arg0, getTokenNames()), arg0); } - public void createLexedToken(CommonToken ct) { + @Override + public void tokenConsumed(String var, CommonToken ct) { LeafNode n = NodeFactory.eINSTANCE.createLeafNode(); current.getChildren().add(n); + if (var!=null) + n.setAlias(var); LexedToken myToken = NodeFactory.eINSTANCE.createLexedToken(); n.setToken(myToken); myToken.setText(ct.getText()); diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3.g b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3.g index fdc704e4..d2071a15 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3.g +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3.g @@ -1,4 +1,7 @@ grammar Xpand3; +options{ + trace=true; +} @lexer::members { private boolean xpandMode = false; diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Lexer.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Lexer.java index 4d5d7c47..51987593 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Lexer.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Lexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0 src/org/eclipse/xpand3/parser/Xpand3.g 2008-02-28 09:34:54 +// $ANTLR 3.0.1 src/org/eclipse/xpand3/parser/Xpand3.g 2008-02-28 11:47:30 package org.eclipse.xpand3.parser; @@ -128,10 +128,10 @@ public class Xpand3Lexer extends Lexer { public String getGrammarFileName() { return "src/org/eclipse/xpand3/parser/Xpand3.g"; } // $ANTLR start T25 - public void mT25() throws RecognitionException { + public final void mT25() throws RecognitionException { try { int _type = T25; - // src/org/eclipse/xpand3/parser/Xpand3.g:9:7: ( 'IMPORT' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:9:5: ( 'IMPORT' ) // src/org/eclipse/xpand3/parser/Xpand3.g:9:7: 'IMPORT' { match("IMPORT"); @@ -147,10 +147,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T25 // $ANTLR start T26 - public void mT26() throws RecognitionException { + public final void mT26() throws RecognitionException { try { int _type = T26; - // src/org/eclipse/xpand3/parser/Xpand3.g:10:7: ( 'EXTENSION' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:10:5: ( 'EXTENSION' ) // src/org/eclipse/xpand3/parser/Xpand3.g:10:7: 'EXTENSION' { match("EXTENSION"); @@ -166,10 +166,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T26 // $ANTLR start T27 - public void mT27() throws RecognitionException { + public final void mT27() throws RecognitionException { try { int _type = T27; - // src/org/eclipse/xpand3/parser/Xpand3.g:11:7: ( 'import' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:11:5: ( 'import' ) // src/org/eclipse/xpand3/parser/Xpand3.g:11:7: 'import' { match("import"); @@ -185,10 +185,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T27 // $ANTLR start T28 - public void mT28() throws RecognitionException { + public final void mT28() throws RecognitionException { try { int _type = T28; - // src/org/eclipse/xpand3/parser/Xpand3.g:12:7: ( ';' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:12:5: ( ';' ) // src/org/eclipse/xpand3/parser/Xpand3.g:12:7: ';' { match(';'); @@ -203,10 +203,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T28 // $ANTLR start T29 - public void mT29() throws RecognitionException { + public final void mT29() throws RecognitionException { try { int _type = T29; - // src/org/eclipse/xpand3/parser/Xpand3.g:13:7: ( 'extension' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:13:5: ( 'extension' ) // src/org/eclipse/xpand3/parser/Xpand3.g:13:7: 'extension' { match("extension"); @@ -222,10 +222,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T29 // $ANTLR start T30 - public void mT30() throws RecognitionException { + public final void mT30() throws RecognitionException { try { int _type = T30; - // src/org/eclipse/xpand3/parser/Xpand3.g:14:7: ( 'reexport' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:14:5: ( 'reexport' ) // src/org/eclipse/xpand3/parser/Xpand3.g:14:7: 'reexport' { match("reexport"); @@ -241,10 +241,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T30 // $ANTLR start T31 - public void mT31() throws RecognitionException { + public final void mT31() throws RecognitionException { try { int _type = T31; - // src/org/eclipse/xpand3/parser/Xpand3.g:15:7: ( '(' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:15:5: ( '(' ) // src/org/eclipse/xpand3/parser/Xpand3.g:15:7: '(' { match('('); @@ -259,10 +259,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T31 // $ANTLR start T32 - public void mT32() throws RecognitionException { + public final void mT32() throws RecognitionException { try { int _type = T32; - // src/org/eclipse/xpand3/parser/Xpand3.g:16:7: ( ',' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:16:5: ( ',' ) // src/org/eclipse/xpand3/parser/Xpand3.g:16:7: ',' { match(','); @@ -277,10 +277,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T32 // $ANTLR start T33 - public void mT33() throws RecognitionException { + public final void mT33() throws RecognitionException { try { int _type = T33; - // src/org/eclipse/xpand3/parser/Xpand3.g:17:7: ( '*' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:17:5: ( '*' ) // src/org/eclipse/xpand3/parser/Xpand3.g:17:7: '*' { match('*'); @@ -295,10 +295,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T33 // $ANTLR start T34 - public void mT34() throws RecognitionException { + public final void mT34() throws RecognitionException { try { int _type = T34; - // src/org/eclipse/xpand3/parser/Xpand3.g:18:7: ( ')' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:18:5: ( ')' ) // src/org/eclipse/xpand3/parser/Xpand3.g:18:7: ')' { match(')'); @@ -313,10 +313,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T34 // $ANTLR start T35 - public void mT35() throws RecognitionException { + public final void mT35() throws RecognitionException { try { int _type = T35; - // src/org/eclipse/xpand3/parser/Xpand3.g:19:7: ( 'FOR' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:19:5: ( 'FOR' ) // src/org/eclipse/xpand3/parser/Xpand3.g:19:7: 'FOR' { match("FOR"); @@ -332,10 +332,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T35 // $ANTLR start T36 - public void mT36() throws RecognitionException { + public final void mT36() throws RecognitionException { try { int _type = T36; - // src/org/eclipse/xpand3/parser/Xpand3.g:20:7: ( '-' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:20:5: ( '-' ) // src/org/eclipse/xpand3/parser/Xpand3.g:20:7: '-' { match('-'); @@ -350,10 +350,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T36 // $ANTLR start T37 - public void mT37() throws RecognitionException { + public final void mT37() throws RecognitionException { try { int _type = T37; - // src/org/eclipse/xpand3/parser/Xpand3.g:21:7: ( 'ERROR' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:21:5: ( 'ERROR' ) // src/org/eclipse/xpand3/parser/Xpand3.g:21:7: 'ERROR' { match("ERROR"); @@ -369,10 +369,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T37 // $ANTLR start T38 - public void mT38() throws RecognitionException { + public final void mT38() throws RecognitionException { try { int _type = T38; - // src/org/eclipse/xpand3/parser/Xpand3.g:22:7: ( 'EXPAND' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:22:5: ( 'EXPAND' ) // src/org/eclipse/xpand3/parser/Xpand3.g:22:7: 'EXPAND' { match("EXPAND"); @@ -388,10 +388,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T38 // $ANTLR start T39 - public void mT39() throws RecognitionException { + public final void mT39() throws RecognitionException { try { int _type = T39; - // src/org/eclipse/xpand3/parser/Xpand3.g:23:7: ( 'FOREACH' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:23:5: ( 'FOREACH' ) // src/org/eclipse/xpand3/parser/Xpand3.g:23:7: 'FOREACH' { match("FOREACH"); @@ -407,10 +407,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T39 // $ANTLR start T40 - public void mT40() throws RecognitionException { + public final void mT40() throws RecognitionException { try { int _type = T40; - // src/org/eclipse/xpand3/parser/Xpand3.g:24:7: ( 'SEPARATOR' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:24:5: ( 'SEPARATOR' ) // src/org/eclipse/xpand3/parser/Xpand3.g:24:7: 'SEPARATOR' { match("SEPARATOR"); @@ -426,10 +426,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T40 // $ANTLR start T41 - public void mT41() throws RecognitionException { + public final void mT41() throws RecognitionException { try { int _type = T41; - // src/org/eclipse/xpand3/parser/Xpand3.g:25:7: ( 'FILE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:25:5: ( 'FILE' ) // src/org/eclipse/xpand3/parser/Xpand3.g:25:7: 'FILE' { match("FILE"); @@ -445,10 +445,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T41 // $ANTLR start T42 - public void mT42() throws RecognitionException { + public final void mT42() throws RecognitionException { try { int _type = T42; - // src/org/eclipse/xpand3/parser/Xpand3.g:26:7: ( 'ENDFILE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:26:5: ( 'ENDFILE' ) // src/org/eclipse/xpand3/parser/Xpand3.g:26:7: 'ENDFILE' { match("ENDFILE"); @@ -464,10 +464,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T42 // $ANTLR start T43 - public void mT43() throws RecognitionException { + public final void mT43() throws RecognitionException { try { int _type = T43; - // src/org/eclipse/xpand3/parser/Xpand3.g:27:7: ( 'AS' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:27:5: ( 'AS' ) // src/org/eclipse/xpand3/parser/Xpand3.g:27:7: 'AS' { match("AS"); @@ -483,10 +483,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T43 // $ANTLR start T44 - public void mT44() throws RecognitionException { + public final void mT44() throws RecognitionException { try { int _type = T44; - // src/org/eclipse/xpand3/parser/Xpand3.g:28:7: ( 'ITERATOR' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:28:5: ( 'ITERATOR' ) // src/org/eclipse/xpand3/parser/Xpand3.g:28:7: 'ITERATOR' { match("ITERATOR"); @@ -502,10 +502,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T44 // $ANTLR start T45 - public void mT45() throws RecognitionException { + public final void mT45() throws RecognitionException { try { int _type = T45; - // src/org/eclipse/xpand3/parser/Xpand3.g:29:7: ( 'ENDFOREACH' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:29:5: ( 'ENDFOREACH' ) // src/org/eclipse/xpand3/parser/Xpand3.g:29:7: 'ENDFOREACH' { match("ENDFOREACH"); @@ -521,10 +521,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T45 // $ANTLR start T46 - public void mT46() throws RecognitionException { + public final void mT46() throws RecognitionException { try { int _type = T46; - // src/org/eclipse/xpand3/parser/Xpand3.g:30:7: ( 'IF' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:30:5: ( 'IF' ) // src/org/eclipse/xpand3/parser/Xpand3.g:30:7: 'IF' { match("IF"); @@ -540,10 +540,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T46 // $ANTLR start T47 - public void mT47() throws RecognitionException { + public final void mT47() throws RecognitionException { try { int _type = T47; - // src/org/eclipse/xpand3/parser/Xpand3.g:31:7: ( 'ENDIF' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:31:5: ( 'ENDIF' ) // src/org/eclipse/xpand3/parser/Xpand3.g:31:7: 'ENDIF' { match("ENDIF"); @@ -559,10 +559,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T47 // $ANTLR start T48 - public void mT48() throws RecognitionException { + public final void mT48() throws RecognitionException { try { int _type = T48; - // src/org/eclipse/xpand3/parser/Xpand3.g:32:7: ( 'ELSEIF' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:32:5: ( 'ELSEIF' ) // src/org/eclipse/xpand3/parser/Xpand3.g:32:7: 'ELSEIF' { match("ELSEIF"); @@ -578,10 +578,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T48 // $ANTLR start T49 - public void mT49() throws RecognitionException { + public final void mT49() throws RecognitionException { try { int _type = T49; - // src/org/eclipse/xpand3/parser/Xpand3.g:33:7: ( 'ELSE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:33:5: ( 'ELSE' ) // src/org/eclipse/xpand3/parser/Xpand3.g:33:7: 'ELSE' { match("ELSE"); @@ -597,10 +597,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T49 // $ANTLR start T50 - public void mT50() throws RecognitionException { + public final void mT50() throws RecognitionException { try { int _type = T50; - // src/org/eclipse/xpand3/parser/Xpand3.g:34:7: ( 'LET' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:34:5: ( 'LET' ) // src/org/eclipse/xpand3/parser/Xpand3.g:34:7: 'LET' { match("LET"); @@ -616,10 +616,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T50 // $ANTLR start T51 - public void mT51() throws RecognitionException { + public final void mT51() throws RecognitionException { try { int _type = T51; - // src/org/eclipse/xpand3/parser/Xpand3.g:35:7: ( 'ENDLET' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:35:5: ( 'ENDLET' ) // src/org/eclipse/xpand3/parser/Xpand3.g:35:7: 'ENDLET' { match("ENDLET"); @@ -635,10 +635,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T51 // $ANTLR start T52 - public void mT52() throws RecognitionException { + public final void mT52() throws RecognitionException { try { int _type = T52; - // src/org/eclipse/xpand3/parser/Xpand3.g:36:7: ( 'PROTECT' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:36:5: ( 'PROTECT' ) // src/org/eclipse/xpand3/parser/Xpand3.g:36:7: 'PROTECT' { match("PROTECT"); @@ -654,10 +654,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T52 // $ANTLR start T53 - public void mT53() throws RecognitionException { + public final void mT53() throws RecognitionException { try { int _type = T53; - // src/org/eclipse/xpand3/parser/Xpand3.g:37:7: ( 'CSTART' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:37:5: ( 'CSTART' ) // src/org/eclipse/xpand3/parser/Xpand3.g:37:7: 'CSTART' { match("CSTART"); @@ -673,10 +673,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T53 // $ANTLR start T54 - public void mT54() throws RecognitionException { + public final void mT54() throws RecognitionException { try { int _type = T54; - // src/org/eclipse/xpand3/parser/Xpand3.g:38:7: ( 'CEND' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:38:5: ( 'CEND' ) // src/org/eclipse/xpand3/parser/Xpand3.g:38:7: 'CEND' { match("CEND"); @@ -692,10 +692,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T54 // $ANTLR start T55 - public void mT55() throws RecognitionException { + public final void mT55() throws RecognitionException { try { int _type = T55; - // src/org/eclipse/xpand3/parser/Xpand3.g:39:7: ( 'ID' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:39:5: ( 'ID' ) // src/org/eclipse/xpand3/parser/Xpand3.g:39:7: 'ID' { match("ID"); @@ -711,10 +711,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T55 // $ANTLR start T56 - public void mT56() throws RecognitionException { + public final void mT56() throws RecognitionException { try { int _type = T56; - // src/org/eclipse/xpand3/parser/Xpand3.g:40:7: ( 'DISABLE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:40:5: ( 'DISABLE' ) // src/org/eclipse/xpand3/parser/Xpand3.g:40:7: 'DISABLE' { match("DISABLE"); @@ -730,10 +730,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T56 // $ANTLR start T57 - public void mT57() throws RecognitionException { + public final void mT57() throws RecognitionException { try { int _type = T57; - // src/org/eclipse/xpand3/parser/Xpand3.g:41:7: ( 'ENDPROTECT' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:41:5: ( 'ENDPROTECT' ) // src/org/eclipse/xpand3/parser/Xpand3.g:41:7: 'ENDPROTECT' { match("ENDPROTECT"); @@ -749,10 +749,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T57 // $ANTLR start T58 - public void mT58() throws RecognitionException { + public final void mT58() throws RecognitionException { try { int _type = T58; - // src/org/eclipse/xpand3/parser/Xpand3.g:42:7: ( 'context' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:42:5: ( 'context' ) // src/org/eclipse/xpand3/parser/Xpand3.g:42:7: 'context' { match("context"); @@ -768,10 +768,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T58 // $ANTLR start T59 - public void mT59() throws RecognitionException { + public final void mT59() throws RecognitionException { try { int _type = T59; - // src/org/eclipse/xpand3/parser/Xpand3.g:43:7: ( 'if' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:43:5: ( 'if' ) // src/org/eclipse/xpand3/parser/Xpand3.g:43:7: 'if' { match("if"); @@ -787,10 +787,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T59 // $ANTLR start T60 - public void mT60() throws RecognitionException { + public final void mT60() throws RecognitionException { try { int _type = T60; - // src/org/eclipse/xpand3/parser/Xpand3.g:44:7: ( 'WARNING' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:44:5: ( 'WARNING' ) // src/org/eclipse/xpand3/parser/Xpand3.g:44:7: 'WARNING' { match("WARNING"); @@ -806,10 +806,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T60 // $ANTLR start T61 - public void mT61() throws RecognitionException { + public final void mT61() throws RecognitionException { try { int _type = T61; - // src/org/eclipse/xpand3/parser/Xpand3.g:45:7: ( ':' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:45:5: ( ':' ) // src/org/eclipse/xpand3/parser/Xpand3.g:45:7: ':' { match(':'); @@ -824,10 +824,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T61 // $ANTLR start T62 - public void mT62() throws RecognitionException { + public final void mT62() throws RecognitionException { try { int _type = T62; - // src/org/eclipse/xpand3/parser/Xpand3.g:46:7: ( 'around' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:46:5: ( 'around' ) // src/org/eclipse/xpand3/parser/Xpand3.g:46:7: 'around' { match("around"); @@ -843,10 +843,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T62 // $ANTLR start T63 - public void mT63() throws RecognitionException { + public final void mT63() throws RecognitionException { try { int _type = T63; - // src/org/eclipse/xpand3/parser/Xpand3.g:47:7: ( '::' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:47:5: ( '::' ) // src/org/eclipse/xpand3/parser/Xpand3.g:47:7: '::' { match("::"); @@ -862,10 +862,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T63 // $ANTLR start T64 - public void mT64() throws RecognitionException { + public final void mT64() throws RecognitionException { try { int _type = T64; - // src/org/eclipse/xpand3/parser/Xpand3.g:48:7: ( 'private' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:48:5: ( 'private' ) // src/org/eclipse/xpand3/parser/Xpand3.g:48:7: 'private' { match("private"); @@ -881,10 +881,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T64 // $ANTLR start T65 - public void mT65() throws RecognitionException { + public final void mT65() throws RecognitionException { try { int _type = T65; - // src/org/eclipse/xpand3/parser/Xpand3.g:49:7: ( 'cached' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:49:5: ( 'cached' ) // src/org/eclipse/xpand3/parser/Xpand3.g:49:7: 'cached' { match("cached"); @@ -900,10 +900,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T65 // $ANTLR start T66 - public void mT66() throws RecognitionException { + public final void mT66() throws RecognitionException { try { int _type = T66; - // src/org/eclipse/xpand3/parser/Xpand3.g:50:7: ( 'create' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:50:5: ( 'create' ) // src/org/eclipse/xpand3/parser/Xpand3.g:50:7: 'create' { match("create"); @@ -919,10 +919,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T66 // $ANTLR start T67 - public void mT67() throws RecognitionException { + public final void mT67() throws RecognitionException { try { int _type = T67; - // src/org/eclipse/xpand3/parser/Xpand3.g:51:7: ( 'JAVA' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:51:5: ( 'JAVA' ) // src/org/eclipse/xpand3/parser/Xpand3.g:51:7: 'JAVA' { match("JAVA"); @@ -938,10 +938,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T67 // $ANTLR start T68 - public void mT68() throws RecognitionException { + public final void mT68() throws RecognitionException { try { int _type = T68; - // src/org/eclipse/xpand3/parser/Xpand3.g:52:7: ( '.' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:52:5: ( '.' ) // src/org/eclipse/xpand3/parser/Xpand3.g:52:7: '.' { match('.'); @@ -956,10 +956,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T68 // $ANTLR start T69 - public void mT69() throws RecognitionException { + public final void mT69() throws RecognitionException { try { int _type = T69; - // src/org/eclipse/xpand3/parser/Xpand3.g:53:7: ( 'Collection' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:53:5: ( 'Collection' ) // src/org/eclipse/xpand3/parser/Xpand3.g:53:7: 'Collection' { match("Collection"); @@ -975,10 +975,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T69 // $ANTLR start T70 - public void mT70() throws RecognitionException { + public final void mT70() throws RecognitionException { try { int _type = T70; - // src/org/eclipse/xpand3/parser/Xpand3.g:54:7: ( 'List' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:54:5: ( 'List' ) // src/org/eclipse/xpand3/parser/Xpand3.g:54:7: 'List' { match("List"); @@ -994,10 +994,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T70 // $ANTLR start T71 - public void mT71() throws RecognitionException { + public final void mT71() throws RecognitionException { try { int _type = T71; - // src/org/eclipse/xpand3/parser/Xpand3.g:55:7: ( 'Set' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:55:5: ( 'Set' ) // src/org/eclipse/xpand3/parser/Xpand3.g:55:7: 'Set' { match("Set"); @@ -1013,10 +1013,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T71 // $ANTLR start T72 - public void mT72() throws RecognitionException { + public final void mT72() throws RecognitionException { try { int _type = T72; - // src/org/eclipse/xpand3/parser/Xpand3.g:56:7: ( 'let' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:56:5: ( 'let' ) // src/org/eclipse/xpand3/parser/Xpand3.g:56:7: 'let' { match("let"); @@ -1032,10 +1032,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T72 // $ANTLR start T73 - public void mT73() throws RecognitionException { + public final void mT73() throws RecognitionException { try { int _type = T73; - // src/org/eclipse/xpand3/parser/Xpand3.g:57:7: ( '=' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:57:5: ( '=' ) // src/org/eclipse/xpand3/parser/Xpand3.g:57:7: '=' { match('='); @@ -1050,10 +1050,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T73 // $ANTLR start T74 - public void mT74() throws RecognitionException { + public final void mT74() throws RecognitionException { try { int _type = T74; - // src/org/eclipse/xpand3/parser/Xpand3.g:58:7: ( '->' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:58:5: ( '->' ) // src/org/eclipse/xpand3/parser/Xpand3.g:58:7: '->' { match("->"); @@ -1069,10 +1069,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T74 // $ANTLR start T75 - public void mT75() throws RecognitionException { + public final void mT75() throws RecognitionException { try { int _type = T75; - // src/org/eclipse/xpand3/parser/Xpand3.g:59:7: ( '?' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:59:5: ( '?' ) // src/org/eclipse/xpand3/parser/Xpand3.g:59:7: '?' { match('?'); @@ -1087,10 +1087,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T75 // $ANTLR start T76 - public void mT76() throws RecognitionException { + public final void mT76() throws RecognitionException { try { int _type = T76; - // src/org/eclipse/xpand3/parser/Xpand3.g:60:7: ( 'then' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:60:5: ( 'then' ) // src/org/eclipse/xpand3/parser/Xpand3.g:60:7: 'then' { match("then"); @@ -1106,10 +1106,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T76 // $ANTLR start T77 - public void mT77() throws RecognitionException { + public final void mT77() throws RecognitionException { try { int _type = T77; - // src/org/eclipse/xpand3/parser/Xpand3.g:61:7: ( 'else' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:61:5: ( 'else' ) // src/org/eclipse/xpand3/parser/Xpand3.g:61:7: 'else' { match("else"); @@ -1125,10 +1125,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T77 // $ANTLR start T78 - public void mT78() throws RecognitionException { + public final void mT78() throws RecognitionException { try { int _type = T78; - // src/org/eclipse/xpand3/parser/Xpand3.g:62:7: ( 'switch' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:62:5: ( 'switch' ) // src/org/eclipse/xpand3/parser/Xpand3.g:62:7: 'switch' { match("switch"); @@ -1144,10 +1144,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T78 // $ANTLR start T79 - public void mT79() throws RecognitionException { + public final void mT79() throws RecognitionException { try { int _type = T79; - // src/org/eclipse/xpand3/parser/Xpand3.g:63:7: ( 'default' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:63:5: ( 'default' ) // src/org/eclipse/xpand3/parser/Xpand3.g:63:7: 'default' { match("default"); @@ -1163,10 +1163,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T79 // $ANTLR start T80 - public void mT80() throws RecognitionException { + public final void mT80() throws RecognitionException { try { int _type = T80; - // src/org/eclipse/xpand3/parser/Xpand3.g:64:7: ( '}' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:64:5: ( '}' ) // src/org/eclipse/xpand3/parser/Xpand3.g:64:7: '}' { match('}'); @@ -1181,10 +1181,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T80 // $ANTLR start T81 - public void mT81() throws RecognitionException { + public final void mT81() throws RecognitionException { try { int _type = T81; - // src/org/eclipse/xpand3/parser/Xpand3.g:65:7: ( 'case' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:65:5: ( 'case' ) // src/org/eclipse/xpand3/parser/Xpand3.g:65:7: 'case' { match("case"); @@ -1200,10 +1200,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T81 // $ANTLR start T82 - public void mT82() throws RecognitionException { + public final void mT82() throws RecognitionException { try { int _type = T82; - // src/org/eclipse/xpand3/parser/Xpand3.g:66:7: ( '||' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:66:5: ( '||' ) // src/org/eclipse/xpand3/parser/Xpand3.g:66:7: '||' { match("||"); @@ -1219,10 +1219,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T82 // $ANTLR start T83 - public void mT83() throws RecognitionException { + public final void mT83() throws RecognitionException { try { int _type = T83; - // src/org/eclipse/xpand3/parser/Xpand3.g:67:7: ( '&&' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:67:5: ( '&&' ) // src/org/eclipse/xpand3/parser/Xpand3.g:67:7: '&&' { match("&&"); @@ -1238,10 +1238,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T83 // $ANTLR start T84 - public void mT84() throws RecognitionException { + public final void mT84() throws RecognitionException { try { int _type = T84; - // src/org/eclipse/xpand3/parser/Xpand3.g:68:7: ( 'implies' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:68:5: ( 'implies' ) // src/org/eclipse/xpand3/parser/Xpand3.g:68:7: 'implies' { match("implies"); @@ -1257,10 +1257,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T84 // $ANTLR start T85 - public void mT85() throws RecognitionException { + public final void mT85() throws RecognitionException { try { int _type = T85; - // src/org/eclipse/xpand3/parser/Xpand3.g:69:7: ( '==' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:69:5: ( '==' ) // src/org/eclipse/xpand3/parser/Xpand3.g:69:7: '==' { match("=="); @@ -1276,10 +1276,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T85 // $ANTLR start T86 - public void mT86() throws RecognitionException { + public final void mT86() throws RecognitionException { try { int _type = T86; - // src/org/eclipse/xpand3/parser/Xpand3.g:70:7: ( '!=' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:70:5: ( '!=' ) // src/org/eclipse/xpand3/parser/Xpand3.g:70:7: '!=' { match("!="); @@ -1295,10 +1295,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T86 // $ANTLR start T87 - public void mT87() throws RecognitionException { + public final void mT87() throws RecognitionException { try { int _type = T87; - // src/org/eclipse/xpand3/parser/Xpand3.g:71:7: ( '>=' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:71:5: ( '>=' ) // src/org/eclipse/xpand3/parser/Xpand3.g:71:7: '>=' { match(">="); @@ -1314,10 +1314,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T87 // $ANTLR start T88 - public void mT88() throws RecognitionException { + public final void mT88() throws RecognitionException { try { int _type = T88; - // src/org/eclipse/xpand3/parser/Xpand3.g:72:7: ( '<=' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:72:5: ( '<=' ) // src/org/eclipse/xpand3/parser/Xpand3.g:72:7: '<=' { match("<="); @@ -1333,10 +1333,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T88 // $ANTLR start T89 - public void mT89() throws RecognitionException { + public final void mT89() throws RecognitionException { try { int _type = T89; - // src/org/eclipse/xpand3/parser/Xpand3.g:73:7: ( '>' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:73:5: ( '>' ) // src/org/eclipse/xpand3/parser/Xpand3.g:73:7: '>' { match('>'); @@ -1351,10 +1351,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T89 // $ANTLR start T90 - public void mT90() throws RecognitionException { + public final void mT90() throws RecognitionException { try { int _type = T90; - // src/org/eclipse/xpand3/parser/Xpand3.g:74:7: ( '<' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:74:5: ( '<' ) // src/org/eclipse/xpand3/parser/Xpand3.g:74:7: '<' { match('<'); @@ -1369,10 +1369,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T90 // $ANTLR start T91 - public void mT91() throws RecognitionException { + public final void mT91() throws RecognitionException { try { int _type = T91; - // src/org/eclipse/xpand3/parser/Xpand3.g:75:7: ( '+' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:75:5: ( '+' ) // src/org/eclipse/xpand3/parser/Xpand3.g:75:7: '+' { match('+'); @@ -1387,10 +1387,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T91 // $ANTLR start T92 - public void mT92() throws RecognitionException { + public final void mT92() throws RecognitionException { try { int _type = T92; - // src/org/eclipse/xpand3/parser/Xpand3.g:76:7: ( '/' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:76:5: ( '/' ) // src/org/eclipse/xpand3/parser/Xpand3.g:76:7: '/' { match('/'); @@ -1405,10 +1405,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T92 // $ANTLR start T93 - public void mT93() throws RecognitionException { + public final void mT93() throws RecognitionException { try { int _type = T93; - // src/org/eclipse/xpand3/parser/Xpand3.g:77:7: ( '!' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:77:5: ( '!' ) // src/org/eclipse/xpand3/parser/Xpand3.g:77:7: '!' { match('!'); @@ -1423,10 +1423,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T93 // $ANTLR start T94 - public void mT94() throws RecognitionException { + public final void mT94() throws RecognitionException { try { int _type = T94; - // src/org/eclipse/xpand3/parser/Xpand3.g:78:7: ( 'GLOBALVAR' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:78:5: ( 'GLOBALVAR' ) // src/org/eclipse/xpand3/parser/Xpand3.g:78:7: 'GLOBALVAR' { match("GLOBALVAR"); @@ -1442,10 +1442,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T94 // $ANTLR start T95 - public void mT95() throws RecognitionException { + public final void mT95() throws RecognitionException { try { int _type = T95; - // src/org/eclipse/xpand3/parser/Xpand3.g:79:7: ( '[' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:79:5: ( '[' ) // src/org/eclipse/xpand3/parser/Xpand3.g:79:7: '[' { match('['); @@ -1460,10 +1460,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T95 // $ANTLR start T96 - public void mT96() throws RecognitionException { + public final void mT96() throws RecognitionException { try { int _type = T96; - // src/org/eclipse/xpand3/parser/Xpand3.g:80:7: ( ']' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:80:5: ( ']' ) // src/org/eclipse/xpand3/parser/Xpand3.g:80:7: ']' { match(']'); @@ -1478,10 +1478,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T96 // $ANTLR start T97 - public void mT97() throws RecognitionException { + public final void mT97() throws RecognitionException { try { int _type = T97; - // src/org/eclipse/xpand3/parser/Xpand3.g:81:7: ( 'new' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:81:5: ( 'new' ) // src/org/eclipse/xpand3/parser/Xpand3.g:81:7: 'new' { match("new"); @@ -1497,10 +1497,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T97 // $ANTLR start T98 - public void mT98() throws RecognitionException { + public final void mT98() throws RecognitionException { try { int _type = T98; - // src/org/eclipse/xpand3/parser/Xpand3.g:82:7: ( 'false' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:82:5: ( 'false' ) // src/org/eclipse/xpand3/parser/Xpand3.g:82:7: 'false' { match("false"); @@ -1516,10 +1516,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T98 // $ANTLR start T99 - public void mT99() throws RecognitionException { + public final void mT99() throws RecognitionException { try { int _type = T99; - // src/org/eclipse/xpand3/parser/Xpand3.g:83:7: ( 'true' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:83:5: ( 'true' ) // src/org/eclipse/xpand3/parser/Xpand3.g:83:7: 'true' { match("true"); @@ -1535,10 +1535,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T99 // $ANTLR start T100 - public void mT100() throws RecognitionException { + public final void mT100() throws RecognitionException { try { int _type = T100; - // src/org/eclipse/xpand3/parser/Xpand3.g:84:8: ( 'null' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:84:6: ( 'null' ) // src/org/eclipse/xpand3/parser/Xpand3.g:84:8: 'null' { match("null"); @@ -1554,10 +1554,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T100 // $ANTLR start T101 - public void mT101() throws RecognitionException { + public final void mT101() throws RecognitionException { try { int _type = T101; - // src/org/eclipse/xpand3/parser/Xpand3.g:85:8: ( 'typeSelect' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:85:6: ( 'typeSelect' ) // src/org/eclipse/xpand3/parser/Xpand3.g:85:8: 'typeSelect' { match("typeSelect"); @@ -1573,10 +1573,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T101 // $ANTLR start T102 - public void mT102() throws RecognitionException { + public final void mT102() throws RecognitionException { try { int _type = T102; - // src/org/eclipse/xpand3/parser/Xpand3.g:86:8: ( 'collect' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:86:6: ( 'collect' ) // src/org/eclipse/xpand3/parser/Xpand3.g:86:8: 'collect' { match("collect"); @@ -1592,10 +1592,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T102 // $ANTLR start T103 - public void mT103() throws RecognitionException { + public final void mT103() throws RecognitionException { try { int _type = T103; - // src/org/eclipse/xpand3/parser/Xpand3.g:87:8: ( 'select' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:87:6: ( 'select' ) // src/org/eclipse/xpand3/parser/Xpand3.g:87:8: 'select' { match("select"); @@ -1611,10 +1611,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T103 // $ANTLR start T104 - public void mT104() throws RecognitionException { + public final void mT104() throws RecognitionException { try { int _type = T104; - // src/org/eclipse/xpand3/parser/Xpand3.g:88:8: ( 'selectFirst' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:88:6: ( 'selectFirst' ) // src/org/eclipse/xpand3/parser/Xpand3.g:88:8: 'selectFirst' { match("selectFirst"); @@ -1630,10 +1630,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T104 // $ANTLR start T105 - public void mT105() throws RecognitionException { + public final void mT105() throws RecognitionException { try { int _type = T105; - // src/org/eclipse/xpand3/parser/Xpand3.g:89:8: ( 'reject' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:89:6: ( 'reject' ) // src/org/eclipse/xpand3/parser/Xpand3.g:89:8: 'reject' { match("reject"); @@ -1649,10 +1649,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T105 // $ANTLR start T106 - public void mT106() throws RecognitionException { + public final void mT106() throws RecognitionException { try { int _type = T106; - // src/org/eclipse/xpand3/parser/Xpand3.g:90:8: ( 'exists' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:90:6: ( 'exists' ) // src/org/eclipse/xpand3/parser/Xpand3.g:90:8: 'exists' { match("exists"); @@ -1668,10 +1668,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T106 // $ANTLR start T107 - public void mT107() throws RecognitionException { + public final void mT107() throws RecognitionException { try { int _type = T107; - // src/org/eclipse/xpand3/parser/Xpand3.g:91:8: ( 'notExists' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:91:6: ( 'notExists' ) // src/org/eclipse/xpand3/parser/Xpand3.g:91:8: 'notExists' { match("notExists"); @@ -1687,10 +1687,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T107 // $ANTLR start T108 - public void mT108() throws RecognitionException { + public final void mT108() throws RecognitionException { try { int _type = T108; - // src/org/eclipse/xpand3/parser/Xpand3.g:92:8: ( 'sortBy' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:92:6: ( 'sortBy' ) // src/org/eclipse/xpand3/parser/Xpand3.g:92:8: 'sortBy' { match("sortBy"); @@ -1706,10 +1706,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T108 // $ANTLR start T109 - public void mT109() throws RecognitionException { + public final void mT109() throws RecognitionException { try { int _type = T109; - // src/org/eclipse/xpand3/parser/Xpand3.g:93:8: ( 'forAll' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:93:6: ( 'forAll' ) // src/org/eclipse/xpand3/parser/Xpand3.g:93:8: 'forAll' { match("forAll"); @@ -1725,10 +1725,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T109 // $ANTLR start T110 - public void mT110() throws RecognitionException { + public final void mT110() throws RecognitionException { try { int _type = T110; - // src/org/eclipse/xpand3/parser/Xpand3.g:94:8: ( '|' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:94:6: ( '|' ) // src/org/eclipse/xpand3/parser/Xpand3.g:94:8: '|' { match('|'); @@ -1743,13 +1743,13 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end T110 // $ANTLR start IntLiteral - public void mIntLiteral() throws RecognitionException { + public final void mIntLiteral() throws RecognitionException { try { int _type = IntLiteral; - // src/org/eclipse/xpand3/parser/Xpand3.g:351:14: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ) - // src/org/eclipse/xpand3/parser/Xpand3.g:351:14: ( '0' | '1' .. '9' ( '0' .. '9' )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:350:12: ( ( '0' | '1' .. '9' ( '0' .. '9' )* ) ) + // src/org/eclipse/xpand3/parser/Xpand3.g:350:14: ( '0' | '1' .. '9' ( '0' .. '9' )* ) { - // src/org/eclipse/xpand3/parser/Xpand3.g:351:14: ( '0' | '1' .. '9' ( '0' .. '9' )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:350:14: ( '0' | '1' .. '9' ( '0' .. '9' )* ) int alt2=2; int LA2_0 = input.LA(1); @@ -1761,23 +1761,23 @@ public class Xpand3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("351:14: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); + new NoViableAltException("350:14: ( '0' | '1' .. '9' ( '0' .. '9' )* )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:351:15: '0' + // src/org/eclipse/xpand3/parser/Xpand3.g:350:15: '0' { match('0'); } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:351:21: '1' .. '9' ( '0' .. '9' )* + // src/org/eclipse/xpand3/parser/Xpand3.g:350:21: '1' .. '9' ( '0' .. '9' )* { matchRange('1','9'); - // src/org/eclipse/xpand3/parser/Xpand3.g:351:30: ( '0' .. '9' )* + // src/org/eclipse/xpand3/parser/Xpand3.g:350:30: ( '0' .. '9' )* loop1: do { int alt1=2; @@ -1790,7 +1790,7 @@ public class Xpand3Lexer extends Lexer { switch (alt1) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:351:30: '0' .. '9' + // src/org/eclipse/xpand3/parser/Xpand3.g:350:30: '0' .. '9' { matchRange('0','9'); @@ -1819,10 +1819,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end IntLiteral // $ANTLR start StringLiteral - public void mStringLiteral() throws RecognitionException { + public final void mStringLiteral() throws RecognitionException { try { int _type = StringLiteral; - // src/org/eclipse/xpand3/parser/Xpand3.g:354:8: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:353:5: ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' ) int alt5=2; int LA5_0 = input.LA(1); @@ -1834,16 +1834,16 @@ public class Xpand3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("353:1: StringLiteral : ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); + new NoViableAltException("352:1: StringLiteral : ( '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' );", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:354:8: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' + // src/org/eclipse/xpand3/parser/Xpand3.g:353:8: '\"' ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // src/org/eclipse/xpand3/parser/Xpand3.g:354:12: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* + // src/org/eclipse/xpand3/parser/Xpand3.g:353:12: ( EscapeSequence | ~ ( '\\\\' | '\"' ) )* loop3: do { int alt3=3; @@ -1859,14 +1859,14 @@ public class Xpand3Lexer extends Lexer { switch (alt3) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:354:14: EscapeSequence + // src/org/eclipse/xpand3/parser/Xpand3.g:353:14: EscapeSequence { mEscapeSequence(); } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:354:31: ~ ( '\\\\' | '\"' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:353:31: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1892,10 +1892,10 @@ public class Xpand3Lexer extends Lexer { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:355:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' + // src/org/eclipse/xpand3/parser/Xpand3.g:354:8: '\\'' ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* '\\'' { match('\''); - // src/org/eclipse/xpand3/parser/Xpand3.g:355:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* + // src/org/eclipse/xpand3/parser/Xpand3.g:354:13: ( EscapeSequence | ~ ( '\\'' | '\\\\' ) )* loop4: do { int alt4=3; @@ -1911,14 +1911,14 @@ public class Xpand3Lexer extends Lexer { switch (alt4) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:355:15: EscapeSequence + // src/org/eclipse/xpand3/parser/Xpand3.g:354:15: EscapeSequence { mEscapeSequence(); } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:355:32: ~ ( '\\'' | '\\\\' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:354:32: ~ ( '\\'' | '\\\\' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1953,9 +1953,9 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end StringLiteral // $ANTLR start EscapeSequence - public void mEscapeSequence() throws RecognitionException { + public final void mEscapeSequence() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:360:9: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape ) + // src/org/eclipse/xpand3/parser/Xpand3.g:359:5: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape ) int alt6=3; int LA6_0 = input.LA(1); @@ -1992,7 +1992,7 @@ public class Xpand3Lexer extends Lexer { break; default: NoViableAltException nvae = - new NoViableAltException("358:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input); + new NoViableAltException("357:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 1, input); throw nvae; } @@ -2000,13 +2000,13 @@ public class Xpand3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("358:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input); + new NoViableAltException("357:1: fragment EscapeSequence : ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | UnicodeEscape | OctalEscape );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:360:9: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:359:9: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||input.LA(1)=='t' ) { @@ -2023,14 +2023,14 @@ public class Xpand3Lexer extends Lexer { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:361:9: UnicodeEscape + // src/org/eclipse/xpand3/parser/Xpand3.g:360:9: UnicodeEscape { mUnicodeEscape(); } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:362:9: OctalEscape + // src/org/eclipse/xpand3/parser/Xpand3.g:361:9: OctalEscape { mOctalEscape(); @@ -2045,9 +2045,9 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end EscapeSequence // $ANTLR start OctalEscape - public void mOctalEscape() throws RecognitionException { + public final void mOctalEscape() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:367:9: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ) + // src/org/eclipse/xpand3/parser/Xpand3.g:366:5: ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ) int alt7=3; int LA7_0 = input.LA(1); @@ -2080,38 +2080,38 @@ public class Xpand3Lexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("365:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input); + new NoViableAltException("364:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 1, input); throw nvae; } } else { NoViableAltException nvae = - new NoViableAltException("365:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input); + new NoViableAltException("364:1: fragment OctalEscape : ( '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) | '\\\\' ( '0' .. '7' ) );", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:367:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:366:9: '\\\\' ( '0' .. '3' ) ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // src/org/eclipse/xpand3/parser/Xpand3.g:367:14: ( '0' .. '3' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:367:15: '0' .. '3' + // src/org/eclipse/xpand3/parser/Xpand3.g:366:14: ( '0' .. '3' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:366:15: '0' .. '3' { matchRange('0','3'); } - // src/org/eclipse/xpand3/parser/Xpand3.g:367:25: ( '0' .. '7' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:367:26: '0' .. '7' + // src/org/eclipse/xpand3/parser/Xpand3.g:366:25: ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:366:26: '0' .. '7' { matchRange('0','7'); } - // src/org/eclipse/xpand3/parser/Xpand3.g:367:36: ( '0' .. '7' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:367:37: '0' .. '7' + // src/org/eclipse/xpand3/parser/Xpand3.g:366:36: ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:366:37: '0' .. '7' { matchRange('0','7'); @@ -2121,18 +2121,18 @@ public class Xpand3Lexer extends Lexer { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:368:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:367:9: '\\\\' ( '0' .. '7' ) ( '0' .. '7' ) { match('\\'); - // src/org/eclipse/xpand3/parser/Xpand3.g:368:14: ( '0' .. '7' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:368:15: '0' .. '7' + // src/org/eclipse/xpand3/parser/Xpand3.g:367:14: ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:367:15: '0' .. '7' { matchRange('0','7'); } - // src/org/eclipse/xpand3/parser/Xpand3.g:368:25: ( '0' .. '7' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:368:26: '0' .. '7' + // src/org/eclipse/xpand3/parser/Xpand3.g:367:25: ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:367:26: '0' .. '7' { matchRange('0','7'); @@ -2142,11 +2142,11 @@ public class Xpand3Lexer extends Lexer { } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:369:9: '\\\\' ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:368:9: '\\\\' ( '0' .. '7' ) { match('\\'); - // src/org/eclipse/xpand3/parser/Xpand3.g:369:14: ( '0' .. '7' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:369:15: '0' .. '7' + // src/org/eclipse/xpand3/parser/Xpand3.g:368:14: ( '0' .. '7' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:368:15: '0' .. '7' { matchRange('0','7'); @@ -2164,10 +2164,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end OctalEscape // $ANTLR start UnicodeEscape - public void mUnicodeEscape() throws RecognitionException { + public final void mUnicodeEscape() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:374:9: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit ) - // src/org/eclipse/xpand3/parser/Xpand3.g:374:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit + // src/org/eclipse/xpand3/parser/Xpand3.g:373:5: ( '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit ) + // src/org/eclipse/xpand3/parser/Xpand3.g:373:9: '\\\\' 'u' HexDigit HexDigit HexDigit HexDigit { match('\\'); match('u'); @@ -2185,10 +2185,10 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end UnicodeEscape // $ANTLR start HexDigit - public void mHexDigit() throws RecognitionException { + public final void mHexDigit() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:377:12: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ) - // src/org/eclipse/xpand3/parser/Xpand3.g:377:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:376:10: ( ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) ) + // src/org/eclipse/xpand3/parser/Xpand3.g:376:12: ( '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ) { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='F')||(input.LA(1)>='a' && input.LA(1)<='f') ) { input.consume(); @@ -2210,11 +2210,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end HexDigit // $ANTLR start DEFINE - public void mDEFINE() throws RecognitionException { + public final void mDEFINE() throws RecognitionException { try { int _type = DEFINE; - // src/org/eclipse/xpand3/parser/Xpand3.g:380:11: ( 'DEFINE' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:380:11: 'DEFINE' + // src/org/eclipse/xpand3/parser/Xpand3.g:379:9: ( 'DEFINE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:379:11: 'DEFINE' { xpandMode=true; match("DEFINE"); @@ -2230,11 +2230,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end DEFINE // $ANTLR start ENDDEFINE - public void mENDDEFINE() throws RecognitionException { + public final void mENDDEFINE() throws RecognitionException { try { int _type = ENDDEFINE; - // src/org/eclipse/xpand3/parser/Xpand3.g:382:4: ( 'ENDDEFINE' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:382:4: 'ENDDEFINE' + // src/org/eclipse/xpand3/parser/Xpand3.g:381:2: ( 'ENDDEFINE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:381:4: 'ENDDEFINE' { match("ENDDEFINE"); @@ -2250,11 +2250,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end ENDDEFINE // $ANTLR start AROUND - public void mAROUND() throws RecognitionException { + public final void mAROUND() throws RecognitionException { try { int _type = AROUND; - // src/org/eclipse/xpand3/parser/Xpand3.g:384:11: ( 'AROUND' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:384:11: 'AROUND' + // src/org/eclipse/xpand3/parser/Xpand3.g:383:9: ( 'AROUND' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:383:11: 'AROUND' { xpandMode=true; match("AROUND"); @@ -2270,11 +2270,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end AROUND // $ANTLR start ENDAROUND - public void mENDAROUND() throws RecognitionException { + public final void mENDAROUND() throws RecognitionException { try { int _type = ENDAROUND; - // src/org/eclipse/xpand3/parser/Xpand3.g:385:13: ( 'ENDAROUND' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:385:13: 'ENDAROUND' + // src/org/eclipse/xpand3/parser/Xpand3.g:384:11: ( 'ENDAROUND' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:384:13: 'ENDAROUND' { match("ENDAROUND"); @@ -2290,13 +2290,13 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end ENDAROUND // $ANTLR start Identifier - public void mIdentifier() throws RecognitionException { + public final void mIdentifier() throws RecognitionException { try { int _type = Identifier; - // src/org/eclipse/xpand3/parser/Xpand3.g:388:9: ( ( '^' )? Letter ( Letter | JavaIDDigit )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:388:9: ( '^' )? Letter ( Letter | JavaIDDigit )* + // src/org/eclipse/xpand3/parser/Xpand3.g:387:5: ( ( '^' )? Letter ( Letter | JavaIDDigit )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:387:9: ( '^' )? Letter ( Letter | JavaIDDigit )* { - // src/org/eclipse/xpand3/parser/Xpand3.g:388:9: ( '^' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:387:9: ( '^' )? int alt8=2; int LA8_0 = input.LA(1); @@ -2305,7 +2305,7 @@ public class Xpand3Lexer extends Lexer { } switch (alt8) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:388:10: '^' + // src/org/eclipse/xpand3/parser/Xpand3.g:387:10: '^' { match('^'); @@ -2315,7 +2315,7 @@ public class Xpand3Lexer extends Lexer { } mLetter(); - // src/org/eclipse/xpand3/parser/Xpand3.g:388:23: ( Letter | JavaIDDigit )* + // src/org/eclipse/xpand3/parser/Xpand3.g:387:23: ( Letter | JavaIDDigit )* loop9: do { int alt9=2; @@ -2360,9 +2360,9 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end Identifier // $ANTLR start Letter - public void mLetter() throws RecognitionException { + public final void mLetter() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:393:8: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:392:5: ( '\\u0024' | '\\u0041' .. '\\u005a' | '\\u005f' | '\\u0061' .. '\\u007a' | '\\u00c0' .. '\\u00d6' | '\\u00d8' .. '\\u00f6' | '\\u00f8' .. '\\u00ff' | '\\u0100' .. '\\u1fff' | '\\u3040' .. '\\u318f' | '\\u3300' .. '\\u337f' | '\\u3400' .. '\\u3d2d' | '\\u4e00' .. '\\u9fff' | '\\uf900' .. '\\ufaff' ) // src/org/eclipse/xpand3/parser/Xpand3.g: { if ( input.LA(1)=='$'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z')||(input.LA(1)>='\u00C0' && input.LA(1)<='\u00D6')||(input.LA(1)>='\u00D8' && input.LA(1)<='\u00F6')||(input.LA(1)>='\u00F8' && input.LA(1)<='\u1FFF')||(input.LA(1)>='\u3040' && input.LA(1)<='\u318F')||(input.LA(1)>='\u3300' && input.LA(1)<='\u337F')||(input.LA(1)>='\u3400' && input.LA(1)<='\u3D2D')||(input.LA(1)>='\u4E00' && input.LA(1)<='\u9FFF')||(input.LA(1)>='\uF900' && input.LA(1)<='\uFAFF') ) { @@ -2385,9 +2385,9 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end Letter // $ANTLR start JavaIDDigit - public void mJavaIDDigit() throws RecognitionException { + public final void mJavaIDDigit() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:410:8: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:409:5: ( '\\u0030' .. '\\u0039' | '\\u0660' .. '\\u0669' | '\\u06f0' .. '\\u06f9' | '\\u0966' .. '\\u096f' | '\\u09e6' .. '\\u09ef' | '\\u0a66' .. '\\u0a6f' | '\\u0ae6' .. '\\u0aef' | '\\u0b66' .. '\\u0b6f' | '\\u0be7' .. '\\u0bef' | '\\u0c66' .. '\\u0c6f' | '\\u0ce6' .. '\\u0cef' | '\\u0d66' .. '\\u0d6f' | '\\u0e50' .. '\\u0e59' | '\\u0ed0' .. '\\u0ed9' | '\\u1040' .. '\\u1049' ) // src/org/eclipse/xpand3/parser/Xpand3.g: { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='\u0660' && input.LA(1)<='\u0669')||(input.LA(1)>='\u06F0' && input.LA(1)<='\u06F9')||(input.LA(1)>='\u0966' && input.LA(1)<='\u096F')||(input.LA(1)>='\u09E6' && input.LA(1)<='\u09EF')||(input.LA(1)>='\u0A66' && input.LA(1)<='\u0A6F')||(input.LA(1)>='\u0AE6' && input.LA(1)<='\u0AEF')||(input.LA(1)>='\u0B66' && input.LA(1)<='\u0B6F')||(input.LA(1)>='\u0BE7' && input.LA(1)<='\u0BEF')||(input.LA(1)>='\u0C66' && input.LA(1)<='\u0C6F')||(input.LA(1)>='\u0CE6' && input.LA(1)<='\u0CEF')||(input.LA(1)>='\u0D66' && input.LA(1)<='\u0D6F')||(input.LA(1)>='\u0E50' && input.LA(1)<='\u0E59')||(input.LA(1)>='\u0ED0' && input.LA(1)<='\u0ED9')||(input.LA(1)>='\u1040' && input.LA(1)<='\u1049') ) { @@ -2410,11 +2410,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end JavaIDDigit // $ANTLR start WS - public void mWS() throws RecognitionException { + public final void mWS() throws RecognitionException { try { int _type = WS; - // src/org/eclipse/xpand3/parser/Xpand3.g:427:8: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) ) - // src/org/eclipse/xpand3/parser/Xpand3.g:427:8: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:426:5: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) ) + // src/org/eclipse/xpand3/parser/Xpand3.g:426:8: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) { if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||(input.LA(1)>='\f' && input.LA(1)<='\r')||input.LA(1)==' ' ) { input.consume(); @@ -2438,15 +2438,15 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end WS // $ANTLR start COMMENT - public void mCOMMENT() throws RecognitionException { + public final void mCOMMENT() throws RecognitionException { try { int _type = COMMENT; - // src/org/eclipse/xpand3/parser/Xpand3.g:431:9: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:431:9: '/*' ( options {greedy=false; } : . )* '*/' + // src/org/eclipse/xpand3/parser/Xpand3.g:430:5: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:430:9: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // src/org/eclipse/xpand3/parser/Xpand3.g:431:14: ( options {greedy=false; } : . )* + // src/org/eclipse/xpand3/parser/Xpand3.g:430:14: ( options {greedy=false; } : . )* loop10: do { int alt10=2; @@ -2471,7 +2471,7 @@ public class Xpand3Lexer extends Lexer { switch (alt10) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:431:42: . + // src/org/eclipse/xpand3/parser/Xpand3.g:430:42: . { matchAny(); @@ -2497,15 +2497,15 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end COMMENT // $ANTLR start LINE_COMMENT - public void mLINE_COMMENT() throws RecognitionException { + public final void mLINE_COMMENT() throws RecognitionException { try { int _type = LINE_COMMENT; - // src/org/eclipse/xpand3/parser/Xpand3.g:435:7: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) ) - // src/org/eclipse/xpand3/parser/Xpand3.g:435:7: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) + // src/org/eclipse/xpand3/parser/Xpand3.g:434:5: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) ) + // src/org/eclipse/xpand3/parser/Xpand3.g:434:7: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' | EOF ) { match("//"); - // src/org/eclipse/xpand3/parser/Xpand3.g:435:12: (~ ( '\\n' | '\\r' ) )* + // src/org/eclipse/xpand3/parser/Xpand3.g:434:12: (~ ( '\\n' | '\\r' ) )* loop11: do { int alt11=2; @@ -2518,7 +2518,7 @@ public class Xpand3Lexer extends Lexer { switch (alt11) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:435:12: ~ ( '\\n' | '\\r' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:434:12: ~ ( '\\n' | '\\r' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -2539,7 +2539,7 @@ public class Xpand3Lexer extends Lexer { } } while (true); - // src/org/eclipse/xpand3/parser/Xpand3.g:435:26: ( ( '\\r' )? '\\n' | EOF ) + // src/org/eclipse/xpand3/parser/Xpand3.g:434:26: ( ( '\\r' )? '\\n' | EOF ) int alt13=2; int LA13_0 = input.LA(1); @@ -2550,9 +2550,9 @@ public class Xpand3Lexer extends Lexer { alt13=2;} switch (alt13) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:435:27: ( '\\r' )? '\\n' + // src/org/eclipse/xpand3/parser/Xpand3.g:434:27: ( '\\r' )? '\\n' { - // src/org/eclipse/xpand3/parser/Xpand3.g:435:27: ( '\\r' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:434:27: ( '\\r' )? int alt12=2; int LA12_0 = input.LA(1); @@ -2561,7 +2561,7 @@ public class Xpand3Lexer extends Lexer { } switch (alt12) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:435:27: '\\r' + // src/org/eclipse/xpand3/parser/Xpand3.g:434:27: '\\r' { match('\r'); @@ -2575,7 +2575,7 @@ public class Xpand3Lexer extends Lexer { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:435:38: EOF + // src/org/eclipse/xpand3/parser/Xpand3.g:434:38: EOF { match(EOF); @@ -2596,11 +2596,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end LINE_COMMENT // $ANTLR start REM_COMMENT_OUT - public void mREM_COMMENT_OUT() throws RecognitionException { + public final void mREM_COMMENT_OUT() throws RecognitionException { try { int _type = REM_COMMENT_OUT; - // src/org/eclipse/xpand3/parser/Xpand3.g:440:4: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG ) - // src/org/eclipse/xpand3/parser/Xpand3.g:440:4: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG + // src/org/eclipse/xpand3/parser/Xpand3.g:439:2: ({...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG ) + // src/org/eclipse/xpand3/parser/Xpand3.g:439:4: {...}? => LG 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' RG { if ( !(!xpandMode) ) { throw new FailedPredicateException(input, "REM_COMMENT_OUT", "!xpandMode"); @@ -2609,7 +2609,7 @@ public class Xpand3Lexer extends Lexer { match("REM"); mRG(); - // src/org/eclipse/xpand3/parser/Xpand3.g:440:32: ( options {greedy=false; } : . )* + // src/org/eclipse/xpand3/parser/Xpand3.g:439:32: ( options {greedy=false; } : . )* loop14: do { int alt14=2; @@ -2688,7 +2688,7 @@ public class Xpand3Lexer extends Lexer { switch (alt14) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:440:60: . + // src/org/eclipse/xpand3/parser/Xpand3.g:439:60: . { matchAny(); @@ -2715,11 +2715,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end REM_COMMENT_OUT // $ANTLR start REM_COMMENT - public void mREM_COMMENT() throws RecognitionException { + public final void mREM_COMMENT() throws RecognitionException { try { int _type = REM_COMMENT; - // src/org/eclipse/xpand3/parser/Xpand3.g:444:2: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:444:2: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' + // src/org/eclipse/xpand3/parser/Xpand3.g:442:13: ({...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:443:2: {...}? => 'REM' RG ( options {greedy=false; } : . )* '\\u00ABENDREM' { if ( !(xpandMode) ) { throw new FailedPredicateException(input, "REM_COMMENT", "xpandMode"); @@ -2727,7 +2727,7 @@ public class Xpand3Lexer extends Lexer { match("REM"); mRG(); - // src/org/eclipse/xpand3/parser/Xpand3.g:444:26: ( options {greedy=false; } : . )* + // src/org/eclipse/xpand3/parser/Xpand3.g:443:26: ( options {greedy=false; } : . )* loop15: do { int alt15=2; @@ -2797,7 +2797,7 @@ public class Xpand3Lexer extends Lexer { switch (alt15) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:444:54: . + // src/org/eclipse/xpand3/parser/Xpand3.g:443:54: . { matchAny(); @@ -2823,17 +2823,17 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end REM_COMMENT // $ANTLR start TEXT - public void mTEXT() throws RecognitionException { + public final void mTEXT() throws RecognitionException { try { int _type = TEXT; - // src/org/eclipse/xpand3/parser/Xpand3.g:449:3: ({...}? => RG (~ ( LG ) )* ( LG )? ) - // src/org/eclipse/xpand3/parser/Xpand3.g:449:3: {...}? => RG (~ ( LG ) )* ( LG )? + // src/org/eclipse/xpand3/parser/Xpand3.g:447:6: ({...}? => RG (~ ( LG ) )* ( LG )? ) + // src/org/eclipse/xpand3/parser/Xpand3.g:448:3: {...}? => RG (~ ( LG ) )* ( LG )? { if ( !(xpandMode) ) { throw new FailedPredicateException(input, "TEXT", "xpandMode"); } mRG(); - // src/org/eclipse/xpand3/parser/Xpand3.g:449:21: (~ ( LG ) )* + // src/org/eclipse/xpand3/parser/Xpand3.g:448:21: (~ ( LG ) )* loop16: do { int alt16=2; @@ -2846,7 +2846,7 @@ public class Xpand3Lexer extends Lexer { switch (alt16) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:449:21: ~ ( LG ) + // src/org/eclipse/xpand3/parser/Xpand3.g:448:21: ~ ( LG ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\u00AA')||(input.LA(1)>='\u00AC' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -2867,7 +2867,7 @@ public class Xpand3Lexer extends Lexer { } } while (true); - // src/org/eclipse/xpand3/parser/Xpand3.g:449:28: ( LG )? + // src/org/eclipse/xpand3/parser/Xpand3.g:448:28: ( LG )? int alt17=2; int LA17_0 = input.LA(1); @@ -2876,7 +2876,7 @@ public class Xpand3Lexer extends Lexer { } switch (alt17) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:449:29: LG + // src/org/eclipse/xpand3/parser/Xpand3.g:448:29: LG { mLG(); @@ -2896,11 +2896,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end TEXT // $ANTLR start LG - public void mLG() throws RecognitionException { + public final void mLG() throws RecognitionException { try { int _type = LG; - // src/org/eclipse/xpand3/parser/Xpand3.g:453:4: ( '\\u00AB' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:453:4: '\\u00AB' + // src/org/eclipse/xpand3/parser/Xpand3.g:452:2: ( '\\u00AB' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:452:4: '\\u00AB' { match('\u00AB'); @@ -2914,11 +2914,11 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end LG // $ANTLR start RG - public void mRG() throws RecognitionException { + public final void mRG() throws RecognitionException { try { int _type = RG; - // src/org/eclipse/xpand3/parser/Xpand3.g:455:4: ( '\\u00BB' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:455:4: '\\u00BB' + // src/org/eclipse/xpand3/parser/Xpand3.g:454:2: ( '\\u00BB' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:454:4: '\\u00BB' { match('\u00BB'); @@ -2932,7 +2932,7 @@ public class Xpand3Lexer extends Lexer { // $ANTLR end RG public void mTokens() throws RecognitionException { - // src/org/eclipse/xpand3/parser/Xpand3.g:1:10: ( T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | T108 | T109 | T110 | IntLiteral | StringLiteral | DEFINE | ENDDEFINE | AROUND | ENDAROUND | Identifier | WS | COMMENT | LINE_COMMENT | REM_COMMENT_OUT | REM_COMMENT | TEXT | LG | RG ) + // src/org/eclipse/xpand3/parser/Xpand3.g:1:8: ( T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | T38 | T39 | T40 | T41 | T42 | T43 | T44 | T45 | T46 | T47 | T48 | T49 | T50 | T51 | T52 | T53 | T54 | T55 | T56 | T57 | T58 | T59 | T60 | T61 | T62 | T63 | T64 | T65 | T66 | T67 | T68 | T69 | T70 | T71 | T72 | T73 | T74 | T75 | T76 | T77 | T78 | T79 | T80 | T81 | T82 | T83 | T84 | T85 | T86 | T87 | T88 | T89 | T90 | T91 | T92 | T93 | T94 | T95 | T96 | T97 | T98 | T99 | T100 | T101 | T102 | T103 | T104 | T105 | T106 | T107 | T108 | T109 | T110 | IntLiteral | StringLiteral | DEFINE | ENDDEFINE | AROUND | ENDAROUND | Identifier | WS | COMMENT | LINE_COMMENT | REM_COMMENT_OUT | REM_COMMENT | TEXT | LG | RG ) int alt18=101; int LA18_0 = input.LA(1); diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3NodeParser.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3NodeParser.java index 097b1bdb..68e90974 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3NodeParser.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3NodeParser.java @@ -40,633 +40,633 @@ public class Xpand3NodeParser extends AbstractXpand3NodeParser { protected Set<String> normalizableRules() { return normalizableRules; } - - // Following code is generated (or at least should be) - @Override - public r_abstractDeclaration_return r_abstractDeclaration() throws RecognitionException { - try { - ruleStart("r_abstractDeclaration"); - return super.r_abstractDeclaration(); - } finally { - ruleEnd(); - } - } - - @Override - public r_additiveExpression_return r_additiveExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_additiveExpression"); - return super.r_additiveExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_andExpression_return r_andExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_andExpression"); - return super.r_andExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_around_return r_around() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_around"); - return super.r_around(); - } finally { - ruleEnd(); - } - } - - @Override - public r_booleanLiteral_return r_booleanLiteral() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_booleanLiteral"); - return super.r_booleanLiteral(); - } finally { - ruleEnd(); - } - } - - @Override - public r_casePart_return r_casePart() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_casePart"); - return super.r_casePart(); - } finally { - ruleEnd(); - } - } - - @Override - public r_castedExpression_return r_castedExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_castedExpression"); - return super.r_castedExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_chainExpression_return r_chainExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_chainExpression"); - return super.r_chainExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_check_return r_check() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_check"); - return super.r_check(); - } finally { - ruleEnd(); - } - } - - @Override - public r_collectionExpression_return r_collectionExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_collectionExpression"); - return super.r_collectionExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_collectionType_return r_collectionType() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_collectionType"); - return super.r_collectionType(); - } finally { - ruleEnd(); - } - } - - @Override - public r_constructorCall_return r_constructorCall() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_constructorCall"); - return super.r_constructorCall(); - } finally { - ruleEnd(); - } - } - - @Override - public r_declaredParameter_return r_declaredParameter() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_declaredParameter"); - return super.r_declaredParameter(); - } finally { - ruleEnd(); - } - } - - @Override - public r_declaredParameterList_return r_declaredParameterList() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_declaredParameterList"); - return super.r_declaredParameterList(); - } finally { - ruleEnd(); - } - } - - @Override - public r_expression_return r_expression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_expression"); - return super.r_expression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_extension_return r_extension() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_extension"); - return super.r_extension(); - } finally { - ruleEnd(); - } - } - - @Override - public r_featureCall_return r_featureCall() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_featureCall"); - return super.r_featureCall(); - } finally { - ruleEnd(); - } - } - - @Override - public r_file_return r_file() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_file"); - return super.r_file(); - } finally { - ruleEnd(); - } - } - - @Override - public r_globalVarExpression_return r_globalVarExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_globalVarExpression"); - return super.r_globalVarExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_identifier_return r_identifier() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_identifier"); - return super.r_identifier(); - } finally { - ruleEnd(); - } - } - - @Override - public r_ifExpression_return r_ifExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_ifExpression"); - return super.r_ifExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_impliesExpression_return r_impliesExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_impliesExpression"); - return super.r_impliesExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_infixExpression_return r_infixExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_infixExpression"); - return super.r_infixExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_javaType_return r_javaType() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_javaType"); - return super.r_javaType(); - } finally { - ruleEnd(); - } - } - - @Override - public r_letExpression_return r_letExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_letExpression"); - return super.r_letExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_listLiteral_return r_listLiteral() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_listLiteral"); - return super.r_listLiteral(); - } finally { - ruleEnd(); - } - } - - @Override - public r_multiplicativeExpression_return r_multiplicativeExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_multiplicativeExpression"); - return super.r_multiplicativeExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_nsImport_return r_nsImport() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_nsImport"); - return super.r_nsImport(); - } finally { - ruleEnd(); - } - } - - @Override - public r_nullLiteral_return r_nullLiteral() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_nullLiteral"); - return super.r_nullLiteral(); - } finally { - ruleEnd(); - } - } - - @Override - public r_numberLiteral_return r_numberLiteral() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_numberLiteral"); - return super.r_numberLiteral(); - } finally { - ruleEnd(); - } - } - - @Override - public r_orExpression_return r_orExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_orExpression"); - return super.r_orExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_parameterList_return r_parameterList() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_parameterList"); - return super.r_parameterList(); - } finally { - ruleEnd(); - } - } - - @Override - public r_paranthesizedExpression_return r_paranthesizedExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_paranthesizedExpression"); - return super.r_paranthesizedExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_pointcut_return r_pointcut() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_pointcut"); - return super.r_pointcut(); - } finally { - ruleEnd(); - } - } - - @Override - public r_primaryExpression_return r_primaryExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_primaryExpression"); - return super.r_primaryExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_relationalExpression_return r_relationalExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_relationalExpression"); - return super.r_relationalExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_simpleType_return r_simpleType() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_simpleType"); - return super.r_simpleType(); - } finally { - ruleEnd(); - } - } - - @Override - public r_switchExpression_return r_switchExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_switchExpression"); - return super.r_switchExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_type_return r_type() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_type"); - return super.r_type(); - } finally { - ruleEnd(); - } - } - - @Override - public r_unaryExpression_return r_unaryExpression() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_unaryExpression"); - return super.r_unaryExpression(); - } finally { - ruleEnd(); - } - } - - @Override - public r_definition_return r_definition() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_definition"); - return super.r_definition(); - } finally { - ruleEnd(); - } - } - - @Override - public r_definitionAround_return r_definitionAround() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_definitionAround"); - return super.r_definitionAround(); - } finally { - ruleEnd(); - } - } - - @Override - public r_elseIfStatement_return r_elseIfStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_elseIfStatement"); - return super.r_elseIfStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_elseStatement_return r_elseStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_elseStatement"); - return super.r_elseStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_errorStatement_return r_errorStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_errorStatement"); - return super.r_errorStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_expandStatement_return r_expandStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_expandStatement"); - return super.r_expandStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_expressionStmt_return r_expressionStmt() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_expressionStmt"); - return super.r_expressionStmt(); - } finally { - ruleEnd(); - } - } - - @Override - public r_fileStatement_return r_fileStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_fileStatement"); - return super.r_fileStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_foreachStatement_return r_foreachStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_foreachStatement"); - return super.r_foreachStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_ifStatement_return r_ifStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_ifStatement"); - return super.r_ifStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_letStatement_return r_letStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_letStatement"); - return super.r_letStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_protectStatement_return r_protectStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_protectStatement"); - return super.r_protectStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_sequence_return r_sequence() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_sequence"); - return super.r_sequence(); - } finally { - ruleEnd(); - } - } - - @Override - public r_simpleStatement_return r_simpleStatement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_simpleStatement"); - return super.r_simpleStatement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_statement_return r_statement() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_statement"); - return super.r_statement(); - } finally { - ruleEnd(); - } - } - - @Override - public r_text_return r_text() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_text"); - return super.r_text(); - } finally { - ruleEnd(); - } - } - - @Override - public r_textSequence_return r_textSequence() throws RecognitionException { - // Auto-generated method - try { - ruleStart("r_textSequence"); - return super.r_textSequence(); - } finally { - ruleEnd(); - } - } +// +// // Following code is generated (or at least should be) +// @Override +// public r_abstractDeclaration_return r_abstractDeclaration() throws RecognitionException { +// try { +// ruleStart("r_abstractDeclaration"); +// return super.r_abstractDeclaration(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_additiveExpression_return r_additiveExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_additiveExpression"); +// return super.r_additiveExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_andExpression_return r_andExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_andExpression"); +// return super.r_andExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_around_return r_around() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_around"); +// return super.r_around(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_booleanLiteral_return r_booleanLiteral() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_booleanLiteral"); +// return super.r_booleanLiteral(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_casePart_return r_casePart() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_casePart"); +// return super.r_casePart(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_castedExpression_return r_castedExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_castedExpression"); +// return super.r_castedExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_chainExpression_return r_chainExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_chainExpression"); +// return super.r_chainExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_check_return r_check() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_check"); +// return super.r_check(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_collectionExpression_return r_collectionExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_collectionExpression"); +// return super.r_collectionExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_collectionType_return r_collectionType() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_collectionType"); +// return super.r_collectionType(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_constructorCall_return r_constructorCall() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_constructorCall"); +// return super.r_constructorCall(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_declaredParameter_return r_declaredParameter() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_declaredParameter"); +// return super.r_declaredParameter(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_declaredParameterList_return r_declaredParameterList() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_declaredParameterList"); +// return super.r_declaredParameterList(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_expression_return r_expression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_expression"); +// return super.r_expression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_extension_return r_extension() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_extension"); +// return super.r_extension(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_featureCall_return r_featureCall() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_featureCall"); +// return super.r_featureCall(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_file_return r_file() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_file"); +// return super.r_file(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_globalVarExpression_return r_globalVarExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_globalVarExpression"); +// return super.r_globalVarExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_identifier_return r_identifier() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_identifier"); +// return super.r_identifier(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_ifExpression_return r_ifExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_ifExpression"); +// return super.r_ifExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_impliesExpression_return r_impliesExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_impliesExpression"); +// return super.r_impliesExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_infixExpression_return r_infixExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_infixExpression"); +// return super.r_infixExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_javaType_return r_javaType() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_javaType"); +// return super.r_javaType(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_letExpression_return r_letExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_letExpression"); +// return super.r_letExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_listLiteral_return r_listLiteral() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_listLiteral"); +// return super.r_listLiteral(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_multiplicativeExpression_return r_multiplicativeExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_multiplicativeExpression"); +// return super.r_multiplicativeExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_nsImport_return r_nsImport() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_nsImport"); +// return super.r_nsImport(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_nullLiteral_return r_nullLiteral() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_nullLiteral"); +// return super.r_nullLiteral(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_numberLiteral_return r_numberLiteral() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_numberLiteral"); +// return super.r_numberLiteral(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_orExpression_return r_orExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_orExpression"); +// return super.r_orExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_parameterList_return r_parameterList() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_parameterList"); +// return super.r_parameterList(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_paranthesizedExpression_return r_paranthesizedExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_paranthesizedExpression"); +// return super.r_paranthesizedExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_pointcut_return r_pointcut() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_pointcut"); +// return super.r_pointcut(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_primaryExpression_return r_primaryExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_primaryExpression"); +// return super.r_primaryExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_relationalExpression_return r_relationalExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_relationalExpression"); +// return super.r_relationalExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_simpleType_return r_simpleType() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_simpleType"); +// return super.r_simpleType(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_switchExpression_return r_switchExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_switchExpression"); +// return super.r_switchExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_type_return r_type() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_type"); +// return super.r_type(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_unaryExpression_return r_unaryExpression() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_unaryExpression"); +// return super.r_unaryExpression(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_definition_return r_definition() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_definition"); +// return super.r_definition(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_definitionAround_return r_definitionAround() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_definitionAround"); +// return super.r_definitionAround(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_elseIfStatement_return r_elseIfStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_elseIfStatement"); +// return super.r_elseIfStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_elseStatement_return r_elseStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_elseStatement"); +// return super.r_elseStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_errorStatement_return r_errorStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_errorStatement"); +// return super.r_errorStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_expandStatement_return r_expandStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_expandStatement"); +// return super.r_expandStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_expressionStmt_return r_expressionStmt() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_expressionStmt"); +// return super.r_expressionStmt(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_fileStatement_return r_fileStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_fileStatement"); +// return super.r_fileStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_foreachStatement_return r_foreachStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_foreachStatement"); +// return super.r_foreachStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_ifStatement_return r_ifStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_ifStatement"); +// return super.r_ifStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_letStatement_return r_letStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_letStatement"); +// return super.r_letStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_protectStatement_return r_protectStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_protectStatement"); +// return super.r_protectStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_sequence_return r_sequence() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_sequence"); +// return super.r_sequence(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_simpleStatement_return r_simpleStatement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_simpleStatement"); +// return super.r_simpleStatement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_statement_return r_statement() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_statement"); +// return super.r_statement(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_text_return r_text() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_text"); +// return super.r_text(); +// } finally { +// ruleEnd(); +// } +// } +// +// @Override +// public r_textSequence_return r_textSequence() throws RecognitionException { +// // Auto-generated method +// try { +// ruleStart("r_textSequence"); +// return super.r_textSequence(); +// } finally { +// ruleEnd(); +// } +// } } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Parser.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Parser.java index f32f4202..f13d7c04 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Parser.java +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3Parser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0 src/org/eclipse/xpand3/parser/Xpand3.g 2008-02-28 09:34:54 +// $ANTLR 3.0.1 src/org/eclipse/xpand3/parser/Xpand3.g 2008-02-28 11:47:29 package org.eclipse.xpand3.parser; @@ -9,10 +9,8 @@ import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; - -import org.antlr.runtime.tree.*; - -public class Xpand3Parser extends Parser { +/** START EDITED 'abstract' added */ +public abstract class Xpand3Parser extends Parser { public static final String[] tokenNames = new String[] { "<invalid>", "<EOR>", "<DOWN>", "<UP>", "LG", "RG", "DEFINE", "ENDDEFINE", "AROUND", "ENDAROUND", "TEXT", "StringLiteral", "IntLiteral", "Identifier", "EscapeSequence", "UnicodeEscape", "OctalEscape", "HexDigit", "Letter", "JavaIDDigit", "WS", "COMMENT", "LINE_COMMENT", "REM_COMMENT_OUT", "REM_COMMENT", "'IMPORT'", "'EXTENSION'", "'import'", "';'", "'extension'", "'reexport'", "'('", "','", "'*'", "')'", "'FOR'", "'-'", "'ERROR'", "'EXPAND'", "'FOREACH'", "'SEPARATOR'", "'FILE'", "'ENDFILE'", "'AS'", "'ITERATOR'", "'ENDFOREACH'", "'IF'", "'ENDIF'", "'ELSEIF'", "'ELSE'", "'LET'", "'ENDLET'", "'PROTECT'", "'CSTART'", "'CEND'", "'ID'", "'DISABLE'", "'ENDPROTECT'", "'context'", "'if'", "'WARNING'", "':'", "'around'", "'::'", "'private'", "'cached'", "'create'", "'JAVA'", "'.'", "'Collection'", "'List'", "'Set'", "'let'", "'='", "'->'", "'?'", "'then'", "'else'", "'switch'", "'default'", "'}'", "'case'", "'||'", "'&&'", "'implies'", "'=='", "'!='", "'>='", "'<='", "'>'", "'<'", "'+'", "'/'", "'!'", "'GLOBALVAR'", "'['", "']'", "'new'", "'false'", "'true'", "'null'", "'typeSelect'", "'collect'", "'select'", "'selectFirst'", "'reject'", "'exists'", "'notExists'", "'sortBy'", "'forAll'", "'|'" }; @@ -44,47 +42,29 @@ public class Xpand3Parser extends Parser { ruleMemo = new HashMap[58+1]; } - protected TreeAdaptor adaptor = new CommonTreeAdaptor(); - - public void setTreeAdaptor(TreeAdaptor adaptor) { - this.adaptor = adaptor; - } - public TreeAdaptor getTreeAdaptor() { - return adaptor; - } + + /* START EDITED */ + protected abstract void ruleEntered(String ruleName); + protected abstract void ruleLeft(String ruleName); + protected abstract void tokenConsumed(String name, CommonToken ct); + /* END EDITED */ public String[] getTokenNames() { return tokenNames; } public String getGrammarFileName() { return "src/org/eclipse/xpand3/parser/Xpand3.g"; } - public static class r_file_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_file - // src/org/eclipse/xpand3/parser/Xpand3.g:19:1: r_file : ( r_nsImport )* ( r_abstractDeclaration )* EOF ; - public r_file_return r_file() throws RecognitionException { - r_file_return retval = new r_file_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token EOF3=null; - r_nsImport_return r_nsImport1 = null; - - r_abstractDeclaration_return r_abstractDeclaration2 = null; - - - Object EOF3_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:18:1: r_file : ( r_nsImport )* ( r_abstractDeclaration )* EOF ; + public final void r_file() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:20:2: ( ( r_nsImport )* ( r_abstractDeclaration )* EOF ) - // src/org/eclipse/xpand3/parser/Xpand3.g:20:2: ( r_nsImport )* ( r_abstractDeclaration )* EOF + /** START EDITED */ + ruleEntered("r_file"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:18:9: ( ( r_nsImport )* ( r_abstractDeclaration )* EOF ) + // src/org/eclipse/xpand3/parser/Xpand3.g:19:2: ( r_nsImport )* ( r_abstractDeclaration )* EOF { - root_0 = (Object)adaptor.nil(); - - // src/org/eclipse/xpand3/parser/Xpand3.g:20:2: ( r_nsImport )* + // src/org/eclipse/xpand3/parser/Xpand3.g:19:2: ( r_nsImport )* loop1: do { int alt1=2; @@ -106,13 +86,12 @@ public class Xpand3Parser extends Parser { switch (alt1) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:20:3: r_nsImport + // src/org/eclipse/xpand3/parser/Xpand3.g:19:3: r_nsImport { pushFollow(FOLLOW_r_nsImport_in_r_file50); - r_nsImport1=r_nsImport(); + r_nsImport(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_nsImport1.getTree()); + if (failed) return ; } break; @@ -122,7 +101,7 @@ public class Xpand3Parser extends Parser { } } while (true); - // src/org/eclipse/xpand3/parser/Xpand3.g:21:2: ( r_abstractDeclaration )* + // src/org/eclipse/xpand3/parser/Xpand3.g:20:2: ( r_abstractDeclaration )* loop2: do { int alt2=2; @@ -135,13 +114,12 @@ public class Xpand3Parser extends Parser { switch (alt2) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:21:3: r_abstractDeclaration + // src/org/eclipse/xpand3/parser/Xpand3.g:20:3: r_abstractDeclaration { pushFollow(FOLLOW_r_abstractDeclaration_in_r_file56); - r_abstractDeclaration2=r_abstractDeclaration(); + r_abstractDeclaration(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_abstractDeclaration2.getTree()); + if (failed) return ; } break; @@ -151,79 +129,36 @@ public class Xpand3Parser extends Parser { } } while (true); - EOF3=(Token)input.LT(1); - match(input,EOF,FOLLOW_EOF_in_r_file63); if (failed) return retval; - if ( backtracking==0 ) { - EOF3_tree = (Object)adaptor.create(EOF3); - adaptor.addChild(root_0, EOF3_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,EOF,FOLLOW_EOF_in_r_file63); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_file"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_file - public static class r_nsImport_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_nsImport - // src/org/eclipse/xpand3/parser/Xpand3.g:25:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' ); - public r_nsImport_return r_nsImport() throws RecognitionException { - r_nsImport_return retval = new r_nsImport_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token LG4=null; - Token string_literal5=null; - Token RG7=null; - Token LG8=null; - Token string_literal9=null; - Token RG11=null; - Token string_literal12=null; - Token char_literal14=null; - Token string_literal15=null; - Token string_literal17=null; - Token char_literal18=null; - r_type_return r_type6 = null; - - r_type_return r_type10 = null; - - r_type_return r_type13 = null; - - r_type_return r_type16 = null; - - - Object LG4_tree=null; - Object string_literal5_tree=null; - Object RG7_tree=null; - Object LG8_tree=null; - Object string_literal9_tree=null; - Object RG11_tree=null; - Object string_literal12_tree=null; - Object char_literal14_tree=null; - Object string_literal15_tree=null; - Object string_literal17_tree=null; - Object char_literal18_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:24:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' ); + public final void r_nsImport() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:26:2: ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' ) + /** START EDITED */ + ruleEntered("r_nsImport"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:24:12: ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' ) int alt4=4; switch ( input.LA(1) ) { case LG: @@ -237,9 +172,9 @@ public class Xpand3Parser extends Parser { alt4=1; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("25:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' );", 4, 1, input); + new NoViableAltException("24:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' );", 4, 1, input); throw nvae; } @@ -256,118 +191,88 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("25:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' );", 4, 0, input); + new NoViableAltException("24:1: r_nsImport : ( LG 'IMPORT' r_type RG | LG 'EXTENSION' r_type RG | 'import' r_type ';' | 'extension' r_type ( 'reexport' )? ';' );", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:26:2: LG 'IMPORT' r_type RG + // src/org/eclipse/xpand3/parser/Xpand3.g:25:2: LG 'IMPORT' r_type RG { - root_0 = (Object)adaptor.nil(); - - LG4=(Token)input.LT(1); - match(input,LG,FOLLOW_LG_in_r_nsImport73); if (failed) return retval; - if ( backtracking==0 ) { - LG4_tree = (Object)adaptor.create(LG4); - adaptor.addChild(root_0, LG4_tree); - } - string_literal5=(Token)input.LT(1); - match(input,25,FOLLOW_25_in_r_nsImport75); if (failed) return retval; - if ( backtracking==0 ) { - string_literal5_tree = (Object)adaptor.create(string_literal5); - adaptor.addChild(root_0, string_literal5_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,LG,FOLLOW_LG_in_r_nsImport73); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,25,FOLLOW_25_in_r_nsImport75); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_nsImport77); - r_type6=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type6.getTree()); - RG7=(Token)input.LT(1); - match(input,RG,FOLLOW_RG_in_r_nsImport79); if (failed) return retval; - if ( backtracking==0 ) { - RG7_tree = (Object)adaptor.create(RG7); - adaptor.addChild(root_0, RG7_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,RG,FOLLOW_RG_in_r_nsImport79); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:27:2: LG 'EXTENSION' r_type RG + // src/org/eclipse/xpand3/parser/Xpand3.g:26:2: LG 'EXTENSION' r_type RG { - root_0 = (Object)adaptor.nil(); - - LG8=(Token)input.LT(1); - match(input,LG,FOLLOW_LG_in_r_nsImport84); if (failed) return retval; - if ( backtracking==0 ) { - LG8_tree = (Object)adaptor.create(LG8); - adaptor.addChild(root_0, LG8_tree); - } - string_literal9=(Token)input.LT(1); - match(input,26,FOLLOW_26_in_r_nsImport86); if (failed) return retval; - if ( backtracking==0 ) { - string_literal9_tree = (Object)adaptor.create(string_literal9); - adaptor.addChild(root_0, string_literal9_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,LG,FOLLOW_LG_in_r_nsImport84); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,26,FOLLOW_26_in_r_nsImport86); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_nsImport88); - r_type10=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type10.getTree()); - RG11=(Token)input.LT(1); - match(input,RG,FOLLOW_RG_in_r_nsImport90); if (failed) return retval; - if ( backtracking==0 ) { - RG11_tree = (Object)adaptor.create(RG11); - adaptor.addChild(root_0, RG11_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,RG,FOLLOW_RG_in_r_nsImport90); if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:28:2: 'import' r_type ';' + // src/org/eclipse/xpand3/parser/Xpand3.g:27:2: 'import' r_type ';' { - root_0 = (Object)adaptor.nil(); - - string_literal12=(Token)input.LT(1); - match(input,27,FOLLOW_27_in_r_nsImport95); if (failed) return retval; - if ( backtracking==0 ) { - string_literal12_tree = (Object)adaptor.create(string_literal12); - adaptor.addChild(root_0, string_literal12_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,27,FOLLOW_27_in_r_nsImport95); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_nsImport97); - r_type13=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type13.getTree()); - char_literal14=(Token)input.LT(1); - match(input,28,FOLLOW_28_in_r_nsImport100); if (failed) return retval; - if ( backtracking==0 ) { - char_literal14_tree = (Object)adaptor.create(char_literal14); - adaptor.addChild(root_0, char_literal14_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,28,FOLLOW_28_in_r_nsImport100); if (failed) return ; } break; case 4 : - // src/org/eclipse/xpand3/parser/Xpand3.g:29:2: 'extension' r_type ( 'reexport' )? ';' + // src/org/eclipse/xpand3/parser/Xpand3.g:28:2: 'extension' r_type ( 'reexport' )? ';' { - root_0 = (Object)adaptor.nil(); - - string_literal15=(Token)input.LT(1); - match(input,29,FOLLOW_29_in_r_nsImport106); if (failed) return retval; - if ( backtracking==0 ) { - string_literal15_tree = (Object)adaptor.create(string_literal15); - adaptor.addChild(root_0, string_literal15_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,29,FOLLOW_29_in_r_nsImport106); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_nsImport108); - r_type16=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type16.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:29:21: ( 'reexport' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:28:21: ( 'reexport' )? int alt3=2; int LA3_0 = input.LA(1); @@ -376,75 +281,50 @@ public class Xpand3Parser extends Parser { } switch (alt3) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:29:22: 'reexport' + // src/org/eclipse/xpand3/parser/Xpand3.g:28:22: 'reexport' { - string_literal17=(Token)input.LT(1); - match(input,30,FOLLOW_30_in_r_nsImport111); if (failed) return retval; - if ( backtracking==0 ) { - string_literal17_tree = (Object)adaptor.create(string_literal17); - adaptor.addChild(root_0, string_literal17_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,30,FOLLOW_30_in_r_nsImport111); if (failed) return ; } break; } - char_literal18=(Token)input.LT(1); - match(input,28,FOLLOW_28_in_r_nsImport115); if (failed) return retval; - if ( backtracking==0 ) { - char_literal18_tree = (Object)adaptor.create(char_literal18); - adaptor.addChild(root_0, char_literal18_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,28,FOLLOW_28_in_r_nsImport115); if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_nsImport"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_nsImport - public static class r_abstractDeclaration_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_abstractDeclaration - // src/org/eclipse/xpand3/parser/Xpand3.g:32:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround ); - public r_abstractDeclaration_return r_abstractDeclaration() throws RecognitionException { - r_abstractDeclaration_return retval = new r_abstractDeclaration_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_check_return r_check19 = null; - - r_around_return r_around20 = null; - - r_extension_return r_extension21 = null; - - r_definition_return r_definition22 = null; - - r_definitionAround_return r_definitionAround23 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:31:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround ); + public final void r_abstractDeclaration() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:33:2: ( r_check | r_around | r_extension | r_definition | r_definitionAround ) + /** START EDITED */ + ruleEntered("r_abstractDeclaration"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:31:23: ( r_check | r_around | r_extension | r_definition | r_definitionAround ) int alt5=5; switch ( input.LA(1) ) { case 58: @@ -479,174 +359,113 @@ public class Xpand3Parser extends Parser { alt5=4; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("32:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround );", 5, 4, input); + new NoViableAltException("31:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround );", 5, 4, input); throw nvae; } } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("32:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround );", 5, 0, input); + new NoViableAltException("31:1: r_abstractDeclaration : ( r_check | r_around | r_extension | r_definition | r_definitionAround );", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:33:2: r_check + // src/org/eclipse/xpand3/parser/Xpand3.g:32:2: r_check { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_check_in_r_abstractDeclaration126); - r_check19=r_check(); + r_check(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_check19.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:34:2: r_around + // src/org/eclipse/xpand3/parser/Xpand3.g:33:2: r_around { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_around_in_r_abstractDeclaration131); - r_around20=r_around(); + r_around(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_around20.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:35:2: r_extension + // src/org/eclipse/xpand3/parser/Xpand3.g:34:2: r_extension { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_extension_in_r_abstractDeclaration136); - r_extension21=r_extension(); + r_extension(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_extension21.getTree()); + if (failed) return ; } break; case 4 : - // src/org/eclipse/xpand3/parser/Xpand3.g:36:2: r_definition + // src/org/eclipse/xpand3/parser/Xpand3.g:35:2: r_definition { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_definition_in_r_abstractDeclaration141); - r_definition22=r_definition(); + r_definition(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_definition22.getTree()); + if (failed) return ; } break; case 5 : - // src/org/eclipse/xpand3/parser/Xpand3.g:37:2: r_definitionAround + // src/org/eclipse/xpand3/parser/Xpand3.g:36:2: r_definitionAround { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_definitionAround_in_r_abstractDeclaration146); - r_definitionAround23=r_definitionAround(); + r_definitionAround(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_definitionAround23.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_abstractDeclaration"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_abstractDeclaration - public static class r_definition_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_definition - // src/org/eclipse/xpand3/parser/Xpand3.g:42:1: r_definition : LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG ; - public r_definition_return r_definition() throws RecognitionException { - r_definition_return retval = new r_definition_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token LG24=null; - Token DEFINE25=null; - Token char_literal27=null; - Token char_literal29=null; - Token char_literal30=null; - Token char_literal31=null; - Token char_literal32=null; - Token string_literal33=null; - Token ENDDEFINE36=null; - Token RG37=null; - r_identifier_return r_identifier26 = null; - - r_declaredParameterList_return r_declaredParameterList28 = null; - - r_type_return r_type34 = null; - - r_sequence_return r_sequence35 = null; - - - Object LG24_tree=null; - Object DEFINE25_tree=null; - Object char_literal27_tree=null; - Object char_literal29_tree=null; - Object char_literal30_tree=null; - Object char_literal31_tree=null; - Object char_literal32_tree=null; - Object string_literal33_tree=null; - Object ENDDEFINE36_tree=null; - Object RG37_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:41:1: r_definition : LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG ; + public final void r_definition() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:43:2: ( LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG ) - // src/org/eclipse/xpand3/parser/Xpand3.g:43:2: LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG + /** START EDITED */ + ruleEntered("r_definition"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:41:14: ( LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG ) + // src/org/eclipse/xpand3/parser/Xpand3.g:42:2: LG DEFINE r_identifier ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDDEFINE RG { - root_0 = (Object)adaptor.nil(); - - LG24=(Token)input.LT(1); - match(input,LG,FOLLOW_LG_in_r_definition158); if (failed) return retval; - if ( backtracking==0 ) { - LG24_tree = (Object)adaptor.create(LG24); - adaptor.addChild(root_0, LG24_tree); - } - DEFINE25=(Token)input.LT(1); - match(input,DEFINE,FOLLOW_DEFINE_in_r_definition160); if (failed) return retval; - if ( backtracking==0 ) { - DEFINE25_tree = (Object)adaptor.create(DEFINE25); - adaptor.addChild(root_0, DEFINE25_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,LG,FOLLOW_LG_in_r_definition158); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,DEFINE,FOLLOW_DEFINE_in_r_definition160); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_definition162); - r_identifier26=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier26.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:43:25: ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:42:25: ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? int alt9=2; int LA9_0 = input.LA(1); @@ -655,15 +474,13 @@ public class Xpand3Parser extends Parser { } switch (alt9) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:43:26: '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:42:26: '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' { - char_literal27=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_definition165); if (failed) return retval; - if ( backtracking==0 ) { - char_literal27_tree = (Object)adaptor.create(char_literal27); - adaptor.addChild(root_0, char_literal27_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:43:30: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_definition165); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:42:30: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? int alt8=3; int LA8_0 = input.LA(1); @@ -675,14 +492,13 @@ public class Xpand3Parser extends Parser { } switch (alt8) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:43:31: r_declaredParameterList ( ( ',' )? '*' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:42:31: r_declaredParameterList ( ( ',' )? '*' )? { pushFollow(FOLLOW_r_declaredParameterList_in_r_definition168); - r_declaredParameterList28=r_declaredParameterList(); + r_declaredParameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameterList28.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:43:55: ( ( ',' )? '*' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:42:55: ( ( ',' )? '*' )? int alt7=2; int LA7_0 = input.LA(1); @@ -691,9 +507,9 @@ public class Xpand3Parser extends Parser { } switch (alt7) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:43:56: ( ',' )? '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:42:56: ( ',' )? '*' { - // src/org/eclipse/xpand3/parser/Xpand3.g:43:56: ( ',' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:42:56: ( ',' )? int alt6=2; int LA6_0 = input.LA(1); @@ -702,26 +518,22 @@ public class Xpand3Parser extends Parser { } switch (alt6) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:43:56: ',' + // src/org/eclipse/xpand3/parser/Xpand3.g:42:56: ',' { - char_literal29=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_definition171); if (failed) return retval; - if ( backtracking==0 ) { - char_literal29_tree = (Object)adaptor.create(char_literal29); - adaptor.addChild(root_0, char_literal29_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_definition171); if (failed) return ; } break; } - char_literal30=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_definition174); if (failed) return retval; - if ( backtracking==0 ) { - char_literal30_tree = (Object)adaptor.create(char_literal30); - adaptor.addChild(root_0, char_literal30_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_definition174); if (failed) return ; } break; @@ -732,147 +544,89 @@ public class Xpand3Parser extends Parser { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:43:69: '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:42:69: '*' { - char_literal31=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_definition180); if (failed) return retval; - if ( backtracking==0 ) { - char_literal31_tree = (Object)adaptor.create(char_literal31); - adaptor.addChild(root_0, char_literal31_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_definition180); if (failed) return ; } break; } - char_literal32=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_definition184); if (failed) return retval; - if ( backtracking==0 ) { - char_literal32_tree = (Object)adaptor.create(char_literal32); - adaptor.addChild(root_0, char_literal32_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_definition184); if (failed) return ; } break; } - string_literal33=(Token)input.LT(1); - match(input,35,FOLLOW_35_in_r_definition188); if (failed) return retval; - if ( backtracking==0 ) { - string_literal33_tree = (Object)adaptor.create(string_literal33); - adaptor.addChild(root_0, string_literal33_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,35,FOLLOW_35_in_r_definition188); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_definition190); - r_type34=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type34.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_definition193); - r_sequence35=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence35.getTree()); - ENDDEFINE36=(Token)input.LT(1); - match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_r_definition196); if (failed) return retval; - if ( backtracking==0 ) { - ENDDEFINE36_tree = (Object)adaptor.create(ENDDEFINE36); - adaptor.addChild(root_0, ENDDEFINE36_tree); - } - RG37=(Token)input.LT(1); - match(input,RG,FOLLOW_RG_in_r_definition198); if (failed) return retval; - if ( backtracking==0 ) { - RG37_tree = (Object)adaptor.create(RG37); - adaptor.addChild(root_0, RG37_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,ENDDEFINE,FOLLOW_ENDDEFINE_in_r_definition196); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,RG,FOLLOW_RG_in_r_definition198); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_definition"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_definition - public static class r_definitionAround_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_definitionAround - // src/org/eclipse/xpand3/parser/Xpand3.g:48:1: r_definitionAround : LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG ; - public r_definitionAround_return r_definitionAround() throws RecognitionException { - r_definitionAround_return retval = new r_definitionAround_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token LG38=null; - Token AROUND39=null; - Token char_literal41=null; - Token char_literal43=null; - Token char_literal44=null; - Token char_literal45=null; - Token char_literal46=null; - Token string_literal47=null; - Token ENDAROUND50=null; - Token RG51=null; - r_pointcut_return r_pointcut40 = null; - - r_declaredParameterList_return r_declaredParameterList42 = null; - - r_type_return r_type48 = null; - - r_sequence_return r_sequence49 = null; - - - Object LG38_tree=null; - Object AROUND39_tree=null; - Object char_literal41_tree=null; - Object char_literal43_tree=null; - Object char_literal44_tree=null; - Object char_literal45_tree=null; - Object char_literal46_tree=null; - Object string_literal47_tree=null; - Object ENDAROUND50_tree=null; - Object RG51_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:47:1: r_definitionAround : LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG ; + public final void r_definitionAround() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:49:2: ( LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG ) - // src/org/eclipse/xpand3/parser/Xpand3.g:49:2: LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG + /** START EDITED */ + ruleEntered("r_definitionAround"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:47:20: ( LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG ) + // src/org/eclipse/xpand3/parser/Xpand3.g:48:2: LG AROUND r_pointcut ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? 'FOR' r_type r_sequence ENDAROUND RG { - root_0 = (Object)adaptor.nil(); - - LG38=(Token)input.LT(1); - match(input,LG,FOLLOW_LG_in_r_definitionAround210); if (failed) return retval; - if ( backtracking==0 ) { - LG38_tree = (Object)adaptor.create(LG38); - adaptor.addChild(root_0, LG38_tree); - } - AROUND39=(Token)input.LT(1); - match(input,AROUND,FOLLOW_AROUND_in_r_definitionAround212); if (failed) return retval; - if ( backtracking==0 ) { - AROUND39_tree = (Object)adaptor.create(AROUND39); - adaptor.addChild(root_0, AROUND39_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,LG,FOLLOW_LG_in_r_definitionAround210); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,AROUND,FOLLOW_AROUND_in_r_definitionAround212); if (failed) return ; pushFollow(FOLLOW_r_pointcut_in_r_definitionAround214); - r_pointcut40=r_pointcut(); + r_pointcut(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_pointcut40.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:49:23: ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:48:23: ( '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' )? int alt13=2; int LA13_0 = input.LA(1); @@ -881,15 +635,13 @@ public class Xpand3Parser extends Parser { } switch (alt13) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:49:24: '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:48:24: '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' { - char_literal41=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_definitionAround217); if (failed) return retval; - if ( backtracking==0 ) { - char_literal41_tree = (Object)adaptor.create(char_literal41); - adaptor.addChild(root_0, char_literal41_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:49:28: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_definitionAround217); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:48:28: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? int alt12=3; int LA12_0 = input.LA(1); @@ -901,14 +653,13 @@ public class Xpand3Parser extends Parser { } switch (alt12) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:49:29: r_declaredParameterList ( ( ',' )? '*' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:48:29: r_declaredParameterList ( ( ',' )? '*' )? { pushFollow(FOLLOW_r_declaredParameterList_in_r_definitionAround220); - r_declaredParameterList42=r_declaredParameterList(); + r_declaredParameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameterList42.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:49:53: ( ( ',' )? '*' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:48:53: ( ( ',' )? '*' )? int alt11=2; int LA11_0 = input.LA(1); @@ -917,9 +668,9 @@ public class Xpand3Parser extends Parser { } switch (alt11) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:49:54: ( ',' )? '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:48:54: ( ',' )? '*' { - // src/org/eclipse/xpand3/parser/Xpand3.g:49:54: ( ',' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:48:54: ( ',' )? int alt10=2; int LA10_0 = input.LA(1); @@ -928,26 +679,22 @@ public class Xpand3Parser extends Parser { } switch (alt10) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:49:54: ',' + // src/org/eclipse/xpand3/parser/Xpand3.g:48:54: ',' { - char_literal43=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_definitionAround223); if (failed) return retval; - if ( backtracking==0 ) { - char_literal43_tree = (Object)adaptor.create(char_literal43); - adaptor.addChild(root_0, char_literal43_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_definitionAround223); if (failed) return ; } break; } - char_literal44=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_definitionAround226); if (failed) return retval; - if ( backtracking==0 ) { - char_literal44_tree = (Object)adaptor.create(char_literal44); - adaptor.addChild(root_0, char_literal44_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_definitionAround226); if (failed) return ; } break; @@ -958,113 +705,81 @@ public class Xpand3Parser extends Parser { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:49:67: '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:48:67: '*' { - char_literal45=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_definitionAround232); if (failed) return retval; - if ( backtracking==0 ) { - char_literal45_tree = (Object)adaptor.create(char_literal45); - adaptor.addChild(root_0, char_literal45_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_definitionAround232); if (failed) return ; } break; } - char_literal46=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_definitionAround236); if (failed) return retval; - if ( backtracking==0 ) { - char_literal46_tree = (Object)adaptor.create(char_literal46); - adaptor.addChild(root_0, char_literal46_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_definitionAround236); if (failed) return ; } break; } - string_literal47=(Token)input.LT(1); - match(input,35,FOLLOW_35_in_r_definitionAround240); if (failed) return retval; - if ( backtracking==0 ) { - string_literal47_tree = (Object)adaptor.create(string_literal47); - adaptor.addChild(root_0, string_literal47_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,35,FOLLOW_35_in_r_definitionAround240); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_definitionAround242); - r_type48=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type48.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_definitionAround245); - r_sequence49=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence49.getTree()); - ENDAROUND50=(Token)input.LT(1); - match(input,ENDAROUND,FOLLOW_ENDAROUND_in_r_definitionAround248); if (failed) return retval; - if ( backtracking==0 ) { - ENDAROUND50_tree = (Object)adaptor.create(ENDAROUND50); - adaptor.addChild(root_0, ENDAROUND50_tree); - } - RG51=(Token)input.LT(1); - match(input,RG,FOLLOW_RG_in_r_definitionAround250); if (failed) return retval; - if ( backtracking==0 ) { - RG51_tree = (Object)adaptor.create(RG51); - adaptor.addChild(root_0, RG51_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,ENDAROUND,FOLLOW_ENDAROUND_in_r_definitionAround248); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,RG,FOLLOW_RG_in_r_definitionAround250); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_definitionAround"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_definitionAround - public static class r_sequence_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_sequence - // src/org/eclipse/xpand3/parser/Xpand3.g:54:1: r_sequence : r_textSequence ( r_statement r_textSequence )* ; - public r_sequence_return r_sequence() throws RecognitionException { - r_sequence_return retval = new r_sequence_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_textSequence_return r_textSequence52 = null; - - r_statement_return r_statement53 = null; - - r_textSequence_return r_textSequence54 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:53:1: r_sequence : r_textSequence ( r_statement r_textSequence )* ; + public final void r_sequence() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:55:3: ( r_textSequence ( r_statement r_textSequence )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:55:3: r_textSequence ( r_statement r_textSequence )* + /** START EDITED */ + ruleEntered("r_sequence"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:53:12: ( r_textSequence ( r_statement r_textSequence )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:54:3: r_textSequence ( r_statement r_textSequence )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_textSequence_in_r_sequence262); - r_textSequence52=r_textSequence(); + r_textSequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_textSequence52.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:56:3: ( r_statement r_textSequence )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:55:3: ( r_statement r_textSequence )* loop14: do { int alt14=2; @@ -1077,18 +792,16 @@ public class Xpand3Parser extends Parser { switch (alt14) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:56:4: r_statement r_textSequence + // src/org/eclipse/xpand3/parser/Xpand3.g:55:4: r_statement r_textSequence { pushFollow(FOLLOW_r_statement_in_r_sequence268); - r_statement53=r_statement(); + r_statement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_statement53.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_textSequence_in_r_sequence274); - r_textSequence54=r_textSequence(); + r_textSequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_textSequence54.getTree()); + if (failed) return ; } break; @@ -1101,52 +814,29 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_sequence"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_sequence - public static class r_statement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_statement - // src/org/eclipse/xpand3/parser/Xpand3.g:60:1: r_statement : ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement ); - public r_statement_return r_statement() throws RecognitionException { - r_statement_return retval = new r_statement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_simpleStatement_return r_simpleStatement55 = null; - - r_fileStatement_return r_fileStatement56 = null; - - r_foreachStatement_return r_foreachStatement57 = null; - - r_ifStatement_return r_ifStatement58 = null; - - r_letStatement_return r_letStatement59 = null; - - r_protectStatement_return r_protectStatement60 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:59:1: r_statement : ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement ); + public final void r_statement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:61:3: ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement ) + /** START EDITED */ + ruleEntered("r_statement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:59:13: ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement ) int alt15=6; switch ( input.LA(1) ) { case StringLiteral: @@ -1208,142 +898,106 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("60:1: r_statement : ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement );", 15, 0, input); + new NoViableAltException("59:1: r_statement : ( r_simpleStatement | r_fileStatement | r_foreachStatement | r_ifStatement | r_letStatement | r_protectStatement );", 15, 0, input); throw nvae; } switch (alt15) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:61:3: r_simpleStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:60:3: r_simpleStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_simpleStatement_in_r_statement289); - r_simpleStatement55=r_simpleStatement(); + r_simpleStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_simpleStatement55.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:62:3: r_fileStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:61:3: r_fileStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_fileStatement_in_r_statement294); - r_fileStatement56=r_fileStatement(); + r_fileStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_fileStatement56.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:63:3: r_foreachStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:62:3: r_foreachStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_foreachStatement_in_r_statement299); - r_foreachStatement57=r_foreachStatement(); + r_foreachStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_foreachStatement57.getTree()); + if (failed) return ; } break; case 4 : - // src/org/eclipse/xpand3/parser/Xpand3.g:64:3: r_ifStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:63:3: r_ifStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_ifStatement_in_r_statement304); - r_ifStatement58=r_ifStatement(); + r_ifStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_ifStatement58.getTree()); + if (failed) return ; } break; case 5 : - // src/org/eclipse/xpand3/parser/Xpand3.g:65:3: r_letStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:64:3: r_letStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_letStatement_in_r_statement309); - r_letStatement59=r_letStatement(); + r_letStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_letStatement59.getTree()); + if (failed) return ; } break; case 6 : - // src/org/eclipse/xpand3/parser/Xpand3.g:66:3: r_protectStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:65:3: r_protectStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_protectStatement_in_r_statement314); - r_protectStatement60=r_protectStatement(); + r_protectStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_protectStatement60.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_statement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_statement - public static class r_textSequence_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_textSequence - // src/org/eclipse/xpand3/parser/Xpand3.g:69:1: r_textSequence : r_text ( r_text )* ; - public r_textSequence_return r_textSequence() throws RecognitionException { - r_textSequence_return retval = new r_textSequence_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_text_return r_text61 = null; - - r_text_return r_text62 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:68:1: r_textSequence : r_text ( r_text )* ; + public final void r_textSequence() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:70:2: ( r_text ( r_text )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:70:2: r_text ( r_text )* + /** START EDITED */ + ruleEntered("r_textSequence"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:68:16: ( r_text ( r_text )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:69:2: r_text ( r_text )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_text_in_r_textSequence325); - r_text61=r_text(); + r_text(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_text61.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:70:9: ( r_text )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:69:9: ( r_text )* loop16: do { int alt16=2; @@ -1365,13 +1019,12 @@ public class Xpand3Parser extends Parser { switch (alt16) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:70:10: r_text + // src/org/eclipse/xpand3/parser/Xpand3.g:69:10: r_text { pushFollow(FOLLOW_r_text_in_r_textSequence328); - r_text62=r_text(); + r_text(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_text62.getTree()); + if (failed) return ; } break; @@ -1384,49 +1037,32 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_textSequence"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_textSequence - public static class r_text_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_text - // src/org/eclipse/xpand3/parser/Xpand3.g:73:1: r_text : ( '-' )? TEXT ; - public r_text_return r_text() throws RecognitionException { - r_text_return retval = new r_text_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal63=null; - Token TEXT64=null; - - Object char_literal63_tree=null; - Object TEXT64_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:72:1: r_text : ( '-' )? TEXT ; + public final void r_text() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:74:2: ( ( '-' )? TEXT ) - // src/org/eclipse/xpand3/parser/Xpand3.g:74:2: ( '-' )? TEXT + /** START EDITED */ + ruleEntered("r_text"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:72:8: ( ( '-' )? TEXT ) + // src/org/eclipse/xpand3/parser/Xpand3.g:73:2: ( '-' )? TEXT { - root_0 = (Object)adaptor.nil(); - - // src/org/eclipse/xpand3/parser/Xpand3.g:74:2: ( '-' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:73:2: ( '-' )? int alt17=2; int LA17_0 = input.LA(1); @@ -1435,69 +1071,48 @@ public class Xpand3Parser extends Parser { } switch (alt17) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:74:2: '-' + // src/org/eclipse/xpand3/parser/Xpand3.g:73:2: '-' { - char_literal63=(Token)input.LT(1); - match(input,36,FOLLOW_36_in_r_text340); if (failed) return retval; - if ( backtracking==0 ) { - char_literal63_tree = (Object)adaptor.create(char_literal63); - adaptor.addChild(root_0, char_literal63_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,36,FOLLOW_36_in_r_text340); if (failed) return ; } break; } - TEXT64=(Token)input.LT(1); - match(input,TEXT,FOLLOW_TEXT_in_r_text343); if (failed) return retval; - if ( backtracking==0 ) { - TEXT64_tree = (Object)adaptor.create(TEXT64); - adaptor.addChild(root_0, TEXT64_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,TEXT,FOLLOW_TEXT_in_r_text343); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_text"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_text - public static class r_simpleStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_simpleStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:77:1: r_simpleStatement : ( r_errorStatement | r_expandStatement | r_expressionStmt ); - public r_simpleStatement_return r_simpleStatement() throws RecognitionException { - r_simpleStatement_return retval = new r_simpleStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_errorStatement_return r_errorStatement65 = null; - - r_expandStatement_return r_expandStatement66 = null; - - r_expressionStmt_return r_expressionStmt67 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:76:1: r_simpleStatement : ( r_errorStatement | r_expandStatement | r_expressionStmt ); + public final void r_simpleStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:78:3: ( r_errorStatement | r_expandStatement | r_expressionStmt ) + /** START EDITED */ + ruleEntered("r_simpleStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:76:19: ( r_errorStatement | r_expandStatement | r_expressionStmt ) int alt18=3; switch ( input.LA(1) ) { case 37: @@ -1542,183 +1157,116 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("77:1: r_simpleStatement : ( r_errorStatement | r_expandStatement | r_expressionStmt );", 18, 0, input); + new NoViableAltException("76:1: r_simpleStatement : ( r_errorStatement | r_expandStatement | r_expressionStmt );", 18, 0, input); throw nvae; } switch (alt18) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:78:3: r_errorStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:77:3: r_errorStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_errorStatement_in_r_simpleStatement354); - r_errorStatement65=r_errorStatement(); + r_errorStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_errorStatement65.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:79:3: r_expandStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:78:3: r_expandStatement { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_expandStatement_in_r_simpleStatement358); - r_expandStatement66=r_expandStatement(); + r_expandStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expandStatement66.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:80:3: r_expressionStmt + // src/org/eclipse/xpand3/parser/Xpand3.g:79:3: r_expressionStmt { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_expressionStmt_in_r_simpleStatement362); - r_expressionStmt67=r_expressionStmt(); + r_expressionStmt(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expressionStmt67.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_simpleStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_simpleStatement - public static class r_errorStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_errorStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:83:1: r_errorStatement : 'ERROR' r_expression ; - public r_errorStatement_return r_errorStatement() throws RecognitionException { - r_errorStatement_return retval = new r_errorStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal68=null; - r_expression_return r_expression69 = null; - - - Object string_literal68_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:82:1: r_errorStatement : 'ERROR' r_expression ; + public final void r_errorStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:84:3: ( 'ERROR' r_expression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:84:3: 'ERROR' r_expression + /** START EDITED */ + ruleEntered("r_errorStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:82:18: ( 'ERROR' r_expression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:83:3: 'ERROR' r_expression { - root_0 = (Object)adaptor.nil(); - - string_literal68=(Token)input.LT(1); - match(input,37,FOLLOW_37_in_r_errorStatement373); if (failed) return retval; - if ( backtracking==0 ) { - string_literal68_tree = (Object)adaptor.create(string_literal68); - adaptor.addChild(root_0, string_literal68_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,37,FOLLOW_37_in_r_errorStatement373); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_errorStatement375); - r_expression69=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression69.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_errorStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_errorStatement - public static class r_expandStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_expandStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:87:1: r_expandStatement : 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? ; - public r_expandStatement_return r_expandStatement() throws RecognitionException { - r_expandStatement_return retval = new r_expandStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal70=null; - Token char_literal72=null; - Token char_literal74=null; - Token string_literal75=null; - Token string_literal77=null; - Token string_literal79=null; - r_simpleType_return r_simpleType71 = null; - - r_parameterList_return r_parameterList73 = null; - - r_expression_return r_expression76 = null; - - r_expression_return r_expression78 = null; - - r_expression_return r_expression80 = null; - - - Object string_literal70_tree=null; - Object char_literal72_tree=null; - Object char_literal74_tree=null; - Object string_literal75_tree=null; - Object string_literal77_tree=null; - Object string_literal79_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:86:1: r_expandStatement : 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? ; + public final void r_expandStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:88:3: ( 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? ) - // src/org/eclipse/xpand3/parser/Xpand3.g:88:3: 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? + /** START EDITED */ + ruleEntered("r_expandStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:86:19: ( 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? ) + // src/org/eclipse/xpand3/parser/Xpand3.g:87:3: 'EXPAND' r_simpleType ( '(' r_parameterList ')' )? ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? { - root_0 = (Object)adaptor.nil(); - - string_literal70=(Token)input.LT(1); - match(input,38,FOLLOW_38_in_r_expandStatement386); if (failed) return retval; - if ( backtracking==0 ) { - string_literal70_tree = (Object)adaptor.create(string_literal70); - adaptor.addChild(root_0, string_literal70_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,38,FOLLOW_38_in_r_expandStatement386); if (failed) return ; pushFollow(FOLLOW_r_simpleType_in_r_expandStatement388); - r_simpleType71=r_simpleType(); + r_simpleType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_simpleType71.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:88:25: ( '(' r_parameterList ')' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:87:25: ( '(' r_parameterList ')' )? int alt19=2; int LA19_0 = input.LA(1); @@ -1727,32 +1275,27 @@ public class Xpand3Parser extends Parser { } switch (alt19) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:88:26: '(' r_parameterList ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:87:26: '(' r_parameterList ')' { - char_literal72=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_expandStatement391); if (failed) return retval; - if ( backtracking==0 ) { - char_literal72_tree = (Object)adaptor.create(char_literal72); - adaptor.addChild(root_0, char_literal72_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_expandStatement391); if (failed) return ; pushFollow(FOLLOW_r_parameterList_in_r_expandStatement393); - r_parameterList73=r_parameterList(); + r_parameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_parameterList73.getTree()); - char_literal74=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_expandStatement395); if (failed) return retval; - if ( backtracking==0 ) { - char_literal74_tree = (Object)adaptor.create(char_literal74); - adaptor.addChild(root_0, char_literal74_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_expandStatement395); if (failed) return ; } break; } - // src/org/eclipse/xpand3/parser/Xpand3.g:88:52: ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? + // src/org/eclipse/xpand3/parser/Xpand3.g:87:52: ( ( 'FOR' r_expression ) | ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) )? int alt21=3; int LA21_0 = input.LA(1); @@ -1764,22 +1307,19 @@ public class Xpand3Parser extends Parser { } switch (alt21) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:88:53: ( 'FOR' r_expression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:87:53: ( 'FOR' r_expression ) { - // src/org/eclipse/xpand3/parser/Xpand3.g:88:53: ( 'FOR' r_expression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:88:54: 'FOR' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:87:53: ( 'FOR' r_expression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:87:54: 'FOR' r_expression { - string_literal75=(Token)input.LT(1); - match(input,35,FOLLOW_35_in_r_expandStatement401); if (failed) return retval; - if ( backtracking==0 ) { - string_literal75_tree = (Object)adaptor.create(string_literal75); - adaptor.addChild(root_0, string_literal75_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,35,FOLLOW_35_in_r_expandStatement401); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_expandStatement403); - r_expression76=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression76.getTree()); + if (failed) return ; } @@ -1787,23 +1327,20 @@ public class Xpand3Parser extends Parser { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:89:5: ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) + // src/org/eclipse/xpand3/parser/Xpand3.g:88:5: ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) { - // src/org/eclipse/xpand3/parser/Xpand3.g:89:5: ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) - // src/org/eclipse/xpand3/parser/Xpand3.g:89:6: 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? + // src/org/eclipse/xpand3/parser/Xpand3.g:88:5: ( 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? ) + // src/org/eclipse/xpand3/parser/Xpand3.g:88:6: 'FOREACH' r_expression ( 'SEPARATOR' r_expression )? { - string_literal77=(Token)input.LT(1); - match(input,39,FOLLOW_39_in_r_expandStatement411); if (failed) return retval; - if ( backtracking==0 ) { - string_literal77_tree = (Object)adaptor.create(string_literal77); - adaptor.addChild(root_0, string_literal77_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,39,FOLLOW_39_in_r_expandStatement411); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_expandStatement412); - r_expression78=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression78.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:89:28: ( 'SEPARATOR' r_expression )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:88:28: ( 'SEPARATOR' r_expression )? int alt20=2; int LA20_0 = input.LA(1); @@ -1812,19 +1349,16 @@ public class Xpand3Parser extends Parser { } switch (alt20) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:89:29: 'SEPARATOR' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:88:29: 'SEPARATOR' r_expression { - string_literal79=(Token)input.LT(1); - match(input,40,FOLLOW_40_in_r_expandStatement415); if (failed) return retval; - if ( backtracking==0 ) { - string_literal79_tree = (Object)adaptor.create(string_literal79); - adaptor.addChild(root_0, string_literal79_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,40,FOLLOW_40_in_r_expandStatement415); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_expandStatement417); - r_expression80=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression80.getTree()); + if (failed) return ; } break; @@ -1843,114 +1377,72 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_expandStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_expandStatement - public static class r_expressionStmt_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_expressionStmt - // src/org/eclipse/xpand3/parser/Xpand3.g:92:1: r_expressionStmt : r_expression ; - public r_expressionStmt_return r_expressionStmt() throws RecognitionException { - r_expressionStmt_return retval = new r_expressionStmt_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_expression_return r_expression81 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:91:1: r_expressionStmt : r_expression ; + public final void r_expressionStmt() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:93:2: ( r_expression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:93:2: r_expression + /** START EDITED */ + ruleEntered("r_expressionStmt"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:91:19: ( r_expression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:92:2: r_expression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_expression_in_r_expressionStmt433); - r_expression81=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression81.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_expressionStmt"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_expressionStmt - public static class r_fileStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_fileStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:96:1: r_fileStatement : 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' ; - public r_fileStatement_return r_fileStatement() throws RecognitionException { - r_fileStatement_return retval = new r_fileStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal82=null; - Token string_literal86=null; - r_expression_return r_expression83 = null; - - r_identifier_return r_identifier84 = null; - - r_sequence_return r_sequence85 = null; - - - Object string_literal82_tree=null; - Object string_literal86_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:95:1: r_fileStatement : 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' ; + public final void r_fileStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:97:2: ( 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:97:2: 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' + /** START EDITED */ + ruleEntered("r_fileStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:95:17: ( 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:96:2: 'FILE' r_expression ( r_identifier )? r_sequence 'ENDFILE' { - root_0 = (Object)adaptor.nil(); - - string_literal82=(Token)input.LT(1); - match(input,41,FOLLOW_41_in_r_fileStatement443); if (failed) return retval; - if ( backtracking==0 ) { - string_literal82_tree = (Object)adaptor.create(string_literal82); - adaptor.addChild(root_0, string_literal82_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,41,FOLLOW_41_in_r_fileStatement443); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_fileStatement445); - r_expression83=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression83.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:97:22: ( r_identifier )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:96:22: ( r_identifier )? int alt22=2; int LA22_0 = input.LA(1); @@ -1959,13 +1451,12 @@ public class Xpand3Parser extends Parser { } switch (alt22) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:97:23: r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:96:23: r_identifier { pushFollow(FOLLOW_r_identifier_in_r_fileStatement448); - r_identifier84=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier84.getTree()); + if (failed) return ; } break; @@ -1973,100 +1464,58 @@ public class Xpand3Parser extends Parser { } pushFollow(FOLLOW_r_sequence_in_r_fileStatement454); - r_sequence85=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence85.getTree()); - string_literal86=(Token)input.LT(1); - match(input,42,FOLLOW_42_in_r_fileStatement458); if (failed) return retval; - if ( backtracking==0 ) { - string_literal86_tree = (Object)adaptor.create(string_literal86); - adaptor.addChild(root_0, string_literal86_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,42,FOLLOW_42_in_r_fileStatement458); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_fileStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_fileStatement - public static class r_foreachStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_foreachStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:102:1: r_foreachStatement : 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' ; - public r_foreachStatement_return r_foreachStatement() throws RecognitionException { - r_foreachStatement_return retval = new r_foreachStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal87=null; - Token string_literal89=null; - Token string_literal91=null; - Token string_literal93=null; - Token string_literal96=null; - r_expression_return r_expression88 = null; - - r_identifier_return r_identifier90 = null; - - r_identifier_return r_identifier92 = null; - - r_expression_return r_expression94 = null; - - r_sequence_return r_sequence95 = null; - - - Object string_literal87_tree=null; - Object string_literal89_tree=null; - Object string_literal91_tree=null; - Object string_literal93_tree=null; - Object string_literal96_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:101:1: r_foreachStatement : 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' ; + public final void r_foreachStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:103:3: ( 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:103:3: 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' + /** START EDITED */ + ruleEntered("r_foreachStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:101:20: ( 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:102:3: 'FOREACH' r_expression 'AS' r_identifier ( 'ITERATOR' r_identifier )? ( 'SEPARATOR' r_expression )? r_sequence 'ENDFOREACH' { - root_0 = (Object)adaptor.nil(); - - string_literal87=(Token)input.LT(1); - match(input,39,FOLLOW_39_in_r_foreachStatement470); if (failed) return retval; - if ( backtracking==0 ) { - string_literal87_tree = (Object)adaptor.create(string_literal87); - adaptor.addChild(root_0, string_literal87_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,39,FOLLOW_39_in_r_foreachStatement470); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_foreachStatement472); - r_expression88=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression88.getTree()); - string_literal89=(Token)input.LT(1); - match(input,43,FOLLOW_43_in_r_foreachStatement474); if (failed) return retval; - if ( backtracking==0 ) { - string_literal89_tree = (Object)adaptor.create(string_literal89); - adaptor.addChild(root_0, string_literal89_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,43,FOLLOW_43_in_r_foreachStatement474); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_foreachStatement476); - r_identifier90=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier90.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:103:44: ( 'ITERATOR' r_identifier )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:102:44: ( 'ITERATOR' r_identifier )? int alt23=2; int LA23_0 = input.LA(1); @@ -2075,26 +1524,23 @@ public class Xpand3Parser extends Parser { } switch (alt23) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:103:45: 'ITERATOR' r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:102:45: 'ITERATOR' r_identifier { - string_literal91=(Token)input.LT(1); - match(input,44,FOLLOW_44_in_r_foreachStatement479); if (failed) return retval; - if ( backtracking==0 ) { - string_literal91_tree = (Object)adaptor.create(string_literal91); - adaptor.addChild(root_0, string_literal91_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,44,FOLLOW_44_in_r_foreachStatement479); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_foreachStatement481); - r_identifier92=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier92.getTree()); + if (failed) return ; } break; } - // src/org/eclipse/xpand3/parser/Xpand3.g:103:71: ( 'SEPARATOR' r_expression )? + // src/org/eclipse/xpand3/parser/Xpand3.g:102:71: ( 'SEPARATOR' r_expression )? int alt24=2; int LA24_0 = input.LA(1); @@ -2103,19 +1549,16 @@ public class Xpand3Parser extends Parser { } switch (alt24) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:103:72: 'SEPARATOR' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:102:72: 'SEPARATOR' r_expression { - string_literal93=(Token)input.LT(1); - match(input,40,FOLLOW_40_in_r_foreachStatement486); if (failed) return retval; - if ( backtracking==0 ) { - string_literal93_tree = (Object)adaptor.create(string_literal93); - adaptor.addChild(root_0, string_literal93_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,40,FOLLOW_40_in_r_foreachStatement486); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_foreachStatement488); - r_expression94=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression94.getTree()); + if (failed) return ; } break; @@ -2123,86 +1566,54 @@ public class Xpand3Parser extends Parser { } pushFollow(FOLLOW_r_sequence_in_r_foreachStatement496); - r_sequence95=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence95.getTree()); - string_literal96=(Token)input.LT(1); - match(input,45,FOLLOW_45_in_r_foreachStatement501); if (failed) return retval; - if ( backtracking==0 ) { - string_literal96_tree = (Object)adaptor.create(string_literal96); - adaptor.addChild(root_0, string_literal96_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,45,FOLLOW_45_in_r_foreachStatement501); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_foreachStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_foreachStatement - public static class r_ifStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_ifStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:108:1: r_ifStatement : 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' ; - public r_ifStatement_return r_ifStatement() throws RecognitionException { - r_ifStatement_return retval = new r_ifStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal97=null; - Token string_literal102=null; - r_expression_return r_expression98 = null; - - r_sequence_return r_sequence99 = null; - - r_elseIfStatement_return r_elseIfStatement100 = null; - - r_elseStatement_return r_elseStatement101 = null; - - - Object string_literal97_tree=null; - Object string_literal102_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:107:1: r_ifStatement : 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' ; + public final void r_ifStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:109:6: ( 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:109:6: 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' + /** START EDITED */ + ruleEntered("r_ifStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:107:15: ( 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:108:6: 'IF' r_expression r_sequence ( r_elseIfStatement )* ( r_elseStatement )? 'ENDIF' { - root_0 = (Object)adaptor.nil(); - - string_literal97=(Token)input.LT(1); - match(input,46,FOLLOW_46_in_r_ifStatement516); if (failed) return retval; - if ( backtracking==0 ) { - string_literal97_tree = (Object)adaptor.create(string_literal97); - adaptor.addChild(root_0, string_literal97_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,46,FOLLOW_46_in_r_ifStatement516); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_ifStatement518); - r_expression98=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression98.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_ifStatement522); - r_sequence99=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence99.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:111:3: ( r_elseIfStatement )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:110:3: ( r_elseIfStatement )* loop25: do { int alt25=2; @@ -2215,13 +1626,12 @@ public class Xpand3Parser extends Parser { switch (alt25) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:111:3: r_elseIfStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:110:3: r_elseIfStatement { pushFollow(FOLLOW_r_elseIfStatement_in_r_ifStatement527); - r_elseIfStatement100=r_elseIfStatement(); + r_elseIfStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_elseIfStatement100.getTree()); + if (failed) return ; } break; @@ -2231,7 +1641,7 @@ public class Xpand3Parser extends Parser { } } while (true); - // src/org/eclipse/xpand3/parser/Xpand3.g:112:3: ( r_elseStatement )? + // src/org/eclipse/xpand3/parser/Xpand3.g:111:3: ( r_elseStatement )? int alt26=2; int LA26_0 = input.LA(1); @@ -2240,331 +1650,207 @@ public class Xpand3Parser extends Parser { } switch (alt26) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:112:3: r_elseStatement + // src/org/eclipse/xpand3/parser/Xpand3.g:111:3: r_elseStatement { pushFollow(FOLLOW_r_elseStatement_in_r_ifStatement532); - r_elseStatement101=r_elseStatement(); + r_elseStatement(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_elseStatement101.getTree()); + if (failed) return ; } break; } - string_literal102=(Token)input.LT(1); - match(input,47,FOLLOW_47_in_r_ifStatement537); if (failed) return retval; - if ( backtracking==0 ) { - string_literal102_tree = (Object)adaptor.create(string_literal102); - adaptor.addChild(root_0, string_literal102_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,47,FOLLOW_47_in_r_ifStatement537); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_ifStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_ifStatement - public static class r_elseIfStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_elseIfStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:116:1: r_elseIfStatement : 'ELSEIF' r_expression r_sequence ; - public r_elseIfStatement_return r_elseIfStatement() throws RecognitionException { - r_elseIfStatement_return retval = new r_elseIfStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal103=null; - r_expression_return r_expression104 = null; - - r_sequence_return r_sequence105 = null; - - - Object string_literal103_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:115:1: r_elseIfStatement : 'ELSEIF' r_expression r_sequence ; + public final void r_elseIfStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:117:2: ( 'ELSEIF' r_expression r_sequence ) - // src/org/eclipse/xpand3/parser/Xpand3.g:117:2: 'ELSEIF' r_expression r_sequence + /** START EDITED */ + ruleEntered("r_elseIfStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:115:19: ( 'ELSEIF' r_expression r_sequence ) + // src/org/eclipse/xpand3/parser/Xpand3.g:116:2: 'ELSEIF' r_expression r_sequence { - root_0 = (Object)adaptor.nil(); - - string_literal103=(Token)input.LT(1); - match(input,48,FOLLOW_48_in_r_elseIfStatement547); if (failed) return retval; - if ( backtracking==0 ) { - string_literal103_tree = (Object)adaptor.create(string_literal103); - adaptor.addChild(root_0, string_literal103_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,48,FOLLOW_48_in_r_elseIfStatement547); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_elseIfStatement549); - r_expression104=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression104.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_elseIfStatement553); - r_sequence105=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence105.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_elseIfStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_elseIfStatement - public static class r_elseStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_elseStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:121:1: r_elseStatement : 'ELSE' r_sequence ; - public r_elseStatement_return r_elseStatement() throws RecognitionException { - r_elseStatement_return retval = new r_elseStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal106=null; - r_sequence_return r_sequence107 = null; - - - Object string_literal106_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:120:1: r_elseStatement : 'ELSE' r_sequence ; + public final void r_elseStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:122:2: ( 'ELSE' r_sequence ) - // src/org/eclipse/xpand3/parser/Xpand3.g:122:2: 'ELSE' r_sequence + /** START EDITED */ + ruleEntered("r_elseStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:120:17: ( 'ELSE' r_sequence ) + // src/org/eclipse/xpand3/parser/Xpand3.g:121:2: 'ELSE' r_sequence { - root_0 = (Object)adaptor.nil(); - - string_literal106=(Token)input.LT(1); - match(input,49,FOLLOW_49_in_r_elseStatement565); if (failed) return retval; - if ( backtracking==0 ) { - string_literal106_tree = (Object)adaptor.create(string_literal106); - adaptor.addChild(root_0, string_literal106_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,49,FOLLOW_49_in_r_elseStatement565); if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_elseStatement569); - r_sequence107=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence107.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_elseStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_elseStatement - public static class r_letStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_letStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:126:1: r_letStatement : 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' ; - public r_letStatement_return r_letStatement() throws RecognitionException { - r_letStatement_return retval = new r_letStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal108=null; - Token string_literal110=null; - Token string_literal113=null; - r_expression_return r_expression109 = null; - - r_identifier_return r_identifier111 = null; - - r_sequence_return r_sequence112 = null; - - - Object string_literal108_tree=null; - Object string_literal110_tree=null; - Object string_literal113_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:125:1: r_letStatement : 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' ; + public final void r_letStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:127:3: ( 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:127:3: 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' + /** START EDITED */ + ruleEntered("r_letStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:125:16: ( 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:126:3: 'LET' r_expression 'AS' r_identifier r_sequence 'ENDLET' { - root_0 = (Object)adaptor.nil(); - - string_literal108=(Token)input.LT(1); - match(input,50,FOLLOW_50_in_r_letStatement581); if (failed) return retval; - if ( backtracking==0 ) { - string_literal108_tree = (Object)adaptor.create(string_literal108); - adaptor.addChild(root_0, string_literal108_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,50,FOLLOW_50_in_r_letStatement581); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_letStatement583); - r_expression109=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression109.getTree()); - string_literal110=(Token)input.LT(1); - match(input,43,FOLLOW_43_in_r_letStatement585); if (failed) return retval; - if ( backtracking==0 ) { - string_literal110_tree = (Object)adaptor.create(string_literal110); - adaptor.addChild(root_0, string_literal110_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,43,FOLLOW_43_in_r_letStatement585); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_letStatement587); - r_identifier111=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier111.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_sequence_in_r_letStatement593); - r_sequence112=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence112.getTree()); - string_literal113=(Token)input.LT(1); - match(input,51,FOLLOW_51_in_r_letStatement598); if (failed) return retval; - if ( backtracking==0 ) { - string_literal113_tree = (Object)adaptor.create(string_literal113); - adaptor.addChild(root_0, string_literal113_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,51,FOLLOW_51_in_r_letStatement598); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_letStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_letStatement - public static class r_protectStatement_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_protectStatement - // src/org/eclipse/xpand3/parser/Xpand3.g:132:1: r_protectStatement : 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' ; - public r_protectStatement_return r_protectStatement() throws RecognitionException { - r_protectStatement_return retval = new r_protectStatement_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal114=null; - Token string_literal115=null; - Token string_literal117=null; - Token string_literal119=null; - Token string_literal121=null; - Token string_literal123=null; - r_expression_return r_expression116 = null; - - r_expression_return r_expression118 = null; - - r_expression_return r_expression120 = null; - - r_sequence_return r_sequence122 = null; - - - Object string_literal114_tree=null; - Object string_literal115_tree=null; - Object string_literal117_tree=null; - Object string_literal119_tree=null; - Object string_literal121_tree=null; - Object string_literal123_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:131:1: r_protectStatement : 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' ; + public final void r_protectStatement() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:133:2: ( 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:133:2: 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' + /** START EDITED */ + ruleEntered("r_protectStatement"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:131:20: ( 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:132:2: 'PROTECT' 'CSTART' r_expression 'CEND' r_expression 'ID' r_expression ( 'DISABLE' )? r_sequence 'ENDPROTECT' { - root_0 = (Object)adaptor.nil(); - - string_literal114=(Token)input.LT(1); - match(input,52,FOLLOW_52_in_r_protectStatement609); if (failed) return retval; - if ( backtracking==0 ) { - string_literal114_tree = (Object)adaptor.create(string_literal114); - adaptor.addChild(root_0, string_literal114_tree); - } - string_literal115=(Token)input.LT(1); - match(input,53,FOLLOW_53_in_r_protectStatement614); if (failed) return retval; - if ( backtracking==0 ) { - string_literal115_tree = (Object)adaptor.create(string_literal115); - adaptor.addChild(root_0, string_literal115_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,52,FOLLOW_52_in_r_protectStatement609); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,53,FOLLOW_53_in_r_protectStatement614); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_protectStatement616); - r_expression116=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression116.getTree()); - string_literal117=(Token)input.LT(1); - match(input,54,FOLLOW_54_in_r_protectStatement621); if (failed) return retval; - if ( backtracking==0 ) { - string_literal117_tree = (Object)adaptor.create(string_literal117); - adaptor.addChild(root_0, string_literal117_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,54,FOLLOW_54_in_r_protectStatement621); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_protectStatement623); - r_expression118=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression118.getTree()); - string_literal119=(Token)input.LT(1); - match(input,55,FOLLOW_55_in_r_protectStatement636); if (failed) return retval; - if ( backtracking==0 ) { - string_literal119_tree = (Object)adaptor.create(string_literal119); - adaptor.addChild(root_0, string_literal119_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,55,FOLLOW_55_in_r_protectStatement636); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_protectStatement638); - r_expression120=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression120.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:136:29: ( 'DISABLE' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:135:29: ( 'DISABLE' )? int alt27=2; int LA27_0 = input.LA(1); @@ -2573,14 +1859,12 @@ public class Xpand3Parser extends Parser { } switch (alt27) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:136:29: 'DISABLE' + // src/org/eclipse/xpand3/parser/Xpand3.g:135:29: 'DISABLE' { - string_literal121=(Token)input.LT(1); - match(input,56,FOLLOW_56_in_r_protectStatement640); if (failed) return retval; - if ( backtracking==0 ) { - string_literal121_tree = (Object)adaptor.create(string_literal121); - adaptor.addChild(root_0, string_literal121_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,56,FOLLOW_56_in_r_protectStatement640); if (failed) return ; } break; @@ -2588,87 +1872,50 @@ public class Xpand3Parser extends Parser { } pushFollow(FOLLOW_r_sequence_in_r_protectStatement646); - r_sequence122=r_sequence(); + r_sequence(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_sequence122.getTree()); - string_literal123=(Token)input.LT(1); - match(input,57,FOLLOW_57_in_r_protectStatement650); if (failed) return retval; - if ( backtracking==0 ) { - string_literal123_tree = (Object)adaptor.create(string_literal123); - adaptor.addChild(root_0, string_literal123_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,57,FOLLOW_57_in_r_protectStatement650); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_protectStatement"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_protectStatement - public static class r_check_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_check - // src/org/eclipse/xpand3/parser/Xpand3.g:143:1: r_check : 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' ; - public r_check_return r_check() throws RecognitionException { - r_check_return retval = new r_check_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal124=null; - Token string_literal126=null; - Token set128=null; - Token char_literal130=null; - Token char_literal132=null; - r_type_return r_type125 = null; - - r_expression_return r_expression127 = null; - - r_expression_return r_expression129 = null; - - r_expression_return r_expression131 = null; - - - Object string_literal124_tree=null; - Object string_literal126_tree=null; - Object set128_tree=null; - Object char_literal130_tree=null; - Object char_literal132_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:142:1: r_check : 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' ; + public final void r_check() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:144:2: ( 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:144:2: 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' + /** START EDITED */ + ruleEntered("r_check"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:142:9: ( 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:143:2: 'context' r_type ( 'if' r_expression )? ( 'ERROR' | 'WARNING' ) r_expression ':' r_expression ';' { - root_0 = (Object)adaptor.nil(); - - string_literal124=(Token)input.LT(1); - match(input,58,FOLLOW_58_in_r_check662); if (failed) return retval; - if ( backtracking==0 ) { - string_literal124_tree = (Object)adaptor.create(string_literal124); - adaptor.addChild(root_0, string_literal124_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,58,FOLLOW_58_in_r_check662); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_check664); - r_type125=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type125.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:144:19: ( 'if' r_expression )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:143:19: ( 'if' r_expression )? int alt28=2; int LA28_0 = input.LA(1); @@ -2677,141 +1924,90 @@ public class Xpand3Parser extends Parser { } switch (alt28) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:144:20: 'if' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:143:20: 'if' r_expression { - string_literal126=(Token)input.LT(1); - match(input,59,FOLLOW_59_in_r_check667); if (failed) return retval; - if ( backtracking==0 ) { - string_literal126_tree = (Object)adaptor.create(string_literal126); - adaptor.addChild(root_0, string_literal126_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,59,FOLLOW_59_in_r_check667); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_check669); - r_expression127=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression127.getTree()); + if (failed) return ; } break; } - set128=(Token)input.LT(1); if ( input.LA(1)==37||input.LA(1)==60 ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set128)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_check673); throw mse; } pushFollow(FOLLOW_r_expression_in_r_check679); - r_expression129=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression129.getTree()); - char_literal130=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_check681); if (failed) return retval; - if ( backtracking==0 ) { - char_literal130_tree = (Object)adaptor.create(char_literal130); - adaptor.addChild(root_0, char_literal130_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_check681); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_check685); - r_expression131=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression131.getTree()); - char_literal132=(Token)input.LT(1); - match(input,28,FOLLOW_28_in_r_check687); if (failed) return retval; - if ( backtracking==0 ) { - char_literal132_tree = (Object)adaptor.create(char_literal132); - adaptor.addChild(root_0, char_literal132_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,28,FOLLOW_28_in_r_check687); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_check"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_check - public static class r_around_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_around - // src/org/eclipse/xpand3/parser/Xpand3.g:148:1: r_around : 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' ; - public r_around_return r_around() throws RecognitionException { - r_around_return retval = new r_around_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal133=null; - Token char_literal135=null; - Token char_literal137=null; - Token char_literal138=null; - Token char_literal139=null; - Token char_literal140=null; - Token char_literal141=null; - Token char_literal143=null; - r_pointcut_return r_pointcut134 = null; - - r_declaredParameterList_return r_declaredParameterList136 = null; - - r_expression_return r_expression142 = null; - - - Object string_literal133_tree=null; - Object char_literal135_tree=null; - Object char_literal137_tree=null; - Object char_literal138_tree=null; - Object char_literal139_tree=null; - Object char_literal140_tree=null; - Object char_literal141_tree=null; - Object char_literal143_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:147:1: r_around : 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' ; + public final void r_around() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:149:5: ( 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:149:5: 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' + /** START EDITED */ + ruleEntered("r_around"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:147:11: ( 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:148:5: 'around' r_pointcut '(' ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? ')' ':' r_expression ';' { - root_0 = (Object)adaptor.nil(); - - string_literal133=(Token)input.LT(1); - match(input,62,FOLLOW_62_in_r_around702); if (failed) return retval; - if ( backtracking==0 ) { - string_literal133_tree = (Object)adaptor.create(string_literal133); - adaptor.addChild(root_0, string_literal133_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,62,FOLLOW_62_in_r_around702); if (failed) return ; pushFollow(FOLLOW_r_pointcut_in_r_around704); - r_pointcut134=r_pointcut(); + r_pointcut(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_pointcut134.getTree()); - char_literal135=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_around706); if (failed) return retval; - if ( backtracking==0 ) { - char_literal135_tree = (Object)adaptor.create(char_literal135); - adaptor.addChild(root_0, char_literal135_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:149:29: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_around706); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:148:29: ( r_declaredParameterList ( ( ',' )? '*' )? | '*' )? int alt31=3; int LA31_0 = input.LA(1); @@ -2823,14 +2019,13 @@ public class Xpand3Parser extends Parser { } switch (alt31) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:149:30: r_declaredParameterList ( ( ',' )? '*' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:148:30: r_declaredParameterList ( ( ',' )? '*' )? { pushFollow(FOLLOW_r_declaredParameterList_in_r_around709); - r_declaredParameterList136=r_declaredParameterList(); + r_declaredParameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameterList136.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:149:54: ( ( ',' )? '*' )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:148:54: ( ( ',' )? '*' )? int alt30=2; int LA30_0 = input.LA(1); @@ -2839,9 +2034,9 @@ public class Xpand3Parser extends Parser { } switch (alt30) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:149:55: ( ',' )? '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:148:55: ( ',' )? '*' { - // src/org/eclipse/xpand3/parser/Xpand3.g:149:55: ( ',' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:148:55: ( ',' )? int alt29=2; int LA29_0 = input.LA(1); @@ -2850,26 +2045,22 @@ public class Xpand3Parser extends Parser { } switch (alt29) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:149:55: ',' + // src/org/eclipse/xpand3/parser/Xpand3.g:148:55: ',' { - char_literal137=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_around712); if (failed) return retval; - if ( backtracking==0 ) { - char_literal137_tree = (Object)adaptor.create(char_literal137); - adaptor.addChild(root_0, char_literal137_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_around712); if (failed) return ; } break; } - char_literal138=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_around715); if (failed) return retval; - if ( backtracking==0 ) { - char_literal138_tree = (Object)adaptor.create(char_literal138); - adaptor.addChild(root_0, char_literal138_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_around715); if (failed) return ; } break; @@ -2880,95 +2071,63 @@ public class Xpand3Parser extends Parser { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:149:68: '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:148:68: '*' { - char_literal139=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_around721); if (failed) return retval; - if ( backtracking==0 ) { - char_literal139_tree = (Object)adaptor.create(char_literal139); - adaptor.addChild(root_0, char_literal139_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_around721); if (failed) return ; } break; } - char_literal140=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_around725); if (failed) return retval; - if ( backtracking==0 ) { - char_literal140_tree = (Object)adaptor.create(char_literal140); - adaptor.addChild(root_0, char_literal140_tree); - } - char_literal141=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_around727); if (failed) return retval; - if ( backtracking==0 ) { - char_literal141_tree = (Object)adaptor.create(char_literal141); - adaptor.addChild(root_0, char_literal141_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_around725); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_around727); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_around734); - r_expression142=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression142.getTree()); - char_literal143=(Token)input.LT(1); - match(input,28,FOLLOW_28_in_r_around736); if (failed) return retval; - if ( backtracking==0 ) { - char_literal143_tree = (Object)adaptor.create(char_literal143); - adaptor.addChild(root_0, char_literal143_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,28,FOLLOW_28_in_r_around736); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_around"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_around - public static class r_pointcut_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_pointcut - // src/org/eclipse/xpand3/parser/Xpand3.g:153:1: r_pointcut : ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* ; - public r_pointcut_return r_pointcut() throws RecognitionException { - r_pointcut_return retval = new r_pointcut_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal144=null; - Token char_literal146=null; - Token string_literal148=null; - r_identifier_return r_identifier145 = null; - - r_identifier_return r_identifier147 = null; - - - Object char_literal144_tree=null; - Object char_literal146_tree=null; - Object string_literal148_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:152:1: r_pointcut : ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* ; + public final void r_pointcut() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:154:2: ( ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:154:2: ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* + /** START EDITED */ + ruleEntered("r_pointcut"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:152:13: ( ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:153:2: ( '*' | r_identifier ) ( '*' | r_identifier | '::' )* { - root_0 = (Object)adaptor.nil(); - - // src/org/eclipse/xpand3/parser/Xpand3.g:154:2: ( '*' | r_identifier ) + // src/org/eclipse/xpand3/parser/Xpand3.g:153:2: ( '*' | r_identifier ) int alt32=2; int LA32_0 = input.LA(1); @@ -2979,40 +2138,37 @@ public class Xpand3Parser extends Parser { alt32=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("154:2: ( '*' | r_identifier )", 32, 0, input); + new NoViableAltException("153:2: ( '*' | r_identifier )", 32, 0, input); throw nvae; } switch (alt32) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:154:4: '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:153:4: '*' { - char_literal144=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_pointcut753); if (failed) return retval; - if ( backtracking==0 ) { - char_literal144_tree = (Object)adaptor.create(char_literal144); - adaptor.addChild(root_0, char_literal144_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_pointcut753); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:155:4: r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:154:4: r_identifier { pushFollow(FOLLOW_r_identifier_in_r_pointcut759); - r_identifier145=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier145.getTree()); + if (failed) return ; } break; } - // src/org/eclipse/xpand3/parser/Xpand3.g:156:4: ( '*' | r_identifier | '::' )* + // src/org/eclipse/xpand3/parser/Xpand3.g:155:4: ( '*' | r_identifier | '::' )* loop33: do { int alt33=4; @@ -3037,37 +2193,32 @@ public class Xpand3Parser extends Parser { switch (alt33) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:156:6: '*' + // src/org/eclipse/xpand3/parser/Xpand3.g:155:6: '*' { - char_literal146=(Token)input.LT(1); - match(input,33,FOLLOW_33_in_r_pointcut767); if (failed) return retval; - if ( backtracking==0 ) { - char_literal146_tree = (Object)adaptor.create(char_literal146); - adaptor.addChild(root_0, char_literal146_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,33,FOLLOW_33_in_r_pointcut767); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:157:6: r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:156:6: r_identifier { pushFollow(FOLLOW_r_identifier_in_r_pointcut775); - r_identifier147=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier147.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:158:6: '::' + // src/org/eclipse/xpand3/parser/Xpand3.g:157:6: '::' { - string_literal148=(Token)input.LT(1); - match(input,63,FOLLOW_63_in_r_pointcut783); if (failed) return retval; - if ( backtracking==0 ) { - string_literal148_tree = (Object)adaptor.create(string_literal148); - adaptor.addChild(root_0, string_literal148_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,63,FOLLOW_63_in_r_pointcut783); if (failed) return ; } break; @@ -3080,83 +2231,32 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_pointcut"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_pointcut - public static class r_extension_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_extension - // src/org/eclipse/xpand3/parser/Xpand3.g:161:1: r_extension : ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' ; - public r_extension_return r_extension() throws RecognitionException { - r_extension_return retval = new r_extension_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set149=null; - Token char_literal153=null; - Token char_literal155=null; - Token char_literal156=null; - Token string_literal157=null; - Token char_literal159=null; - Token char_literal161=null; - Token char_literal163=null; - Token char_literal165=null; - Token char_literal167=null; - r_type_return r_type150 = null; - - r_identifier_return r_identifier151 = null; - - r_identifier_return r_identifier152 = null; - - r_declaredParameterList_return r_declaredParameterList154 = null; - - r_javaType_return r_javaType158 = null; - - r_identifier_return r_identifier160 = null; - - r_javaType_return r_javaType162 = null; - - r_javaType_return r_javaType164 = null; - - r_expression_return r_expression166 = null; - - - Object set149_tree=null; - Object char_literal153_tree=null; - Object char_literal155_tree=null; - Object char_literal156_tree=null; - Object string_literal157_tree=null; - Object char_literal159_tree=null; - Object char_literal161_tree=null; - Object char_literal163_tree=null; - Object char_literal165_tree=null; - Object char_literal167_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:160:1: r_extension : ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' ; + public final void r_extension() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:162:2: ( ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:162:2: ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' + /** START EDITED */ + ruleEntered("r_extension"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:160:14: ( ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:161:2: ( 'private' | 'cached' | 'create' )* ( r_type )? r_identifier ( r_identifier )? '(' ( r_declaredParameterList )? ')' ':' ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) ';' { - root_0 = (Object)adaptor.nil(); - - // src/org/eclipse/xpand3/parser/Xpand3.g:162:2: ( 'private' | 'cached' | 'create' )* + // src/org/eclipse/xpand3/parser/Xpand3.g:161:2: ( 'private' | 'cached' | 'create' )* loop34: do { int alt34=2; @@ -3171,14 +2271,12 @@ public class Xpand3Parser extends Parser { case 1 : // src/org/eclipse/xpand3/parser/Xpand3.g: { - set149=(Token)input.LT(1); if ( (input.LA(1)>=64 && input.LA(1)<=66) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set149)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_extension797); throw mse; @@ -3193,7 +2291,7 @@ public class Xpand3Parser extends Parser { } } while (true); - // src/org/eclipse/xpand3/parser/Xpand3.g:162:33: ( r_type )? + // src/org/eclipse/xpand3/parser/Xpand3.g:161:33: ( r_type )? int alt35=2; int LA35_0 = input.LA(1); @@ -3212,13 +2310,12 @@ public class Xpand3Parser extends Parser { } switch (alt35) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:162:33: r_type + // src/org/eclipse/xpand3/parser/Xpand3.g:161:33: r_type { pushFollow(FOLLOW_r_type_in_r_extension806); - r_type150=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type150.getTree()); + if (failed) return ; } break; @@ -3226,11 +2323,10 @@ public class Xpand3Parser extends Parser { } pushFollow(FOLLOW_r_identifier_in_r_extension809); - r_identifier151=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier151.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:162:54: ( r_identifier )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:161:54: ( r_identifier )? int alt36=2; int LA36_0 = input.LA(1); @@ -3239,26 +2335,23 @@ public class Xpand3Parser extends Parser { } switch (alt36) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:162:54: r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:161:54: r_identifier { pushFollow(FOLLOW_r_identifier_in_r_extension811); - r_identifier152=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier152.getTree()); + if (failed) return ; } break; } - char_literal153=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_extension814); if (failed) return retval; - if ( backtracking==0 ) { - char_literal153_tree = (Object)adaptor.create(char_literal153); - adaptor.addChild(root_0, char_literal153_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:162:72: ( r_declaredParameterList )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_extension814); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:161:72: ( r_declaredParameterList )? int alt37=2; int LA37_0 = input.LA(1); @@ -3267,32 +2360,27 @@ public class Xpand3Parser extends Parser { } switch (alt37) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:162:72: r_declaredParameterList + // src/org/eclipse/xpand3/parser/Xpand3.g:161:72: r_declaredParameterList { pushFollow(FOLLOW_r_declaredParameterList_in_r_extension816); - r_declaredParameterList154=r_declaredParameterList(); + r_declaredParameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameterList154.getTree()); + if (failed) return ; } break; } - char_literal155=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_extension819); if (failed) return retval; - if ( backtracking==0 ) { - char_literal155_tree = (Object)adaptor.create(char_literal155); - adaptor.addChild(root_0, char_literal155_tree); - } - char_literal156=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_extension821); if (failed) return retval; - if ( backtracking==0 ) { - char_literal156_tree = (Object)adaptor.create(char_literal156); - adaptor.addChild(root_0, char_literal156_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:163:3: ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_extension819); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_extension821); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:162:3: ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression ) int alt40=2; int LA40_0 = input.LA(1); @@ -3303,45 +2391,37 @@ public class Xpand3Parser extends Parser { alt40=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("163:3: ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression )", 40, 0, input); + new NoViableAltException("162:3: ( 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' | r_expression )", 40, 0, input); throw nvae; } switch (alt40) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:163:4: 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:162:4: 'JAVA' r_javaType '.' r_identifier '(' ( r_javaType ( ',' r_javaType )* )? ')' { - string_literal157=(Token)input.LT(1); - match(input,67,FOLLOW_67_in_r_extension826); if (failed) return retval; - if ( backtracking==0 ) { - string_literal157_tree = (Object)adaptor.create(string_literal157); - adaptor.addChild(root_0, string_literal157_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,67,FOLLOW_67_in_r_extension826); if (failed) return ; pushFollow(FOLLOW_r_javaType_in_r_extension828); - r_javaType158=r_javaType(); + r_javaType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_javaType158.getTree()); - char_literal159=(Token)input.LT(1); - match(input,68,FOLLOW_68_in_r_extension830); if (failed) return retval; - if ( backtracking==0 ) { - char_literal159_tree = (Object)adaptor.create(char_literal159); - adaptor.addChild(root_0, char_literal159_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,68,FOLLOW_68_in_r_extension830); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_extension832); - r_identifier160=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier160.getTree()); - char_literal161=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_extension834); if (failed) return retval; - if ( backtracking==0 ) { - char_literal161_tree = (Object)adaptor.create(char_literal161); - adaptor.addChild(root_0, char_literal161_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:163:42: ( r_javaType ( ',' r_javaType )* )? + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_extension834); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:162:42: ( r_javaType ( ',' r_javaType )* )? int alt39=2; int LA39_0 = input.LA(1); @@ -3350,14 +2430,13 @@ public class Xpand3Parser extends Parser { } switch (alt39) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:163:43: r_javaType ( ',' r_javaType )* + // src/org/eclipse/xpand3/parser/Xpand3.g:162:43: r_javaType ( ',' r_javaType )* { pushFollow(FOLLOW_r_javaType_in_r_extension836); - r_javaType162=r_javaType(); + r_javaType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_javaType162.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:163:54: ( ',' r_javaType )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:162:54: ( ',' r_javaType )* loop38: do { int alt38=2; @@ -3370,19 +2449,16 @@ public class Xpand3Parser extends Parser { switch (alt38) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:163:55: ',' r_javaType + // src/org/eclipse/xpand3/parser/Xpand3.g:162:55: ',' r_javaType { - char_literal163=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_extension839); if (failed) return retval; - if ( backtracking==0 ) { - char_literal163_tree = (Object)adaptor.create(char_literal163); - adaptor.addChild(root_0, char_literal163_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_extension839); if (failed) return ; pushFollow(FOLLOW_r_javaType_in_r_extension841); - r_javaType164=r_javaType(); + r_javaType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_javaType164.getTree()); + if (failed) return ; } break; @@ -3398,94 +2474,63 @@ public class Xpand3Parser extends Parser { } - char_literal165=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_extension848); if (failed) return retval; - if ( backtracking==0 ) { - char_literal165_tree = (Object)adaptor.create(char_literal165); - adaptor.addChild(root_0, char_literal165_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_extension848); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:164:4: r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:163:4: r_expression { pushFollow(FOLLOW_r_expression_in_r_extension855); - r_expression166=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression166.getTree()); + if (failed) return ; } break; } - char_literal167=(Token)input.LT(1); - match(input,28,FOLLOW_28_in_r_extension858); if (failed) return retval; - if ( backtracking==0 ) { - char_literal167_tree = (Object)adaptor.create(char_literal167); - adaptor.addChild(root_0, char_literal167_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,28,FOLLOW_28_in_r_extension858); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_extension"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_extension - public static class r_javaType_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_javaType - // src/org/eclipse/xpand3/parser/Xpand3.g:167:1: r_javaType : r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* ; - public r_javaType_return r_javaType() throws RecognitionException { - r_javaType_return retval = new r_javaType_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal169=null; - Token string_literal171=null; - Token string_literal172=null; - Token string_literal173=null; - r_identifier_return r_identifier168 = null; - - r_identifier_return r_identifier170 = null; - - - Object char_literal169_tree=null; - Object string_literal171_tree=null; - Object string_literal172_tree=null; - Object string_literal173_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:166:1: r_javaType : r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* ; + public final void r_javaType() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:168:2: ( r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:168:2: r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* + /** START EDITED */ + ruleEntered("r_javaType"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:166:13: ( r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:167:2: r_identifier ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_identifier_in_r_javaType869); - r_identifier168=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier168.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:169:2: ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:168:2: ( '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) )* loop42: do { int alt42=2; @@ -3513,15 +2558,13 @@ public class Xpand3Parser extends Parser { switch (alt42) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:169:3: '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:168:3: '.' ( r_identifier | 'Collection' | 'List' | 'Set' ) { - char_literal169=(Token)input.LT(1); - match(input,68,FOLLOW_68_in_r_javaType875); if (failed) return retval; - if ( backtracking==0 ) { - char_literal169_tree = (Object)adaptor.create(char_literal169); - adaptor.addChild(root_0, char_literal169_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:169:7: ( r_identifier | 'Collection' | 'List' | 'Set' ) + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,68,FOLLOW_68_in_r_javaType875); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:168:7: ( r_identifier | 'Collection' | 'List' | 'Set' ) int alt41=4; switch ( input.LA(1) ) { case Identifier: @@ -3545,58 +2588,51 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("169:7: ( r_identifier | 'Collection' | 'List' | 'Set' )", 41, 0, input); + new NoViableAltException("168:7: ( r_identifier | 'Collection' | 'List' | 'Set' )", 41, 0, input); throw nvae; } switch (alt41) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:169:8: r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:168:8: r_identifier { pushFollow(FOLLOW_r_identifier_in_r_javaType878); - r_identifier170=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier170.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:169:22: 'Collection' + // src/org/eclipse/xpand3/parser/Xpand3.g:168:22: 'Collection' { - string_literal171=(Token)input.LT(1); - match(input,69,FOLLOW_69_in_r_javaType881); if (failed) return retval; - if ( backtracking==0 ) { - string_literal171_tree = (Object)adaptor.create(string_literal171); - adaptor.addChild(root_0, string_literal171_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,69,FOLLOW_69_in_r_javaType881); if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:170:2: 'List' + // src/org/eclipse/xpand3/parser/Xpand3.g:169:2: 'List' { - string_literal172=(Token)input.LT(1); - match(input,70,FOLLOW_70_in_r_javaType887); if (failed) return retval; - if ( backtracking==0 ) { - string_literal172_tree = (Object)adaptor.create(string_literal172); - adaptor.addChild(root_0, string_literal172_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,70,FOLLOW_70_in_r_javaType887); if (failed) return ; } break; case 4 : - // src/org/eclipse/xpand3/parser/Xpand3.g:170:10: 'Set' + // src/org/eclipse/xpand3/parser/Xpand3.g:169:10: 'Set' { - string_literal173=(Token)input.LT(1); - match(input,71,FOLLOW_71_in_r_javaType890); if (failed) return retval; - if ( backtracking==0 ) { - string_literal173_tree = (Object)adaptor.create(string_literal173); - adaptor.addChild(root_0, string_literal173_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,71,FOLLOW_71_in_r_javaType890); if (failed) return ; } break; @@ -3615,102 +2651,61 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_javaType"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_javaType - public static class r_expression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_expression - // src/org/eclipse/xpand3/parser/Xpand3.g:176:1: r_expression : r_letExpression ; - public r_expression_return r_expression() throws RecognitionException { - r_expression_return retval = new r_expression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_letExpression_return r_letExpression174 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:175:1: r_expression : r_letExpression ; + public final void r_expression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:177:2: ( r_letExpression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:177:2: r_letExpression + /** START EDITED */ + ruleEntered("r_expression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:175:14: ( r_letExpression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:176:2: r_letExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_letExpression_in_r_expression906); - r_letExpression174=r_letExpression(); + r_letExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_letExpression174.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_expression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_expression - public static class r_letExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_letExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:180:1: r_letExpression : ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression ); - public r_letExpression_return r_letExpression() throws RecognitionException { - r_letExpression_return retval = new r_letExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal175=null; - Token char_literal177=null; - Token char_literal179=null; - r_identifier_return r_identifier176 = null; - - r_castedExpression_return r_castedExpression178 = null; - - r_expression_return r_expression180 = null; - - r_castedExpression_return r_castedExpression181 = null; - - - Object string_literal175_tree=null; - Object char_literal177_tree=null; - Object char_literal179_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:179:1: r_letExpression : ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression ); + public final void r_letExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:181:4: ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression ) + /** START EDITED */ + ruleEntered("r_letExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:179:18: ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression ) int alt43=2; int LA43_0 = input.LA(1); @@ -3721,211 +2716,145 @@ public class Xpand3Parser extends Parser { alt43=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("180:1: r_letExpression : ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression );", 43, 0, input); + new NoViableAltException("179:1: r_letExpression : ( 'let' r_identifier '=' r_castedExpression ':' r_expression | r_castedExpression );", 43, 0, input); throw nvae; } switch (alt43) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:181:4: 'let' r_identifier '=' r_castedExpression ':' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:180:4: 'let' r_identifier '=' r_castedExpression ':' r_expression { - root_0 = (Object)adaptor.nil(); - - string_literal175=(Token)input.LT(1); - match(input,72,FOLLOW_72_in_r_letExpression920); if (failed) return retval; - if ( backtracking==0 ) { - string_literal175_tree = (Object)adaptor.create(string_literal175); - adaptor.addChild(root_0, string_literal175_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,72,FOLLOW_72_in_r_letExpression920); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_letExpression922); - r_identifier176=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier176.getTree()); - char_literal177=(Token)input.LT(1); - match(input,73,FOLLOW_73_in_r_letExpression924); if (failed) return retval; - if ( backtracking==0 ) { - char_literal177_tree = (Object)adaptor.create(char_literal177); - adaptor.addChild(root_0, char_literal177_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,73,FOLLOW_73_in_r_letExpression924); if (failed) return ; pushFollow(FOLLOW_r_castedExpression_in_r_letExpression926); - r_castedExpression178=r_castedExpression(); + r_castedExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_castedExpression178.getTree()); - char_literal179=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_letExpression928); if (failed) return retval; - if ( backtracking==0 ) { - char_literal179_tree = (Object)adaptor.create(char_literal179); - adaptor.addChild(root_0, char_literal179_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_letExpression928); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_letExpression930); - r_expression180=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression180.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:182:4: r_castedExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:181:4: r_castedExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_castedExpression_in_r_letExpression936); - r_castedExpression181=r_castedExpression(); + r_castedExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_castedExpression181.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_letExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_letExpression - public static class r_castedExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_castedExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:185:1: r_castedExpression : ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression ); - public r_castedExpression_return r_castedExpression() throws RecognitionException { - r_castedExpression_return retval = new r_castedExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal182=null; - Token char_literal184=null; - r_type_return r_type183 = null; - - r_chainExpression_return r_chainExpression185 = null; - - r_chainExpression_return r_chainExpression186 = null; - - - Object char_literal182_tree=null; - Object char_literal184_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:184:1: r_castedExpression : ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression ); + public final void r_castedExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:186:5: ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression ) + /** START EDITED */ + ruleEntered("r_castedExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:184:20: ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression ) int alt44=2; alt44 = dfa44.predict(input); switch (alt44) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:186:5: ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:185:5: ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression { - root_0 = (Object)adaptor.nil(); - - char_literal182=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_castedExpression962); if (failed) return retval; - if ( backtracking==0 ) { - char_literal182_tree = (Object)adaptor.create(char_literal182); - adaptor.addChild(root_0, char_literal182_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_castedExpression962); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_castedExpression964); - r_type183=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type183.getTree()); - char_literal184=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_castedExpression966); if (failed) return retval; - if ( backtracking==0 ) { - char_literal184_tree = (Object)adaptor.create(char_literal184); - adaptor.addChild(root_0, char_literal184_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_castedExpression966); if (failed) return ; pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression968); - r_chainExpression185=r_chainExpression(); + r_chainExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_chainExpression185.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:188:4: r_chainExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:187:4: r_chainExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_chainExpression_in_r_castedExpression974); - r_chainExpression186=r_chainExpression(); + r_chainExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_chainExpression186.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_castedExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_castedExpression - public static class r_chainExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_chainExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:191:1: r_chainExpression : r_ifExpression ( '->' r_ifExpression )* ; - public r_chainExpression_return r_chainExpression() throws RecognitionException { - r_chainExpression_return retval = new r_chainExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal188=null; - r_ifExpression_return r_ifExpression187 = null; - - r_ifExpression_return r_ifExpression189 = null; - - - Object string_literal188_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:190:1: r_chainExpression : r_ifExpression ( '->' r_ifExpression )* ; + public final void r_chainExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:192:2: ( r_ifExpression ( '->' r_ifExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:192:2: r_ifExpression ( '->' r_ifExpression )* + /** START EDITED */ + ruleEntered("r_chainExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:190:20: ( r_ifExpression ( '->' r_ifExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:191:2: r_ifExpression ( '->' r_ifExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression986); - r_ifExpression187=r_ifExpression(); + r_ifExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_ifExpression187.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:192:18: ( '->' r_ifExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:191:18: ( '->' r_ifExpression )* loop45: do { int alt45=2; @@ -3938,19 +2867,16 @@ public class Xpand3Parser extends Parser { switch (alt45) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:192:20: '->' r_ifExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:191:20: '->' r_ifExpression { - string_literal188=(Token)input.LT(1); - match(input,74,FOLLOW_74_in_r_chainExpression991); if (failed) return retval; - if ( backtracking==0 ) { - string_literal188_tree = (Object)adaptor.create(string_literal188); - adaptor.addChild(root_0, string_literal188_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,74,FOLLOW_74_in_r_chainExpression991); if (failed) return ; pushFollow(FOLLOW_r_ifExpression_in_r_chainExpression993); - r_ifExpression189=r_ifExpression(); + r_ifExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_ifExpression189.getTree()); + if (failed) return ; } break; @@ -3963,62 +2889,29 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_chainExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_chainExpression - public static class r_ifExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_ifExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:195:1: r_ifExpression : ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? ); - public r_ifExpression_return r_ifExpression() throws RecognitionException { - r_ifExpression_return retval = new r_ifExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal191=null; - Token char_literal193=null; - Token string_literal195=null; - Token string_literal197=null; - Token string_literal199=null; - r_switchExpression_return r_switchExpression190 = null; - - r_expression_return r_expression192 = null; - - r_switchExpression_return r_switchExpression194 = null; - - r_expression_return r_expression196 = null; - - r_switchExpression_return r_switchExpression198 = null; - - r_switchExpression_return r_switchExpression200 = null; - - - Object char_literal191_tree=null; - Object char_literal193_tree=null; - Object string_literal195_tree=null; - Object string_literal197_tree=null; - Object string_literal199_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:194:1: r_ifExpression : ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? ); + public final void r_ifExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:196:2: ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? ) + /** START EDITED */ + ruleEntered("r_ifExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:194:17: ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? ) int alt48=2; int LA48_0 = input.LA(1); @@ -4029,24 +2922,21 @@ public class Xpand3Parser extends Parser { alt48=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("195:1: r_ifExpression : ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? );", 48, 0, input); + new NoViableAltException("194:1: r_ifExpression : ( r_switchExpression ( '?' r_expression ':' r_switchExpression )? | 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? );", 48, 0, input); throw nvae; } switch (alt48) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:196:2: r_switchExpression ( '?' r_expression ':' r_switchExpression )? + // src/org/eclipse/xpand3/parser/Xpand3.g:195:2: r_switchExpression ( '?' r_expression ':' r_switchExpression )? { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression1007); - r_switchExpression190=r_switchExpression(); + r_switchExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_switchExpression190.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:196:21: ( '?' r_expression ':' r_switchExpression )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:195:21: ( '?' r_expression ':' r_switchExpression )? int alt46=2; int LA46_0 = input.LA(1); @@ -4055,30 +2945,24 @@ public class Xpand3Parser extends Parser { } switch (alt46) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:196:22: '?' r_expression ':' r_switchExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:195:22: '?' r_expression ':' r_switchExpression { - char_literal191=(Token)input.LT(1); - match(input,75,FOLLOW_75_in_r_ifExpression1010); if (failed) return retval; - if ( backtracking==0 ) { - char_literal191_tree = (Object)adaptor.create(char_literal191); - adaptor.addChild(root_0, char_literal191_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,75,FOLLOW_75_in_r_ifExpression1010); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_ifExpression1012); - r_expression192=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression192.getTree()); - char_literal193=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_ifExpression1014); if (failed) return retval; - if ( backtracking==0 ) { - char_literal193_tree = (Object)adaptor.create(char_literal193); - adaptor.addChild(root_0, char_literal193_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_ifExpression1014); if (failed) return ; pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression1016); - r_switchExpression194=r_switchExpression(); + r_switchExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_switchExpression194.getTree()); + if (failed) return ; } break; @@ -4089,33 +2973,25 @@ public class Xpand3Parser extends Parser { } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:197:3: 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? + // src/org/eclipse/xpand3/parser/Xpand3.g:196:3: 'if' r_expression 'then' r_switchExpression ( 'else' r_switchExpression )? { - root_0 = (Object)adaptor.nil(); - - string_literal195=(Token)input.LT(1); - match(input,59,FOLLOW_59_in_r_ifExpression1023); if (failed) return retval; - if ( backtracking==0 ) { - string_literal195_tree = (Object)adaptor.create(string_literal195); - adaptor.addChild(root_0, string_literal195_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,59,FOLLOW_59_in_r_ifExpression1023); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_ifExpression1025); - r_expression196=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression196.getTree()); - string_literal197=(Token)input.LT(1); - match(input,76,FOLLOW_76_in_r_ifExpression1027); if (failed) return retval; - if ( backtracking==0 ) { - string_literal197_tree = (Object)adaptor.create(string_literal197); - adaptor.addChild(root_0, string_literal197_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,76,FOLLOW_76_in_r_ifExpression1027); if (failed) return ; pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression1029); - r_switchExpression198=r_switchExpression(); + r_switchExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_switchExpression198.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:197:47: ( 'else' r_switchExpression )? + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:196:47: ( 'else' r_switchExpression )? int alt47=2; int LA47_0 = input.LA(1); @@ -4124,19 +3000,16 @@ public class Xpand3Parser extends Parser { } switch (alt47) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:197:48: 'else' r_switchExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:196:48: 'else' r_switchExpression { - string_literal199=(Token)input.LT(1); - match(input,77,FOLLOW_77_in_r_ifExpression1032); if (failed) return retval; - if ( backtracking==0 ) { - string_literal199_tree = (Object)adaptor.create(string_literal199); - adaptor.addChild(root_0, string_literal199_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,77,FOLLOW_77_in_r_ifExpression1032); if (failed) return ; pushFollow(FOLLOW_r_switchExpression_in_r_ifExpression1034); - r_switchExpression200=r_switchExpression(); + r_switchExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_switchExpression200.getTree()); + if (failed) return ; } break; @@ -4148,60 +3021,29 @@ public class Xpand3Parser extends Parser { break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_ifExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_ifExpression - public static class r_switchExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_switchExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:200:1: r_switchExpression : ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression ); - public r_switchExpression_return r_switchExpression() throws RecognitionException { - r_switchExpression_return retval = new r_switchExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal201=null; - Token char_literal202=null; - Token char_literal204=null; - Token string_literal206=null; - Token char_literal207=null; - Token char_literal209=null; - r_orExpression_return r_orExpression203 = null; - - r_casePart_return r_casePart205 = null; - - r_orExpression_return r_orExpression208 = null; - - r_orExpression_return r_orExpression210 = null; - - - Object string_literal201_tree=null; - Object char_literal202_tree=null; - Object char_literal204_tree=null; - Object string_literal206_tree=null; - Object char_literal207_tree=null; - Object char_literal209_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:199:1: r_switchExpression : ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression ); + public final void r_switchExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:201:4: ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression ) + /** START EDITED */ + ruleEntered("r_switchExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:199:21: ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression ) int alt51=2; int LA51_0 = input.LA(1); @@ -4212,25 +3054,21 @@ public class Xpand3Parser extends Parser { alt51=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("200:1: r_switchExpression : ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression );", 51, 0, input); + new NoViableAltException("199:1: r_switchExpression : ( 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' | r_orExpression );", 51, 0, input); throw nvae; } switch (alt51) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:201:4: 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' + // src/org/eclipse/xpand3/parser/Xpand3.g:200:4: 'switch' ( '(' r_orExpression ')' )? ( r_casePart )* 'default' ':' r_orExpression '}' { - root_0 = (Object)adaptor.nil(); - - string_literal201=(Token)input.LT(1); - match(input,78,FOLLOW_78_in_r_switchExpression1050); if (failed) return retval; - if ( backtracking==0 ) { - string_literal201_tree = (Object)adaptor.create(string_literal201); - adaptor.addChild(root_0, string_literal201_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:201:13: ( '(' r_orExpression ')' )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,78,FOLLOW_78_in_r_switchExpression1050); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:200:13: ( '(' r_orExpression ')' )? int alt49=2; int LA49_0 = input.LA(1); @@ -4239,32 +3077,27 @@ public class Xpand3Parser extends Parser { } switch (alt49) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:201:14: '(' r_orExpression ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:200:14: '(' r_orExpression ')' { - char_literal202=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_switchExpression1053); if (failed) return retval; - if ( backtracking==0 ) { - char_literal202_tree = (Object)adaptor.create(char_literal202); - adaptor.addChild(root_0, char_literal202_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_switchExpression1053); if (failed) return ; pushFollow(FOLLOW_r_orExpression_in_r_switchExpression1055); - r_orExpression203=r_orExpression(); + r_orExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_orExpression203.getTree()); - char_literal204=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_switchExpression1057); if (failed) return retval; - if ( backtracking==0 ) { - char_literal204_tree = (Object)adaptor.create(char_literal204); - adaptor.addChild(root_0, char_literal204_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_switchExpression1057); if (failed) return ; } break; } - // src/org/eclipse/xpand3/parser/Xpand3.g:202:2: ( r_casePart )* + // src/org/eclipse/xpand3/parser/Xpand3.g:201:2: ( r_casePart )* loop50: do { int alt50=2; @@ -4277,13 +3110,12 @@ public class Xpand3Parser extends Parser { switch (alt50) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:202:2: r_casePart + // src/org/eclipse/xpand3/parser/Xpand3.g:201:2: r_casePart { pushFollow(FOLLOW_r_casePart_in_r_switchExpression1062); - r_casePart205=r_casePart(); + r_casePart(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_casePart205.getTree()); + if (failed) return ; } break; @@ -4293,168 +3125,111 @@ public class Xpand3Parser extends Parser { } } while (true); - string_literal206=(Token)input.LT(1); - match(input,79,FOLLOW_79_in_r_switchExpression1068); if (failed) return retval; - if ( backtracking==0 ) { - string_literal206_tree = (Object)adaptor.create(string_literal206); - adaptor.addChild(root_0, string_literal206_tree); - } - char_literal207=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_switchExpression1070); if (failed) return retval; - if ( backtracking==0 ) { - char_literal207_tree = (Object)adaptor.create(char_literal207); - adaptor.addChild(root_0, char_literal207_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,79,FOLLOW_79_in_r_switchExpression1068); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_switchExpression1070); if (failed) return ; pushFollow(FOLLOW_r_orExpression_in_r_switchExpression1072); - r_orExpression208=r_orExpression(); + r_orExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_orExpression208.getTree()); - char_literal209=(Token)input.LT(1); - match(input,80,FOLLOW_80_in_r_switchExpression1077); if (failed) return retval; - if ( backtracking==0 ) { - char_literal209_tree = (Object)adaptor.create(char_literal209); - adaptor.addChild(root_0, char_literal209_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,80,FOLLOW_80_in_r_switchExpression1077); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:205:4: r_orExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:204:4: r_orExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_orExpression_in_r_switchExpression1082); - r_orExpression210=r_orExpression(); + r_orExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_orExpression210.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_switchExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_switchExpression - public static class r_casePart_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_casePart - // src/org/eclipse/xpand3/parser/Xpand3.g:208:1: r_casePart : 'case' r_expression ':' r_expression ; - public r_casePart_return r_casePart() throws RecognitionException { - r_casePart_return retval = new r_casePart_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal211=null; - Token char_literal213=null; - r_expression_return r_expression212 = null; - - r_expression_return r_expression214 = null; - - - Object string_literal211_tree=null; - Object char_literal213_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:207:1: r_casePart : 'case' r_expression ':' r_expression ; + public final void r_casePart() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:209:2: ( 'case' r_expression ':' r_expression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:209:2: 'case' r_expression ':' r_expression + /** START EDITED */ + ruleEntered("r_casePart"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:207:12: ( 'case' r_expression ':' r_expression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:208:2: 'case' r_expression ':' r_expression { - root_0 = (Object)adaptor.nil(); - - string_literal211=(Token)input.LT(1); - match(input,81,FOLLOW_81_in_r_casePart1093); if (failed) return retval; - if ( backtracking==0 ) { - string_literal211_tree = (Object)adaptor.create(string_literal211); - adaptor.addChild(root_0, string_literal211_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,81,FOLLOW_81_in_r_casePart1093); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_casePart1095); - r_expression212=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression212.getTree()); - char_literal213=(Token)input.LT(1); - match(input,61,FOLLOW_61_in_r_casePart1097); if (failed) return retval; - if ( backtracking==0 ) { - char_literal213_tree = (Object)adaptor.create(char_literal213); - adaptor.addChild(root_0, char_literal213_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,61,FOLLOW_61_in_r_casePart1097); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_casePart1099); - r_expression214=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression214.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_casePart"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_casePart - public static class r_orExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_orExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:211:1: r_orExpression : r_andExpression ( '||' r_andExpression )* ; - public r_orExpression_return r_orExpression() throws RecognitionException { - r_orExpression_return retval = new r_orExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal216=null; - r_andExpression_return r_andExpression215 = null; - - r_andExpression_return r_andExpression217 = null; - - - Object string_literal216_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:210:1: r_orExpression : r_andExpression ( '||' r_andExpression )* ; + public final void r_orExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:212:4: ( r_andExpression ( '||' r_andExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:212:4: r_andExpression ( '||' r_andExpression )* + /** START EDITED */ + ruleEntered("r_orExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:210:16: ( r_andExpression ( '||' r_andExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:211:4: r_andExpression ( '||' r_andExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_andExpression_in_r_orExpression1111); - r_andExpression215=r_andExpression(); + r_andExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_andExpression215.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:212:21: ( '||' r_andExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:211:21: ( '||' r_andExpression )* loop52: do { int alt52=2; @@ -4467,19 +3242,16 @@ public class Xpand3Parser extends Parser { switch (alt52) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:212:22: '||' r_andExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:211:22: '||' r_andExpression { - string_literal216=(Token)input.LT(1); - match(input,82,FOLLOW_82_in_r_orExpression1115); if (failed) return retval; - if ( backtracking==0 ) { - string_literal216_tree = (Object)adaptor.create(string_literal216); - adaptor.addChild(root_0, string_literal216_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,82,FOLLOW_82_in_r_orExpression1115); if (failed) return ; pushFollow(FOLLOW_r_andExpression_in_r_orExpression1117); - r_andExpression217=r_andExpression(); + r_andExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_andExpression217.getTree()); + if (failed) return ; } break; @@ -4492,56 +3264,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_orExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_orExpression - public static class r_andExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_andExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:215:1: r_andExpression : r_impliesExpression ( '&&' r_impliesExpression )* ; - public r_andExpression_return r_andExpression() throws RecognitionException { - r_andExpression_return retval = new r_andExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal219=null; - r_impliesExpression_return r_impliesExpression218 = null; - - r_impliesExpression_return r_impliesExpression220 = null; - - - Object string_literal219_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:214:1: r_andExpression : r_impliesExpression ( '&&' r_impliesExpression )* ; + public final void r_andExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:216:2: ( r_impliesExpression ( '&&' r_impliesExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:216:2: r_impliesExpression ( '&&' r_impliesExpression )* + /** START EDITED */ + ruleEntered("r_andExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:214:18: ( r_impliesExpression ( '&&' r_impliesExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:215:2: r_impliesExpression ( '&&' r_impliesExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression1132); - r_impliesExpression218=r_impliesExpression(); + r_impliesExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_impliesExpression218.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:216:23: ( '&&' r_impliesExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:215:23: ( '&&' r_impliesExpression )* loop53: do { int alt53=2; @@ -4554,19 +3306,16 @@ public class Xpand3Parser extends Parser { switch (alt53) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:216:24: '&&' r_impliesExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:215:24: '&&' r_impliesExpression { - string_literal219=(Token)input.LT(1); - match(input,83,FOLLOW_83_in_r_andExpression1136); if (failed) return retval; - if ( backtracking==0 ) { - string_literal219_tree = (Object)adaptor.create(string_literal219); - adaptor.addChild(root_0, string_literal219_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,83,FOLLOW_83_in_r_andExpression1136); if (failed) return ; pushFollow(FOLLOW_r_impliesExpression_in_r_andExpression1138); - r_impliesExpression220=r_impliesExpression(); + r_impliesExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_impliesExpression220.getTree()); + if (failed) return ; } break; @@ -4579,56 +3328,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_andExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_andExpression - public static class r_impliesExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_impliesExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:219:1: r_impliesExpression : r_relationalExpression ( 'implies' r_relationalExpression )* ; - public r_impliesExpression_return r_impliesExpression() throws RecognitionException { - r_impliesExpression_return retval = new r_impliesExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal222=null; - r_relationalExpression_return r_relationalExpression221 = null; - - r_relationalExpression_return r_relationalExpression223 = null; - - - Object string_literal222_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:218:1: r_impliesExpression : r_relationalExpression ( 'implies' r_relationalExpression )* ; + public final void r_impliesExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:220:2: ( r_relationalExpression ( 'implies' r_relationalExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:220:2: r_relationalExpression ( 'implies' r_relationalExpression )* + /** START EDITED */ + ruleEntered("r_impliesExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:218:21: ( r_relationalExpression ( 'implies' r_relationalExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:219:2: r_relationalExpression ( 'implies' r_relationalExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression1153); - r_relationalExpression221=r_relationalExpression(); + r_relationalExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_relationalExpression221.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:220:26: ( 'implies' r_relationalExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:219:26: ( 'implies' r_relationalExpression )* loop54: do { int alt54=2; @@ -4641,19 +3370,16 @@ public class Xpand3Parser extends Parser { switch (alt54) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:220:27: 'implies' r_relationalExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:219:27: 'implies' r_relationalExpression { - string_literal222=(Token)input.LT(1); - match(input,84,FOLLOW_84_in_r_impliesExpression1157); if (failed) return retval; - if ( backtracking==0 ) { - string_literal222_tree = (Object)adaptor.create(string_literal222); - adaptor.addChild(root_0, string_literal222_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,84,FOLLOW_84_in_r_impliesExpression1157); if (failed) return ; pushFollow(FOLLOW_r_relationalExpression_in_r_impliesExpression1159); - r_relationalExpression223=r_relationalExpression(); + r_relationalExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_relationalExpression223.getTree()); + if (failed) return ; } break; @@ -4666,56 +3392,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_impliesExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_impliesExpression - public static class r_relationalExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_relationalExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:223:1: r_relationalExpression : r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* ; - public r_relationalExpression_return r_relationalExpression() throws RecognitionException { - r_relationalExpression_return retval = new r_relationalExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set225=null; - r_additiveExpression_return r_additiveExpression224 = null; - - r_additiveExpression_return r_additiveExpression226 = null; - - - Object set225_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:222:1: r_relationalExpression : r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* ; + public final void r_relationalExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:224:2: ( r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:224:2: r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* + /** START EDITED */ + ruleEntered("r_relationalExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:222:24: ( r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:223:2: r_additiveExpression ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression1175); - r_additiveExpression224=r_additiveExpression(); + r_additiveExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_additiveExpression224.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:225:2: ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:224:2: ( ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression )* loop55: do { int alt55=2; @@ -4728,26 +3434,23 @@ public class Xpand3Parser extends Parser { switch (alt55) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:225:3: ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:224:3: ( '==' | '!=' | '>=' | '<=' | '>' | '<' ) r_additiveExpression { - set225=(Token)input.LT(1); if ( (input.LA(1)>=85 && input.LA(1)<=90) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set225)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_relationalExpression1180); throw mse; } pushFollow(FOLLOW_r_additiveExpression_in_r_relationalExpression1204); - r_additiveExpression226=r_additiveExpression(); + r_additiveExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_additiveExpression226.getTree()); + if (failed) return ; } break; @@ -4760,56 +3463,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_relationalExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_relationalExpression - public static class r_additiveExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_additiveExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:228:1: r_additiveExpression : r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* ; - public r_additiveExpression_return r_additiveExpression() throws RecognitionException { - r_additiveExpression_return retval = new r_additiveExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set228=null; - r_multiplicativeExpression_return r_multiplicativeExpression227 = null; - - r_multiplicativeExpression_return r_multiplicativeExpression229 = null; - - - Object set228_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:227:1: r_additiveExpression : r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* ; + public final void r_additiveExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:229:2: ( r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:229:2: r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* + /** START EDITED */ + ruleEntered("r_additiveExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:227:22: ( r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:228:2: r_multiplicativeExpression ( ( '+' | '-' ) r_multiplicativeExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression1217); - r_multiplicativeExpression227=r_multiplicativeExpression(); + r_multiplicativeExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_multiplicativeExpression227.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:230:4: ( ( '+' | '-' ) r_multiplicativeExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:229:4: ( ( '+' | '-' ) r_multiplicativeExpression )* loop56: do { int alt56=2; @@ -4831,26 +3514,23 @@ public class Xpand3Parser extends Parser { switch (alt56) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:230:5: ( '+' | '-' ) r_multiplicativeExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:229:5: ( '+' | '-' ) r_multiplicativeExpression { - set228=(Token)input.LT(1); if ( input.LA(1)==36||input.LA(1)==91 ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set228)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_additiveExpression1224); throw mse; } pushFollow(FOLLOW_r_multiplicativeExpression_in_r_additiveExpression1231); - r_multiplicativeExpression229=r_multiplicativeExpression(); + r_multiplicativeExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_multiplicativeExpression229.getTree()); + if (failed) return ; } break; @@ -4863,56 +3543,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_additiveExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_additiveExpression - public static class r_multiplicativeExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_multiplicativeExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:233:1: r_multiplicativeExpression : r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* ; - public r_multiplicativeExpression_return r_multiplicativeExpression() throws RecognitionException { - r_multiplicativeExpression_return retval = new r_multiplicativeExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set231=null; - r_unaryExpression_return r_unaryExpression230 = null; - - r_unaryExpression_return r_unaryExpression232 = null; - - - Object set231_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:232:1: r_multiplicativeExpression : r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* ; + public final void r_multiplicativeExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:234:2: ( r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:234:2: r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* + /** START EDITED */ + ruleEntered("r_multiplicativeExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:232:28: ( r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:233:2: r_unaryExpression ( ( '*' | '/' ) r_unaryExpression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression1244); - r_unaryExpression230=r_unaryExpression(); + r_unaryExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_unaryExpression230.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:235:2: ( ( '*' | '/' ) r_unaryExpression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:234:2: ( ( '*' | '/' ) r_unaryExpression )* loop57: do { int alt57=2; @@ -4925,26 +3585,23 @@ public class Xpand3Parser extends Parser { switch (alt57) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:235:3: ( '*' | '/' ) r_unaryExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:234:3: ( '*' | '/' ) r_unaryExpression { - set231=(Token)input.LT(1); if ( input.LA(1)==33||input.LA(1)==92 ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set231)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_multiplicativeExpression1249); throw mse; } pushFollow(FOLLOW_r_unaryExpression_in_r_multiplicativeExpression1257); - r_unaryExpression232=r_unaryExpression(); + r_unaryExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_unaryExpression232.getTree()); + if (failed) return ; } break; @@ -4957,50 +3614,29 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_multiplicativeExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_multiplicativeExpression - public static class r_unaryExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_unaryExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:239:1: r_unaryExpression : ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression ); - public r_unaryExpression_return r_unaryExpression() throws RecognitionException { - r_unaryExpression_return retval = new r_unaryExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal234=null; - Token char_literal236=null; - r_infixExpression_return r_infixExpression233 = null; - - r_infixExpression_return r_infixExpression235 = null; - - r_infixExpression_return r_infixExpression237 = null; - - - Object char_literal234_tree=null; - Object char_literal236_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:238:1: r_unaryExpression : ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression ); + public final void r_unaryExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:240:2: ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression ) + /** START EDITED */ + ruleEntered("r_unaryExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:238:19: ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression ) int alt58=3; switch ( input.LA(1) ) { case StringLiteral: @@ -5040,117 +3676,84 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("239:1: r_unaryExpression : ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression );", 58, 0, input); + new NoViableAltException("238:1: r_unaryExpression : ( r_infixExpression | '!' r_infixExpression | '-' r_infixExpression );", 58, 0, input); throw nvae; } switch (alt58) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:240:2: r_infixExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:239:2: r_infixExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression1271); - r_infixExpression233=r_infixExpression(); + r_infixExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_infixExpression233.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:241:3: '!' r_infixExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:240:3: '!' r_infixExpression { - root_0 = (Object)adaptor.nil(); - - char_literal234=(Token)input.LT(1); - match(input,93,FOLLOW_93_in_r_unaryExpression1276); if (failed) return retval; - if ( backtracking==0 ) { - char_literal234_tree = (Object)adaptor.create(char_literal234); - adaptor.addChild(root_0, char_literal234_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,93,FOLLOW_93_in_r_unaryExpression1276); if (failed) return ; pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression1278); - r_infixExpression235=r_infixExpression(); + r_infixExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_infixExpression235.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:242:3: '-' r_infixExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:241:3: '-' r_infixExpression { - root_0 = (Object)adaptor.nil(); - - char_literal236=(Token)input.LT(1); - match(input,36,FOLLOW_36_in_r_unaryExpression1283); if (failed) return retval; - if ( backtracking==0 ) { - char_literal236_tree = (Object)adaptor.create(char_literal236); - adaptor.addChild(root_0, char_literal236_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,36,FOLLOW_36_in_r_unaryExpression1283); if (failed) return ; pushFollow(FOLLOW_r_infixExpression_in_r_unaryExpression1285); - r_infixExpression237=r_infixExpression(); + r_infixExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_infixExpression237.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_unaryExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_unaryExpression - public static class r_infixExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_infixExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:245:1: r_infixExpression : r_primaryExpression ( '.' r_featureCall )* ; - public r_infixExpression_return r_infixExpression() throws RecognitionException { - r_infixExpression_return retval = new r_infixExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal239=null; - r_primaryExpression_return r_primaryExpression238 = null; - - r_featureCall_return r_featureCall240 = null; - - - Object char_literal239_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:244:1: r_infixExpression : r_primaryExpression ( '.' r_featureCall )* ; + public final void r_infixExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:246:2: ( r_primaryExpression ( '.' r_featureCall )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:246:2: r_primaryExpression ( '.' r_featureCall )* + /** START EDITED */ + ruleEntered("r_infixExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:244:19: ( r_primaryExpression ( '.' r_featureCall )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:245:2: r_primaryExpression ( '.' r_featureCall )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_primaryExpression_in_r_infixExpression1296); - r_primaryExpression238=r_primaryExpression(); + r_primaryExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_primaryExpression238.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:246:23: ( '.' r_featureCall )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:245:23: ( '.' r_featureCall )* loop59: do { int alt59=2; @@ -5163,19 +3766,16 @@ public class Xpand3Parser extends Parser { switch (alt59) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:246:25: '.' r_featureCall + // src/org/eclipse/xpand3/parser/Xpand3.g:245:25: '.' r_featureCall { - char_literal239=(Token)input.LT(1); - match(input,68,FOLLOW_68_in_r_infixExpression1301); if (failed) return retval; - if ( backtracking==0 ) { - char_literal239_tree = (Object)adaptor.create(char_literal239); - adaptor.addChild(root_0, char_literal239_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,68,FOLLOW_68_in_r_infixExpression1301); if (failed) return ; pushFollow(FOLLOW_r_featureCall_in_r_infixExpression1303); - r_featureCall240=r_featureCall(); + r_featureCall(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_featureCall240.getTree()); + if (failed) return ; } break; @@ -5188,58 +3788,29 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_infixExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_infixExpression - public static class r_primaryExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_primaryExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:249:1: r_primaryExpression : ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression ); - public r_primaryExpression_return r_primaryExpression() throws RecognitionException { - r_primaryExpression_return retval = new r_primaryExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token StringLiteral241=null; - r_featureCall_return r_featureCall242 = null; - - r_booleanLiteral_return r_booleanLiteral243 = null; - - r_numberLiteral_return r_numberLiteral244 = null; - - r_nullLiteral_return r_nullLiteral245 = null; - - r_listLiteral_return r_listLiteral246 = null; - - r_constructorCall_return r_constructorCall247 = null; - - r_globalVarExpression_return r_globalVarExpression248 = null; - - r_paranthesizedExpression_return r_paranthesizedExpression249 = null; - - - Object StringLiteral241_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:248:1: r_primaryExpression : ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression ); + public final void r_primaryExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:250:4: ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression ) + /** START EDITED */ + ruleEntered("r_primaryExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:248:23: ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression ) int alt60=9; switch ( input.LA(1) ) { case StringLiteral: @@ -5301,300 +3872,205 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("249:1: r_primaryExpression : ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression );", 60, 0, input); + new NoViableAltException("248:1: r_primaryExpression : ( StringLiteral | r_featureCall | r_booleanLiteral | r_numberLiteral | r_nullLiteral | r_listLiteral | r_constructorCall | r_globalVarExpression | r_paranthesizedExpression );", 60, 0, input); throw nvae; } switch (alt60) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:250:4: StringLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:249:4: StringLiteral { - root_0 = (Object)adaptor.nil(); - - StringLiteral241=(Token)input.LT(1); - match(input,StringLiteral,FOLLOW_StringLiteral_in_r_primaryExpression1321); if (failed) return retval; - if ( backtracking==0 ) { - StringLiteral241_tree = (Object)adaptor.create(StringLiteral241); - adaptor.addChild(root_0, StringLiteral241_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,StringLiteral,FOLLOW_StringLiteral_in_r_primaryExpression1321); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:251:5: r_featureCall + // src/org/eclipse/xpand3/parser/Xpand3.g:250:5: r_featureCall { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_featureCall_in_r_primaryExpression1329); - r_featureCall242=r_featureCall(); + r_featureCall(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_featureCall242.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:252:5: r_booleanLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:251:5: r_booleanLiteral { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_booleanLiteral_in_r_primaryExpression1336); - r_booleanLiteral243=r_booleanLiteral(); + r_booleanLiteral(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_booleanLiteral243.getTree()); + if (failed) return ; } break; case 4 : - // src/org/eclipse/xpand3/parser/Xpand3.g:253:5: r_numberLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:252:5: r_numberLiteral { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_numberLiteral_in_r_primaryExpression1343); - r_numberLiteral244=r_numberLiteral(); + r_numberLiteral(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_numberLiteral244.getTree()); + if (failed) return ; } break; case 5 : - // src/org/eclipse/xpand3/parser/Xpand3.g:254:5: r_nullLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:253:5: r_nullLiteral { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_nullLiteral_in_r_primaryExpression1350); - r_nullLiteral245=r_nullLiteral(); + r_nullLiteral(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_nullLiteral245.getTree()); + if (failed) return ; } break; case 6 : - // src/org/eclipse/xpand3/parser/Xpand3.g:255:5: r_listLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:254:5: r_listLiteral { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_listLiteral_in_r_primaryExpression1357); - r_listLiteral246=r_listLiteral(); + r_listLiteral(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_listLiteral246.getTree()); + if (failed) return ; } break; case 7 : - // src/org/eclipse/xpand3/parser/Xpand3.g:256:5: r_constructorCall + // src/org/eclipse/xpand3/parser/Xpand3.g:255:5: r_constructorCall { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_constructorCall_in_r_primaryExpression1364); - r_constructorCall247=r_constructorCall(); + r_constructorCall(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_constructorCall247.getTree()); + if (failed) return ; } break; case 8 : - // src/org/eclipse/xpand3/parser/Xpand3.g:257:5: r_globalVarExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:256:5: r_globalVarExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_globalVarExpression_in_r_primaryExpression1371); - r_globalVarExpression248=r_globalVarExpression(); + r_globalVarExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_globalVarExpression248.getTree()); + if (failed) return ; } break; case 9 : - // src/org/eclipse/xpand3/parser/Xpand3.g:258:5: r_paranthesizedExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:257:5: r_paranthesizedExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_paranthesizedExpression_in_r_primaryExpression1378); - r_paranthesizedExpression249=r_paranthesizedExpression(); + r_paranthesizedExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_paranthesizedExpression249.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_primaryExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_primaryExpression - public static class r_paranthesizedExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_paranthesizedExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:261:1: r_paranthesizedExpression : '(' r_expression ')' ; - public r_paranthesizedExpression_return r_paranthesizedExpression() throws RecognitionException { - r_paranthesizedExpression_return retval = new r_paranthesizedExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal250=null; - Token char_literal252=null; - r_expression_return r_expression251 = null; - - - Object char_literal250_tree=null; - Object char_literal252_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:260:1: r_paranthesizedExpression : '(' r_expression ')' ; + public final void r_paranthesizedExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:262:5: ( '(' r_expression ')' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:262:5: '(' r_expression ')' + /** START EDITED */ + ruleEntered("r_paranthesizedExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:260:27: ( '(' r_expression ')' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:261:5: '(' r_expression ')' { - root_0 = (Object)adaptor.nil(); - - char_literal250=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_paranthesizedExpression1392); if (failed) return retval; - if ( backtracking==0 ) { - char_literal250_tree = (Object)adaptor.create(char_literal250); - adaptor.addChild(root_0, char_literal250_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_paranthesizedExpression1392); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_paranthesizedExpression1394); - r_expression251=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression251.getTree()); - char_literal252=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_paranthesizedExpression1396); if (failed) return retval; - if ( backtracking==0 ) { - char_literal252_tree = (Object)adaptor.create(char_literal252); - adaptor.addChild(root_0, char_literal252_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_paranthesizedExpression1396); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_paranthesizedExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_paranthesizedExpression - public static class r_globalVarExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_globalVarExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:265:1: r_globalVarExpression : 'GLOBALVAR' r_identifier ; - public r_globalVarExpression_return r_globalVarExpression() throws RecognitionException { - r_globalVarExpression_return retval = new r_globalVarExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal253=null; - r_identifier_return r_identifier254 = null; - - - Object string_literal253_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:264:1: r_globalVarExpression : 'GLOBALVAR' r_identifier ; + public final void r_globalVarExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:266:5: ( 'GLOBALVAR' r_identifier ) - // src/org/eclipse/xpand3/parser/Xpand3.g:266:5: 'GLOBALVAR' r_identifier + /** START EDITED */ + ruleEntered("r_globalVarExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:264:24: ( 'GLOBALVAR' r_identifier ) + // src/org/eclipse/xpand3/parser/Xpand3.g:265:5: 'GLOBALVAR' r_identifier { - root_0 = (Object)adaptor.nil(); - - string_literal253=(Token)input.LT(1); - match(input,94,FOLLOW_94_in_r_globalVarExpression1411); if (failed) return retval; - if ( backtracking==0 ) { - string_literal253_tree = (Object)adaptor.create(string_literal253); - adaptor.addChild(root_0, string_literal253_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,94,FOLLOW_94_in_r_globalVarExpression1411); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_globalVarExpression1413); - r_identifier254=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier254.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_globalVarExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_globalVarExpression - public static class r_featureCall_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_featureCall - // src/org/eclipse/xpand3/parser/Xpand3.g:268:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression ); - public r_featureCall_return r_featureCall() throws RecognitionException { - r_featureCall_return retval = new r_featureCall_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal256=null; - Token char_literal258=null; - r_identifier_return r_identifier255 = null; - - r_parameterList_return r_parameterList257 = null; - - r_type_return r_type259 = null; - - r_collectionExpression_return r_collectionExpression260 = null; - - - Object char_literal256_tree=null; - Object char_literal258_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:267:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression ); + public final void r_featureCall() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:269:5: ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression ) + /** START EDITED */ + ruleEntered("r_featureCall"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:267:16: ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression ) int alt62=3; switch ( input.LA(1) ) { case Identifier: @@ -5608,9 +4084,9 @@ public class Xpand3Parser extends Parser { alt62=1; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("268:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression );", 62, 1, input); + new NoViableAltException("267:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression );", 62, 1, input); throw nvae; } @@ -5637,31 +4113,26 @@ public class Xpand3Parser extends Parser { } break; default: - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("268:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression );", 62, 0, input); + new NoViableAltException("267:1: r_featureCall : ( r_identifier '(' ( r_parameterList )? ')' | r_type | r_collectionExpression );", 62, 0, input); throw nvae; } switch (alt62) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:269:5: r_identifier '(' ( r_parameterList )? ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:268:5: r_identifier '(' ( r_parameterList )? ')' { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_identifier_in_r_featureCall1427); - r_identifier255=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier255.getTree()); - char_literal256=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_featureCall1429); if (failed) return retval; - if ( backtracking==0 ) { - char_literal256_tree = (Object)adaptor.create(char_literal256); - adaptor.addChild(root_0, char_literal256_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:269:22: ( r_parameterList )? + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_featureCall1429); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:268:22: ( r_parameterList )? int alt61=2; int LA61_0 = input.LA(1); @@ -5670,111 +4141,77 @@ public class Xpand3Parser extends Parser { } switch (alt61) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:269:23: r_parameterList + // src/org/eclipse/xpand3/parser/Xpand3.g:268:23: r_parameterList { pushFollow(FOLLOW_r_parameterList_in_r_featureCall1432); - r_parameterList257=r_parameterList(); + r_parameterList(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_parameterList257.getTree()); + if (failed) return ; } break; } - char_literal258=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_featureCall1436); if (failed) return retval; - if ( backtracking==0 ) { - char_literal258_tree = (Object)adaptor.create(char_literal258); - adaptor.addChild(root_0, char_literal258_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_featureCall1436); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:270:5: r_type + // src/org/eclipse/xpand3/parser/Xpand3.g:269:5: r_type { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_type_in_r_featureCall1443); - r_type259=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type259.getTree()); + if (failed) return ; } break; case 3 : - // src/org/eclipse/xpand3/parser/Xpand3.g:271:5: r_collectionExpression + // src/org/eclipse/xpand3/parser/Xpand3.g:270:5: r_collectionExpression { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_collectionExpression_in_r_featureCall1451); - r_collectionExpression260=r_collectionExpression(); + r_collectionExpression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_collectionExpression260.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_featureCall"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_featureCall - public static class r_listLiteral_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_listLiteral - // src/org/eclipse/xpand3/parser/Xpand3.g:274:1: r_listLiteral : '[' ( r_expression ( ',' r_expression )* )? ']' ; - public r_listLiteral_return r_listLiteral() throws RecognitionException { - r_listLiteral_return retval = new r_listLiteral_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal261=null; - Token char_literal263=null; - Token char_literal265=null; - r_expression_return r_expression262 = null; - - r_expression_return r_expression264 = null; - - - Object char_literal261_tree=null; - Object char_literal263_tree=null; - Object char_literal265_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:273:1: r_listLiteral : '[' ( r_expression ( ',' r_expression )* )? ']' ; + public final void r_listLiteral() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:275:2: ( '[' ( r_expression ( ',' r_expression )* )? ']' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:275:2: '[' ( r_expression ( ',' r_expression )* )? ']' + /** START EDITED */ + ruleEntered("r_listLiteral"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:273:16: ( '[' ( r_expression ( ',' r_expression )* )? ']' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:274:2: '[' ( r_expression ( ',' r_expression )* )? ']' { - root_0 = (Object)adaptor.nil(); - - char_literal261=(Token)input.LT(1); - match(input,95,FOLLOW_95_in_r_listLiteral1463); if (failed) return retval; - if ( backtracking==0 ) { - char_literal261_tree = (Object)adaptor.create(char_literal261); - adaptor.addChild(root_0, char_literal261_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:275:5: ( r_expression ( ',' r_expression )* )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,95,FOLLOW_95_in_r_listLiteral1463); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:274:5: ( r_expression ( ',' r_expression )* )? int alt64=2; int LA64_0 = input.LA(1); @@ -5783,14 +4220,13 @@ public class Xpand3Parser extends Parser { } switch (alt64) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:275:6: r_expression ( ',' r_expression )* + // src/org/eclipse/xpand3/parser/Xpand3.g:274:6: r_expression ( ',' r_expression )* { pushFollow(FOLLOW_r_expression_in_r_listLiteral1465); - r_expression262=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression262.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:275:19: ( ',' r_expression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:274:19: ( ',' r_expression )* loop63: do { int alt63=2; @@ -5803,19 +4239,16 @@ public class Xpand3Parser extends Parser { switch (alt63) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:275:20: ',' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:274:20: ',' r_expression { - char_literal263=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_listLiteral1468); if (failed) return retval; - if ( backtracking==0 ) { - char_literal263_tree = (Object)adaptor.create(char_literal263); - adaptor.addChild(root_0, char_literal263_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_listLiteral1468); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_listLiteral1470); - r_expression264=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression264.getTree()); + if (failed) return ; } break; @@ -5831,119 +4264,80 @@ public class Xpand3Parser extends Parser { } - char_literal265=(Token)input.LT(1); - match(input,96,FOLLOW_96_in_r_listLiteral1475); if (failed) return retval; - if ( backtracking==0 ) { - char_literal265_tree = (Object)adaptor.create(char_literal265); - adaptor.addChild(root_0, char_literal265_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,96,FOLLOW_96_in_r_listLiteral1475); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_listLiteral"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_listLiteral - public static class r_constructorCall_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_constructorCall - // src/org/eclipse/xpand3/parser/Xpand3.g:278:1: r_constructorCall : 'new' r_simpleType ; - public r_constructorCall_return r_constructorCall() throws RecognitionException { - r_constructorCall_return retval = new r_constructorCall_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal266=null; - r_simpleType_return r_simpleType267 = null; - - - Object string_literal266_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:277:1: r_constructorCall : 'new' r_simpleType ; + public final void r_constructorCall() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:279:2: ( 'new' r_simpleType ) - // src/org/eclipse/xpand3/parser/Xpand3.g:279:2: 'new' r_simpleType + /** START EDITED */ + ruleEntered("r_constructorCall"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:277:20: ( 'new' r_simpleType ) + // src/org/eclipse/xpand3/parser/Xpand3.g:278:2: 'new' r_simpleType { - root_0 = (Object)adaptor.nil(); - - string_literal266=(Token)input.LT(1); - match(input,97,FOLLOW_97_in_r_constructorCall1486); if (failed) return retval; - if ( backtracking==0 ) { - string_literal266_tree = (Object)adaptor.create(string_literal266); - adaptor.addChild(root_0, string_literal266_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,97,FOLLOW_97_in_r_constructorCall1486); if (failed) return ; pushFollow(FOLLOW_r_simpleType_in_r_constructorCall1488); - r_simpleType267=r_simpleType(); + r_simpleType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_simpleType267.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_constructorCall"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_constructorCall - public static class r_booleanLiteral_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_booleanLiteral - // src/org/eclipse/xpand3/parser/Xpand3.g:283:1: r_booleanLiteral : ( 'false' | 'true' ); - public r_booleanLiteral_return r_booleanLiteral() throws RecognitionException { - r_booleanLiteral_return retval = new r_booleanLiteral_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set268=null; - - Object set268_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:282:1: r_booleanLiteral : ( 'false' | 'true' ); + public final void r_booleanLiteral() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:284:2: ( 'false' | 'true' ) + /** START EDITED */ + ruleEntered("r_booleanLiteral"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:282:19: ( 'false' | 'true' ) // src/org/eclipse/xpand3/parser/Xpand3.g: { - root_0 = (Object)adaptor.nil(); - - set268=(Token)input.LT(1); if ( (input.LA(1)>=98 && input.LA(1)<=99) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set268)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_booleanLiteral0); throw mse; @@ -5952,97 +4346,61 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_booleanLiteral"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_booleanLiteral - public static class r_nullLiteral_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_nullLiteral - // src/org/eclipse/xpand3/parser/Xpand3.g:287:1: r_nullLiteral : 'null' ; - public r_nullLiteral_return r_nullLiteral() throws RecognitionException { - r_nullLiteral_return retval = new r_nullLiteral_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal269=null; - - Object string_literal269_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:286:1: r_nullLiteral : 'null' ; + public final void r_nullLiteral() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:288:2: ( 'null' ) - // src/org/eclipse/xpand3/parser/Xpand3.g:288:2: 'null' + /** START EDITED */ + ruleEntered("r_nullLiteral"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:286:16: ( 'null' ) + // src/org/eclipse/xpand3/parser/Xpand3.g:287:2: 'null' { - root_0 = (Object)adaptor.nil(); - - string_literal269=(Token)input.LT(1); - match(input,100,FOLLOW_100_in_r_nullLiteral1514); if (failed) return retval; - if ( backtracking==0 ) { - string_literal269_tree = (Object)adaptor.create(string_literal269); - adaptor.addChild(root_0, string_literal269_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,100,FOLLOW_100_in_r_nullLiteral1514); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_nullLiteral"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_nullLiteral - public static class r_numberLiteral_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_numberLiteral - // src/org/eclipse/xpand3/parser/Xpand3.g:291:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral ); - public r_numberLiteral_return r_numberLiteral() throws RecognitionException { - r_numberLiteral_return retval = new r_numberLiteral_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token IntLiteral270=null; - Token IntLiteral271=null; - Token char_literal272=null; - Token IntLiteral273=null; - - Object IntLiteral270_tree=null; - Object IntLiteral271_tree=null; - Object char_literal272_tree=null; - Object IntLiteral273_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:290:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral ); + public final void r_numberLiteral() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:292:4: ( IntLiteral | IntLiteral '.' IntLiteral ) + /** START EDITED */ + ruleEntered("r_numberLiteral"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:290:18: ( IntLiteral | IntLiteral '.' IntLiteral ) int alt65=2; int LA65_0 = input.LA(1); @@ -6059,9 +4417,9 @@ public class Xpand3Parser extends Parser { alt65=1; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("291:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 2, input); + new NoViableAltException("290:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 2, input); throw nvae; } @@ -6070,117 +4428,74 @@ public class Xpand3Parser extends Parser { alt65=1; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("291:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 1, input); + new NoViableAltException("290:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 1, input); throw nvae; } } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("291:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 0, input); + new NoViableAltException("290:1: r_numberLiteral : ( IntLiteral | IntLiteral '.' IntLiteral );", 65, 0, input); throw nvae; } switch (alt65) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:292:4: IntLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:291:4: IntLiteral { - root_0 = (Object)adaptor.nil(); - - IntLiteral270=(Token)input.LT(1); - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1527); if (failed) return retval; - if ( backtracking==0 ) { - IntLiteral270_tree = (Object)adaptor.create(IntLiteral270); - adaptor.addChild(root_0, IntLiteral270_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1527); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:293:4: IntLiteral '.' IntLiteral + // src/org/eclipse/xpand3/parser/Xpand3.g:292:4: IntLiteral '.' IntLiteral { - root_0 = (Object)adaptor.nil(); - - IntLiteral271=(Token)input.LT(1); - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1533); if (failed) return retval; - if ( backtracking==0 ) { - IntLiteral271_tree = (Object)adaptor.create(IntLiteral271); - adaptor.addChild(root_0, IntLiteral271_tree); - } - char_literal272=(Token)input.LT(1); - match(input,68,FOLLOW_68_in_r_numberLiteral1535); if (failed) return retval; - if ( backtracking==0 ) { - char_literal272_tree = (Object)adaptor.create(char_literal272); - adaptor.addChild(root_0, char_literal272_tree); - } - IntLiteral273=(Token)input.LT(1); - match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1537); if (failed) return retval; - if ( backtracking==0 ) { - IntLiteral273_tree = (Object)adaptor.create(IntLiteral273); - adaptor.addChild(root_0, IntLiteral273_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1533); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,68,FOLLOW_68_in_r_numberLiteral1535); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,IntLiteral,FOLLOW_IntLiteral_in_r_numberLiteral1537); if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_numberLiteral"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_numberLiteral - public static class r_collectionExpression_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_collectionExpression - // src/org/eclipse/xpand3/parser/Xpand3.g:296:1: r_collectionExpression : ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' ); - public r_collectionExpression_return r_collectionExpression() throws RecognitionException { - r_collectionExpression_return retval = new r_collectionExpression_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal274=null; - Token char_literal275=null; - Token char_literal277=null; - Token set278=null; - Token char_literal279=null; - Token char_literal281=null; - Token char_literal283=null; - r_type_return r_type276 = null; - - r_identifier_return r_identifier280 = null; - - r_expression_return r_expression282 = null; - - - Object string_literal274_tree=null; - Object char_literal275_tree=null; - Object char_literal277_tree=null; - Object set278_tree=null; - Object char_literal279_tree=null; - Object char_literal281_tree=null; - Object char_literal283_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:295:1: r_collectionExpression : ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' ); + public final void r_collectionExpression() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:297:3: ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' ) + /** START EDITED */ + ruleEntered("r_collectionExpression"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:295:25: ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' ) int alt67=2; int LA67_0 = input.LA(1); @@ -6191,69 +4506,54 @@ public class Xpand3Parser extends Parser { alt67=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("296:1: r_collectionExpression : ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' );", 67, 0, input); + new NoViableAltException("295:1: r_collectionExpression : ( 'typeSelect' '(' r_type ')' | ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' );", 67, 0, input); throw nvae; } switch (alt67) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:297:3: 'typeSelect' '(' r_type ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:296:3: 'typeSelect' '(' r_type ')' { - root_0 = (Object)adaptor.nil(); - - string_literal274=(Token)input.LT(1); - match(input,101,FOLLOW_101_in_r_collectionExpression1550); if (failed) return retval; - if ( backtracking==0 ) { - string_literal274_tree = (Object)adaptor.create(string_literal274); - adaptor.addChild(root_0, string_literal274_tree); - } - char_literal275=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_collectionExpression1554); if (failed) return retval; - if ( backtracking==0 ) { - char_literal275_tree = (Object)adaptor.create(char_literal275); - adaptor.addChild(root_0, char_literal275_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,101,FOLLOW_101_in_r_collectionExpression1550); if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_collectionExpression1554); if (failed) return ; pushFollow(FOLLOW_r_type_in_r_collectionExpression1556); - r_type276=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type276.getTree()); - char_literal277=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_collectionExpression1558); if (failed) return retval; - if ( backtracking==0 ) { - char_literal277_tree = (Object)adaptor.create(char_literal277); - adaptor.addChild(root_0, char_literal277_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_collectionExpression1558); if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:300:4: ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' + // src/org/eclipse/xpand3/parser/Xpand3.g:299:4: ( 'collect' | 'select' | 'selectFirst' | 'reject' | 'exists' | 'notExists' | 'sortBy' | 'forAll' ) '(' ( r_identifier '|' )? r_expression ')' { - root_0 = (Object)adaptor.nil(); - - set278=(Token)input.LT(1); if ( (input.LA(1)>=102 && input.LA(1)<=109) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set278)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_collectionExpression1567); throw mse; } - char_literal279=(Token)input.LT(1); - match(input,31,FOLLOW_31_in_r_collectionExpression1617); if (failed) return retval; - if ( backtracking==0 ) { - char_literal279_tree = (Object)adaptor.create(char_literal279); - adaptor.addChild(root_0, char_literal279_tree); - } - // src/org/eclipse/xpand3/parser/Xpand3.g:307:19: ( r_identifier '|' )? + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,31,FOLLOW_31_in_r_collectionExpression1617); if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:306:19: ( r_identifier '|' )? int alt66=2; int LA66_0 = input.LA(1); @@ -6266,19 +4566,16 @@ public class Xpand3Parser extends Parser { } switch (alt66) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:307:20: r_identifier '|' + // src/org/eclipse/xpand3/parser/Xpand3.g:306:20: r_identifier '|' { pushFollow(FOLLOW_r_identifier_in_r_collectionExpression1620); - r_identifier280=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier280.getTree()); - char_literal281=(Token)input.LT(1); - match(input,110,FOLLOW_110_in_r_collectionExpression1622); if (failed) return retval; - if ( backtracking==0 ) { - char_literal281_tree = (Object)adaptor.create(char_literal281); - adaptor.addChild(root_0, char_literal281_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,110,FOLLOW_110_in_r_collectionExpression1622); if (failed) return ; } break; @@ -6286,71 +4583,48 @@ public class Xpand3Parser extends Parser { } pushFollow(FOLLOW_r_expression_in_r_collectionExpression1626); - r_expression282=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression282.getTree()); - char_literal283=(Token)input.LT(1); - match(input,34,FOLLOW_34_in_r_collectionExpression1628); if (failed) return retval; - if ( backtracking==0 ) { - char_literal283_tree = (Object)adaptor.create(char_literal283); - adaptor.addChild(root_0, char_literal283_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,34,FOLLOW_34_in_r_collectionExpression1628); if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_collectionExpression"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_collectionExpression - public static class r_declaredParameterList_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_declaredParameterList - // src/org/eclipse/xpand3/parser/Xpand3.g:313:1: r_declaredParameterList : r_declaredParameter ( ',' r_declaredParameter )* ; - public r_declaredParameterList_return r_declaredParameterList() throws RecognitionException { - r_declaredParameterList_return retval = new r_declaredParameterList_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal285=null; - r_declaredParameter_return r_declaredParameter284 = null; - - r_declaredParameter_return r_declaredParameter286 = null; - - - Object char_literal285_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:312:1: r_declaredParameterList : r_declaredParameter ( ',' r_declaredParameter )* ; + public final void r_declaredParameterList() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:314:2: ( r_declaredParameter ( ',' r_declaredParameter )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:314:2: r_declaredParameter ( ',' r_declaredParameter )* + /** START EDITED */ + ruleEntered("r_declaredParameterList"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:312:26: ( r_declaredParameter ( ',' r_declaredParameter )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:313:2: r_declaredParameter ( ',' r_declaredParameter )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList1645); - r_declaredParameter284=r_declaredParameter(); + r_declaredParameter(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameter284.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:314:22: ( ',' r_declaredParameter )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:313:22: ( ',' r_declaredParameter )* loop68: do { int alt68=2; @@ -6369,19 +4643,16 @@ public class Xpand3Parser extends Parser { switch (alt68) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:314:23: ',' r_declaredParameter + // src/org/eclipse/xpand3/parser/Xpand3.g:313:23: ',' r_declaredParameter { - char_literal285=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_declaredParameterList1648); if (failed) return retval; - if ( backtracking==0 ) { - char_literal285_tree = (Object)adaptor.create(char_literal285); - adaptor.addChild(root_0, char_literal285_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_declaredParameterList1648); if (failed) return ; pushFollow(FOLLOW_r_declaredParameter_in_r_declaredParameterList1650); - r_declaredParameter286=r_declaredParameter(); + r_declaredParameter(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_declaredParameter286.getTree()); + if (failed) return ; } break; @@ -6394,111 +4665,72 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_declaredParameterList"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_declaredParameterList - public static class r_declaredParameter_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_declaredParameter - // src/org/eclipse/xpand3/parser/Xpand3.g:317:1: r_declaredParameter : r_type r_identifier ; - public r_declaredParameter_return r_declaredParameter() throws RecognitionException { - r_declaredParameter_return retval = new r_declaredParameter_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_type_return r_type287 = null; - - r_identifier_return r_identifier288 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:316:1: r_declaredParameter : r_type r_identifier ; + public final void r_declaredParameter() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:318:2: ( r_type r_identifier ) - // src/org/eclipse/xpand3/parser/Xpand3.g:318:2: r_type r_identifier + /** START EDITED */ + ruleEntered("r_declaredParameter"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:316:21: ( r_type r_identifier ) + // src/org/eclipse/xpand3/parser/Xpand3.g:317:2: r_type r_identifier { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_type_in_r_declaredParameter1663); - r_type287=r_type(); + r_type(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_type287.getTree()); + if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_declaredParameter1665); - r_identifier288=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier288.getTree()); + if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_declaredParameter"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_declaredParameter - public static class r_parameterList_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_parameterList - // src/org/eclipse/xpand3/parser/Xpand3.g:321:1: r_parameterList : r_expression ( ',' r_expression )* ; - public r_parameterList_return r_parameterList() throws RecognitionException { - r_parameterList_return retval = new r_parameterList_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token char_literal290=null; - r_expression_return r_expression289 = null; - - r_expression_return r_expression291 = null; - - - Object char_literal290_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:320:1: r_parameterList : r_expression ( ',' r_expression )* ; + public final void r_parameterList() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:322:5: ( r_expression ( ',' r_expression )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:322:5: r_expression ( ',' r_expression )* + /** START EDITED */ + ruleEntered("r_parameterList"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:320:18: ( r_expression ( ',' r_expression )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:321:5: r_expression ( ',' r_expression )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_expression_in_r_parameterList1680); - r_expression289=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression289.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:322:19: ( ',' r_expression )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:321:19: ( ',' r_expression )* loop69: do { int alt69=2; @@ -6511,19 +4743,16 @@ public class Xpand3Parser extends Parser { switch (alt69) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:322:20: ',' r_expression + // src/org/eclipse/xpand3/parser/Xpand3.g:321:20: ',' r_expression { - char_literal290=(Token)input.LT(1); - match(input,32,FOLLOW_32_in_r_parameterList1684); if (failed) return retval; - if ( backtracking==0 ) { - char_literal290_tree = (Object)adaptor.create(char_literal290); - adaptor.addChild(root_0, char_literal290_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,32,FOLLOW_32_in_r_parameterList1684); if (failed) return ; pushFollow(FOLLOW_r_expression_in_r_parameterList1686); - r_expression291=r_expression(); + r_expression(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_expression291.getTree()); + if (failed) return ; } break; @@ -6536,44 +4765,29 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_parameterList"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_parameterList - public static class r_type_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_type - // src/org/eclipse/xpand3/parser/Xpand3.g:327:1: r_type : ( r_collectionType | r_simpleType ); - public r_type_return r_type() throws RecognitionException { - r_type_return retval = new r_type_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - r_collectionType_return r_collectionType292 = null; - - r_simpleType_return r_simpleType293 = null; - - - + // src/org/eclipse/xpand3/parser/Xpand3.g:326:1: r_type : ( r_collectionType | r_simpleType ); + public final void r_type() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:328:2: ( r_collectionType | r_simpleType ) + /** START EDITED */ + ruleEntered("r_type"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:326:8: ( r_collectionType | r_simpleType ) int alt70=2; int LA70_0 = input.LA(1); @@ -6584,101 +4798,72 @@ public class Xpand3Parser extends Parser { alt70=2; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("327:1: r_type : ( r_collectionType | r_simpleType );", 70, 0, input); + new NoViableAltException("326:1: r_type : ( r_collectionType | r_simpleType );", 70, 0, input); throw nvae; } switch (alt70) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:328:2: r_collectionType + // src/org/eclipse/xpand3/parser/Xpand3.g:327:2: r_collectionType { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_collectionType_in_r_type1703); - r_collectionType292=r_collectionType(); + r_collectionType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_collectionType292.getTree()); + if (failed) return ; } break; case 2 : - // src/org/eclipse/xpand3/parser/Xpand3.g:329:2: r_simpleType + // src/org/eclipse/xpand3/parser/Xpand3.g:328:2: r_simpleType { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_simpleType_in_r_type1708); - r_simpleType293=r_simpleType(); + r_simpleType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_simpleType293.getTree()); + if (failed) return ; } break; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_type"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_type - public static class r_collectionType_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_collectionType - // src/org/eclipse/xpand3/parser/Xpand3.g:332:1: r_collectionType : ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? ; - public r_collectionType_return r_collectionType() throws RecognitionException { - r_collectionType_return retval = new r_collectionType_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token set294=null; - Token char_literal295=null; - Token char_literal297=null; - r_simpleType_return r_simpleType296 = null; - - - Object set294_tree=null; - Object char_literal295_tree=null; - Object char_literal297_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:331:1: r_collectionType : ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? ; + public final void r_collectionType() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:333:3: ( ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? ) - // src/org/eclipse/xpand3/parser/Xpand3.g:333:3: ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? + /** START EDITED */ + ruleEntered("r_collectionType"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:331:19: ( ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? ) + // src/org/eclipse/xpand3/parser/Xpand3.g:332:3: ( 'Collection' | 'List' | 'Set' ) ( '[' r_simpleType ']' )? { - root_0 = (Object)adaptor.nil(); - - set294=(Token)input.LT(1); if ( (input.LA(1)>=69 && input.LA(1)<=71) ) { input.consume(); - if ( backtracking==0 ) adaptor.addChild(root_0, adaptor.create(set294)); errorRecovery=false;failed=false; } else { - if (backtracking>0) {failed=true; return retval;} + if (backtracking>0) {failed=true; return ;} MismatchedSetException mse = new MismatchedSetException(null,input); recoverFromMismatchedSet(input,mse,FOLLOW_set_in_r_collectionType1723); throw mse; } - // src/org/eclipse/xpand3/parser/Xpand3.g:334:3: ( '[' r_simpleType ']' )? + // src/org/eclipse/xpand3/parser/Xpand3.g:333:3: ( '[' r_simpleType ']' )? int alt71=2; int LA71_0 = input.LA(1); @@ -6687,25 +4872,20 @@ public class Xpand3Parser extends Parser { } switch (alt71) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:334:4: '[' r_simpleType ']' + // src/org/eclipse/xpand3/parser/Xpand3.g:333:4: '[' r_simpleType ']' { - char_literal295=(Token)input.LT(1); - match(input,95,FOLLOW_95_in_r_collectionType1741); if (failed) return retval; - if ( backtracking==0 ) { - char_literal295_tree = (Object)adaptor.create(char_literal295); - adaptor.addChild(root_0, char_literal295_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,95,FOLLOW_95_in_r_collectionType1741); if (failed) return ; pushFollow(FOLLOW_r_simpleType_in_r_collectionType1743); - r_simpleType296=r_simpleType(); + r_simpleType(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_simpleType296.getTree()); - char_literal297=(Token)input.LT(1); - match(input,96,FOLLOW_96_in_r_collectionType1745); if (failed) return retval; - if ( backtracking==0 ) { - char_literal297_tree = (Object)adaptor.create(char_literal297); - adaptor.addChild(root_0, char_literal297_tree); - } + if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,96,FOLLOW_96_in_r_collectionType1745); if (failed) return ; } break; @@ -6715,56 +4895,36 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_collectionType"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_collectionType - public static class r_simpleType_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_simpleType - // src/org/eclipse/xpand3/parser/Xpand3.g:337:1: r_simpleType : r_identifier ( '::' r_identifier )* ; - public r_simpleType_return r_simpleType() throws RecognitionException { - r_simpleType_return retval = new r_simpleType_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token string_literal299=null; - r_identifier_return r_identifier298 = null; - - r_identifier_return r_identifier300 = null; - - - Object string_literal299_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:336:1: r_simpleType : r_identifier ( '::' r_identifier )* ; + public final void r_simpleType() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:338:2: ( r_identifier ( '::' r_identifier )* ) - // src/org/eclipse/xpand3/parser/Xpand3.g:338:2: r_identifier ( '::' r_identifier )* + /** START EDITED */ + ruleEntered("r_simpleType"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:336:14: ( r_identifier ( '::' r_identifier )* ) + // src/org/eclipse/xpand3/parser/Xpand3.g:337:2: r_identifier ( '::' r_identifier )* { - root_0 = (Object)adaptor.nil(); - pushFollow(FOLLOW_r_identifier_in_r_simpleType1758); - r_identifier298=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier298.getTree()); - // src/org/eclipse/xpand3/parser/Xpand3.g:339:2: ( '::' r_identifier )* + if (failed) return ; + // src/org/eclipse/xpand3/parser/Xpand3.g:338:2: ( '::' r_identifier )* loop72: do { int alt72=2; @@ -6777,19 +4937,16 @@ public class Xpand3Parser extends Parser { switch (alt72) { case 1 : - // src/org/eclipse/xpand3/parser/Xpand3.g:339:3: '::' r_identifier + // src/org/eclipse/xpand3/parser/Xpand3.g:338:3: '::' r_identifier { - string_literal299=(Token)input.LT(1); - match(input,63,FOLLOW_63_in_r_simpleType1763); if (failed) return retval; - if ( backtracking==0 ) { - string_literal299_tree = (Object)adaptor.create(string_literal299); - adaptor.addChild(root_0, string_literal299_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,63,FOLLOW_63_in_r_simpleType1763); if (failed) return ; pushFollow(FOLLOW_r_identifier_in_r_simpleType1765); - r_identifier300=r_identifier(); + r_identifier(); _fsp--; - if (failed) return retval; - if ( backtracking==0 ) adaptor.addChild(root_0, r_identifier300.getTree()); + if (failed) return ; } break; @@ -6802,82 +4959,68 @@ public class Xpand3Parser extends Parser { } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_simpleType"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_simpleType - public static class r_identifier_return extends ParserRuleReturnScope { - Object tree; - public Object getTree() { return tree; } - }; // $ANTLR start r_identifier - // src/org/eclipse/xpand3/parser/Xpand3.g:342:1: r_identifier : Identifier ; - public r_identifier_return r_identifier() throws RecognitionException { - r_identifier_return retval = new r_identifier_return(); - retval.start = input.LT(1); - - Object root_0 = null; - - Token Identifier301=null; - - Object Identifier301_tree=null; - + // src/org/eclipse/xpand3/parser/Xpand3.g:341:1: r_identifier : Identifier ; + public final void r_identifier() throws RecognitionException { try { - // src/org/eclipse/xpand3/parser/Xpand3.g:343:4: ( Identifier ) - // src/org/eclipse/xpand3/parser/Xpand3.g:343:4: Identifier + /** START EDITED */ + ruleEntered("r_identifier"); + /** END EDITED */ + // src/org/eclipse/xpand3/parser/Xpand3.g:341:14: ( Identifier ) + // src/org/eclipse/xpand3/parser/Xpand3.g:342:4: Identifier { - root_0 = (Object)adaptor.nil(); - - Identifier301=(Token)input.LT(1); - match(input,Identifier,FOLLOW_Identifier_in_r_identifier1781); if (failed) return retval; - if ( backtracking==0 ) { - Identifier301_tree = (Object)adaptor.create(Identifier301); - adaptor.addChild(root_0, Identifier301_tree); - } + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ + match(input,Identifier,FOLLOW_Identifier_in_r_identifier1781); if (failed) return ; } - retval.stop = input.LT(-1); - - if ( backtracking==0 ) { - retval.tree = (Object)adaptor.rulePostProcessing(root_0); - adaptor.setTokenBoundaries(retval.tree, retval.start, retval.stop); - } } catch (RecognitionException re) { reportError(re); recover(input,re); } finally { + /** START EDITED */ + ruleLeft("r_identifier"); + /** END EDITED */ } - return retval; + return ; } // $ANTLR end r_identifier // $ANTLR start synpred1 - public void synpred1_fragment() throws RecognitionException { - // src/org/eclipse/xpand3/parser/Xpand3.g:186:5: ( '(' r_type ')' r_castedExpression ) - // src/org/eclipse/xpand3/parser/Xpand3.g:186:6: '(' r_type ')' r_castedExpression + public final void synpred1_fragment() throws RecognitionException { + // src/org/eclipse/xpand3/parser/Xpand3.g:185:5: ( '(' r_type ')' r_castedExpression ) + // src/org/eclipse/xpand3/parser/Xpand3.g:185:6: '(' r_type ')' r_castedExpression { + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ match(input,31,FOLLOW_31_in_synpred1951); if (failed) return ; pushFollow(FOLLOW_r_type_in_synpred1953); r_type(); _fsp--; if (failed) return ; + /** START EDITED */ + tokenConsumed(null, (CommonToken) input.LT(1)); + /** END EDITED */ match(input,34,FOLLOW_34_in_synpred1955); if (failed) return ; pushFollow(FOLLOW_r_castedExpression_in_synpred1957); r_castedExpression(); @@ -7019,7 +5162,7 @@ public class Xpand3Parser extends Parser { this.transition = DFA44_transition; } public String getDescription() { - return "185:1: r_castedExpression : ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression );"; + return "184:1: r_castedExpression : ( ( '(' r_type ')' r_castedExpression )=> '(' r_type ')' r_chainExpression | r_chainExpression );"; } public int specialStateTransition(int s, IntStream input) throws NoViableAltException { int _s = s; diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3__.g b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3__.g index 09cb09ea..48743482 100644 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3__.g +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xpand3/parser/Xpand3__.g @@ -93,16 +93,16 @@ T108 : 'sortBy' ; T109 : 'forAll' ; T110 : '|' ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 351 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 350 IntLiteral : ('0' | '1'..'9' '0'..'9'*) ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 353 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 352 StringLiteral : '"' ( EscapeSequence | ~('\\'|'"') )* '"' | '\'' ( EscapeSequence | ~('\''|'\\') )* '\'' ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 358 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 357 fragment EscapeSequence : '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') @@ -110,7 +110,7 @@ EscapeSequence | OctalEscape ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 365 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 364 fragment OctalEscape : '\\' ('0'..'3') ('0'..'7') ('0'..'7') @@ -118,33 +118,33 @@ OctalEscape | '\\' ('0'..'7') ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 372 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 371 fragment UnicodeEscape : '\\' 'u' HexDigit HexDigit HexDigit HexDigit ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 376 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 375 fragment HexDigit : ('0'..'9'|'a'..'f'|'A'..'F') ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 380 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 379 DEFINE : {xpandMode=true;} 'DEFINE'; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 381 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 380 ENDDEFINE : 'ENDDEFINE' {xpandMode=false;}; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 384 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 383 AROUND : {xpandMode=true;}'AROUND'; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 385 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 384 ENDAROUND : 'ENDAROUND'{xpandMode=false;}; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 387 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 386 Identifier : ('^')? Letter (Letter|JavaIDDigit)* ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 391 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 390 fragment Letter : '\u0024' | @@ -162,7 +162,7 @@ Letter '\uf900'..'\ufaff' ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 408 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 407 fragment JavaIDDigit : '\u0030'..'\u0039' | @@ -182,40 +182,40 @@ JavaIDDigit '\u1040'..'\u1049' ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 427 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 426 WS : (' '|'\r'|'\t'|'\u000C'|'\n') {$channel=HIDDEN;} ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 430 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 429 COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;} ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 434 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 433 LINE_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n'|EOF) {$channel=HIDDEN;} ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 439 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 438 REM_COMMENT_OUT : {!xpandMode}?=> LG 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' RG {$channel=HIDDEN;} ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 443 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 442 REM_COMMENT : {xpandMode}?=> 'REM' RG ( options {greedy=false;} : . )* '\u00ABENDREM' {$channel=HIDDEN;} ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 448 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 447 TEXT : {xpandMode}?=> RG ~(LG)* (LG)? ; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 452 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 451 LG : '\u00AB'; -// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 454 +// $ANTLR src "src/org/eclipse/xpand3/parser/Xpand3.g" 453 RG : '\u00BB'; diff --git a/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java b/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java index 5d55e389..fdfe0398 100644 --- a/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java +++ b/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/parser/Xpand3NodeParserTest.java @@ -1,22 +1,18 @@ package org.eclipse.xpand3.parser; -import static org.eclipse.xpand3.parser.SyntaxUtil.LG; -import static org.eclipse.xpand3.parser.SyntaxUtil.RG; import junit.framework.TestCase; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CommonTokenStream; import org.eclipse.xpand3.node.Node; import org.eclipse.xpand3.node.NodeUtil; -import org.eclipse.xpand3.parser.Xpand3Parser.r_file_return; +import static org.eclipse.xpand3.parser.SyntaxUtil.*; public class Xpand3NodeParserTest extends TestCase { + private Node parse(String s) throws Exception { - ANTLRStringStream stream = new ANTLRStringStream(s); - Xpand3Lexer lexer = new Xpand3Lexer(stream); - CommonTokenStream tokenStream = new CommonTokenStream(lexer); - Xpand3NodeParser parser = new Xpand3NodeParser(tokenStream); - r_file_return r_file = parser.r_file(); + Xpand3NodeParser parser = createParser(s); + parser.r_file(); return parser.getRootNode(); } @@ -42,4 +38,24 @@ public class Xpand3NodeParserTest extends TestCase { System.out.println(NodeUtil.toString(node)); System.out.println(NodeUtil.serialize(node)); } +// + public void testPerf() throws Exception { + String s = "foo.bar.honolulu('lola',[true,false,45]).collect(e|2.minor + 34 / (x - 2))"; + for (int i = 0; i<10;i++) { + s = s+" -> "+s; + } + Xpand3Parser parser = createParser(s); + long n = System.currentTimeMillis(); + parser.r_expression(); + long after = System.currentTimeMillis(); + System.out.println("Time : "+(after-n)/1000.+" Expressionlength was : "+s.length()); + } + + private Xpand3NodeParser createParser(String s) { + ANTLRStringStream stream = new ANTLRStringStream(s); + Xpand3Lexer lexer = new Xpand3Lexer(stream); + CommonTokenStream tokenStream = new CommonTokenStream(lexer); + Xpand3NodeParser parser = new Xpand3NodeParser(tokenStream); + return parser; + } } |