| author | szarnekow | 2009-01-19 09:39:16 (EST) |
|---|---|---|
| committer | sefftinge | 2009-01-19 09:39:16 (EST) |
| commit | f860f41a88b3c44628f766edca076ea09e64a9b3 (patch) (side-by-side diff) | |
| tree | fd7edf5c15869a39f0aea89d7718f18909e1acc0 | |
| parent | f8124185c303d421be49a821f073e2631ac72a1f (diff) | |
| download | org.eclipse.xtext-f860f41a88b3c44628f766edca076ea09e64a9b3.zip org.eclipse.xtext-f860f41a88b3c44628f766edca076ea09e64a9b3.tar.gz org.eclipse.xtext-f860f41a88b3c44628f766edca076ea09e64a9b3.tar.bz2 | |
PackratParserGen - support for terminal rules and hidden tokens per rule
* todo: port hidden tokens per rule to antlr
* todo: identify valid follow-elements for keywords
415 files changed, 44194 insertions, 8360 deletions
diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java index c12ef8f..67514eb 100644 --- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java +++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/GenReferenceGrammarUiConfig.java @@ -15,7 +15,6 @@ public class GenReferenceGrammarUiConfig extends AbstractServiceRegistrationFact public Set<IServiceRegistration> registrations() { return scope(org.eclipse.xtext.reference.IReferenceGrammar.SCOPE) .with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.reference.ReferenceGrammarGenProposalProvider.class) - .with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class) .with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class) .registrations(); } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore index c70d0ae..e234417 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.ecore @@ -16,12 +16,12 @@ </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Person"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eStructuralFeatures> <eStructuralFeatures xsi:type="ecore:EAttribute" name="age"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Kind" eSuperTypes="//Person"/> <eClassifiers xsi:type="ecore:EClass" name="Erwachsener" eSuperTypes="//Person"/> 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 42e7e2d..9a73b5f 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 @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleSpielplatz entryRuleSpielplatz returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -243,6 +244,8 @@ ruleSpielplatz returns [EObject current=null] + + // Entry rule entryRuleKind entryRuleKind returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); } @@ -313,6 +316,8 @@ ruleKind returns [EObject current=null] + + // Entry rule entryRuleErwachsener entryRuleErwachsener returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); } @@ -383,6 +388,8 @@ ruleErwachsener returns [EObject current=null] + + // Entry rule entryRuleSpielzeug entryRuleSpielzeug returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); } @@ -454,6 +461,8 @@ ruleSpielzeug returns [EObject current=null] + + // Entry rule entryRuleFamilie entryRuleFamilie returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); } @@ -578,6 +587,8 @@ ruleFamilie returns [EObject current=null] + + // Entry rule entryRuleFarbe entryRuleFarbe returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); } @@ -631,6 +642,8 @@ ruleFarbe returns [EObject current=null] + + // Entry rule entryRuleCustomTypeParserRule entryRuleCustomTypeParserRule returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); } @@ -673,6 +686,24 @@ ruleCustomTypeParserRule returns [EObject current=null] + + + + + + + + + + + + + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; 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 5cb7604..2cac853 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 @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g 2009-01-14 16:50:27 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g 2009-01-19 15:14:31 package org.eclipse.xtext.reference.parser.antlr.internal; @@ -347,10 +347,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:707:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:707:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:707:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -359,7 +359,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:12: '^' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:707:12: '^' { match('^'); @@ -378,7 +378,7 @@ public class InternalReferenceGrammarLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:676:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:707:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -426,10 +426,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:678:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:678:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:709:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:709:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:678:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:709:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -443,7 +443,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:678:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:709:13: '0' .. '9' { matchRange('0','9'); @@ -473,7 +473,7 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -485,16 +485,16 @@ public class InternalReferenceGrammarLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("680:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("711:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -510,7 +510,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:21: '\\\\' ( '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' ) { @@ -527,7 +527,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -553,10 +553,10 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -572,7 +572,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:108: '\\\\' ( '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' ) { @@ -589,7 +589,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:680:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:711:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -627,12 +627,12 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:682:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:682:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:682:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -657,7 +657,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:682:52: . + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:713:52: . { matchAny(); @@ -686,12 +686,12 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -704,7 +704,7 @@ public class InternalReferenceGrammarLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715: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(); @@ -725,7 +725,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -734,9 +734,9 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -745,7 +745,7 @@ public class InternalReferenceGrammarLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:684:39: '\\r' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:715:39: '\\r' { match('\r'); @@ -776,10 +776,10 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:686:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:686:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:686:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:717:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -833,8 +833,8 @@ public class InternalReferenceGrammarLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:688:16: ( . ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:688:18: . + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719:16: ( . ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:719: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 b25984c..4aaba11 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 @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g 2009-01-14 16:50:26 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g 2009-01-19 15:14:30 package org.eclipse.xtext.reference.parser.antlr.internal; @@ -64,7 +64,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleSpielplatz - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:66:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:67:1: entryRuleSpielplatz returns [EObject current=null] : iv_ruleSpielplatz= ruleSpielplatz EOF ; public final EObject entryRuleSpielplatz() throws RecognitionException { EObject current = null; @@ -72,16 +72,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:66:52: (iv_ruleSpielplatz= ruleSpielplatz EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:67:2: iv_ruleSpielplatz= ruleSpielplatz EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:67:52: (iv_ruleSpielplatz= ruleSpielplatz EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:68:2: iv_ruleSpielplatz= ruleSpielplatz EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz71); + pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz72); iv_ruleSpielplatz=ruleSpielplatz(); _fsp--; current =iv_ruleSpielplatz; - match(input,EOF,FOLLOW_EOF_in_entryRuleSpielplatz81); + match(input,EOF,FOLLOW_EOF_in_entryRuleSpielplatz82); } @@ -99,7 +99,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleSpielplatz - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:74:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:75:1: ruleSpielplatz returns [EObject current=null] : ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ; public final EObject ruleSpielplatz() throws RecognitionException { EObject current = null; @@ -118,10 +118,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:76:33: ( ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:33: ( ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:1: ( ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' )? int alt6=2; int LA6_0 = input.LA(1); @@ -130,29 +130,29 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) '}' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:2: ( ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:3: ( ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) '{' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:4: ( ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) (lv_beschreibung= RULE_STRING )? { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:77:6: 'spielplatz' (lv_groesse= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:5: ( 'spielplatz' (lv_groesse= RULE_INT ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:78:6: 'spielplatz' (lv_groesse= RULE_INT ) { - match(input,11,FOLLOW_11_in_ruleSpielplatz119); + match(input,11,FOLLOW_11_in_ruleSpielplatz120); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:81:1: (lv_groesse= RULE_INT ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:83:6: lv_groesse= RULE_INT + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:82:1: (lv_groesse= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:84:6: lv_groesse= RULE_INT { lv_groesse=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz140); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz141); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "groesse"); @@ -174,7 +174,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:101:3: (lv_beschreibung= RULE_STRING )? + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:102:3: (lv_beschreibung= RULE_STRING )? int alt1=2; int LA1_0 = input.LA(1); @@ -183,10 +183,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:103:6: lv_beschreibung= RULE_STRING + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:104:6: lv_beschreibung= RULE_STRING { lv_beschreibung=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz173); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz174); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "beschreibung"); @@ -211,14 +211,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,12,FOLLOW_12_in_ruleSpielplatz195); + match(input,12,FOLLOW_12_in_ruleSpielplatz196); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:2: ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:2: ( ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) | (lv_types= ruleCustomTypeParserRule ) )* loop5: do { int alt5=3; @@ -234,9 +234,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) ) int alt4=2; int LA4_0 = input.LA(1); @@ -248,15 +248,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("125:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )", 4, 0, input); + new NoViableAltException("126:3: ( ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) | (lv_familie= ruleFamilie ) )", 4, 0, input); throw nvae; } switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) ) int alt3=2; int LA3_0 = input.LA(1); @@ -268,15 +268,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("125:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )", 3, 0, input); + new NoViableAltException("126:4: ( ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) | (lv_spielzeuge= ruleSpielzeug ) )", 3, 0, input); throw nvae; } switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) ) int alt2=2; int LA2_0 = input.LA(1); @@ -288,21 +288,21 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("125:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )", 2, 0, input); + new NoViableAltException("126:5: ( (lv_kinder= ruleKind ) | (lv_erzieher= ruleErwachsener ) )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:6: (lv_kinder= ruleKind ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:6: (lv_kinder= ruleKind ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:125:6: (lv_kinder= ruleKind ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:128:6: lv_kinder= ruleKind + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:126:6: (lv_kinder= ruleKind ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:129:6: lv_kinder= ruleKind { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@groups.0/@groups.0/@groups.0/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz234); + pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz235); lv_kinder=ruleKind(); _fsp--; @@ -326,15 +326,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:147:6: (lv_erzieher= ruleErwachsener ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:148:6: (lv_erzieher= ruleErwachsener ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:147:6: (lv_erzieher= ruleErwachsener ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:150:6: lv_erzieher= ruleErwachsener + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:148:6: (lv_erzieher= ruleErwachsener ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:151:6: lv_erzieher= ruleErwachsener { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@groups.0/@groups.0/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz278); + pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz279); lv_erzieher=ruleErwachsener(); _fsp--; @@ -364,15 +364,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:169:6: (lv_spielzeuge= ruleSpielzeug ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:170:6: (lv_spielzeuge= ruleSpielzeug ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:169:6: (lv_spielzeuge= ruleSpielzeug ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:172:6: lv_spielzeuge= ruleSpielzeug + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:170:6: (lv_spielzeuge= ruleSpielzeug ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:173:6: lv_spielzeuge= ruleSpielzeug { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@groups.0/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz323); + pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz324); lv_spielzeuge=ruleSpielzeug(); _fsp--; @@ -402,15 +402,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:191:6: (lv_familie= ruleFamilie ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:192:6: (lv_familie= ruleFamilie ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:191:6: (lv_familie= ruleFamilie ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:194:6: lv_familie= ruleFamilie + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:192:6: (lv_familie= ruleFamilie ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:195:6: lv_familie= ruleFamilie { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz368); + pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz369); lv_familie=ruleFamilie(); _fsp--; @@ -440,15 +440,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:213:6: (lv_types= ruleCustomTypeParserRule ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:214:6: (lv_types= ruleCustomTypeParserRule ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:213:6: (lv_types= ruleCustomTypeParserRule ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:216:6: lv_types= ruleCustomTypeParserRule + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:214:6: (lv_types= ruleCustomTypeParserRule ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:217:6: lv_types= ruleCustomTypeParserRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz413); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz414); lv_types=ruleCustomTypeParserRule(); _fsp--; @@ -480,7 +480,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,13,FOLLOW_13_in_ruleSpielplatz429); + match(input,13,FOLLOW_13_in_ruleSpielplatz430); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.0/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -508,7 +508,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleKind - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:247:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:250:1: entryRuleKind returns [EObject current=null] : iv_ruleKind= ruleKind EOF ; public final EObject entryRuleKind() throws RecognitionException { EObject current = null; @@ -516,16 +516,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:247:46: (iv_ruleKind= ruleKind EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:248:2: iv_ruleKind= ruleKind EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:250:46: (iv_ruleKind= ruleKind EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:251:2: iv_ruleKind= ruleKind EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleKind_in_entryRuleKind465); + pushFollow(FOLLOW_ruleKind_in_entryRuleKind468); iv_ruleKind=ruleKind(); _fsp--; current =iv_ruleKind; - match(input,EOF,FOLLOW_EOF_in_entryRuleKind475); + match(input,EOF,FOLLOW_EOF_in_entryRuleKind478); } @@ -543,7 +543,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleKind - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:255:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:1: ruleKind returns [EObject current=null] : ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; public final EObject ruleKind() throws RecognitionException { EObject current = null; @@ -552,37 +552,37 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:257:33: ( ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:260:33: ( ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:1: ( ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:2: ( ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:4: ( 'kind' '(' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:3: ( ( 'kind' '(' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:4: ( 'kind' '(' ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:4: ( 'kind' '(' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:258:5: 'kind' '(' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:4: ( 'kind' '(' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:261:5: 'kind' '(' { - match(input,14,FOLLOW_14_in_ruleKind512); + match(input,14,FOLLOW_14_in_ruleKind515); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,15,FOLLOW_15_in_ruleKind521); + match(input,15,FOLLOW_15_in_ruleKind524); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:266:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:268:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:269:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:271:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind543); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind546); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -604,11 +604,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:286:3: (lv_age= RULE_INT ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:288:6: lv_age= RULE_INT + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:289:3: (lv_age= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:291:6: lv_age= RULE_INT { lv_age=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind576); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind579); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "age"); @@ -630,7 +630,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleKind597); + match(input,16,FOLLOW_16_in_ruleKind600); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.2/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -655,7 +655,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleErwachsener - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:317:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:322:1: entryRuleErwachsener returns [EObject current=null] : iv_ruleErwachsener= ruleErwachsener EOF ; public final EObject entryRuleErwachsener() throws RecognitionException { EObject current = null; @@ -663,16 +663,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:317:53: (iv_ruleErwachsener= ruleErwachsener EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:318:2: iv_ruleErwachsener= ruleErwachsener EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:322:53: (iv_ruleErwachsener= ruleErwachsener EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:323:2: iv_ruleErwachsener= ruleErwachsener EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener630); + pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener635); iv_ruleErwachsener=ruleErwachsener(); _fsp--; current =iv_ruleErwachsener; - match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener640); + match(input,EOF,FOLLOW_EOF_in_entryRuleErwachsener645); } @@ -690,7 +690,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleErwachsener - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:325:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:330:1: ruleErwachsener returns [EObject current=null] : ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ; public final EObject ruleErwachsener() throws RecognitionException { EObject current = null; @@ -699,37 +699,37 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:33: ( ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:332:33: ( ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:1: ( ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) ')' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:2: ( ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) (lv_age= RULE_INT ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:4: ( 'erwachsener' '(' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:3: ( ( 'erwachsener' '(' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:4: ( 'erwachsener' '(' ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:4: ( 'erwachsener' '(' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:328:5: 'erwachsener' '(' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:4: ( 'erwachsener' '(' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:333:5: 'erwachsener' '(' { - match(input,17,FOLLOW_17_in_ruleErwachsener677); + match(input,17,FOLLOW_17_in_ruleErwachsener682); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,15,FOLLOW_15_in_ruleErwachsener686); + match(input,15,FOLLOW_15_in_ruleErwachsener691); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:336:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:338:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:341:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:343:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener708); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener713); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -751,11 +751,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:356:3: (lv_age= RULE_INT ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:358:6: lv_age= RULE_INT + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:361:3: (lv_age= RULE_INT ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:363:6: lv_age= RULE_INT { lv_age=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener741); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener746); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "age"); @@ -777,7 +777,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleErwachsener762); + match(input,16,FOLLOW_16_in_ruleErwachsener767); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -802,7 +802,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleSpielzeug - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:387:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:394:1: entryRuleSpielzeug returns [EObject current=null] : iv_ruleSpielzeug= ruleSpielzeug EOF ; public final EObject entryRuleSpielzeug() throws RecognitionException { EObject current = null; @@ -810,16 +810,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:387:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:388:2: iv_ruleSpielzeug= ruleSpielzeug EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:394:51: (iv_ruleSpielzeug= ruleSpielzeug EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:395:2: iv_ruleSpielzeug= ruleSpielzeug EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug795); + pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug802); iv_ruleSpielzeug=ruleSpielzeug(); _fsp--; current =iv_ruleSpielzeug; - match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug805); + match(input,EOF,FOLLOW_EOF_in_entryRuleSpielzeug812); } @@ -837,7 +837,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleSpielzeug - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:395:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:402:1: ruleSpielzeug returns [EObject current=null] : ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ; public final EObject ruleSpielzeug() throws RecognitionException { EObject current = null; @@ -847,37 +847,37 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:397:33: ( ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:404:33: ( ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:1: ( ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) ')' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:2: ( ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) (lv_farbe= ruleFarbe ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:4: ( 'spielzeug' '(' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:3: ( ( 'spielzeug' '(' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:4: ( 'spielzeug' '(' ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:4: ( 'spielzeug' '(' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:398:5: 'spielzeug' '(' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:4: ( 'spielzeug' '(' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:405:5: 'spielzeug' '(' { - match(input,18,FOLLOW_18_in_ruleSpielzeug842); + match(input,18,FOLLOW_18_in_ruleSpielzeug849); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,15,FOLLOW_15_in_ruleSpielzeug851); + match(input,15,FOLLOW_15_in_ruleSpielzeug858); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:406:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:408:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:413:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:415:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug873); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug880); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -899,13 +899,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:426:3: (lv_farbe= ruleFarbe ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:429:6: lv_farbe= ruleFarbe + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:433:3: (lv_farbe= ruleFarbe ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:436:6: lv_farbe= ruleFarbe { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug919); + pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug926); lv_farbe=ruleFarbe(); _fsp--; @@ -928,7 +928,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleSpielzeug933); + match(input,16,FOLLOW_16_in_ruleSpielzeug940); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.4/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -953,7 +953,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleFamilie - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:458:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:467:1: entryRuleFamilie returns [EObject current=null] : iv_ruleFamilie= ruleFamilie EOF ; public final EObject entryRuleFamilie() throws RecognitionException { EObject current = null; @@ -961,16 +961,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:458:49: (iv_ruleFamilie= ruleFamilie EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:459:2: iv_ruleFamilie= ruleFamilie EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:467:49: (iv_ruleFamilie= ruleFamilie EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:468:2: iv_ruleFamilie= ruleFamilie EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie966); + pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie975); iv_ruleFamilie=ruleFamilie(); _fsp--; current =iv_ruleFamilie; - match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie976); + match(input,EOF,FOLLOW_EOF_in_entryRuleFamilie985); } @@ -988,7 +988,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFamilie - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:466:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:475:1: ruleFamilie returns [EObject current=null] : ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ; public final EObject ruleFamilie() throws RecognitionException { EObject current = null; @@ -996,45 +996,45 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:468:33: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:477:33: ( ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:1: ( ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) ')' { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:2: ( ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ',' ( ( RULE_ID ) ) )* { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:3: ( ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:4: ( ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:5: ( ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:7: ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:6: ( ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:7: ( 'familie' '(' ) (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:7: ( 'familie' '(' ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:469:8: 'familie' '(' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:7: ( 'familie' '(' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:478:8: 'familie' '(' { - match(input,19,FOLLOW_19_in_ruleFamilie1016); + match(input,19,FOLLOW_19_in_ruleFamilie1025); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,15,FOLLOW_15_in_ruleFamilie1025); + match(input,15,FOLLOW_15_in_ruleFamilie1034); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:477:2: (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:6: lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:486:2: (lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:6: lv_name= ( ( 'keyword' | RULE_STRING ) | RULE_ID ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID ) int alt8=2; int LA8_0 = input.LA(1); @@ -1046,15 +1046,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("479:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input); + new NoViableAltException("488:14: ( ( 'keyword' | RULE_STRING ) | RULE_ID )", 8, 0, input); throw nvae; } switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:15: ( 'keyword' | RULE_STRING ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:15: ( 'keyword' | RULE_STRING ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:15: ( 'keyword' | RULE_STRING ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:15: ( 'keyword' | RULE_STRING ) int alt7=2; int LA7_0 = input.LA(1); @@ -1066,15 +1066,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("479:15: ( 'keyword' | RULE_STRING )", 7, 0, input); + new NoViableAltException("488:15: ( 'keyword' | RULE_STRING )", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:479:16: 'keyword' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:488:16: 'keyword' { - match(input,20,FOLLOW_20_in_ruleFamilie1049); + match(input,20,FOLLOW_20_in_ruleFamilie1058); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.0/@groups.0" /* xtext::Keyword */, "name"); @@ -1082,9 +1082,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:484:6: RULE_STRING + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:493:6: RULE_STRING { - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1064); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1073); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.0/@groups.1" /* xtext::RuleCall */, "name"); @@ -1098,9 +1098,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:489:6: RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:498:6: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1079); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1088); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal/@groups.1" /* xtext::RuleCall */, "name"); @@ -1128,8 +1128,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:507:3: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:510:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:516:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:519:3: ( RULE_ID ) { if (current==null) { @@ -1137,10 +1137,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:516:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:517:2: RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:525:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:526:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1116); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1125); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "mutter"); @@ -1153,8 +1153,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:522:3: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:525:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:531:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:534:3: ( RULE_ID ) { if (current==null) { @@ -1162,10 +1162,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:531:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:532:2: RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:540:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:541:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1145); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1154); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "vater"); @@ -1178,8 +1178,8 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:537:3: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:540:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:546:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:549:3: ( RULE_ID ) { if (current==null) { @@ -1187,10 +1187,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:546:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:547:2: RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:555:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:556:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1174); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1183); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "kinder"); @@ -1203,7 +1203,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:552:3: ( ',' ( ( RULE_ID ) ) )* + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:561:3: ( ',' ( ( RULE_ID ) ) )* loop9: do { int alt9=2; @@ -1216,14 +1216,14 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:552:4: ',' ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:561:4: ',' ( ( RULE_ID ) ) { - match(input,21,FOLLOW_21_in_ruleFamilie1189); + match(input,21,FOLLOW_21_in_ruleFamilie1198); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:556:1: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:559:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:565:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:568:3: ( RULE_ID ) { if (current==null) { @@ -1231,10 +1231,10 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:565:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:566:2: RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:574:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:575:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1213); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1222); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "kinder"); @@ -1256,7 +1256,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } - match(input,16,FOLLOW_16_in_ruleFamilie1229); + match(input,16,FOLLOW_16_in_ruleFamilie1238); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.5/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -1281,7 +1281,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleFarbe - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:582:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:593:1: entryRuleFarbe returns [EObject current=null] : iv_ruleFarbe= ruleFarbe EOF ; public final EObject entryRuleFarbe() throws RecognitionException { EObject current = null; @@ -1289,16 +1289,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:582:47: (iv_ruleFarbe= ruleFarbe EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:583:2: iv_ruleFarbe= ruleFarbe EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:593:47: (iv_ruleFarbe= ruleFarbe EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:594:2: iv_ruleFarbe= ruleFarbe EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1262); + pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1273); iv_ruleFarbe=ruleFarbe(); _fsp--; current =iv_ruleFarbe; - match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1272); + match(input,EOF,FOLLOW_EOF_in_entryRuleFarbe1283); } @@ -1316,7 +1316,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleFarbe - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:590:1: ruleFarbe returns [EObject current=null] : (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:601:1: ruleFarbe returns [EObject current=null] : (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) ; public final EObject ruleFarbe() throws RecognitionException { EObject current = null; @@ -1324,13 +1324,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:592:33: ( (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:593:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:603:33: ( (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:604:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:593:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:6: lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:604:1: (lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:6: lv_wert= ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' ) int alt12=2; int LA12_0 = input.LA(1); @@ -1342,15 +1342,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("595:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' )", 12, 0, input); + new NoViableAltException("606:14: ( ( ( 'ROT' | 'BLAU' ) | 'GELB' ) | 'GRÜN' )", 12, 0, input); throw nvae; } switch (alt12) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' ) int alt11=2; int LA11_0 = input.LA(1); @@ -1362,15 +1362,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("595:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input); + new NoViableAltException("606:15: ( ( 'ROT' | 'BLAU' ) | 'GELB' )", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:16: ( 'ROT' | 'BLAU' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:16: ( 'ROT' | 'BLAU' ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:16: ( 'ROT' | 'BLAU' ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:16: ( 'ROT' | 'BLAU' ) int alt10=2; int LA10_0 = input.LA(1); @@ -1382,15 +1382,15 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("595:16: ( 'ROT' | 'BLAU' )", 10, 0, input); + new NoViableAltException("606:16: ( 'ROT' | 'BLAU' )", 10, 0, input); throw nvae; } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:595:17: 'ROT' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:17: 'ROT' { - match(input,22,FOLLOW_22_in_ruleFarbe1320); + match(input,22,FOLLOW_22_in_ruleFarbe1331); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6/@alternatives/@terminal/@groups.0/@groups.0/@groups.0" /* xtext::Keyword */, "wert"); @@ -1398,9 +1398,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:600:6: 'BLAU' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:611:6: 'BLAU' { - match(input,23,FOLLOW_23_in_ruleFarbe1335); + match(input,23,FOLLOW_23_in_ruleFarbe1346); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6/@alternatives/@terminal/@groups.0/@groups.0/@groups.1" /* xtext::Keyword */, "wert"); @@ -1414,9 +1414,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:605:6: 'GELB' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:616:6: 'GELB' { - match(input,24,FOLLOW_24_in_ruleFarbe1351); + match(input,24,FOLLOW_24_in_ruleFarbe1362); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6/@alternatives/@terminal/@groups.0/@groups.1" /* xtext::Keyword */, "wert"); @@ -1430,9 +1430,9 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser } break; case 2 : - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:610:6: 'GRÜN' + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:621:6: 'GRÜN' { - match(input,25,FOLLOW_25_in_ruleFarbe1367); + match(input,25,FOLLOW_25_in_ruleFarbe1378); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.6/@alternatives/@terminal/@groups.1" /* xtext::Keyword */, "wert"); @@ -1475,7 +1475,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleCustomTypeParserRule - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:635:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:648:1: entryRuleCustomTypeParserRule returns [EObject current=null] : iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ; public final EObject entryRuleCustomTypeParserRule() throws RecognitionException { EObject current = null; @@ -1483,16 +1483,16 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:635:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:636:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:648:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:649:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1412); + pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1425); iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule(); _fsp--; current =iv_ruleCustomTypeParserRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1422); + match(input,EOF,FOLLOW_EOF_in_entryRuleCustomTypeParserRule1435); } @@ -1510,7 +1510,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser // $ANTLR start ruleCustomTypeParserRule - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:643:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name= RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:656:1: ruleCustomTypeParserRule returns [EObject current=null] : ( 'type' (lv_name= RULE_ID ) ) ; public final EObject ruleCustomTypeParserRule() throws RecognitionException { EObject current = null; @@ -1518,21 +1518,21 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:645:33: ( ( 'type' (lv_name= RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:646:1: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:658:33: ( ( 'type' (lv_name= RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:659:1: ( 'type' (lv_name= RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:646:1: ( 'type' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:646:2: 'type' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:659:1: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:659:2: 'type' (lv_name= RULE_ID ) { - match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1456); + match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1469); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.7/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:650:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:652:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:663:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:665:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1477); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1490); createLeafNode("classpath:/org/eclipse/xtext/reference/ReferenceGrammar.xmi#//@rules.7/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -1573,61 +1573,61 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser - 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_ruleSpielplatz140 = new BitSet(new long[]{0x0000000000001020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz173 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleSpielplatz195 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz234 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz278 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz323 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz368 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz413 = new BitSet(new long[]{0x00000000040E6000L}); - public static final BitSet FOLLOW_13_in_ruleSpielplatz429 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleKind_in_entryRuleKind465 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleKind475 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_ruleKind512 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleKind521 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleKind543 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleKind576 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleKind597 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener630 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener640 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleErwachsener677 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleErwachsener686 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener708 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener741 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleErwachsener762 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug795 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug805 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_18_in_ruleSpielzeug842 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleSpielzeug851 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug873 = new BitSet(new long[]{0x0000000003C00000L}); - public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug919 = new BitSet(new long[]{0x0000000000010000L}); - public static final BitSet FOLLOW_16_in_ruleSpielzeug933 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie966 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFamilie976 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_19_in_ruleFamilie1016 = new BitSet(new long[]{0x0000000000008000L}); - public static final BitSet FOLLOW_15_in_ruleFamilie1025 = new BitSet(new long[]{0x0000000000100060L}); - public static final BitSet FOLLOW_20_in_ruleFamilie1049 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1064 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1079 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1116 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1145 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1174 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_21_in_ruleFamilie1189 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1213 = new BitSet(new long[]{0x0000000000210000L}); - public static final BitSet FOLLOW_16_in_ruleFamilie1229 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1262 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1272 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_22_in_ruleFarbe1320 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_ruleFarbe1335 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_24_in_ruleFarbe1351 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_25_in_ruleFarbe1367 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1412 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1422 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1456 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1477 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleSpielplatz82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleSpielplatz120 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleSpielplatz141 = new BitSet(new long[]{0x0000000000001020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleSpielplatz174 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_12_in_ruleSpielplatz196 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleKind_in_ruleSpielplatz235 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleErwachsener_in_ruleSpielplatz279 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_ruleSpielplatz324 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleFamilie_in_ruleSpielplatz369 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz414 = new BitSet(new long[]{0x00000000040E6000L}); + public static final BitSet FOLLOW_13_in_ruleSpielplatz430 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleKind_in_entryRuleKind468 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleKind478 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleKind515 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleKind524 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleKind546 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleKind579 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleKind600 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleErwachsener_in_entryRuleErwachsener635 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleErwachsener645 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleErwachsener682 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleErwachsener691 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleErwachsener713 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleErwachsener746 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleErwachsener767 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug802 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleSpielzeug812 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleSpielzeug849 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleSpielzeug858 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleSpielzeug880 = new BitSet(new long[]{0x0000000003C00000L}); + public static final BitSet FOLLOW_ruleFarbe_in_ruleSpielzeug926 = new BitSet(new long[]{0x0000000000010000L}); + public static final BitSet FOLLOW_16_in_ruleSpielzeug940 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFamilie_in_entryRuleFamilie975 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFamilie985 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleFamilie1025 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleFamilie1034 = new BitSet(new long[]{0x0000000000100060L}); + public static final BitSet FOLLOW_20_in_ruleFamilie1058 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleFamilie1073 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1088 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1125 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1154 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1183 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_21_in_ruleFamilie1198 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFamilie1222 = new BitSet(new long[]{0x0000000000210000L}); + public static final BitSet FOLLOW_16_in_ruleFamilie1238 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFarbe_in_entryRuleFarbe1273 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFarbe1283 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_22_in_ruleFarbe1331 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_23_in_ruleFarbe1346 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_24_in_ruleFarbe1362 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_25_in_ruleFarbe1378 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1425 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleCustomTypeParserRule1435 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_26_in_ruleCustomTypeParserRule1469 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1490 = new BitSet(new long[]{0x0000000000000002L}); }
\ 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 67d6b42..7ea3ca5 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,25 +24,25 @@ T24 : 'GELB' ; T25 : 'GRÜN' ; T26 : 'type' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 676 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 707 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 678 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 709 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 680 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 711 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 682 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 713 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 684 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 715 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 686 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 717 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 688 +// $ANTLR src "./src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 719 RULE_ANY_OTHER : .; diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java index f485da9..bcbb5a8 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarDelimiters.java @@ -14,14 +14,13 @@ public final class ReferenceGrammarDelimiters { throw new UnsupportedOperationException("Utility classes may not be initialized"); } - public static ICharacterClass keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); - - // TODO do not use IDConsumer internals - public static ICharacterClass keyword$9$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - public static ISequenceMatcher ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - + + public static ICharacterClass keyword$9$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; + + public static ICharacterClass keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); + public static ISequenceMatcher ruleCall$44$Delimiter = new SetBasedKeywordMatcher( "spielplatz", "kind", "erwachsener", "spielzeug", "familie", "keyword", "ROT", "BLAU", "GELB", "GRÜN", "type"); - + } 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 647fd75..56a1f13 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 @@ -57,8 +57,7 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); spielplatzConsumer = new ReferenceGrammarSpielplatzConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); personConsumer = new ReferenceGrammarPersonConsumer( getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null @@ -88,13 +87,13 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura } public void configureConsumers() { + getSpielplatzConsumer().setCustomTypeParserRuleConsumer(getCustomTypeParserRuleConsumer()); getSpielplatzConsumer().setErwachsenerConsumer(getErwachsenerConsumer()); - getSpielplatzConsumer().setSpielzeugConsumer(getSpielzeugConsumer()); - getSpielplatzConsumer().setIntConsumer(getIntConsumer()); - getSpielplatzConsumer().setStringConsumer(getStringConsumer()); getSpielplatzConsumer().setFamilieConsumer(getFamilieConsumer()); + getSpielplatzConsumer().setIntConsumer(getIntConsumer()); getSpielplatzConsumer().setKindConsumer(getKindConsumer()); - getSpielplatzConsumer().setCustomTypeParserRuleConsumer(getCustomTypeParserRuleConsumer()); + getSpielplatzConsumer().setStringConsumer(getStringConsumer()); + getSpielplatzConsumer().setSpielzeugConsumer(getSpielzeugConsumer()); getPersonConsumer().setErwachsenerConsumer(getErwachsenerConsumer()); getPersonConsumer().setKindConsumer(getKindConsumer()); @@ -105,64 +104,50 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura getErwachsenerConsumer().setIdConsumer(getIdConsumer()); getErwachsenerConsumer().setIntConsumer(getIntConsumer()); - getSpielzeugConsumer().setIdConsumer(getIdConsumer()); getSpielzeugConsumer().setFarbeConsumer(getFarbeConsumer()); + getSpielzeugConsumer().setIdConsumer(getIdConsumer()); getFamilieConsumer().setIdConsumer(getIdConsumer()); getFamilieConsumer().setStringConsumer(getStringConsumer()); getCustomTypeParserRuleConsumer().setIdConsumer(getIdConsumer()); - getSpielplatzConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getSpielplatzConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); getSpielplatzConsumer().setRuleCall$10$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); - getSpielplatzConsumer().setKeyword$26$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getSpielplatzConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - getSpielplatzConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); - getKindConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); - getKindConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - getKindConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getSpielplatzConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getSpielplatzConsumer().setKeyword$26$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getKindConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getKindConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getKindConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); getKindConsumer().setRuleCall$10$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); - getErwachsenerConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - getErwachsenerConsumer().setRuleCall$10$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); + getKindConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); + getErwachsenerConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getErwachsenerConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getErwachsenerConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); - getErwachsenerConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); - getSpielzeugConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - getSpielzeugConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getErwachsenerConsumer().setRuleCall$10$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); + getErwachsenerConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getSpielzeugConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getSpielzeugConsumer().setKeyword$11$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); - getFamilieConsumer().setCrossReference$28$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getSpielzeugConsumer().setRuleCall$8$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getSpielzeugConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getFamilieConsumer().setKeyword$9$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); - getFamilieConsumer().setCrossReference$23$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); - getFamilieConsumer().setRuleCall$15$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); - getFamilieConsumer().setKeyword$26$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); - getFamilieConsumer().setCrossReference$20$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); getFamilieConsumer().setKeyword$30$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); + getFamilieConsumer().setKeyword$26$Delimiter(ReferenceGrammarDelimiters.keyword$14$Delimiter); getFamilieConsumer().setCrossReference$17$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getFamilieConsumer().setCrossReference$20$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getFamilieConsumer().setRuleCall$15$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getFamilieConsumer().setCrossReference$28$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); + getFamilieConsumer().setCrossReference$23$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); getFamilieConsumer().setRuleCall$14$Delimiter(ReferenceGrammarDelimiters.ruleCall$11$Delimiter); getFamilieConsumer().setKeyword$8$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getFamilieConsumer().setKeyword$13$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - getFarbeConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getFarbeConsumer().setKeyword$6$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getFarbeConsumer().setKeyword$7$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getFarbeConsumer().setKeyword$8$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); + getFarbeConsumer().setKeyword$5$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); getCustomTypeParserRuleConsumer().setRuleCall$4$Delimiter(ReferenceGrammarDelimiters.ruleCall$44$Delimiter); getCustomTypeParserRuleConsumer().setKeyword$2$Delimiter(ReferenceGrammarDelimiters.keyword$9$Delimiter); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); } // TODO collect superGrammars transitive 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 a21fd0e..cb1a2a7 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 @@ -27,25 +27,25 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum private XtextBuiltinIDConsumer idConsumer; private XtextBuiltinINTConsumer intConsumer; - private ICharacterClass keyword$5$Delimiter; - - private ISequenceMatcher ruleCall$10$Delimiter; + private ICharacterClass keyword$6$Delimiter; private ICharacterClass keyword$11$Delimiter; private ISequenceMatcher ruleCall$8$Delimiter; - private ICharacterClass keyword$6$Delimiter; + private ISequenceMatcher ruleCall$10$Delimiter; + + private ICharacterClass keyword$5$Delimiter; public ReferenceGrammarErwachsenerConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); - ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); + ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -122,20 +122,12 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum this.intConsumer = intConsumer; } - public ICharacterClass getKeyword$5$Delimiter() { - return keyword$5$Delimiter; - } - - public void setKeyword$5$Delimiter(ICharacterClass characterClass) { - keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - - public ISequenceMatcher getRuleCall$10$Delimiter() { - return ruleCall$10$Delimiter; + public ICharacterClass getKeyword$6$Delimiter() { + return keyword$6$Delimiter; } - public void setRuleCall$10$Delimiter(ISequenceMatcher matcher) { - ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setKeyword$6$Delimiter(ICharacterClass characterClass) { + keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ICharacterClass getKeyword$11$Delimiter() { @@ -154,12 +146,20 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } - public ICharacterClass getKeyword$6$Delimiter() { - return keyword$6$Delimiter; + public ISequenceMatcher getRuleCall$10$Delimiter() { + return ruleCall$10$Delimiter; } - public void setKeyword$6$Delimiter(ICharacterClass characterClass) { - keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setRuleCall$10$Delimiter(ISequenceMatcher matcher) { + ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ICharacterClass getKeyword$5$Delimiter() { + return keyword$5$Delimiter; + } + + public void setKeyword$5$Delimiter(ICharacterClass characterClass) { + keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } } 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 038b360..0870975 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 @@ -27,21 +27,21 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; private XtextBuiltinSTRINGConsumer stringConsumer; - private ISequenceMatcher crossReference$28$Delimiter; - private ICharacterClass keyword$9$Delimiter; - private ISequenceMatcher crossReference$23$Delimiter; - - private ISequenceMatcher ruleCall$15$Delimiter; + private ICharacterClass keyword$30$Delimiter; private ICharacterClass keyword$26$Delimiter; + private ISequenceMatcher crossReference$17$Delimiter; + private ISequenceMatcher crossReference$20$Delimiter; - private ICharacterClass keyword$30$Delimiter; + private ISequenceMatcher ruleCall$15$Delimiter; - private ISequenceMatcher crossReference$17$Delimiter; + private ISequenceMatcher crossReference$28$Delimiter; + + private ISequenceMatcher crossReference$23$Delimiter; private ISequenceMatcher ruleCall$14$Delimiter; @@ -53,14 +53,14 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - crossReference$28$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); - crossReference$23$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - ruleCall$15$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); - crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$30$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); crossReference$17$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + crossReference$20$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$15$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + crossReference$28$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + crossReference$23$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); keyword$13$Delimiter = ICharacterClass.Factory.nullClass(); @@ -196,14 +196,6 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { this.stringConsumer = stringConsumer; } - public ISequenceMatcher getCrossReference$28$Delimiter() { - return crossReference$28$Delimiter; - } - - public void setCrossReference$28$Delimiter(ISequenceMatcher matcher) { - crossReference$28$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ICharacterClass getKeyword$9$Delimiter() { return keyword$9$Delimiter; } @@ -212,20 +204,12 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { keyword$9$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ISequenceMatcher getCrossReference$23$Delimiter() { - return crossReference$23$Delimiter; - } - - public void setCrossReference$23$Delimiter(ISequenceMatcher matcher) { - crossReference$23$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ISequenceMatcher getRuleCall$15$Delimiter() { - return ruleCall$15$Delimiter; + public ICharacterClass getKeyword$30$Delimiter() { + return keyword$30$Delimiter; } - public void setRuleCall$15$Delimiter(ISequenceMatcher matcher) { - ruleCall$15$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setKeyword$30$Delimiter(ICharacterClass characterClass) { + keyword$30$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ICharacterClass getKeyword$26$Delimiter() { @@ -236,6 +220,14 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { keyword$26$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ISequenceMatcher getCrossReference$17$Delimiter() { + return crossReference$17$Delimiter; + } + + public void setCrossReference$17$Delimiter(ISequenceMatcher matcher) { + crossReference$17$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + public ISequenceMatcher getCrossReference$20$Delimiter() { return crossReference$20$Delimiter; } @@ -244,20 +236,28 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer { crossReference$20$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } - public ICharacterClass getKeyword$30$Delimiter() { - return keyword$30$Delimiter; + public ISequenceMatcher getRuleCall$15$Delimiter() { + return ruleCall$15$Delimiter; } - public void setKeyword$30$Delimiter(ICharacterClass characterClass) { - keyword$30$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setRuleCall$15$Delimiter(ISequenceMatcher matcher) { + ruleCall$15$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } - public ISequenceMatcher getCrossReference$17$Delimiter() { - return crossReference$17$Delimiter; + public ISequenceMatcher getCrossReference$28$Delimiter() { + return crossReference$28$Delimiter; } - public void setCrossReference$17$Delimiter(ISequenceMatcher matcher) { - crossReference$17$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setCrossReference$28$Delimiter(ISequenceMatcher matcher) { + crossReference$28$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ISequenceMatcher getCrossReference$23$Delimiter() { + return crossReference$23$Delimiter; + } + + public void setCrossReference$23$Delimiter(ISequenceMatcher matcher) { + crossReference$23$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } public ISequenceMatcher getRuleCall$14$Delimiter() { diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java index f1062fa..18fea0c 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java @@ -23,22 +23,22 @@ import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.FarbeE public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { - private ICharacterClass keyword$5$Delimiter; - private ICharacterClass keyword$6$Delimiter; private ICharacterClass keyword$7$Delimiter; private ICharacterClass keyword$8$Delimiter; + private ICharacterClass keyword$5$Delimiter; + public ReferenceGrammarFarbeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$8$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -70,14 +70,6 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { return "Farbe"; } - public ICharacterClass getKeyword$5$Delimiter() { - return keyword$5$Delimiter; - } - - public void setKeyword$5$Delimiter(ICharacterClass characterClass) { - keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ICharacterClass getKeyword$6$Delimiter() { return keyword$6$Delimiter; } @@ -102,4 +94,12 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer { keyword$8$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ICharacterClass getKeyword$5$Delimiter() { + return keyword$5$Delimiter; + } + + public void setKeyword$5$Delimiter(ICharacterClass characterClass) { + keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } 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 358a6d1..4442220 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 @@ -27,25 +27,25 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; private XtextBuiltinINTConsumer intConsumer; - private ISequenceMatcher ruleCall$8$Delimiter; - - private ICharacterClass keyword$5$Delimiter; + private ICharacterClass keyword$6$Delimiter; private ICharacterClass keyword$11$Delimiter; - private ICharacterClass keyword$6$Delimiter; + private ISequenceMatcher ruleCall$8$Delimiter; private ISequenceMatcher ruleCall$10$Delimiter; + private ICharacterClass keyword$5$Delimiter; + public ReferenceGrammarKindConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -122,20 +122,12 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { this.intConsumer = intConsumer; } - public ISequenceMatcher getRuleCall$8$Delimiter() { - return ruleCall$8$Delimiter; - } - - public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { - ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ICharacterClass getKeyword$5$Delimiter() { - return keyword$5$Delimiter; + public ICharacterClass getKeyword$6$Delimiter() { + return keyword$6$Delimiter; } - public void setKeyword$5$Delimiter(ICharacterClass characterClass) { - keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$6$Delimiter(ICharacterClass characterClass) { + keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ICharacterClass getKeyword$11$Delimiter() { @@ -146,12 +138,12 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$6$Delimiter() { - return keyword$6$Delimiter; + public ISequenceMatcher getRuleCall$8$Delimiter() { + return ruleCall$8$Delimiter; } - public void setKeyword$6$Delimiter(ICharacterClass characterClass) { - keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { + ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } public ISequenceMatcher getRuleCall$10$Delimiter() { @@ -162,4 +154,12 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer { ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ICharacterClass getKeyword$5$Delimiter() { + return keyword$5$Delimiter; + } + + public void setKeyword$5$Delimiter(ICharacterClass characterClass) { + keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } 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 80d2679..a94c5f8 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 @@ -18,44 +18,44 @@ import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielplatzElements; +import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarCustomTypeParserRuleConsumer; import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarErwachsenerConsumer; -import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarSpielzeugConsumer; -import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinINTConsumer; -import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer; import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarFamilieConsumer; +import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinINTConsumer; import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarKindConsumer; -import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarCustomTypeParserRuleConsumer; +import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinSTRINGConsumer; +import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarSpielzeugConsumer; @SuppressWarnings("unused") public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsumer { + private ReferenceGrammarCustomTypeParserRuleConsumer customTypeParserRuleConsumer; private ReferenceGrammarErwachsenerConsumer erwachsenerConsumer; - private ReferenceGrammarSpielzeugConsumer spielzeugConsumer; - private XtextBuiltinINTConsumer intConsumer; - private XtextBuiltinSTRINGConsumer stringConsumer; private ReferenceGrammarFamilieConsumer familieConsumer; + private XtextBuiltinINTConsumer intConsumer; private ReferenceGrammarKindConsumer kindConsumer; - private ReferenceGrammarCustomTypeParserRuleConsumer customTypeParserRuleConsumer; + private XtextBuiltinSTRINGConsumer stringConsumer; + private ReferenceGrammarSpielzeugConsumer spielzeugConsumer; - private ICharacterClass keyword$11$Delimiter; + private ISequenceMatcher ruleCall$8$Delimiter; private ISequenceMatcher ruleCall$10$Delimiter; - private ICharacterClass keyword$26$Delimiter; - private ICharacterClass keyword$6$Delimiter; - private ISequenceMatcher ruleCall$8$Delimiter; + private ICharacterClass keyword$11$Delimiter; + + private ICharacterClass keyword$26$Delimiter; public ReferenceGrammarSpielplatzConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$10$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); - ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$26$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -187,40 +187,40 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume return "Spielplatz"; } + public void setCustomTypeParserRuleConsumer(ReferenceGrammarCustomTypeParserRuleConsumer customTypeParserRuleConsumer) { + this.customTypeParserRuleConsumer = customTypeParserRuleConsumer; + } + public void setErwachsenerConsumer(ReferenceGrammarErwachsenerConsumer erwachsenerConsumer) { this.erwachsenerConsumer = erwachsenerConsumer; } - public void setSpielzeugConsumer(ReferenceGrammarSpielzeugConsumer spielzeugConsumer) { - this.spielzeugConsumer = spielzeugConsumer; + public void setFamilieConsumer(ReferenceGrammarFamilieConsumer familieConsumer) { + this.familieConsumer = familieConsumer; } public void setIntConsumer(XtextBuiltinINTConsumer intConsumer) { this.intConsumer = intConsumer; } - public void setStringConsumer(XtextBuiltinSTRINGConsumer stringConsumer) { - this.stringConsumer = stringConsumer; - } - - public void setFamilieConsumer(ReferenceGrammarFamilieConsumer familieConsumer) { - this.familieConsumer = familieConsumer; - } - public void setKindConsumer(ReferenceGrammarKindConsumer kindConsumer) { this.kindConsumer = kindConsumer; } - public void setCustomTypeParserRuleConsumer(ReferenceGrammarCustomTypeParserRuleConsumer customTypeParserRuleConsumer) { - this.customTypeParserRuleConsumer = customTypeParserRuleConsumer; + public void setStringConsumer(XtextBuiltinSTRINGConsumer stringConsumer) { + this.stringConsumer = stringConsumer; } - public ICharacterClass getKeyword$11$Delimiter() { - return keyword$11$Delimiter; + public void setSpielzeugConsumer(ReferenceGrammarSpielzeugConsumer spielzeugConsumer) { + this.spielzeugConsumer = spielzeugConsumer; } - public void setKeyword$11$Delimiter(ICharacterClass characterClass) { - keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public ISequenceMatcher getRuleCall$8$Delimiter() { + return ruleCall$8$Delimiter; + } + + public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { + ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } public ISequenceMatcher getRuleCall$10$Delimiter() { @@ -231,14 +231,6 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume ruleCall$10$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } - public ICharacterClass getKeyword$26$Delimiter() { - return keyword$26$Delimiter; - } - - public void setKeyword$26$Delimiter(ICharacterClass characterClass) { - keyword$26$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ICharacterClass getKeyword$6$Delimiter() { return keyword$6$Delimiter; } @@ -247,12 +239,20 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ISequenceMatcher getRuleCall$8$Delimiter() { - return ruleCall$8$Delimiter; + public ICharacterClass getKeyword$11$Delimiter() { + return keyword$11$Delimiter; } - public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { - ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setKeyword$11$Delimiter(ICharacterClass characterClass) { + keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + + public ICharacterClass getKeyword$26$Delimiter() { + return keyword$26$Delimiter; + } + + public void setKeyword$26$Delimiter(ICharacterClass characterClass) { + keyword$26$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } } 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 7fdb5ad..7a0001e 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 @@ -18,31 +18,31 @@ import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess; import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess.SpielzeugElements; -import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer; import org.eclipse.xtext.reference.parser.packrat.consumers.ReferenceGrammarFarbeConsumer; +import org.eclipse.xtext.builtin.parser.packrat.consumers.XtextBuiltinIDConsumer; @SuppressWarnings("unused") public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer { - private XtextBuiltinIDConsumer idConsumer; private ReferenceGrammarFarbeConsumer farbeConsumer; + private XtextBuiltinIDConsumer idConsumer; - private ICharacterClass keyword$5$Delimiter; - - private ISequenceMatcher ruleCall$8$Delimiter; - private ICharacterClass keyword$6$Delimiter; private ICharacterClass keyword$11$Delimiter; + private ISequenceMatcher ruleCall$8$Delimiter; + + private ICharacterClass keyword$5$Delimiter; + public ReferenceGrammarSpielzeugConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); - ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -111,28 +111,12 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer return "Spielzeug"; } - public void setIdConsumer(XtextBuiltinIDConsumer idConsumer) { - this.idConsumer = idConsumer; - } - public void setFarbeConsumer(ReferenceGrammarFarbeConsumer farbeConsumer) { this.farbeConsumer = farbeConsumer; } - public ICharacterClass getKeyword$5$Delimiter() { - return keyword$5$Delimiter; - } - - public void setKeyword$5$Delimiter(ICharacterClass characterClass) { - keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - - public ISequenceMatcher getRuleCall$8$Delimiter() { - return ruleCall$8$Delimiter; - } - - public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { - ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setIdConsumer(XtextBuiltinIDConsumer idConsumer) { + this.idConsumer = idConsumer; } public ICharacterClass getKeyword$6$Delimiter() { @@ -151,4 +135,20 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ISequenceMatcher getRuleCall$8$Delimiter() { + return ruleCall$8$Delimiter; + } + + public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { + ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + + public ICharacterClass getKeyword$5$Delimiter() { + return keyword$5$Delimiter; + } + + public void setKeyword$5$Delimiter(ICharacterClass characterClass) { + keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java index a2f2c5b..66deee5 100644 --- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java +++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parsetree/reconstr/ReferenceGrammarParseTreeConstructor.java @@ -1452,11 +1452,13 @@ protected class Familie_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("keyword".equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele000001000KeywordKeyword(); return new Solution(obj); } + if(true) { // xtext::RuleCall FIXME: check if value is valid for lexer rule type = AssignmentType.LRC; element = ReferenceGrammarGrammarAccess.INSTANCE.prFamilie().ele000001001LexerRuleCallSTRING(); @@ -1658,26 +1660,34 @@ protected class Farbe_Assignment_wert extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("wert",IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("wert"); + if("ROT".equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = ReferenceGrammarGrammarAccess.INSTANCE.prFarbe().ele0000KeywordROT(); return new Solution(obj); } + + if("BLAU".equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = ReferenceGrammarGrammarAccess.INSTANCE.prFarbe().ele0001KeywordBLAU(); return new Solution(obj); } + + if("GELB".equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = ReferenceGrammarGrammarAccess.INSTANCE.prFarbe().ele001KeywordGELB(); return new Solution(obj); } + + if("GRÜN".equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = ReferenceGrammarGrammarAccess.INSTANCE.prFarbe().ele01KeywordGRÜN(); return new Solution(obj); } + return null; } } 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 53a0c5c..de077d3 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 @@ -490,7 +490,7 @@ public class ReferenceGrammarGrammarAccess extends BaseEPackageAccess implements } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java index 59587c7..abb6f36 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl.ui/src-gen/org/eclipse/xtext/example/GenFowlerDslUiConfig.java @@ -15,7 +15,6 @@ public class GenFowlerDslUiConfig extends AbstractServiceRegistrationFactory { public Set<IServiceRegistration> registrations() { return scope(org.eclipse.xtext.example.IFowlerDsl.SCOPE) .with(org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider.class, org.eclipse.xtext.example.FowlerDslGenProposalProvider.class) - .with(org.eclipse.jface.text.contentassist.IContentAssistant.class, org.eclipse.jface.text.contentassist.ContentAssistant.class) .with(org.eclipse.jface.text.contentassist.IContentAssistProcessor.class, org.eclipse.xtext.ui.common.editor.contentassist.impl.DefaultContentAssistProcessor.class) .registrations(); } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g index 6177368..3df7a51 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleStatemachine entryRuleStatemachine returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -159,6 +160,8 @@ ruleStatemachine returns [EObject current=null] + + // Entry rule entryRuleEvent entryRuleEvent returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); } @@ -237,6 +240,8 @@ ruleEvent returns [EObject current=null] + + // Entry rule entryRuleCommand entryRuleCommand returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); } @@ -295,6 +300,8 @@ ruleCommand returns [EObject current=null] + + // Entry rule entryRuleState entryRuleState returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); } @@ -389,6 +396,8 @@ ruleState returns [EObject current=null] + + // Entry rule entryRuleTransition entryRuleTransition returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); } @@ -441,6 +450,18 @@ ruleTransition returns [EObject current=null] + + + + + + + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java index dbacd43..5f9449d 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g 2009-01-14 16:50:18 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g 2009-01-19 15:14:19 package org.eclipse.xtext.example.parser.antlr.internal; @@ -210,10 +210,10 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:444:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:444:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:444:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -222,7 +222,7 @@ public class InternalFowlerDslLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:444:12: '^' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:12: '^' { match('^'); @@ -241,7 +241,7 @@ public class InternalFowlerDslLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:444:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:465:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -289,10 +289,10 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:446:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:446:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:446:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -306,7 +306,7 @@ public class InternalFowlerDslLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:446:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:467:13: '0' .. '9' { matchRange('0','9'); @@ -336,7 +336,7 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -348,16 +348,16 @@ public class InternalFowlerDslLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("448:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("469:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -373,7 +373,7 @@ public class InternalFowlerDslLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:21: '\\\\' ( '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' ) { @@ -390,7 +390,7 @@ public class InternalFowlerDslLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -416,10 +416,10 @@ public class InternalFowlerDslLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -435,7 +435,7 @@ public class InternalFowlerDslLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:108: '\\\\' ( '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' ) { @@ -452,7 +452,7 @@ public class InternalFowlerDslLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:448:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:469:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -490,12 +490,12 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:450:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:450:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:450:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -520,7 +520,7 @@ public class InternalFowlerDslLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:450:52: . + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:471:52: . { matchAny(); @@ -549,12 +549,12 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -567,7 +567,7 @@ public class InternalFowlerDslLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473: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(); @@ -588,7 +588,7 @@ public class InternalFowlerDslLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -597,9 +597,9 @@ public class InternalFowlerDslLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -608,7 +608,7 @@ public class InternalFowlerDslLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:452:39: '\\r' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:473:39: '\\r' { match('\r'); @@ -639,10 +639,10 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:454:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:454:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:454:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:475:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -696,8 +696,8 @@ public class InternalFowlerDslLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:456:16: ( . ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:456:18: . + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:477:16: ( . ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:477:18: . { matchAny(); diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java index d1f34ef..6a53a2e 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDslParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g 2009-01-14 16:50:18 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g 2009-01-19 15:14:18 package org.eclipse.xtext.example.parser.antlr.internal; @@ -64,7 +64,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleStatemachine - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:66:1: entryRuleStatemachine returns [EObject current=null] : iv_ruleStatemachine= ruleStatemachine EOF ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:67:1: entryRuleStatemachine returns [EObject current=null] : iv_ruleStatemachine= ruleStatemachine EOF ; public final EObject entryRuleStatemachine() throws RecognitionException { EObject current = null; @@ -72,16 +72,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:66:54: (iv_ruleStatemachine= ruleStatemachine EOF ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:67:2: iv_ruleStatemachine= ruleStatemachine EOF + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:67:54: (iv_ruleStatemachine= ruleStatemachine EOF ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:68:2: iv_ruleStatemachine= ruleStatemachine EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleStatemachine_in_entryRuleStatemachine71); + pushFollow(FOLLOW_ruleStatemachine_in_entryRuleStatemachine72); iv_ruleStatemachine=ruleStatemachine(); _fsp--; current =iv_ruleStatemachine; - match(input,EOF,FOLLOW_EOF_in_entryRuleStatemachine81); + match(input,EOF,FOLLOW_EOF_in_entryRuleStatemachine82); } @@ -99,7 +99,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleStatemachine - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:74:1: ruleStatemachine returns [EObject current=null] : ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:75:1: ruleStatemachine returns [EObject current=null] : ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) ; public final EObject ruleStatemachine() throws RecognitionException { EObject current = null; @@ -112,32 +112,32 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:76:33: ( ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:1: ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:33: ( ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:1: ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:1: ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:2: ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:1: ( ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:2: ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) (lv_states= ruleState )* { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:2: ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:3: ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:2: ( ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:3: ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) 'end' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:3: ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:4: ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:3: ( ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:4: ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) (lv_commands= ruleCommand )* { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:4: ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:5: ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:4: ( ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:5: ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) 'commands' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:5: ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:6: ( 'events' (lv_events= ruleEvent )* ) 'end' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:5: ( ( 'events' (lv_events= ruleEvent )* ) 'end' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:6: ( 'events' (lv_events= ruleEvent )* ) 'end' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:6: ( 'events' (lv_events= ruleEvent )* ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:77:7: 'events' (lv_events= ruleEvent )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:6: ( 'events' (lv_events= ruleEvent )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:78:7: 'events' (lv_events= ruleEvent )* { - match(input,11,FOLLOW_11_in_ruleStatemachine120); + match(input,11,FOLLOW_11_in_ruleStatemachine121); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:81:1: (lv_events= ruleEvent )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:82:1: (lv_events= ruleEvent )* loop1: do { int alt1=2; @@ -150,12 +150,12 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:84:6: lv_events= ruleEvent + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:85:6: lv_events= ruleEvent { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleEvent_in_ruleStatemachine154); + pushFollow(FOLLOW_ruleEvent_in_ruleStatemachine155); lv_events=ruleEvent(); _fsp--; @@ -184,21 +184,21 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - match(input,12,FOLLOW_12_in_ruleStatemachine169); + match(input,12,FOLLOW_12_in_ruleStatemachine170); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - match(input,13,FOLLOW_13_in_ruleStatemachine179); + match(input,13,FOLLOW_13_in_ruleStatemachine180); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:110:2: (lv_commands= ruleCommand )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:111:2: (lv_commands= ruleCommand )* loop2: do { int alt2=2; @@ -211,12 +211,12 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:113:6: lv_commands= ruleCommand + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:114:6: lv_commands= ruleCommand { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleCommand_in_ruleStatemachine214); + pushFollow(FOLLOW_ruleCommand_in_ruleStatemachine215); lv_commands=ruleCommand(); _fsp--; @@ -245,14 +245,14 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - match(input,12,FOLLOW_12_in_ruleStatemachine229); + match(input,12,FOLLOW_12_in_ruleStatemachine230); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:135:2: (lv_states= ruleState )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:136:2: (lv_states= ruleState )* loop3: do { int alt3=2; @@ -265,12 +265,12 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:138:6: lv_states= ruleState + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:139:6: lv_states= ruleState { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleState_in_ruleStatemachine264); + pushFollow(FOLLOW_ruleState_in_ruleStatemachine265); lv_states=ruleState(); _fsp--; @@ -317,7 +317,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleEvent - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:163:1: entryRuleEvent returns [EObject current=null] : iv_ruleEvent= ruleEvent EOF ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:166:1: entryRuleEvent returns [EObject current=null] : iv_ruleEvent= ruleEvent EOF ; public final EObject entryRuleEvent() throws RecognitionException { EObject current = null; @@ -325,16 +325,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:163:47: (iv_ruleEvent= ruleEvent EOF ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:164:2: iv_ruleEvent= ruleEvent EOF + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:166:47: (iv_ruleEvent= ruleEvent EOF ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:167:2: iv_ruleEvent= ruleEvent EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleEvent_in_entryRuleEvent302); + pushFollow(FOLLOW_ruleEvent_in_entryRuleEvent305); iv_ruleEvent=ruleEvent(); _fsp--; current =iv_ruleEvent; - match(input,EOF,FOLLOW_EOF_in_entryRuleEvent312); + match(input,EOF,FOLLOW_EOF_in_entryRuleEvent315); } @@ -352,7 +352,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleEvent - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:171:1: ruleEvent returns [EObject current=null] : ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:1: ruleEvent returns [EObject current=null] : ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) ; public final EObject ruleEvent() throws RecognitionException { EObject current = null; @@ -362,16 +362,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:173:33: ( ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:1: ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:176:33: ( ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:1: ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:1: ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:2: ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:1: ( ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:2: ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) (lv_code= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:2: ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:3: (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:2: ( (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:3: (lv_resetting= 'resetting' )? (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:174:3: (lv_resetting= 'resetting' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:177:3: (lv_resetting= 'resetting' )? int alt4=2; int LA4_0 = input.LA(1); @@ -380,10 +380,10 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:176:6: lv_resetting= 'resetting' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:179:6: lv_resetting= 'resetting' { lv_resetting=(Token)input.LT(1); - match(input,14,FOLLOW_14_in_ruleEvent359); + match(input,14,FOLLOW_14_in_ruleEvent362); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::Keyword */, "resetting"); @@ -405,11 +405,11 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:194:3: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:196:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:197:3: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:199:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEvent393); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEvent396); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -431,11 +431,11 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:214:3: (lv_code= RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:216:6: lv_code= RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:217:3: (lv_code= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:219:6: lv_code= RULE_ID { lv_code=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEvent426); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEvent429); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.1/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "code"); @@ -475,7 +475,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleCommand - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:241:1: entryRuleCommand returns [EObject current=null] : iv_ruleCommand= ruleCommand EOF ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:246:1: entryRuleCommand returns [EObject current=null] : iv_ruleCommand= ruleCommand EOF ; public final EObject entryRuleCommand() throws RecognitionException { EObject current = null; @@ -483,16 +483,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:241:49: (iv_ruleCommand= ruleCommand EOF ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:242:2: iv_ruleCommand= ruleCommand EOF + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:246:49: (iv_ruleCommand= ruleCommand EOF ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:247:2: iv_ruleCommand= ruleCommand EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleCommand_in_entryRuleCommand470); + pushFollow(FOLLOW_ruleCommand_in_entryRuleCommand475); iv_ruleCommand=ruleCommand(); _fsp--; current =iv_ruleCommand; - match(input,EOF,FOLLOW_EOF_in_entryRuleCommand480); + match(input,EOF,FOLLOW_EOF_in_entryRuleCommand485); } @@ -510,7 +510,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleCommand - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:249:1: ruleCommand returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:254:1: ruleCommand returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) ; public final EObject ruleCommand() throws RecognitionException { EObject current = null; @@ -519,17 +519,17 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:251:33: ( ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:252:1: ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:256:33: ( ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:257:1: ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:252:1: ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:252:2: (lv_name= RULE_ID ) (lv_code= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:257:1: ( (lv_name= RULE_ID ) (lv_code= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:257:2: (lv_name= RULE_ID ) (lv_code= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:252:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:254:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:257:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:259:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCommand526); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCommand531); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.2/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, "name"); @@ -548,11 +548,11 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:272:2: (lv_code= RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:274:6: lv_code= RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:277:2: (lv_code= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:279:6: lv_code= RULE_ID { lv_code=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCommand558); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCommand563); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "code"); @@ -592,7 +592,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleState - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:299:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:306:1: entryRuleState returns [EObject current=null] : iv_ruleState= ruleState EOF ; public final EObject entryRuleState() throws RecognitionException { EObject current = null; @@ -600,16 +600,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:299:47: (iv_ruleState= ruleState EOF ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:300:2: iv_ruleState= ruleState EOF + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:306:47: (iv_ruleState= ruleState EOF ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:307:2: iv_ruleState= ruleState EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleState_in_entryRuleState602); + pushFollow(FOLLOW_ruleState_in_entryRuleState609); iv_ruleState=ruleState(); _fsp--; current =iv_ruleState; - match(input,EOF,FOLLOW_EOF_in_entryRuleState612); + match(input,EOF,FOLLOW_EOF_in_entryRuleState619); } @@ -627,7 +627,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleState - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:307:1: ruleState returns [EObject current=null] : ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:314:1: ruleState returns [EObject current=null] : ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) ; public final EObject ruleState() throws RecognitionException { EObject current = null; @@ -637,30 +637,30 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:309:33: ( ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:1: ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:316:33: ( ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:1: ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:1: ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:2: ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:1: ( ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:2: ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) 'end' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:2: ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:3: ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:2: ( ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:3: ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) (lv_transitions= ruleTransition )* { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:3: ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:4: ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:3: ( ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:4: ( 'state' (lv_name= RULE_ID ) ) ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:4: ( 'state' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:310:5: 'state' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:4: ( 'state' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:317:5: 'state' (lv_name= RULE_ID ) { - match(input,15,FOLLOW_15_in_ruleState649); + match(input,15,FOLLOW_15_in_ruleState656); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:314:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:316:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:321:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:323:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleState670); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleState677); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -682,7 +682,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:3: ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:3: ( ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' )? int alt6=2; int LA6_0 = input.LA(1); @@ -691,26 +691,26 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:4: ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:4: ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) '}' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:4: ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:5: ( 'actions' '{' ) ( ( RULE_ID ) )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:4: ( ( 'actions' '{' ) ( ( RULE_ID ) )+ ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:5: ( 'actions' '{' ) ( ( RULE_ID ) )+ { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:5: ( 'actions' '{' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:334:6: 'actions' '{' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:5: ( 'actions' '{' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:341:6: 'actions' '{' { - match(input,16,FOLLOW_16_in_ruleState694); + match(input,16,FOLLOW_16_in_ruleState701); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - match(input,17,FOLLOW_17_in_ruleState703); + match(input,17,FOLLOW_17_in_ruleState710); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:342:2: ( ( RULE_ID ) )+ + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:349:2: ( ( RULE_ID ) )+ int cnt5=0; loop5: do { @@ -724,7 +724,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:345:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:352:3: ( RULE_ID ) { if (current==null) { @@ -732,10 +732,10 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:351:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:352:2: RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:358:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:359:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleState728); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleState735); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "actions"); @@ -758,7 +758,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - match(input,18,FOLLOW_18_in_ruleState743); + match(input,18,FOLLOW_18_in_ruleState750); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1" /* xtext::Keyword */, null); @@ -771,7 +771,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:361:4: (lv_transitions= ruleTransition )* + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:368:4: (lv_transitions= ruleTransition )* loop7: do { int alt7=2; @@ -784,12 +784,12 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:364:6: lv_transitions= ruleTransition + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:371:6: lv_transitions= ruleTransition { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleTransition_in_ruleState780); + pushFollow(FOLLOW_ruleTransition_in_ruleState787); lv_transitions=ruleTransition(); _fsp--; @@ -818,7 +818,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - match(input,12,FOLLOW_12_in_ruleState795); + match(input,12,FOLLOW_12_in_ruleState802); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -843,7 +843,7 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start entryRuleTransition - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:393:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:402:1: entryRuleTransition returns [EObject current=null] : iv_ruleTransition= ruleTransition EOF ; public final EObject entryRuleTransition() throws RecognitionException { EObject current = null; @@ -851,16 +851,16 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:393:52: (iv_ruleTransition= ruleTransition EOF ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:394:2: iv_ruleTransition= ruleTransition EOF + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:402:52: (iv_ruleTransition= ruleTransition EOF ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:403:2: iv_ruleTransition= ruleTransition EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition828); + pushFollow(FOLLOW_ruleTransition_in_entryRuleTransition837); iv_ruleTransition=ruleTransition(); _fsp--; current =iv_ruleTransition; - match(input,EOF,FOLLOW_EOF_in_entryRuleTransition838); + match(input,EOF,FOLLOW_EOF_in_entryRuleTransition847); } @@ -878,23 +878,23 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { // $ANTLR start ruleTransition - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:401:1: ruleTransition returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:410:1: ruleTransition returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) ; public final EObject ruleTransition() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:403:33: ( ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:1: ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:412:33: ( ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:1: ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:1: ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:2: ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:1: ( ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:2: ( ( ( RULE_ID ) ) '=>' ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:2: ( ( ( RULE_ID ) ) '=>' ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:3: ( ( RULE_ID ) ) '=>' + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:2: ( ( ( RULE_ID ) ) '=>' ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:3: ( ( RULE_ID ) ) '=>' { - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:404:3: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:407:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:416:3: ( RULE_ID ) { if (current==null) { @@ -902,10 +902,10 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:413:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:414:2: RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:422:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:423:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransition888); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransition897); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::CrossReference */, "event"); @@ -915,15 +915,15 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { } - match(input,19,FOLLOW_19_in_ruleTransition901); + match(input,19,FOLLOW_19_in_ruleTransition910); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:423:2: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:426:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:432:2: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:435:3: ( RULE_ID ) { if (current==null) { @@ -931,10 +931,10 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:432:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:433:2: RULE_ID + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:441:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g:442:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransition926); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTransition935); createLeafNode("classpath:/org/eclipse/xtext/example/FowlerDsl.xmi#//@rules.4/@alternatives/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "state"); @@ -966,38 +966,38 @@ public class InternalFowlerDslParser extends AbstractInternalAntlrParser { - public static final BitSet FOLLOW_ruleStatemachine_in_entryRuleStatemachine71 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleStatemachine81 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_11_in_ruleStatemachine120 = new BitSet(new long[]{0x0000000000005010L}); - public static final BitSet FOLLOW_ruleEvent_in_ruleStatemachine154 = new BitSet(new long[]{0x0000000000005010L}); - public static final BitSet FOLLOW_12_in_ruleStatemachine169 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleStatemachine179 = new BitSet(new long[]{0x0000000000001010L}); - public static final BitSet FOLLOW_ruleCommand_in_ruleStatemachine214 = new BitSet(new long[]{0x0000000000001010L}); - public static final BitSet FOLLOW_12_in_ruleStatemachine229 = new BitSet(new long[]{0x0000000000008002L}); - public static final BitSet FOLLOW_ruleState_in_ruleStatemachine264 = new BitSet(new long[]{0x0000000000008002L}); - public static final BitSet FOLLOW_ruleEvent_in_entryRuleEvent302 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleEvent312 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_ruleEvent359 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEvent393 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleEvent426 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleCommand_in_entryRuleCommand470 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleCommand480 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleCommand526 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleCommand558 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleState_in_entryRuleState602 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleState612 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_15_in_ruleState649 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleState670 = new BitSet(new long[]{0x0000000000011010L}); - public static final BitSet FOLLOW_16_in_ruleState694 = new BitSet(new long[]{0x0000000000020000L}); - public static final BitSet FOLLOW_17_in_ruleState703 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleState728 = new BitSet(new long[]{0x0000000000040010L}); - public static final BitSet FOLLOW_18_in_ruleState743 = new BitSet(new long[]{0x0000000000001010L}); - public static final BitSet FOLLOW_ruleTransition_in_ruleState780 = new BitSet(new long[]{0x0000000000001010L}); - public static final BitSet FOLLOW_12_in_ruleState795 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition828 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTransition838 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleTransition888 = new BitSet(new long[]{0x0000000000080000L}); - public static final BitSet FOLLOW_19_in_ruleTransition901 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleTransition926 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStatemachine_in_entryRuleStatemachine72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleStatemachine82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleStatemachine121 = new BitSet(new long[]{0x0000000000005010L}); + public static final BitSet FOLLOW_ruleEvent_in_ruleStatemachine155 = new BitSet(new long[]{0x0000000000005010L}); + public static final BitSet FOLLOW_12_in_ruleStatemachine170 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleStatemachine180 = new BitSet(new long[]{0x0000000000001010L}); + public static final BitSet FOLLOW_ruleCommand_in_ruleStatemachine215 = new BitSet(new long[]{0x0000000000001010L}); + public static final BitSet FOLLOW_12_in_ruleStatemachine230 = new BitSet(new long[]{0x0000000000008002L}); + public static final BitSet FOLLOW_ruleState_in_ruleStatemachine265 = new BitSet(new long[]{0x0000000000008002L}); + public static final BitSet FOLLOW_ruleEvent_in_entryRuleEvent305 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleEvent315 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleEvent362 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEvent396 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleEvent429 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleCommand_in_entryRuleCommand475 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleCommand485 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleCommand531 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleCommand563 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleState_in_entryRuleState609 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleState619 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleState656 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleState677 = new BitSet(new long[]{0x0000000000011010L}); + public static final BitSet FOLLOW_16_in_ruleState701 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_17_in_ruleState710 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleState735 = new BitSet(new long[]{0x0000000000040010L}); + public static final BitSet FOLLOW_18_in_ruleState750 = new BitSet(new long[]{0x0000000000001010L}); + public static final BitSet FOLLOW_ruleTransition_in_ruleState787 = new BitSet(new long[]{0x0000000000001010L}); + public static final BitSet FOLLOW_12_in_ruleState802 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTransition_in_entryRuleTransition837 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTransition847 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleTransition897 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleTransition910 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleTransition935 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g index 9094fe6..0ef2673 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl__.g @@ -17,25 +17,25 @@ T17 : '{' ; T18 : '}' ; T19 : '=>' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 444 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 465 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 446 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 467 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 448 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 469 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 450 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 471 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 452 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 473 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 454 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 475 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 456 +// $ANTLR src "./src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalFowlerDsl.g" 477 RULE_ANY_OTHER : .; diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslDelimiters.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslDelimiters.java index 9665ff2..46f59ea 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslDelimiters.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslDelimiters.java @@ -14,12 +14,11 @@ public final class FowlerDslDelimiters { throw new UnsupportedOperationException("Utility classes may not be initialized"); } - // TODO do not use IDConsumer internals public static ICharacterClass keyword$9$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - + public static ISequenceMatcher ruleCall$26$Delimiter = new SetBasedKeywordMatcher( "events", "end", "commands", "resetting", "state", "actions"); - + public static ICharacterClass keyword$49$Delimiter = ICharacterClass.Factory.nullClass(); - + } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java index 8b530ca..d331f23 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/FowlerDslParserConfiguration.java @@ -51,8 +51,7 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration { public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); statemachineConsumer = new FowlerDslStatemachineConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); eventConsumer = new FowlerDslEventConsumer( getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null @@ -73,9 +72,9 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration { } public void configureConsumers() { - getStatemachineConsumer().setStateConsumer(getStateConsumer()); - getStatemachineConsumer().setEventConsumer(getEventConsumer()); getStatemachineConsumer().setCommandConsumer(getCommandConsumer()); + getStatemachineConsumer().setEventConsumer(getEventConsumer()); + getStatemachineConsumer().setStateConsumer(getStateConsumer()); getEventConsumer().setIdConsumer(getIdConsumer()); @@ -86,39 +85,25 @@ public class FowlerDslParserConfiguration extends AbstractParserConfiguration { getTransitionConsumer().setIdConsumer(getIdConsumer()); - getStatemachineConsumer().setKeyword$14$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); - getStatemachineConsumer().setKeyword$7$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); getStatemachineConsumer().setKeyword$11$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); + getStatemachineConsumer().setKeyword$14$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); getStatemachineConsumer().setKeyword$10$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); - getEventConsumer().setKeyword$4$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); - getEventConsumer().setRuleCall$6$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); + getStatemachineConsumer().setKeyword$7$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); getEventConsumer().setRuleCall$8$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); + getEventConsumer().setRuleCall$6$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); + getEventConsumer().setKeyword$4$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); getCommandConsumer().setRuleCall$3$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); getCommandConsumer().setRuleCall$5$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); - getStateConsumer().setRuleCall$7$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); getStateConsumer().setCrossReference$14$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); + getStateConsumer().setRuleCall$7$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); getStateConsumer().setKeyword$11$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); - getStateConsumer().setKeyword$12$Delimiter(FowlerDslDelimiters.keyword$49$Delimiter); - getStateConsumer().setKeyword$5$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); getStateConsumer().setKeyword$19$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); + getStateConsumer().setKeyword$5$Delimiter(FowlerDslDelimiters.keyword$9$Delimiter); + getStateConsumer().setKeyword$12$Delimiter(FowlerDslDelimiters.keyword$49$Delimiter); getStateConsumer().setKeyword$16$Delimiter(FowlerDslDelimiters.keyword$49$Delimiter); - getTransitionConsumer().setCrossReference$8$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); getTransitionConsumer().setKeyword$6$Delimiter(FowlerDslDelimiters.keyword$49$Delimiter); + getTransitionConsumer().setCrossReference$8$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); getTransitionConsumer().setCrossReference$4$Delimiter(FowlerDslDelimiters.ruleCall$26$Delimiter); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); } // TODO collect superGrammars transitive diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java index 9f9e010..80b8aea 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslEventConsumer.java @@ -25,19 +25,19 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; - private ICharacterClass keyword$4$Delimiter; + private ISequenceMatcher ruleCall$8$Delimiter; private ISequenceMatcher ruleCall$6$Delimiter; - private ISequenceMatcher ruleCall$8$Delimiter; + private ICharacterClass keyword$4$Delimiter; public FowlerDslEventConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); - ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -101,12 +101,12 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer { this.idConsumer = idConsumer; } - public ICharacterClass getKeyword$4$Delimiter() { - return keyword$4$Delimiter; + public ISequenceMatcher getRuleCall$8$Delimiter() { + return ruleCall$8$Delimiter; } - public void setKeyword$4$Delimiter(ICharacterClass characterClass) { - keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { + ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } public ISequenceMatcher getRuleCall$6$Delimiter() { @@ -117,12 +117,12 @@ public final class FowlerDslEventConsumer extends NonTerminalConsumer { ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } - public ISequenceMatcher getRuleCall$8$Delimiter() { - return ruleCall$8$Delimiter; + public ICharacterClass getKeyword$4$Delimiter() { + return keyword$4$Delimiter; } - public void setRuleCall$8$Delimiter(ISequenceMatcher matcher) { - ruleCall$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + public void setKeyword$4$Delimiter(ICharacterClass characterClass) { + keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java index bd85556..34df35e 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStateConsumer.java @@ -27,17 +27,17 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; private FowlerDslTransitionConsumer transitionConsumer; - private ISequenceMatcher ruleCall$7$Delimiter; - private ISequenceMatcher crossReference$14$Delimiter; + private ISequenceMatcher ruleCall$7$Delimiter; + private ICharacterClass keyword$11$Delimiter; - private ICharacterClass keyword$12$Delimiter; + private ICharacterClass keyword$19$Delimiter; private ICharacterClass keyword$5$Delimiter; - private ICharacterClass keyword$19$Delimiter; + private ICharacterClass keyword$12$Delimiter; private ICharacterClass keyword$16$Delimiter; @@ -45,12 +45,12 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$14$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$7$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); keyword$19$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$5$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); keyword$16$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -181,14 +181,6 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { this.transitionConsumer = transitionConsumer; } - public ISequenceMatcher getRuleCall$7$Delimiter() { - return ruleCall$7$Delimiter; - } - - public void setRuleCall$7$Delimiter(ISequenceMatcher matcher) { - ruleCall$7$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ISequenceMatcher getCrossReference$14$Delimiter() { return crossReference$14$Delimiter; } @@ -197,6 +189,14 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { crossReference$14$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ISequenceMatcher getRuleCall$7$Delimiter() { + return ruleCall$7$Delimiter; + } + + public void setRuleCall$7$Delimiter(ISequenceMatcher matcher) { + ruleCall$7$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + public ICharacterClass getKeyword$11$Delimiter() { return keyword$11$Delimiter; } @@ -205,12 +205,12 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$12$Delimiter() { - return keyword$12$Delimiter; + public ICharacterClass getKeyword$19$Delimiter() { + return keyword$19$Delimiter; } - public void setKeyword$12$Delimiter(ICharacterClass characterClass) { - keyword$12$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$19$Delimiter(ICharacterClass characterClass) { + keyword$19$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ICharacterClass getKeyword$5$Delimiter() { @@ -221,12 +221,12 @@ public final class FowlerDslStateConsumer extends NonTerminalConsumer { keyword$5$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$19$Delimiter() { - return keyword$19$Delimiter; + public ICharacterClass getKeyword$12$Delimiter() { + return keyword$12$Delimiter; } - public void setKeyword$19$Delimiter(ICharacterClass characterClass) { - keyword$19$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setKeyword$12$Delimiter(ICharacterClass characterClass) { + keyword$12$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } public ICharacterClass getKeyword$16$Delimiter() { diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java index fcf92cc..aa0eecd 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslStatemachineConsumer.java @@ -18,33 +18,33 @@ import org.eclipse.xtext.parser.packrat.tokens.IParsedTokenAcceptor; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess; import org.eclipse.xtext.example.services.FowlerDslGrammarAccess.StatemachineElements; -import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslStateConsumer; -import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslEventConsumer; import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslCommandConsumer; +import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslEventConsumer; +import org.eclipse.xtext.example.parser.packrat.consumers.FowlerDslStateConsumer; @SuppressWarnings("unused") public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { - private FowlerDslStateConsumer stateConsumer; - private FowlerDslEventConsumer eventConsumer; private FowlerDslCommandConsumer commandConsumer; + private FowlerDslEventConsumer eventConsumer; + private FowlerDslStateConsumer stateConsumer; - private ICharacterClass keyword$14$Delimiter; - - private ICharacterClass keyword$7$Delimiter; - private ICharacterClass keyword$11$Delimiter; + private ICharacterClass keyword$14$Delimiter; + private ICharacterClass keyword$10$Delimiter; + private ICharacterClass keyword$7$Delimiter; + public FowlerDslStatemachineConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$11$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$14$Delimiter = ICharacterClass.Factory.nullClass(); keyword$10$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -146,32 +146,16 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { return "Statemachine"; } - public void setStateConsumer(FowlerDslStateConsumer stateConsumer) { - this.stateConsumer = stateConsumer; - } - - public void setEventConsumer(FowlerDslEventConsumer eventConsumer) { - this.eventConsumer = eventConsumer; - } - public void setCommandConsumer(FowlerDslCommandConsumer commandConsumer) { this.commandConsumer = commandConsumer; } - public ICharacterClass getKeyword$14$Delimiter() { - return keyword$14$Delimiter; - } - - public void setKeyword$14$Delimiter(ICharacterClass characterClass) { - keyword$14$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - - public ICharacterClass getKeyword$7$Delimiter() { - return keyword$7$Delimiter; + public void setEventConsumer(FowlerDslEventConsumer eventConsumer) { + this.eventConsumer = eventConsumer; } - public void setKeyword$7$Delimiter(ICharacterClass characterClass) { - keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + public void setStateConsumer(FowlerDslStateConsumer stateConsumer) { + this.stateConsumer = stateConsumer; } public ICharacterClass getKeyword$11$Delimiter() { @@ -182,6 +166,14 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { keyword$11$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ICharacterClass getKeyword$14$Delimiter() { + return keyword$14$Delimiter; + } + + public void setKeyword$14$Delimiter(ICharacterClass characterClass) { + keyword$14$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + public ICharacterClass getKeyword$10$Delimiter() { return keyword$10$Delimiter; } @@ -190,4 +182,12 @@ public final class FowlerDslStatemachineConsumer extends NonTerminalConsumer { keyword$10$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ICharacterClass getKeyword$7$Delimiter() { + return keyword$7$Delimiter; + } + + public void setKeyword$7$Delimiter(ICharacterClass characterClass) { + keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java index 982da6c..e0c292b 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/FowlerDslTransitionConsumer.java @@ -25,18 +25,18 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; - private ISequenceMatcher crossReference$8$Delimiter; - private ICharacterClass keyword$6$Delimiter; + private ISequenceMatcher crossReference$8$Delimiter; + private ISequenceMatcher crossReference$4$Delimiter; public FowlerDslTransitionConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); + crossReference$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); crossReference$4$Delimiter = ISequenceMatcher.Factory.nullMatcher(); } @@ -94,14 +94,6 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer { this.idConsumer = idConsumer; } - public ISequenceMatcher getCrossReference$8$Delimiter() { - return crossReference$8$Delimiter; - } - - public void setCrossReference$8$Delimiter(ISequenceMatcher matcher) { - crossReference$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - public ICharacterClass getKeyword$6$Delimiter() { return keyword$6$Delimiter; } @@ -110,6 +102,14 @@ public final class FowlerDslTransitionConsumer extends NonTerminalConsumer { keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ISequenceMatcher getCrossReference$8$Delimiter() { + return crossReference$8$Delimiter; + } + + public void setCrossReference$8$Delimiter(ISequenceMatcher matcher) { + crossReference$8$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + public ISequenceMatcher getCrossReference$4$Delimiter() { return crossReference$4$Delimiter; } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java index a67ac2a..866a33b 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/parsetree/reconstr/FowlerDslParseTreeConstructor.java @@ -429,11 +429,13 @@ protected class Event_0_0_Assignment_resetting extends AssignmentToken { protected Solution createSolution() { if((value = current.getConsumable("resetting",!IS_REQUIRED)) == null) return null; IInstanceDescription obj = current.cloneAndConsume("resetting"); - if("resetting".equals(value)) { // xtext::Keyword + + if(Boolean.TRUE.equals(value)) { // xtext::Keyword type = AssignmentType.KW; element = FowlerDslGrammarAccess.INSTANCE.prEvent().ele000KeywordResetting(); return new Solution(obj); } + return null; } } diff --git a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java index 8892f28..493e8f0 100644 --- a/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java +++ b/examples/org.eclipse.xtext.example.fowlerdsl/src-gen/org/eclipse/xtext/example/services/FowlerDslGrammarAccess.java @@ -282,7 +282,7 @@ public class FowlerDslGrammarAccess extends BaseEPackageAccess implements IGramm } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi index ff7dd73..bbf95e1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xmi @@ -10,10 +10,13 @@ <metamodelDeclarations xsi:type="xtext:ReferencedMetamodel" alias="ecore"> <ePackage href="http://www.eclipse.org/emf/2002/Ecore#/"/> </metamodelDeclarations> - <rules xsi:type="xtext:ParserRule" name="Grammar"> + <rules xsi:type="xtext:ParserRule" name="Grammar" definesHiddenTokens="true"> <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Grammar"/> </type> + <hiddenTokens href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.5"/> + <hiddenTokens href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.3"/> + <hiddenTokens href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.4"/> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> @@ -73,8 +76,11 @@ <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> </type> <alternatives xsi:type="xtext:Alternatives"> - <groups xsi:type="xtext:RuleCall" rule="//@rules.5"/> - <groups xsi:type="xtext:RuleCall" rule="//@rules.6"/> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:RuleCall" rule="//@rules.5"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.6"/> + </groups> + <groups xsi:type="xtext:RuleCall" rule="//@rules.7"/> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="AbstractMetamodelDeclaration"> @@ -100,8 +106,11 @@ </terminal> </abstractTokens> </abstractTokens> - <abstractTokens xsi:type="xtext:Assignment" feature="nsURI" operator="="> - <terminal xsi:type="xtext:RuleCall"> + <abstractTokens xsi:type="xtext:Assignment" feature="ePackage" operator="="> + <terminal xsi:type="xtext:CrossReference"> + <type metamodel="//@metamodelDeclarations.1"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + </type> <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> </terminal> </abstractTokens> @@ -123,8 +132,11 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="import"/> - <abstractTokens xsi:type="xtext:Assignment" feature="uri" operator="="> - <terminal xsi:type="xtext:RuleCall"> + <abstractTokens xsi:type="xtext:Assignment" feature="ePackage" operator="="> + <terminal xsi:type="xtext:CrossReference"> + <type metamodel="//@metamodelDeclarations.1"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + </type> <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.2"/> </terminal> </abstractTokens> @@ -161,7 +173,7 @@ <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Keyword" value="returns"/> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> </abstractTokens> </abstractTokens> </abstractTokens> @@ -184,22 +196,90 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> - <terminal xsi:type="xtext:RuleCall"> - <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> - </terminal> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <terminal xsi:type="xtext:RuleCall"> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + </terminal> + </abstractTokens> + <abstractTokens xsi:type="xtext:Group" cardinality="?"> + <abstractTokens xsi:type="xtext:Keyword" value="returns"/> + <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> + </abstractTokens> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Group" cardinality="?"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Assignment" feature="definesHiddenTokens" operator="?="> + <terminal xsi:type="xtext:Keyword" value="hidden"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value="("/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="hiddenTokens" operator="+="> + <terminal xsi:type="xtext:CrossReference"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> + </type> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + </terminal> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value=","/> + <abstractTokens xsi:type="xtext:Assignment" feature="hiddenTokens" operator="+="> + <terminal xsi:type="xtext:CrossReference"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractRule"/> + </type> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + </terminal> + </abstractTokens> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=":"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="alternatives" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.9"/> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=";"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="TerminalRule"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//ParserRule"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Assignment" feature="terminal" operator="?="> + <terminal xsi:type="xtext:Keyword" value="terminal"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="name" operator="="> + <terminal xsi:type="xtext:RuleCall"> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.0"/> + </terminal> + </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> <abstractTokens xsi:type="xtext:Keyword" value="returns"/> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> </abstractTokens> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value=":"/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="alternatives" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value=";"/> @@ -236,7 +316,7 @@ <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.9"/> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.11"/> <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Action" feature="groups" operator="+="> @@ -247,7 +327,28 @@ <abstractTokens xsi:type="xtext:Keyword" value="|"/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="groups" operator="+="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.9"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.11"/> + </abstractTokens> + </abstractTokens> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="TerminalAlternatives"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.12"/> + <abstractTokens xsi:type="xtext:Group" cardinality="*"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Action" feature="groups" operator="+="> + <typeName metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Alternatives"/> + </typeName> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value="|"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="groups" operator="+="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.12"/> </abstractTokens> </abstractTokens> </alternatives> @@ -257,7 +358,7 @@ <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> </type> <alternatives xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.13"/> <abstractTokens xsi:type="xtext:Group" cardinality="*"> <abstractTokens xsi:type="xtext:Action" feature="abstractTokens" operator="+="> <typeName metamodel="//@metamodelDeclarations.0"> @@ -265,7 +366,25 @@ </typeName> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="abstractTokens" operator="+="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.10"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.13"/> + </abstractTokens> + </abstractTokens> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="TerminalGroup"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.14"/> + <abstractTokens xsi:type="xtext:Group" cardinality="*"> + <abstractTokens xsi:type="xtext:Action" feature="abstractTokens" operator="+="> + <typeName metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Group"/> + </typeName> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="abstractTokens" operator="+="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.14"/> </abstractTokens> </abstractTokens> </alternatives> @@ -277,10 +396,10 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Alternatives"> - <groups xsi:type="xtext:RuleCall" rule="//@rules.11"/> - <groups xsi:type="xtext:RuleCall" rule="//@rules.12"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.15"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.16"/> </groups> - <groups xsi:type="xtext:RuleCall" rule="//@rules.13"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.17"/> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="cardinality" operator="="> <terminal xsi:type="xtext:Alternatives"> @@ -293,6 +412,23 @@ </abstractTokens> </alternatives> </rules> + <rules xsi:type="xtext:ParserRule" name="TerminalToken"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.18"/> + <abstractTokens xsi:type="xtext:Assignment" cardinality="?" feature="cardinality" operator="="> + <terminal xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Keyword" value="?"/> + <groups xsi:type="xtext:Keyword" value="*"/> + </groups> + <groups xsi:type="xtext:Keyword" value="+"/> + </terminal> + </abstractTokens> + </alternatives> + </rules> <rules xsi:type="xtext:ParserRule" name="Assignment"> <type metamodel="//@metamodelDeclarations.0"> <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Assignment"/> @@ -315,7 +451,7 @@ </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="terminal" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.13"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.17"/> </abstractTokens> </alternatives> </rules> @@ -337,7 +473,7 @@ </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Assignment" feature="typeName" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value="."/> @@ -367,12 +503,90 @@ <alternatives xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Alternatives"> <groups xsi:type="xtext:Alternatives"> - <groups xsi:type="xtext:RuleCall" rule="//@rules.16"/> - <groups xsi:type="xtext:RuleCall" rule="//@rules.17"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.27"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.28"/> </groups> - <groups xsi:type="xtext:RuleCall" rule="//@rules.15"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.25"/> </groups> - <groups xsi:type="xtext:RuleCall" rule="//@rules.14"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.24"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="TerminalTokenElement"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:RuleCall" rule="//@rules.23"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.28"/> + </groups> + <groups xsi:type="xtext:RuleCall" rule="//@rules.26"/> + </groups> + <groups xsi:type="xtext:RuleCall" rule="//@rules.19"/> + </groups> + <groups xsi:type="xtext:RuleCall" rule="//@rules.22"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="AbstractNegatedToken"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractNegatedToken"/> + </type> + <alternatives xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:RuleCall" rule="//@rules.20"/> + <groups xsi:type="xtext:RuleCall" rule="//@rules.21"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="NegatedToken"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//NegatedToken"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="!"/> + <abstractTokens xsi:type="xtext:Assignment" feature="terminal" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.18"/> + </abstractTokens> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="UpToToken"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//UpToToken"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="->"/> + <abstractTokens xsi:type="xtext:Assignment" feature="terminal" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.18"/> + </abstractTokens> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="Wildcard"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//Wildcard"/> + </type> + <alternatives xsi:type="xtext:Assignment" feature="isWildcard" operator="?="> + <terminal xsi:type="xtext:Keyword" value="."/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="CharacterRange"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.27"/> + <abstractTokens xsi:type="xtext:Group" cardinality="?"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Action" feature="left" operator="="> + <typeName metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//CharacterRange"/> + </typeName> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=".."/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Assignment" feature="right" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.27"/> + </abstractTokens> + </abstractTokens> </alternatives> </rules> <rules xsi:type="xtext:ParserRule" name="CrossReference"> @@ -384,7 +598,7 @@ <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="["/> <abstractTokens xsi:type="xtext:Assignment" feature="type" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.7"/> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.8"/> </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> @@ -409,7 +623,19 @@ <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Keyword" value="("/> - <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.8"/> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.9"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="ParenthesizedTerminalElement"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EClass" href="http://www.eclipse.org/2008/Test/XtextTest#//AbstractElement"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="("/> + <abstractTokens xsi:type="xtext:RuleCall" rule="//@rules.10"/> </abstractTokens> <abstractTokens xsi:type="xtext:Keyword" value=")"/> </alternatives> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore index e657032..8d076d0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/XtextTest.ecore @@ -23,27 +23,30 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="ePackage"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="GeneratedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eStructuralFeatures> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ReferencedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eStructuralFeatures> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="ReferencedMetamodel" eSuperTypes="//AbstractMetamodelDeclaration"/> <eClassifiers xsi:type="ecore:EClass" name="LexerRule" eSuperTypes="//AbstractRule"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="body"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ParserRule" eSuperTypes="//AbstractRule"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="definesHiddenTokens"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EReference" name="hiddenTokens" unique="false" upperBound="-1" eType="//AbstractRule"/> <eStructuralFeatures xsi:type="ecore:EReference" name="alternatives" eType="//AbstractElement" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="terminal"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + </eStructuralFeatures> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TypeRef"> <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" eType="//AbstractMetamodelDeclaration"/> @@ -74,6 +77,16 @@ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eStructuralFeatures> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="AbstractNegatedToken" eSuperTypes="//AbstractElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="terminal" eType="//AbstractElement" containment="true"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="NegatedToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="UpToToken" eSuperTypes="//AbstractNegatedToken"/> + <eClassifiers xsi:type="ecore:EClass" name="Wildcard" eSuperTypes="//AbstractElement"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="isWildcard"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> + </eStructuralFeatures> + </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CrossReference" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="rule" eType="//AbstractRule"/> @@ -92,4 +105,8 @@ <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="//AbstractElement"> <eStructuralFeatures xsi:type="ecore:EReference" name="abstractTokens" unique="false" upperBound="-1" eType="//AbstractElement" containment="true"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="CharacterRange" eSuperTypes="//AbstractElement"> + <eStructuralFeatures xsi:type="ecore:EReference" name="left" eType="//Keyword" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="right" eType="//Keyword" containment="true"/> + </eClassifiers> </ecore:EPackage> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g index b593162..38ff915 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleMain entryRuleMain returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -122,6 +123,8 @@ ruleMain returns [EObject current=null] + + // Entry rule entryRuleImport entryRuleImport returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); } @@ -164,6 +167,8 @@ ruleImport returns [EObject current=null] + + // Entry rule entryRuleType entryRuleType returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); } @@ -225,6 +230,14 @@ ruleType returns [EObject current=null] + + + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java index 4796f29..e7ae911 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g 2009-01-19 11:41:30 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g 2009-01-19 15:14:03 package org.eclipse.xtext.crossrefs.parser.antlr.internal; @@ -92,10 +92,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:228:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:228:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:228:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -104,7 +104,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:228:12: '^' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:12: '^' { match('^'); @@ -123,7 +123,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:228:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:241:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -171,10 +171,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:230:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:230:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:230:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -188,7 +188,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:230:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:243:13: '0' .. '9' { matchRange('0','9'); @@ -218,7 +218,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -230,16 +230,16 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("232:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("245:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -255,7 +255,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:21: '\\\\' ( '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' ) { @@ -272,7 +272,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -298,10 +298,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -317,7 +317,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:108: '\\\\' ( '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' ) { @@ -334,7 +334,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:232:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:245:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -372,12 +372,12 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:234:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:234:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:234:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -402,7 +402,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:234:52: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:247:52: . { matchAny(); @@ -431,12 +431,12 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -449,7 +449,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249: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(); @@ -470,7 +470,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -479,9 +479,9 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -490,7 +490,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:236:39: '\\r' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:249:39: '\\r' { match('\r'); @@ -521,10 +521,10 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:238:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -578,8 +578,8 @@ public class InternalImportUriTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:16: ( . ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:240:18: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:253:16: ( . ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:253:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageParser.java index 2cb493a..8d591df 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g 2009-01-19 11:41:30 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g 2009-01-19 15:14:03 package org.eclipse.xtext.crossrefs.parser.antlr.internal; @@ -64,7 +64,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start entryRuleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:66:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:67:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; public final EObject entryRuleMain() throws RecognitionException { EObject current = null; @@ -72,16 +72,16 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:66:46: (iv_ruleMain= ruleMain EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:67:2: iv_ruleMain= ruleMain EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:67:46: (iv_ruleMain= ruleMain EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:68:2: iv_ruleMain= ruleMain EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleMain_in_entryRuleMain71); + pushFollow(FOLLOW_ruleMain_in_entryRuleMain72); iv_ruleMain=ruleMain(); _fsp--; current =iv_ruleMain; - match(input,EOF,FOLLOW_EOF_in_entryRuleMain81); + match(input,EOF,FOLLOW_EOF_in_entryRuleMain82); } @@ -99,7 +99,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start ruleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:74:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:75:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; public final EObject ruleMain() throws RecognitionException { EObject current = null; @@ -110,13 +110,13 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:76:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:77:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:78:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:77:2: (lv_imports= ruleImport )* (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:78:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:78:2: (lv_imports= ruleImport )* (lv_types= ruleType )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:77:2: (lv_imports= ruleImport )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:78:2: (lv_imports= ruleImport )* loop1: do { int alt1=2; @@ -129,12 +129,12 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:80:6: lv_imports= ruleImport + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:81:6: lv_imports= ruleImport { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleImport_in_ruleMain140); + pushFollow(FOLLOW_ruleImport_in_ruleMain141); lv_imports=ruleImport(); _fsp--; @@ -160,7 +160,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:98:3: (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:99:3: (lv_types= ruleType )* loop2: do { int alt2=2; @@ -173,12 +173,12 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:101:6: lv_types= ruleType + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:102:6: lv_types= ruleType { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleType_in_ruleMain179); + pushFollow(FOLLOW_ruleType_in_ruleMain180); lv_types=ruleType(); _fsp--; @@ -225,7 +225,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start entryRuleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:126:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:129:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -233,16 +233,16 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:126:48: (iv_ruleImport= ruleImport EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:127:2: iv_ruleImport= ruleImport EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:129:48: (iv_ruleImport= ruleImport EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:130:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleImport_in_entryRuleImport217); + pushFollow(FOLLOW_ruleImport_in_entryRuleImport220); iv_ruleImport=ruleImport(); _fsp--; current =iv_ruleImport; - match(input,EOF,FOLLOW_EOF_in_entryRuleImport227); + match(input,EOF,FOLLOW_EOF_in_entryRuleImport230); } @@ -260,7 +260,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start ruleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:134:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:137:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; @@ -268,21 +268,21 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:136:33: ( ( 'import' (lv_importURI= RULE_STRING ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:137:1: ( 'import' (lv_importURI= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:139:33: ( ( 'import' (lv_importURI= RULE_STRING ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:140:1: ( 'import' (lv_importURI= RULE_STRING ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:137:1: ( 'import' (lv_importURI= RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:137:2: 'import' (lv_importURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:140:1: ( 'import' (lv_importURI= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:140:2: 'import' (lv_importURI= RULE_STRING ) { - match(input,11,FOLLOW_11_in_ruleImport261); + match(input,11,FOLLOW_11_in_ruleImport264); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:141:1: (lv_importURI= RULE_STRING ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:143:6: lv_importURI= RULE_STRING + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:144:1: (lv_importURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:146:6: lv_importURI= RULE_STRING { lv_importURI=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport282); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "importURI"); @@ -322,7 +322,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start entryRuleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:168:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:173:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; public final EObject entryRuleType() throws RecognitionException { EObject current = null; @@ -330,16 +330,16 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:168:46: (iv_ruleType= ruleType EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:169:2: iv_ruleType= ruleType EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:173:46: (iv_ruleType= ruleType EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:174:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleType_in_entryRuleType326); + pushFollow(FOLLOW_ruleType_in_entryRuleType331); iv_ruleType=ruleType(); _fsp--; current =iv_ruleType; - match(input,EOF,FOLLOW_EOF_in_entryRuleType336); + match(input,EOF,FOLLOW_EOF_in_entryRuleType341); } @@ -357,7 +357,7 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa // $ANTLR start ruleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:176:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:181:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; public final EObject ruleType() throws RecognitionException { EObject current = null; @@ -365,27 +365,27 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:178:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:183:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:179:4: 'type' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:3: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:184:4: 'type' (lv_name= RULE_ID ) { - match(input,12,FOLLOW_12_in_ruleType372); + match(input,12,FOLLOW_12_in_ruleType377); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:183:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:185:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:188:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:190:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType393); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType398); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -407,15 +407,15 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa } - match(input,13,FOLLOW_13_in_ruleType414); + match(input,13,FOLLOW_13_in_ruleType419); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:207:2: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:210:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:212:2: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:215:3: ( RULE_ID ) { if (current==null) { @@ -423,10 +423,10 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:216:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:217:2: RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:221:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g:222:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType439); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType444); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "extends"); @@ -458,19 +458,19 @@ public class InternalImportUriTestLanguageParser extends AbstractInternalAntlrPa - public static final BitSet FOLLOW_ruleMain_in_entryRuleMain71 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleMain81 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleImport_in_ruleMain140 = new BitSet(new long[]{0x0000000000001802L}); - public static final BitSet FOLLOW_ruleType_in_ruleMain179 = new BitSet(new long[]{0x0000000000001002L}); - 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_ruleImport282 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_entryRuleType326 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleType336 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_ruleType372 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleType393 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleType414 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleType439 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleMain_in_entryRuleMain72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleMain82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleImport_in_ruleMain141 = new BitSet(new long[]{0x0000000000001802L}); + public static final BitSet FOLLOW_ruleType_in_ruleMain180 = new BitSet(new long[]{0x0000000000001002L}); + 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_ruleType_in_entryRuleType331 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleType341 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_ruleType377 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleType398 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleType419 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleType444 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g index 1c26150..f74ad5d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'import' ; T12 : 'type' ; T13 : 'extends' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 228 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 241 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 230 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 243 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 232 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 245 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 234 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 247 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 236 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 249 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 238 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 251 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 240 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalImportUriTestLanguage.g" 253 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g index a137818..09efbca 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleMain entryRuleMain returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -122,6 +123,8 @@ ruleMain returns [EObject current=null] + + // Entry rule entryRuleImport entryRuleImport returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); } @@ -164,6 +167,8 @@ ruleImport returns [EObject current=null] + + // Entry rule entryRuleType entryRuleType returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); } @@ -225,6 +230,14 @@ ruleType returns [EObject current=null] + + + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java index a31b22b..33bd286 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g 2009-01-19 11:41:10 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g 2009-01-19 15:13:45 package org.eclipse.xtext.crossrefs.parser.antlr.internal; @@ -92,10 +92,10 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:228:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:228:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:241:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:241:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:228:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:241:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -104,7 +104,7 @@ public class InternalLangATestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:228:12: '^' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:241:12: '^' { match('^'); @@ -123,7 +123,7 @@ public class InternalLangATestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:228:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:241:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -171,10 +171,10 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:230:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:230:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:243:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:243:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:230:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:243:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -188,7 +188,7 @@ public class InternalLangATestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:230:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:243:13: '0' .. '9' { matchRange('0','9'); @@ -218,7 +218,7 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -230,16 +230,16 @@ public class InternalLangATestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("232:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("245:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -255,7 +255,7 @@ public class InternalLangATestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:21: '\\\\' ( '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' ) { @@ -272,7 +272,7 @@ public class InternalLangATestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -298,10 +298,10 @@ public class InternalLangATestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -317,7 +317,7 @@ public class InternalLangATestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:108: '\\\\' ( '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' ) { @@ -334,7 +334,7 @@ public class InternalLangATestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:232:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:245:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -372,12 +372,12 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:234:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:234:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:247:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:247:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:234:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:247:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -402,7 +402,7 @@ public class InternalLangATestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:234:52: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:247:52: . { matchAny(); @@ -431,12 +431,12 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -449,7 +449,7 @@ public class InternalLangATestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249: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(); @@ -470,7 +470,7 @@ public class InternalLangATestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -479,9 +479,9 @@ public class InternalLangATestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -490,7 +490,7 @@ public class InternalLangATestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:236:39: '\\r' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:249:39: '\\r' { match('\r'); @@ -521,10 +521,10 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:238:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:251:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:251:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -578,8 +578,8 @@ public class InternalLangATestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:240:16: ( . ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:240:18: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:253:16: ( . ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:253:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageParser.java index 6a9ad18..a8310b3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g 2009-01-19 11:41:10 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g 2009-01-19 15:13:45 package org.eclipse.xtext.crossrefs.parser.antlr.internal; @@ -64,7 +64,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:66:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:67:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; public final EObject entryRuleMain() throws RecognitionException { EObject current = null; @@ -72,16 +72,16 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:66:46: (iv_ruleMain= ruleMain EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:67:2: iv_ruleMain= ruleMain EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:67:46: (iv_ruleMain= ruleMain EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:68:2: iv_ruleMain= ruleMain EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleMain_in_entryRuleMain71); + pushFollow(FOLLOW_ruleMain_in_entryRuleMain72); iv_ruleMain=ruleMain(); _fsp--; current =iv_ruleMain; - match(input,EOF,FOLLOW_EOF_in_entryRuleMain81); + match(input,EOF,FOLLOW_EOF_in_entryRuleMain82); } @@ -99,7 +99,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start ruleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:74:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:75:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; public final EObject ruleMain() throws RecognitionException { EObject current = null; @@ -110,13 +110,13 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:76:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:77:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:78:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:77:2: (lv_imports= ruleImport )* (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:78:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:78:2: (lv_imports= ruleImport )* (lv_types= ruleType )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:77:2: (lv_imports= ruleImport )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:78:2: (lv_imports= ruleImport )* loop1: do { int alt1=2; @@ -129,12 +129,12 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:80:6: lv_imports= ruleImport + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:81:6: lv_imports= ruleImport { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleImport_in_ruleMain140); + pushFollow(FOLLOW_ruleImport_in_ruleMain141); lv_imports=ruleImport(); _fsp--; @@ -160,7 +160,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:98:3: (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:99:3: (lv_types= ruleType )* loop2: do { int alt2=2; @@ -173,12 +173,12 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:101:6: lv_types= ruleType + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:102:6: lv_types= ruleType { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleType_in_ruleMain179); + pushFollow(FOLLOW_ruleType_in_ruleMain180); lv_types=ruleType(); _fsp--; @@ -225,7 +225,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:126:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:129:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -233,16 +233,16 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:126:48: (iv_ruleImport= ruleImport EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:127:2: iv_ruleImport= ruleImport EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:129:48: (iv_ruleImport= ruleImport EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:130:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleImport_in_entryRuleImport217); + pushFollow(FOLLOW_ruleImport_in_entryRuleImport220); iv_ruleImport=ruleImport(); _fsp--; current =iv_ruleImport; - match(input,EOF,FOLLOW_EOF_in_entryRuleImport227); + match(input,EOF,FOLLOW_EOF_in_entryRuleImport230); } @@ -260,7 +260,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start ruleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:134:1: ruleImport returns [EObject current=null] : ( 'import' (lv_uri= RULE_STRING ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:137:1: ruleImport returns [EObject current=null] : ( 'import' (lv_uri= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; @@ -268,21 +268,21 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:136:33: ( ( 'import' (lv_uri= RULE_STRING ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:137:1: ( 'import' (lv_uri= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:139:33: ( ( 'import' (lv_uri= RULE_STRING ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:140:1: ( 'import' (lv_uri= RULE_STRING ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:137:1: ( 'import' (lv_uri= RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:137:2: 'import' (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:140:1: ( 'import' (lv_uri= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:140:2: 'import' (lv_uri= RULE_STRING ) { - match(input,11,FOLLOW_11_in_ruleImport261); + match(input,11,FOLLOW_11_in_ruleImport264); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:141:1: (lv_uri= RULE_STRING ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:143:6: lv_uri= RULE_STRING + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:144:1: (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:146:6: lv_uri= RULE_STRING { lv_uri=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport282); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport285); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "uri"); @@ -322,7 +322,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:168:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:173:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; public final EObject entryRuleType() throws RecognitionException { EObject current = null; @@ -330,16 +330,16 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:168:46: (iv_ruleType= ruleType EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:169:2: iv_ruleType= ruleType EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:173:46: (iv_ruleType= ruleType EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:174:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleType_in_entryRuleType326); + pushFollow(FOLLOW_ruleType_in_entryRuleType331); iv_ruleType=ruleType(); _fsp--; current =iv_ruleType; - match(input,EOF,FOLLOW_EOF_in_entryRuleType336); + match(input,EOF,FOLLOW_EOF_in_entryRuleType341); } @@ -357,7 +357,7 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start ruleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:176:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:181:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; public final EObject ruleType() throws RecognitionException { EObject current = null; @@ -365,27 +365,27 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:178:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:183:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:179:4: 'type' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:3: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:184:4: 'type' (lv_name= RULE_ID ) { - match(input,12,FOLLOW_12_in_ruleType372); + match(input,12,FOLLOW_12_in_ruleType377); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:183:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:185:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:188:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:190:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType393); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType398); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -407,15 +407,15 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser } - match(input,13,FOLLOW_13_in_ruleType414); + match(input,13,FOLLOW_13_in_ruleType419); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:207:2: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:210:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:212:2: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:215:3: ( RULE_ID ) { if (current==null) { @@ -423,10 +423,10 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:216:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:217:2: RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:221:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g:222:2: RULE_ID { - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType439); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType444); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::CrossReference */, "extends"); @@ -458,19 +458,19 @@ public class InternalLangATestLanguageParser extends AbstractInternalAntlrParser - public static final BitSet FOLLOW_ruleMain_in_entryRuleMain71 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleMain81 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleImport_in_ruleMain140 = new BitSet(new long[]{0x0000000000001802L}); - public static final BitSet FOLLOW_ruleType_in_ruleMain179 = new BitSet(new long[]{0x0000000000001002L}); - 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_ruleImport282 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleType_in_entryRuleType326 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleType336 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_ruleType372 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleType393 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleType414 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleType439 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleMain_in_entryRuleMain72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleMain82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleImport_in_ruleMain141 = new BitSet(new long[]{0x0000000000001802L}); + public static final BitSet FOLLOW_ruleType_in_ruleMain180 = new BitSet(new long[]{0x0000000000001002L}); + 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_ruleType_in_entryRuleType331 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleType341 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_ruleType377 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleType398 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleType419 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleType444 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g index 8d44924..96fee75 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'import' ; T12 : 'type' ; T13 : 'extends' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 228 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 241 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 230 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 243 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 232 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 245 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 234 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 247 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 236 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 249 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 238 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 251 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 240 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/antlr/internal/InternalLangATestLanguage.g" 253 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageDelimiters.java index c94c77a..7cd3322 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageDelimiters.java @@ -15,11 +15,10 @@ public final class ImportUriTestLanguageDelimiters { } public static ISequenceMatcher ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - - // TODO do not use IDConsumer internals + public static ICharacterClass keyword$11$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - + public static ISequenceMatcher ruleCall$21$Delimiter = new SetBasedKeywordMatcher( "import", "type", "extends"); - + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java index 8fd62f9..27088a5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/ImportUriTestLanguageParserConfiguration.java @@ -47,8 +47,7 @@ public class ImportUriTestLanguageParserConfiguration extends AbstractParserConf public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); mainConsumer = new ImportUriTestLanguageMainConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); importConsumer = new ImportUriTestLanguageImportConsumer( getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null @@ -72,24 +71,10 @@ public class ImportUriTestLanguageParserConfiguration extends AbstractParserConf getImportConsumer().setRuleCall$4$Delimiter(ImportUriTestLanguageDelimiters.ruleCall$13$Delimiter); getImportConsumer().setKeyword$2$Delimiter(ImportUriTestLanguageDelimiters.keyword$11$Delimiter); - getTypeConsumer().setRuleCall$6$Delimiter(ImportUriTestLanguageDelimiters.ruleCall$21$Delimiter); - getTypeConsumer().setKeyword$4$Delimiter(ImportUriTestLanguageDelimiters.keyword$11$Delimiter); getTypeConsumer().setCrossReference$9$Delimiter(ImportUriTestLanguageDelimiters.ruleCall$21$Delimiter); + getTypeConsumer().setRuleCall$6$Delimiter(ImportUriTestLanguageDelimiters.ruleCall$21$Delimiter); getTypeConsumer().setKeyword$7$Delimiter(ImportUriTestLanguageDelimiters.keyword$11$Delimiter); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); + getTypeConsumer().setKeyword$4$Delimiter(ImportUriTestLanguageDelimiters.keyword$11$Delimiter); } // TODO collect superGrammars transitive diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageDelimiters.java index 9c279a0..8496684 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageDelimiters.java @@ -15,11 +15,10 @@ public final class LangATestLanguageDelimiters { } public static ISequenceMatcher ruleCall$13$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - - // TODO do not use IDConsumer internals + public static ICharacterClass keyword$11$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - + public static ISequenceMatcher ruleCall$21$Delimiter = new SetBasedKeywordMatcher( "import", "type", "extends"); - + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java index 56e894e..3f93297 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/LangATestLanguageParserConfiguration.java @@ -47,8 +47,7 @@ public class LangATestLanguageParserConfiguration extends AbstractParserConfigur public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); mainConsumer = new LangATestLanguageMainConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); importConsumer = new LangATestLanguageImportConsumer( getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null @@ -72,24 +71,10 @@ public class LangATestLanguageParserConfiguration extends AbstractParserConfigur getImportConsumer().setRuleCall$4$Delimiter(LangATestLanguageDelimiters.ruleCall$13$Delimiter); getImportConsumer().setKeyword$2$Delimiter(LangATestLanguageDelimiters.keyword$11$Delimiter); - getTypeConsumer().setKeyword$7$Delimiter(LangATestLanguageDelimiters.keyword$11$Delimiter); getTypeConsumer().setCrossReference$9$Delimiter(LangATestLanguageDelimiters.ruleCall$21$Delimiter); getTypeConsumer().setRuleCall$6$Delimiter(LangATestLanguageDelimiters.ruleCall$21$Delimiter); + getTypeConsumer().setKeyword$7$Delimiter(LangATestLanguageDelimiters.keyword$11$Delimiter); getTypeConsumer().setKeyword$4$Delimiter(LangATestLanguageDelimiters.keyword$11$Delimiter); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); } // TODO collect superGrammars transitive diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java index 59ca97e..73185fd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/ImportUriTestLanguageTypeConsumer.java @@ -25,22 +25,22 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer private XtextBuiltinIDConsumer idConsumer; - private ISequenceMatcher ruleCall$6$Delimiter; - - private ICharacterClass keyword$4$Delimiter; - private ISequenceMatcher crossReference$9$Delimiter; + private ISequenceMatcher ruleCall$6$Delimiter; + private ICharacterClass keyword$7$Delimiter; + private ICharacterClass keyword$4$Delimiter; + public ImportUriTestLanguageTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); crossReference$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -105,22 +105,6 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer this.idConsumer = idConsumer; } - public ISequenceMatcher getRuleCall$6$Delimiter() { - return ruleCall$6$Delimiter; - } - - public void setRuleCall$6$Delimiter(ISequenceMatcher matcher) { - ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ICharacterClass getKeyword$4$Delimiter() { - return keyword$4$Delimiter; - } - - public void setKeyword$4$Delimiter(ICharacterClass characterClass) { - keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ISequenceMatcher getCrossReference$9$Delimiter() { return crossReference$9$Delimiter; } @@ -129,6 +113,14 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer crossReference$9$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ISequenceMatcher getRuleCall$6$Delimiter() { + return ruleCall$6$Delimiter; + } + + public void setRuleCall$6$Delimiter(ISequenceMatcher matcher) { + ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + public ICharacterClass getKeyword$7$Delimiter() { return keyword$7$Delimiter; } @@ -137,4 +129,12 @@ public final class ImportUriTestLanguageTypeConsumer extends NonTerminalConsumer keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ICharacterClass getKeyword$4$Delimiter() { + return keyword$4$Delimiter; + } + + public void setKeyword$4$Delimiter(ICharacterClass characterClass) { + keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java index 28388c7..fc5e6e9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/packrat/consumers/LangATestLanguageTypeConsumer.java @@ -25,21 +25,21 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer { private XtextBuiltinIDConsumer idConsumer; - private ICharacterClass keyword$7$Delimiter; - private ISequenceMatcher crossReference$9$Delimiter; private ISequenceMatcher ruleCall$6$Delimiter; + private ICharacterClass keyword$7$Delimiter; + private ICharacterClass keyword$4$Delimiter; public LangATestLanguageTypeConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); crossReference$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } @@ -105,14 +105,6 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer { this.idConsumer = idConsumer; } - public ICharacterClass getKeyword$7$Delimiter() { - return keyword$7$Delimiter; - } - - public void setKeyword$7$Delimiter(ICharacterClass characterClass) { - keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ISequenceMatcher getCrossReference$9$Delimiter() { return crossReference$9$Delimiter; } @@ -129,6 +121,14 @@ public final class LangATestLanguageTypeConsumer extends NonTerminalConsumer { ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ICharacterClass getKeyword$7$Delimiter() { + return keyword$7$Delimiter; + } + + public void setKeyword$7$Delimiter(ICharacterClass characterClass) { + keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + public ICharacterClass getKeyword$4$Delimiter() { return keyword$4$Delimiter; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java index 2f35300..454e717 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/ImportUriTestLanguageGrammarAccess.java @@ -122,7 +122,7 @@ public class ImportUriTestLanguageGrammarAccess extends BaseEPackageAccess imple } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java index 897602f..ff63e7a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/services/LangATestLanguageGrammarAccess.java @@ -122,7 +122,7 @@ public class LangATestLanguageGrammarAccess extends BaseEPackageAccess implement } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g index fd8a79b..dea3f19 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleModel entryRuleModel returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -101,6 +102,8 @@ ruleModel returns [EObject current=null] + + // Entry rule entryRuleElement entryRuleElement returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); } @@ -187,6 +190,12 @@ ruleElement returns [EObject current=null] + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java index 612c6ae..3bd4afd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g 2009-01-19 11:41:17 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g 2009-01-19 15:13:52 package org.eclipse.xtext.dummy.parser.antlr.internal; @@ -91,10 +91,10 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:190:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:190:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:199:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:199:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:190:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:199:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -103,7 +103,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:190:12: '^' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:199:12: '^' { match('^'); @@ -122,7 +122,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:190:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:199:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -170,10 +170,10 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:192:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:192:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:201:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:201:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:192:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:201:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -187,7 +187,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:192:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:201:13: '0' .. '9' { matchRange('0','9'); @@ -217,7 +217,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -229,16 +229,16 @@ public class InternalDummyTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("194:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("203:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -254,7 +254,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:21: '\\\\' ( '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' ) { @@ -271,7 +271,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -297,10 +297,10 @@ public class InternalDummyTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -316,7 +316,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:108: '\\\\' ( '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' ) { @@ -333,7 +333,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:194:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:203:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -371,12 +371,12 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:196:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:196:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:205:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:205:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:196:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:205:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -401,7 +401,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:196:52: . + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:205:52: . { matchAny(); @@ -430,12 +430,12 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -448,7 +448,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207: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(); @@ -469,7 +469,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -478,9 +478,9 @@ public class InternalDummyTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -489,7 +489,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:198:39: '\\r' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:207:39: '\\r' { match('\r'); @@ -520,10 +520,10 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:200:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:200:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:209:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:209:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:200:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:209:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -577,8 +577,8 @@ public class InternalDummyTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:202:16: ( . ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:202:18: . + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:211:16: ( . ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:211:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageParser.java index cb7bf14..8f453d0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g 2009-01-19 11:41:17 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g 2009-01-19 15:13:52 package org.eclipse.xtext.dummy.parser.antlr.internal; @@ -64,7 +64,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleModel - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:66:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:67:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -72,16 +72,16 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:66:47: (iv_ruleModel= ruleModel EOF ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:67:2: iv_ruleModel= ruleModel EOF + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:67:47: (iv_ruleModel= ruleModel EOF ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:68:2: iv_ruleModel= ruleModel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleModel_in_entryRuleModel71); + pushFollow(FOLLOW_ruleModel_in_entryRuleModel72); iv_ruleModel=ruleModel(); _fsp--; current =iv_ruleModel; - match(input,EOF,FOLLOW_EOF_in_entryRuleModel81); + match(input,EOF,FOLLOW_EOF_in_entryRuleModel82); } @@ -99,7 +99,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start ruleModel - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:74:1: ruleModel returns [EObject current=null] : (lv_elements= ruleElement )* ; + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:75:1: ruleModel returns [EObject current=null] : (lv_elements= ruleElement )* ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -108,10 +108,10 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:76:33: ( (lv_elements= ruleElement )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:77:1: (lv_elements= ruleElement )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:77:33: ( (lv_elements= ruleElement )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:78:1: (lv_elements= ruleElement )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:77:1: (lv_elements= ruleElement )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:78:1: (lv_elements= ruleElement )* loop1: do { int alt1=2; @@ -124,12 +124,12 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:80:6: lv_elements= ruleElement + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:81:6: lv_elements= ruleElement { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.0/@alternatives/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleElement_in_ruleModel139); + pushFollow(FOLLOW_ruleElement_in_ruleModel140); lv_elements=ruleElement(); _fsp--; @@ -173,7 +173,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start entryRuleElement - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:105:1: entryRuleElement returns [EObject current=null] : iv_ruleElement= ruleElement EOF ; + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:108:1: entryRuleElement returns [EObject current=null] : iv_ruleElement= ruleElement EOF ; public final EObject entryRuleElement() throws RecognitionException { EObject current = null; @@ -181,16 +181,16 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser try { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:105:49: (iv_ruleElement= ruleElement EOF ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:106:2: iv_ruleElement= ruleElement EOF + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:108:49: (iv_ruleElement= ruleElement EOF ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:109:2: iv_ruleElement= ruleElement EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleElement_in_entryRuleElement176); + pushFollow(FOLLOW_ruleElement_in_entryRuleElement179); iv_ruleElement=ruleElement(); _fsp--; current =iv_ruleElement; - match(input,EOF,FOLLOW_EOF_in_entryRuleElement186); + match(input,EOF,FOLLOW_EOF_in_entryRuleElement189); } @@ -208,7 +208,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start ruleElement - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:113:1: ruleElement returns [EObject current=null] : ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ; + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:1: ruleElement returns [EObject current=null] : ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ; public final EObject ruleElement() throws RecognitionException { EObject current = null; @@ -218,22 +218,22 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:115:33: ( ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:118:33: ( ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:4: ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:4: ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:4: ( (lv_optional= 'optional' )? 'element' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:5: (lv_optional= 'optional' )? 'element' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:4: ( (lv_optional= 'optional' )? 'element' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:5: (lv_optional= 'optional' )? 'element' { - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:116:5: (lv_optional= 'optional' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:119:5: (lv_optional= 'optional' )? int alt2=2; int LA2_0 = input.LA(1); @@ -242,10 +242,10 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:118:6: lv_optional= 'optional' + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:121:6: lv_optional= 'optional' { lv_optional=(Token)input.LT(1); - match(input,11,FOLLOW_11_in_ruleElement235); + match(input,11,FOLLOW_11_in_ruleElement238); createLeafNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::Keyword */, "optional"); @@ -267,18 +267,18 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser } - match(input,12,FOLLOW_12_in_ruleElement257); + match(input,12,FOLLOW_12_in_ruleElement260); createLeafNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:140:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:142:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:143:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:145:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleElement279); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleElement282); createLeafNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -300,7 +300,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser } - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:160:3: (lv_descriptions= RULE_STRING )* + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:163:3: (lv_descriptions= RULE_STRING )* loop3: do { int alt3=2; @@ -313,10 +313,10 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:162:6: lv_descriptions= RULE_STRING + // ./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g:165:6: lv_descriptions= RULE_STRING { lv_descriptions=(Token)input.LT(1); - match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleElement312); + match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleElement315); createLeafNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "descriptions"); @@ -344,7 +344,7 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser } - match(input,13,FOLLOW_13_in_ruleElement334); + match(input,13,FOLLOW_13_in_ruleElement337); createLeafNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -370,15 +370,15 @@ public class InternalDummyTestLanguageParser extends AbstractInternalAntlrParser - public static final BitSet FOLLOW_ruleModel_in_entryRuleModel71 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleModel81 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleElement_in_ruleModel139 = new BitSet(new long[]{0x0000000000001802L}); - public static final BitSet FOLLOW_ruleElement_in_entryRuleElement176 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleElement186 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_11_in_ruleElement235 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleElement257 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleElement279 = new BitSet(new long[]{0x0000000000002020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleElement312 = new BitSet(new long[]{0x0000000000002020L}); - public static final BitSet FOLLOW_13_in_ruleElement334 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleModel_in_entryRuleModel72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleModel82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleElement_in_ruleModel140 = new BitSet(new long[]{0x0000000000001802L}); + public static final BitSet FOLLOW_ruleElement_in_entryRuleElement179 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleElement189 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_11_in_ruleElement238 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_12_in_ruleElement260 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleElement282 = new BitSet(new long[]{0x0000000000002020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleElement315 = new BitSet(new long[]{0x0000000000002020L}); + public static final BitSet FOLLOW_13_in_ruleElement337 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g index 3e3116e..3c34e3a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'optional' ; T12 : 'element' ; T13 : ';' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 190 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 199 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 192 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 201 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 194 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 203 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 196 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 205 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 198 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 207 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 200 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 209 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 202 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/antlr/internal/InternalDummyTestLanguage.g" 211 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageDelimiters.java index d7e6783..aed5e6d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageDelimiters.java @@ -14,14 +14,13 @@ public final class DummyTestLanguageDelimiters { throw new UnsupportedOperationException("Utility classes may not be initialized"); } + public static ICharacterClass keyword$18$Delimiter = ICharacterClass.Factory.nullClass(); + public static ISequenceMatcher ruleCall$15$Delimiter = new SetBasedKeywordMatcher( "optional", "element"); - - // TODO do not use IDConsumer internals - public static ICharacterClass keyword$12$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - - public static ICharacterClass keyword$18$Delimiter = ICharacterClass.Factory.nullClass(); - + public static ISequenceMatcher ruleCall$17$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - + + public static ICharacterClass keyword$12$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java index b07e0b7..cd0a8bf 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/DummyTestLanguageParserConfiguration.java @@ -45,8 +45,7 @@ public class DummyTestLanguageParserConfiguration extends AbstractParserConfigur public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); modelConsumer = new DummyTestLanguageModelConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); elementConsumer = new DummyTestLanguageElementConsumer( getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null @@ -63,25 +62,11 @@ public class DummyTestLanguageParserConfiguration extends AbstractParserConfigur getElementConsumer().setIdConsumer(getIdConsumer()); getElementConsumer().setStringConsumer(getStringConsumer()); - getElementConsumer().setRuleCall$9$Delimiter(DummyTestLanguageDelimiters.ruleCall$15$Delimiter); - getElementConsumer().setKeyword$6$Delimiter(DummyTestLanguageDelimiters.keyword$12$Delimiter); getElementConsumer().setKeyword$12$Delimiter(DummyTestLanguageDelimiters.keyword$18$Delimiter); + getElementConsumer().setRuleCall$9$Delimiter(DummyTestLanguageDelimiters.ruleCall$15$Delimiter); getElementConsumer().setRuleCall$11$Delimiter(DummyTestLanguageDelimiters.ruleCall$17$Delimiter); getElementConsumer().setKeyword$7$Delimiter(DummyTestLanguageDelimiters.keyword$12$Delimiter); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); + getElementConsumer().setKeyword$6$Delimiter(DummyTestLanguageDelimiters.keyword$12$Delimiter); } // TODO collect superGrammars transitive diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java index a1515c3..e7b19a1 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/packrat/consumers/DummyTestLanguageElementConsumer.java @@ -27,25 +27,25 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer private XtextBuiltinIDConsumer idConsumer; private XtextBuiltinSTRINGConsumer stringConsumer; - private ISequenceMatcher ruleCall$9$Delimiter; - - private ICharacterClass keyword$6$Delimiter; - private ICharacterClass keyword$12$Delimiter; + private ISequenceMatcher ruleCall$9$Delimiter; + private ISequenceMatcher ruleCall$11$Delimiter; private ICharacterClass keyword$7$Delimiter; + private ICharacterClass keyword$6$Delimiter; + public DummyTestLanguageElementConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); - ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); keyword$12$Delimiter = ICharacterClass.Factory.nullClass(); + ruleCall$9$Delimiter = ISequenceMatcher.Factory.nullMatcher(); ruleCall$11$Delimiter = ISequenceMatcher.Factory.nullMatcher(); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); + keyword$6$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -134,22 +134,6 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer this.stringConsumer = stringConsumer; } - public ISequenceMatcher getRuleCall$9$Delimiter() { - return ruleCall$9$Delimiter; - } - - public void setRuleCall$9$Delimiter(ISequenceMatcher matcher) { - ruleCall$9$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); - } - - public ICharacterClass getKeyword$6$Delimiter() { - return keyword$6$Delimiter; - } - - public void setKeyword$6$Delimiter(ICharacterClass characterClass) { - keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ICharacterClass getKeyword$12$Delimiter() { return keyword$12$Delimiter; } @@ -158,6 +142,14 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer keyword$12$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ISequenceMatcher getRuleCall$9$Delimiter() { + return ruleCall$9$Delimiter; + } + + public void setRuleCall$9$Delimiter(ISequenceMatcher matcher) { + ruleCall$9$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); + } + public ISequenceMatcher getRuleCall$11$Delimiter() { return ruleCall$11$Delimiter; } @@ -174,4 +166,12 @@ public final class DummyTestLanguageElementConsumer extends NonTerminalConsumer keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } + public ICharacterClass getKeyword$6$Delimiter() { + return keyword$6$Delimiter; + } + + public void setKeyword$6$Delimiter(ICharacterClass characterClass) { + keyword$6$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java index a56923a..f38d0c5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/services/DummyTestLanguageGrammarAccess.java @@ -98,7 +98,7 @@ public class DummyTestLanguageGrammarAccess extends BaseEPackageAccess implement } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g index a93d0dd..1259650 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleConcreteParserRule entryRuleConcreteParserRule returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -129,6 +130,8 @@ ruleConcreteParserRule returns [EObject current=null] + + // Entry rule entryRuleInheritedParserRule entryRuleInheritedParserRule returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -171,6 +174,12 @@ ruleInheritedParserRule returns [EObject current=null] + + + + + + RULE_REAL : RULE_INT '.' RULE_INT; RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java index 8c9e77d..d28d59b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g 2009-01-19 11:41:12 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g 2009-01-19 15:13:46 package org.eclipse.xtext.grammarinheritance.parser.antlr.internal; @@ -92,8 +92,8 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_REAL() throws RecognitionException { try { int _type = RULE_REAL; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:174:11: ( RULE_INT '.' RULE_INT ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:174:13: RULE_INT '.' RULE_INT + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:183:11: ( RULE_INT '.' RULE_INT ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:183:13: RULE_INT '.' RULE_INT { mRULE_INT(); match('.'); @@ -112,10 +112,10 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:176:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:176:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:185:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:185:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:176:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:185:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -124,7 +124,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:176:12: '^' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:185:12: '^' { match('^'); @@ -143,7 +143,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:176:53: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:185:53: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -191,10 +191,10 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:178:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:178:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:187:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:187:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:178:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:187:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -208,7 +208,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:178:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:187:13: '0' .. '9' { matchRange('0','9'); @@ -238,7 +238,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -250,16 +250,16 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("180:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("189:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -275,7 +275,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:21: '\\\\' ( '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' ) { @@ -292,7 +292,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -318,10 +318,10 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -337,7 +337,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:108: '\\\\' ( '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' ) { @@ -354,7 +354,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:180:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:189:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -392,12 +392,12 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:182:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:182:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:191:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:191:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:182:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:191:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -422,7 +422,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:182:52: . + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:191:52: . { matchAny(); @@ -451,12 +451,12 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -469,7 +469,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193: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(); @@ -490,7 +490,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -499,9 +499,9 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -510,7 +510,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:184:39: '\\r' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:193:39: '\\r' { match('\r'); @@ -541,10 +541,10 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:186:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:186:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:195:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:195:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:186:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:195:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -598,8 +598,8 @@ public class InternalConcreteTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:188:16: ( . ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:188:18: . + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:197:16: ( . ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:197:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java index 57564db..e26e116 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g 2009-01-19 11:41:11 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g 2009-01-19 15:13:46 package org.eclipse.xtext.grammarinheritance.parser.antlr.internal; @@ -65,7 +65,7 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start entryRuleConcreteParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:66:1: entryRuleConcreteParserRule returns [EObject current=null] : iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:67:1: entryRuleConcreteParserRule returns [EObject current=null] : iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ; public final EObject entryRuleConcreteParserRule() throws RecognitionException { EObject current = null; @@ -73,16 +73,16 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:66:60: (iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:67:2: iv_ruleConcreteParserRule= ruleConcreteParserRule EOF + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:67:60: (iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:68:2: iv_ruleConcreteParserRule= ruleConcreteParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleConcreteParserRule_in_entryRuleConcreteParserRule71); + pushFollow(FOLLOW_ruleConcreteParserRule_in_entryRuleConcreteParserRule72); iv_ruleConcreteParserRule=ruleConcreteParserRule(); _fsp--; current =iv_ruleConcreteParserRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleConcreteParserRule81); + match(input,EOF,FOLLOW_EOF_in_entryRuleConcreteParserRule82); } @@ -100,7 +100,7 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start ruleConcreteParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:74:1: ruleConcreteParserRule returns [EObject current=null] : ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:75:1: ruleConcreteParserRule returns [EObject current=null] : ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ; public final EObject ruleConcreteParserRule() throws RecognitionException { EObject current = null; @@ -110,27 +110,27 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:76:33: ( ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:33: ( ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:77:4: 'model' (lv_magicNumber= RULE_REAL ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:78:4: 'model' (lv_magicNumber= RULE_REAL ) { - match(input,12,FOLLOW_12_in_ruleConcreteParserRule117); + match(input,12,FOLLOW_12_in_ruleConcreteParserRule118); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:81:1: (lv_magicNumber= RULE_REAL ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:83:6: lv_magicNumber= RULE_REAL + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:82:1: (lv_magicNumber= RULE_REAL ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:84:6: lv_magicNumber= RULE_REAL { lv_magicNumber=(Token)input.LT(1); - match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleConcreteParserRule138); + match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleConcreteParserRule139); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "magicNumber"); @@ -152,14 +152,14 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar } - match(input,13,FOLLOW_13_in_ruleConcreteParserRule159); + match(input,13,FOLLOW_13_in_ruleConcreteParserRule160); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:105:2: (lv_elements= ruleInheritedParserRule )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:106:2: (lv_elements= ruleInheritedParserRule )* loop1: do { int alt1=2; @@ -172,12 +172,12 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:108:6: lv_elements= ruleInheritedParserRule + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:109:6: lv_elements= ruleInheritedParserRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleInheritedParserRule_in_ruleConcreteParserRule194); + pushFollow(FOLLOW_ruleInheritedParserRule_in_ruleConcreteParserRule195); lv_elements=ruleInheritedParserRule(); _fsp--; @@ -224,7 +224,7 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start entryRuleInheritedParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:133:1: entryRuleInheritedParserRule returns [EObject current=null] : iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:136:1: entryRuleInheritedParserRule returns [EObject current=null] : iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ; public final EObject entryRuleInheritedParserRule() throws RecognitionException { EObject current = null; @@ -232,16 +232,16 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:133:61: (iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:134:2: iv_ruleInheritedParserRule= ruleInheritedParserRule EOF + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:136:61: (iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:137:2: iv_ruleInheritedParserRule= ruleInheritedParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleInheritedParserRule_in_entryRuleInheritedParserRule232); + pushFollow(FOLLOW_ruleInheritedParserRule_in_entryRuleInheritedParserRule235); iv_ruleInheritedParserRule=ruleInheritedParserRule(); _fsp--; current =iv_ruleInheritedParserRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleInheritedParserRule242); + match(input,EOF,FOLLOW_EOF_in_entryRuleInheritedParserRule245); } @@ -259,7 +259,7 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar // $ANTLR start ruleInheritedParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:141:1: ruleInheritedParserRule returns [EObject current=null] : ( 'element' (lv_name= RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:144:1: ruleInheritedParserRule returns [EObject current=null] : ( 'element' (lv_name= RULE_ID ) ) ; public final EObject ruleInheritedParserRule() throws RecognitionException { EObject current = null; @@ -267,21 +267,21 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:143:33: ( ( 'element' (lv_name= RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:144:1: ( 'element' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:146:33: ( ( 'element' (lv_name= RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:147:1: ( 'element' (lv_name= RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:144:1: ( 'element' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:144:2: 'element' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:147:1: ( 'element' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:147:2: 'element' (lv_name= RULE_ID ) { - match(input,14,FOLLOW_14_in_ruleInheritedParserRule276); + match(input,14,FOLLOW_14_in_ruleInheritedParserRule279); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:148:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:150:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:151:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g:153:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInheritedParserRule297); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInheritedParserRule300); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, "name"); @@ -322,15 +322,15 @@ public class InternalConcreteTestLanguageParser extends AbstractInternalAntlrPar - public static final BitSet FOLLOW_ruleConcreteParserRule_in_entryRuleConcreteParserRule71 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleConcreteParserRule81 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_12_in_ruleConcreteParserRule117 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_REAL_in_ruleConcreteParserRule138 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleConcreteParserRule159 = new BitSet(new long[]{0x0000000000004002L}); - public static final BitSet FOLLOW_ruleInheritedParserRule_in_ruleConcreteParserRule194 = new BitSet(new long[]{0x0000000000004002L}); - public static final BitSet FOLLOW_ruleInheritedParserRule_in_entryRuleInheritedParserRule232 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleInheritedParserRule242 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_14_in_ruleInheritedParserRule276 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleInheritedParserRule297 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleConcreteParserRule_in_entryRuleConcreteParserRule72 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleConcreteParserRule82 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_12_in_ruleConcreteParserRule118 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_REAL_in_ruleConcreteParserRule139 = new BitSet(new long[]{0x0000000000002000L}); + public static final BitSet FOLLOW_13_in_ruleConcreteParserRule160 = new BitSet(new long[]{0x0000000000004002L}); + public static final BitSet FOLLOW_ruleInheritedParserRule_in_ruleConcreteParserRule195 = new BitSet(new long[]{0x0000000000004002L}); + public static final BitSet FOLLOW_ruleInheritedParserRule_in_entryRuleInheritedParserRule235 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleInheritedParserRule245 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_14_in_ruleInheritedParserRule279 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleInheritedParserRule300 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g index 2cda002..971dfd8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage__.g @@ -11,28 +11,28 @@ T12 : 'model' ; T13 : ':' ; T14 : 'element' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 174 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 183 RULE_REAL : RULE_INT '.' RULE_INT; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 176 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 185 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 178 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 187 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 180 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 189 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 182 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 191 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 184 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 193 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 186 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 195 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 188 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/antlr/internal/InternalConcreteTestLanguage.g" 197 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageDelimiters.java index 3436c66..4434eb7 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageDelimiters.java @@ -16,8 +16,7 @@ public final class AbstractTestLanguageDelimiters { public static ISequenceMatcher ruleCall$7$Delimiter = new SetBasedKeywordMatcher( "element"); - - // TODO do not use IDConsumer internals + public static ICharacterClass keyword$5$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java index 0074103..f813800 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/AbstractTestLanguageParserConfiguration.java @@ -46,8 +46,7 @@ public class AbstractTestLanguageParserConfiguration extends AbstractParserConfi public void createNonTerminalConsumers() { getXtextBuiltinConfiguration().createNonTerminalConsumers(); inheritedParserRuleConsumer = new AbstractTestLanguageInheritedParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); } @@ -62,22 +61,6 @@ public class AbstractTestLanguageParserConfiguration extends AbstractParserConfi getInheritedParserRuleConsumer().setRuleCall$4$Delimiter(AbstractTestLanguageDelimiters.ruleCall$7$Delimiter); getInheritedParserRuleConsumer().setKeyword$2$Delimiter(AbstractTestLanguageDelimiters.keyword$5$Delimiter); - // TODO remove workaround - getRealConsumer().initFields(this); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); } // TODO collect superGrammars transitive diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageDelimiters.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageDelimiters.java index bc9c61f..e77f448 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageDelimiters.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageDelimiters.java @@ -15,13 +15,12 @@ public final class ConcreteTestLanguageDelimiters { } public static ICharacterClass keyword$9$Delimiter = ICharacterClass.Factory.nullClass(); - - // TODO do not use IDConsumer internals - public static ICharacterClass keyword$6$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; - + public static ISequenceMatcher ruleCall$8$Delimiter = ISequenceMatcher.Factory.nullMatcher(); - + + public static ICharacterClass keyword$6$Delimiter = XtextBuiltinIDConsumer.IDConsumer$$2; + public static ISequenceMatcher ruleCall$7$Delimiter = new SetBasedKeywordMatcher( "model"); - + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java index 4f93f7f..f12c52a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/ConcreteTestLanguageParserConfiguration.java @@ -45,8 +45,7 @@ public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfi public void createNonTerminalConsumers() { getAbstractTestLanguageConfiguration().createNonTerminalConsumers(); concreteParserRuleConsumer = new ConcreteTestLanguageConcreteParserRuleConsumer( - getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), - new ITerminalConsumer[]{ getWsConsumer(), getMlCommentConsumer(), getSlCommentConsumer() } + getInput(), getMarkerFactory(), getTokenAcceptor(), getHiddenTokenHandler(), getConsumerUtil(), null ); } @@ -61,26 +60,10 @@ public class ConcreteTestLanguageParserConfiguration extends AbstractParserConfi getInheritedParserRuleConsumer().setIdConsumer(getIdConsumer()); getConcreteParserRuleConsumer().setKeyword$7$Delimiter(ConcreteTestLanguageDelimiters.keyword$9$Delimiter); - getConcreteParserRuleConsumer().setKeyword$4$Delimiter(ConcreteTestLanguageDelimiters.keyword$6$Delimiter); getConcreteParserRuleConsumer().setRuleCall$6$Delimiter(ConcreteTestLanguageDelimiters.ruleCall$8$Delimiter); + getConcreteParserRuleConsumer().setKeyword$4$Delimiter(ConcreteTestLanguageDelimiters.keyword$6$Delimiter); getInheritedParserRuleConsumer().setRuleCall$4$Delimiter(ConcreteTestLanguageDelimiters.ruleCall$7$Delimiter); getInheritedParserRuleConsumer().setKeyword$2$Delimiter(ConcreteTestLanguageDelimiters.keyword$6$Delimiter); - // TODO remove workaround - getRealConsumer().initFields(this); - // TODO remove workaround - getIdConsumer().initFields(this); - // TODO remove workaround - getIntConsumer().initFields(this); - // TODO remove workaround - getStringConsumer().initFields(this); - // TODO remove workaround - getMlCommentConsumer().initFields(this); - // TODO remove workaround - getSlCommentConsumer().initFields(this); - // TODO remove workaround - getWsConsumer().initFields(this); - // TODO remove workaround - getAnyOtherConsumer().initFields(this); } // TODO collect superGrammars transitive diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java index e8617d6..f0e7c15 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/packrat/consumers/ConcreteTestLanguageConcreteParserRuleConsumer.java @@ -29,17 +29,17 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer private ICharacterClass keyword$7$Delimiter; - private ICharacterClass keyword$4$Delimiter; - private ISequenceMatcher ruleCall$6$Delimiter; + private ICharacterClass keyword$4$Delimiter; + public ConcreteTestLanguageConcreteParserRuleConsumer(ICharSequenceWithOffset input, IMarkerFactory markerFactory, IParsedTokenAcceptor tokenAcceptor, IHiddenTokenHandler hiddenTokenHandler, IConsumerUtility consumerUtil, ITerminalConsumer[] hiddenTokens) { super(input, markerFactory, tokenAcceptor, hiddenTokenHandler, consumerUtil, hiddenTokens); keyword$7$Delimiter = ICharacterClass.Factory.nullClass(); - keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); ruleCall$6$Delimiter = ISequenceMatcher.Factory.nullMatcher(); + keyword$4$Delimiter = ICharacterClass.Factory.nullClass(); } protected boolean doConsume() throws Exception { @@ -121,14 +121,6 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer keyword$7$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); } - public ICharacterClass getKeyword$4$Delimiter() { - return keyword$4$Delimiter; - } - - public void setKeyword$4$Delimiter(ICharacterClass characterClass) { - keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); - } - public ISequenceMatcher getRuleCall$6$Delimiter() { return ruleCall$6$Delimiter; } @@ -137,4 +129,12 @@ public final class ConcreteTestLanguageConcreteParserRuleConsumer extends NonTer ruleCall$6$Delimiter = matcher != null ? matcher : ISequenceMatcher.Factory.nullMatcher(); } + public ICharacterClass getKeyword$4$Delimiter() { + return keyword$4$Delimiter; + } + + public void setKeyword$4$Delimiter(ICharacterClass characterClass) { + keyword$4$Delimiter = characterClass != null ? characterClass : ICharacterClass.Factory.nullClass(); + } + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java index f09c476..154c147 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java @@ -52,7 +52,7 @@ public class AbstractTestLanguageGrammarAccess extends BaseEPackageAccess implem } public XtextBuiltinGrammarAccess getSuperGrammar() { - return XtextBuiltinGrammarAccess.INSTANCE; + return XtextBuiltinGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java index 88b2708..7590020 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java @@ -70,7 +70,7 @@ public class ConcreteTestLanguageGrammarAccess extends BaseEPackageAccess implem } public AbstractTestLanguageGrammarAccess getSuperGrammar() { - return AbstractTestLanguageGrammarAccess.INSTANCE; + return AbstractTestLanguageGrammarAccess.INSTANCE; } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g index 9b74e29..3c9990d 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g @@ -62,6 +62,7 @@ import org.eclipse.xtext.conversion.ValueConverterException; + // Entry rule entryRuleFoo entryRuleFoo returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); } @@ -121,6 +122,8 @@ ruleFoo returns [EObject current=null] + + // Entry rule entryRuleNameRef entryRuleNameRef returns [EObject current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); } @@ -156,6 +159,14 @@ ruleNameRef returns [EObject current=null] + + + + + + + + RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; RULE_INT : ('0'..'9')+; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java index 5e56225..23b8abc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g 2009-01-19 11:41:16 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g 2009-01-19 15:13:51 package org.eclipse.xtext.metamodelreferencing.tests.parser.antlr.internal; @@ -32,10 +32,10 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:159:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:159:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:170:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:170:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:159:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:170:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -44,7 +44,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:159:12: '^' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:170:12: '^' { match('^'); @@ -63,7 +63,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:159:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:170:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -111,10 +111,10 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:161:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:161:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:172:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:172:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:161:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:172:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -128,7 +128,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:161:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:172:13: '0' .. '9' { matchRange('0','9'); @@ -158,7 +158,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -170,16 +170,16 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("163:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("174:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -195,7 +195,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:21: '\\\\' ( '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' ) { @@ -212,7 +212,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -238,10 +238,10 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -257,7 +257,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:108: '\\\\' ( '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' ) { @@ -274,7 +274,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:163:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:174:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -312,12 +312,12 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:165:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:165:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:176:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:176:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:165:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:176:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -342,7 +342,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:165:52: . + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:176:52: . { matchAny(); @@ -371,12 +371,12 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -389,7 +389,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178: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(); @@ -410,7 +410,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -419,9 +419,9 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -430,7 +430,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:167:39: '\\r' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:178:39: '\\r' { match('\r'); @@ -461,10 +461,10 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:169:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:169:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:180:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:180:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/internal/InternalMetamodelRefTestLanguage.g:169:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/antlr/intern |