| author | szarnekow | 2009-03-01 18:08:55 (EST) |
|---|---|---|
| committer | sefftinge | 2009-03-01 18:08:55 (EST) |
| commit | fd1214332fdf8bf88b288e81510993573c09eaef (patch) (side-by-side diff) | |
| tree | 5a60c4d17f3b7b0b3981a04b82dd195d66b76b56 | |
| parent | 9e4b2128f96d45bcf6c74e0fc6e5c4fa290f0e40 (diff) | |
| download | org.eclipse.xtext-fd1214332fdf8bf88b288e81510993573c09eaef.zip org.eclipse.xtext-fd1214332fdf8bf88b288e81510993573c09eaef.tar.gz org.eclipse.xtext-fd1214332fdf8bf88b288e81510993573c09eaef.tar.bz2 | |
Removed type LexerRule from semantic model (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=266433)
724 files changed, 23801 insertions, 37521 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java index 28b4af1..1a37105 100644 --- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java +++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarProposals.java @@ -224,27 +224,6 @@ public class GenReferenceGrammarProposals extends AbstractJavaProposalProvider { } return Collections.emptyList(); } - - public List<? extends ICompletionProposal> completeEcore_EString(RuleCall ruleCall, IContentAssistContext contentAssistContext) { - if (logger.isDebugEnabled()) { - logger.debug("completeEcore_EString '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality() - + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'"); - } - return Collections.emptyList(); - } - - public List<? extends ICompletionProposal> completeEcore_EInt(RuleCall ruleCall, IContentAssistContext contentAssistContext) { - if (logger.isDebugEnabled()) { - logger.debug("completeEcore_EInt '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality() - + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'"); - } - return Collections.emptyList(); - } - - - - - @Override protected String getDefaultImageFilePath() { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi index ab2cc13..a62ee40 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi @@ -224,7 +224,7 @@ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> - <rules xsi:type="xtext:ParserRule" name="ID" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -266,7 +266,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="INT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> @@ -275,7 +275,7 @@ <right value="9"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -360,7 +360,7 @@ </groups> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -371,7 +371,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -391,7 +391,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="WS" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -406,7 +406,7 @@ <groups xsi:type="xtext:Keyword" value="
"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java index ad109f9..1ef785b 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java @@ -219,13 +219,11 @@ protected class Spielplatz_0_0_0_0_1_Assignment_groesse extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("groesse",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("groesse"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prSpielplatz().ele000010ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prSpielplatz().ele000010TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -247,13 +245,11 @@ protected class Spielplatz_0_0_0_1_Assignment_beschreibung extends AssignmentTok protected Solution createSolution() { if((value = current.getConsumable("beschreibung",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("beschreibung"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prSpielplatz().ele00010TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -792,13 +788,11 @@ protected class Kind_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prKind().ele0010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prKind().ele0010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -820,13 +814,11 @@ protected class Kind_0_1_Assignment_age extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("age",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("age"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prKind().ele010ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prKind().ele010TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -1016,13 +1008,11 @@ protected class Erwachsener_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prErwachsener().ele0010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prErwachsener().ele0010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1044,13 +1034,11 @@ protected class Erwachsener_0_1_Assignment_age extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("age",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("age"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prErwachsener().ele010ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prErwachsener().ele010TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -1240,13 +1228,11 @@ protected class Spielzeug_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prSpielzeug().ele0010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prSpielzeug().ele0010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1567,20 +1553,16 @@ protected class Familie_0_0_0_0_0_1_Assignment_name extends AssignmentToken { return new Solution(obj); } - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prFamilie().ele000001001TerminalRuleCallSTRING(); return new Solution(obj); } - - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prFamilie().ele00000101ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prFamilie().ele00000101TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1884,13 +1866,11 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1898,11 +1878,4 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken /************ end Rule CustomTypeParserRule ****************/ - - - - - - - } 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 00899f4..4e20fe8 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 @@ -65,7 +65,6 @@ import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess; - // Entry rule entryRuleSpielplatz entryRuleSpielplatz returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prSpielplatz().getRule(), currentNode); } @@ -87,8 +86,9 @@ ruleSpielplatz returns [EObject current=null] } ( - lv_groesse_1=RULE_INT { - createLeafNode(grammarAccess.prSpielplatz().ele000010ParserRuleCallINT(), "groesse"); + lv_groesse_1= RULE_INT + { + createLeafNode(grammarAccess.prSpielplatz().ele000010TerminalRuleCallINT(), "groesse"); } { @@ -106,8 +106,9 @@ ruleSpielplatz returns [EObject current=null] ))( - lv_beschreibung_2=RULE_STRING { - createLeafNode(grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING(), "beschreibung"); + lv_beschreibung_2= RULE_STRING + { + createLeafNode(grammarAccess.prSpielplatz().ele00010TerminalRuleCallSTRING(), "beschreibung"); } { @@ -248,8 +249,6 @@ ruleSpielplatz returns [EObject current=null] - - // Entry rule entryRuleKind entryRuleKind returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode); } @@ -275,8 +274,9 @@ ruleKind returns [EObject current=null] } )( - lv_name_2=RULE_ID { - createLeafNode(grammarAccess.prKind().ele0010ParserRuleCallID(), "name"); + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prKind().ele0010TerminalRuleCallID(), "name"); } { @@ -294,8 +294,9 @@ ruleKind returns [EObject current=null] ))( - lv_age_3=RULE_INT { - createLeafNode(grammarAccess.prKind().ele010ParserRuleCallINT(), "age"); + lv_age_3= RULE_INT + { + createLeafNode(grammarAccess.prKind().ele010TerminalRuleCallINT(), "age"); } { @@ -321,8 +322,6 @@ ruleKind returns [EObject current=null] - - // Entry rule entryRuleErwachsener entryRuleErwachsener returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode); } @@ -348,8 +347,9 @@ ruleErwachsener returns [EObject current=null] } )( - lv_name_2=RULE_ID { - createLeafNode(grammarAccess.prErwachsener().ele0010ParserRuleCallID(), "name"); + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prErwachsener().ele0010TerminalRuleCallID(), "name"); } { @@ -367,8 +367,9 @@ ruleErwachsener returns [EObject current=null] ))( - lv_age_3=RULE_INT { - createLeafNode(grammarAccess.prErwachsener().ele010ParserRuleCallINT(), "age"); + lv_age_3= RULE_INT + { + createLeafNode(grammarAccess.prErwachsener().ele010TerminalRuleCallINT(), "age"); } { @@ -394,8 +395,6 @@ ruleErwachsener returns [EObject current=null] - - // Entry rule entryRuleSpielzeug entryRuleSpielzeug returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode); } @@ -421,8 +420,9 @@ ruleSpielzeug returns [EObject current=null] } )( - lv_name_2=RULE_ID { - createLeafNode(grammarAccess.prSpielzeug().ele0010ParserRuleCallID(), "name"); + lv_name_2= RULE_ID + { + createLeafNode(grammarAccess.prSpielzeug().ele0010TerminalRuleCallID(), "name"); } { @@ -469,8 +469,6 @@ ruleSpielzeug returns [EObject current=null] - - // Entry rule entryRuleFamilie entryRuleFamilie returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode); } @@ -504,13 +502,13 @@ ruleFamilie returns [EObject current=null] | RULE_STRING { - createLeafNode(grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING(), "name"); + createLeafNode(grammarAccess.prFamilie().ele000001001TerminalRuleCallSTRING(), "name"); } ) | RULE_ID { - createLeafNode(grammarAccess.prFamilie().ele00000101ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prFamilie().ele00000101TerminalRuleCallID(), "name"); } ) @@ -605,8 +603,6 @@ ruleFamilie returns [EObject current=null] - - // Entry rule entryRuleFarbe entryRuleFarbe returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode); } @@ -670,8 +666,6 @@ ruleFarbe returns [EObject current=null] - - // Entry rule entryRuleCustomTypeParserRule entryRuleCustomTypeParserRule returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode); } @@ -693,8 +687,9 @@ ruleCustomTypeParserRule returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID(), "name"); } { @@ -715,71 +710,18 @@ ruleCustomTypeParserRule returns [EObject current=null] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*; - - RULE_INT : ('0'..'9')+; - - RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\''); - - RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; - - RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; - - RULE_WS : (((' '|'\t')|'\r')|'\n')+; - - RULE_ANY_OTHER : .; - - 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 4273281..f0b9a95 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:757: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:757: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:713: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:713: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:757:11: ( '^' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713: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:757:11: '^' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:11: '^' { 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:757:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:42: ( ( ( '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:761:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:761:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715: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:761:13: '0' .. '9' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:13: '0' .. '9' { matchRange('0','9'); @@ -471,10 +471,10 @@ 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:765: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:765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:717: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:717:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:717:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -486,16 +486,16 @@ public class InternalReferenceGrammarLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("765:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input); + new NoViableAltException("717:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:765:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' { match('\"'); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* loop4: do { int alt4=3; @@ -511,7 +511,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:765:22: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717: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' ) { @@ -528,7 +528,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:76: ~ ( ( '\\\\' | '\\\"' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:76: ~ ( ( '\\\\' | '\\\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -554,10 +554,10 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -573,7 +573,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:765:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:104: '\\\\' ( ( ( ( ( ( ( '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' ) { @@ -590,7 +590,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:765:158: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:158: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -632,12 +632,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:769:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:769:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -662,7 +662,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:769:52: . + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:52: . { matchAny(); @@ -690,12 +690,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:773:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -708,7 +708,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:773:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721: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(); @@ -729,7 +729,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:40: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -738,9 +738,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:773:41: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:41: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:773:41: ( '\\r' )? + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -749,7 +749,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:773:41: '\\r' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:721:41: '\\r' { match('\r'); @@ -779,10 +779,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:777:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:777:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:723:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:723:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:777:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:723:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ int cnt11=0; loop11: do { @@ -835,8 +835,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:781:16: ( . ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:781:18: . + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:725:16: ( . ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:725: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 ef2bb8b..69ace43 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 @@ -65,7 +65,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleSpielplatz - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:70:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:69:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ; public final EObject entryRuleSpielplatz() throws RecognitionException { EObject current = null; @@ -73,16 +73,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:70:52: (iv_ruleSpielplatz= ruleSpielplatz EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:71:2: iv_ruleSpielplatz= ruleSpielplatz EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:69:52: (iv_ruleSpielplatz= ruleSpielplatz EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:70:2: iv_ruleSpielplatz= ruleSpielplatz EOF { currentNode = createCompositeNode(grammarAccess.prSpielplatz().getRule(), currentNode); - pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz72); + pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz71); iv_ruleSpielplatz=ruleSpielplatz(); _fsp--; current =iv_ruleSpielplatz; - match(input,EOF,FOLLOW_EOF_in_entryRuleSpielplatz82); + match(input,EOF,FOLLOW_EOF_in_entryRuleSpielplatz81); } @@ -100,7 +100,7 @@ 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_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:77: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; @@ -120,10 +120,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../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:82: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:83: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: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_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,31 +132,31 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } switch (alt6) { case 1 : - // ../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_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: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: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: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: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: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:83: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: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: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: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: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 ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:5: ( 'spielplatz' (lv_groesse_1= RULE_INT ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:6: 'spielplatz' (lv_groesse_1= RULE_INT ) { - match(input,11,FOLLOW_11_in_ruleSpielplatz120); + match(input,11,FOLLOW_11_in_ruleSpielplatz119); createLeafNode(grammarAccess.prSpielplatz().ele00000KeywordSpielplatz(), null); - // ../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 + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:87:1: (lv_groesse_1= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:89:6: lv_groesse_1= RULE_INT { lv_groesse_1=(Token)input.LT(1); match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz141); - createLeafNode(grammarAccess.prSpielplatz().ele000010ParserRuleCallINT(), "groesse"); + createLeafNode(grammarAccess.prSpielplatz().ele000010TerminalRuleCallINT(), "groesse"); if (current==null) { @@ -188,9 +188,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:109:6: lv_beschreibung_2= RULE_STRING { lv_beschreibung_2=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz170); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz172); - createLeafNode(grammarAccess.prSpielplatz().ele00010ParserRuleCallSTRING(), "beschreibung"); + createLeafNode(grammarAccess.prSpielplatz().ele00010TerminalRuleCallSTRING(), "beschreibung"); if (current==null) { @@ -213,14 +213,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,12,FOLLOW_12_in_ruleSpielplatz188); + match(input,12,FOLLOW_12_in_ruleSpielplatz191); createLeafNode(grammarAccess.prSpielplatz().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:2: ( ( ( ( (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:131: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:130: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_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:130: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_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("130:3: ( ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) ) | (lv_familie_7= ruleFamilie ) )", 4, 0, input); + new NoViableAltException("131: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:130: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_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:130: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_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("130:4: ( ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) | (lv_spielzeuge_6= ruleSpielzeug ) )", 3, 0, input); + new NoViableAltException("131: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:130: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_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130: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_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) ) int alt2=2; int LA2_0 = input.LA(1); @@ -290,21 +290,21 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("130:5: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) )", 2, 0, input); + new NoViableAltException("131: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:130:6: (lv_kinder_4= ruleKind ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:6: (lv_kinder_4= ruleKind ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:130:6: (lv_kinder_4= ruleKind ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:133:6: lv_kinder_4= ruleKind + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:6: (lv_kinder_4= ruleKind ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:134:6: lv_kinder_4= ruleKind { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100000ParserRuleCallKind(), currentNode); - pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz227); + pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz230); lv_kinder_4=ruleKind(); _fsp--; @@ -328,15 +328,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:152:6: (lv_erzieher_5= ruleErwachsener ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:153:6: (lv_erzieher_5= ruleErwachsener ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:152:6: (lv_erzieher_5= ruleErwachsener ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:155:6: lv_erzieher_5= ruleErwachsener + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:153:6: (lv_erzieher_5= ruleErwachsener ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:156:6: lv_erzieher_5= ruleErwachsener { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0100010ParserRuleCallErwachsener(), currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz271); + pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz274); lv_erzieher_5=ruleErwachsener(); _fsp--; @@ -366,15 +366,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:174:6: (lv_spielzeuge_6= ruleSpielzeug ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:175:6: (lv_spielzeuge_6= ruleSpielzeug ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:174:6: (lv_spielzeuge_6= ruleSpielzeug ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:177:6: lv_spielzeuge_6= ruleSpielzeug + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:175:6: (lv_spielzeuge_6= ruleSpielzeug ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:178:6: lv_spielzeuge_6= ruleSpielzeug { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele010010ParserRuleCallSpielzeug(), currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz316); + pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz319); lv_spielzeuge_6=ruleSpielzeug(); _fsp--; @@ -404,15 +404,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:196:6: (lv_familie_7= ruleFamilie ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:197:6: (lv_familie_7= ruleFamilie ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:196:6: (lv_familie_7= ruleFamilie ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:199:6: lv_familie_7= ruleFamilie + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:197:6: (lv_familie_7= ruleFamilie ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:200:6: lv_familie_7= ruleFamilie { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele01010ParserRuleCallFamilie(), currentNode); - pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz361); + pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz364); lv_familie_7=ruleFamilie(); _fsp--; @@ -442,15 +442,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:218:6: (lv_types_8= ruleCustomTypeParserRule ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:219:6: (lv_types_8= ruleCustomTypeParserRule ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:218:6: (lv_types_8= ruleCustomTypeParserRule ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:221:6: lv_types_8= ruleCustomTypeParserRule + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:219:6: (lv_types_8= ruleCustomTypeParserRule ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:222:6: lv_types_8= ruleCustomTypeParserRule { currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele0110ParserRuleCallCustomTypeParserRule(), currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz406); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz409); lv_types_8=ruleCustomTypeParserRule(); _fsp--; @@ -482,7 +482,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,13,FOLLOW_13_in_ruleSpielplatz422); + match(input,13,FOLLOW_13_in_ruleSpielplatz425); createLeafNode(grammarAccess.prSpielplatz().ele1KeywordRightCurlyBracket(), null); @@ -512,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:254: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:253:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ; public final EObject entryRuleKind() throws RecognitionException { EObject current = null; @@ -520,16 +520,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:254:46: (iv_ruleKind= ruleKind EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:255:2: iv_ruleKind= ruleKind EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:253:46: (iv_ruleKind= ruleKind EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:254:2: iv_ruleKind= ruleKind EOF { currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode); - pushFollow(FOLLOW_ruleKind_in_entryRuleKind460); + pushFollow(FOLLOW_ruleKind_in_entryRuleKind461); iv_ruleKind=ruleKind(); _fsp--; current =iv_ruleKind; - match(input,EOF,FOLLOW_EOF_in_entryRuleKind470); + match(input,EOF,FOLLOW_EOF_in_entryRuleKind471); } @@ -547,7 +547,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleKind - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:262:1: ruleKind returns [EObject current=null] : ( ( ( ( '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:261: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; @@ -557,39 +557,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser 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_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_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:266: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:267: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_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_2= RULE_ID ) ) (lv_age_3= RULE_INT ) ) ')' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267: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:267: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_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_2= RULE_ID ) ) (lv_age_3= RULE_INT ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267: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:267: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_2= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:4: ( 'kind' '(' ) (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267:3: ( ( 'kind' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267: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:267:4: ( 'kind' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:267:5: 'kind' '(' { - match(input,14,FOLLOW_14_in_ruleKind507); + match(input,14,FOLLOW_14_in_ruleKind508); createLeafNode(grammarAccess.prKind().ele0000KeywordKind(), null); - match(input,15,FOLLOW_15_in_ruleKind516); + match(input,15,FOLLOW_15_in_ruleKind517); createLeafNode(grammarAccess.prKind().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:276:2: (lv_name_2= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:278:6: lv_name_2= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:275:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:277:6: lv_name_2= RULE_ID { lv_name_2=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind538); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind540); - createLeafNode(grammarAccess.prKind().ele0010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prKind().ele0010TerminalRuleCallID(), "name"); if (current==null) { @@ -613,9 +613,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:297:6: lv_age_3= RULE_INT { lv_age_3=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind567); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind571); - createLeafNode(grammarAccess.prKind().ele010ParserRuleCallINT(), "age"); + createLeafNode(grammarAccess.prKind().ele010TerminalRuleCallINT(), "age"); if (current==null) { @@ -635,7 +635,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleKind584); + match(input,16,FOLLOW_16_in_ruleKind589); createLeafNode(grammarAccess.prKind().ele1KeywordRightParenthesis(), null); @@ -662,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:327: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:326:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ; public final EObject entryRuleErwachsener() throws RecognitionException { EObject current = null; @@ -670,16 +670,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:53: (iv_ruleErwachsener= ruleErwachsener EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:2: iv_ruleErwachsener= ruleErwachsener EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:326:53: (iv_ruleErwachsener= ruleErwachsener EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:2: iv_ruleErwachsener= ruleErwachsener EOF { currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener619); + pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener622); iv_ruleErwachsener=ruleErwachsener(); _fsp--; current =iv_ruleErwachsener; - match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener629); + match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener632); } @@ -697,7 +697,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleErwachsener - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:335:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( '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:334: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; @@ -707,39 +707,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340: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:341: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:339: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:340: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:341: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:341: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:340: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:340: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:341: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:341: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:340: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:340: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:341:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:4: ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340:3: ( ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340:4: ( 'erwachsener' '(' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:4: ( 'erwachsener' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:5: 'erwachsener' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340:4: ( 'erwachsener' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:340:5: 'erwachsener' '(' { - match(input,17,FOLLOW_17_in_ruleErwachsener666); + match(input,17,FOLLOW_17_in_ruleErwachsener669); createLeafNode(grammarAccess.prErwachsener().ele0000KeywordErwachsener(), null); - match(input,15,FOLLOW_15_in_ruleErwachsener675); + match(input,15,FOLLOW_15_in_ruleErwachsener678); createLeafNode(grammarAccess.prErwachsener().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:349:2: (lv_name_2= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:351:6: lv_name_2= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:348:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:350:6: lv_name_2= RULE_ID { lv_name_2=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener697); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener701); - createLeafNode(grammarAccess.prErwachsener().ele0010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prErwachsener().ele0010TerminalRuleCallID(), "name"); if (current==null) { @@ -763,9 +763,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:370:6: lv_age_3= RULE_INT { lv_age_3=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener726); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener732); - createLeafNode(grammarAccess.prErwachsener().ele010ParserRuleCallINT(), "age"); + createLeafNode(grammarAccess.prErwachsener().ele010TerminalRuleCallINT(), "age"); if (current==null) { @@ -785,7 +785,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleErwachsener743); + match(input,16,FOLLOW_16_in_ruleErwachsener750); createLeafNode(grammarAccess.prErwachsener().ele1KeywordRightParenthesis(), null); @@ -812,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:400: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:399:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ; public final EObject entryRuleSpielzeug() throws RecognitionException { EObject current = null; @@ -820,16 +820,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:400:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:401:2: iv_ruleSpielzeug= ruleSpielzeug EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:399:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:400:2: iv_ruleSpielzeug= ruleSpielzeug EOF { currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug778); + pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug783); iv_ruleSpielzeug=ruleSpielzeug(); _fsp--; current =iv_ruleSpielzeug; - match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug788); + match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug793); } @@ -847,7 +847,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleSpielzeug - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:408:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( '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:407: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; @@ -858,39 +858,39 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413: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:414: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:412: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:413: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:414: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:414: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:413: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:413: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:414: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:414: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:413: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:413: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:414:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:4: ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:3: ( ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:4: ( 'spielzeug' '(' ) (lv_name_2= RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:4: ( 'spielzeug' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:414:5: 'spielzeug' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:4: ( 'spielzeug' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:5: 'spielzeug' '(' { - match(input,18,FOLLOW_18_in_ruleSpielzeug825); + match(input,18,FOLLOW_18_in_ruleSpielzeug830); createLeafNode(grammarAccess.prSpielzeug().ele0000KeywordSpielzeug(), null); - match(input,15,FOLLOW_15_in_ruleSpielzeug834); + match(input,15,FOLLOW_15_in_ruleSpielzeug839); createLeafNode(grammarAccess.prSpielzeug().ele0001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:422:2: (lv_name_2= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:424:6: lv_name_2= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:421:2: (lv_name_2= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:423:6: lv_name_2= RULE_ID { lv_name_2=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug856); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug862); - createLeafNode(grammarAccess.prSpielzeug().ele0010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prSpielzeug().ele0010TerminalRuleCallID(), "name"); if (current==null) { @@ -916,7 +916,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele010ParserRuleCallFarbe(), currentNode); - pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug898); + pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug905); lv_farbe_3=ruleFarbe(); _fsp--; @@ -939,7 +939,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleSpielzeug912); + match(input,16,FOLLOW_16_in_ruleSpielzeug919); createLeafNode(grammarAccess.prSpielzeug().ele1KeywordRightParenthesis(), null); @@ -966,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:475: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:473:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ; public final EObject entryRuleFamilie() throws RecognitionException { EObject current = null; @@ -974,16 +974,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:475:49: (iv_ruleFamilie= ruleFamilie EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:476:2: iv_ruleFamilie= ruleFamilie EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:473:49: (iv_ruleFamilie= ruleFamilie EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:474:2: iv_ruleFamilie= ruleFamilie EOF { currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode); - pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie947); + pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie952); iv_ruleFamilie=ruleFamilie(); _fsp--; current =iv_ruleFamilie; - match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie957); + match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie962); } @@ -1001,7 +1001,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFamilie - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:483:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( '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:481: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; @@ -1010,45 +1010,45 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488: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:489: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:486: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:487: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:489: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:489: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:487: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:487: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:489: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:489: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:487: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:487: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:489: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:489: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:487: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:487: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:489: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:489: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:487: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:487: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:489: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:489: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:487: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:487: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:489: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:489: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:487: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:487: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:489:7: ( 'familie' '(' ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:8: 'familie' '(' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:487:7: ( 'familie' '(' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:487:8: 'familie' '(' { - match(input,19,FOLLOW_19_in_ruleFamilie997); + match(input,19,FOLLOW_19_in_ruleFamilie1002); createLeafNode(grammarAccess.prFamilie().ele0000000KeywordFamilie(), null); - match(input,15,FOLLOW_15_in_ruleFamilie1006); + match(input,15,FOLLOW_15_in_ruleFamilie1011); createLeafNode(grammarAccess.prFamilie().ele0000001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:2: (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:6: lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:495:2: (lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:6: lv_name_2= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) int alt8=2; int LA8_0 = input.LA(1); @@ -1060,15 +1060,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("499:16: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input); + new NoViableAltException("497: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:499:17: ( 'keyword' | RULE_STRING ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:17: ( 'keyword' | RULE_STRING ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:499:17: ( 'keyword' | RULE_STRING ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:17: ( 'keyword' | RULE_STRING ) int alt7=2; int LA7_0 = input.LA(1); @@ -1080,15 +1080,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("499:17: ( 'keyword' | RULE_STRING )", 7, 0, input); + new NoViableAltException("497: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:499:18: 'keyword' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:18: 'keyword' { - match(input,20,FOLLOW_20_in_ruleFamilie1030); + match(input,20,FOLLOW_20_in_ruleFamilie1035); createLeafNode(grammarAccess.prFamilie().ele000001000KeywordKeyword(), "name"); @@ -1096,11 +1096,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:505:7: RULE_STRING + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:503:7: RULE_STRING { - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1047); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1052); - createLeafNode(grammarAccess.prFamilie().ele000001001ParserRuleCallSTRING(), "name"); + createLeafNode(grammarAccess.prFamilie().ele000001001TerminalRuleCallSTRING(), "name"); } @@ -1112,11 +1112,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:511:7: RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:509:7: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1061); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1066); - createLeafNode(grammarAccess.prFamilie().ele00000101ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prFamilie().ele00000101TerminalRuleCallID(), "name"); } @@ -1142,8 +1142,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:530:3: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:533:3: RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:528:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:531:3: RULE_ID { if (current==null) { @@ -1151,7 +1151,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1094); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1099); createLeafNode(grammarAccess.prFamilie().ele000010CrossReferenceEStringErwachsener(), "mutter"); @@ -1161,8 +1161,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:546:3: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:549:3: RULE_ID + // ../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 { if (current==null) { @@ -1170,7 +1170,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1120); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1125); createLeafNode(grammarAccess.prFamilie().ele00010CrossReferenceEStringErwachsener(), "vater"); @@ -1180,8 +1180,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../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:565:3: RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:560:3: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:563:3: RULE_ID { if (current==null) { @@ -1189,7 +1189,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1146); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1151); createLeafNode(grammarAccess.prFamilie().ele0010CrossReferenceEStringKind(), "kinder"); @@ -1199,7 +1199,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:578:3: ( ',' ( RULE_ID ) )* + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:576:3: ( ',' ( RULE_ID ) )* loop9: do { int alt9=2; @@ -1212,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:578:4: ',' ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:576:4: ',' ( RULE_ID ) { - match(input,21,FOLLOW_21_in_ruleFamilie1160); + match(input,21,FOLLOW_21_in_ruleFamilie1165); createLeafNode(grammarAccess.prFamilie().ele010KeywordComma(), null); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:582:1: ( RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:585:3: RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:580:1: ( RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:583:3: RULE_ID { if (current==null) { @@ -1227,7 +1227,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1182); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1187); createLeafNode(grammarAccess.prFamilie().ele0110CrossReferenceEStringKind(), "kinder"); @@ -1246,7 +1246,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleFamilie1197); + match(input,16,FOLLOW_16_in_ruleFamilie1202); createLeafNode(grammarAccess.prFamilie().ele1KeywordRightParenthesis(), null); @@ -1273,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:611: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:607:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ; public final EObject entryRuleFarbe() throws RecognitionException { EObject current = null; @@ -1281,16 +1281,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:611:47: (iv_ruleFarbe= ruleFarbe EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:612:2: iv_ruleFarbe= ruleFarbe EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:607:47: (iv_ruleFarbe= ruleFarbe EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:608:2: iv_ruleFarbe= ruleFarbe EOF { currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode); - pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1232); + pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1235); iv_ruleFarbe=ruleFarbe(); _fsp--; current =iv_ruleFarbe; - match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1242); + match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1245); } @@ -1308,7 +1308,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFarbe - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:615:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; @@ -1317,13 +1317,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:624:6: ( (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:625:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620: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:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:625:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627: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:1: (lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:6: lv_wert_0= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' ) int alt12=2; int LA12_0 = input.LA(1); @@ -1335,15 +1335,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("627:16: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GR\\u00DCN' )", 12, 0, input); + new NoViableAltException("623: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:627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) int alt11=2; int LA11_0 = input.LA(1); @@ -1355,15 +1355,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("627:17: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input); + new NoViableAltException("623: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:627:18: ( 'ROT' | 'BLAU' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:18: ( 'ROT' | 'BLAU' ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:627:18: ( 'ROT' | 'BLAU' ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:18: ( 'ROT' | 'BLAU' ) int alt10=2; int LA10_0 = input.LA(1); @@ -1375,15 +1375,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("627:18: ( 'ROT' | 'BLAU' )", 10, 0, input); + new NoViableAltException("623: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:627:19: 'ROT' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:623:19: 'ROT' { - match(input,22,FOLLOW_22_in_ruleFarbe1290); + match(input,22,FOLLOW_22_in_ruleFarbe1293); createLeafNode(grammarAccess.prFarbe().ele0000KeywordROT(), "wert"); @@ -1391,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:633:6: 'BLAU' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:629:6: 'BLAU' { - match(input,23,FOLLOW_23_in_ruleFarbe1306); + match(input,23,FOLLOW_23_in_ruleFarbe1309); createLeafNode(grammarAccess.prFarbe().ele0001KeywordBLAU(), "wert"); @@ -1407,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:640:6: 'GELB' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:636:6: 'GELB' { - match(input,24,FOLLOW_24_in_ruleFarbe1324); + match(input,24,FOLLOW_24_in_ruleFarbe1327); createLeafNode(grammarAccess.prFarbe().ele001KeywordGELB(), "wert"); @@ -1423,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:647:6: 'GR\\u00DCN' + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:643:6: 'GR\\u00DCN' { - match(input,25,FOLLOW_25_in_ruleFarbe1342); + match(input,25,FOLLOW_25_in_ruleFarbe1345); createLeafNode(grammarAccess.prFarbe().ele01KeywordGRÜN(), "wert"); @@ -1470,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:676: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:670:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ; public final EObject entryRuleCustomTypeParserRule() throws RecognitionException { EObject current = null; @@ -1478,16 +1478,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:677:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:670:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:671:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF { currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1391); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1392); iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule(); _fsp--; current =iv_ruleCustomTypeParserRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1401); + match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1402); } @@ -1505,7 +1505,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleCustomTypeParserRule - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name_1= RULE_ID ) ) ; + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:678:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name_1= RULE_ID ) ) ; public final EObject ruleCustomTypeParserRule() throws RecognitionException { EObject current = null; @@ -1514,23 +1514,23 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:689:6: ( ( 'type' (lv_name_1= RULE_ID ) ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:1: ( 'type' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:683:6: ( ( 'type' (lv_name_1= RULE_ID ) ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:1: ( 'type' (lv_name_1= RULE_ID ) ) { - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:1: ( 'type' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:2: 'type' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:1: ( 'type' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:2: 'type' (lv_name_1= RULE_ID ) { - match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1435); + match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1436); createLeafNode(grammarAccess.prCustomTypeParserRule().ele0KeywordType(), null); - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:694:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:696:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:688:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:690:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1456); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1458); - createLeafNode(grammarAccess.prCustomTypeParserRule().ele10ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID(), "name"); if (current==null) { @@ -1571,61 +1571,61 @@ 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_ruleSpielplatz_in_entryRuleSpielplatz71 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleSpielplatz81 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleSpielplatz119 = 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_ruleSpielplatz170 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleSpielplatz188 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz227 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz271 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz316 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz361 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz406 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_13_in_ruleSpielplatz422 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleKind_in_entryRuleKind460 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleKind470 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_ruleKind507 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleKind516 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleKind538 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleKind567 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleKind584 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener619 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener629 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleErwachsener666 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleErwachsener675 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener697 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener726 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleErwachsener743 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug778 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug788 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleSpielzeug825 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleSpielzeug834 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug856 = new BitSet(new long[]{0x0000000003C00000L}); - public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug898 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleSpielzeug912 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie947 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFamilie957 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_19_in_ruleFamilie997 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleFamilie1006 = new BitSet(new long[]{0x0000000000100060L}); - public static final BitSet FOLLOW_20_in_ruleFamilie1030 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1047 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1061 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1094 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1120 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1146 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_21_in_ruleFamilie1160 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1182 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_16_in_ruleFamilie1197 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1232 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1242 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleFarbe1290 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_ruleFarbe1306 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_24_in_ruleFarbe1324 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_25_in_ruleFarbe1342 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1391 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1401 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1435 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1456 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz172 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_12_in_ruleSpielplatz191 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz230 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz274 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz319 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz364 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz409 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_13_in_ruleSpielplatz425 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleKind_in_entryRuleKind461 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleKind471 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleKind508 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleKind517 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleKind540 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleKind571 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleKind589 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener622 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener632 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleErwachsener669 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleErwachsener678 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener701 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener732 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleErwachsener750 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug783 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug793 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleSpielzeug830 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleSpielzeug839 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug862 = new BitSet(new long[]{0x0000000003C00000L}); + public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug905 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleSpielzeug919 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie952 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFamilie962 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleFamilie1002 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleFamilie1011 = new BitSet(new long[]{0x0000000000100060L}); + public static final BitSet FOLLOW_20_in_ruleFamilie1035 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1052 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1066 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1099 = 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_ruleFamilie1151 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_21_in_ruleFamilie1165 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1187 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_16_in_ruleFamilie1202 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1235 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1245 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleFarbe1293 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_23_in_ruleFarbe1309 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_24_in_ruleFarbe1327 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_25_in_ruleFarbe1345 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1392 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1402 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1436 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1458 = 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 82249e6..bdd5dcc 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,39 +24,25 @@ T24 : 'GELB' ; T25 : 'GR\u00DCN' ; T26 : 'type' ; -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 757 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 713 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" 761 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 715 RULE_INT : ('0'..'9')+; - - -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 765 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 717 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" 769 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 719 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; - - -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 773 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 721 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; - - -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 777 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 723 RULE_WS : (((' '|'\t')|'\r')|'\n')+; - - -// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 781 +// $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 725 RULE_ANY_OTHER : .; - - diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java index f731096..24ba9e4 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java @@ -94,13 +94,13 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura getFamilieConsumer().setRule(grammarAccess.prFamilie()); getFarbeConsumer().setRule(grammarAccess.prFarbe()); getCustomTypeParserRuleConsumer().setRule(grammarAccess.prCustomTypeParserRule()); - getIdConsumer().setRule(grammarAccess.prID()); - getIntConsumer().setRule(grammarAccess.prINT()); - getStringConsumer().setRule(grammarAccess.prSTRING()); - getMlCommentConsumer().setRule(grammarAccess.prML_COMMENT()); - getSlCommentConsumer().setRule(grammarAccess.prSL_COMMENT()); - getWsConsumer().setRule(grammarAccess.prWS()); - getAnyOtherConsumer().setRule(grammarAccess.prANY_OTHER()); + getIdConsumer().setRule(grammarAccess.trID()); + getIntConsumer().setRule(grammarAccess.trINT()); + getStringConsumer().setRule(grammarAccess.trSTRING()); + getMlCommentConsumer().setRule(grammarAccess.trML_COMMENT()); + getSlCommentConsumer().setRule(grammarAccess.trSL_COMMENT()); + getWsConsumer().setRule(grammarAccess.trWS()); + getAnyOtherConsumer().setRule(grammarAccess.trANY_OTHER()); getSpielplatzConsumer().setCustomTypeParserRuleConsumer(getCustomTypeParserRuleConsumer()); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java index 5701a8a..f0d2ef9 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java @@ -108,7 +108,7 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordType()); assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName()); - ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallID()); + ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID()); } @Override diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java index 14658fa..87934be 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java @@ -179,9 +179,9 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordErwachsener()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName()); - ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID()); + ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010TerminalRuleCallID()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentAge()); - ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallINT()); + ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010TerminalRuleCallINT()); keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis()); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java index b1cdd45..8f6214e 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java @@ -361,11 +361,11 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { assignment$10$Consumer = new Assignment$10$Consumer(rule.ele000001AssignmentName()); alternatives$11$Consumer = new Alternatives$11$Consumer(rule.ele0000010Alternatives()); keyword$13$Consumer = new Keyword$13$Consumer(rule.ele000001000KeywordKeyword()); - ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001ParserRuleCallSTRING()); - ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101ParserRuleCallID()); + ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001TerminalRuleCallSTRING()); + ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101TerminalRuleCallID()); keyword$13$Consumer = new Keyword$13$Consumer(rule.ele000001000KeywordKeyword()); - ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001ParserRuleCallSTRING()); - ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101ParserRuleCallID()); + ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele000001001TerminalRuleCallSTRING()); + ruleCall$15$Consumer = new RuleCall$15$Consumer(rule.ele00000101TerminalRuleCallID()); assignment$16$Consumer = new Assignment$16$Consumer(rule.ele00001AssignmentMutter()); crossReference$17$Consumer = new CrossReference$17$Consumer(rule.ele000010CrossReferenceEStringErwachsener()); assignment$19$Consumer = new Assignment$19$Consumer(rule.ele0001AssignmentVater()); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java index 7d470ba..f432290 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java @@ -179,9 +179,9 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordKind()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName()); - ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID()); + ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010TerminalRuleCallID()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentAge()); - ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallINT()); + ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010TerminalRuleCallINT()); keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis()); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java index e544fa7..8d212d7 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java @@ -349,9 +349,9 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele00000KeywordSpielplatz()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele00001AssignmentGroesse()); - ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010ParserRuleCallINT()); + ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010TerminalRuleCallINT()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele0001AssignmentBeschreibung()); - ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele00010ParserRuleCallSTRING()); + ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele00010TerminalRuleCallSTRING()); keyword$11$Consumer = new Keyword$11$Consumer(rule.ele001KeywordLeftCurlyBracket()); alternatives$12$Consumer = new Alternatives$12$Consumer(rule.ele01Alternatives()); assignment$16$Consumer = new Assignment$16$Consumer(rule.ele010000AssignmentKinder()); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java index 024cde0..3fa71e3 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java @@ -177,7 +177,7 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordSpielzeug()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele0001KeywordLeftParenthesis()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele001AssignmentName()); - ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010ParserRuleCallID()); + ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele0010TerminalRuleCallID()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentFarbe()); ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallFarbe()); keyword$11$Consumer = new Keyword$11$Consumer(rule.ele1KeywordRightParenthesis()); diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java index 4ad0dea..bc0c3f8 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java @@ -26,9 +26,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Group c0000Group = (Group)c000Group.eContents().get(0); private final Keyword c00000KeywordSpielplatz = (Keyword)c0000Group.eContents().get(0); private final Assignment c00001AssignmentGroesse = (Assignment)c0000Group.eContents().get(1); - private final RuleCall c000010ParserRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0); + private final RuleCall c000010TerminalRuleCallINT = (RuleCall)c00001AssignmentGroesse.eContents().get(0); private final Assignment c0001AssignmentBeschreibung = (Assignment)c000Group.eContents().get(1); - private final RuleCall c00010ParserRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0); + private final RuleCall c00010TerminalRuleCallSTRING = (RuleCall)c0001AssignmentBeschreibung.eContents().get(0); private final Keyword c001KeywordLeftCurlyBracket = (Keyword)c00Group.eContents().get(1); private final Alternatives c01Alternatives = (Alternatives)c0Group.eContents().get(1); private final Alternatives c010Alternatives = (Alternatives)c01Alternatives.eContents().get(0); @@ -71,13 +71,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele00001AssignmentGroesse() { return c00001AssignmentGroesse; } // not supported - public RuleCall ele000010ParserRuleCallINT() { return c000010ParserRuleCallINT; } + public RuleCall ele000010TerminalRuleCallINT() { return c000010TerminalRuleCallINT; } // not supported public Assignment ele0001AssignmentBeschreibung() { return c0001AssignmentBeschreibung; } // not supported - public RuleCall ele00010ParserRuleCallSTRING() { return c00010ParserRuleCallSTRING; } + public RuleCall ele00010TerminalRuleCallSTRING() { return c00010TerminalRuleCallSTRING; } // not supported public Keyword ele001KeywordLeftCurlyBracket() { return c001KeywordLeftCurlyBracket; } @@ -156,9 +156,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Keyword c0000KeywordKind = (Keyword)c000Group.eContents().get(0); private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1); private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1); - private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); + private final RuleCall c0010TerminalRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1); - private final RuleCall c010ParserRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0); + private final RuleCall c010TerminalRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0); private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1); // not supported @@ -186,13 +186,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele001AssignmentName() { return c001AssignmentName; } // not supported - public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; } + public RuleCall ele0010TerminalRuleCallID() { return c0010TerminalRuleCallID; } // not supported public Assignment ele01AssignmentAge() { return c01AssignmentAge; } // not supported - public RuleCall ele010ParserRuleCallINT() { return c010ParserRuleCallINT; } + public RuleCall ele010TerminalRuleCallINT() { return c010TerminalRuleCallINT; } // not supported public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; } @@ -207,9 +207,9 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Keyword c0000KeywordErwachsener = (Keyword)c000Group.eContents().get(0); private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1); private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1); - private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); + private final RuleCall c0010TerminalRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); private final Assignment c01AssignmentAge = (Assignment)c0Group.eContents().get(1); - private final RuleCall c010ParserRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0); + private final RuleCall c010TerminalRuleCallINT = (RuleCall)c01AssignmentAge.eContents().get(0); private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1); // not supported @@ -237,13 +237,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele001AssignmentName() { return c001AssignmentName; } // not supported - public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; } + public RuleCall ele0010TerminalRuleCallID() { return c0010TerminalRuleCallID; } // not supported public Assignment ele01AssignmentAge() { return c01AssignmentAge; } // not supported - public RuleCall ele010ParserRuleCallINT() { return c010ParserRuleCallINT; } + public RuleCall ele010TerminalRuleCallINT() { return c010TerminalRuleCallINT; } // not supported public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; } @@ -258,7 +258,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Keyword c0000KeywordSpielzeug = (Keyword)c000Group.eContents().get(0); private final Keyword c0001KeywordLeftParenthesis = (Keyword)c000Group.eContents().get(1); private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1); - private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); + private final RuleCall c0010TerminalRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); private final Assignment c01AssignmentFarbe = (Assignment)c0Group.eContents().get(1); private final RuleCall c010ParserRuleCallFarbe = (RuleCall)c01AssignmentFarbe.eContents().get(0); private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1); @@ -288,7 +288,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele001AssignmentName() { return c001AssignmentName; } // not supported - public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; } + public RuleCall ele0010TerminalRuleCallID() { return c0010TerminalRuleCallID; } // not supported public Assignment ele01AssignmentFarbe() { return c01AssignmentFarbe; } @@ -315,8 +315,8 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Alternatives c0000010Alternatives = (Alternatives)c000001AssignmentName.eContents().get(0); private final Alternatives c00000100Alternatives = (Alternatives)c0000010Alternatives.eContents().get(0); private final Keyword c000001000KeywordKeyword = (Keyword)c00000100Alternatives.eContents().get(0); - private final RuleCall c000001001ParserRuleCallSTRING = (RuleCall)c00000100Alternatives.eContents().get(1); - private final RuleCall c00000101ParserRuleCallID = (RuleCall)c0000010Alternatives.eContents().get(1); + private final RuleCall c000001001TerminalRuleCallSTRING = (RuleCall)c00000100Alternatives.eContents().get(1); + private final RuleCall c00000101TerminalRuleCallID = (RuleCall)c0000010Alternatives.eContents().get(1); private final Assignment c00001AssignmentMutter = (Assignment)c0000Group.eContents().get(1); private final CrossReference c000010CrossReferenceEStringErwachsener = (CrossReference)c00001AssignmentMutter.eContents().get(0); private final Assignment c0001AssignmentVater = (Assignment)c000Group.eContents().get(1); @@ -372,10 +372,10 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Keyword ele000001000KeywordKeyword() { return c000001000KeywordKeyword; } // not supported - public RuleCall ele000001001ParserRuleCallSTRING() { return c000001001ParserRuleCallSTRING; } + public RuleCall ele000001001TerminalRuleCallSTRING() { return c000001001TerminalRuleCallSTRING; } // not supported - public RuleCall ele00000101ParserRuleCallID() { return c00000101ParserRuleCallID; } + public RuleCall ele00000101TerminalRuleCallID() { return c00000101TerminalRuleCallID; } // not supported public Assignment ele00001AssignmentMutter() { return c00001AssignmentMutter; } @@ -455,7 +455,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordType = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1); - private final RuleCall c10ParserRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0); + private final RuleCall c10TerminalRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0); // not supported public ParserRule getRule() { return rule; } @@ -470,7 +470,7 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { public Assignment ele1AssignmentName() { return c1AssignmentName; } // not supported - public RuleCall ele10ParserRuleCallID() { return c10ParserRuleCallID; } + public RuleCall ele10TerminalRuleCallID() { return c10TerminalRuleCallID; } } private SpielplatzElements pSpielplatz; @@ -543,37 +543,37 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess { } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.IDElements prID() { - return superGrammarAccess.prID(); + public TerminalRule trID() { + return superGrammarAccess.trID(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.INTElements prINT() { - return superGrammarAccess.prINT(); + public TerminalRule trINT() { + return superGrammarAccess.trINT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.STRINGElements prSTRING() { - return superGrammarAccess.prSTRING(); + public TerminalRule trSTRING() { + return superGrammarAccess.trSTRING(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ML_COMMENTElements prML_COMMENT() { - return superGrammarAccess.prML_COMMENT(); + public TerminalRule trML_COMMENT() { + return superGrammarAccess.trML_COMMENT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.SL_COMMENTElements prSL_COMMENT() { - return superGrammarAccess.prSL_COMMENT(); + public TerminalRule trSL_COMMENT() { + return superGrammarAccess.trSL_COMMENT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.WSElements prWS() { - return superGrammarAccess.prWS(); + public TerminalRule trWS() { + return superGrammarAccess.trWS(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ANY_OTHERElements prANY_OTHER() { - return superGrammarAccess.prANY_OTHER(); + public TerminalRule trANY_OTHER() { + return superGrammarAccess.trANY_OTHER(); } } diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java index 4ae618a..ecbc2c8 100644 --- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java +++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/GenDomainmodelProposals.java @@ -241,20 +241,6 @@ public class GenDomainmodelProposals extends AbstractJavaProposalProvider { } return Collections.emptyList(); } - - - public List<? extends ICompletionProposal> completeEcore_EInt(RuleCall ruleCall, IContentAssistContext contentAssistContext) { - if (logger.isDebugEnabled()) { - logger.debug("completeEcore_EInt '" + ruleCall.getRule().getName() + "' cardinality '" + ruleCall.getCardinality() - + "' for model '" + contentAssistContext.getModel() + "' and prefix '" + contentAssistContext.getMatchString() + "'"); - } - return Collections.emptyList(); - } - - - - - @Override protected String getDefaultImageFilePath() { diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi index f43f927..5e6bca2 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/Domainmodel.xmi @@ -273,7 +273,7 @@ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> - <rules xsi:type="xtext:ParserRule" name="ID" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -315,7 +315,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="INT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> @@ -324,7 +324,7 @@ <right value="9"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -409,7 +409,7 @@ </groups> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -420,7 +420,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -440,7 +440,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="WS" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -455,7 +455,7 @@ <groups xsi:type="xtext:Keyword" value="
"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java index 8d36658..a0f91fc 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java @@ -213,13 +213,11 @@ protected class Import_1_Assignment_importURI extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("importURI",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("importURI"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prImport().ele10ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prImport().ele10TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -671,13 +669,11 @@ protected class DataType_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prDataType().ele10ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prDataType().ele10TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -871,13 +867,11 @@ protected class Entity_0_0_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEntity().ele000010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEntity().ele000010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1291,13 +1285,11 @@ protected class Attribute_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prAttribute().ele0010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prAttribute().ele0010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1508,13 +1500,11 @@ protected class Reference_0_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prReference().ele00010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prReference().ele00010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1857,13 +1847,11 @@ protected class Operation_0_0_0_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prOperation().ele0000010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prOperation().ele0000010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -2139,13 +2127,11 @@ protected class Parameter_0_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prParameter().ele00ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prParameter().ele00TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -2299,11 +2285,4 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken { /************ end Rule TypeRef ****************/ - - - - - - - } 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 697f7c3..66b748b 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 @@ -65,7 +65,6 @@ import org.eclipse.xtext.example.services.DomainmodelGrammarAccess; - // Entry rule entryRuleFile entryRuleFile returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prFile().getRule(), currentNode); } @@ -129,8 +128,6 @@ ruleFile returns [EObject current=null] - - // Entry rule entryRuleImport entryRuleImport returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prImport().getRule(), currentNode); } @@ -152,8 +149,9 @@ ruleImport returns [EObject current=null] } ( - lv_importURI_1=RULE_STRING { - createLeafNode(grammarAccess.prImport().ele10ParserRuleCallSTRING(), "importURI"); + lv_importURI_1= RULE_STRING + { + createLeafNode(grammarAccess.prImport().ele10TerminalRuleCallSTRING(), "importURI"); } { @@ -175,8 +173,6 @@ ruleImport returns [EObject current=null] - - // Entry rule entryRuleNamedElement entryRuleNamedElement returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode); } @@ -202,6 +198,10 @@ ruleNamedElement returns [EObject current=null] currentNode = currentNode.getParent(); } + { + createLeafNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), null); + } + | { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); @@ -211,9 +211,11 @@ ruleNamedElement returns [EObject current=null] $current = $this_Type_1.current; currentNode = currentNode.getParent(); } -); - + { + createLeafNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), null); + } +); @@ -294,8 +296,6 @@ rulePackage returns [EObject current=null] - - // Entry rule entryRuleType entryRuleType returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode); } @@ -321,6 +321,10 @@ ruleType returns [EObject current=null] currentNode = currentNode.getParent(); } + { + createLeafNode(grammarAccess.prType().ele0ParserRuleCallEntity(), null); + } + | { currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); @@ -330,9 +334,11 @@ ruleType returns [EObject current=null] $current = $this_DataType_1.current; currentNode = currentNode.getParent(); } -); - + { + createLeafNode(grammarAccess.prType().ele1ParserRuleCallDataType(), null); + } +); @@ -359,8 +365,9 @@ ruleDataType returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prDataType().ele10ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prDataType().ele10TerminalRuleCallID(), "name"); } { @@ -382,8 +389,6 @@ ruleDataType returns [EObject current=null] - - // Entry rule entryRuleEntity entryRuleEntity returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode); } @@ -405,8 +410,9 @@ ruleEntity returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prEntity().ele000010ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prEntity().ele000010TerminalRuleCallID(), "name"); } { @@ -477,8 +483,6 @@ ruleEntity returns [EObject current=null] - - // Entry rule entryRuleFeature entryRuleFeature returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode); } @@ -504,6 +508,10 @@ ruleFeature returns [EObject current=null] currentNode = currentNode.getParent(); } + { + createLeafNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), null); + } + | { currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); @@ -513,9 +521,11 @@ ruleFeature returns [EObject current=null] $current = $this_Operation_1.current; currentNode = currentNode.getParent(); } -); - + { + createLeafNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), null); + } +); @@ -546,6 +556,10 @@ ruleStructuralFeature returns [EObject current=null] currentNode = currentNode.getParent(); } + { + createLeafNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), null); + } + | { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); @@ -555,9 +569,11 @@ ruleStructuralFeature returns [EObject current=null] $current = $this_Reference_1.current; currentNode = currentNode.getParent(); } -); - + { + createLeafNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), null); + } +); @@ -584,8 +600,9 @@ ruleAttribute returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prAttribute().ele0010ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prAttribute().ele0010TerminalRuleCallID(), "name"); } { @@ -632,8 +649,6 @@ ruleAttribute returns [EObject current=null] - - // Entry rule entryRuleReference entryRuleReference returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode); } @@ -655,8 +670,9 @@ ruleReference returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prReference().ele00010ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prReference().ele00010TerminalRuleCallID(), "name"); } { @@ -723,8 +739,6 @@ ruleReference returns [EObject current=null] - - // Entry rule entryRuleOperation entryRuleOperation returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode); } @@ -746,8 +760,9 @@ ruleOperation returns [EObject current=null] } ( - lv_name_1=RULE_ID { - createLeafNode(grammarAccess.prOperation().ele0000010ParserRuleCallID(), "name"); + lv_name_1= RULE_ID + { + createLeafNode(grammarAccess.prOperation().ele0000010TerminalRuleCallID(), "name"); } { @@ -848,8 +863,6 @@ ruleOperation returns [EObject current=null] - - // Entry rule entryRuleParameter entryRuleParameter returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode); } @@ -867,8 +880,9 @@ ruleParameter returns [EObject current=null] }: (( - lv_name_0=RULE_ID { - createLeafNode(grammarAccess.prParameter().ele00ParserRuleCallID(), "name"); + lv_name_0= RULE_ID + { + createLeafNode(grammarAccess.prParameter().ele00TerminalRuleCallID(), "name"); } { @@ -913,8 +927,6 @@ ruleParameter returns [EObject current=null] - - // Entry rule entryRuleTypeRef entryRuleTypeRef returns [EObject current=null] : { currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode); } @@ -952,8 +964,6 @@ ruleTypeRef returns [EObject current=null] - - // Entry rule entryRuleQualifiedName entryRuleQualifiedName returns [String current=null] : { currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode); } @@ -975,7 +985,7 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT } { - createLeafNode(grammarAccess.prQualifiedName().ele0ParserRuleCallID(), null); + createLeafNode(grammarAccess.prQualifiedName().ele0TerminalRuleCallID(), null); } ( kw='.' @@ -988,7 +998,7 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT } { - createLeafNode(grammarAccess.prQualifiedName().ele11ParserRuleCallID(), null); + createLeafNode(grammarAccess.prQualifiedName().ele11TerminalRuleCallID(), null); } )*) ; @@ -996,85 +1006,18 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RULE_ID : '^'? (('a'..'z'|'A'..'Z')|'_') ((('a'..'z'|'A'..'Z')|'_')|'0'..'9')*; - - RULE_INT : ('0'..'9')+; - - RULE_STRING : ('\"' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\"')))* '\"'|'\'' ('\\' ((((((('b'|'t')|'n')|'f')|'r')|'\"')|'\'')|'\\')|~(('\\'|'\'')))* '\''); - - RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; - - RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; - - RULE_WS : (((' '|'\t')|'\r')|'\n')+; - - RULE_ANY_OTHER : .; - - 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 83fbbc4..91eb35d 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:1052: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:1052: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:1009: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:1009: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:1052:11: ( '^' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1009: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:1052:11: '^' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1009:11: '^' { 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:1052:42: ( ( ( 'a' .. 'z' | 'A' .. 'Z' ) | '_' ) | '0' .. '9' )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1009:42: ( ( ( '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:1056:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1056:12: ( '0' .. '9' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011: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:1056:13: '0' .. '9' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1011:13: '0' .. '9' { matchRange('0','9'); @@ -469,10 +469,10 @@ 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:1060: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:1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:1013: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:1013:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:1013:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -484,16 +484,16 @@ public class InternalDomainmodelLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1060:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' | '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )", 6, 0, input); + new NoViableAltException("1013:15: ( '\\\"' ( '\\\\' ( ( ( ( ( ( ( '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:1060:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:16: '\\\"' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* '\\\"' { match('\"'); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:21: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\\"' ) ) )* loop4: do { int alt4=3; @@ -509,7 +509,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:1060:22: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013: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' ) { @@ -526,7 +526,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:1060:76: ~ ( ( '\\\\' | '\\\"' ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:76: ~ ( ( '\\\\' | '\\\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -552,10 +552,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:1060:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:98: '\\'' ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1060:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:103: ( '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -571,7 +571,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:1060:104: '\\\\' ( ( ( ( ( ( ( 'b' | 't' ) | 'n' ) | 'f' ) | 'r' ) | '\\\"' ) | '\\'' ) | '\\\\' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:104: '\\\\' ( ( ( ( ( ( ( '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' ) { @@ -588,7 +588,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:1060:158: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1013:158: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -630,12 +630,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:1064:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1064:24: ( options {greedy=false; } : . )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -660,7 +660,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:1064:52: . + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1015:52: . { matchAny(); @@ -688,12 +688,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:1068:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -706,7 +706,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:1068:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017: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(); @@ -727,7 +727,7 @@ public class InternalDomainmodelLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:40: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -736,9 +736,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:1068:41: ( '\\r' )? '\\n' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:41: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1068:41: ( '\\r' )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -747,7 +747,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:1068:41: '\\r' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1017:41: '\\r' { match('\r'); @@ -777,10 +777,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:1072:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1072:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1019:9: ( ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1019:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1072:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1019:11: ( ( ( ' ' | '\\t' ) | '\\r' ) | '\\n' )+ int cnt11=0; loop11: do { @@ -833,8 +833,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:1076:16: ( . ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1076:18: . + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1021:16: ( . ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:1021: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 87dc2d1..ae705aa 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 @@ -65,7 +65,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleFile - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:70:1: entryRuleFile returns [EObject current=null] : iv_ruleFile= ruleFile EOF ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:69:1: entryRuleFile returns [EObject current=null] : iv_ruleFile= ruleFile EOF ; public final EObject entryRuleFile() throws RecognitionException { EObject current = null; @@ -73,16 +73,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:70:46: (iv_ruleFile= ruleFile EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:71:2: iv_ruleFile= ruleFile EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:69:46: (iv_ruleFile= ruleFile EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:70:2: iv_ruleFile= ruleFile EOF { currentNode = createCompositeNode(grammarAccess.prFile().getRule(), currentNode); - pushFollow(FOLLOW_ruleFile_in_entryRuleFile72); + pushFollow(FOLLOW_ruleFile_in_entryRuleFile71); iv_ruleFile=ruleFile(); _fsp--; current =iv_ruleFile; - match(input,EOF,FOLLOW_EOF_in_entryRuleFile82); + match(input,EOF,FOLLOW_EOF_in_entryRuleFile81); } @@ -100,7 +100,7 @@ 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_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:77:1: ruleFile returns [EObject current=null] : ( (lv_imports_0= ruleImport )* (lv_namedElements_1= ruleNamedElement )* ) ; public final EObject ruleFile() throws RecognitionException { EObject current = null; @@ -112,13 +112,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../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:82: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:83: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: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: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: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:84:2: (lv_imports_0= ruleImport )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:83:2: (lv_imports_0= ruleImport )* loop1: do { int alt1=2; @@ -131,12 +131,12 @@ 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:87:6: lv_imports_0= ruleImport + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:86:6: lv_imports_0= ruleImport { currentNode=createCompositeNode(grammarAccess.prFile().ele00ParserRuleCallImport(), currentNode); - pushFollow(FOLLOW_ruleImport_in_ruleFile141); + pushFollow(FOLLOW_ruleImport_in_ruleFile140); lv_imports_0=ruleImport(); _fsp--; @@ -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:105:3: (lv_namedElements_1= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:104:3: (lv_namedElements_1= ruleNamedElement )* loop2: do { int alt2=2; @@ -175,12 +175,12 @@ 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:108:6: lv_namedElements_1= ruleNamedElement + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:107:6: lv_namedElements_1= ruleNamedElement { currentNode=createCompositeNode(grammarAccess.prFile().ele10ParserRuleCallNamedElement(), currentNode); - pushFollow(FOLLOW_ruleNamedElement_in_ruleFile180); + pushFollow(FOLLOW_ruleNamedElement_in_ruleFile179); lv_namedElements_1=ruleNamedElement(); _fsp--; @@ -229,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:135: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:132:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -237,16 +237,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../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 + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:48: (iv_ruleImport= ruleImport EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:133:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode(grammarAccess.prImport().getRule(), currentNode); - pushFollow(FOLLOW_ruleImport_in_entryRuleImport220); + pushFollow(FOLLOW_ruleImport_in_entryRuleImport217); iv_ruleImport=ruleImport(); _fsp--; current =iv_ruleImport; - match(input,EOF,FOLLOW_EOF_in_entryRuleImport230); + match(input,EOF,FOLLOW_EOF_in_entryRuleImport227); } @@ -264,7 +264,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleImport - // ../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 ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:140:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI_1= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; @@ -273,23 +273,23 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../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:145:6: ( ( 'import' (lv_importURI_1= RULE_STRING ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:146:1: ( '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:149:2: 'import' (lv_importURI_1= RULE_STRING ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:146:1: ( 'import' (lv_importURI_1= RULE_STRING ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:146:2: 'import' (lv_importURI_1= RULE_STRING ) { - match(input,11,FOLLOW_11_in_ruleImport264); + match(input,11,FOLLOW_11_in_ruleImport261); createLeafNode(grammarAccess.prImport().ele0KeywordImport(), null); - // ../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 + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:150:1: (lv_importURI_1= RULE_STRING ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:152:6: lv_importURI_1= RULE_STRING { lv_importURI_1=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport283); - createLeafNode(grammarAccess.prImport().ele10ParserRuleCallSTRING(), "importURI"); + createLeafNode(grammarAccess.prImport().ele10TerminalRuleCallSTRING(), "importURI"); if (current==null) { @@ -329,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:181: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:177:1: entryRuleNamedElement returns [EObject current=null] : iv_ruleNamedElement= ruleNamedElement EOF ; public final EObject entryRuleNamedElement() throws RecognitionException { EObject current = null; @@ -337,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:181:54: (iv_ruleNamedElement= ruleNamedElement EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:182:2: iv_ruleNamedElement= ruleNamedElement EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:177:54: (iv_ruleNamedElement= ruleNamedElement EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:2: iv_ruleNamedElement= ruleNamedElement EOF { currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode); - pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement327); + pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement324); iv_ruleNamedElement=ruleNamedElement(); _fsp--; current =iv_ruleNamedElement; - match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement337); + match(input,EOF,FOLLOW_EOF_in_entryRuleNamedElement334); } @@ -364,7 +364,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleNamedElement - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:189:1: ruleNamedElement returns [EObject current=null] : (this_Package_0= rulePackage | this_Type_1= ruleType ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:185:1: ruleNamedElement returns [EObject current=null] : (this_Package_0= rulePackage | this_Type_1= ruleType ) ; public final EObject ruleNamedElement() throws RecognitionException { EObject current = null; @@ -376,10 +376,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:194: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:195: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:190: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:191: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:195: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:191:1: (this_Package_0= rulePackage | this_Type_1= ruleType ) int alt3=2; int LA3_0 = input.LA(1); @@ -391,18 +391,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("195:1: (this_Package_0= rulePackage | this_Type_1= ruleType )", 3, 0, input); + new NoViableAltException("191: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:196:5: this_Package_0= rulePackage + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:192:5: this_Package_0= rulePackage { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode); - pushFollow(FOLLOW_rulePackage_in_ruleNamedElement384); + pushFollow(FOLLOW_rulePackage_in_ruleNamedElement381); this_Package_0=rulePackage(); _fsp--; @@ -410,6 +410,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Package_0; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), null); + } break; @@ -419,7 +422,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); - pushFollow(FOLLOW_ruleType_in_ruleNamedElement411); + pushFollow(FOLLOW_ruleType_in_ruleNamedElement415); this_Type_1=ruleType(); _fsp--; @@ -427,6 +430,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Type_1; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), null); + } break; @@ -453,7 +459,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:223: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:225:1: entryRulePackage returns [EObject current=null] : iv_rulePackage= rulePackage EOF ; public final EObject entryRulePackage() throws RecognitionException { EObject current = null; @@ -461,16 +467,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:223:49: (iv_rulePackage= rulePackage EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:224:2: iv_rulePackage= rulePackage EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:225:49: (iv_rulePackage= rulePackage EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:226:2: iv_rulePackage= rulePackage EOF { currentNode = createCompositeNode(grammarAccess.prPackage().getRule(), currentNode); - pushFollow(FOLLOW_rulePackage_in_entryRulePackage445); + pushFollow(FOLLOW_rulePackage_in_entryRulePackage454); iv_rulePackage=rulePackage(); _fsp--; current =iv_rulePackage; - match(input,EOF,FOLLOW_EOF_in_entryRulePackage455); + match(input,EOF,FOLLOW_EOF_in_entryRulePackage464); } @@ -488,7 +494,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start rulePackage - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:231:1: rulePackage returns [EObject current=null] : ( ( ( ( '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:233:1: rulePackage returns [EObject current=null] : ( ( ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) (lv_namedElements_3= ruleNamedElement )* ) '}' ) ; public final EObject rulePackage() throws RecognitionException { EObject current = null; @@ -500,32 +506,32 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:236: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:237: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: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:239: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:237: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:237: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:239: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:239: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:237: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:237: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:239: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:239: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:237:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:3: ( ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) '{' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:237:5: 'package' (lv_name_1= ruleQualifiedName ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:4: ( 'package' (lv_name_1= ruleQualifiedName ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:239:5: 'package' (lv_name_1= ruleQualifiedName ) { - match(input,12,FOLLOW_12_in_rulePackage492); + match(input,12,FOLLOW_12_in_rulePackage501); createLeafNode(grammarAccess.prPackage().ele0000KeywordPackage(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:241:1: (lv_name_1= ruleQualifiedName ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:244:6: lv_name_1= ruleQualifiedName + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:243:1: (lv_name_1= ruleQualifiedName ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:246:6: lv_name_1= ruleQualifiedName { currentNode=createCompositeNode(grammarAccess.prPackage().ele00010ParserRuleCallQualifiedName(), currentNode); - pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage526); + pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage535); lv_name_1=ruleQualifiedName(); _fsp--; @@ -548,14 +554,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_rulePackage540); + match(input,13,FOLLOW_13_in_rulePackage549); createLeafNode(grammarAccess.prPackage().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:266:2: (lv_namedElements_3= ruleNamedElement )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:268:2: (lv_namedElements_3= ruleNamedElement )* loop4: do { int alt4=2; @@ -568,12 +574,12 @@ 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:269:6: lv_namedElements_3= ruleNamedElement + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:271:6: lv_namedElements_3= ruleNamedElement { currentNode=createCompositeNode(grammarAccess.prPackage().ele010ParserRuleCallNamedElement(), currentNode); - pushFollow(FOLLOW_ruleNamedElement_in_rulePackage575); + pushFollow(FOLLOW_ruleNamedElement_in_rulePackage584); lv_namedElements_3=ruleNamedElement(); _fsp--; @@ -602,7 +608,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,14,FOLLOW_14_in_rulePackage590); + match(input,14,FOLLOW_14_in_rulePackage599); createLeafNode(grammarAccess.prPackage().ele1KeywordRightCurlyBracket(), null); @@ -641,12 +647,12 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode); - pushFollow(FOLLOW_ruleType_in_entryRuleType625); + pushFollow(FOLLOW_ruleType_in_entryRuleType632); iv_ruleType=ruleType(); _fsp--; current =iv_ruleType; - match(input,EOF,FOLLOW_EOF_in_entryRuleType635); + match(input,EOF,FOLLOW_EOF_in_entryRuleType642); } @@ -702,7 +708,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode); - pushFollow(FOLLOW_ruleEntity_in_ruleType682); + pushFollow(FOLLOW_ruleEntity_in_ruleType689); this_Entity_0=ruleEntity(); _fsp--; @@ -710,16 +716,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Entity_0; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prType().ele0ParserRuleCallEntity(), null); + } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:325:5: this_DataType_1= ruleDataType + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:329:5: this_DataType_1= ruleDataType { currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); - pushFollow(FOLLOW_ruleDataType_in_ruleType709); + pushFollow(FOLLOW_ruleDataType_in_ruleType723); this_DataType_1=ruleDataType(); _fsp--; @@ -727,6 +736,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_DataType_1; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prType().ele1ParserRuleCallDataType(), null); + } break; @@ -753,7 +765,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:342: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:348:1: entryRuleDataType returns [EObject current=null] : iv_ruleDataType= ruleDataType EOF ; public final EObject entryRuleDataType() throws RecognitionException { EObject current = null; @@ -761,16 +773,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:342:50: (iv_ruleDataType= ruleDataType EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:343:2: iv_ruleDataType= ruleDataType EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:348:50: (iv_ruleDataType= ruleDataType EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:2: iv_ruleDataType= ruleDataType EOF { currentNode = createCompositeNode(grammarAccess.prDataType().getRule(), currentNode); - pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType743); + pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType762); iv_ruleDataType=ruleDataType(); _fsp--; current =iv_ruleDataType; - match(input,EOF,FOLLOW_EOF_in_entryRuleDataType753); + match(input,EOF,FOLLOW_EOF_in_entryRuleDataType772); } @@ -788,7 +800,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleDataType - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:350:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:1: ruleDataType returns [EObject current=null] : ( 'datatype' (lv_name_1= RULE_ID ) ) ; public final EObject ruleDataType() throws RecognitionException { EObject current = null; @@ -797,23 +809,23 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:355:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:1: ( 'datatype' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:361:6: ( ( 'datatype' (lv_name_1= RULE_ID ) ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:1: ( 'datatype' (lv_name_1= RULE_ID ) ) { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:1: ( 'datatype' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:356:2: 'datatype' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:1: ( 'datatype' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:2: 'datatype' (lv_name_1= RULE_ID ) { - match(input,15,FOLLOW_15_in_ruleDataType787); + match(input,15,FOLLOW_15_in_ruleDataType806); createLeafNode(grammarAccess.prDataType().ele0KeywordDatatype(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:360:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:362:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:366:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:368:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType808); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType828); - createLeafNode(grammarAccess.prDataType().ele10ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prDataType().ele10TerminalRuleCallID(), "name"); if (current==null) { @@ -853,7 +865,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:388: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:393:1: entryRuleEntity returns [EObject current=null] : iv_ruleEntity= ruleEntity EOF ; public final EObject entryRuleEntity() throws RecognitionException { EObject current = null; @@ -861,16 +873,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:388:48: (iv_ruleEntity= ruleEntity EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:389:2: iv_ruleEntity= ruleEntity EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:393:48: (iv_ruleEntity= ruleEntity EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:394:2: iv_ruleEntity= ruleEntity EOF { currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode); - pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity850); + pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity869); iv_ruleEntity=ruleEntity(); _fsp--; current =iv_ruleEntity; - match(input,EOF,FOLLOW_EOF_in_entryRuleEntity860); + match(input,EOF,FOLLOW_EOF_in_entryRuleEntity879); } @@ -888,7 +900,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEntity - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:396:1: ruleEntity returns [EObject current=null] : ( ( ( ( ( '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:401: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; @@ -899,35 +911,35 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:401: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:402: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:406: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:407: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:402: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:402: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:407: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:407: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:402: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:402: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:407: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:407: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:402: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:402: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:407: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:407: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:402: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:402: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:407: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:407: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:402:5: ( 'entity' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:402:6: 'entity' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:407:5: ( 'entity' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:407:6: 'entity' (lv_name_1= RULE_ID ) { - match(input,16,FOLLOW_16_in_ruleEntity898); + match(input,16,FOLLOW_16_in_ruleEntity917); createLeafNode(grammarAccess.prEntity().ele00000KeywordEntity(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:406:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:408:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:411:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:413:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity919); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity939); - createLeafNode(grammarAccess.prEntity().ele000010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prEntity().ele000010TerminalRuleCallID(), "name"); if (current==null) { @@ -947,7 +959,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:425:3: ( 'extends' ( RULE_ID ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:431:3: ( 'extends' ( RULE_ID ) )? int alt6=2; int LA6_0 = input.LA(1); @@ -956,14 +968,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:425:4: 'extends' ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:431:4: 'extends' ( RULE_ID ) { - match(input,17,FOLLOW_17_in_ruleEntity937); + match(input,17,FOLLOW_17_in_ruleEntity958); createLeafNode(grammarAccess.prEntity().ele00010KeywordExtends(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:429:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:432:3: RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:438:3: RULE_ID { if (current==null) { @@ -971,7 +983,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity959); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity980); createLeafNode(grammarAccess.prEntity().ele000110CrossReferenceEStringEntity(), "superType"); @@ -987,14 +999,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,13,FOLLOW_13_in_ruleEntity974); + match(input,13,FOLLOW_13_in_ruleEntity995); createLeafNode(grammarAccess.prEntity().ele001KeywordLeftCurlyBracket(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:449:2: (lv_features_5= ruleFeature )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:455:2: (lv_features_5= ruleFeature )* loop7: do { int alt7=2; @@ -1007,12 +1019,12 @@ 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:452:6: lv_features_5= ruleFeature + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:458:6: lv_features_5= ruleFeature { currentNode=createCompositeNode(grammarAccess.prEntity().ele010ParserRuleCallFeature(), currentNode); - pushFollow(FOLLOW_ruleFeature_in_ruleEntity1009); + pushFollow(FOLLOW_ruleFeature_in_ruleEntity1030); lv_features_5=ruleFeature(); _fsp--; @@ -1041,7 +1053,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,14,FOLLOW_14_in_ruleEntity1024); + match(input,14,FOLLOW_14_in_ruleEntity1045); createLeafNode(grammarAccess.prEntity().ele1KeywordRightCurlyBracket(), null); @@ -1068,7 +1080,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:483: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:487:1: entryRuleFeature returns [EObject current=null] : iv_ruleFeature= ruleFeature EOF ; public final EObject entryRuleFeature() throws RecognitionException { EObject current = null; @@ -1076,16 +1088,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:483:49: (iv_ruleFeature= ruleFeature EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:484:2: iv_ruleFeature= ruleFeature EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:487:49: (iv_ruleFeature= ruleFeature EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:488:2: iv_ruleFeature= ruleFeature EOF { currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode); - pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1059); + pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1078); iv_ruleFeature=ruleFeature(); _fsp--; current =iv_ruleFeature; - match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1069); + match(input,EOF,FOLLOW_EOF_in_entryRuleFeature1088); } @@ -1103,7 +1115,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:491:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:495:1: ruleFeature returns [EObject current=null] : (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) ; public final EObject ruleFeature() throws RecognitionException { EObject current = null; @@ -1115,10 +1127,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:496: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:497: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:500: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:501: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:497: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:501:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation ) int alt8=2; int LA8_0 = input.LA(1); @@ -1130,18 +1142,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("497:1: (this_StructuralFeature_0= ruleStructuralFeature | this_Operation_1= ruleOperation )", 8, 0, input); + new NoViableAltException("501: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:498:5: this_StructuralFeature_0= ruleStructuralFeature + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:502:5: this_StructuralFeature_0= ruleStructuralFeature { currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode); - pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1116); + pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1135); this_StructuralFeature_0=ruleStructuralFeature(); _fsp--; @@ -1149,16 +1161,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_StructuralFeature_0; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), null); + } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:508:5: this_Operation_1= ruleOperation + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:516:5: this_Operation_1= ruleOperation { currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); - pushFollow(FOLLOW_ruleOperation_in_ruleFeature1143); + pushFollow(FOLLOW_ruleOperation_in_ruleFeature1169); this_Operation_1=ruleOperation(); _fsp--; @@ -1166,6 +1181,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Operation_1; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), null); + } break; @@ -1192,7 +1210,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:525: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:535:1: entryRuleStructuralFeature returns [EObject current=null] : iv_ruleStructuralFeature= ruleStructuralFeature EOF ; public final EObject entryRuleStructuralFeature() throws RecognitionException { EObject current = null; @@ -1200,16 +1218,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:525:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:526:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:535:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF { currentNode = createCompositeNode(grammarAccess.prStructuralFeature().getRule(), currentNode); - pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1177); + pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1208); iv_ruleStructuralFeature=ruleStructuralFeature(); _fsp--; current =iv_ruleStructuralFeature; - match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1187); + match(input,EOF,FOLLOW_EOF_in_entryRuleStructuralFeature1218); } @@ -1227,7 +1245,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleStructuralFeature - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:533:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:543:1: ruleStructuralFeature returns [EObject current=null] : (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) ; public final EObject ruleStructuralFeature() throws RecognitionException { EObject current = null; @@ -1239,10 +1257,10 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:538: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:539: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:548: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:549: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:539: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:549:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference ) int alt9=2; int LA9_0 = input.LA(1); @@ -1254,18 +1272,18 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("539:1: (this_Attribute_0= ruleAttribute | this_Reference_1= ruleReference )", 9, 0, input); + new NoViableAltException("549: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:540:5: this_Attribute_0= ruleAttribute + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:550:5: this_Attribute_0= ruleAttribute { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode); - pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1234); + pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1265); this_Attribute_0=ruleAttribute(); _fsp--; @@ -1273,16 +1291,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Attribute_0; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), null); + } break; case 2 : - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:550:5: this_Reference_1= ruleReference + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:564:5: this_Reference_1= ruleReference { currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); - pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1261); + pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1299); this_Reference_1=ruleReference(); _fsp--; @@ -1290,6 +1311,9 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { current = this_Reference_1; currentNode = currentNode.getParent(); + + createLeafNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), null); + } break; @@ -1316,7 +1340,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:567: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:583:1: entryRuleAttribute returns [EObject current=null] : iv_ruleAttribute= ruleAttribute EOF ; public final EObject entryRuleAttribute() throws RecognitionException { EObject current = null; @@ -1324,16 +1348,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:567:51: (iv_ruleAttribute= ruleAttribute EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:568:2: iv_ruleAttribute= ruleAttribute EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:583:51: (iv_ruleAttribute= ruleAttribute EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: iv_ruleAttribute= ruleAttribute EOF { currentNode = createCompositeNode(grammarAccess.prAttribute().getRule(), currentNode); - pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1295); + pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1338); iv_ruleAttribute=ruleAttribute(); _fsp--; current =iv_ruleAttribute; - match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1305); + match(input,EOF,FOLLOW_EOF_in_entryRuleAttribute1348); } @@ -1351,7 +1375,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleAttribute - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:575:1: ruleAttribute returns [EObject current=null] : ( ( ( '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:591: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; @@ -1362,29 +1386,29 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:580: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:581: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:596: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:597: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:581: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:581: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:597: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:597: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:581:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:3: ( 'attr' (lv_name_1= RULE_ID ) ) ':' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:597:2: ( ( 'attr' (lv_name_1= RULE_ID ) ) ':' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:597:3: ( 'attr' (lv_name_1= RULE_ID ) ) ':' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:3: ( 'attr' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:581:4: 'attr' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:597:3: ( 'attr' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:597:4: 'attr' (lv_name_1= RULE_ID ) { - match(input,18,FOLLOW_18_in_ruleAttribute1341); + match(input,18,FOLLOW_18_in_ruleAttribute1384); createLeafNode(grammarAccess.prAttribute().ele000KeywordAttr(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:585:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:587:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:601:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:603:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1362); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1406); - createLeafNode(grammarAccess.prAttribute().ele0010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prAttribute().ele0010TerminalRuleCallID(), "name"); if (current==null) { @@ -1404,20 +1428,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,19,FOLLOW_19_in_ruleAttribute1379); + match(input,19,FOLLOW_19_in_ruleAttribute1424); createLeafNode(grammarAccess.prAttribute().ele01KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:608:2: (lv_type_3= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:611:6: lv_type_3= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:625:2: (lv_type_3= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:628:6: lv_type_3= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prAttribute().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1414); + pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1459); lv_type_3=ruleTypeRef(); _fsp--; @@ -1460,7 +1484,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:638: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:653:1: entryRuleReference returns [EObject current=null] : iv_ruleReference= ruleReference EOF ; public final EObject entryRuleReference() throws RecognitionException { EObject current = null; @@ -1468,16 +1492,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:638:51: (iv_ruleReference= ruleReference EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:639:2: iv_ruleReference= ruleReference EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:653:51: (iv_ruleReference= ruleReference EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:654:2: iv_ruleReference= ruleReference EOF { currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode); - pushFollow(FOLLOW_ruleReference_in_entryRuleReference1453); + pushFollow(FOLLOW_ruleReference_in_entryRuleReference1496); iv_ruleReference=ruleReference(); _fsp--; current =iv_ruleReference; - match(input,EOF,FOLLOW_EOF_in_entryRuleReference1463); + match(input,EOF,FOLLOW_EOF_in_entryRuleReference1506); } @@ -1495,7 +1519,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleReference - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:646:1: ruleReference returns [EObject current=null] : ( ( ( ( '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:661: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; @@ -1506,32 +1530,32 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:651: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:652: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:666: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:667: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:652: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:652: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:667: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:667: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:652: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:652: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:667: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:667: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:652:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:4: ( 'ref' (lv_name_1= RULE_ID ) ) ':' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:667:3: ( ( 'ref' (lv_name_1= RULE_ID ) ) ':' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:667:4: ( 'ref' (lv_name_1= RULE_ID ) ) ':' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:4: ( 'ref' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:652:5: 'ref' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:667:4: ( 'ref' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:667:5: 'ref' (lv_name_1= RULE_ID ) { - match(input,20,FOLLOW_20_in_ruleReference1500); + match(input,20,FOLLOW_20_in_ruleReference1543); createLeafNode(grammarAccess.prReference().ele0000KeywordRef(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:656:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:658:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:671:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:673:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1521); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1565); - createLeafNode(grammarAccess.prReference().ele00010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prReference().ele00010TerminalRuleCallID(), "name"); if (current==null) { @@ -1551,20 +1575,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,19,FOLLOW_19_in_ruleReference1538); + match(input,19,FOLLOW_19_in_ruleReference1583); createLeafNode(grammarAccess.prReference().ele001KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:679:2: (lv_type_3= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:682:6: lv_type_3= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:695:2: (lv_type_3= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:698:6: lv_type_3= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prReference().ele010ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1573); + pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1618); lv_type_3=ruleTypeRef(); _fsp--; @@ -1587,7 +1611,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:700:3: ( 'opposite' ( RULE_ID ) )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:716:3: ( 'opposite' ( RULE_ID ) )? int alt10=2; int LA10_0 = input.LA(1); @@ -1596,14 +1620,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:700:4: 'opposite' ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:716:4: 'opposite' ( RULE_ID ) { - match(input,21,FOLLOW_21_in_ruleReference1588); + match(input,21,FOLLOW_21_in_ruleReference1633); createLeafNode(grammarAccess.prReference().ele10KeywordOpposite(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:704:1: ( RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:707:3: RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:720:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:723:3: RULE_ID { if (current==null) { @@ -1611,7 +1635,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1610); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1655); createLeafNode(grammarAccess.prReference().ele110CrossReferenceEStringReference(), "opposite"); @@ -1647,7 +1671,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:729: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:743:1: entryRuleOperation returns [EObject current=null] : iv_ruleOperation= ruleOperation EOF ; public final EObject entryRuleOperation() throws RecognitionException { EObject current = null; @@ -1655,16 +1679,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:729:51: (iv_ruleOperation= ruleOperation EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:730:2: iv_ruleOperation= ruleOperation EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:51: (iv_ruleOperation= ruleOperation EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:744:2: iv_ruleOperation= ruleOperation EOF { currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode); - pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1650); + pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1693); iv_ruleOperation=ruleOperation(); _fsp--; current =iv_ruleOperation; - match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1660); + match(input,EOF,FOLLOW_EOF_in_entryRuleOperation1703); } @@ -1682,7 +1706,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleOperation - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:737:1: ruleOperation returns [EObject current=null] : ( ( ( ( ( ( '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:751: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; @@ -1697,38 +1721,38 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:742: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:743: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:756: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:757: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:743: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:743: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:757: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:757: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:743: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:743: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:757: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:757: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:743: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:743: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:757: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:757: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:743: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:743: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:757: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:757: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:743:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:6: ( 'op' (lv_name_1= RULE_ID ) ) '(' + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:757:5: ( ( 'op' (lv_name_1= RULE_ID ) ) '(' ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:757:6: ( 'op' (lv_name_1= RULE_ID ) ) '(' { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:6: ( 'op' (lv_name_1= RULE_ID ) ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:7: 'op' (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:757:6: ( 'op' (lv_name_1= RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:757:7: 'op' (lv_name_1= RULE_ID ) { - match(input,22,FOLLOW_22_in_ruleOperation1699); + match(input,22,FOLLOW_22_in_ruleOperation1742); createLeafNode(grammarAccess.prOperation().ele000000KeywordOp(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:747:1: (lv_name_1= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:749:6: lv_name_1= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:761:1: (lv_name_1= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:763:6: lv_name_1= RULE_ID { lv_name_1=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1720); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1764); - createLeafNode(grammarAccess.prOperation().ele0000010ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prOperation().ele0000010TerminalRuleCallID(), "name"); if (current==null) { @@ -1748,14 +1772,14 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,23,FOLLOW_23_in_ruleOperation1737); + match(input,23,FOLLOW_23_in_ruleOperation1782); createLeafNode(grammarAccess.prOperation().ele00001KeywordLeftParenthesis(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:770:2: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:2: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )? int alt12=2; int LA12_0 = input.LA(1); @@ -1764,15 +1788,15 @@ 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:770: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:785: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:770:3: (lv_params_3= ruleParameter ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:773:6: lv_params_3= ruleParameter + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:3: (lv_params_3= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:788:6: lv_params_3= ruleParameter { currentNode=createCompositeNode(grammarAccess.prOperation().ele000100ParserRuleCallParameter(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_ruleOperation1773); + pushFollow(FOLLOW_ruleParameter_in_ruleOperation1818); lv_params_3=ruleParameter(); _fsp--; @@ -1792,7 +1816,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:791:2: ( ',' (lv_params_5= ruleParameter ) )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:806:2: ( ',' (lv_params_5= ruleParameter ) )* loop11: do { int alt11=2; @@ -1805,19 +1829,19 @@ 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:791:3: ',' (lv_params_5= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:806:3: ',' (lv_params_5= ruleParameter ) { - match(input,24,FOLLOW_24_in_ruleOperation1787); + match(input,24,FOLLOW_24_in_ruleOperation1832); createLeafNode(grammarAccess.prOperation().ele000110KeywordComma(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:795:1: (lv_params_5= ruleParameter ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:798:6: lv_params_5= ruleParameter + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:810:1: (lv_params_5= ruleParameter ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:813:6: lv_params_5= ruleParameter { currentNode=createCompositeNode(grammarAccess.prOperation().ele0001110ParserRuleCallParameter(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_ruleOperation1821); + pushFollow(FOLLOW_ruleParameter_in_ruleOperation1866); lv_params_5=ruleParameter(); _fsp--; @@ -1855,27 +1879,27 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - match(input,25,FOLLOW_25_in_ruleOperation1839); + match(input,25,FOLLOW_25_in_ruleOperation1884); createLeafNode(grammarAccess.prOperation().ele001KeywordRightParenthesis(), null); } - match(input,19,FOLLOW_19_in_ruleOperation1849); + match(input,19,FOLLOW_19_in_ruleOperation1894); createLeafNode(grammarAccess.prOperation().ele01KeywordColon(), null); } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:824:2: (lv_type_8= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:827:6: lv_type_8= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:839:2: (lv_type_8= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:842:6: lv_type_8= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prOperation().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1884); + pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1929); lv_type_8=ruleTypeRef(); _fsp--; @@ -1918,7 +1942,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:854: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:867:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ; public final EObject entryRuleParameter() throws RecognitionException { EObject current = null; @@ -1926,16 +1950,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:854:51: (iv_ruleParameter= ruleParameter EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:855:2: iv_ruleParameter= ruleParameter EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:867:51: (iv_ruleParameter= ruleParameter EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:2: iv_ruleParameter= ruleParameter EOF { currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode); - pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1923); + pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1966); iv_ruleParameter=ruleParameter(); _fsp--; current =iv_ruleParameter; - match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1933); + match(input,EOF,FOLLOW_EOF_in_entryRuleParameter1976); } @@ -1953,7 +1977,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleParameter - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:862:1: ruleParameter returns [EObject current=null] : ( (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:875:1: ruleParameter returns [EObject current=null] : ( (lv_name_0= RULE_ID ) (lv_type_1= ruleTypeRef ) ) ; public final EObject ruleParameter() throws RecognitionException { EObject current = null; @@ -1964,19 +1988,19 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:867: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:868: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:880: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:881: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:868: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:868: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:881: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:881: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:868:2: (lv_name_0= RULE_ID ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:870:6: lv_name_0= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:881:2: (lv_name_0= RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:883:6: lv_name_0= RULE_ID { lv_name_0=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1979); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter2023); - createLeafNode(grammarAccess.prParameter().ele00ParserRuleCallID(), "name"); + createLeafNode(grammarAccess.prParameter().ele00TerminalRuleCallID(), "name"); if (current==null) { @@ -1993,13 +2017,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:887:2: (lv_type_1= ruleTypeRef ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:890:6: lv_type_1= ruleTypeRef + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:901:2: (lv_type_1= ruleTypeRef ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:904:6: lv_type_1= ruleTypeRef { currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2020); + pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2065); lv_type_1=ruleTypeRef(); _fsp--; @@ -2042,7 +2066,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:919: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:931:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ; public final EObject entryRuleTypeRef() throws RecognitionException { EObject current = null; @@ -2050,16 +2074,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:919:49: (iv_ruleTypeRef= ruleTypeRef EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:920:2: iv_ruleTypeRef= ruleTypeRef EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:931:49: (iv_ruleTypeRef= ruleTypeRef EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:2: iv_ruleTypeRef= ruleTypeRef EOF { currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode); - pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2061); + pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2104); iv_ruleTypeRef=ruleTypeRef(); _fsp--; current =iv_ruleTypeRef; - match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2071); + match(input,EOF,FOLLOW_EOF_in_entryRuleTypeRef2114); } @@ -2077,18 +2101,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:927:1: ruleTypeRef returns [EObject current=null] : ( RULE_ID ) ; + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:939: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:932:6: ( ( RULE_ID ) ) - // ../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:944:6: ( ( RULE_ID ) ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:945:1: ( RULE_ID ) { - // ../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:936:3: RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:945:1: ( RULE_ID ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:948:3: RULE_ID { if (current==null) { @@ -2096,7 +2120,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2117); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2160); createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceEStringType(), "referenced"); @@ -2123,7 +2147,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:958: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:968:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ; public final String entryRuleQualifiedName() throws RecognitionException { String current = null; @@ -2131,16 +2155,16 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:958:54: (iv_ruleQualifiedName= ruleQualifiedName EOF ) - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:959:2: iv_ruleQualifiedName= ruleQualifiedName EOF + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:968:54: (iv_ruleQualifiedName= ruleQualifiedName EOF ) + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:969:2: iv_ruleQualifiedName= ruleQualifiedName EOF { currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode); - pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2155); + pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2196); iv_ruleQualifiedName=ruleQualifiedName(); _fsp--; current =iv_ruleQualifiedName.getText(); - match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2166); + match(input,EOF,FOLLOW_EOF_in_entryRuleQualifiedName2207); } @@ -2158,7 +2182,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { // $ANTLR start ruleQualifiedName - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:966:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (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:976: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(); @@ -2169,21 +2193,21 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:972: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:973: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:982: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:983: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:973: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:973: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:983: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:983:6: this_ID_0= RULE_ID (kw= '.' this_ID_2= RULE_ID )* { this_ID_0=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2206); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2247); current.merge(this_ID_0); - createLeafNode(grammarAccess.prQualifiedName().ele0ParserRuleCallID(), null); + createLeafNode(grammarAccess.prQualifiedName().ele0TerminalRuleCallID(), null); - // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:980:1: (kw= '.' this_ID_2= RULE_ID )* + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:990:1: (kw= '.' this_ID_2= RULE_ID )* loop13: do { int alt13=2; @@ -2196,21 +2220,21 @@ 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:981:2: kw= '.' this_ID_2= RULE_ID + // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:991:2: kw= '.' this_ID_2= RULE_ID { kw=(Token)input.LT(1); - match(input,26,FOLLOW_26_in_ruleQualifiedName2225); + match(input,26,FOLLOW_26_in_ruleQualifiedName2266); current.merge(kw); createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null); this_ID_2=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2240); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2281); current.merge(this_ID_2); - createLeafNode(grammarAccess.prQualifiedName().ele11ParserRuleCallID(), null); + createLeafNode(grammarAccess.prQualifiedName().ele11TerminalRuleCallID(), null); } @@ -2246,86 +2270,86 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser { - public static final BitSet FOLLOW_ruleFile_in_entryRuleFile72 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFile82 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleImport_in_ruleFile141 = new BitSet(new long[]{0x0000000000019802L}); - public static final BitSet FOLLOW_ruleNamedElement_in_ruleFile180 = new BitSet(new long[]{0x0000000000019002L}); - 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_entryRuleNamedElement327 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement337 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement384 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_ruleNamedElement411 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePackage_in_entryRulePackage445 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePackage455 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_rulePackage492 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage526 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_rulePackage540 = new BitSet(new long[]{0x000000000001D000L}); - public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage575 = new BitSet(new long[]{0x000000000001D000L}); - public static final BitSet FOLLOW_14_in_rulePackage590 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_entryRuleType625 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleType635 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleEntity_in_ruleType682 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleDataType_in_ruleType709 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType743 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleDataType753 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_ruleDataType787 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleDataType808 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity850 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleEntity860 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_ruleEntity898 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEntity919 = new BitSet(new long[]{0x0000000000022000L}); - public static final BitSet FOLLOW_17_in_ruleEntity937 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEntity959 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleEntity974 = new BitSet(new long[]{0x0000000000544000L}); - public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1009 = new BitSet(new long[]{0x0000000000544000L}); - public static final BitSet FOLLOW_14_in_ruleEntity1024 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1059 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFeature1069 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1116 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1143 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1177 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1187 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1234 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1261 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1295 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1305 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleAttribute1341 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1362 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleAttribute1379 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1414 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1453 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleReference1463 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_20_in_ruleReference1500 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleReference1521 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleReference1538 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1573 = new BitSet(new long[]{0x0000000000200002L}); - public static final BitSet FOLLOW_21_in_ruleReference1588 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleReference1610 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1650 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleOperation1660 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleOperation1699 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1720 = new BitSet(new long[]{0x0000000000800000L}); - public static final BitSet FOLLOW_23_in_ruleOperation1737 = new BitSet(new long[]{0x0000000002000020L}); - public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1773 = new BitSet(new long[]{0x0000000003000000L}); - public static final BitSet FOLLOW_24_in_ruleOperation1787 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1821 = new BitSet(new long[]{0x0000000003000000L}); - public static final BitSet FOLLOW_25_in_ruleOperation1839 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleOperation1849 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1884 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1923 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleParameter1933 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleParameter1979 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2020 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2061 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2071 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2117 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2155 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2166 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2206 = new BitSet(new long[]{0x0000000004000002L}); - public static final BitSet FOLLOW_26_in_ruleQualifiedName2225 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2240 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_ruleFile_in_entryRuleFile71 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFile81 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleImport_in_ruleFile140 = new BitSet(new long[]{0x0000000000019802L}); + public static final BitSet FOLLOW_ruleNamedElement_in_ruleFile179 = new BitSet(new long[]{0x0000000000019002L}); + public static final BitSet FOLLOW_ruleImport_in_entryRuleImport217 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleImport227 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleImport261 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleImport283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNamedElement_in_entryRuleNamedElement324 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNamedElement334 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePackage_in_ruleNamedElement381 = 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_entryRulePackage454 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePackage464 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_rulePackage501 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleQualifiedName_in_rulePackage535 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_rulePackage549 = new BitSet(new long[]{0x000000000001D000L}); + public static final BitSet FOLLOW_ruleNamedElement_in_rulePackage584 = new BitSet(new long[]{0x000000000001D000L}); + public static final BitSet FOLLOW_14_in_rulePackage599 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleType_in_entryRuleType632 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleType642 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleEntity_in_ruleType689 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDataType_in_ruleType723 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDataType_in_entryRuleDataType762 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDataType772 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleDataType806 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleDataType828 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleEntity_in_entryRuleEntity869 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleEntity879 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_ruleEntity917 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEntity939 = new BitSet(new long[]{0x0000000000022000L}); + public static final BitSet FOLLOW_17_in_ruleEntity958 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEntity980 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleEntity995 = new BitSet(new long[]{0x0000000000544000L}); + public static final BitSet FOLLOW_ruleFeature_in_ruleEntity1030 = new BitSet(new long[]{0x0000000000544000L}); + public static final BitSet FOLLOW_14_in_ruleEntity1045 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFeature_in_entryRuleFeature1078 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFeature1088 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStructuralFeature_in_ruleFeature1135 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOperation_in_ruleFeature1169 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1208 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleStructuralFeature1218 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_ruleStructuralFeature1265 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleReference_in_ruleStructuralFeature1299 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleAttribute_in_entryRuleAttribute1338 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleAttribute1348 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleAttribute1384 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleAttribute1406 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleAttribute1424 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleAttribute1459 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleReference_in_entryRuleReference1496 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleReference1506 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_20_in_ruleReference1543 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleReference1565 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleReference1583 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleReference1618 = new BitSet(new long[]{0x0000000000200002L}); + public static final BitSet FOLLOW_21_in_ruleReference1633 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleReference1655 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleOperation_in_entryRuleOperation1693 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleOperation1703 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleOperation1742 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleOperation1764 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_23_in_ruleOperation1782 = new BitSet(new long[]{0x0000000002000020L}); + public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1818 = new BitSet(new long[]{0x0000000003000000L}); + public static final BitSet FOLLOW_24_in_ruleOperation1832 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleParameter_in_ruleOperation1866 = new BitSet(new long[]{0x0000000003000000L}); + public static final BitSet FOLLOW_25_in_ruleOperation1884 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleOperation1894 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleOperation1929 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleParameter_in_entryRuleParameter1966 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleParameter1976 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleParameter2023 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleTypeRef_in_ruleParameter2065 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeRef_in_entryRuleTypeRef2104 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeRef2114 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleTypeRef2160 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2196 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleQualifiedName2207 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2247 = new BitSet(new long[]{0x0000000004000002L}); + public static final BitSet FOLLOW_26_in_ruleQualifiedName2266 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleQualifiedName2281 = 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 097b771..68c7e94 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,39 +24,25 @@ T24 : ',' ; T25 : ')' ; T26 : '.' ; -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1052 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1009 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" 1056 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1011 RULE_INT : ('0'..'9')+; - - -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1060 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1013 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" 1064 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1015 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/'; - - -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1068 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1017 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" 1072 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1019 RULE_WS : (((' '|'\t')|'\r')|'\n')+; - - -// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1076 +// $ANTLR src "../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g" 1021 RULE_ANY_OTHER : .; - - diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java index 72a36d6..0ea715d 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java @@ -142,13 +142,13 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration getTypedElementConsumer().setRule(grammarAccess.prTypedElement()); getTypeRefConsumer().setRule(grammarAccess.prTypeRef()); getQualifiedNameConsumer().setRule(grammarAccess.prQualifiedName()); - getIdConsumer().setRule(grammarAccess.prID()); - getIntConsumer().setRule(grammarAccess.prINT()); - getStringConsumer().setRule(grammarAccess.prSTRING()); - getMlCommentConsumer().setRule(grammarAccess.prML_COMMENT()); - getSlCommentConsumer().setRule(grammarAccess.prSL_COMMENT()); - getWsConsumer().setRule(grammarAccess.prWS()); - getAnyOtherConsumer().setRule(grammarAccess.prANY_OTHER()); + getIdConsumer().setRule(grammarAccess.trID()); + getIntConsumer().setRule(grammarAccess.trINT()); + getStringConsumer().setRule(grammarAccess.trSTRING()); + getMlCommentConsumer().setRule(grammarAccess.trML_COMMENT()); + getSlCommentConsumer().setRule(grammarAccess.trSL_COMMENT()); + getWsConsumer().setRule(grammarAccess.trWS()); + getAnyOtherConsumer().setRule(grammarAccess.trANY_OTHER()); getFileConsumer().setImportConsumer(getImportConsumer()); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java index bab674d..6ebb7d6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java @@ -158,7 +158,7 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$4$Consumer = new Keyword$4$Consumer(rule.ele000KeywordAttr()); assignment$5$Consumer = new Assignment$5$Consumer(rule.ele001AssignmentName()); - ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.ele0010ParserRuleCallID()); + ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.ele0010TerminalRuleCallID()); keyword$7$Consumer = new Keyword$7$Consumer(rule.ele01KeywordColon()); assignment$8$Consumer = new Assignment$8$Consumer(rule.ele1AssignmentType()); ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele10ParserRuleCallTypeRef()); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java index 957382f..da67b9f 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java @@ -108,7 +108,7 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordDatatype()); assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName()); - ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallID()); + ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID()); } @Override diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java index 47b15c3..6a91d68 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java @@ -241,7 +241,7 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$6$Consumer = new Keyword$6$Consumer(rule.ele00000KeywordEntity()); assignment$7$Consumer = new Assignment$7$Consumer(rule.ele00001AssignmentName()); - ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010ParserRuleCallID()); + ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele000010TerminalRuleCallID()); group$9$Consumer = new Group$9$Consumer(rule.ele0001Group()); keyword$10$Consumer = new Keyword$10$Consumer(rule.ele00010KeywordExtends()); assignment$11$Consumer = new Assignment$11$Consumer(rule.ele00011AssignmentSuperType()); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java index e6cabcd..b2ece58 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelImportConsumer.java @@ -108,7 +108,7 @@ public final class DomainmodelImportConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordImport()); assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentImportURI()); - ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10ParserRuleCallSTRING()); + ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallSTRING()); } @Override diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java index 1070860..2961944 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelOperationConsumer.java @@ -300,7 +300,7 @@ public final class DomainmodelOperationConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$7$Consumer = new Keyword$7$Consumer(rule.ele000000KeywordOp()); assignment$8$Consumer = new Assignment$8$Consumer(rule.ele000001AssignmentName()); - ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele0000010ParserRuleCallID()); + ruleCall$9$Consumer = new RuleCall$9$Consumer(rule.ele0000010TerminalRuleCallID()); keyword$10$Consumer = new Keyword$10$Consumer(rule.ele00001KeywordLeftParenthesis()); group$11$Consumer = new Group$11$Consumer(rule.ele0001Group()); assignment$12$Consumer = new Assignment$12$Consumer(rule.ele00010AssignmentParams()); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java index e8e864c..30a6ad6 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelParameterConsumer.java @@ -119,7 +119,7 @@ public final class DomainmodelParameterConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); assignment$2$Consumer = new Assignment$2$Consumer(rule.ele0AssignmentName()); - ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele00ParserRuleCallID()); + ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele00TerminalRuleCallID()); assignment$4$Consumer = new Assignment$4$Consumer(rule.ele1AssignmentType()); ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele10ParserRuleCallTypeRef()); } diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java index 0bdc49b..8b5ee53 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelQualifiedNameConsumer.java @@ -123,10 +123,10 @@ public final class DomainmodelQualifiedNameConsumer extends NonTerminalConsumer this.rule = rule; group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); - ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallID()); + ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0TerminalRuleCallID()); group$3$Consumer = new Group$3$Consumer(rule.ele1Group()); keyword$4$Consumer = new Keyword$4$Consumer(rule.ele10KeywordFullStop()); - ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele11ParserRuleCallID()); + ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele11TerminalRuleCallID()); } @Override diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java index cdd269b..6ddbd67 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelReferenceConsumer.java @@ -223,7 +223,7 @@ public final class DomainmodelReferenceConsumer extends NonTerminalConsumer { group$1$Consumer = new Group$1$Consumer(rule.eleGroup()); keyword$5$Consumer = new Keyword$5$Consumer(rule.ele0000KeywordRef()); assignment$6$Consumer = new Assignment$6$Consumer(rule.ele0001AssignmentName()); - ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele00010ParserRuleCallID()); + ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele00010TerminalRuleCallID()); keyword$8$Consumer = new Keyword$8$Consumer(rule.ele001KeywordColon()); assignment$9$Consumer = new Assignment$9$Consumer(rule.ele01AssignmentType()); ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele010ParserRuleCallTypeRef()); diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java index ec3dca5..858c77b 100644 --- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java +++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/services/DomainmodelGrammarAccess.java @@ -49,7 +49,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordImport = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentImportURI = (Assignment)cGroup.eContents().get(1); - private final RuleCall c10ParserRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0); + private final RuleCall c10TerminalRuleCallSTRING = (RuleCall)c1AssignmentImportURI.eContents().get(0); // not supported public ParserRule getRule() { return rule; } @@ -64,7 +64,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele1AssignmentImportURI() { return c1AssignmentImportURI; } // not supported - public RuleCall ele10ParserRuleCallSTRING() { return c10ParserRuleCallSTRING; } + public RuleCall ele10TerminalRuleCallSTRING() { return c10TerminalRuleCallSTRING; } } public class NamedElementElements implements IParserRuleAccess { @@ -161,7 +161,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword c0KeywordDatatype = (Keyword)cGroup.eContents().get(0); private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1); - private final RuleCall c10ParserRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0); + private final RuleCall c10TerminalRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0); // not supported public ParserRule getRule() { return rule; } @@ -176,7 +176,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele1AssignmentName() { return c1AssignmentName; } // not supported - public RuleCall ele10ParserRuleCallID() { return c10ParserRuleCallID; } + public RuleCall ele10TerminalRuleCallID() { return c10TerminalRuleCallID; } } public class EntityElements implements IParserRuleAccess { @@ -188,7 +188,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c0000Group = (Group)c000Group.eContents().get(0); private final Keyword c00000KeywordEntity = (Keyword)c0000Group.eContents().get(0); private final Assignment c00001AssignmentName = (Assignment)c0000Group.eContents().get(1); - private final RuleCall c000010ParserRuleCallID = (RuleCall)c00001AssignmentName.eContents().get(0); + private final RuleCall c000010TerminalRuleCallID = (RuleCall)c00001AssignmentName.eContents().get(0); private final Group c0001Group = (Group)c000Group.eContents().get(1); private final Keyword c00010KeywordExtends = (Keyword)c0001Group.eContents().get(0); private final Assignment c00011AssignmentSuperType = (Assignment)c0001Group.eContents().get(1); @@ -223,7 +223,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele00001AssignmentName() { return c00001AssignmentName; } // not supported - public RuleCall ele000010ParserRuleCallID() { return c000010ParserRuleCallID; } + public RuleCall ele000010TerminalRuleCallID() { return c000010TerminalRuleCallID; } // not supported public Group ele0001Group() { return c0001Group; } @@ -295,7 +295,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c00Group = (Group)c0Group.eContents().get(0); private final Keyword c000KeywordAttr = (Keyword)c00Group.eContents().get(0); private final Assignment c001AssignmentName = (Assignment)c00Group.eContents().get(1); - private final RuleCall c0010ParserRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); + private final RuleCall c0010TerminalRuleCallID = (RuleCall)c001AssignmentName.eContents().get(0); private final Keyword c01KeywordColon = (Keyword)c0Group.eContents().get(1); private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1); private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0); @@ -319,7 +319,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele001AssignmentName() { return c001AssignmentName; } // not supported - public RuleCall ele0010ParserRuleCallID() { return c0010ParserRuleCallID; } + public RuleCall ele0010TerminalRuleCallID() { return c0010TerminalRuleCallID; } // not supported public Keyword ele01KeywordColon() { return c01KeywordColon; } @@ -339,7 +339,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c000Group = (Group)c00Group.eContents().get(0); private final Keyword c0000KeywordRef = (Keyword)c000Group.eContents().get(0); private final Assignment c0001AssignmentName = (Assignment)c000Group.eContents().get(1); - private final RuleCall c00010ParserRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0); + private final RuleCall c00010TerminalRuleCallID = (RuleCall)c0001AssignmentName.eContents().get(0); private final Keyword c001KeywordColon = (Keyword)c00Group.eContents().get(1); private final Assignment c01AssignmentType = (Assignment)c0Group.eContents().get(1); private final RuleCall c010ParserRuleCallTypeRef = (RuleCall)c01AssignmentType.eContents().get(0); @@ -370,7 +370,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele0001AssignmentName() { return c0001AssignmentName; } // not supported - public RuleCall ele00010ParserRuleCallID() { return c00010ParserRuleCallID; } + public RuleCall ele00010TerminalRuleCallID() { return c00010TerminalRuleCallID; } // not supported public Keyword ele001KeywordColon() { return c001KeywordColon; } @@ -404,7 +404,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final Group c00000Group = (Group)c0000Group.eContents().get(0); private final Keyword c000000KeywordOp = (Keyword)c00000Group.eContents().get(0); private final Assignment c000001AssignmentName = (Assignment)c00000Group.eContents().get(1); - private final RuleCall c0000010ParserRuleCallID = (RuleCall)c000001AssignmentName.eContents().get(0); + private final RuleCall c0000010TerminalRuleCallID = (RuleCall)c000001AssignmentName.eContents().get(0); private final Keyword c00001KeywordLeftParenthesis = (Keyword)c0000Group.eContents().get(1); private final Group c0001Group = (Group)c000Group.eContents().get(1); private final Assignment c00010AssignmentParams = (Assignment)c0001Group.eContents().get(0); @@ -446,7 +446,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele000001AssignmentName() { return c000001AssignmentName; } // not supported - public RuleCall ele0000010ParserRuleCallID() { return c0000010ParserRuleCallID; } + public RuleCall ele0000010TerminalRuleCallID() { return c0000010TerminalRuleCallID; } // not supported public Keyword ele00001KeywordLeftParenthesis() { return c00001KeywordLeftParenthesis; } @@ -489,7 +489,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Parameter"); private final Group cGroup = (Group)rule.eContents().get(1); private final Assignment c0AssignmentName = (Assignment)cGroup.eContents().get(0); - private final RuleCall c00ParserRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0); + private final RuleCall c00TerminalRuleCallID = (RuleCall)c0AssignmentName.eContents().get(0); private final Assignment c1AssignmentType = (Assignment)cGroup.eContents().get(1); private final RuleCall c10ParserRuleCallTypeRef = (RuleCall)c1AssignmentType.eContents().get(0); @@ -503,7 +503,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Assignment ele0AssignmentName() { return c0AssignmentName; } // not supported - public RuleCall ele00ParserRuleCallID() { return c00ParserRuleCallID; } + public RuleCall ele00TerminalRuleCallID() { return c00TerminalRuleCallID; } // not supported public Assignment ele1AssignmentType() { return c1AssignmentType; } @@ -549,10 +549,10 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public class QualifiedNameElements implements IParserRuleAccess { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "QualifiedName"); private final Group cGroup = (Group)rule.eContents().get(1); - private final RuleCall c0ParserRuleCallID = (RuleCall)cGroup.eContents().get(0); + private final RuleCall c0TerminalRuleCallID = (RuleCall)cGroup.eContents().get(0); private final Group c1Group = (Group)cGroup.eContents().get(1); private final Keyword c10KeywordFullStop = (Keyword)c1Group.eContents().get(0); - private final RuleCall c11ParserRuleCallID = (RuleCall)c1Group.eContents().get(1); + private final RuleCall c11TerminalRuleCallID = (RuleCall)c1Group.eContents().get(1); // not supported public ParserRule getRule() { return rule; } @@ -561,7 +561,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Group eleGroup() { return cGroup; } // not supported - public RuleCall ele0ParserRuleCallID() { return c0ParserRuleCallID; } + public RuleCall ele0TerminalRuleCallID() { return c0TerminalRuleCallID; } // not supported public Group ele1Group() { return c1Group; } @@ -570,7 +570,7 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { public Keyword ele10KeywordFullStop() { return c10KeywordFullStop; } // not supported - public RuleCall ele11ParserRuleCallID() { return c11ParserRuleCallID; } + public RuleCall ele11TerminalRuleCallID() { return c11TerminalRuleCallID; } } private FileElements pFile; @@ -691,37 +691,37 @@ public class DomainmodelGrammarAccess implements IGrammarAccess { } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.IDElements prID() { - return superGrammarAccess.prID(); + public TerminalRule trID() { + return superGrammarAccess.trID(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.INTElements prINT() { - return superGrammarAccess.prINT(); + public TerminalRule trINT() { + return superGrammarAccess.trINT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.STRINGElements prSTRING() { - return superGrammarAccess.prSTRING(); + public TerminalRule trSTRING() { + return superGrammarAccess.trSTRING(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ML_COMMENTElements prML_COMMENT() { - return superGrammarAccess.prML_COMMENT(); + public TerminalRule trML_COMMENT() { + return superGrammarAccess.trML_COMMENT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.SL_COMMENTElements prSL_COMMENT() { - return superGrammarAccess.prSL_COMMENT(); + public TerminalRule trSL_COMMENT() { + return superGrammarAccess.trSL_COMMENT(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.WSElements prWS() { - return superGrammarAccess.prWS(); + public TerminalRule trWS() { + return superGrammarAccess.trWS(); } // not supported - public org.eclipse.xtext.common.services.TerminalsGrammarAccess.ANY_OTHERElements prANY_OTHER() { - return superGrammarAccess.prANY_OTHER(); + public TerminalRule trANY_OTHER() { + return superGrammarAccess.trANY_OTHER(); } } diff --git a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java index 0d479e4..67bdd0d 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java +++ b/examples/org.eclipse.xtext.example.ecoredsl.ui/src-gen/org/eclipse/xtext/example/GenEcoreDslProposals.java @@ -989,13 +989,6 @@ public class GenEcoreDslProposals extends AbstractJavaProposalProvider { } return Collections.emptyList(); } - - - - - - - @Override protected String getDefaultImageFilePath() { diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi index a5af4fd..b5ec0a2 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/EcoreDsl.xmi @@ -854,7 +854,7 @@ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> - <rules xsi:type="xtext:ParserRule" name="ID" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ID"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -896,7 +896,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="INT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="INT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </type> @@ -905,7 +905,7 @@ <right value="9"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="STRING" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="STRING"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -990,7 +990,7 @@ </groups> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ML_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ML_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -1001,7 +1001,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="SL_COMMENT" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="SL_COMMENT"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -1021,7 +1021,7 @@ </abstractTokens> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="WS" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="WS"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> @@ -1036,7 +1036,7 @@ <groups xsi:type="xtext:Keyword" value="
"/> </alternatives> </rules> - <rules xsi:type="xtext:ParserRule" name="ANY_OTHER" terminal="true"> + <rules xsi:type="xtext:TerminalRule" name="ANY_OTHER"> <type metamodel="/1/@metamodelDeclarations.0"> <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </type> diff --git a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java index 91d793e..9a6f0fb 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java +++ b/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parseTreeConstruction/EcoreDslParsetreeConstructor.java @@ -309,13 +309,11 @@ protected class ImportStatementDecl_0_0_1_0_Assignment_alias extends AssignmentT protected Solution createSolution() { if((value = current.getConsumable("alias",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("alias"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prImportStatementDecl().ele00100ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prImportStatementDecl().ele00100TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -350,13 +348,11 @@ protected class ImportStatementDecl_0_1_Assignment_importURI extends AssignmentT protected Solution createSolution() { if((value = current.getConsumable("importURI",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("importURI"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prImportStatementDecl().ele010ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prImportStatementDecl().ele010TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -831,13 +827,11 @@ protected class EPackageDecl_0_0_0_0_0_0_1_Assignment_nsURI extends AssignmentTo protected Solution createSolution() { if((value = current.getConsumable("nsURI",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("nsURI"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEPackageDecl().ele00000010ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEPackageDecl().ele00000010TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -1236,13 +1230,11 @@ protected class SubEPackageDecl_0_0_0_1_Assignment_name extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prSubEPackageDecl().ele00010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prSubEPackageDecl().ele00010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -1741,13 +1733,11 @@ protected class EDataTypeDecl_0_1_0_0_0_1_Assignment_name extends AssignmentToke protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEDataTypeDecl().ele0100010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEDataTypeDecl().ele0100010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -2047,13 +2037,11 @@ protected class EAnnotationDecl_0_0_0_0_0_1_Assignment_source extends Assignment protected Solution createSolution() { if((value = current.getConsumable("source",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("source"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEAnnotationDecl().ele0000010ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEAnnotationDecl().ele0000010TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -2646,13 +2634,11 @@ protected class EClassDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEClassDecl().ele00000010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEClassDecl().ele00000010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -4134,13 +4120,11 @@ protected class EAttributeDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig protected Solution createSolution() { if((value = current.getConsumable("lowerBound",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("lowerBound"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEAttributeDecl().ele00010010ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEAttributeDecl().ele00010010TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -4247,13 +4231,11 @@ protected class EAttributeDecl_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEAttributeDecl().ele0010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEAttributeDecl().ele0010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -4317,13 +4299,11 @@ protected class EAttributeDecl_0_1_1_Assignment_defaultValueLiteral extends Assi protected Solution createSolution() { if((value = current.getConsumable("defaultValueLiteral",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("defaultValueLiteral"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEAttributeDecl().ele0110ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEAttributeDecl().ele0110TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -5197,13 +5177,11 @@ protected class EReferenceDecl_0_0_0_1_0_0_1_Assignment_lowerBound extends Assig protected Solution createSolution() { if((value = current.getConsumable("lowerBound",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("lowerBound"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEReferenceDecl().ele00010010ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEReferenceDecl().ele00010010TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -5382,13 +5360,11 @@ protected class EReferenceDecl_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEReferenceDecl().ele010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEReferenceDecl().ele010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -5629,13 +5605,11 @@ protected class EEnumDecl_0_0_0_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEEnumDecl().ele00010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEEnumDecl().ele00010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -5880,13 +5854,11 @@ protected class EEnumLiteralDecl_0_0_0_1_Assignment_name extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEEnumLiteralDecl().ele00010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEEnumLiteralDecl().ele00010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -5950,13 +5922,11 @@ protected class EEnumLiteralDecl_0_0_1_1_Assignment_value extends AssignmentToke protected Solution createSolution() { if((value = current.getConsumable("value",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("value"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEEnumLiteralDecl().ele00110ParserRuleCallINT(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEEnumLiteralDecl().ele00110TerminalRuleCallINT(); return new Solution(obj); } - return null; } } @@ -5979,13 +5949,11 @@ protected class EEnumLiteralDecl_0_1_Assignment_literal extends AssignmentToken protected Solution createSolution() { if((value = current.getConsumable("literal",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("literal"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEEnumLiteralDecl().ele010ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEEnumLiteralDecl().ele010TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -6060,13 +6028,11 @@ protected class ETypeParameterDecl_0_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prETypeParameterDecl().ele00ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prETypeParameterDecl().ele00TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -7692,13 +7658,11 @@ protected class EOperationDecl_0_0_0_0_0_0_1_Assignment_name extends AssignmentT protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEOperationDecl().ele00000010ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEOperationDecl().ele00000010TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -8448,13 +8412,11 @@ protected class EParameterDecl_1_Assignment_name extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("name",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("name"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prEParameterDecl().ele10ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prEParameterDecl().ele10TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -8576,13 +8538,11 @@ protected class MapEntry_0_0_Assignment_detailKey extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("detailKey",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("detailKey"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prMapEntry().ele000ParserRuleCallID(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prMapEntry().ele000TerminalRuleCallID(); return new Solution(obj); } - return null; } } @@ -8616,13 +8576,11 @@ protected class MapEntry_1_Assignment_detailValue extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("detailValue",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("detailValue"); - - if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule - type = AssignmentType.PRC; - element = grammarAccess.prMapEntry().ele10ParserRuleCallSTRING(); + if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule + type = AssignmentType.LRC; + element = grammarAccess.prMapEntry().ele10TerminalRuleCallSTRING(); return new Solution(obj); } - return null; } } @@ -8727,11 +8685,4 @@ protected class MultiplicityExpr_1_Keyword extends KeywordToken { - - - - - - - } 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 b945ef2..5775112 100644 --- a/examples/org.eclipse.xtext.example.ecoredsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalEcoreDsl.g +++ b/ |