| author | szarnekow | 2009-02-13 16:14:02 (EST) |
|---|---|---|
| committer | sefftinge | 2009-02-13 16:14:02 (EST) |
| commit | d137982a97dfed455456d0ea81ac782cb55787ab (patch) (side-by-side diff) | |
| tree | 1d8e583c144097e3fd1dc4cecb523cc9dd109dba | |
| parent | eacc9f637fb29a932a1f553676e06736659230f6 (diff) | |
| download | org.eclipse.xtext-d137982a97dfed455456d0ea81ac782cb55787ab.zip org.eclipse.xtext-d137982a97dfed455456d0ea81ac782cb55787ab.tar.gz org.eclipse.xtext-d137982a97dfed455456d0ea81ac782cb55787ab.tar.bz2 | |
WIP: some fixes when working with assigned alternatives and assigned datatype rule (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=250313)
187 files changed, 20212 insertions, 16508 deletions
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g index 4649eea..95ea604 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g @@ -79,6 +79,7 @@ ruleSpielplatz returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((((('spielplatz' { @@ -86,10 +87,10 @@ ruleSpielplatz returns [EObject current=null] } ( - lv_groesse=RULE_INT - { - createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse"); - } + lv_groesse_1= RULE_INT + { + createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse"); + } { if ($current==null) { @@ -98,7 +99,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.set($current, "groesse", lv_groesse, "INT", currentNode); + set($current, "groesse", lv_groesse_1, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -106,10 +107,10 @@ ruleSpielplatz returns [EObject current=null] ))( - lv_beschreibung=RULE_STRING - { - createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung"); - } + lv_beschreibung_2= RULE_STRING + { + createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung"); + } { if ($current==null) { @@ -118,7 +119,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.set($current, "beschreibung", lv_beschreibung, "STRING", currentNode); + set($current, "beschreibung", lv_beschreibung_2, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -134,7 +135,7 @@ ruleSpielplatz returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100000ParserRuleCallKind(), currentNode); } - lv_kinder=ruleKind + lv_kinder_4=ruleKind { if ($current==null) { $current = factory.create("Spielplatz"); @@ -142,7 +143,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.add($current, "kinder", lv_kinder, "Kind", currentNode); + add($current, "kinder", lv_kinder_4, "Kind", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -156,7 +157,7 @@ ruleSpielplatz returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100010ParserRuleCallErwachsener(), currentNode); } - lv_erzieher=ruleErwachsener + lv_erzieher_5=ruleErwachsener { if ($current==null) { $current = factory.create("Spielplatz"); @@ -164,7 +165,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.add($current, "erzieher", lv_erzieher, "Erwachsener", currentNode); + add($current, "erzieher", lv_erzieher_5, "Erwachsener", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -178,7 +179,7 @@ ruleSpielplatz returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele010010ParserRuleCallSpielzeug(), currentNode); } - lv_spielzeuge=ruleSpielzeug + lv_spielzeuge_6=ruleSpielzeug { if ($current==null) { $current = factory.create("Spielplatz"); @@ -186,7 +187,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.add($current, "spielzeuge", lv_spielzeuge, "Spielzeug", currentNode); + add($current, "spielzeuge", lv_spielzeuge_6, "Spielzeug", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -200,7 +201,7 @@ ruleSpielplatz returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele01010ParserRuleCallFamilie(), currentNode); } - lv_familie=ruleFamilie + lv_familie_7=ruleFamilie { if ($current==null) { $current = factory.create("Spielplatz"); @@ -208,7 +209,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.add($current, "familie", lv_familie, "Familie", currentNode); + add($current, "familie", lv_familie_7, "Familie", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -222,7 +223,7 @@ ruleSpielplatz returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0110ParserRuleCallCustomTypeParserRule(), currentNode); } - lv_types=ruleCustomTypeParserRule + lv_types_8=ruleCustomTypeParserRule { if ($current==null) { $current = factory.create("Spielplatz"); @@ -230,7 +231,7 @@ ruleSpielplatz returns [EObject current=null] } try { - factory.add($current, "types", lv_types, "CustomTypeParserRule", currentNode); + add($current, "types", lv_types_8, "CustomTypeParserRule", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -264,6 +265,7 @@ ruleKind returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((('kind' { @@ -275,10 +277,10 @@ ruleKind returns [EObject current=null] } )( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -287,7 +289,7 @@ ruleKind returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -295,10 +297,10 @@ ruleKind returns [EObject current=null] ))( - lv_age=RULE_INT - { - createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age"); - } + lv_age_3= RULE_INT + { + createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age"); + } { if ($current==null) { @@ -307,7 +309,7 @@ ruleKind returns [EObject current=null] } try { - factory.set($current, "age", lv_age, "INT", currentNode); + set($current, "age", lv_age_3, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -338,6 +340,7 @@ ruleErwachsener returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((('erwachsener' { @@ -349,10 +352,10 @@ ruleErwachsener returns [EObject current=null] } )( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -361,7 +364,7 @@ ruleErwachsener returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -369,10 +372,10 @@ ruleErwachsener returns [EObject current=null] ))( - lv_age=RULE_INT - { - createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age"); - } + lv_age_3= RULE_INT + { + createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age"); + } { if ($current==null) { @@ -381,7 +384,7 @@ ruleErwachsener returns [EObject current=null] } try { - factory.set($current, "age", lv_age, "INT", currentNode); + set($current, "age", lv_age_3, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -412,6 +415,7 @@ ruleSpielzeug returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((('spielzeug' { @@ -423,10 +427,10 @@ ruleSpielzeug returns [EObject current=null] } )( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -435,7 +439,7 @@ ruleSpielzeug returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -447,7 +451,7 @@ ruleSpielzeug returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele010ParserRuleCallFarbe(), currentNode); } - lv_farbe=ruleFarbe + lv_farbe_3=ruleFarbe { if ($current==null) { $current = factory.create("Spielzeug"); @@ -455,7 +459,7 @@ ruleSpielzeug returns [EObject current=null] } try { - factory.set($current, "farbe", lv_farbe, "Farbe", currentNode); + set($current, "farbe", lv_farbe_3, "Farbe", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -487,6 +491,7 @@ ruleFamilie returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((((((('familie' { @@ -498,21 +503,24 @@ ruleFamilie returns [EObject current=null] } )( - lv_name=(('keyword' + lv_name_2=(('keyword' { createLeafNode(grammarAccess.prFamilie().ele000001000KeywordKeyword(), "name"); } - |RULE_STRING - { - createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name"); - } + + | RULE_STRING + { + createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name"); + } ) - |RULE_ID - { - createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name"); - } -) + + | RULE_ID + { + createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name"); + } +) + { if ($current==null) { $current = factory.create("Familie"); @@ -520,7 +528,7 @@ ruleFamilie returns [EObject current=null] } try { - factory.set($current, "name", input.LT(-1), null, currentNode); + set($current, "name", /* lv_name_2 */ input.LT(-1), null, lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -535,11 +543,12 @@ ruleFamilie returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter"); + } + + // TODO assign feature to currentNode ))( @@ -550,11 +559,12 @@ ruleFamilie returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater"); + } + + // TODO assign feature to currentNode ))( @@ -565,11 +575,12 @@ ruleFamilie returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder"); + } + + // TODO assign feature to currentNode ))(',' { @@ -584,11 +595,12 @@ ruleFamilie returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder"); + } + + // TODO assign feature to currentNode ))*)')' { @@ -615,29 +627,37 @@ ruleFarbe returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( - lv_wert=((('ROT' + lv_wert_0=((('ROT' { createLeafNode(grammarAccess.prFarbe().ele0000KeywordROT(), "wert"); } + |'BLAU' { createLeafNode(grammarAccess.prFarbe().ele0001KeywordBLAU(), "wert"); } + ) + |'GELB' { createLeafNode(grammarAccess.prFarbe().ele001KeywordGELB(), "wert"); } + ) + |'GR\u00DCN' { createLeafNode(grammarAccess.prFarbe().ele01KeywordGRÜN(), "wert"); } -) + +) + { if ($current==null) { $current = factory.create("Farbe"); @@ -645,7 +665,7 @@ ruleFarbe returns [EObject current=null] } try { - factory.set($current, "wert", input.LT(-1), null, currentNode); + set($current, "wert", /* lv_wert_0 */ input.LT(-1), null, lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -672,6 +692,7 @@ ruleCustomTypeParserRule returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ('type' { @@ -679,10 +700,10 @@ ruleCustomTypeParserRule returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -691,7 +712,7 @@ ruleCustomTypeParserRule returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java index fc88adf..2b55166 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java @@ -345,10 +345,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:724:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:724:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:724:11: ( '^' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -357,7 +357,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt1) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:724:12: '^' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:12: '^' { match('^'); @@ -376,7 +376,7 @@ public class InternalReferenceGrammarLexer extends Lexer { recover(mse); throw mse; } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:724:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:745:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -424,10 +424,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:726:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:726:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:726:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -441,7 +441,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt3) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:726:13: '0' .. '9' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:747:13: '0' .. '9' { matchRange('0','9'); @@ -471,7 +471,7 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:728:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:749:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -483,16 +483,16 @@ public class InternalReferenceGrammarLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("728:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("749:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:729:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:729:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -508,7 +508,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt4) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:729:12: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:12: '\\\\' ( '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' ) { @@ -525,7 +525,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:729:56: ~ ( '\\\\' | '\"' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:750:56: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -551,10 +551,10 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:730:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:730:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -570,7 +570,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:730:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:22: '\\\\' ( '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' ) { @@ -587,7 +587,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:730:66: ~ ( '\\\\' | '\\'' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:751:66: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -625,12 +625,12 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:733:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:733:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:733:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -655,7 +655,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt7) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:733:52: . + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:754:52: . { matchAny(); @@ -683,12 +683,12 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:24: (~ ( '\\n' | '\\r' ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -701,7 +701,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:24: ~ ( '\\n' | '\\r' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:24: ~ ( '\\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(); @@ -722,7 +722,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:38: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -731,9 +731,9 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:39: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:39: ( '\\r' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -742,7 +742,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:735:39: '\\r' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:756:39: '\\r' { match('\r'); @@ -772,10 +772,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:737:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:737:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:737:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:758:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -828,8 +828,8 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:739:16: ( . ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:739:18: . + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:760:16: ( . ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:760:18: . { matchAny(); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java index 6d95c12..bfdef05 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java @@ -100,30 +100,30 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleSpielplatz - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) '}' )? ; public final EObject ruleSpielplatz() throws RecognitionException { EObject current = null; - Token lv_groesse=null; - Token lv_beschreibung=null; - EObject lv_kinder = null; + Token lv_groesse_1=null; + Token lv_beschreibung_2=null; + EObject lv_kinder_4 = null; - EObject lv_erzieher = null; + EObject lv_erzieher_5 = null; - EObject lv_spielzeuge = null; + EObject lv_spielzeuge_6 = null; - EObject lv_familie = null; + EObject lv_familie_7 = null; - EObject lv_types = null; + EObject lv_types_8 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:82:6: ( ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:6: ( ( ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) '}' )? ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:1: ( ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) '}' )? { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:1: ( ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) '}' )? int alt6=2; int LA6_0 = input.LA(1); @@ -132,32 +132,32 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } switch (alt6) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:2: ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) '}' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:2: ( ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:3: ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:3: ( ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:4: ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) '{' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:4: ( ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:5: ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) (lv_beschreibung_2= RULE_STRING )? { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:6: 'spielplatz' (lv_groesse= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:5: ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:6: 'spielplatz' (lv_groesse_1= RULE_INT ) { match(input,11,FOLLOW_11_in_ruleSpielplatz120); createLeafNode(grammarAccess.prSpielplatz().ele00000KeywordSpielplatz(), null); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:87:1: (lv_groesse= RULE_INT ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:89:6: lv_groesse= RULE_INT + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:88:1: (lv_groesse_1= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:90:6: lv_groesse_1= RULE_INT { - lv_groesse=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz141); - - createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse"); - + lv_groesse_1=(Token)input.LT(1); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz142); + + createLeafNode(grammarAccess.prSpielplatz().ele000010LexerRuleCallINT(), "groesse"); + if (current==null) { current = factory.create("Spielplatz"); @@ -165,7 +165,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "groesse", lv_groesse, "INT", currentNode); + set(current, "groesse", lv_groesse_1, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -176,7 +176,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:107:3: (lv_beschreibung= RULE_STRING )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:108:3: (lv_beschreibung_2= RULE_STRING )? int alt1=2; int LA1_0 = input.LA(1); @@ -185,13 +185,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } switch (alt1) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:109:6: lv_beschreibung= RULE_STRING + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:110:6: lv_beschreibung_2= RULE_STRING { - lv_beschreibung=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz174); - - createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung"); - + lv_beschreibung_2=(Token)input.LT(1); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz173); + + createLeafNode(grammarAccess.prSpielplatz().ele00010LexerRuleCallSTRING(), "beschreibung"); + if (current==null) { current = factory.create("Spielplatz"); @@ -199,7 +199,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "beschreibung", lv_beschreibung, "STRING", currentNode); + set(current, "beschreibung", lv_beschreibung_2, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -213,14 +213,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,12,FOLLOW_12_in_ruleSpielplatz196); + match(input,12,FOLLOW_12_in_ruleSpielplatz192); createLeafNode(grammarAccess.prSpielplatz().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:2: ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:2: ( ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) | (lv_types_8= ruleCustomTypeParserRule ) )* loop5: do { int alt5=3; @@ -236,9 +236,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser switch (alt5) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) ) int alt4=2; int LA4_0 = input.LA(1); @@ -250,15 +250,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("131:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )", 4, 0, input); + new NoViableAltException("132:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) int alt3=2; int LA3_0 = input.LA(1); @@ -270,15 +270,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("131:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )", 3, 0, input); + new NoViableAltException("132:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )", 3, 0, input); throw nvae; } switch (alt3) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) int alt2=2; int LA2_0 = input.LA(1); @@ -290,22 +290,22 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("131:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )", 2, 0, input); + new NoViableAltException("132:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:6: (lv_kinder= ruleKind ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:6: (lv_kinder_4= ruleKind ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:6: (lv_kinder= ruleKind ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:134:6: lv_kinder= ruleKind + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:132:6: (lv_kinder_4= ruleKind ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:135:6: lv_kinder_4= ruleKind { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100000ParserRuleCallKind(), currentNode); - pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz235); - lv_kinder=ruleKind(); + pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz231); + lv_kinder_4=ruleKind(); _fsp--; @@ -315,7 +315,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.add(current, "kinder", lv_kinder, "Kind", currentNode); + add(current, "kinder", lv_kinder_4, "Kind", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -328,16 +328,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:153:6: (lv_erzieher= ruleErwachsener ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:154:6: (lv_erzieher_5= ruleErwachsener ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:153:6: (lv_erzieher= ruleErwachsener ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:156:6: lv_erzieher= ruleErwachsener + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:154:6: (lv_erzieher_5= ruleErwachsener ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:157:6: lv_erzieher_5= ruleErwachsener { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100010ParserRuleCallErwachsener(), currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz279); - lv_erzieher=ruleErwachsener(); + pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz275); + lv_erzieher_5=ruleErwachsener(); _fsp--; @@ -347,7 +347,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.add(current, "erzieher", lv_erzieher, "Erwachsener", currentNode); + add(current, "erzieher", lv_erzieher_5, "Erwachsener", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -366,16 +366,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:175:6: (lv_spielzeuge= ruleSpielzeug ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:176:6: (lv_spielzeuge_6= ruleSpielzeug ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:175:6: (lv_spielzeuge= ruleSpielzeug ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:178:6: lv_spielzeuge= ruleSpielzeug + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:176:6: (lv_spielzeuge_6= ruleSpielzeug ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:179:6: lv_spielzeuge_6= ruleSpielzeug { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele010010ParserRuleCallSpielzeug(), currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz324); - lv_spielzeuge=ruleSpielzeug(); + pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz320); + lv_spielzeuge_6=ruleSpielzeug(); _fsp--; @@ -385,7 +385,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.add(current, "spielzeuge", lv_spielzeuge, "Spielzeug", currentNode); + add(current, "spielzeuge", lv_spielzeuge_6, "Spielzeug", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -404,16 +404,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:197:6: (lv_familie= ruleFamilie ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:198:6: (lv_familie_7= ruleFamilie ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:197:6: (lv_familie= ruleFamilie ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:200:6: lv_familie= ruleFamilie + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:198:6: (lv_familie_7= ruleFamilie ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:201:6: lv_familie_7= ruleFamilie { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele01010ParserRuleCallFamilie(), currentNode); - pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz369); - lv_familie=ruleFamilie(); + pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz365); + lv_familie_7=ruleFamilie(); _fsp--; @@ -423,7 +423,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.add(current, "familie", lv_familie, "Familie", currentNode); + add(current, "familie", lv_familie_7, "Familie", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -442,16 +442,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:219:6: (lv_types= ruleCustomTypeParserRule ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:220:6: (lv_types_8= ruleCustomTypeParserRule ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:219:6: (lv_types= ruleCustomTypeParserRule ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:222:6: lv_types= ruleCustomTypeParserRule + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:220:6: (lv_types_8= ruleCustomTypeParserRule ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:223:6: lv_types_8= ruleCustomTypeParserRule { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0110ParserRuleCallCustomTypeParserRule(), currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz414); - lv_types=ruleCustomTypeParserRule(); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz410); + lv_types_8=ruleCustomTypeParserRule(); _fsp--; @@ -461,7 +461,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.add(current, "types", lv_types, "CustomTypeParserRule", currentNode); + add(current, "types", lv_types_8, "CustomTypeParserRule", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -482,7 +482,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,13,FOLLOW_13_in_ruleSpielplatz430); + match(input,13,FOLLOW_13_in_ruleSpielplatz426); createLeafNode(grammarAccess.prSpielplatz().ele1KeywordRightCurlyBracket(), null); @@ -496,6 +496,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -511,7 +512,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleKind - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:255:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:256:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ; public final EObject entryRuleKind() throws RecognitionException { EObject current = null; @@ -519,16 +520,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:255:46: (iv_ruleKind= ruleKind EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:256:2: iv_ruleKind= ruleKind EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:256:46: (iv_ruleKind= ruleKind EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:257:2: iv_ruleKind= ruleKind EOF { currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode); - pushFollow(FOLLOW_ruleKind_in_entryRuleKind468); + pushFollow(FOLLOW_ruleKind_in_entryRuleKind464); iv_ruleKind=ruleKind(); _fsp--; current =iv_ruleKind; - match(input,EOF,FOLLOW_EOF_in_entryRuleKind478); + match(input,EOF,FOLLOW_EOF_in_entryRuleKind474); } @@ -546,50 +547,50 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleKind - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:263:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:264:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ; public final EObject ruleKind() throws RecognitionException { EObject current = null; - Token lv_name=null; - Token lv_age=null; + Token lv_name_2=null; + Token lv_age_3=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267:6: ( ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:269:6: ( ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:1: ( ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:2: ( ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:4: ( 'kind' '(' ) (lv_name= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:4: ( 'kind' '(' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:4: ( 'kind' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:5: 'kind' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:4: ( 'kind' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:270:5: 'kind' '(' { - match(input,14,FOLLOW_14_in_ruleKind515); + match(input,14,FOLLOW_14_in_ruleKind511); createLeafNode(grammarAccess.prKind().ele0000KeywordKind(), null); - match(input,15,FOLLOW_15_in_ruleKind524); + match(input,15,FOLLOW_15_in_ruleKind520); createLeafNode(grammarAccess.prKind().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:276:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:278:6: lv_name= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:278:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:280:6: lv_name_2= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind546); - - createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name"); - + lv_name_2=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind543); + + createLeafNode(grammarAccess.prKind().ele0010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Kind"); @@ -597,7 +598,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -608,14 +609,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:296:3: (lv_age= RULE_INT ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:298:6: lv_age= RULE_INT + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:298:3: (lv_age_3= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:300:6: lv_age_3= RULE_INT { - lv_age=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind579); - - createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age"); - + lv_age_3=(Token)input.LT(1); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind574); + + createLeafNode(grammarAccess.prKind().ele010LexerRuleCallINT(), "age"); + if (current==null) { current = factory.create("Kind"); @@ -623,7 +624,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "age", lv_age, "INT", currentNode); + set(current, "age", lv_age_3, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -634,7 +635,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleKind600); + match(input,16,FOLLOW_16_in_ruleKind592); createLeafNode(grammarAccess.prKind().ele1KeywordRightParenthesis(), null); @@ -645,6 +646,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -660,7 +662,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleErwachsener - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:329:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:331:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ; public final EObject entryRuleErwachsener() throws RecognitionException { EObject current = null; @@ -668,16 +670,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:329:53: (iv_ruleErwachsener= ruleErwachsener EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:330:2: iv_ruleErwachsener= ruleErwachsener EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:331:53: (iv_ruleErwachsener= ruleErwachsener EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:332:2: iv_ruleErwachsener= ruleErwachsener EOF { currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener635); + pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener627); iv_ruleErwachsener=ruleErwachsener(); _fsp--; current =iv_ruleErwachsener; - match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener645); + match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener637); } @@ -695,50 +697,50 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleErwachsener - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:337:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:339:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ; public final EObject ruleErwachsener() throws RecognitionException { EObject current = null; - Token lv_name=null; - Token lv_age=null; + Token lv_name_2=null; + Token lv_age_3=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:6: ( ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:344:6: ( ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:1: ( ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:2: ( ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) (lv_age_3= RULE_INT ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:4: ( 'erwachsener' '(' ) (lv_name= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:4: ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:4: ( 'erwachsener' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:342:5: 'erwachsener' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:4: ( 'erwachsener' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:345:5: 'erwachsener' '(' { - match(input,17,FOLLOW_17_in_ruleErwachsener682); + match(input,17,FOLLOW_17_in_ruleErwachsener674); createLeafNode(grammarAccess.prErwachsener().ele0000KeywordErwachsener(), null); - match(input,15,FOLLOW_15_in_ruleErwachsener691); + match(input,15,FOLLOW_15_in_ruleErwachsener683); createLeafNode(grammarAccess.prErwachsener().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:350:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:352:6: lv_name= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:353:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:355:6: lv_name_2= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener713); - - createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name"); - + lv_name_2=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener706); + + createLeafNode(grammarAccess.prErwachsener().ele0010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Erwachsener"); @@ -746,7 +748,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -757,14 +759,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:370:3: (lv_age= RULE_INT ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:372:6: lv_age= RULE_INT + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:373:3: (lv_age_3= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:375:6: lv_age_3= RULE_INT { - lv_age=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener746); - - createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age"); - + lv_age_3=(Token)input.LT(1); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener737); + + createLeafNode(grammarAccess.prErwachsener().ele010LexerRuleCallINT(), "age"); + if (current==null) { current = factory.create("Erwachsener"); @@ -772,7 +774,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "age", lv_age, "INT", currentNode); + set(current, "age", lv_age_3, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -783,7 +785,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleErwachsener767); + match(input,16,FOLLOW_16_in_ruleErwachsener755); createLeafNode(grammarAccess.prErwachsener().ele1KeywordRightParenthesis(), null); @@ -794,6 +796,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -809,7 +812,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleSpielzeug - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:403:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:406:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ; public final EObject entryRuleSpielzeug() throws RecognitionException { EObject current = null; @@ -817,16 +820,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:403:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:404:2: iv_ruleSpielzeug= ruleSpielzeug EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:406:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:407:2: iv_ruleSpielzeug= ruleSpielzeug EOF { currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug802); + pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug790); iv_ruleSpielzeug=ruleSpielzeug(); _fsp--; current =iv_ruleSpielzeug; - match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug812); + match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug800); } @@ -844,51 +847,51 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleSpielzeug - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:411:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) ; public final EObject ruleSpielzeug() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_farbe = null; + Token lv_name_2=null; + EObject lv_farbe_3 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:415:6: ( ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:419:6: ( ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:1: ( ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) ')' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:2: ( ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) (lv_farbe_3= ruleFarbe ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:4: ( 'spielzeug' '(' ) (lv_name= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:4: ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:4: ( 'spielzeug' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:416:5: 'spielzeug' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:4: ( 'spielzeug' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:420:5: 'spielzeug' '(' { - match(input,18,FOLLOW_18_in_ruleSpielzeug849); + match(input,18,FOLLOW_18_in_ruleSpielzeug837); createLeafNode(grammarAccess.prSpielzeug().ele0000KeywordSpielzeug(), null); - match(input,15,FOLLOW_15_in_ruleSpielzeug858); + match(input,15,FOLLOW_15_in_ruleSpielzeug846); createLeafNode(grammarAccess.prSpielzeug().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:424:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:426:6: lv_name= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:428:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:430:6: lv_name_2= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug880); - - createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name"); - + lv_name_2=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug869); + + createLeafNode(grammarAccess.prSpielzeug().ele0010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Spielzeug"); @@ -896,7 +899,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -907,14 +910,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:444:3: (lv_farbe= ruleFarbe ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:447:6: lv_farbe= ruleFarbe + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:448:3: (lv_farbe_3= ruleFarbe ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:451:6: lv_farbe_3= ruleFarbe { currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele010ParserRuleCallFarbe(), currentNode); - pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug926); - lv_farbe=ruleFarbe(); + pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug912); + lv_farbe_3=ruleFarbe(); _fsp--; @@ -924,7 +927,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "farbe", lv_farbe, "Farbe", currentNode); + set(current, "farbe", lv_farbe_3, "Farbe", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -936,7 +939,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleSpielzeug940); + match(input,16,FOLLOW_16_in_ruleSpielzeug926); createLeafNode(grammarAccess.prSpielzeug().ele1KeywordRightParenthesis(), null); @@ -947,6 +950,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -962,7 +966,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleFamilie - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:482:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ; public final EObject entryRuleFamilie() throws RecognitionException { EObject current = null; @@ -970,16 +974,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:49: (iv_ruleFamilie= ruleFamilie EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:2: iv_ruleFamilie= ruleFamilie EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:482:49: (iv_ruleFamilie= ruleFamilie EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:483:2: iv_ruleFamilie= ruleFamilie EOF { currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode); - pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie975); + pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie961); iv_ruleFamilie=ruleFamilie(); _fsp--; current =iv_ruleFamilie; - match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie985); + match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie971); } @@ -997,54 +1001,54 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFamilie - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:486:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:490:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) ; public final EObject ruleFamilie() throws RecognitionException { EObject current = null; - Token lv_name=null; + Token lv_name_2=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:490:6: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:495:6: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) ')' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( ',' ( RULE_ID ) )* { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:3: ( ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) ( RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:4: ( ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) ( RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:5: ( ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:7: ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:6: ( ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:7: ( 'familie' '(' ) (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:7: ( 'familie' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:491:8: 'familie' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:7: ( 'familie' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:496:8: 'familie' '(' { - match(input,19,FOLLOW_19_in_ruleFamilie1025); + match(input,19,FOLLOW_19_in_ruleFamilie1011); createLeafNode(grammarAccess.prFamilie().ele0000000KeywordFamilie(), null); - match(input,15,FOLLOW_15_in_ruleFamilie1034); + match(input,15,FOLLOW_15_in_ruleFamilie1020); createLeafNode(grammarAccess.prFamilie().ele0000001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:2: (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:501:6: lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:504:2: (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:6: lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:501:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) int alt8=2; int LA8_0 = input.LA(1); @@ -1056,15 +1060,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("501:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input); + new NoViableAltException("506:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input); throw nvae; } switch (alt8) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:501:15: ( 'keyword' | RULE_STRING ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:17: ( 'keyword' | RULE_STRING ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:501:15: ( 'keyword' | RULE_STRING ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:17: ( 'keyword' | RULE_STRING ) int alt7=2; int LA7_0 = input.LA(1); @@ -1076,15 +1080,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("501:15: ( 'keyword' | RULE_STRING )", 7, 0, input); + new NoViableAltException("506:17: ( 'keyword' | RULE_STRING )", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:501:16: 'keyword' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:18: 'keyword' { - match(input,20,FOLLOW_20_in_ruleFamilie1058); + match(input,20,FOLLOW_20_in_ruleFamilie1044); createLeafNode(grammarAccess.prFamilie().ele000001000KeywordKeyword(), "name"); @@ -1092,12 +1096,12 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:506:6: RULE_STRING + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:512:7: RULE_STRING { - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1073); - - createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name"); - + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1061); + + createLeafNode(grammarAccess.prFamilie().ele000001001LexerRuleCallSTRING(), "name"); + } break; @@ -1108,12 +1112,12 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:511:6: RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:518:7: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1088); - - createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name"); - + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1075); + + createLeafNode(grammarAccess.prFamilie().ele00000101LexerRuleCallID(), "name"); + } break; @@ -1127,7 +1131,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "name", input.LT(-1), null, currentNode); + set(current, "name", /* lv_name_2 */ input.LT(-1), null, lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1138,8 +1142,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:529:3: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:532:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:537:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:540:3: RULE_ID { if (current==null) { @@ -1147,24 +1151,18 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:538:1: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:539:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1125); - - createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1108); + createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter"); + } } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:544:3: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:547:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:553:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:556:3: RULE_ID { if (current==null) { @@ -1172,24 +1170,18 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:553:1: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:554:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1154); - - createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1134); + createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater"); + } } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:559:3: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:562:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:569:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:572:3: RULE_ID { if (current==null) { @@ -1197,23 +1189,17 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:568:1: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:569:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1183); - - createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1160); + createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder"); + } } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:574:3: ( ',' ( ( RULE_ID ) ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:3: ( ',' ( RULE_ID ) )* loop9: do { int alt9=2; @@ -1226,14 +1212,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser switch (alt9) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:574:4: ',' ( ( RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:4: ',' ( RULE_ID ) { - match(input,21,FOLLOW_21_in_ruleFamilie1198); + match(input,21,FOLLOW_21_in_ruleFamilie1174); createLeafNode(grammarAccess.prFamilie().ele010KeywordComma(), null); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:578:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:581:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:589:1: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:592:3: RULE_ID { if (current==null) { @@ -1241,16 +1227,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:587:1: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:588:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1222); - - createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1196); + createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder"); + } @@ -1266,7 +1246,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleFamilie1238); + match(input,16,FOLLOW_16_in_ruleFamilie1211); createLeafNode(grammarAccess.prFamilie().ele1KeywordRightParenthesis(), null); @@ -1277,6 +1257,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1292,7 +1273,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleFarbe - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:618:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ; public final EObject entryRuleFarbe() throws RecognitionException { EObject current = null; @@ -1300,16 +1281,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:47: (iv_ruleFarbe= ruleFarbe EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:607:2: iv_ruleFarbe= ruleFarbe EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:618:47: (iv_ruleFarbe= ruleFarbe EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:2: iv_ruleFarbe= ruleFarbe EOF { currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode); - pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1273); + pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1246); iv_ruleFarbe=ruleFarbe(); _fsp--; current =iv_ruleFarbe; - match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1283); + match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1256); } @@ -1327,22 +1308,22 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:626:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; - Token lv_wert=null; + Token lv_wert_0=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:618:6: ( (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:631:6: ( (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:632:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:6: lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:632:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:6: lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) int alt12=2; int LA12_0 = input.LA(1); @@ -1354,15 +1335,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("621:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )", 12, 0, input); + new NoViableAltException("634:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )", 12, 0, input); throw nvae; } switch (alt12) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) int alt11=2; int LA11_0 = input.LA(1); @@ -1374,15 +1355,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("621:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input); + new NoViableAltException("634:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:16: ( 'ROT' | 'BLAU' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:18: ( 'ROT' | 'BLAU' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:16: ( 'ROT' | 'BLAU' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:18: ( 'ROT' | 'BLAU' ) int alt10=2; int LA10_0 = input.LA(1); @@ -1394,15 +1375,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("621:16: ( 'ROT' | 'BLAU' )", 10, 0, input); + new NoViableAltException("634:18: ( 'ROT' | 'BLAU' )", 10, 0, input); throw nvae; } switch (alt10) { case 1 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:17: 'ROT' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:634:19: 'ROT' { - match(input,22,FOLLOW_22_in_ruleFarbe1331); + match(input,22,FOLLOW_22_in_ruleFarbe1304); createLeafNode(grammarAccess.prFarbe().ele0000KeywordROT(), "wert"); @@ -1410,9 +1391,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:626:6: 'BLAU' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'BLAU' { - match(input,23,FOLLOW_23_in_ruleFarbe1346); + match(input,23,FOLLOW_23_in_ruleFarbe1320); createLeafNode(grammarAccess.prFarbe().ele0001KeywordBLAU(), "wert"); @@ -1426,9 +1407,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:631:6: 'GELB' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:647:6: 'GELB' { - match(input,24,FOLLOW_24_in_ruleFarbe1362); + match(input,24,FOLLOW_24_in_ruleFarbe1338); createLeafNode(grammarAccess.prFarbe().ele001KeywordGELB(), "wert"); @@ -1442,9 +1423,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:636:6: 'GR\\u00DCN' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:654:6: 'GR\\u00DCN' { - match(input,25,FOLLOW_25_in_ruleFarbe1378); + match(input,25,FOLLOW_25_in_ruleFarbe1356); createLeafNode(grammarAccess.prFarbe().ele01KeywordGRÜN(), "wert"); @@ -1461,7 +1442,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "wert", input.LT(-1), null, currentNode); + set(current, "wert", /* lv_wert_0 */ input.LT(-1), null, lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1473,6 +1454,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1488,7 +1470,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleCustomTypeParserRule - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:663:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:683:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ; public final EObject entryRuleCustomTypeParserRule() throws RecognitionException { EObject current = null; @@ -1496,16 +1478,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:663:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:664:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:683:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF { currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1425); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1405); iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule(); _fsp--; current =iv_ruleCustomTypeParserRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1435); + match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1415); } @@ -1523,33 +1505,33 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleCustomTypeParserRule - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:671:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name= RULE_ID ) ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:691:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name_1= RULE_ID ) ) ; public final EObject ruleCustomTypeParserRule() throws RecognitionException { EObject current = null; - Token lv_name=null; + Token lv_name_1=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:675:6: ( ( 'type' (lv_name= RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:1: ( 'type' (lv_name= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:696:6: ( ( 'type' (lv_name_1= RULE_ID ) ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:1: ( 'type' (lv_name_1= RULE_ID ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:1: ( 'type' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:2: 'type' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:1: ( 'type' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:697:2: 'type' (lv_name_1= RULE_ID ) { - match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1469); + match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1449); createLeafNode(grammarAccess.prCustomTypeParserRule().ele0KeywordType(), null); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:682:6: lv_name= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:701:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:703:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1490); - - createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1471); + + createLeafNode(grammarAccess.prCustomTypeParserRule().ele10LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("CustomType"); @@ -1557,7 +1539,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1572,6 +1554,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1591,58 +1574,58 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser public static final BitSet FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz72 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleSpielplatz82 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_11_in_ruleSpielplatz120 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleSpielplatz141 = new BitSet(new long[]{0x0000000000001020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz174 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleSpielplatz196 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz235 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz279 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz324 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz369 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz414 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_13_in_ruleSpielplatz430 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleKind_in_entryRuleKind468 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleKind478 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_ruleKind515 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleKind524 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleKind546 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleKind579 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleKind600 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener635 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener645 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleErwachsener682 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleErwachsener691 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener713 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener746 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleErwachsener767 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug802 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug812 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleSpielzeug849 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleSpielzeug858 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug880 = new BitSet(new long[]{0x0000000003C00000L}); - public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug926 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleSpielzeug940 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie975 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFamilie985 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_19_in_ruleFamilie1025 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleFamilie1034 = new BitSet(new long[]{0x0000000000100060L}); - public static final BitSet FOLLOW_20_in_ruleFamilie1058 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1073 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1088 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1125 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1154 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1183 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_21_in_ruleFamilie1198 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1222 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_16_in_ruleFamilie1238 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1273 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1283 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleFarbe1331 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_ruleFarbe1346 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_24_in_ruleFarbe1362 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_25_in_ruleFarbe1378 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1425 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1435 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1469 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1490 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleSpielplatz142 = new BitSet(new long[]{0x0000000000001020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz173 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_12_in_ruleSpielplatz192 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz231 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz275 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz320 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz365 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz410 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_13_in_ruleSpielplatz426 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleKind_in_entryRuleKind464 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleKind474 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleKind511 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleKind520 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleKind543 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleKind574 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleKind592 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener627 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener637 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleErwachsener674 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleErwachsener683 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener706 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener737 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleErwachsener755 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug790 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug800 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleSpielzeug837 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleSpielzeug846 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug869 = new BitSet(new long[]{0x0000000003C00000L}); + public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug912 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleSpielzeug926 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie961 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFamilie971 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleFamilie1011 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleFamilie1020 = new BitSet(new long[]{0x0000000000100060L}); + public static final BitSet FOLLOW_20_in_ruleFamilie1044 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1061 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1075 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1108 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1134 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1160 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_21_in_ruleFamilie1174 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1196 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_16_in_ruleFamilie1211 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1246 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1256 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleFarbe1304 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_23_in_ruleFarbe1320 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_24_in_ruleFarbe1338 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_25_in_ruleFarbe1356 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1405 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1415 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1449 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1471 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g index 82c6a5e..207a484 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g @@ -24,28 +24,28 @@ T24 : 'GELB' ; T25 : 'GR\u00DCN' ; T26 : 'type' ; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 724 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 745 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 726 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 747 RULE_INT : ('0'..'9')+; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 728 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 749 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'' ; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 733 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 754 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/'; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 735 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 756 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 737 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 758 RULE_WS : (' '|'\t'|'\r'|'\n')+; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 739 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 760 RULE_ANY_OTHER : .; diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g index 95be4c7..2e3a521 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g @@ -79,6 +79,7 @@ ruleFile returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (( @@ -86,7 +87,7 @@ ruleFile returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prFile().ele00ParserRuleCallImport(), currentNode); } - lv_imports=ruleImport + lv_imports_0=ruleImport { if ($current==null) { $current = factory.create("File"); @@ -94,7 +95,7 @@ ruleFile returns [EObject current=null] } try { - factory.add($current, "imports", lv_imports, "Import", currentNode); + add($current, "imports", lv_imports_0, "Import", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -107,7 +108,7 @@ ruleFile returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prFile().ele10ParserRuleCallNamedElement(), currentNode); } - lv_namedElements=ruleNamedElement + lv_namedElements_1=ruleNamedElement { if ($current==null) { $current = factory.create("File"); @@ -115,7 +116,7 @@ ruleFile returns [EObject current=null] } try { - factory.add($current, "namedElements", lv_namedElements, "NamedElement", currentNode); + add($current, "namedElements", lv_namedElements_1, "NamedElement", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -143,6 +144,7 @@ ruleImport returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ('import' { @@ -150,10 +152,10 @@ ruleImport returns [EObject current=null] } ( - lv_importURI=RULE_STRING - { - createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI"); - } + lv_importURI_1= RULE_STRING + { + createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI"); + } { if ($current==null) { @@ -162,7 +164,7 @@ ruleImport returns [EObject current=null] } try { - factory.set($current, "importURI", lv_importURI, "STRING", currentNode); + set($current, "importURI", lv_importURI_1, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -189,14 +191,15 @@ ruleNamedElement returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode); } - this_Package=rulePackage + this_Package_0=rulePackage { - $current = $this_Package.current; + $current = $this_Package_0.current; currentNode = currentNode.getParent(); } @@ -204,9 +207,9 @@ ruleNamedElement returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); } - this_Type=ruleType + this_Type_1=ruleType { - $current = $this_Type.current; + $current = $this_Type_1.current; currentNode = currentNode.getParent(); } ); @@ -230,6 +233,7 @@ rulePackage returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((('package' { @@ -241,7 +245,7 @@ rulePackage returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prPackage().ele00010ParserRuleCallQualifiedName(), currentNode); } - lv_name=ruleQualifiedName + lv_name_1=ruleQualifiedName { if ($current==null) { $current = factory.create("Package"); @@ -249,7 +253,7 @@ rulePackage returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "QualifiedName", currentNode); + set($current, "name", lv_name_1, "QualifiedName", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -266,7 +270,7 @@ rulePackage returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prPackage().ele010ParserRuleCallNamedElement(), currentNode); } - lv_namedElements=ruleNamedElement + lv_namedElements_3=ruleNamedElement { if ($current==null) { $current = factory.create("Package"); @@ -274,7 +278,7 @@ rulePackage returns [EObject current=null] } try { - factory.add($current, "namedElements", lv_namedElements, "NamedElement", currentNode); + add($current, "namedElements", lv_namedElements_3, "NamedElement", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -306,14 +310,15 @@ ruleType returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode); } - this_Entity=ruleEntity + this_Entity_0=ruleEntity { - $current = $this_Entity.current; + $current = $this_Entity_0.current; currentNode = currentNode.getParent(); } @@ -321,9 +326,9 @@ ruleType returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); } - this_DataType=ruleDataType + this_DataType_1=ruleDataType { - $current = $this_DataType.current; + $current = $this_DataType_1.current; currentNode = currentNode.getParent(); } ); @@ -347,6 +352,7 @@ ruleDataType returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ('datatype' { @@ -354,10 +360,10 @@ ruleDataType returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -366,7 +372,7 @@ ruleDataType returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -393,6 +399,7 @@ ruleEntity returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((((('entity' { @@ -400,10 +407,10 @@ ruleEntity returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -412,7 +419,7 @@ ruleEntity returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -431,11 +438,12 @@ ruleEntity returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType"); + } + + // TODO assign feature to currentNode ))?)'{' { @@ -447,7 +455,7 @@ ruleEntity returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEntity().ele010ParserRuleCallFeature(), currentNode); } - lv_features=ruleFeature + lv_features_5=ruleFeature { if ($current==null) { $current = factory.create("Entity"); @@ -455,7 +463,7 @@ ruleEntity returns [EObject current=null] } try { - factory.add($current, "features", lv_features, "Feature", currentNode); + add($current, "features", lv_features_5, "Feature", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -487,14 +495,15 @@ ruleFeature returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode); } - this_StructuralFeature=ruleStructuralFeature + this_StructuralFeature_0=ruleStructuralFeature { - $current = $this_StructuralFeature.current; + $current = $this_StructuralFeature_0.current; currentNode = currentNode.getParent(); } @@ -502,9 +511,9 @@ ruleFeature returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); } - this_Operation=ruleOperation + this_Operation_1=ruleOperation { - $current = $this_Operation.current; + $current = $this_Operation_1.current; currentNode = currentNode.getParent(); } ); @@ -528,14 +537,15 @@ ruleStructuralFeature returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode); } - this_Attribute=ruleAttribute + this_Attribute_0=ruleAttribute { - $current = $this_Attribute.current; + $current = $this_Attribute_0.current; currentNode = currentNode.getParent(); } @@ -543,9 +553,9 @@ ruleStructuralFeature returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); } - this_Reference=ruleReference + this_Reference_1=ruleReference { - $current = $this_Reference.current; + $current = $this_Reference_1.current; currentNode = currentNode.getParent(); } ); @@ -569,6 +579,7 @@ ruleAttribute returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((('attr' { @@ -576,10 +587,10 @@ ruleAttribute returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -588,7 +599,7 @@ ruleAttribute returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -604,7 +615,7 @@ ruleAttribute returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prAttribute().ele10ParserRuleCallTypeRef(), currentNode); } - lv_type=ruleTypeRef + lv_type_3=ruleTypeRef { if ($current==null) { $current = factory.create("Attribute"); @@ -612,7 +623,7 @@ ruleAttribute returns [EObject current=null] } try { - factory.set($current, "type", lv_type, "TypeRef", currentNode); + set($current, "type", lv_type_3, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -640,6 +651,7 @@ ruleReference returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((('ref' { @@ -647,10 +659,10 @@ ruleReference returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -659,7 +671,7 @@ ruleReference returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -675,7 +687,7 @@ ruleReference returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prReference().ele010ParserRuleCallTypeRef(), currentNode); } - lv_type=ruleTypeRef + lv_type_3=ruleTypeRef { if ($current==null) { $current = factory.create("Reference"); @@ -683,7 +695,7 @@ ruleReference returns [EObject current=null] } try { - factory.set($current, "type", lv_type, "TypeRef", currentNode); + set($current, "type", lv_type_3, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -703,11 +715,12 @@ ruleReference returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite"); + } + + // TODO assign feature to currentNode ))?); @@ -730,6 +743,7 @@ ruleOperation returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((('op' { @@ -737,10 +751,10 @@ ruleOperation returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -749,7 +763,7 @@ ruleOperation returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -765,7 +779,7 @@ ruleOperation returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prOperation().ele000100ParserRuleCallParameter(), currentNode); } - lv_params=ruleParameter + lv_params_3=ruleParameter { if ($current==null) { $current = factory.create("Operation"); @@ -773,7 +787,7 @@ ruleOperation returns [EObject current=null] } try { - factory.add($current, "params", lv_params, "Parameter", currentNode); + add($current, "params", lv_params_3, "Parameter", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -790,7 +804,7 @@ ruleOperation returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prOperation().ele0001110ParserRuleCallParameter(), currentNode); } - lv_params=ruleParameter + lv_params_5=ruleParameter { if ($current==null) { $current = factory.create("Operation"); @@ -798,7 +812,7 @@ ruleOperation returns [EObject current=null] } try { - factory.add($current, "params", lv_params, "Parameter", currentNode); + add($current, "params", lv_params_5, "Parameter", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -819,7 +833,7 @@ ruleOperation returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prOperation().ele10ParserRuleCallTypeRef(), currentNode); } - lv_type=ruleTypeRef + lv_type_8=ruleTypeRef { if ($current==null) { $current = factory.create("Operation"); @@ -827,7 +841,7 @@ ruleOperation returns [EObject current=null] } try { - factory.set($current, "type", lv_type, "TypeRef", currentNode); + set($current, "type", lv_type_8, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -855,13 +869,14 @@ ruleParameter returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name"); - } + lv_name_0= RULE_ID + { + createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -870,7 +885,7 @@ ruleParameter returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_0, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -882,7 +897,7 @@ ruleParameter returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode); } - lv_type=ruleTypeRef + lv_type_1=ruleTypeRef { if ($current==null) { $current = factory.create("Parameter"); @@ -890,7 +905,7 @@ ruleParameter returns [EObject current=null] } try { - factory.set($current, "type", lv_type, "TypeRef", currentNode); + set($current, "type", lv_type_1, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -920,6 +935,7 @@ ruleTypeRef returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( @@ -930,11 +946,12 @@ ruleTypeRef returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); + } + + // TODO assign feature to currentNode ); @@ -957,9 +974,11 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT @init { setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; + lastConsumedDatatypeToken = $current; }: -( this_ID=RULE_ID { - $current.merge(this_ID); +( this_ID_0=RULE_ID { + $current.merge(this_ID_0); } { @@ -971,8 +990,8 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT $current.merge(kw); createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null); } - this_ID=RULE_ID { - $current.merge(this_ID); + this_ID_2=RULE_ID { + $current.merge(this_ID_2); } { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java index 54f3306..0d78f94 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelLexer.java @@ -343,10 +343,10 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:11: ( '^' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -355,7 +355,7 @@ public class InternalDomainmodelLexer extends Lexer { } switch (alt1) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:12: '^' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:12: '^' { match('^'); @@ -374,7 +374,7 @@ public class InternalDomainmodelLexer extends Lexer { recover(mse); throw mse; } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1022:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1041:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -422,10 +422,10 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -439,7 +439,7 @@ public class InternalDomainmodelLexer extends Lexer { switch (alt3) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1024:13: '0' .. '9' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1043:13: '0' .. '9' { matchRange('0','9'); @@ -469,7 +469,7 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1026:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1045:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -481,16 +481,16 @@ public class InternalDomainmodelLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1026:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("1045:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1027:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1027:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -506,7 +506,7 @@ public class InternalDomainmodelLexer extends Lexer { switch (alt4) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1027:12: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:12: '\\\\' ( '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' ) { @@ -523,7 +523,7 @@ public class InternalDomainmodelLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1027:56: ~ ( '\\\\' | '\"' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1046:56: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -549,10 +549,10 @@ public class InternalDomainmodelLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -568,7 +568,7 @@ public class InternalDomainmodelLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:22: '\\\\' ( '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' ) { @@ -585,7 +585,7 @@ public class InternalDomainmodelLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1028:66: ~ ( '\\\\' | '\\'' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1047:66: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -623,12 +623,12 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1031:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1031:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1031:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -653,7 +653,7 @@ public class InternalDomainmodelLexer extends Lexer { switch (alt7) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1031:52: . + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1050:52: . { matchAny(); @@ -681,12 +681,12 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:24: (~ ( '\\n' | '\\r' ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -699,7 +699,7 @@ public class InternalDomainmodelLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:24: ~ ( '\\n' | '\\r' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:24: ~ ( '\\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(); @@ -720,7 +720,7 @@ public class InternalDomainmodelLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:38: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -729,9 +729,9 @@ public class InternalDomainmodelLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:39: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:39: ( '\\r' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -740,7 +740,7 @@ public class InternalDomainmodelLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1033:39: '\\r' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1052:39: '\\r' { match('\r'); @@ -770,10 +770,10 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1035:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1035:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1035:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1054:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -826,8 +826,8 @@ public class InternalDomainmodelLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1037:16: ( . ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1037:18: . + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:16: ( . ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:18: . { matchAny(); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java index 7d24958..d91ee8d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java @@ -100,25 +100,25 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleFile - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:78:1: ruleFile returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:78:1: ruleFile returns [EObject current=null] : ( (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) ; public final EObject ruleFile() throws RecognitionException { EObject current = null; - EObject lv_imports = null; + EObject lv_imports_0 = null; - EObject lv_namedElements = null; + EObject lv_namedElements_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:82:6: ( ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:6: ( ( (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:1: ( (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:1: ( (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:2: (lv_imports= ruleImport )* (lv_namedElements= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:1: ( (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:2: (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:2: (lv_imports= ruleImport )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:84:2: (lv_imports_0= ruleImport )* loop1: do { int alt1=2; @@ -131,13 +131,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt1) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:86:6: lv_imports= ruleImport + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:87:6: lv_imports_0= ruleImport { currentNode=createCompositeNode(grammarAccess.prFile().ele00ParserRuleCallImport(), currentNode); pushFollow(FOLLOW_ruleImport_in_ruleFile141); - lv_imports=ruleImport(); + lv_imports_0=ruleImport(); _fsp--; @@ -147,7 +147,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "imports", lv_imports, "Import", currentNode); + add(current, "imports", lv_imports_0, "Import", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -162,7 +162,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:104:3: (lv_namedElements= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:105:3: (lv_namedElements_1= ruleNamedElement )* loop2: do { int alt2=2; @@ -175,13 +175,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt2) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:107:6: lv_namedElements= ruleNamedElement + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:108:6: lv_namedElements_1= ruleNamedElement { currentNode=createCompositeNode(grammarAccess.prFile().ele10ParserRuleCallNamedElement(), currentNode); pushFollow(FOLLOW_ruleNamedElement_in_ruleFile180); - lv_namedElements=ruleNamedElement(); + lv_namedElements_1=ruleNamedElement(); _fsp--; @@ -191,7 +191,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "namedElements", lv_namedElements, "NamedElement", currentNode); + add(current, "namedElements", lv_namedElements_1, "NamedElement", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -213,6 +213,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -228,7 +229,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleImport - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:134:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:135:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -236,8 +237,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:134:48: (iv_ruleImport= ruleImport EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:135:2: iv_ruleImport= ruleImport EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:135:48: (iv_ruleImport= ruleImport EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:136:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode(grammarAccess.prImport().getRule(), currentNode); pushFollow(FOLLOW_ruleImport_in_entryRuleImport220); @@ -263,33 +264,33 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleImport - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:142:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:143:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI_1= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; - Token lv_importURI=null; + Token lv_importURI_1=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:146:6: ( ( 'import' (lv_importURI= RULE_STRING ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:147:1: ( 'import' (lv_importURI= RULE_STRING ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:148:6: ( ( 'import' (lv_importURI_1= RULE_STRING ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:149:1: ( 'import' (lv_importURI_1= RULE_STRING ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:147:1: ( 'import' (lv_importURI= RULE_STRING ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:147:2: 'import' (lv_importURI= RULE_STRING ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:149:1: ( 'import' (lv_importURI_1= RULE_STRING ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:149:2: 'import' (lv_importURI_1= RULE_STRING ) { match(input,11,FOLLOW_11_in_ruleImport264); createLeafNode(grammarAccess.prImport().ele0KeywordImport(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:151:1: (lv_importURI= RULE_STRING ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:153:6: lv_importURI= RULE_STRING + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:153:1: (lv_importURI_1= RULE_STRING ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:155:6: lv_importURI_1= RULE_STRING { - lv_importURI=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285); - - createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI"); - + lv_importURI_1=(Token)input.LT(1); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport286); + + createLeafNode(grammarAccess.prImport().ele10LexerRuleCallSTRING(), "importURI"); + if (current==null) { current = factory.create("Import"); @@ -297,7 +298,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "importURI", lv_importURI, "STRING", currentNode); + set(current, "importURI", lv_importURI_1, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -312,6 +313,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -327,7 +329,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleNamedElement - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:180:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ; public final EObject entryRuleNamedElement() throws RecognitionException { EObject current = null; @@ -335,16 +337,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:180:54: (iv_ruleNamedElement= ruleNamedElement EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:181:2: iv_ruleNamedElement= ruleNamedElement EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:54: (iv_ruleNamedElement= ruleNamedElement EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:183:2: iv_ruleNamedElement= ruleNamedElement EOF { currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode); - pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement331); + pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement329); iv_ruleNamedElement=ruleNamedElement(); _fsp--; current =iv_ruleNamedElement; - match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement341); + match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement339); } @@ -362,22 +364,22 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleNamedElement - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:188:1: ruleNamedElement returns [EObject current=null] : (this_Package= rulePackage | this_Type= ruleType ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:190:1: ruleNamedElement returns [EObject current=null] : (this_Package_0= rulePackage | this_Type_1= ruleType ) ; public final EObject ruleNamedElement() throws RecognitionException { EObject current = null; - EObject this_Package = null; + EObject this_Package_0 = null; - EObject this_Type = null; + EObject this_Type_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:192:6: ( (this_Package= rulePackage | this_Type= ruleType ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:193:1: (this_Package= rulePackage | this_Type= ruleType ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:195:6: ( (this_Package_0= rulePackage | this_Type_1= ruleType ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:196:1: (this_Package_0= rulePackage | this_Type_1= ruleType ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:193:1: (this_Package= rulePackage | this_Type= ruleType ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:196:1: (this_Package_0= rulePackage | this_Type_1= ruleType ) int alt3=2; int LA3_0 = input.LA(1); @@ -389,40 +391,40 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("193:1: (this_Package= rulePackage | this_Type= ruleType )", 3, 0, input); + new NoViableAltException("196:1: (this_Package_0= rulePackage | this_Type_1= ruleType )", 3, 0, input); throw nvae; } switch (alt3) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:194:5: this_Package= rulePackage + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:197:5: this_Package_0= rulePackage { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode); - pushFollow(FOLLOW_rulePackage_in_ruleNamedElement388); - this_Package=rulePackage(); + pushFollow(FOLLOW_rulePackage_in_ruleNamedElement386); + this_Package_0=rulePackage(); _fsp--; - current = this_Package; + current = this_Package_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:204:5: this_Type= ruleType + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:207:5: this_Type_1= ruleType { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); - pushFollow(FOLLOW_ruleType_in_ruleNamedElement415); - this_Type=ruleType(); + pushFollow(FOLLOW_ruleType_in_ruleNamedElement413); + this_Type_1=ruleType(); _fsp--; - current = this_Type; + current = this_Type_1; currentNode = currentNode.getParent(); @@ -435,6 +437,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -450,7 +453,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRulePackage - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:221:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ; public final EObject entryRulePackage() throws RecognitionException { EObject current = null; @@ -458,16 +461,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:221:49: (iv_rulePackage= rulePackage EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:222:2: iv_rulePackage= rulePackage EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:49: (iv_rulePackage= rulePackage EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:225:2: iv_rulePackage= rulePackage EOF { currentNode = createCompositeNode(grammarAccess.prPackage().getRule(), currentNode); - pushFollow(FOLLOW_rulePackage_in_entryRulePackage449); + pushFollow(FOLLOW_rulePackage_in_entryRulePackage447); iv_rulePackage=rulePackage(); _fsp--; current =iv_rulePackage; - match(input,EOF,FOLLOW_EOF_in_entryRulePackage459); + match(input,EOF,FOLLOW_EOF_in_entryRulePackage457); } @@ -485,45 +488,45 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start rulePackage - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:229:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:232:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) ; public final EObject rulePackage() throws RecognitionException { EObject current = null; - AntlrDatatypeRuleToken lv_name = null; + AntlrDatatypeRuleToken lv_name_1 = null; - EObject lv_namedElements = null; + EObject lv_namedElements_3 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:233:6: ( ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:6: ( ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:1: ( ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) '}' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:1: ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:2: ( ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) (lv_namedElements= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:2: ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:3: ( ( 'package' (lv_name= ruleQualifiedName ) ) '{' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:4: ( 'package' (lv_name= ruleQualifiedName ) ) '{' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:4: ( 'package' (lv_name= ruleQualifiedName ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:234:5: 'package' (lv_name= ruleQualifiedName ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:5: 'package' (lv_name_1= ruleQualifiedName ) { - match(input,12,FOLLOW_12_in_rulePackage496); + match(input,12,FOLLOW_12_in_rulePackage494); createLeafNode(grammarAccess.prPackage().ele0000KeywordPackage(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:238:1: (lv_name= ruleQualifiedName ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:241:6: lv_name= ruleQualifiedName + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:242:1: (lv_name_1= ruleQualifiedName ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:245:6: lv_name_1= ruleQualifiedName { currentNode=createCompositeNode(grammarAccess.prPackage().ele00010ParserRuleCallQualifiedName(), currentNode); - pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage530); - lv_name=ruleQualifiedName(); + pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage528); + lv_name_1=ruleQualifiedName(); _fsp--; @@ -533,7 +536,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "QualifiedName", currentNode); + set(current, "name", lv_name_1, "QualifiedName", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -545,14 +548,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_rulePackage544); + match(input,13,FOLLOW_13_in_rulePackage542); createLeafNode(grammarAccess.prPackage().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:263:2: (lv_namedElements= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:267:2: (lv_namedElements_3= ruleNamedElement )* loop4: do { int alt4=2; @@ -565,13 +568,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt4) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:266:6: lv_namedElements= ruleNamedElement + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:270:6: lv_namedElements_3= ruleNamedElement { currentNode=createCompositeNode(grammarAccess.prPackage().ele010ParserRuleCallNamedElement(), currentNode); - pushFollow(FOLLOW_ruleNamedElement_in_rulePackage579); - lv_namedElements=ruleNamedElement(); + pushFollow(FOLLOW_ruleNamedElement_in_rulePackage577); + lv_namedElements_3=ruleNamedElement(); _fsp--; @@ -581,7 +584,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "namedElements", lv_namedElements, "NamedElement", currentNode); + add(current, "namedElements", lv_namedElements_3, "NamedElement", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -599,7 +602,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,14,FOLLOW_14_in_rulePackage594); + match(input,14,FOLLOW_14_in_rulePackage592); createLeafNode(grammarAccess.prPackage().ele1KeywordRightCurlyBracket(), null); @@ -610,6 +613,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -625,7 +629,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleType - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:297:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; public final EObject entryRuleType() throws RecognitionException { EObject current = null; @@ -633,16 +637,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:297:46: (iv_ruleType= ruleType EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:298:2: iv_ruleType= ruleType EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:46: (iv_ruleType= ruleType EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:302:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode); - pushFollow(FOLLOW_ruleType_in_entryRuleType629); + pushFollow(FOLLOW_ruleType_in_entryRuleType627); iv_ruleType=ruleType(); _fsp--; current =iv_ruleType; - match(input,EOF,FOLLOW_EOF_in_entryRuleType639); + match(input,EOF,FOLLOW_EOF_in_entryRuleType637); } @@ -660,22 +664,22 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleType - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:305:1: ruleType returns [EObject current=null] : (this_Entity= ruleEntity | this_DataType= ruleDataType ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:309:1: ruleType returns [EObject current=null] : (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) ; public final EObject ruleType() throws RecognitionException { EObject current = null; - EObject this_Entity = null; + EObject this_Entity_0 = null; - EObject this_DataType = null; + EObject this_DataType_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:309:6: ( (this_Entity= ruleEntity | this_DataType= ruleDataType ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:310:1: (this_Entity= ruleEntity | this_DataType= ruleDataType ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:314:6: ( (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:310:1: (this_Entity= ruleEntity | this_DataType= ruleDataType ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType ) int alt5=2; int LA5_0 = input.LA(1); @@ -687,40 +691,40 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("310:1: (this_Entity= ruleEntity | this_DataType= ruleDataType )", 5, 0, input); + new NoViableAltException("315:1: (this_Entity_0= ruleEntity | this_DataType_1= ruleDataType )", 5, 0, input); throw nvae; } switch (alt5) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:311:5: this_Entity= ruleEntity + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:316:5: this_Entity_0= ruleEntity { currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode); - pushFollow(FOLLOW_ruleEntity_in_ruleType686); - this_Entity=ruleEntity(); + pushFollow(FOLLOW_ruleEntity_in_ruleType684); + this_Entity_0=ruleEntity(); _fsp--; - current = this_Entity; + current = this_Entity_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:321:5: this_DataType= ruleDataType + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:326:5: this_DataType_1= ruleDataType { currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); - pushFollow(FOLLOW_ruleDataType_in_ruleType713); - this_DataType=ruleDataType(); + pushFollow(FOLLOW_ruleDataType_in_ruleType711); + this_DataType_1=ruleDataType(); _fsp--; - current = this_DataType; + current = this_DataType_1; currentNode = currentNode.getParent(); @@ -733,6 +737,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -748,7 +753,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleDataType - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:338:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ; public final EObject entryRuleDataType() throws RecognitionException { EObject current = null; @@ -756,16 +761,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:338:50: (iv_ruleDataType= ruleDataType EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:339:2: iv_ruleDataType= ruleDataType EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:50: (iv_ruleDataType= ruleDataType EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:344:2: iv_ruleDataType= ruleDataType EOF { currentNode = createCompositeNode(grammarAccess.prDataType().getRule(), currentNode); - pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType747); + pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType745); iv_ruleDataType=ruleDataType(); _fsp--; current =iv_ruleDataType; - match(input,EOF,FOLLOW_EOF_in_entryRuleDataType757); + match(input,EOF,FOLLOW_EOF_in_entryRuleDataType755); } @@ -783,33 +788,33 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleDataType - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:346:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name= RULE_ID ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:351:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ; public final EObject ruleDataType() throws RecognitionException { EObject current = null; - Token lv_name=null; + Token lv_name_1=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:350:6: ( ( 'datatype' (lv_name= RULE_ID ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:351:1: ( 'datatype' (lv_name= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:1: ( 'datatype' (lv_name_1= RULE_ID ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:351:1: ( 'datatype' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:351:2: 'datatype' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:1: ( 'datatype' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:2: 'datatype' (lv_name_1= RULE_ID ) { - match(input,15,FOLLOW_15_in_ruleDataType791); + match(input,15,FOLLOW_15_in_ruleDataType789); createLeafNode(grammarAccess.prDataType().ele0KeywordDatatype(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:355:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:357:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:361:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:363:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType812); - - createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType811); + + createLeafNode(grammarAccess.prDataType().ele10LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("DataType"); @@ -817,7 +822,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -832,6 +837,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -847,7 +853,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEntity - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:384:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ; public final EObject entryRuleEntity() throws RecognitionException { EObject current = null; @@ -855,16 +861,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:384:48: (iv_ruleEntity= ruleEntity EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:385:2: iv_ruleEntity= ruleEntity EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:390:48: (iv_ruleEntity= ruleEntity EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:391:2: iv_ruleEntity= ruleEntity EOF { currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode); - pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity858); + pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity854); iv_ruleEntity=ruleEntity(); _fsp--; current =iv_ruleEntity; - match(input,EOF,FOLLOW_EOF_in_entryRuleEntity868); + match(input,EOF,FOLLOW_EOF_in_entryRuleEntity864); } @@ -882,47 +888,47 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEntity - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:392:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:398:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) ; public final EObject ruleEntity() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_features = null; + Token lv_name_1=null; + EObject lv_features_5 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:396:6: ( ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:403:6: ( ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:1: ( ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) '}' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:1: ( ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) '}' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:2: ( ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) (lv_features= ruleFeature )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:2: ( ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) (lv_features_5= ruleFeature )* { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:3: ( ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) '{' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:3: ( ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) '{' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:4: ( ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:5: ( 'entity' (lv_name= RULE_ID ) ) ( 'extends' ( ( RULE_ID ) ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:4: ( ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:5: ( 'entity' (lv_name_1= RULE_ID ) ) ( 'extends' ( RULE_ID ) )? { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:5: ( 'entity' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:397:6: 'entity' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:5: ( 'entity' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:404:6: 'entity' (lv_name_1= RULE_ID ) { - match(input,16,FOLLOW_16_in_ruleEntity906); + match(input,16,FOLLOW_16_in_ruleEntity902); createLeafNode(grammarAccess.prEntity().ele00000KeywordEntity(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:401:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:403:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:408:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:410:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity927); - - createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity924); + + createLeafNode(grammarAccess.prEntity().ele000010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Entity"); @@ -930,7 +936,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -941,7 +947,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:421:3: ( 'extends' ( ( RULE_ID ) ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:428:3: ( 'extends' ( RULE_ID ) )? int alt6=2; int LA6_0 = input.LA(1); @@ -950,14 +956,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } switch (alt6) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:421:4: 'extends' ( ( RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:428:4: 'extends' ( RULE_ID ) { - match(input,17,FOLLOW_17_in_ruleEntity949); + match(input,17,FOLLOW_17_in_ruleEntity943); createLeafNode(grammarAccess.prEntity().ele00010KeywordExtends(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:425:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:428:3: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:3: RULE_ID { if (current==null) { @@ -965,16 +971,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:434:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity973); - - createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity965); + createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType"); + } @@ -987,14 +987,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_ruleEntity989); + match(input,13,FOLLOW_13_in_ruleEntity980); createLeafNode(grammarAccess.prEntity().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:444:2: (lv_features= ruleFeature )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:452:2: (lv_features_5= ruleFeature )* loop7: do { int alt7=2; @@ -1007,13 +1007,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt7) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:447:6: lv_features= ruleFeature + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:455:6: lv_features_5= ruleFeature { currentNode=createCompositeNode(grammarAccess.prEntity().ele010ParserRuleCallFeature(), currentNode); - pushFollow(FOLLOW_ruleFeature_in_ruleEntity1024); - lv_features=ruleFeature(); + pushFollow(FOLLOW_ruleFeature_in_ruleEntity1015); + lv_features_5=ruleFeature(); _fsp--; @@ -1023,7 +1023,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "features", lv_features, "Feature", currentNode); + add(current, "features", lv_features_5, "Feature", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1041,7 +1041,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,14,FOLLOW_14_in_ruleEntity1039); + match(input,14,FOLLOW_14_in_ruleEntity1030); createLeafNode(grammarAccess.prEntity().ele1KeywordRightCurlyBracket(), null); @@ -1052,6 +1052,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1067,7 +1068,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:478:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ; public final EObject entryRuleFeature() throws RecognitionException { EObject current = null; @@ -1075,16 +1076,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:478:49: (iv_ruleFeature= ruleFeature EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:479:2: iv_ruleFeature= ruleFeature EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:49: (iv_ruleFeature= ruleFeature EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:487:2: iv_ruleFeature= ruleFeature EOF { currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode); - pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1074); + pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1065); iv_ruleFeature=ruleFeature(); _fsp--; current =iv_ruleFeature; - match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1084); + match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1075); } @@ -1102,22 +1103,22 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:486:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:494:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ; public final EObject ruleFeature() throws RecognitionException { EObject current = null; - EObject this_StructuralFeature = null; + EObject this_StructuralFeature_0 = null; - EObject this_Operation = null; + EObject this_Operation_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:490:6: ( (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:491:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:499:6: ( (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:491:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) int alt8=2; int LA8_0 = input.LA(1); @@ -1129,40 +1130,40 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("491:1: (this_StructuralFeature= ruleStructuralFeature | this_Operation= ruleOperation )", 8, 0, input); + new NoViableAltException("500:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )", 8, 0, input); throw nvae; } switch (alt8) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:492:5: this_StructuralFeature= ruleStructuralFeature + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:501:5: this_StructuralFeature_0= ruleStructuralFeature { currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode); - pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1131); - this_StructuralFeature=ruleStructuralFeature(); + pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1122); + this_StructuralFeature_0=ruleStructuralFeature(); _fsp--; - current = this_StructuralFeature; + current = this_StructuralFeature_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:502:5: this_Operation= ruleOperation + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:511:5: this_Operation_1= ruleOperation { currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); - pushFollow(FOLLOW_ruleOperation_in_ruleFeature1158); - this_Operation=ruleOperation(); + pushFollow(FOLLOW_ruleOperation_in_ruleFeature1149); + this_Operation_1=ruleOperation(); _fsp--; - current = this_Operation; + current = this_Operation_1; currentNode = currentNode.getParent(); @@ -1175,6 +1176,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1190,7 +1192,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleStructuralFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:519:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:528:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ; public final EObject entryRuleStructuralFeature() throws RecognitionException { EObject current = null; @@ -1198,16 +1200,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:519:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:520:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:528:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:529:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF { currentNode = createCompositeNode(grammarAccess.prStructuralFeature().getRule(), currentNode); - pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1192); + pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1183); iv_ruleStructuralFeature=ruleStructuralFeature(); _fsp--; current =iv_ruleStructuralFeature; - match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1202); + match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1193); } @@ -1225,22 +1227,22 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleStructuralFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:527:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute= ruleAttribute | this_Reference= ruleReference ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ; public final EObject ruleStructuralFeature() throws RecognitionException { EObject current = null; - EObject this_Attribute = null; + EObject this_Attribute_0 = null; - EObject this_Reference = null; + EObject this_Reference_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:531:6: ( (this_Attribute= ruleAttribute | this_Reference= ruleReference ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:532:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:541:6: ( (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:532:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) int alt9=2; int LA9_0 = input.LA(1); @@ -1252,40 +1254,40 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("532:1: (this_Attribute= ruleAttribute | this_Reference= ruleReference )", 9, 0, input); + new NoViableAltException("542:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )", 9, 0, input); throw nvae; } switch (alt9) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:533:5: this_Attribute= ruleAttribute + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:543:5: this_Attribute_0= ruleAttribute { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode); - pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1249); - this_Attribute=ruleAttribute(); + pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1240); + this_Attribute_0=ruleAttribute(); _fsp--; - current = this_Attribute; + current = this_Attribute_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:543:5: this_Reference= ruleReference + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:553:5: this_Reference_1= ruleReference { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); - pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1276); - this_Reference=ruleReference(); + pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1267); + this_Reference_1=ruleReference(); _fsp--; - current = this_Reference; + current = this_Reference_1; currentNode = currentNode.getParent(); @@ -1298,6 +1300,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1313,7 +1316,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleAttribute - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:560:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ; public final EObject entryRuleAttribute() throws RecognitionException { EObject current = null; @@ -1321,16 +1324,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:560:51: (iv_ruleAttribute= ruleAttribute EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:561:2: iv_ruleAttribute= ruleAttribute EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:570:51: (iv_ruleAttribute= ruleAttribute EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:571:2: iv_ruleAttribute= ruleAttribute EOF { currentNode = createCompositeNode(grammarAccess.prAttribute().getRule(), currentNode); - pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1310); + pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1301); iv_ruleAttribute=ruleAttribute(); _fsp--; current =iv_ruleAttribute; - match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1320); + match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1311); } @@ -1348,41 +1351,41 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleAttribute - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:568:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:578:1: ruleAttribute returns [EObject current=null] : ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ; public final EObject ruleAttribute() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_type = null; + Token lv_name_1=null; + EObject lv_type_3 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:572:6: ( ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:583:6: ( ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:1: ( ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:1: ( ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:2: ( ( 'attr' (lv_name= RULE_ID ) ) ':' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:3: ( 'attr' (lv_name= RULE_ID ) ) ':' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:3: ( 'attr' (lv_name_1= RULE_ID ) ) ':' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:3: ( 'attr' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:573:4: 'attr' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:3: ( 'attr' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:4: 'attr' (lv_name_1= RULE_ID ) { - match(input,18,FOLLOW_18_in_ruleAttribute1356); + match(input,18,FOLLOW_18_in_ruleAttribute1347); createLeafNode(grammarAccess.prAttribute().ele000KeywordAttr(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:577:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:579:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:588:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:590:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1377); - - createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1369); + + createLeafNode(grammarAccess.prAttribute().ele0010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Attribute"); @@ -1390,7 +1393,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1401,21 +1404,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,19,FOLLOW_19_in_ruleAttribute1398); + match(input,19,FOLLOW_19_in_ruleAttribute1387); createLeafNode(grammarAccess.prAttribute().ele01KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:601:2: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:604:6: lv_type= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:612:2: (lv_type_3= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:615:6: lv_type_3= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prAttribute().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1433); - lv_type=ruleTypeRef(); + pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1422); + lv_type_3=ruleTypeRef(); _fsp--; @@ -1425,7 +1428,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "type", lv_type, "TypeRef", currentNode); + set(current, "type", lv_type_3, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1441,6 +1444,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1456,7 +1460,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleReference - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:631:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ; public final EObject entryRuleReference() throws RecognitionException { EObject current = null; @@ -1464,16 +1468,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:631:51: (iv_ruleReference= ruleReference EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:632:2: iv_ruleReference= ruleReference EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:642:51: (iv_ruleReference= ruleReference EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:643:2: iv_ruleReference= ruleReference EOF { currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode); - pushFollow(FOLLOW_ruleReference_in_entryRuleReference1472); + pushFollow(FOLLOW_ruleReference_in_entryRuleReference1461); iv_ruleReference=ruleReference(); _fsp--; current =iv_ruleReference; - match(input,EOF,FOLLOW_EOF_in_entryRuleReference1482); + match(input,EOF,FOLLOW_EOF_in_entryRuleReference1471); } @@ -1491,44 +1495,44 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleReference - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:639:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:650:1: ruleReference returns [EObject current=null] : ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) ; public final EObject ruleReference() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_type = null; + Token lv_name_1=null; + EObject lv_type_3 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:643:6: ( ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:655:6: ( ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:1: ( ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) ( 'opposite' ( ( RULE_ID ) ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: ( ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) ( 'opposite' ( RULE_ID ) )? { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:2: ( ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) (lv_type= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:2: ( ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) (lv_type_3= ruleTypeRef ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:3: ( ( 'ref' (lv_name= RULE_ID ) ) ':' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:4: ( 'ref' (lv_name= RULE_ID ) ) ':' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:4: ( 'ref' (lv_name_1= RULE_ID ) ) ':' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:4: ( 'ref' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:644:5: 'ref' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:4: ( 'ref' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:5: 'ref' (lv_name_1= RULE_ID ) { - match(input,20,FOLLOW_20_in_ruleReference1519); + match(input,20,FOLLOW_20_in_ruleReference1508); createLeafNode(grammarAccess.prReference().ele0000KeywordRef(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:648:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:650:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:660:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:662:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1540); - - createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1530); + + createLeafNode(grammarAccess.prReference().ele00010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Reference"); @@ -1536,7 +1540,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1547,21 +1551,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,19,FOLLOW_19_in_ruleReference1561); + match(input,19,FOLLOW_19_in_ruleReference1548); createLeafNode(grammarAccess.prReference().ele001KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:672:2: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:675:6: lv_type= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:684:2: (lv_type_3= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:687:6: lv_type_3= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prReference().ele010ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1596); - lv_type=ruleTypeRef(); + pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1583); + lv_type_3=ruleTypeRef(); _fsp--; @@ -1571,7 +1575,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "type", lv_type, "TypeRef", currentNode); + set(current, "type", lv_type_3, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1583,7 +1587,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:693:3: ( 'opposite' ( ( RULE_ID ) ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:3: ( 'opposite' ( RULE_ID ) )? int alt10=2; int LA10_0 = input.LA(1); @@ -1592,14 +1596,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } switch (alt10) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:693:4: 'opposite' ( ( RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:705:4: 'opposite' ( RULE_ID ) { - match(input,21,FOLLOW_21_in_ruleReference1611); + match(input,21,FOLLOW_21_in_ruleReference1598); createLeafNode(grammarAccess.prReference().ele10KeywordOpposite(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:697:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:700:3: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:709:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:712:3: RULE_ID { if (current==null) { @@ -1607,16 +1611,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:706:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:707:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1635); - - createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1620); + createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite"); + } @@ -1633,6 +1631,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1648,7 +1647,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleOperation - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:721:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ; public final EObject entryRuleOperation() throws RecognitionException { EObject current = null; @@ -1656,16 +1655,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:721:51: (iv_ruleOperation= ruleOperation EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:722:2: iv_ruleOperation= ruleOperation EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:51: (iv_ruleOperation= ruleOperation EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:735:2: iv_ruleOperation= ruleOperation EOF { currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode); - pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1676); + pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1660); iv_ruleOperation=ruleOperation(); _fsp--; current =iv_ruleOperation; - match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1686); + match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1670); } @@ -1683,52 +1682,54 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleOperation - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:729:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:742:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) ; public final EObject ruleOperation() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_params = null; + Token lv_name_1=null; + EObject lv_params_3 = null; + + EObject lv_params_5 = null; - EObject lv_type = null; + EObject lv_type_8 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:733:6: ( ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:747:6: ( ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:1: ( ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:1: ( ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) (lv_type_8= ruleTypeRef ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:2: ( ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) ':' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:2: ( ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) ':' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:3: ( ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) ')' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:3: ( ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) ')' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:4: ( ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' ) ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:4: ( ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:5: ( ( 'op' (lv_name= RULE_ID ) ) '(' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:6: ( 'op' (lv_name= RULE_ID ) ) '(' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:6: ( 'op' (lv_name_1= RULE_ID ) ) '(' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:6: ( 'op' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:734:7: 'op' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:6: ( 'op' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:748:7: 'op' (lv_name_1= RULE_ID ) { - match(input,22,FOLLOW_22_in_ruleOperation1725); + match(input,22,FOLLOW_22_in_ruleOperation1709); createLeafNode(grammarAccess.prOperation().ele000000KeywordOp(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:738:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:740:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:752:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:754:6: lv_name_1= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1746); - - createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name"); - + lv_name_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1731); + + createLeafNode(grammarAccess.prOperation().ele0000010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Operation"); @@ -1736,7 +1737,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1747,14 +1748,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,23,FOLLOW_23_in_ruleOperation1767); + match(input,23,FOLLOW_23_in_ruleOperation1749); createLeafNode(grammarAccess.prOperation().ele00001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:762:2: ( (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:2: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? int alt12=2; int LA12_0 = input.LA(1); @@ -1763,16 +1764,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } switch (alt12) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:762:3: (lv_params= ruleParameter ) ( ',' (lv_params= ruleParameter ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:3: (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:762:3: (lv_params= ruleParameter ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:765:6: lv_params= ruleParameter + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:776:3: (lv_params_3= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:779:6: lv_params_3= ruleParameter { currentNode=createCompositeNode(grammarAccess.prOperation().ele000100ParserRuleCallParameter(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_ruleOperation1803); - lv_params=ruleParameter(); + pushFollow(FOLLOW_ruleParameter_in_ruleOperation1785); + lv_params_3=ruleParameter(); _fsp--; @@ -1782,7 +1783,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "params", lv_params, "Parameter", currentNode); + add(current, "params", lv_params_3, "Parameter", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1791,7 +1792,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:783:2: ( ',' (lv_params= ruleParameter ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:797:2: ( ',' (lv_params_5= ruleParameter ) )* loop11: do { int alt11=2; @@ -1804,20 +1805,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt11) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:783:3: ',' (lv_params= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:797:3: ',' (lv_params_5= ruleParameter ) { - match(input,24,FOLLOW_24_in_ruleOperation1817); + match(input,24,FOLLOW_24_in_ruleOperation1799); createLeafNode(grammarAccess.prOperation().ele000110KeywordComma(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:787:1: (lv_params= ruleParameter ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:790:6: lv_params= ruleParameter + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:801:1: (lv_params_5= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:804:6: lv_params_5= ruleParameter { currentNode=createCompositeNode(grammarAccess.prOperation().ele0001110ParserRuleCallParameter(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_ruleOperation1851); - lv_params=ruleParameter(); + pushFollow(FOLLOW_ruleParameter_in_ruleOperation1833); + lv_params_5=ruleParameter(); _fsp--; @@ -1827,7 +1828,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "params", lv_params, "Parameter", currentNode); + add(current, "params", lv_params_5, "Parameter", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1854,28 +1855,28 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,25,FOLLOW_25_in_ruleOperation1869); + match(input,25,FOLLOW_25_in_ruleOperation1851); createLeafNode(grammarAccess.prOperation().ele001KeywordRightParenthesis(), null); } - match(input,19,FOLLOW_19_in_ruleOperation1879); + match(input,19,FOLLOW_19_in_ruleOperation1861); createLeafNode(grammarAccess.prOperation().ele01KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:816:2: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:819:6: lv_type= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:830:2: (lv_type_8= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:833:6: lv_type_8= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prOperation().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1914); - lv_type=ruleTypeRef(); + pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1896); + lv_type_8=ruleTypeRef(); _fsp--; @@ -1885,7 +1886,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "type", lv_type, "TypeRef", currentNode); + set(current, "type", lv_type_8, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1901,6 +1902,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1916,7 +1918,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleParameter - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:846:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:860:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; public final EObject entryRuleParameter() throws RecognitionException { EObject current = null; @@ -1924,16 +1926,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:846:51: (iv_ruleParameter= ruleParameter EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:847:2: iv_ruleParameter= ruleParameter EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:860:51: (iv_ruleParameter= ruleParameter EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:861:2: iv_ruleParameter= ruleParameter EOF { currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1953); + pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1935); iv_ruleParameter=ruleParameter(); _fsp--; current =iv_ruleParameter; - match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1963); + match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1945); } @@ -1951,31 +1953,31 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleParameter - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:854:1: ruleParameter returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:1: ruleParameter returns [EObject current=null] : ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ; public final EObject ruleParameter() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_type = null; + Token lv_name_0=null; + EObject lv_type_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:858:6: ( ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:873:6: ( ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:1: ( (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:2: (lv_name= RULE_ID ) (lv_type= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:1: ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:2: (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:859:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:861:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:874:2: (lv_name_0= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:876:6: lv_name_0= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter2009); - - createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name"); - + lv_name_0=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1992); + + createLeafNode(grammarAccess.prParameter().ele00LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("Parameter"); @@ -1983,7 +1985,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_0, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1991,14 +1993,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:879:2: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:882:6: lv_type= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:894:2: (lv_type_1= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:897:6: lv_type_1= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2054); - lv_type=ruleTypeRef(); + pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2034); + lv_type_1=ruleTypeRef(); _fsp--; @@ -2008,7 +2010,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "type", lv_type, "TypeRef", currentNode); + set(current, "type", lv_type_1, "TypeRef", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2024,6 +2026,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -2039,7 +2042,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleTypeRef - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:911:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:926:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ; public final EObject entryRuleTypeRef() throws RecognitionException { EObject current = null; @@ -2047,16 +2050,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:911:49: (iv_ruleTypeRef= ruleTypeRef EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:912:2: iv_ruleTypeRef= ruleTypeRef EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:926:49: (iv_ruleTypeRef= ruleTypeRef EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:927:2: iv_ruleTypeRef= ruleTypeRef EOF { currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2095); + pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2075); iv_ruleTypeRef=ruleTypeRef(); _fsp--; current =iv_ruleTypeRef; - match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2105); + match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2085); } @@ -2074,18 +2077,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleTypeRef - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:919:1: ruleTypeRef returns [EObject current=null] : ( ( RULE_ID ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:934:1: ruleTypeRef returns [EObject current=null] : ( RULE_ID ) ; public final EObject ruleTypeRef() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:923:6: ( ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:924:1: ( ( RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:939:6: ( ( RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:940:1: ( RULE_ID ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:924:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:927:3: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:940:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:943:3: RULE_ID { if (current==null) { @@ -2093,16 +2096,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:933:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:934:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2153); - - createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2131); + createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); + } @@ -2110,6 +2107,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -2125,7 +2123,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleQualifiedName - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:948:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:965:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ; public final String entryRuleQualifiedName() throws RecognitionException { String current = null; @@ -2133,16 +2131,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:948:54: (iv_ruleQualifiedName= ruleQualifiedName EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:949:2: iv_ruleQualifiedName= ruleQualifiedName EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:965:54: (iv_ruleQualifiedName= ruleQualifiedName EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:2: iv_ruleQualifiedName= ruleQualifiedName EOF { currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode); - pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2192); + pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2169); iv_ruleQualifiedName=ruleQualifiedName(); _fsp--; current =iv_ruleQualifiedName.getText(); - match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2203); + match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2180); } @@ -2160,31 +2158,32 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleQualifiedName - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:956:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:973:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ; public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); - Token this_ID=null; + Token this_ID_0=null; Token kw=null; + Token this_ID_2=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:960:6: ( (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:961:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:979:6: ( (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:961:1: (this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:961:6: this_ID= RULE_ID (kw= '.' this_ID= RULE_ID )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* { - this_ID=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2243); + this_ID_0=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2220); - current.merge(this_ID); + current.merge(this_ID_0); createLeafNode(grammarAccess.prQualifiedName().ele0LexerRuleCallID(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:968:1: (kw= '.' this_ID= RULE_ID )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:987:1: (kw= '.' this_ID_2= RULE_ID )* loop13: do { int alt13=2; @@ -2197,18 +2196,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { switch (alt13) { case 1 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:969:2: kw= '.' this_ID= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:988:2: kw= '.' this_ID_2= RULE_ID { kw=(Token)input.LT(1); - match(input,26,FOLLOW_26_in_ruleQualifiedName2262); + match(input,26,FOLLOW_26_in_ruleQualifiedName2239); current.merge(kw); createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null); - this_ID=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2277); + this_ID_2=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2254); - current.merge(this_ID); + current.merge(this_ID_2); createLeafNode(grammarAccess.prQualifiedName().ele11LexerRuleCallID(), null); @@ -2229,6 +2228,8 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; + lastConsumedDatatypeToken = current; } @@ -2252,79 +2253,79 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleImport_in_entryRuleImport220 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleImport230 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_11_in_ruleImport264 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleImport285 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement331 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement341 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement388 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_ruleNamedElement415 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePackage_in_entryRulePackage449 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePackage459 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_rulePackage496 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage530 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_rulePackage544 = new BitSet(new long[]{0x000000000001D000L}); - public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage579 = new BitSet(new long[]{0x000000000001D000L}); - public static final BitSet FOLLOW_14_in_rulePackage594 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_entryRuleType629 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleType639 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleEntity_in_ruleType686 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleDataType_in_ruleType713 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType747 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleDataType757 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_ruleDataType791 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleDataType812 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity858 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleEntity868 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_ruleEntity906 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEntity927 = new BitSet(new long[]{0x0000000000022000L}); - public static final BitSet FOLLOW_17_in_ruleEntity949 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEntity973 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleEntity989 = new BitSet(new long[]{0x0000000000544000L}); - public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1024 = new BitSet(new long[]{0x0000000000544000L}); - public static final BitSet FOLLOW_14_in_ruleEntity1039 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1074 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFeature1084 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1131 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1158 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1192 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1202 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1249 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1276 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1310 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1320 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleAttribute1356 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1377 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleAttribute1398 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1433 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1472 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleReference1482 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_20_in_ruleReference1519 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleReference1540 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleReference1561 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1596 = new BitSet(new long[]{0x0000000000200002L}); - public static final BitSet FOLLOW_21_in_ruleReference1611 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleReference1635 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1676 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleOperation1686 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleOperation1725 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1746 = new BitSet(new long[]{0x0000000000800000L}); - public static final BitSet FOLLOW_23_in_ruleOperation1767 = new BitSet(new long[]{0x0000000002000020L}); - public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1803 = new BitSet(new long[]{0x0000000003000000L}); - public static final BitSet FOLLOW_24_in_ruleOperation1817 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1851 = new BitSet(new long[]{0x0000000003000000L}); - public static final BitSet FOLLOW_25_in_ruleOperation1869 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleOperation1879 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1914 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1953 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleParameter1963 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleParameter2009 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2054 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2095 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2105 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2153 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2192 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2203 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2243 = new BitSet(new long[]{0x0000000004000002L}); - public static final BitSet FOLLOW_26_in_ruleQualifiedName2262 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2277 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleImport286 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement329 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement339 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement386 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleType_in_ruleNamedElement413 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePackage_in_entryRulePackage447 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePackage457 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_rulePackage494 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage528 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_rulePackage542 = new BitSet(new long[]{0x000000000001D000L}); + public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage577 = new BitSet(new long[]{0x000000000001D000L}); + public static final BitSet FOLLOW_14_in_rulePackage592 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleType_in_entryRuleType627 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleType637 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleEntity_in_ruleType684 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDataType_in_ruleType711 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType745 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDataType755 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleDataType789 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleDataType811 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity854 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleEntity864 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_ruleEntity902 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEntity924 = new BitSet(new long[]{0x0000000000022000L}); + public static final BitSet FOLLOW_17_in_ruleEntity943 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEntity965 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleEntity980 = new BitSet(new long[]{0x0000000000544000L}); + public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1015 = new BitSet(new long[]{0x0000000000544000L}); + public static final BitSet FOLLOW_14_in_ruleEntity1030 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1065 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFeature1075 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1122 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1149 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1183 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1193 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1240 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1267 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1301 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1311 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleAttribute1347 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1369 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleAttribute1387 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1422 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1461 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleReference1471 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_20_in_ruleReference1508 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleReference1530 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleReference1548 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1583 = new BitSet(new long[]{0x0000000000200002L}); + public static final BitSet FOLLOW_21_in_ruleReference1598 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleReference1620 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1660 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleOperation1670 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleOperation1709 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1731 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_23_in_ruleOperation1749 = new BitSet(new long[]{0x0000000002000020L}); + public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1785 = new BitSet(new long[]{0x0000000003000000L}); + public static final BitSet FOLLOW_24_in_ruleOperation1799 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1833 = new BitSet(new long[]{0x0000000003000000L}); + public static final BitSet FOLLOW_25_in_ruleOperation1851 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleOperation1861 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1896 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1935 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleParameter1945 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1992 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2034 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2075 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2085 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2131 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2169 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2180 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2220 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_26_in_ruleQualifiedName2239 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2254 = new BitSet(new long[]{0x0000000004000002L}); }
\ No newline at end of file diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g index b68b3a5..6f366f5 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel__.g @@ -24,28 +24,28 @@ T24 : ',' ; T25 : ')' ; T26 : '.' ; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1022 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1041 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1024 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1043 RULE_INT : ('0'..'9')+; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1026 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1045 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\'' ; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1031 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1050 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/'; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1033 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1052 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')?; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1035 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1054 RULE_WS : (' '|'\t'|'\r'|'\n')+; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1037 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1056 RULE_ANY_OTHER : .; diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g index 22007c7..1f35053 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g @@ -79,6 +79,7 @@ ruleEcoreDsl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (( @@ -86,7 +87,7 @@ ruleEcoreDsl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEcoreDsl().ele00ParserRuleCallImportStatementDecl(), currentNode); } - lv_imports=ruleImportStatementDecl + lv_imports_0=ruleImportStatementDecl { if ($current==null) { $current = factory.create("EcoreDsl"); @@ -94,7 +95,7 @@ ruleEcoreDsl returns [EObject current=null] } try { - factory.add($current, "imports", lv_imports, "ImportStatementDecl", currentNode); + add($current, "imports", lv_imports_0, "ImportStatementDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -107,7 +108,7 @@ ruleEcoreDsl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEcoreDsl().ele10ParserRuleCallEPackageDecl(), currentNode); } - lv_package=ruleEPackageDecl + lv_package_1=ruleEPackageDecl { if ($current==null) { $current = factory.create("EcoreDsl"); @@ -115,7 +116,7 @@ ruleEcoreDsl returns [EObject current=null] } try { - factory.set($current, "package", lv_package, "EPackageDecl", currentNode); + set($current, "package", lv_package_1, "EPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -143,6 +144,7 @@ ruleImportStatementDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((('import' { @@ -150,10 +152,10 @@ ruleImportStatementDecl returns [EObject current=null] } (( - lv_alias=RULE_ID - { - createLeafNode(grammarAccess.prImportStatementDecl().ele00100LexerRuleCallID(), "alias"); - } + lv_alias_1= RULE_ID + { + createLeafNode(grammarAccess.prImportStatementDecl().ele00100LexerRuleCallID(), "alias"); + } { if ($current==null) { @@ -162,7 +164,7 @@ ruleImportStatementDecl returns [EObject current=null] } try { - factory.set($current, "alias", lv_alias, "ID", currentNode); + set($current, "alias", lv_alias_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -174,10 +176,10 @@ ruleImportStatementDecl returns [EObject current=null] } )?)( - lv_importURI=RULE_STRING - { - createLeafNode(grammarAccess.prImportStatementDecl().ele010LexerRuleCallSTRING(), "importURI"); - } + lv_importURI_3= RULE_STRING + { + createLeafNode(grammarAccess.prImportStatementDecl().ele010LexerRuleCallSTRING(), "importURI"); + } { if ($current==null) { @@ -186,7 +188,7 @@ ruleImportStatementDecl returns [EObject current=null] } try { - factory.set($current, "importURI", lv_importURI, "STRING", currentNode); + set($current, "importURI", lv_importURI_3, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -217,6 +219,7 @@ ruleEPackageDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((((((((( @@ -224,7 +227,7 @@ ruleEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele000000000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -232,7 +235,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -249,7 +252,7 @@ ruleEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele00000000010ParserRuleCallQID(), currentNode); } - lv_name=ruleQID + lv_name_2=ruleQID { if ($current==null) { $current = factory.create("EPackage"); @@ -257,7 +260,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "QID", currentNode); + set($current, "name", lv_name_2, "QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -274,10 +277,10 @@ ruleEPackageDecl returns [EObject current=null] } )( - lv_nsURI=RULE_STRING - { - createLeafNode(grammarAccess.prEPackageDecl().ele00000010LexerRuleCallSTRING(), "nsURI"); - } + lv_nsURI_5= RULE_STRING + { + createLeafNode(grammarAccess.prEPackageDecl().ele00000010LexerRuleCallSTRING(), "nsURI"); + } { if ($current==null) { @@ -286,7 +289,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.set($current, "nsURI", lv_nsURI, "STRING", currentNode); + set($current, "nsURI", lv_nsURI_5, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -306,7 +309,7 @@ ruleEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele00010ParserRuleCallQID(), currentNode); } - lv_nsPrefix=ruleQID + lv_nsPrefix_8=ruleQID { if ($current==null) { $current = factory.create("EPackage"); @@ -314,7 +317,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.set($current, "nsPrefix", lv_nsPrefix, "QID", currentNode); + set($current, "nsPrefix", lv_nsPrefix_8, "QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -331,7 +334,7 @@ ruleEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele0100ParserRuleCallSubEPackageDecl(), currentNode); } - lv_eSubpackages=ruleSubEPackageDecl + lv_eSubpackages_10=ruleSubEPackageDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -339,7 +342,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eSubpackages", lv_eSubpackages, "SubEPackageDecl", currentNode); + add($current, "eSubpackages", lv_eSubpackages_10, "SubEPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -353,7 +356,7 @@ ruleEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele0110ParserRuleCallEClassifierDecl(), currentNode); } - lv_eClassifiers=ruleEClassifierDecl + lv_eClassifiers_11=ruleEClassifierDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -361,7 +364,7 @@ ruleEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eClassifiers", lv_eClassifiers, "EClassifierDecl", currentNode); + add($current, "eClassifiers", lv_eClassifiers_11, "EClassifierDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -393,6 +396,7 @@ ruleSubEPackageDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((( @@ -400,7 +404,7 @@ ruleSubEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -408,7 +412,7 @@ ruleSubEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -421,10 +425,10 @@ ruleSubEPackageDecl returns [EObject current=null] } )( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prSubEPackageDecl().ele00010LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prSubEPackageDecl().ele00010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -433,7 +437,7 @@ ruleSubEPackageDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -449,7 +453,7 @@ ruleSubEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele0100ParserRuleCallSubEPackageDecl(), currentNode); } - lv_eSubpackages=ruleSubEPackageDecl + lv_eSubpackages_4=ruleSubEPackageDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -457,7 +461,7 @@ ruleSubEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eSubpackages", lv_eSubpackages, "SubEPackageDecl", currentNode); + add($current, "eSubpackages", lv_eSubpackages_4, "SubEPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -471,7 +475,7 @@ ruleSubEPackageDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele0110ParserRuleCallEClassifierDecl(), currentNode); } - lv_eClassifiers=ruleEClassifierDecl + lv_eClassifiers_5=ruleEClassifierDecl { if ($current==null) { $current = factory.create("EPackage"); @@ -479,7 +483,7 @@ ruleSubEPackageDecl returns [EObject current=null] } try { - factory.add($current, "eClassifiers", lv_eClassifiers, "EClassifierDecl", currentNode); + add($current, "eClassifiers", lv_eClassifiers_5, "EClassifierDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -511,14 +515,15 @@ ruleEClassifierDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prEClassifierDecl().ele0ParserRuleCallEClassDecl(), currentNode); } - this_EClassDecl=ruleEClassDecl + this_EClassDecl_0=ruleEClassDecl { - $current = $this_EClassDecl.current; + $current = $this_EClassDecl_0.current; currentNode = currentNode.getParent(); } @@ -526,9 +531,9 @@ ruleEClassifierDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassifierDecl().ele1ParserRuleCallEDataTypeDecl(), currentNode); } - this_EDataTypeDecl=ruleEDataTypeDecl + this_EDataTypeDecl_1=ruleEDataTypeDecl { - $current = $this_EDataTypeDecl.current; + $current = $this_EDataTypeDecl_1.current; currentNode = currentNode.getParent(); } ); @@ -552,6 +557,7 @@ ruleEDataTypeDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((( @@ -559,7 +565,7 @@ ruleEDataTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele0000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EDataType"); @@ -567,7 +573,7 @@ ruleEDataTypeDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -576,10 +582,11 @@ ruleEDataTypeDecl returns [EObject current=null] )*( - lv_serializable='!serializable' + lv_serializable_1='!serializable' { createLeafNode(grammarAccess.prEDataTypeDecl().ele0010KeywordSerializable(), "serializable"); } + { if ($current==null) { @@ -588,7 +595,7 @@ ruleEDataTypeDecl returns [EObject current=null] } try { - factory.set($current, "serializable", true, "!serializable", currentNode); + set($current, "serializable", true, "!serializable", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -600,10 +607,10 @@ ruleEDataTypeDecl returns [EObject current=null] } ( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEDataTypeDecl().ele0100010LexerRuleCallID(), "name"); - } + lv_name_3= RULE_ID + { + createLeafNode(grammarAccess.prEDataTypeDecl().ele0100010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -612,7 +619,7 @@ ruleEDataTypeDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_3, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -628,7 +635,7 @@ ruleEDataTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele01010ParserRuleCallSTRING_OR_QID(), currentNode); } - lv_instanceClassName=ruleSTRING_OR_QID + lv_instanceClassName_5=ruleSTRING_OR_QID { if ($current==null) { $current = factory.create("EDataType"); @@ -636,7 +643,7 @@ ruleEDataTypeDecl returns [EObject current=null] } try { - factory.set($current, "instanceClassName", lv_instanceClassName, "STRING_OR_QID", currentNode); + set($current, "instanceClassName", lv_instanceClassName_5, "STRING_OR_QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -652,9 +659,9 @@ ruleEDataTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele1ParserRuleCallEEnumDecl(), currentNode); } - this_EEnumDecl=ruleEEnumDecl + this_EEnumDecl_7=ruleEEnumDecl { - $current = $this_EEnumDecl.current; + $current = $this_EEnumDecl_7.current; currentNode = currentNode.getParent(); } ); @@ -678,6 +685,7 @@ ruleEAnnotationDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((('@' { @@ -685,10 +693,10 @@ ruleEAnnotationDecl returns [EObject current=null] } ( - lv_source=RULE_STRING - { - createLeafNode(grammarAccess.prEAnnotationDecl().ele0000010LexerRuleCallSTRING(), "source"); - } + lv_source_1= RULE_STRING + { + createLeafNode(grammarAccess.prEAnnotationDecl().ele0000010LexerRuleCallSTRING(), "source"); + } { if ($current==null) { @@ -697,7 +705,7 @@ ruleEAnnotationDecl returns [EObject current=null] } try { - factory.set($current, "source", lv_source, "STRING", currentNode); + set($current, "source", lv_source_1, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -712,11 +720,12 @@ ruleEAnnotationDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement(), "eModelElement"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement(), "eModelElement"); + } + + // TODO assign feature to currentNode )?)'(' { @@ -728,7 +737,7 @@ ruleEAnnotationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEAnnotationDecl().ele0010ParserRuleCallMapEntrySuper(), currentNode); } - lv_contents=ruleMapEntrySuper + lv_contents_4=ruleMapEntrySuper { if ($current==null) { $current = factory.create("EAnnotation"); @@ -736,7 +745,7 @@ ruleEAnnotationDecl returns [EObject current=null] } try { - factory.add($current, "contents", lv_contents, "MapEntrySuper", currentNode); + add($current, "contents", lv_contents_4, "MapEntrySuper", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -753,7 +762,7 @@ ruleEAnnotationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEAnnotationDecl().ele0110ParserRuleCallMapEntrySuper(), currentNode); } - lv_contents=ruleMapEntrySuper + lv_contents_6=ruleMapEntrySuper { if ($current==null) { $current = factory.create("EAnnotation"); @@ -761,7 +770,7 @@ ruleEAnnotationDecl returns [EObject current=null] } try { - factory.add($current, "contents", lv_contents, "MapEntrySuper", currentNode); + add($current, "contents", lv_contents_6, "MapEntrySuper", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -793,6 +802,7 @@ ruleEClassDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((((((( @@ -800,7 +810,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EClass"); @@ -808,7 +818,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -817,10 +827,11 @@ ruleEClassDecl returns [EObject current=null] )*( - lv_abstract='abstract' + lv_abstract_1='abstract' { createLeafNode(grammarAccess.prEClassDecl().ele0000000010KeywordAbstract(), "abstract"); } + { if ($current==null) { @@ -829,7 +840,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.set($current, "abstract", true, "abstract", currentNode); + set($current, "abstract", true, "abstract", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -837,10 +848,11 @@ ruleEClassDecl returns [EObject current=null] )?)(( - lv_interface='interface' + lv_interface_2='interface' { createLeafNode(grammarAccess.prEClassDecl().ele0000000100KeywordInterface(), "interface"); } + { if ($current==null) { @@ -849,7 +861,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.set($current, "interface", true, "interface", currentNode); + set($current, "interface", true, "interface", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -862,10 +874,10 @@ ruleEClassDecl returns [EObject current=null] } ))( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEClassDecl().ele00000010LexerRuleCallID(), "name"); - } + lv_name_4= RULE_ID + { + createLeafNode(grammarAccess.prEClassDecl().ele00000010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -874,7 +886,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_4, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -890,7 +902,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000010010ParserRuleCallETypeParameterDecl(), currentNode); } - lv_eTypeParameters=ruleETypeParameterDecl + lv_eTypeParameters_6=ruleETypeParameterDecl { if ($current==null) { $current = factory.create("EClass"); @@ -898,7 +910,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add($current, "eTypeParameters", lv_eTypeParameters_6, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -915,7 +927,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000010110ParserRuleCallETypeParameterDecl(), currentNode); } - lv_eTypeParameters=ruleETypeParameterDecl + lv_eTypeParameters_8=ruleETypeParameterDecl { if ($current==null) { $current = factory.create("EClass"); @@ -923,7 +935,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add($current, "eTypeParameters", lv_eTypeParameters_8, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -944,7 +956,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele00001010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericSuperTypes=ruleEGenericTypeReferenceDecl + lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EClass"); @@ -952,7 +964,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eGenericSuperTypes", lv_eGenericSuperTypes, "EGenericTypeReferenceDecl", currentNode); + add($current, "eGenericSuperTypes", lv_eGenericSuperTypes_11, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -969,7 +981,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele00001110ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericSuperTypes=ruleEGenericTypeReferenceDecl + lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EClass"); @@ -977,7 +989,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eGenericSuperTypes", lv_eGenericSuperTypes, "EGenericTypeReferenceDecl", currentNode); + add($current, "eGenericSuperTypes", lv_eGenericSuperTypes_13, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -994,7 +1006,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele000110ParserRuleCallSTRING_OR_QID(), currentNode); } - lv_instanceClassName=ruleSTRING_OR_QID + lv_instanceClassName_15=ruleSTRING_OR_QID { if ($current==null) { $current = factory.create("EClass"); @@ -1002,7 +1014,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.set($current, "instanceClassName", lv_instanceClassName, "STRING_OR_QID", currentNode); + set($current, "instanceClassName", lv_instanceClassName_15, "STRING_OR_QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1019,7 +1031,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0100ParserRuleCallEStructuralFeatureDecl(), currentNode); } - lv_eStructuralFeatures=ruleEStructuralFeatureDecl + lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl { if ($current==null) { $current = factory.create("EClass"); @@ -1027,7 +1039,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eStructuralFeatures", lv_eStructuralFeatures, "EStructuralFeatureDecl", currentNode); + add($current, "eStructuralFeatures", lv_eStructuralFeatures_17, "EStructuralFeatureDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1041,7 +1053,7 @@ ruleEClassDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0110ParserRuleCallEOperationDecl(), currentNode); } - lv_eOperations=ruleEOperationDecl + lv_eOperations_18=ruleEOperationDecl { if ($current==null) { $current = factory.create("EClass"); @@ -1049,7 +1061,7 @@ ruleEClassDecl returns [EObject current=null] } try { - factory.add($current, "eOperations", lv_eOperations, "EOperationDecl", currentNode); + add($current, "eOperations", lv_eOperations_18, "EOperationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1081,14 +1093,15 @@ ruleEStructuralFeatureDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ( { currentNode=createCompositeNode(grammarAccess.prEStructuralFeatureDecl().ele0ParserRuleCallEAttributeDecl(), currentNode); } - this_EAttributeDecl=ruleEAttributeDecl + this_EAttributeDecl_0=ruleEAttributeDecl { - $current = $this_EAttributeDecl.current; + $current = $this_EAttributeDecl_0.current; currentNode = currentNode.getParent(); } @@ -1096,9 +1109,9 @@ ruleEStructuralFeatureDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEStructuralFeatureDecl().ele1ParserRuleCallEReferenceDecl(), currentNode); } - this_EReferenceDecl=ruleEReferenceDecl + this_EReferenceDecl_1=ruleEReferenceDecl { - $current = $this_EReferenceDecl.current; + $current = $this_EReferenceDecl_1.current; currentNode = currentNode.getParent(); } ); @@ -1122,6 +1135,7 @@ ruleEAttributeDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((((( @@ -1129,7 +1143,7 @@ ruleEAttributeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEAttributeDecl().ele00000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EAttribute"); @@ -1137,7 +1151,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1146,10 +1160,11 @@ ruleEAttributeDecl returns [EObject current=null] )*(((((((( - lv_iD='ID' + lv_iD_1='ID' { createLeafNode(grammarAccess.prEAttributeDecl().ele000000100000000KeywordID(), "iD"); } + { if ($current==null) { @@ -1158,7 +1173,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "iD", true, "ID", currentNode); + set($current, "iD", true, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1167,10 +1182,11 @@ ruleEAttributeDecl returns [EObject current=null] ) |( - lv_unique='bag' + lv_unique_2='bag' { createLeafNode(grammarAccess.prEAttributeDecl().ele000000100000010KeywordBag(), "unique"); } + { if ($current==null) { @@ -1179,7 +1195,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "unique", true, "bag", currentNode); + set($current, "unique", true, "bag", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1188,10 +1204,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_ordered='random' + lv_ordered_3='random' { createLeafNode(grammarAccess.prEAttributeDecl().ele00000010000010KeywordRandom(), "ordered"); } + { if ($current==null) { @@ -1200,7 +1217,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "ordered", true, "random", currentNode); + set($current, "ordered", true, "random", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1209,10 +1226,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_changeable='readonly' + lv_changeable_4='readonly' { createLeafNode(grammarAccess.prEAttributeDecl().ele0000001000010KeywordReadonly(), "changeable"); } + { if ($current==null) { @@ -1221,7 +1239,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "changeable", true, "readonly", currentNode); + set($current, "changeable", true, "readonly", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1230,10 +1248,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_volatile='volatile' + lv_volatile_5='volatile' { createLeafNode(grammarAccess.prEAttributeDecl().ele000000100010KeywordVolatile(), "volatile"); } + { if ($current==null) { @@ -1242,7 +1261,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "volatile", true, "volatile", currentNode); + set($current, "volatile", true, "volatile", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1251,10 +1270,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_transient='transient' + lv_transient_6='transient' { createLeafNode(grammarAccess.prEAttributeDecl().ele00000010010KeywordTransient(), "transient"); } + { if ($current==null) { @@ -1263,7 +1283,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "transient", true, "transient", currentNode); + set($current, "transient", true, "transient", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1272,10 +1292,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_unsettable='unsettable' + lv_unsettable_7='unsettable' { createLeafNode(grammarAccess.prEAttributeDecl().ele0000001010KeywordUnsettable(), "unsettable"); } + { if ($current==null) { @@ -1284,7 +1305,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "unsettable", true, "unsettable", currentNode); + set($current, "unsettable", true, "unsettable", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1293,10 +1314,11 @@ ruleEAttributeDecl returns [EObject current=null] )) |( - lv_derived='derived' + lv_derived_8='derived' { createLeafNode(grammarAccess.prEAttributeDecl().ele000000110KeywordDerived(), "derived"); } + { if ($current==null) { @@ -1305,7 +1327,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "derived", true, "derived", currentNode); + set($current, "derived", true, "derived", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1321,7 +1343,7 @@ ruleEAttributeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEAttributeDecl().ele000010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericType=ruleEGenericTypeReferenceDecl + lv_eGenericType_10=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EAttribute"); @@ -1329,7 +1351,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "eGenericType", lv_eGenericType, "EGenericTypeReferenceDecl", currentNode); + set($current, "eGenericType", lv_eGenericType_10, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1342,10 +1364,10 @@ ruleEAttributeDecl returns [EObject current=null] } ( - lv_lowerBound=RULE_INT - { - createLeafNode(grammarAccess.prEAttributeDecl().ele00010010LexerRuleCallINT(), "lowerBound"); - } + lv_lowerBound_12= RULE_INT + { + createLeafNode(grammarAccess.prEAttributeDecl().ele00010010LexerRuleCallINT(), "lowerBound"); + } { if ($current==null) { @@ -1354,7 +1376,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "lowerBound", lv_lowerBound, "INT", currentNode); + set($current, "lowerBound", lv_lowerBound_12, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1370,7 +1392,7 @@ ruleEAttributeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEAttributeDecl().ele00010110ParserRuleCallSINT(), currentNode); } - lv_upperBound=ruleSINT + lv_upperBound_14=ruleSINT { if ($current==null) { $current = factory.create("EAttribute"); @@ -1378,7 +1400,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "upperBound", lv_upperBound, "SINT", currentNode); + set($current, "upperBound", lv_upperBound_14, "SINT", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1391,10 +1413,10 @@ ruleEAttributeDecl returns [EObject current=null] } )?)( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEAttributeDecl().ele0010LexerRuleCallID(), "name"); - } + lv_name_16= RULE_ID + { + createLeafNode(grammarAccess.prEAttributeDecl().ele0010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -1403,7 +1425,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_16, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1415,10 +1437,10 @@ ruleEAttributeDecl returns [EObject current=null] } ( - lv_defaultValueLiteral=RULE_STRING - { - createLeafNode(grammarAccess.prEAttributeDecl().ele0110LexerRuleCallSTRING(), "defaultValueLiteral"); - } + lv_defaultValueLiteral_18= RULE_STRING + { + createLeafNode(grammarAccess.prEAttributeDecl().ele0110LexerRuleCallSTRING(), "defaultValueLiteral"); + } { if ($current==null) { @@ -1427,7 +1449,7 @@ ruleEAttributeDecl returns [EObject current=null] } try { - factory.set($current, "defaultValueLiteral", lv_defaultValueLiteral, "STRING", currentNode); + set($current, "defaultValueLiteral", lv_defaultValueLiteral_18, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1458,6 +1480,7 @@ ruleEReferenceDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((((( @@ -1465,7 +1488,7 @@ ruleEReferenceDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEReferenceDecl().ele00000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EReference"); @@ -1473,7 +1496,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1482,10 +1505,11 @@ ruleEReferenceDecl returns [EObject current=null] )*(((((((( - lv_resolveProxies='local' + lv_resolveProxies_1='local' { createLeafNode(grammarAccess.prEReferenceDecl().ele000000100000000KeywordLocal(), "resolveProxies"); } + { if ($current==null) { @@ -1494,7 +1518,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "resolveProxies", true, "local", currentNode); + set($current, "resolveProxies", true, "local", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1503,10 +1527,11 @@ ruleEReferenceDecl returns [EObject current=null] ) |( - lv_unique='bag' + lv_unique_2='bag' { createLeafNode(grammarAccess.prEReferenceDecl().ele000000100000010KeywordBag(), "unique"); } + { if ($current==null) { @@ -1515,7 +1540,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "unique", true, "bag", currentNode); + set($current, "unique", true, "bag", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1524,10 +1549,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_ordered='random' + lv_ordered_3='random' { createLeafNode(grammarAccess.prEReferenceDecl().ele00000010000010KeywordRandom(), "ordered"); } + { if ($current==null) { @@ -1536,7 +1562,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "ordered", true, "random", currentNode); + set($current, "ordered", true, "random", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1545,10 +1571,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_changeable='readonly' + lv_changeable_4='readonly' { createLeafNode(grammarAccess.prEReferenceDecl().ele0000001000010KeywordReadonly(), "changeable"); } + { if ($current==null) { @@ -1557,7 +1584,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "changeable", true, "readonly", currentNode); + set($current, "changeable", true, "readonly", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1566,10 +1593,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_volatile='volatile' + lv_volatile_5='volatile' { createLeafNode(grammarAccess.prEReferenceDecl().ele000000100010KeywordVolatile(), "volatile"); } + { if ($current==null) { @@ -1578,7 +1606,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "volatile", true, "volatile", currentNode); + set($current, "volatile", true, "volatile", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1587,10 +1615,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_transient='transient' + lv_transient_6='transient' { createLeafNode(grammarAccess.prEReferenceDecl().ele00000010010KeywordTransient(), "transient"); } + { if ($current==null) { @@ -1599,7 +1628,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "transient", true, "transient", currentNode); + set($current, "transient", true, "transient", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1608,10 +1637,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_unsettable='unsettable' + lv_unsettable_7='unsettable' { createLeafNode(grammarAccess.prEReferenceDecl().ele0000001010KeywordUnsettable(), "unsettable"); } + { if ($current==null) { @@ -1620,7 +1650,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "unsettable", true, "unsettable", currentNode); + set($current, "unsettable", true, "unsettable", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1629,10 +1659,11 @@ ruleEReferenceDecl returns [EObject current=null] )) |( - lv_derived='derived' + lv_derived_8='derived' { createLeafNode(grammarAccess.prEReferenceDecl().ele000000110KeywordDerived(), "derived"); } + { if ($current==null) { @@ -1641,7 +1672,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "derived", true, "derived", currentNode); + set($current, "derived", true, "derived", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1649,10 +1680,11 @@ ruleEReferenceDecl returns [EObject current=null] ))*)(( - lv_containment='val' + lv_containment_9='val' { createLeafNode(grammarAccess.prEReferenceDecl().ele00000100KeywordVal(), "containment"); } + { if ($current==null) { @@ -1661,7 +1693,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "containment", true, "val", currentNode); + set($current, "containment", true, "val", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1678,7 +1710,7 @@ ruleEReferenceDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEReferenceDecl().ele000010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericType=ruleEGenericTypeReferenceDecl + lv_eGenericType_11=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EReference"); @@ -1686,7 +1718,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "eGenericType", lv_eGenericType, "EGenericTypeReferenceDecl", currentNode); + set($current, "eGenericType", lv_eGenericType_11, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1699,10 +1731,10 @@ ruleEReferenceDecl returns [EObject current=null] } ( - lv_lowerBound=RULE_INT - { - createLeafNode(grammarAccess.prEReferenceDecl().ele00010010LexerRuleCallINT(), "lowerBound"); - } + lv_lowerBound_13= RULE_INT + { + createLeafNode(grammarAccess.prEReferenceDecl().ele00010010LexerRuleCallINT(), "lowerBound"); + } { if ($current==null) { @@ -1711,7 +1743,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "lowerBound", lv_lowerBound, "INT", currentNode); + set($current, "lowerBound", lv_lowerBound_13, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1727,7 +1759,7 @@ ruleEReferenceDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEReferenceDecl().ele00010110ParserRuleCallSINT(), currentNode); } - lv_upperBound=ruleSINT + lv_upperBound_15=ruleSINT { if ($current==null) { $current = factory.create("EReference"); @@ -1735,7 +1767,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "upperBound", lv_upperBound, "SINT", currentNode); + set($current, "upperBound", lv_upperBound_15, "SINT", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1759,18 +1791,19 @@ ruleEReferenceDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEReferenceDecl().ele00110CrossReferenceEStringEReference(), "eOpposite"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEReferenceDecl().ele00110CrossReferenceEStringEReference(), "eOpposite"); + } + + // TODO assign feature to currentNode ))?)( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEReferenceDecl().ele010LexerRuleCallID(), "name"); - } + lv_name_19= RULE_ID + { + createLeafNode(grammarAccess.prEReferenceDecl().ele010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -1779,7 +1812,7 @@ ruleEReferenceDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_19, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1810,6 +1843,7 @@ ruleEEnumDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((((( @@ -1817,7 +1851,7 @@ ruleEEnumDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEEnumDecl().ele000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EEnum"); @@ -1825,7 +1859,7 @@ ruleEEnumDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1838,10 +1872,10 @@ ruleEEnumDecl returns [EObject current=null] } )( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEEnumDecl().ele00010LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prEEnumDecl().ele00010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -1850,7 +1884,7 @@ ruleEEnumDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1866,7 +1900,7 @@ ruleEEnumDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEEnumDecl().ele010ParserRuleCallEEnumLiteralDecl(), currentNode); } - lv_eLiterals=ruleEEnumLiteralDecl + lv_eLiterals_4=ruleEEnumLiteralDecl { if ($current==null) { $current = factory.create("EEnum"); @@ -1874,7 +1908,7 @@ ruleEEnumDecl returns [EObject current=null] } try { - factory.add($current, "eLiterals", lv_eLiterals, "EEnumLiteralDecl", currentNode); + add($current, "eLiterals", lv_eLiterals_4, "EEnumLiteralDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1906,6 +1940,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((((( @@ -1913,7 +1948,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEEnumLiteralDecl().ele00000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EEnumLiteral"); @@ -1921,7 +1956,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1930,10 +1965,10 @@ ruleEEnumLiteralDecl returns [EObject current=null] )*( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEEnumLiteralDecl().ele00010LexerRuleCallID(), "name"); - } + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prEEnumLiteralDecl().ele00010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -1942,7 +1977,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1954,10 +1989,10 @@ ruleEEnumLiteralDecl returns [EObject current=null] } ( - lv_value=RULE_INT - { - createLeafNode(grammarAccess.prEEnumLiteralDecl().ele00110LexerRuleCallINT(), "value"); - } + lv_value_3= RULE_INT + { + createLeafNode(grammarAccess.prEEnumLiteralDecl().ele00110LexerRuleCallINT(), "value"); + } { if ($current==null) { @@ -1966,7 +2001,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] } try { - factory.set($current, "value", lv_value, "INT", currentNode); + set($current, "value", lv_value_3, "INT", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1974,10 +2009,10 @@ ruleEEnumLiteralDecl returns [EObject current=null] ))?)( - lv_literal=RULE_STRING - { - createLeafNode(grammarAccess.prEEnumLiteralDecl().ele010LexerRuleCallSTRING(), "literal"); - } + lv_literal_4= RULE_STRING + { + createLeafNode(grammarAccess.prEEnumLiteralDecl().ele010LexerRuleCallSTRING(), "literal"); + } { if ($current==null) { @@ -1986,7 +2021,7 @@ ruleEEnumLiteralDecl returns [EObject current=null] } try { - factory.set($current, "literal", lv_literal, "STRING", currentNode); + set($current, "literal", lv_literal_4, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2017,13 +2052,14 @@ ruleETypeParameterDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prETypeParameterDecl().ele00LexerRuleCallID(), "name"); - } + lv_name_0= RULE_ID + { + createLeafNode(grammarAccess.prETypeParameterDecl().ele00LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -2032,7 +2068,7 @@ ruleETypeParameterDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_0, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2048,7 +2084,7 @@ ruleETypeParameterDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prETypeParameterDecl().ele110ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eBounds=ruleEGenericTypeDecl + lv_eBounds_2=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("ETypeParameter"); @@ -2056,7 +2092,7 @@ ruleETypeParameterDecl returns [EObject current=null] } try { - factory.add($current, "eBounds", lv_eBounds, "EGenericTypeDecl", currentNode); + add($current, "eBounds", lv_eBounds_2, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2084,6 +2120,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((( @@ -2094,11 +2131,12 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier(), "eClassifier"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele000CrossReferenceEStringEClassifier(), "eClassifier"); + } + + // TODO assign feature to currentNode )((('<' { @@ -2110,7 +2148,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeReferenceDecl().ele010010ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eTypeArguments=ruleEGenericTypeDecl + lv_eTypeArguments_2=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2118,7 +2156,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] } try { - factory.add($current, "eTypeArguments", lv_eTypeArguments, "EGenericTypeDecl", currentNode); + add($current, "eTypeArguments", lv_eTypeArguments_2, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2135,7 +2173,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeReferenceDecl().ele010110ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eTypeArguments=ruleEGenericTypeDecl + lv_eTypeArguments_4=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2143,7 +2181,7 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] } try { - factory.add($current, "eTypeArguments", lv_eTypeArguments, "EGenericTypeDecl", currentNode); + add($current, "eTypeArguments", lv_eTypeArguments_4, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2168,11 +2206,12 @@ ruleEGenericTypeReferenceDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter(), "eTypeParameter"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEGenericTypeReferenceDecl().ele110CrossReferenceEStringETypeParameter(), "eTypeParameter"); + } + + // TODO assign feature to currentNode ))); @@ -2195,6 +2234,7 @@ ruleEGenericTypeDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: (((( @@ -2205,11 +2245,12 @@ ruleEGenericTypeDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeDecl().ele0000CrossReferenceEStringEClassifier(), "eClassifier"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEGenericTypeDecl().ele0000CrossReferenceEStringEClassifier(), "eClassifier"); + } + + // TODO assign feature to currentNode )((('<' { @@ -2221,7 +2262,7 @@ ruleEGenericTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeDecl().ele0010010ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eTypeArguments=ruleEGenericTypeDecl + lv_eTypeArguments_2=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2229,7 +2270,7 @@ ruleEGenericTypeDecl returns [EObject current=null] } try { - factory.add($current, "eTypeArguments", lv_eTypeArguments, "EGenericTypeDecl", currentNode); + add($current, "eTypeArguments", lv_eTypeArguments_2, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2246,7 +2287,7 @@ ruleEGenericTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeDecl().ele0010110ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eTypeArguments=ruleEGenericTypeDecl + lv_eTypeArguments_4=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2254,7 +2295,7 @@ ruleEGenericTypeDecl returns [EObject current=null] } try { - factory.add($current, "eTypeArguments", lv_eTypeArguments, "EGenericTypeDecl", currentNode); + add($current, "eTypeArguments", lv_eTypeArguments_4, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2279,11 +2320,12 @@ ruleEGenericTypeDecl returns [EObject current=null] associateNodeWithAstElement(currentNode, $current); } } -( - RULE_ID { - createLeafNode(grammarAccess.prEGenericTypeDecl().ele0110CrossReferenceEStringETypeParameter(), "eTypeParameter"); - } -) + RULE_ID + { + createLeafNode(grammarAccess.prEGenericTypeDecl().ele0110CrossReferenceEStringETypeParameter(), "eTypeParameter"); + } + + // TODO assign feature to currentNode ))) |('?' @@ -2300,7 +2342,7 @@ ruleEGenericTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeDecl().ele11010ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eUpperBound=ruleEGenericTypeDecl + lv_eUpperBound_10=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2308,7 +2350,7 @@ ruleEGenericTypeDecl returns [EObject current=null] } try { - factory.set($current, "eUpperBound", lv_eUpperBound, "EGenericTypeDecl", currentNode); + set($current, "eUpperBound", lv_eUpperBound_10, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2326,7 +2368,7 @@ ruleEGenericTypeDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEGenericTypeDecl().ele11110ParserRuleCallEGenericTypeDecl(), currentNode); } - lv_eLowerBound=ruleEGenericTypeDecl + lv_eLowerBound_12=ruleEGenericTypeDecl { if ($current==null) { $current = factory.create("EGenericType"); @@ -2334,7 +2376,7 @@ ruleEGenericTypeDecl returns [EObject current=null] } try { - factory.set($current, "eLowerBound", lv_eLowerBound, "EGenericTypeDecl", currentNode); + set($current, "eLowerBound", lv_eLowerBound_12, "EGenericTypeDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2362,6 +2404,7 @@ ruleEOperationDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((((((((((( @@ -2369,7 +2412,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele00000000000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2377,7 +2420,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2386,10 +2429,11 @@ ruleEOperationDecl returns [EObject current=null] )*(( - lv_unique='bag' + lv_unique_1='bag' { createLeafNode(grammarAccess.prEOperationDecl().ele000000000100KeywordBag(), "unique"); } + { if ($current==null) { @@ -2398,7 +2442,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.set($current, "unique", true, "bag", currentNode); + set($current, "unique", true, "bag", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2407,10 +2451,11 @@ ruleEOperationDecl returns [EObject current=null] ) |( - lv_ordered='random' + lv_ordered_2='random' { createLeafNode(grammarAccess.prEOperationDecl().ele000000000110KeywordRandom(), "ordered"); } + { if ($current==null) { @@ -2419,7 +2464,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.set($current, "ordered", true, "random", currentNode); + set($current, "ordered", true, "random", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2435,7 +2480,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele0000000100ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericType=ruleEGenericTypeReferenceDecl + lv_eGenericType_4=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2443,7 +2488,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.set($current, "eGenericType", lv_eGenericType, "EGenericTypeReferenceDecl", currentNode); + set($current, "eGenericType", lv_eGenericType_4, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2457,10 +2502,10 @@ ruleEOperationDecl returns [EObject current=null] } ))( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEOperationDecl().ele00000010LexerRuleCallID(), "name"); - } + lv_name_6= RULE_ID + { + createLeafNode(grammarAccess.prEOperationDecl().ele00000010LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -2469,7 +2514,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_6, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2485,7 +2530,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele0000010010ParserRuleCallETypeParameterDecl(), currentNode); } - lv_eTypeParameters=ruleETypeParameterDecl + lv_eTypeParameters_8=ruleETypeParameterDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2493,7 +2538,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add($current, "eTypeParameters", lv_eTypeParameters_8, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2510,7 +2555,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele0000010110ParserRuleCallETypeParameterDecl(), currentNode); } - lv_eTypeParameters=ruleETypeParameterDecl + lv_eTypeParameters_10=ruleETypeParameterDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2518,7 +2563,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add($current, "eTypeParameters", lv_eTypeParameters_10, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2539,7 +2584,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele000100ParserRuleCallEParameterDecl(), currentNode); } - lv_eParameters=ruleEParameterDecl + lv_eParameters_13=ruleEParameterDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2547,7 +2592,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eParameters", lv_eParameters, "EParameterDecl", currentNode); + add($current, "eParameters", lv_eParameters_13, "EParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2564,7 +2609,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele0001110ParserRuleCallEParameterDecl(), currentNode); } - lv_eParameters=ruleEParameterDecl + lv_eParameters_15=ruleEParameterDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2572,7 +2617,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eParameters", lv_eParameters, "EParameterDecl", currentNode); + add($current, "eParameters", lv_eParameters_15, "EParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2593,7 +2638,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele01010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericExceptions=ruleEGenericTypeReferenceDecl + lv_eGenericExceptions_18=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2601,7 +2646,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eGenericExceptions", lv_eGenericExceptions, "EGenericTypeReferenceDecl", currentNode); + add($current, "eGenericExceptions", lv_eGenericExceptions_18, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2618,7 +2663,7 @@ ruleEOperationDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEOperationDecl().ele01110ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericExceptions=ruleEGenericTypeReferenceDecl + lv_eGenericExceptions_20=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EOperation"); @@ -2626,7 +2671,7 @@ ruleEOperationDecl returns [EObject current=null] } try { - factory.add($current, "eGenericExceptions", lv_eGenericExceptions, "EGenericTypeReferenceDecl", currentNode); + add($current, "eGenericExceptions", lv_eGenericExceptions_20, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2658,6 +2703,7 @@ ruleEParameterDecl returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((( @@ -2665,7 +2711,7 @@ ruleEParameterDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEParameterDecl().ele000ParserRuleCallEAnnotationDecl(), currentNode); } - lv_eAnnotations=ruleEAnnotationDecl + lv_eAnnotations_0=ruleEAnnotationDecl { if ($current==null) { $current = factory.create("EParameter"); @@ -2673,7 +2719,7 @@ ruleEParameterDecl returns [EObject current=null] } try { - factory.add($current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add($current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2686,7 +2732,7 @@ ruleEParameterDecl returns [EObject current=null] { currentNode=createCompositeNode(grammarAccess.prEParameterDecl().ele010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); } - lv_eGenericType=ruleEGenericTypeReferenceDecl + lv_eGenericType_1=ruleEGenericTypeReferenceDecl { if ($current==null) { $current = factory.create("EParameter"); @@ -2694,7 +2740,7 @@ ruleEParameterDecl returns [EObject current=null] } try { - factory.set($current, "eGenericType", lv_eGenericType, "EGenericTypeReferenceDecl", currentNode); + set($current, "eGenericType", lv_eGenericType_1, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2703,10 +2749,10 @@ ruleEParameterDecl returns [EObject current=null] ))( - lv_name=RULE_ID - { - createLeafNode(grammarAccess.prEParameterDecl().ele10LexerRuleCallID(), "name"); - } + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prEParameterDecl().ele10LexerRuleCallID(), "name"); + } { if ($current==null) { @@ -2715,7 +2761,7 @@ ruleEParameterDecl returns [EObject current=null] } try { - factory.set($current, "name", lv_name, "ID", currentNode); + set($current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2742,14 +2788,15 @@ ruleMapEntrySuper returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: { currentNode=createCompositeNode(grammarAccess.prMapEntrySuper().eleParserRuleCallMapEntry(), currentNode); } - this_MapEntry=ruleMapEntry + this_MapEntry_0=ruleMapEntry { - $current = $this_MapEntry.current; + $current = $this_MapEntry_0.current; currentNode = currentNode.getParent(); } ; @@ -2773,13 +2820,14 @@ ruleMapEntry returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; }: ((( - lv_detailKey=RULE_ID - { - createLeafNode(grammarAccess.prMapEntry().ele000LexerRuleCallID(), "detailKey"); - } + lv_detailKey_0= RULE_ID + { + createLeafNode(grammarAccess.prMapEntry().ele000LexerRuleCallID(), "detailKey"); + } { if ($current==null) { @@ -2788,7 +2836,7 @@ ruleMapEntry returns [EObject current=null] } try { - factory.set($current, "detailKey", lv_detailKey, "ID", currentNode); + set($current, "detailKey", lv_detailKey_0, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2800,10 +2848,10 @@ ruleMapEntry returns [EObject current=null] } )( - lv_detailValue=RULE_STRING - { - createLeafNode(grammarAccess.prMapEntry().ele10LexerRuleCallSTRING(), "detailValue"); - } + lv_detailValue_2= RULE_STRING + { + createLeafNode(grammarAccess.prMapEntry().ele10LexerRuleCallSTRING(), "detailValue"); + } { if ($current==null) { @@ -2812,7 +2860,7 @@ ruleMapEntry returns [EObject current=null] } try { - factory.set($current, "detailValue", lv_detailValue, "STRING", currentNode); + set($current, "detailValue", lv_detailValue_2, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2841,9 +2889,11 @@ ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] @init { setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; + lastConsumedDatatypeToken = $current; }: -( this_ID=RULE_ID { - $current.merge(this_ID); +( this_ID_0=RULE_ID { + $current.merge(this_ID_0); } { @@ -2862,8 +2912,8 @@ ruleQID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] $current.merge(kw); createLeafNode(grammarAccess.prQID().ele101Keyword$(), null); } -) this_ID=RULE_ID { - $current.merge(this_ID); +) this_ID_3=RULE_ID { + $current.merge(this_ID_3); } { @@ -2891,9 +2941,11 @@ ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT @init { setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; + lastConsumedDatatypeToken = $current; }: -( this_STRING=RULE_STRING { - $current.merge(this_STRING); +( this_STRING_0=RULE_STRING { + $current.merge(this_STRING_0); } { @@ -2904,8 +2956,8 @@ ruleSTRING_OR_QID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT { currentNode=createCompositeNode(grammarAccess.prSTRING_OR_QID().ele1ParserRuleCallQID(), currentNode); } - this_QID=ruleQID { - $current.merge(this_QID); + this_QID_1=ruleQID { + $current.merge(this_QID_1); } { @@ -2933,6 +2985,8 @@ ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] @init { setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); + lastConsumedNode = currentNode; + lastConsumedDatatypeToken = $current; }: (( kw='-' @@ -2940,8 +2994,8 @@ ruleSINT returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] $current.merge(kw); createLeafNode(grammarAccess.prSINT().ele0KeywordHyphenMinus(), null); } -)? this_INT=RULE_INT { - $current.merge(this_INT); +)? this_INT_1=RULE_INT { + $current.merge(this_INT_1); } { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java index 3b7051c..403ebbe 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslLexer.java @@ -932,10 +932,10 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3007:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3007:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3061:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3061:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3007:11: ( '^' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3061:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -944,7 +944,7 @@ public class InternalEcoreDslLexer extends Lexer { } switch (alt1) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3007:12: '^' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3061:12: '^' { match('^'); @@ -963,7 +963,7 @@ public class InternalEcoreDslLexer extends Lexer { recover(mse); throw mse; } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3007:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3061:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -1011,10 +1011,10 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3009:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3009:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3063:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3063:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3009:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3063:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -1028,7 +1028,7 @@ public class InternalEcoreDslLexer extends Lexer { switch (alt3) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3009:13: '0' .. '9' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3063:13: '0' .. '9' { matchRange('0','9'); @@ -1058,7 +1058,7 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3011:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3065:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -1070,16 +1070,16 @@ public class InternalEcoreDslLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("3011:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("3065:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3012:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3066:6: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3012:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3066:10: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -1095,7 +1095,7 @@ public class InternalEcoreDslLexer extends Lexer { switch (alt4) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3012:12: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3066:12: '\\\\' ( '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' ) { @@ -1112,7 +1112,7 @@ public class InternalEcoreDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3012:56: ~ ( '\\\\' | '\"' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3066:56: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1138,10 +1138,10 @@ public class InternalEcoreDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3013:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3067:15: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3013:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3067:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -1157,7 +1157,7 @@ public class InternalEcoreDslLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3013:22: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3067:22: '\\\\' ( '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' ) { @@ -1174,7 +1174,7 @@ public class InternalEcoreDslLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3013:66: ~ ( '\\\\' | '\\'' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3067:66: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -1212,12 +1212,12 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3016:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3016:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3070:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3070:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3016:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3070:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -1242,7 +1242,7 @@ public class InternalEcoreDslLexer extends Lexer { switch (alt7) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3016:52: . + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3070:52: . { matchAny(); @@ -1270,12 +1270,12 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:24: (~ ( '\\n' | '\\r' ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -1288,7 +1288,7 @@ public class InternalEcoreDslLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:24: ~ ( '\\n' | '\\r' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:24: ~ ( '\\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(); @@ -1309,7 +1309,7 @@ public class InternalEcoreDslLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:38: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -1318,9 +1318,9 @@ public class InternalEcoreDslLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:39: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:39: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:39: ( '\\r' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -1329,7 +1329,7 @@ public class InternalEcoreDslLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3018:39: '\\r' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3072:39: '\\r' { match('\r'); @@ -1359,10 +1359,10 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3020:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3020:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3074:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3074:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3020:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3074:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -1415,8 +1415,8 @@ public class InternalEcoreDslLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3022:16: ( . ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3022:18: . + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3076:16: ( . ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:3076:18: . { matchAny(); diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java index 9cbc20f..487aae7 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDslParser.java @@ -100,25 +100,25 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEcoreDsl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:78:1: ruleEcoreDsl returns [EObject current=null] : ( (lv_imports= ruleImportStatementDecl )* (lv_package= ruleEPackageDecl ) ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:78:1: ruleEcoreDsl returns [EObject current=null] : ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) ; public final EObject ruleEcoreDsl() throws RecognitionException { EObject current = null; - EObject lv_imports = null; + EObject lv_imports_0 = null; - EObject lv_package = null; + EObject lv_package_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:82:6: ( ( (lv_imports= ruleImportStatementDecl )* (lv_package= ruleEPackageDecl ) ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_imports= ruleImportStatementDecl )* (lv_package= ruleEPackageDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:6: ( ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:84:1: ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:1: ( (lv_imports= ruleImportStatementDecl )* (lv_package= ruleEPackageDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_imports= ruleImportStatementDecl )* (lv_package= ruleEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:84:1: ( (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:84:2: (lv_imports_0= ruleImportStatementDecl )* (lv_package_1= ruleEPackageDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:83:2: (lv_imports= ruleImportStatementDecl )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:84:2: (lv_imports_0= ruleImportStatementDecl )* loop1: do { int alt1=2; @@ -131,13 +131,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt1) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:86:6: lv_imports= ruleImportStatementDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:87:6: lv_imports_0= ruleImportStatementDecl { currentNode=createCompositeNode(grammarAccess.prEcoreDsl().ele00ParserRuleCallImportStatementDecl(), currentNode); pushFollow(FOLLOW_ruleImportStatementDecl_in_ruleEcoreDsl141); - lv_imports=ruleImportStatementDecl(); + lv_imports_0=ruleImportStatementDecl(); _fsp--; @@ -147,7 +147,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "imports", lv_imports, "ImportStatementDecl", currentNode); + add(current, "imports", lv_imports_0, "ImportStatementDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -162,14 +162,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:104:3: (lv_package= ruleEPackageDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:107:6: lv_package= ruleEPackageDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:105:3: (lv_package_1= ruleEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:108:6: lv_package_1= ruleEPackageDecl { currentNode=createCompositeNode(grammarAccess.prEcoreDsl().ele10ParserRuleCallEPackageDecl(), currentNode); pushFollow(FOLLOW_ruleEPackageDecl_in_ruleEcoreDsl180); - lv_package=ruleEPackageDecl(); + lv_package_1=ruleEPackageDecl(); _fsp--; @@ -179,7 +179,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "package", lv_package, "EPackageDecl", currentNode); + set(current, "package", lv_package_1, "EPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -195,6 +195,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -210,7 +211,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleImportStatementDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:134:1: entryRuleImportStatementDecl returns [EObject current=null] : iv_ruleImportStatementDecl= ruleImportStatementDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:135:1: entryRuleImportStatementDecl returns [EObject current=null] : iv_ruleImportStatementDecl= ruleImportStatementDecl EOF ; public final EObject entryRuleImportStatementDecl() throws RecognitionException { EObject current = null; @@ -218,8 +219,8 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:134:61: (iv_ruleImportStatementDecl= ruleImportStatementDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:135:2: iv_ruleImportStatementDecl= ruleImportStatementDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:135:61: (iv_ruleImportStatementDecl= ruleImportStatementDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:136:2: iv_ruleImportStatementDecl= ruleImportStatementDecl EOF { currentNode = createCompositeNode(grammarAccess.prImportStatementDecl().getRule(), currentNode); pushFollow(FOLLOW_ruleImportStatementDecl_in_entryRuleImportStatementDecl219); @@ -245,33 +246,33 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleImportStatementDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:142:1: ruleImportStatementDecl returns [EObject current=null] : ( ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) ';' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:143:1: ruleImportStatementDecl returns [EObject current=null] : ( ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) ';' ) ; public final EObject ruleImportStatementDecl() throws RecognitionException { EObject current = null; - Token lv_alias=null; - Token lv_importURI=null; + Token lv_alias_1=null; + Token lv_importURI_3=null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:146:6: ( ( ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) ';' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:1: ( ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) ';' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:148:6: ( ( ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) ';' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:1: ( ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) ';' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:1: ( ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) ';' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:2: ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) ';' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:1: ( ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) ';' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:2: ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) ';' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:2: ( ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:3: ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) (lv_importURI= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:2: ( ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:3: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) (lv_importURI_3= RULE_STRING ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:3: ( 'import' ( (lv_alias= RULE_ID ) '=' )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:147:4: 'import' ( (lv_alias= RULE_ID ) '=' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:3: ( 'import' ( (lv_alias_1= RULE_ID ) '=' )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:149:4: 'import' ( (lv_alias_1= RULE_ID ) '=' )? { match(input,11,FOLLOW_11_in_ruleImportStatementDecl265); createLeafNode(grammarAccess.prImportStatementDecl().ele000KeywordImport(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:151:1: ( (lv_alias= RULE_ID ) '=' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:153:1: ( (lv_alias_1= RULE_ID ) '=' )? int alt2=2; int LA2_0 = input.LA(1); @@ -280,16 +281,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt2) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:151:2: (lv_alias= RULE_ID ) '=' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:153:2: (lv_alias_1= RULE_ID ) '=' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:151:2: (lv_alias= RULE_ID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:153:6: lv_alias= RULE_ID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:153:2: (lv_alias_1= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:155:6: lv_alias_1= RULE_ID { - lv_alias=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleImportStatementDecl287); - - createLeafNode(grammarAccess.prImportStatementDecl().ele00100LexerRuleCallID(), "alias"); - + lv_alias_1=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleImportStatementDecl288); + + createLeafNode(grammarAccess.prImportStatementDecl().ele00100LexerRuleCallID(), "alias"); + if (current==null) { current = factory.create("ImportStatementDecl"); @@ -297,7 +298,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "alias", lv_alias, "ID", currentNode); + set(current, "alias", lv_alias_1, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -305,7 +306,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,12,FOLLOW_12_in_ruleImportStatementDecl307); + match(input,12,FOLLOW_12_in_ruleImportStatementDecl305); createLeafNode(grammarAccess.prImportStatementDecl().ele0011KeywordEqualsSign(), null); @@ -318,14 +319,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:175:4: (lv_importURI= RULE_STRING ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:177:6: lv_importURI= RULE_STRING + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:177:4: (lv_importURI_3= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:179:6: lv_importURI_3= RULE_STRING { - lv_importURI=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImportStatementDecl331); - - createLeafNode(grammarAccess.prImportStatementDecl().ele010LexerRuleCallSTRING(), "importURI"); - + lv_importURI_3=(Token)input.LT(1); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImportStatementDecl330); + + createLeafNode(grammarAccess.prImportStatementDecl().ele010LexerRuleCallSTRING(), "importURI"); + if (current==null) { current = factory.create("ImportStatementDecl"); @@ -333,7 +334,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "importURI", lv_importURI, "STRING", currentNode); + set(current, "importURI", lv_importURI_3, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -344,7 +345,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_ruleImportStatementDecl352); + match(input,13,FOLLOW_13_in_ruleImportStatementDecl348); createLeafNode(grammarAccess.prImportStatementDecl().ele1KeywordSemicolon(), null); @@ -355,6 +356,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -370,7 +372,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEPackageDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:208:1: entryRuleEPackageDecl returns [EObject current=null] : iv_ruleEPackageDecl= ruleEPackageDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:210:1: entryRuleEPackageDecl returns [EObject current=null] : iv_ruleEPackageDecl= ruleEPackageDecl EOF ; public final EObject entryRuleEPackageDecl() throws RecognitionException { EObject current = null; @@ -378,16 +380,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:208:54: (iv_ruleEPackageDecl= ruleEPackageDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:209:2: iv_ruleEPackageDecl= ruleEPackageDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:210:54: (iv_ruleEPackageDecl= ruleEPackageDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:211:2: iv_ruleEPackageDecl= ruleEPackageDecl EOF { currentNode = createCompositeNode(grammarAccess.prEPackageDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl387); + pushFollow(FOLLOW_ruleEPackageDecl_in_entryRuleEPackageDecl383); iv_ruleEPackageDecl=ruleEPackageDecl(); _fsp--; current =iv_ruleEPackageDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEPackageDecl397); + match(input,EOF,FOLLOW_EOF_in_entryRuleEPackageDecl393); } @@ -405,62 +407,62 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEPackageDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:216:1: ruleEPackageDecl returns [EObject current=null] : ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:218:1: ruleEPackageDecl returns [EObject current=null] : ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) '}' ) ; public final EObject ruleEPackageDecl() throws RecognitionException { EObject current = null; - Token lv_nsURI=null; - EObject lv_eAnnotations = null; + Token lv_nsURI_5=null; + EObject lv_eAnnotations_0 = null; - AntlrDatatypeRuleToken lv_name = null; + AntlrDatatypeRuleToken lv_name_2 = null; - AntlrDatatypeRuleToken lv_nsPrefix = null; + AntlrDatatypeRuleToken lv_nsPrefix_8 = null; - EObject lv_eSubpackages = null; + EObject lv_eSubpackages_10 = null; - EObject lv_eClassifiers = null; + EObject lv_eClassifiers_11 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:220:6: ( ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:1: ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:223:6: ( ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) '}' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:1: ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) '}' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:1: ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:2: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:1: ( ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:2: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) '}' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:2: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:3: ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:2: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:3: ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:3: ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:4: ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) '{' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:3: ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:4: ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) '{' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:4: ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:5: ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix= ruleQID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:4: ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:5: ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) (lv_nsPrefix_8= ruleQID ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:5: ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:6: ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) '=' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:5: ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:6: ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) '=' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:6: ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:7: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) 'nsPrefix' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:6: ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:7: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) 'nsPrefix' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:7: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:8: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:7: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:8: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) (lv_nsURI_5= RULE_STRING ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:8: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:9: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) '=' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:8: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:9: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) '=' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:9: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:10: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) 'nsURI' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:9: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:10: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) 'nsURI' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:10: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:11: ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= ruleQID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:10: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:11: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= ruleQID ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:11: ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:12: (lv_eAnnotations= ruleEAnnotationDecl )* 'package' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:11: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:12: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:221:12: (lv_eAnnotations= ruleEAnnotationDecl )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:12: (lv_eAnnotations_0= ruleEAnnotationDecl )* loop3: do { int alt3=2; @@ -473,13 +475,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt3) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:224:6: lv_eAnnotations= ruleEAnnotationDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:227:6: lv_eAnnotations_0= ruleEAnnotationDecl { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele000000000000ParserRuleCallEAnnotationDecl(), currentNode); - pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl466); - lv_eAnnotations=ruleEAnnotationDecl(); + pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEPackageDecl462); + lv_eAnnotations_0=ruleEAnnotationDecl(); _fsp--; @@ -489,7 +491,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add(current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -504,21 +506,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } } while (true); - match(input,14,FOLLOW_14_in_ruleEPackageDecl480); + match(input,14,FOLLOW_14_in_ruleEPackageDecl476); createLeafNode(grammarAccess.prEPackageDecl().ele00000000001KeywordPackage(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:246:2: (lv_name= ruleQID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:249:6: lv_name= ruleQID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:249:2: (lv_name_2= ruleQID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:252:6: lv_name_2= ruleQID { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele00000000010ParserRuleCallQID(), currentNode); - pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl515); - lv_name=ruleQID(); + pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl511); + lv_name_2=ruleQID(); _fsp--; @@ -528,7 +530,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "QID", currentNode); + set(current, "name", lv_name_2, "QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -540,28 +542,28 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,15,FOLLOW_15_in_ruleEPackageDecl529); + match(input,15,FOLLOW_15_in_ruleEPackageDecl525); createLeafNode(grammarAccess.prEPackageDecl().ele000000001KeywordNsURI(), null); } - match(input,12,FOLLOW_12_in_ruleEPackageDecl539); + match(input,12,FOLLOW_12_in_ruleEPackageDecl535); createLeafNode(grammarAccess.prEPackageDecl().ele00000001KeywordEqualsSign(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:275:2: (lv_nsURI= RULE_STRING ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:277:6: lv_nsURI= RULE_STRING + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:278:2: (lv_nsURI_5= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:280:6: lv_nsURI_5= RULE_STRING { - lv_nsURI=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEPackageDecl561); - - createLeafNode(grammarAccess.prEPackageDecl().ele00000010LexerRuleCallSTRING(), "nsURI"); - + lv_nsURI_5=(Token)input.LT(1); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEPackageDecl558); + + createLeafNode(grammarAccess.prEPackageDecl().ele00000010LexerRuleCallSTRING(), "nsURI"); + if (current==null) { current = factory.create("EPackage"); @@ -569,7 +571,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "nsURI", lv_nsURI, "STRING", currentNode); + set(current, "nsURI", lv_nsURI_5, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -580,28 +582,28 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,16,FOLLOW_16_in_ruleEPackageDecl582); + match(input,16,FOLLOW_16_in_ruleEPackageDecl576); createLeafNode(grammarAccess.prEPackageDecl().ele000001KeywordNsPrefix(), null); } - match(input,12,FOLLOW_12_in_ruleEPackageDecl592); + match(input,12,FOLLOW_12_in_ruleEPackageDecl586); createLeafNode(grammarAccess.prEPackageDecl().ele00001KeywordEqualsSign(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:303:2: (lv_nsPrefix= ruleQID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:306:6: lv_nsPrefix= ruleQID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:306:2: (lv_nsPrefix_8= ruleQID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:309:6: lv_nsPrefix_8= ruleQID { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele00010ParserRuleCallQID(), currentNode); - pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl627); - lv_nsPrefix=ruleQID(); + pushFollow(FOLLOW_ruleQID_in_ruleEPackageDecl621); + lv_nsPrefix_8=ruleQID(); _fsp--; @@ -611,7 +613,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "nsPrefix", lv_nsPrefix, "QID", currentNode); + set(current, "nsPrefix", lv_nsPrefix_8, "QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -623,30 +625,30 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,17,FOLLOW_17_in_ruleEPackageDecl641); + match(input,17,FOLLOW_17_in_ruleEPackageDecl635); createLeafNode(grammarAccess.prEPackageDecl().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:328:2: ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:331:2: ( (lv_eSubpackages_10= ruleSubEPackageDecl ) | (lv_eClassifiers_11= ruleEClassifierDecl ) )* loop4: do { int alt4=3; alt4 = dfa4.predict(input); switch (alt4) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:328:3: (lv_eSubpackages= ruleSubEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:331:3: (lv_eSubpackages_10= ruleSubEPackageDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:328:3: (lv_eSubpackages= ruleSubEPackageDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:331:6: lv_eSubpackages= ruleSubEPackageDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:331:3: (lv_eSubpackages_10= ruleSubEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:334:6: lv_eSubpackages_10= ruleSubEPackageDecl { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele0100ParserRuleCallSubEPackageDecl(), currentNode); - pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl677); - lv_eSubpackages=ruleSubEPackageDecl(); + pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleEPackageDecl671); + lv_eSubpackages_10=ruleSubEPackageDecl(); _fsp--; @@ -656,7 +658,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eSubpackages", lv_eSubpackages, "SubEPackageDecl", currentNode); + add(current, "eSubpackages", lv_eSubpackages_10, "SubEPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -669,16 +671,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:350:6: (lv_eClassifiers= ruleEClassifierDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:353:6: (lv_eClassifiers_11= ruleEClassifierDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:350:6: (lv_eClassifiers= ruleEClassifierDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:353:6: lv_eClassifiers= ruleEClassifierDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:353:6: (lv_eClassifiers_11= ruleEClassifierDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:356:6: lv_eClassifiers_11= ruleEClassifierDecl { currentNode=createCompositeNode(grammarAccess.prEPackageDecl().ele0110ParserRuleCallEClassifierDecl(), currentNode); - pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl721); - lv_eClassifiers=ruleEClassifierDecl(); + pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleEPackageDecl715); + lv_eClassifiers_11=ruleEClassifierDecl(); _fsp--; @@ -688,7 +690,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eClassifiers", lv_eClassifiers, "EClassifierDecl", currentNode); + add(current, "eClassifiers", lv_eClassifiers_11, "EClassifierDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -709,7 +711,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,18,FOLLOW_18_in_ruleEPackageDecl737); + match(input,18,FOLLOW_18_in_ruleEPackageDecl731); createLeafNode(grammarAccess.prEPackageDecl().ele1KeywordRightCurlyBracket(), null); @@ -720,6 +722,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -735,7 +738,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleSubEPackageDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:384:1: entryRuleSubEPackageDecl returns [EObject current=null] : iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:387:1: entryRuleSubEPackageDecl returns [EObject current=null] : iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ; public final EObject entryRuleSubEPackageDecl() throws RecognitionException { EObject current = null; @@ -743,16 +746,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:384:57: (iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:385:2: iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:387:57: (iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:388:2: iv_ruleSubEPackageDecl= ruleSubEPackageDecl EOF { currentNode = createCompositeNode(grammarAccess.prSubEPackageDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl772); + pushFollow(FOLLOW_ruleSubEPackageDecl_in_entryRuleSubEPackageDecl766); iv_ruleSubEPackageDecl=ruleSubEPackageDecl(); _fsp--; current =iv_ruleSubEPackageDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleSubEPackageDecl782); + match(input,EOF,FOLLOW_EOF_in_entryRuleSubEPackageDecl776); } @@ -770,40 +773,40 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleSubEPackageDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:392:1: ruleSubEPackageDecl returns [EObject current=null] : ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:395:1: ruleSubEPackageDecl returns [EObject current=null] : ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) '}' ) ; public final EObject ruleSubEPackageDecl() throws RecognitionException { EObject current = null; - Token lv_name=null; - EObject lv_eAnnotations = null; + Token lv_name_2=null; + EObject lv_eAnnotations_0 = null; - EObject lv_eSubpackages = null; + EObject lv_eSubpackages_4 = null; - EObject lv_eClassifiers = null; + EObject lv_eClassifiers_5 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:396:6: ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:1: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:400:6: ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) '}' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:1: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) '}' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:1: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:2: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) '}' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:1: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:2: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) '}' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:2: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:3: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:2: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:3: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:3: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:4: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) '{' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:3: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:4: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) '{' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:4: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:5: ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:4: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:5: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:5: ( (lv_eAnnotations= ruleEAnnotationDecl )* 'package' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:6: (lv_eAnnotations= ruleEAnnotationDecl )* 'package' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:5: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:6: (lv_eAnnotations_0= ruleEAnnotationDecl )* 'package' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:397:6: (lv_eAnnotations= ruleEAnnotationDecl )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:401:6: (lv_eAnnotations_0= ruleEAnnotationDecl )* loop5: do { int alt5=2; @@ -816,13 +819,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt5) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:400:6: lv_eAnnotations= ruleEAnnotationDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:404:6: lv_eAnnotations_0= ruleEAnnotationDecl { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele000000ParserRuleCallEAnnotationDecl(), currentNode); - pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl845); - lv_eAnnotations=ruleEAnnotationDecl(); + pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleSubEPackageDecl839); + lv_eAnnotations_0=ruleEAnnotationDecl(); _fsp--; @@ -832,7 +835,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add(current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -847,21 +850,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } } while (true); - match(input,14,FOLLOW_14_in_ruleSubEPackageDecl859); + match(input,14,FOLLOW_14_in_ruleSubEPackageDecl853); createLeafNode(grammarAccess.prSubEPackageDecl().ele00001KeywordPackage(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:422:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:424:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:426:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:428:6: lv_name_2= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubEPackageDecl881); - - createLeafNode(grammarAccess.prSubEPackageDecl().ele00010LexerRuleCallID(), "name"); - + lv_name_2=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSubEPackageDecl876); + + createLeafNode(grammarAccess.prSubEPackageDecl().ele00010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("EPackage"); @@ -869,7 +872,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_2, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -880,30 +883,30 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,17,FOLLOW_17_in_ruleSubEPackageDecl902); + match(input,17,FOLLOW_17_in_ruleSubEPackageDecl894); createLeafNode(grammarAccess.prSubEPackageDecl().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:446:2: ( (lv_eSubpackages= ruleSubEPackageDecl ) | (lv_eClassifiers= ruleEClassifierDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:450:2: ( (lv_eSubpackages_4= ruleSubEPackageDecl ) | (lv_eClassifiers_5= ruleEClassifierDecl ) )* loop6: do { int alt6=3; alt6 = dfa6.predict(input); switch (alt6) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:446:3: (lv_eSubpackages= ruleSubEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:450:3: (lv_eSubpackages_4= ruleSubEPackageDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:446:3: (lv_eSubpackages= ruleSubEPackageDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:449:6: lv_eSubpackages= ruleSubEPackageDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:450:3: (lv_eSubpackages_4= ruleSubEPackageDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:453:6: lv_eSubpackages_4= ruleSubEPackageDecl { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele0100ParserRuleCallSubEPackageDecl(), currentNode); - pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl938); - lv_eSubpackages=ruleSubEPackageDecl(); + pushFollow(FOLLOW_ruleSubEPackageDecl_in_ruleSubEPackageDecl930); + lv_eSubpackages_4=ruleSubEPackageDecl(); _fsp--; @@ -913,7 +916,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eSubpackages", lv_eSubpackages, "SubEPackageDecl", currentNode); + add(current, "eSubpackages", lv_eSubpackages_4, "SubEPackageDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -926,16 +929,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:468:6: (lv_eClassifiers= ruleEClassifierDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:472:6: (lv_eClassifiers_5= ruleEClassifierDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:468:6: (lv_eClassifiers= ruleEClassifierDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:471:6: lv_eClassifiers= ruleEClassifierDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:472:6: (lv_eClassifiers_5= ruleEClassifierDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:475:6: lv_eClassifiers_5= ruleEClassifierDecl { currentNode=createCompositeNode(grammarAccess.prSubEPackageDecl().ele0110ParserRuleCallEClassifierDecl(), currentNode); - pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl982); - lv_eClassifiers=ruleEClassifierDecl(); + pushFollow(FOLLOW_ruleEClassifierDecl_in_ruleSubEPackageDecl974); + lv_eClassifiers_5=ruleEClassifierDecl(); _fsp--; @@ -945,7 +948,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eClassifiers", lv_eClassifiers, "EClassifierDecl", currentNode); + add(current, "eClassifiers", lv_eClassifiers_5, "EClassifierDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -966,7 +969,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,18,FOLLOW_18_in_ruleSubEPackageDecl998); + match(input,18,FOLLOW_18_in_ruleSubEPackageDecl990); createLeafNode(grammarAccess.prSubEPackageDecl().ele1KeywordRightCurlyBracket(), null); @@ -977,6 +980,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -992,7 +996,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEClassifierDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:502:1: entryRuleEClassifierDecl returns [EObject current=null] : iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:506:1: entryRuleEClassifierDecl returns [EObject current=null] : iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ; public final EObject entryRuleEClassifierDecl() throws RecognitionException { EObject current = null; @@ -1000,16 +1004,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:502:57: (iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:503:2: iv_ruleEClassifierDecl= ruleEClassifierDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:506:57: (iv_ruleEClassifierDecl= ruleEClassifierDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:507:2: iv_ruleEClassifierDecl= ruleEClassifierDecl EOF { currentNode = createCompositeNode(grammarAccess.prEClassifierDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl1033); + pushFollow(FOLLOW_ruleEClassifierDecl_in_entryRuleEClassifierDecl1025); iv_ruleEClassifierDecl=ruleEClassifierDecl(); _fsp--; current =iv_ruleEClassifierDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEClassifierDecl1043); + match(input,EOF,FOLLOW_EOF_in_entryRuleEClassifierDecl1035); } @@ -1027,54 +1031,54 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEClassifierDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:510:1: ruleEClassifierDecl returns [EObject current=null] : (this_EClassDecl= ruleEClassDecl | this_EDataTypeDecl= ruleEDataTypeDecl ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:514:1: ruleEClassifierDecl returns [EObject current=null] : (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) ; public final EObject ruleEClassifierDecl() throws RecognitionException { EObject current = null; - EObject this_EClassDecl = null; + EObject this_EClassDecl_0 = null; - EObject this_EDataTypeDecl = null; + EObject this_EDataTypeDecl_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:514:6: ( (this_EClassDecl= ruleEClassDecl | this_EDataTypeDecl= ruleEDataTypeDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:515:1: (this_EClassDecl= ruleEClassDecl | this_EDataTypeDecl= ruleEDataTypeDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:519:6: ( (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:520:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:515:1: (this_EClassDecl= ruleEClassDecl | this_EDataTypeDecl= ruleEDataTypeDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:520:1: (this_EClassDecl_0= ruleEClassDecl | this_EDataTypeDecl_1= ruleEDataTypeDecl ) int alt7=2; alt7 = dfa7.predict(input); switch (alt7) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:516:5: this_EClassDecl= ruleEClassDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:521:5: this_EClassDecl_0= ruleEClassDecl { currentNode=createCompositeNode(grammarAccess.prEClassifierDecl().ele0ParserRuleCallEClassDecl(), currentNode); - pushFollow(FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1090); - this_EClassDecl=ruleEClassDecl(); + pushFollow(FOLLOW_ruleEClassDecl_in_ruleEClassifierDecl1082); + this_EClassDecl_0=ruleEClassDecl(); _fsp--; - current = this_EClassDecl; + current = this_EClassDecl_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:526:5: this_EDataTypeDecl= ruleEDataTypeDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:531:5: this_EDataTypeDecl_1= ruleEDataTypeDecl { currentNode=createCompositeNode(grammarAccess.prEClassifierDecl().ele1ParserRuleCallEDataTypeDecl(), currentNode); - pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1117); - this_EDataTypeDecl=ruleEDataTypeDecl(); + pushFollow(FOLLOW_ruleEDataTypeDecl_in_ruleEClassifierDecl1109); + this_EDataTypeDecl_1=ruleEDataTypeDecl(); _fsp--; - current = this_EDataTypeDecl; + current = this_EDataTypeDecl_1; currentNode = currentNode.getParent(); @@ -1087,6 +1091,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1102,7 +1107,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEDataTypeDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:543:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:548:1: entryRuleEDataTypeDecl returns [EObject current=null] : iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ; public final EObject entryRuleEDataTypeDecl() throws RecognitionException { EObject current = null; @@ -1110,16 +1115,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:543:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:544:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:548:55: (iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:549:2: iv_ruleEDataTypeDecl= ruleEDataTypeDecl EOF { currentNode = createCompositeNode(grammarAccess.prEDataTypeDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1151); + pushFollow(FOLLOW_ruleEDataTypeDecl_in_entryRuleEDataTypeDecl1143); iv_ruleEDataTypeDecl=ruleEDataTypeDecl(); _fsp--; current =iv_ruleEDataTypeDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1161); + match(input,EOF,FOLLOW_EOF_in_entryRuleEDataTypeDecl1153); } @@ -1137,39 +1142,39 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEDataTypeDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:551:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl= ruleEEnumDecl ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:1: ruleEDataTypeDecl returns [EObject current=null] : ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ; public final EObject ruleEDataTypeDecl() throws RecognitionException { EObject current = null; - Token lv_serializable=null; - Token lv_name=null; - EObject lv_eAnnotations = null; + Token lv_serializable_1=null; + Token lv_name_3=null; + EObject lv_eAnnotations_0 = null; - AntlrDatatypeRuleToken lv_instanceClassName = null; + AntlrDatatypeRuleToken lv_instanceClassName_5 = null; - EObject this_EEnumDecl = null; + EObject this_EEnumDecl_7 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:555:6: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl= ruleEEnumDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:1: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl= ruleEEnumDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:561:6: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:1: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:1: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl= ruleEEnumDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:1: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) | this_EEnumDecl_7= ruleEEnumDecl ) int alt10=2; alt10 = dfa10.predict(input); switch (alt10) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:2: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:2: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:2: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:3: ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:2: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:3: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:3: ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:4: (lv_eAnnotations= ruleEAnnotationDecl )* (lv_serializable= '!serializable' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:3: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:4: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_serializable_1= '!serializable' )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:556:4: (lv_eAnnotations= ruleEAnnotationDecl )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:562:4: (lv_eAnnotations_0= ruleEAnnotationDecl )* loop8: do { int alt8=2; @@ -1182,13 +1187,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt8) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:559:6: lv_eAnnotations= ruleEAnnotationDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:565:6: lv_eAnnotations_0= ruleEAnnotationDecl { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele0000ParserRuleCallEAnnotationDecl(), currentNode); - pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1222); - lv_eAnnotations=ruleEAnnotationDecl(); + pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEDataTypeDecl1214); + lv_eAnnotations_0=ruleEAnnotationDecl(); _fsp--; @@ -1198,7 +1203,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add(current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1213,7 +1218,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:577:3: (lv_serializable= '!serializable' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:583:3: (lv_serializable_1= '!serializable' )? int alt9=2; int LA9_0 = input.LA(1); @@ -1222,10 +1227,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt9) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:579:6: lv_serializable= '!serializable' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:585:6: lv_serializable_1= '!serializable' { - lv_serializable=(Token)input.LT(1); - match(input,19,FOLLOW_19_in_ruleEDataTypeDecl1248); + lv_serializable_1=(Token)input.LT(1); + match(input,19,FOLLOW_19_in_ruleEDataTypeDecl1240); createLeafNode(grammarAccess.prEDataTypeDecl().ele0010KeywordSerializable(), "serializable"); @@ -1236,7 +1241,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "serializable", true, "!serializable", currentNode); + set(current, "serializable", true, "!serializable", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1250,30 +1255,30 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:4: ( ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:5: ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) ';' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:4: ( ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:5: ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) ';' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:5: ( ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:6: ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) (lv_instanceClassName= ruleSTRING_OR_QID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:5: ( ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:6: ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) (lv_instanceClassName_5= ruleSTRING_OR_QID ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:6: ( ( 'datatype' (lv_name= RULE_ID ) ) ':' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:7: ( 'datatype' (lv_name= RULE_ID ) ) ':' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:6: ( ( 'datatype' (lv_name_3= RULE_ID ) ) ':' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:7: ( 'datatype' (lv_name_3= RULE_ID ) ) ':' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:7: ( 'datatype' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:597:8: 'datatype' (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:7: ( 'datatype' (lv_name_3= RULE_ID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:604:8: 'datatype' (lv_name_3= RULE_ID ) { - match(input,20,FOLLOW_20_in_ruleEDataTypeDecl1275); + match(input,20,FOLLOW_20_in_ruleEDataTypeDecl1268); createLeafNode(grammarAccess.prEDataTypeDecl().ele010000KeywordDatatype(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:601:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:603:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:608:1: (lv_name_3= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:610:6: lv_name_3= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1296); - - createLeafNode(grammarAccess.prEDataTypeDecl().ele0100010LexerRuleCallID(), "name"); - + lv_name_3=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEDataTypeDecl1290); + + createLeafNode(grammarAccess.prEDataTypeDecl().ele0100010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("EDataType"); @@ -1281,7 +1286,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_3, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1292,21 +1297,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,21,FOLLOW_21_in_ruleEDataTypeDecl1317); + match(input,21,FOLLOW_21_in_ruleEDataTypeDecl1308); createLeafNode(grammarAccess.prEDataTypeDecl().ele01001KeywordColon(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:625:2: (lv_instanceClassName= ruleSTRING_OR_QID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:628:6: lv_instanceClassName= ruleSTRING_OR_QID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:632:2: (lv_instanceClassName_5= ruleSTRING_OR_QID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:635:6: lv_instanceClassName_5= ruleSTRING_OR_QID { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele01010ParserRuleCallSTRING_OR_QID(), currentNode); - pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1352); - lv_instanceClassName=ruleSTRING_OR_QID(); + pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEDataTypeDecl1343); + lv_instanceClassName_5=ruleSTRING_OR_QID(); _fsp--; @@ -1316,7 +1321,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "instanceClassName", lv_instanceClassName, "STRING_OR_QID", currentNode); + set(current, "instanceClassName", lv_instanceClassName_5, "STRING_OR_QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1328,7 +1333,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_ruleEDataTypeDecl1366); + match(input,13,FOLLOW_13_in_ruleEDataTypeDecl1357); createLeafNode(grammarAccess.prEDataTypeDecl().ele011KeywordSemicolon(), null); @@ -1342,17 +1347,17 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:652:5: this_EEnumDecl= ruleEEnumDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:659:5: this_EEnumDecl_7= ruleEEnumDecl { currentNode=createCompositeNode(grammarAccess.prEDataTypeDecl().ele1ParserRuleCallEEnumDecl(), currentNode); - pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1396); - this_EEnumDecl=ruleEEnumDecl(); + pushFollow(FOLLOW_ruleEEnumDecl_in_ruleEDataTypeDecl1387); + this_EEnumDecl_7=ruleEEnumDecl(); _fsp--; - current = this_EEnumDecl; + current = this_EEnumDecl_7; currentNode = currentNode.getParent(); @@ -1365,6 +1370,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1380,7 +1386,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEAnnotationDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:669:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:1: entryRuleEAnnotationDecl returns [EObject current=null] : iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ; public final EObject entryRuleEAnnotationDecl() throws RecognitionException { EObject current = null; @@ -1388,16 +1394,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:669:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:670:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:676:57: (iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:677:2: iv_ruleEAnnotationDecl= ruleEAnnotationDecl EOF { currentNode = createCompositeNode(grammarAccess.prEAnnotationDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1430); + pushFollow(FOLLOW_ruleEAnnotationDecl_in_entryRuleEAnnotationDecl1421); iv_ruleEAnnotationDecl=ruleEAnnotationDecl(); _fsp--; current =iv_ruleEAnnotationDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1440); + match(input,EOF,FOLLOW_EOF_in_entryRuleEAnnotationDecl1431); } @@ -1415,50 +1421,52 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEAnnotationDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:677:1: ruleEAnnotationDecl returns [EObject current=null] : ( ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) ')' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:684:1: ruleEAnnotationDecl returns [EObject current=null] : ( ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) ')' ) ; public final EObject ruleEAnnotationDecl() throws RecognitionException { EObject current = null; - Token lv_source=null; - EObject lv_contents = null; + Token lv_source_1=null; + EObject lv_contents_4 = null; + + EObject lv_contents_6 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:681:6: ( ( ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) ')' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:1: ( ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) ')' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:689:6: ( ( ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) ')' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:1: ( ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) ')' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:1: ( ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) ')' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:2: ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) ')' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:1: ( ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) ')' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:2: ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) ')' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:2: ( ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:3: ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) ( ',' (lv_contents= ruleMapEntrySuper ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:2: ( ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:3: ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) ( ',' (lv_contents_6= ruleMapEntrySuper ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:3: ( ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:4: ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) (lv_contents= ruleMapEntrySuper ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:3: ( ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:4: ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) (lv_contents_4= ruleMapEntrySuper ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:4: ( ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:5: ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) '(' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:4: ( ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:5: ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) '(' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:5: ( ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:6: ( '@' (lv_source= RULE_STRING ) ) ( ( RULE_ID ) )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:5: ( ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:6: ( '@' (lv_source_1= RULE_STRING ) ) ( RULE_ID )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:6: ( '@' (lv_source= RULE_STRING ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:682:7: '@' (lv_source= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:6: ( '@' (lv_source_1= RULE_STRING ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:690:7: '@' (lv_source_1= RULE_STRING ) { - match(input,22,FOLLOW_22_in_ruleEAnnotationDecl1479); + match(input,22,FOLLOW_22_in_ruleEAnnotationDecl1470); createLeafNode(grammarAccess.prEAnnotationDecl().ele000000KeywordCommercialAt(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:686:1: (lv_source= RULE_STRING ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:688:6: lv_source= RULE_STRING + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:694:1: (lv_source_1= RULE_STRING ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:696:6: lv_source_1= RULE_STRING { - lv_source=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAnnotationDecl1500); - - createLeafNode(grammarAccess.prEAnnotationDecl().ele0000010LexerRuleCallSTRING(), "source"); - + lv_source_1=(Token)input.LT(1); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleEAnnotationDecl1492); + + createLeafNode(grammarAccess.prEAnnotationDecl().ele0000010LexerRuleCallSTRING(), "source"); + if (current==null) { current = factory.create("EAnnotation"); @@ -1466,7 +1474,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "source", lv_source, "STRING", currentNode); + set(current, "source", lv_source_1, "STRING", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1477,7 +1485,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:706:3: ( ( RULE_ID ) )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:714:3: ( RULE_ID )? int alt11=2; int LA11_0 = input.LA(1); @@ -1486,7 +1494,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt11) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:709:3: ( RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:717:3: RULE_ID { if (current==null) { @@ -1494,16 +1502,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:715:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:716:2: RULE_ID - { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAnnotationDecl1536); - - createLeafNode(grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement(), "eModelElement"); - - - } + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEAnnotationDecl1523); + createLeafNode(grammarAccess.prEAnnotationDecl().ele000010CrossReferenceEStringEModelElement(), "eModelElement"); + } break; @@ -1513,21 +1515,21 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,23,FOLLOW_23_in_ruleEAnnotationDecl1551); + match(input,23,FOLLOW_23_in_ruleEAnnotationDecl1537); createLeafNode(grammarAccess.prEAnnotationDecl().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:725:2: (lv_contents= ruleMapEntrySuper ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:728:6: lv_contents= ruleMapEntrySuper + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:734:2: (lv_contents_4= ruleMapEntrySuper ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:737:6: lv_contents_4= ruleMapEntrySuper { currentNode=createCompositeNode(grammarAccess.prEAnnotationDecl().ele0010ParserRuleCallMapEntrySuper(), currentNode); - pushFollow(FOLLOW_ruleMapEntrySuper_in_ruleEAnnotationDecl1586); - lv_contents=ruleMapEntrySuper(); + pushFollow(FOLLOW_ruleMapEntrySuper_in_ruleEAnnotationDecl1572); + lv_contents_4=ruleMapEntrySuper(); _fsp--; @@ -1537,7 +1539,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "contents", lv_contents, "MapEntrySuper", currentNode); + add(current, "contents", lv_contents_4, "MapEntrySuper", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1549,7 +1551,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:746:3: ( ',' (lv_contents= ruleMapEntrySuper ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:755:3: ( ',' (lv_contents_6= ruleMapEntrySuper ) )* loop12: do { int alt12=2; @@ -1562,20 +1564,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt12) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:746:4: ',' (lv_contents= ruleMapEntrySuper ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:755:4: ',' (lv_contents_6= ruleMapEntrySuper ) { - match(input,24,FOLLOW_24_in_ruleEAnnotationDecl1601); + match(input,24,FOLLOW_24_in_ruleEAnnotationDecl1587); createLeafNode(grammarAccess.prEAnnotationDecl().ele010KeywordComma(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:750:1: (lv_contents= ruleMapEntrySuper ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:753:6: lv_contents= ruleMapEntrySuper + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:759:1: (lv_contents_6= ruleMapEntrySuper ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:762:6: lv_contents_6= ruleMapEntrySuper { currentNode=createCompositeNode(grammarAccess.prEAnnotationDecl().ele0110ParserRuleCallMapEntrySuper(), currentNode); - pushFollow(FOLLOW_ruleMapEntrySuper_in_ruleEAnnotationDecl1635); - lv_contents=ruleMapEntrySuper(); + pushFollow(FOLLOW_ruleMapEntrySuper_in_ruleEAnnotationDecl1621); + lv_contents_6=ruleMapEntrySuper(); _fsp--; @@ -1585,7 +1587,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "contents", lv_contents, "MapEntrySuper", currentNode); + add(current, "contents", lv_contents_6, "MapEntrySuper", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1606,7 +1608,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,25,FOLLOW_25_in_ruleEAnnotationDecl1651); + match(input,25,FOLLOW_25_in_ruleEAnnotationDecl1637); createLeafNode(grammarAccess.prEAnnotationDecl().ele1KeywordRightParenthesis(), null); @@ -1617,6 +1619,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -1632,7 +1635,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEClassDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:784:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:793:1: entryRuleEClassDecl returns [EObject current=null] : iv_ruleEClassDecl= ruleEClassDecl EOF ; public final EObject entryRuleEClassDecl() throws RecognitionException { EObject current = null; @@ -1640,16 +1643,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:784:52: (iv_ruleEClassDecl= ruleEClassDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:785:2: iv_ruleEClassDecl= ruleEClassDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:793:52: (iv_ruleEClassDecl= ruleEClassDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:794:2: iv_ruleEClassDecl= ruleEClassDecl EOF { currentNode = createCompositeNode(grammarAccess.prEClassDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1686); + pushFollow(FOLLOW_ruleEClassDecl_in_entryRuleEClassDecl1672); iv_ruleEClassDecl=ruleEClassDecl(); _fsp--; current =iv_ruleEClassDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1696); + match(input,EOF,FOLLOW_EOF_in_entryRuleEClassDecl1682); } @@ -1667,60 +1670,64 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEClassDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:792:1: ruleEClassDecl returns [EObject current=null] : ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) '}' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:801:1: ruleEClassDecl returns [EObject current=null] : ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) '}' ) ; public final EObject ruleEClassDecl() throws RecognitionException { EObject current = null; - Token lv_abstract=null; - Token lv_interface=null; - Token lv_name=null; - EObject lv_eAnnotations = null; + Token lv_abstract_1=null; + Token lv_interface_2=null; + Token lv_name_4=null; + EObject lv_eAnnotations_0 = null; + + EObject lv_eTypeParameters_6 = null; + + EObject lv_eTypeParameters_8 = null; - EObject lv_eTypeParameters = null; + EObject lv_eGenericSuperTypes_11 = null; - EObject lv_eGenericSuperTypes = null; + EObject lv_eGenericSuperTypes_13 = null; - AntlrDatatypeRuleToken lv_instanceClassName = null; + AntlrDatatypeRuleToken lv_instanceClassName_15 = null; - EObject lv_eStructuralFeatures = null; + EObject lv_eStructuralFeatures_17 = null; - EObject lv_eOperations = null; + EObject lv_eOperations_18 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:796:6: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) '}' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:1: ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:806:6: ( ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) '}' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:1: ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) '}' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:1: ( ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) '}' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:2: ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) '}' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:1: ( ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) '}' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:2: ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) '}' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:2: ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:3: ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:2: ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:3: ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:3: ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:4: ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) '{' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:3: ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:4: ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) '{' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:4: ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:5: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:4: ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:5: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:5: ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:6: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:5: ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:6: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:6: ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:7: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:6: ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:7: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:7: ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:8: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) (lv_name= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:7: ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:8: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) (lv_name_4= RULE_ID ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:8: ( ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:9: ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) ( (lv_interface= 'interface' ) | 'class' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:8: ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:9: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) ( (lv_interface_2= 'interface' ) | 'class' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:9: ( (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:10: (lv_eAnnotations= ruleEAnnotationDecl )* (lv_abstract= 'abstract' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:9: ( (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:10: (lv_eAnnotations_0= ruleEAnnotationDecl )* (lv_abstract_1= 'abstract' )? { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:797:10: (lv_eAnnotations= ruleEAnnotationDecl )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:807:10: (lv_eAnnotations_0= ruleEAnnotationDecl )* loop13: do { int alt13=2; @@ -1733,13 +1740,13 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt13) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:800:6: lv_eAnnotations= ruleEAnnotationDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:810:6: lv_eAnnotations_0= ruleEAnnotationDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000000000ParserRuleCallEAnnotationDecl(), currentNode); - pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1763); - lv_eAnnotations=ruleEAnnotationDecl(); + pushFollow(FOLLOW_ruleEAnnotationDecl_in_ruleEClassDecl1749); + lv_eAnnotations_0=ruleEAnnotationDecl(); _fsp--; @@ -1749,7 +1756,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eAnnotations", lv_eAnnotations, "EAnnotationDecl", currentNode); + add(current, "eAnnotations", lv_eAnnotations_0, "EAnnotationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1764,7 +1771,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } } while (true); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:818:3: (lv_abstract= 'abstract' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:828:3: (lv_abstract_1= 'abstract' )? int alt14=2; int LA14_0 = input.LA(1); @@ -1773,10 +1780,10 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt14) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:820:6: lv_abstract= 'abstract' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:830:6: lv_abstract_1= 'abstract' { - lv_abstract=(Token)input.LT(1); - match(input,26,FOLLOW_26_in_ruleEClassDecl1789); + lv_abstract_1=(Token)input.LT(1); + match(input,26,FOLLOW_26_in_ruleEClassDecl1775); createLeafNode(grammarAccess.prEClassDecl().ele0000000010KeywordAbstract(), "abstract"); @@ -1787,7 +1794,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "abstract", true, "abstract", currentNode); + set(current, "abstract", true, "abstract", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1801,7 +1808,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:838:4: ( (lv_interface= 'interface' ) | 'class' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:849:4: ( (lv_interface_2= 'interface' ) | 'class' ) int alt15=2; int LA15_0 = input.LA(1); @@ -1813,19 +1820,19 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("838:4: ( (lv_interface= 'interface' ) | 'class' )", 15, 0, input); + new NoViableAltException("849:4: ( (lv_interface_2= 'interface' ) | 'class' )", 15, 0, input); throw nvae; } switch (alt15) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:838:5: (lv_interface= 'interface' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:849:5: (lv_interface_2= 'interface' ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:838:5: (lv_interface= 'interface' ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:840:6: lv_interface= 'interface' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:849:5: (lv_interface_2= 'interface' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:851:6: lv_interface_2= 'interface' { - lv_interface=(Token)input.LT(1); - match(input,27,FOLLOW_27_in_ruleEClassDecl1825); + lv_interface_2=(Token)input.LT(1); + match(input,27,FOLLOW_27_in_ruleEClassDecl1812); createLeafNode(grammarAccess.prEClassDecl().ele0000000100KeywordInterface(), "interface"); @@ -1836,7 +1843,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "interface", true, "interface", currentNode); + set(current, "interface", true, "interface", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1848,9 +1855,9 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:859:6: 'class' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:871:6: 'class' { - match(input,28,FOLLOW_28_in_ruleEClassDecl1852); + match(input,28,FOLLOW_28_in_ruleEClassDecl1840); createLeafNode(grammarAccess.prEClassDecl().ele000000011KeywordClass(), null); @@ -1863,14 +1870,14 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:863:3: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:865:6: lv_name= RULE_ID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:875:3: (lv_name_4= RULE_ID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:877:6: lv_name_4= RULE_ID { - lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1875); - - createLeafNode(grammarAccess.prEClassDecl().ele00000010LexerRuleCallID(), "name"); - + lv_name_4=(Token)input.LT(1); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEClassDecl1864); + + createLeafNode(grammarAccess.prEClassDecl().ele00000010LexerRuleCallID(), "name"); + if (current==null) { current = factory.create("EClass"); @@ -1878,7 +1885,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "name", lv_name, "ID", currentNode); + set(current, "name", lv_name_4, "ID", lastConsumedNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1889,7 +1896,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:3: ( ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:3: ( ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' )? int alt17=2; int LA17_0 = input.LA(1); @@ -1898,26 +1905,26 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt17) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:4: ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) '>' + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:4: ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) '>' { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:4: ( ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:5: ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:4: ( ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:5: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:5: ( '<' (lv_eTypeParameters= ruleETypeParameterDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:883:6: '<' (lv_eTypeParameters= ruleETypeParameterDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:5: ( '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:895:6: '<' (lv_eTypeParameters_6= ruleETypeParameterDecl ) { - match(input,29,FOLLOW_29_in_ruleEClassDecl1899); + match(input,29,FOLLOW_29_in_ruleEClassDecl1885); createLeafNode(grammarAccess.prEClassDecl().ele000001000KeywordLessThanSign(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:887:1: (lv_eTypeParameters= ruleETypeParameterDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:890:6: lv_eTypeParameters= ruleETypeParameterDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:899:1: (lv_eTypeParameters_6= ruleETypeParameterDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:902:6: lv_eTypeParameters_6= ruleETypeParameterDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000010010ParserRuleCallETypeParameterDecl(), currentNode); - pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1933); - lv_eTypeParameters=ruleETypeParameterDecl(); + pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1919); + lv_eTypeParameters_6=ruleETypeParameterDecl(); _fsp--; @@ -1927,7 +1934,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add(current, "eTypeParameters", lv_eTypeParameters_6, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1939,7 +1946,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:908:3: ( ',' (lv_eTypeParameters= ruleETypeParameterDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:920:3: ( ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) )* loop16: do { int alt16=2; @@ -1952,20 +1959,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt16) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:908:4: ',' (lv_eTypeParameters= ruleETypeParameterDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:920:4: ',' (lv_eTypeParameters_8= ruleETypeParameterDecl ) { - match(input,24,FOLLOW_24_in_ruleEClassDecl1948); + match(input,24,FOLLOW_24_in_ruleEClassDecl1934); createLeafNode(grammarAccess.prEClassDecl().ele000001010KeywordComma(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:912:1: (lv_eTypeParameters= ruleETypeParameterDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:915:6: lv_eTypeParameters= ruleETypeParameterDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:924:1: (lv_eTypeParameters_8= ruleETypeParameterDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:927:6: lv_eTypeParameters_8= ruleETypeParameterDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0000010110ParserRuleCallETypeParameterDecl(), currentNode); - pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1982); - lv_eTypeParameters=ruleETypeParameterDecl(); + pushFollow(FOLLOW_ruleETypeParameterDecl_in_ruleEClassDecl1968); + lv_eTypeParameters_8=ruleETypeParameterDecl(); _fsp--; @@ -1975,7 +1982,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eTypeParameters", lv_eTypeParameters, "ETypeParameterDecl", currentNode); + add(current, "eTypeParameters", lv_eTypeParameters_8, "ETypeParameterDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -1996,7 +2003,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,30,FOLLOW_30_in_ruleEClassDecl1998); + match(input,30,FOLLOW_30_in_ruleEClassDecl1984); createLeafNode(grammarAccess.prEClassDecl().ele0000011KeywordGreaterThanSign(), null); @@ -2009,7 +2016,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:937:4: ( ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:949:4: ( ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* )? int alt19=2; int LA19_0 = input.LA(1); @@ -2018,23 +2025,23 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt19) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:937:5: ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:949:5: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:937:5: ( 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:937:6: 'extends' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:949:5: ( 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:949:6: 'extends' (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) { - match(input,31,FOLLOW_31_in_ruleEClassDecl2012); + match(input,31,FOLLOW_31_in_ruleEClassDecl1998); createLeafNode(grammarAccess.prEClassDecl().ele0000100KeywordExtends(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:941:1: (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:944:6: lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:953:1: (lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:956:6: lv_eGenericSuperTypes_11= ruleEGenericTypeReferenceDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele00001010ParserRuleCallEGenericTypeReferenceDecl(), currentNode); - pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2046); - lv_eGenericSuperTypes=ruleEGenericTypeReferenceDecl(); + pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2032); + lv_eGenericSuperTypes_11=ruleEGenericTypeReferenceDecl(); _fsp--; @@ -2044,7 +2051,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eGenericSuperTypes", lv_eGenericSuperTypes, "EGenericTypeReferenceDecl", currentNode); + add(current, "eGenericSuperTypes", lv_eGenericSuperTypes_11, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2056,7 +2063,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:962:3: ( ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:974:3: ( ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) )* loop18: do { int alt18=2; @@ -2069,20 +2076,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { switch (alt18) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:962:4: ',' (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:974:4: ',' (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) { - match(input,24,FOLLOW_24_in_ruleEClassDecl2061); + match(input,24,FOLLOW_24_in_ruleEClassDecl2047); createLeafNode(grammarAccess.prEClassDecl().ele0000110KeywordComma(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:966:1: (lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:969:6: lv_eGenericSuperTypes= ruleEGenericTypeReferenceDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:978:1: (lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:981:6: lv_eGenericSuperTypes_13= ruleEGenericTypeReferenceDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele00001110ParserRuleCallEGenericTypeReferenceDecl(), currentNode); - pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2095); - lv_eGenericSuperTypes=ruleEGenericTypeReferenceDecl(); + pushFollow(FOLLOW_ruleEGenericTypeReferenceDecl_in_ruleEClassDecl2081); + lv_eGenericSuperTypes_13=ruleEGenericTypeReferenceDecl(); _fsp--; @@ -2092,7 +2099,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eGenericSuperTypes", lv_eGenericSuperTypes, "EGenericTypeReferenceDecl", currentNode); + add(current, "eGenericSuperTypes", lv_eGenericSuperTypes_13, "EGenericTypeReferenceDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2119,7 +2126,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:987:7: ( ':' (lv_instanceClassName= ruleSTRING_OR_QID ) )? + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:999:7: ( ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) )? int alt20=2; int LA20_0 = input.LA(1); @@ -2128,20 +2135,20 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } switch (alt20) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:987:8: ':' (lv_instanceClassName= ruleSTRING_OR_QID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:999:8: ':' (lv_instanceClassName_15= ruleSTRING_OR_QID ) { - match(input,21,FOLLOW_21_in_ruleEClassDecl2114); + match(input,21,FOLLOW_21_in_ruleEClassDecl2100); createLeafNode(grammarAccess.prEClassDecl().ele00010KeywordColon(), null); - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:991:1: (lv_instanceClassName= ruleSTRING_OR_QID ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:994:6: lv_instanceClassName= ruleSTRING_OR_QID + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1003:1: (lv_instanceClassName_15= ruleSTRING_OR_QID ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1006:6: lv_instanceClassName_15= ruleSTRING_OR_QID { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele000110ParserRuleCallSTRING_OR_QID(), currentNode); - pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2148); - lv_instanceClassName=ruleSTRING_OR_QID(); + pushFollow(FOLLOW_ruleSTRING_OR_QID_in_ruleEClassDecl2134); + lv_instanceClassName_15=ruleSTRING_OR_QID(); _fsp--; @@ -2151,7 +2158,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.set(current, "instanceClassName", lv_instanceClassName, "STRING_OR_QID", currentNode); + set(current, "instanceClassName", lv_instanceClassName_15, "STRING_OR_QID", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2169,30 +2176,30 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,17,FOLLOW_17_in_ruleEClassDecl2164); + match(input,17,FOLLOW_17_in_ruleEClassDecl2150); createLeafNode(grammarAccess.prEClassDecl().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1016:2: ( (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) | (lv_eOperations= ruleEOperationDecl ) )* + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1028:2: ( (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) | (lv_eOperations_18= ruleEOperationDecl ) )* loop21: do { int alt21=3; alt21 = dfa21.predict(input); switch (alt21) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1016:3: (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1028:3: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1016:3: (lv_eStructuralFeatures= ruleEStructuralFeatureDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1019:6: lv_eStructuralFeatures= ruleEStructuralFeatureDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1028:3: (lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1031:6: lv_eStructuralFeatures_17= ruleEStructuralFeatureDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0100ParserRuleCallEStructuralFeatureDecl(), currentNode); - pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2200); - lv_eStructuralFeatures=ruleEStructuralFeatureDecl(); + pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_ruleEClassDecl2186); + lv_eStructuralFeatures_17=ruleEStructuralFeatureDecl(); _fsp--; @@ -2202,7 +2209,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eStructuralFeatures", lv_eStructuralFeatures, "EStructuralFeatureDecl", currentNode); + add(current, "eStructuralFeatures", lv_eStructuralFeatures_17, "EStructuralFeatureDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2215,16 +2222,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1038:6: (lv_eOperations= ruleEOperationDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1050:6: (lv_eOperations_18= ruleEOperationDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1038:6: (lv_eOperations= ruleEOperationDecl ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1041:6: lv_eOperations= ruleEOperationDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1050:6: (lv_eOperations_18= ruleEOperationDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1053:6: lv_eOperations_18= ruleEOperationDecl { currentNode=createCompositeNode(grammarAccess.prEClassDecl().ele0110ParserRuleCallEOperationDecl(), currentNode); - pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2244); - lv_eOperations=ruleEOperationDecl(); + pushFollow(FOLLOW_ruleEOperationDecl_in_ruleEClassDecl2230); + lv_eOperations_18=ruleEOperationDecl(); _fsp--; @@ -2234,7 +2241,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } try { - factory.add(current, "eOperations", lv_eOperations, "EOperationDecl", currentNode); + add(current, "eOperations", lv_eOperations_18, "EOperationDecl", currentNode); } catch (ValueConverterException vce) { handleValueConverterException(vce); } @@ -2255,7 +2262,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } - match(input,18,FOLLOW_18_in_ruleEClassDecl2260); + match(input,18,FOLLOW_18_in_ruleEClassDecl2246); createLeafNode(grammarAccess.prEClassDecl().ele1KeywordRightCurlyBracket(), null); @@ -2266,6 +2273,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -2281,7 +2289,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEStructuralFeatureDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1072:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1084:1: entryRuleEStructuralFeatureDecl returns [EObject current=null] : iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ; public final EObject entryRuleEStructuralFeatureDecl() throws RecognitionException { EObject current = null; @@ -2289,16 +2297,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1072:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1073:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1084:64: (iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1085:2: iv_ruleEStructuralFeatureDecl= ruleEStructuralFeatureDecl EOF { currentNode = createCompositeNode(grammarAccess.prEStructuralFeatureDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2295); + pushFollow(FOLLOW_ruleEStructuralFeatureDecl_in_entryRuleEStructuralFeatureDecl2281); iv_ruleEStructuralFeatureDecl=ruleEStructuralFeatureDecl(); _fsp--; current =iv_ruleEStructuralFeatureDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2305); + match(input,EOF,FOLLOW_EOF_in_entryRuleEStructuralFeatureDecl2291); } @@ -2316,54 +2324,54 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEStructuralFeatureDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1080:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl= ruleEAttributeDecl | this_EReferenceDecl= ruleEReferenceDecl ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1092:1: ruleEStructuralFeatureDecl returns [EObject current=null] : (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ; public final EObject ruleEStructuralFeatureDecl() throws RecognitionException { EObject current = null; - EObject this_EAttributeDecl = null; + EObject this_EAttributeDecl_0 = null; - EObject this_EReferenceDecl = null; + EObject this_EReferenceDecl_1 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1084:6: ( (this_EAttributeDecl= ruleEAttributeDecl | this_EReferenceDecl= ruleEReferenceDecl ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1085:1: (this_EAttributeDecl= ruleEAttributeDecl | this_EReferenceDecl= ruleEReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1097:6: ( (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1098:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1085:1: (this_EAttributeDecl= ruleEAttributeDecl | this_EReferenceDecl= ruleEReferenceDecl ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1098:1: (this_EAttributeDecl_0= ruleEAttributeDecl | this_EReferenceDecl_1= ruleEReferenceDecl ) int alt22=2; alt22 = dfa22.predict(input); switch (alt22) { case 1 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1086:5: this_EAttributeDecl= ruleEAttributeDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1099:5: this_EAttributeDecl_0= ruleEAttributeDecl { currentNode=createCompositeNode(grammarAccess.prEStructuralFeatureDecl().ele0ParserRuleCallEAttributeDecl(), currentNode); - pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2352); - this_EAttributeDecl=ruleEAttributeDecl(); + pushFollow(FOLLOW_ruleEAttributeDecl_in_ruleEStructuralFeatureDecl2338); + this_EAttributeDecl_0=ruleEAttributeDecl(); _fsp--; - current = this_EAttributeDecl; + current = this_EAttributeDecl_0; currentNode = currentNode.getParent(); } break; case 2 : - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1096:5: this_EReferenceDecl= ruleEReferenceDecl + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1109:5: this_EReferenceDecl_1= ruleEReferenceDecl { currentNode=createCompositeNode(grammarAccess.prEStructuralFeatureDecl().ele1ParserRuleCallEReferenceDecl(), currentNode); - pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2379); - this_EReferenceDecl=ruleEReferenceDecl(); + pushFollow(FOLLOW_ruleEReferenceDecl_in_ruleEStructuralFeatureDecl2365); + this_EReferenceDecl_1=ruleEReferenceDecl(); _fsp--; - current = this_EReferenceDecl; + current = this_EReferenceDecl_1; currentNode = currentNode.getParent(); @@ -2376,6 +2384,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { } resetLookahead(); + lastConsumedNode = currentNode; } @@ -2391,7 +2400,7 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEAttributeDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1113:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:1: entryRuleEAttributeDecl returns [EObject current=null] : iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ; public final EObject entryRuleEAttributeDecl() throws RecognitionException { EObject current = null; @@ -2399,16 +2408,16 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1113:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1114:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:56: (iv_ruleEAttributeDecl= ruleEAttributeDecl EOF ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1127:2: iv_ruleEAttributeDecl= ruleEAttributeDecl EOF { currentNode = createCompositeNode(grammarAccess.prEAttributeDecl().getRule(), currentNode); - pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2413); + pushFollow(FOLLOW_ruleEAttributeDecl_in_entryRuleEAttributeDecl2399); iv_ruleEAttributeDecl=ruleEAttributeDecl(); _fsp--; current =iv_ruleEAttributeDecl; - match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2423); + match(input,EOF,FOLLOW_EOF_in_entryRuleEAttributeDecl2409); } @@ -2426,56 +2435,56 @@ public class InternalEcoreDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEAttributeDecl - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1121:1: ruleEAttributeDecl returns [EObject current=null] : ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* ( ( ( ( ( ( ( (lv_iD= 'ID' ) | (lv_unique= 'bag' ) ) | (lv_ordered= 'random' ) ) | (lv_changeable= 'readonly' ) ) | (lv_volatile= 'volatile' ) ) | (lv_transient= 'transient' ) ) | (lv_unsettable= 'unsettable' ) ) | (lv_derived= 'derived' ) )* ) 'attr' ) (lv_eGenericType= ruleEGenericTypeReferenceDecl ) ) ( ( ( '[' (lv_lowerBound= RULE_INT ) ) ( '..' (lv_upperBound= ruleSINT ) )? ) ']' )? ) (lv_name= RULE_ID ) ) ( '=' (lv_defaultValueLiteral= RULE_STRING ) )? ) ';' ) ; + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1134:1: ruleEAttributeDecl returns [EObject current=null] : ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( ( ( ( ( ( ( (lv_iD_1= 'ID' ) | (lv_unique_2= 'bag' ) ) | (lv_ordered_3= 'random' ) ) | (lv_changeable_4= 'readonly' ) ) | (lv_volatile_5= 'volatile' ) ) | (lv_transient_6= 'transient' ) ) | (lv_unsettable_7= 'unsettable' ) ) | (lv_derived_8= 'derived' ) )* ) 'attr' ) (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ) ( ( ( '[' (lv_lowerBound_12= RULE_INT ) ) ( '..' (lv_upperBound_14= ruleSINT ) )? ) ']' )? ) (lv_name_16= RULE_ID ) ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ) ';' ) ; public final EObject ruleEAttributeDecl() throws RecognitionException { EObject current = null; - Token lv_iD=null; - Token lv_unique=null; - Token lv_ordered=null; - Token lv_changeable=null; - Token lv_volatile=null; - Token lv_transient=null; - Token lv_unsettable=null; - Token lv_derived=null; - Token lv_lowerBound=null; - Token lv_name=null; - Token lv_defaultValueLiteral=null; - EObject lv_eAnnotations = null; + Token lv_iD_1=null; + Token lv_unique_2=null; + Token lv_ordered_3=null; + Token lv_changeable_4=null; + Token lv_volatile_5=null; + Token lv_transient_6=null; + Token lv_unsettable_7=null; + Token lv_derived_8=null; + Token lv_lowerBound_12=null; + Token lv_name_16=null; + Token lv_defaultValueLiteral_18=null; + EObject lv_eAnnotations_0 = null; - EObject lv_eGenericType = null; + EObject lv_eGenericType_10 = null; - AntlrDatatypeRuleToken lv_upperBound = null; + AntlrDatatypeRuleToken lv_upperBound_14 = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1125:6: ( ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* ( ( ( ( ( ( ( (lv_iD= 'ID' ) | (lv_unique= 'bag' ) ) | (lv_ordered= 'random' ) ) | (lv_changeable= 'readonly' ) ) | (lv_volatile= 'volatile' ) ) | (lv_transient= 'transient' ) ) | (lv_unsettable= 'unsettable' ) ) | (lv_derived= 'derived' ) )* ) 'attr' ) (lv_eGenericType= ruleEGenericTypeReferenceDecl ) ) ( ( ( '[' (lv_lowerBound= RULE_INT ) ) ( '..' (lv_upperBound= ruleSINT ) )? ) ']' )? ) (lv_name= RULE_ID ) ) ( '=' (lv_defaultValueLiteral= RULE_STRING ) )? ) ';' ) ) - // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1126:1: ( ( ( ( ( ( ( (lv_eAnnotations= ruleEAnnotationDecl )* ( ( ( ( ( ( ( (lv_iD= 'ID' ) | (lv_unique= 'bag' ) ) | (lv_ordered= 'random' ) ) | (lv_changeable= 'readonly' ) ) | (lv_volatile= 'volatile' ) ) | (lv_transient= 'transient' ) ) | (lv_unsettable= 'unsettable' ) ) | (lv_derived= 'derived' ) )* ) 'attr' ) (lv_eGenericType= ruleEGenericTypeReferenceDecl ) ) ( ( ( '[' (lv_lowerBound= RULE_INT ) ) ( '..' (lv_upperBound= ruleSINT ) )? ) ']' )? ) (lv_name= RULE_ID ) ) ( '=' (lv_defaultValueLiteral= RULE_STRING ) )? ) ';' ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1139:6: ( ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleEAnnotationDecl )* ( ( ( ( ( ( ( (lv_iD_1= 'ID' ) | (lv_unique_2= 'bag' ) ) | (lv_ordered_3= 'random' ) ) | (lv_changeable_4= 'readonly' ) ) | (lv_volatile_5= 'volatile' ) ) | (lv_transient_6= 'transient' ) ) | (lv_unsettable_7= 'unsettable' ) ) | (lv_derived_8= 'derived' ) )* ) 'attr' ) (lv_eGenericType_10= ruleEGenericTypeReferenceDecl ) ) ( ( ( '[' (lv_lowerBound_12= RULE_INT ) ) ( '..' (lv_upperBound_14= ruleSINT ) )? ) ']' )? ) (lv_name_16= RULE_ID ) ) ( '=' (lv_defaultValueLiteral_18= RULE_STRING ) )? ) ';' ) ) + // ../org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g:1140:1: ( ( ( ( ( ( ( (lv_eAnnotations_0= ruleE |