| author | szarnekow | 2008-12-18 07:51:13 (EST) |
|---|---|---|
| committer | sefftinge | 2008-12-18 07:51:13 (EST) |
| commit | a3f009a5b5a74cf786034ba1e1d86e8d1cbb1888 (patch) (side-by-side diff) | |
| tree | f91585e72affe8f571727e382ac2efcb1063e745 | |
| parent | 1354f8458631a55737fac94288f9021f927d69bb (diff) | |
| download | org.eclipse.xtext-a3f009a5b5a74cf786034ba1e1d86e8d1cbb1888.zip org.eclipse.xtext-a3f009a5b5a74cf786034ba1e1d86e8d1cbb1888.tar.gz org.eclipse.xtext-a3f009a5b5a74cf786034ba1e1d86e8d1cbb1888.tar.bz2 | |
Some tweaks for datatype rules (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=249952)
108 files changed, 4466 insertions, 3276 deletions
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 e39b7fa..8617a78 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 @@ -14,10 +14,10 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="rules" upperBound="-1" eType="//AbstractRule" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractRule"> + <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="//TypeRef" containment="true"/> <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:EReference" name="type" eType="//TypeRef" containment="true"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="AbstractMetamodelDeclaration"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="alias"> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g index 66c9f31..ab96dd6 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java index 52fc633..f5fa1f8 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-16 15:27:15 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-18 11:06:27 package org.eclipse.xtext.crossrefs.parser.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/internal/InternalImportUriTestLanguage.g:226:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:226:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:226:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228: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/internal/InternalImportUriTestLanguage.g:226:12: '^' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228:12: '^' { match('^'); @@ -123,7 +123,7 @@ public class InternalImportUriTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:226:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228: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/internal/InternalImportUriTestLanguage.g:228:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:228:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230: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/internal/InternalImportUriTestLanguage.g:228:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230: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/internal/InternalImportUriTestLanguage.g:230:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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("230:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("232: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/internal/InternalImportUriTestLanguage.g:230:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:230:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:230:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:230:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:230:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:230:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:230:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232: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/internal/InternalImportUriTestLanguage.g:232:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:232:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234: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/internal/InternalImportUriTestLanguage.g:232:52: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234: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/internal/InternalImportUriTestLanguage.g:234:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236: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/internal/InternalImportUriTestLanguage.g:234:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236: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/internal/InternalImportUriTestLanguage.g:234:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236: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/internal/InternalImportUriTestLanguage.g:234:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:234:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236: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/internal/InternalImportUriTestLanguage.g:234:39: '\\r' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236: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/internal/InternalImportUriTestLanguage.g:236:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:238:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:236:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:238: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/internal/InternalImportUriTestLanguage.g:238:16: ( . ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:238:18: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:240:16: ( . ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:240:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java index ac903a9..968fd69 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-16 15:27:15 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g 2008-12-18 11:06:27 package org.eclipse.xtext.crossrefs.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:64:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:66:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; public final EObject entryRuleMain() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:64:46: (iv_ruleMain= ruleMain EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:65:2: iv_ruleMain= ruleMain EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:66:46: (iv_ruleMain= ruleMain EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:67:2: iv_ruleMain= ruleMain EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleMain_in_entryRuleMain71); @@ -97,7 +99,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:72:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:74:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; public final EObject ruleMain() throws RecognitionException { EObject current = null; @@ -108,13 +110,13 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:74:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:75:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:76:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:75:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:75:2: (lv_imports= ruleImport )* (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:77:2: (lv_imports= ruleImport )* (lv_types= ruleType )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:75:2: (lv_imports= ruleImport )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:77:2: (lv_imports= ruleImport )* loop1: do { int alt1=2; @@ -127,7 +129,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:78:6: lv_imports= ruleImport + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:80:6: lv_imports= ruleImport { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); @@ -158,7 +160,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:96:3: (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:98:3: (lv_types= ruleType )* loop2: do { int alt2=2; @@ -171,7 +173,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:99:6: lv_types= ruleType + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:101:6: lv_types= ruleType { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -223,7 +225,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:124:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:126:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -231,8 +233,8 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:124:48: (iv_ruleImport= ruleImport EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:125:2: iv_ruleImport= ruleImport EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:126:48: (iv_ruleImport= ruleImport EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:127:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleImport_in_entryRuleImport217); @@ -258,7 +260,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:132:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:134:1: ruleImport returns [EObject current=null] : ( 'import' (lv_importURI= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; @@ -266,18 +268,18 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:134:33: ( ( 'import' (lv_importURI= RULE_STRING ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:135:1: ( 'import' (lv_importURI= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:136:33: ( ( 'import' (lv_importURI= RULE_STRING ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:137:1: ( 'import' (lv_importURI= RULE_STRING ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:135:1: ( 'import' (lv_importURI= RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:135:2: 'import' (lv_importURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:137:1: ( 'import' (lv_importURI= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:137:2: 'import' (lv_importURI= RULE_STRING ) { match(input,11,FOLLOW_11_in_ruleImport261); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:139:1: (lv_importURI= RULE_STRING ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:141:6: lv_importURI= RULE_STRING + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:141:1: (lv_importURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:143:6: lv_importURI= RULE_STRING { lv_importURI=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport282); @@ -320,7 +322,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:166:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:168:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; public final EObject entryRuleType() throws RecognitionException { EObject current = null; @@ -328,8 +330,8 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:166:46: (iv_ruleType= ruleType EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:167:2: iv_ruleType= ruleType EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:168:46: (iv_ruleType= ruleType EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:169:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/ImportUriTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleType_in_entryRuleType326); @@ -355,7 +357,7 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:174:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:176:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; public final EObject ruleType() throws RecognitionException { EObject current = null; @@ -363,24 +365,24 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:176:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:178:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:3: ( 'type' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:177:4: 'type' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:179:4: 'type' (lv_name= RULE_ID ) { match(input,12,FOLLOW_12_in_ruleType372); 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/internal/InternalImportUriTestLanguage.g:181:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:183:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:183:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:185:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType393); @@ -412,8 +414,8 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:205:2: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:208:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:207:2: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:210:3: ( RULE_ID ) { if (current==null) { @@ -421,8 +423,8 @@ public class InternalImportUriTestLanguageParser extends AbstractAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:214:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:215:2: RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:216:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g:217:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType439); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage__.g index 1a1a789..82d944a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'import' ; T12 : 'type' ; T13 : 'extends' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 226 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 228 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 228 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 230 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 230 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 232 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 232 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 234 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 234 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 236 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 236 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 238 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 238 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalImportUriTestLanguage.g" 240 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g index 015dcd2..a53e4a5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java index 04ab0e7..909fb72 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-16 15:27:03 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-18 11:06:15 package org.eclipse.xtext.crossrefs.parser.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/internal/InternalLangATestLanguage.g:226:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:226:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:226:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228: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/internal/InternalLangATestLanguage.g:226:12: '^' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228:12: '^' { match('^'); @@ -123,7 +123,7 @@ public class InternalLangATestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:226:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228: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/internal/InternalLangATestLanguage.g:228:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:228:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230: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/internal/InternalLangATestLanguage.g:228:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230: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/internal/InternalLangATestLanguage.g:230:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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("230:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("232: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/internal/InternalLangATestLanguage.g:230:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:230:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:230:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:230:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:230:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:230:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:230:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232: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/internal/InternalLangATestLanguage.g:232:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:232:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234: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/internal/InternalLangATestLanguage.g:232:52: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234: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/internal/InternalLangATestLanguage.g:234:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236: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/internal/InternalLangATestLanguage.g:234:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236: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/internal/InternalLangATestLanguage.g:234:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236: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/internal/InternalLangATestLanguage.g:234:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:234:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236: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/internal/InternalLangATestLanguage.g:234:39: '\\r' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236: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/internal/InternalLangATestLanguage.g:236:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:238:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:236:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:238: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/internal/InternalLangATestLanguage.g:238:16: ( . ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:238:18: . + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:240:16: ( . ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:240:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java index 7183b68..36e37f5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-16 15:27:03 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g 2008-12-18 11:06:14 package org.eclipse.xtext.crossrefs.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:64:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:66:1: entryRuleMain returns [EObject current=null] : iv_ruleMain= ruleMain EOF ; public final EObject entryRuleMain() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:64:46: (iv_ruleMain= ruleMain EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:65:2: iv_ruleMain= ruleMain EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:66:46: (iv_ruleMain= ruleMain EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:67:2: iv_ruleMain= ruleMain EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleMain_in_entryRuleMain71); @@ -97,7 +99,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleMain - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:72:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:74:1: ruleMain returns [EObject current=null] : ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ; public final EObject ruleMain() throws RecognitionException { EObject current = null; @@ -108,13 +110,13 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:74:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:75:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:76:33: ( ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:75:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:75:2: (lv_imports= ruleImport )* (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:77:1: ( (lv_imports= ruleImport )* (lv_types= ruleType )* ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:77:2: (lv_imports= ruleImport )* (lv_types= ruleType )* { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:75:2: (lv_imports= ruleImport )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:77:2: (lv_imports= ruleImport )* loop1: do { int alt1=2; @@ -127,7 +129,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:78:6: lv_imports= ruleImport + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:80:6: lv_imports= ruleImport { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); @@ -158,7 +160,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { } } while (true); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:96:3: (lv_types= ruleType )* + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:98:3: (lv_types= ruleType )* loop2: do { int alt2=2; @@ -171,7 +173,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:99:6: lv_types= ruleType + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:101:6: lv_types= ruleType { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -223,7 +225,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:124:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:126:1: entryRuleImport returns [EObject current=null] : iv_ruleImport= ruleImport EOF ; public final EObject entryRuleImport() throws RecognitionException { EObject current = null; @@ -231,8 +233,8 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:124:48: (iv_ruleImport= ruleImport EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:125:2: iv_ruleImport= ruleImport EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:126:48: (iv_ruleImport= ruleImport EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:127:2: iv_ruleImport= ruleImport EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleImport_in_entryRuleImport217); @@ -258,7 +260,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleImport - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:132:1: ruleImport returns [EObject current=null] : ( 'import' (lv_uri= RULE_STRING ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:134:1: ruleImport returns [EObject current=null] : ( 'import' (lv_uri= RULE_STRING ) ) ; public final EObject ruleImport() throws RecognitionException { EObject current = null; @@ -266,18 +268,18 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:134:33: ( ( 'import' (lv_uri= RULE_STRING ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:135:1: ( 'import' (lv_uri= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:136:33: ( ( 'import' (lv_uri= RULE_STRING ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:137:1: ( 'import' (lv_uri= RULE_STRING ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:135:1: ( 'import' (lv_uri= RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:135:2: 'import' (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:137:1: ( 'import' (lv_uri= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:137:2: 'import' (lv_uri= RULE_STRING ) { match(input,11,FOLLOW_11_in_ruleImport261); createLeafNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:139:1: (lv_uri= RULE_STRING ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:141:6: lv_uri= RULE_STRING + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:141:1: (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:143:6: lv_uri= RULE_STRING { lv_uri=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport282); @@ -320,7 +322,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:166:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:168:1: entryRuleType returns [EObject current=null] : iv_ruleType= ruleType EOF ; public final EObject entryRuleType() throws RecognitionException { EObject current = null; @@ -328,8 +330,8 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:166:46: (iv_ruleType= ruleType EOF ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:167:2: iv_ruleType= ruleType EOF + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:168:46: (iv_ruleType= ruleType EOF ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:169:2: iv_ruleType= ruleType EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/crossrefs/LangATestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleType_in_entryRuleType326); @@ -355,7 +357,7 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleType - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:174:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:176:1: ruleType returns [EObject current=null] : ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ; public final EObject ruleType() throws RecognitionException { EObject current = null; @@ -363,24 +365,24 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:176:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:178:33: ( ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:1: ( ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:2: ( ( 'type' (lv_name= RULE_ID ) ) 'extends' ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) 'extends' { - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:3: ( 'type' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:177:4: 'type' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:3: ( 'type' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:179:4: 'type' (lv_name= RULE_ID ) { match(input,12,FOLLOW_12_in_ruleType372); 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/internal/InternalLangATestLanguage.g:181:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:183:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:183:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:185:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType393); @@ -412,8 +414,8 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:205:2: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:208:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:207:2: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:210:3: ( RULE_ID ) { if (current==null) { @@ -421,8 +423,8 @@ public class InternalLangATestLanguageParser extends AbstractAntlrParser { associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:214:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:215:2: RULE_ID + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:216:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g:217:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleType439); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage__.g index 7018d6a..eba7aa5 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'import' ; T12 : 'type' ; T13 : 'extends' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 226 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 228 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 228 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 230 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 230 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 232 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 232 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 234 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 234 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 236 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 236 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 238 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 238 +// $ANTLR src "./src-gen/org/eclipse/xtext/crossrefs/parser/internal/InternalLangATestLanguage.g" 240 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g index f7d372b..a54e916 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java index 1ceb3d0..b154498 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-16 15:27:08 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-18 11:06:19 package org.eclipse.xtext.dummy.parser.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/internal/InternalDummyTestLanguage.g:188:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:188:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:188:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190: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/internal/InternalDummyTestLanguage.g:188:12: '^' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190:12: '^' { match('^'); @@ -122,7 +122,7 @@ public class InternalDummyTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:188:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190: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/internal/InternalDummyTestLanguage.g:190:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:190:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192: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/internal/InternalDummyTestLanguage.g:190:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192: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/internal/InternalDummyTestLanguage.g:192:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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("192:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("194: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/internal/InternalDummyTestLanguage.g:192:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:192:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:192:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:192:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:192:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:192:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:192:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194: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/internal/InternalDummyTestLanguage.g:194:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:194:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196: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/internal/InternalDummyTestLanguage.g:194:52: . + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196: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/internal/InternalDummyTestLanguage.g:196:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198: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/internal/InternalDummyTestLanguage.g:196:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198: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/internal/InternalDummyTestLanguage.g:196:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198: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/internal/InternalDummyTestLanguage.g:196:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:196:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198: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/internal/InternalDummyTestLanguage.g:196:39: '\\r' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198: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/internal/InternalDummyTestLanguage.g:198:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:200:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:200:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:198:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:200: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/internal/InternalDummyTestLanguage.g:200:16: ( . ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:200:18: . + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:202:16: ( . ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:202:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java index 4fcfc09..23af363 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-16 15:27:07 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g 2008-12-18 11:06:19 package org.eclipse.xtext.dummy.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleModel - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:64:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:66:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:64:47: (iv_ruleModel= ruleModel EOF ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:65:2: iv_ruleModel= ruleModel EOF + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:66:47: (iv_ruleModel= ruleModel EOF ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:67:2: iv_ruleModel= ruleModel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleModel_in_entryRuleModel71); @@ -97,7 +99,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleModel - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:72:1: ruleModel returns [EObject current=null] : (lv_elements= ruleElement )* ; + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:74:1: ruleModel returns [EObject current=null] : (lv_elements= ruleElement )* ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -106,10 +108,10 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:74:33: ( (lv_elements= ruleElement )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:75:1: (lv_elements= ruleElement )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:76:33: ( (lv_elements= ruleElement )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:77:1: (lv_elements= ruleElement )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:75:1: (lv_elements= ruleElement )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:77:1: (lv_elements= ruleElement )* loop1: do { int alt1=2; @@ -122,7 +124,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:78:6: lv_elements= ruleElement + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:80:6: lv_elements= ruleElement { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.0/@alternatives/@terminal" /* xtext::RuleCall */, currentNode); @@ -171,7 +173,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleElement - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:103:1: entryRuleElement returns [EObject current=null] : iv_ruleElement= ruleElement EOF ; + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:105:1: entryRuleElement returns [EObject current=null] : iv_ruleElement= ruleElement EOF ; public final EObject entryRuleElement() throws RecognitionException { EObject current = null; @@ -179,8 +181,8 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:103:49: (iv_ruleElement= ruleElement EOF ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:104:2: iv_ruleElement= ruleElement EOF + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:105:49: (iv_ruleElement= ruleElement EOF ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:106:2: iv_ruleElement= ruleElement EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/dummy/DummyTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleElement_in_entryRuleElement176); @@ -206,7 +208,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleElement - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:111: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/internal/InternalDummyTestLanguage.g:113: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; @@ -216,22 +218,22 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:113:33: ( ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:115:33: ( ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:1: ( ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) ';' { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:2: ( ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) (lv_descriptions= RULE_STRING )* { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:4: ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:3: ( ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:4: ( (lv_optional= 'optional' )? 'element' ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:4: ( (lv_optional= 'optional' )? 'element' ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:5: (lv_optional= 'optional' )? 'element' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:4: ( (lv_optional= 'optional' )? 'element' ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:5: (lv_optional= 'optional' )? 'element' { - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:114:5: (lv_optional= 'optional' )? + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:5: (lv_optional= 'optional' )? int alt2=2; int LA2_0 = input.LA(1); @@ -240,7 +242,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:116:6: lv_optional= 'optional' + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:118:6: lv_optional= 'optional' { lv_optional=(Token)input.LT(1); match(input,11,FOLLOW_11_in_ruleElement235); @@ -272,8 +274,8 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:138:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:140:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:140:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:142:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleElement279); @@ -298,7 +300,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:158:3: (lv_descriptions= RULE_STRING )* + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:160:3: (lv_descriptions= RULE_STRING )* loop3: do { int alt3=2; @@ -311,7 +313,7 @@ public class InternalDummyTestLanguageParser extends AbstractAntlrParser { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:160:6: lv_descriptions= RULE_STRING + // ./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g:162:6: lv_descriptions= RULE_STRING { lv_descriptions=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleElement312); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage__.g index e53b7d3..08b9d41 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage__.g @@ -11,25 +11,25 @@ T11 : 'optional' ; T12 : 'element' ; T13 : ';' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 188 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 190 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 190 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 192 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 192 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 194 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 194 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 196 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 196 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 198 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 198 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 200 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 200 +// $ANTLR src "./src-gen/org/eclipse/xtext/dummy/parser/internal/InternalDummyTestLanguage.g" 202 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g index 7214f64..667fa21 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java index 02f73b9..0382f57 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-16 15:27:04 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-18 11:06:16 package org.eclipse.xtext.grammarinheritance.parser.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/internal/InternalConcreteTestLanguage.g:172:11: ( RULE_INT '.' RULE_INT ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:172:13: RULE_INT '.' RULE_INT + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:174:11: ( RULE_INT '.' RULE_INT ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:174: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/internal/InternalConcreteTestLanguage.g:174:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:174:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | 'ö' | 'ä' | 'ü' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:174:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176: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/internal/InternalConcreteTestLanguage.g:174:12: '^' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176:12: '^' { match('^'); @@ -143,7 +143,7 @@ public class InternalConcreteTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:174:53: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176: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/internal/InternalConcreteTestLanguage.g:176:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:176:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178: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/internal/InternalConcreteTestLanguage.g:176:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178: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/internal/InternalConcreteTestLanguage.g:178:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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("178:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("180: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/internal/InternalConcreteTestLanguage.g:178:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:178:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:178:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:178:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:178:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:178:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:178:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180: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/internal/InternalConcreteTestLanguage.g:180:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:180:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182: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/internal/InternalConcreteTestLanguage.g:180:52: . + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182: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/internal/InternalConcreteTestLanguage.g:182:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184: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/internal/InternalConcreteTestLanguage.g:182:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184: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/internal/InternalConcreteTestLanguage.g:182:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184: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/internal/InternalConcreteTestLanguage.g:182:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:182:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184: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/internal/InternalConcreteTestLanguage.g:182:39: '\\r' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184: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/internal/InternalConcreteTestLanguage.g:184:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:186:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:186:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:184:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:186: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/internal/InternalConcreteTestLanguage.g:186:16: ( . ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:186:18: . + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:188:16: ( . ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:188:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java index fa8605c..ad9f4fd 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-16 15:27:04 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g 2008-12-18 11:06:16 package org.eclipse.xtext.grammarinheritance.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -63,7 +65,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleConcreteParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:64:1: entryRuleConcreteParserRule returns [EObject current=null] : iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:66:1: entryRuleConcreteParserRule returns [EObject current=null] : iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ; public final EObject entryRuleConcreteParserRule() throws RecognitionException { EObject current = null; @@ -71,8 +73,8 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:64:60: (iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:65:2: iv_ruleConcreteParserRule= ruleConcreteParserRule EOF + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:66:60: (iv_ruleConcreteParserRule= ruleConcreteParserRule EOF ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:67:2: iv_ruleConcreteParserRule= ruleConcreteParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleConcreteParserRule_in_entryRuleConcreteParserRule71); @@ -98,7 +100,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleConcreteParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:72:1: ruleConcreteParserRule returns [EObject current=null] : ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:74:1: ruleConcreteParserRule returns [EObject current=null] : ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ; public final EObject ruleConcreteParserRule() throws RecognitionException { EObject current = null; @@ -108,24 +110,24 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:74:33: ( ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:76:33: ( ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:1: ( ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) (lv_elements= ruleInheritedParserRule )* { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:2: ( ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) ':' { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:75:4: 'model' (lv_magicNumber= RULE_REAL ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:3: ( 'model' (lv_magicNumber= RULE_REAL ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:77:4: 'model' (lv_magicNumber= RULE_REAL ) { match(input,12,FOLLOW_12_in_ruleConcreteParserRule117); 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/internal/InternalConcreteTestLanguage.g:79:1: (lv_magicNumber= RULE_REAL ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:81:6: lv_magicNumber= RULE_REAL + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:81:1: (lv_magicNumber= RULE_REAL ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:83:6: lv_magicNumber= RULE_REAL { lv_magicNumber=(Token)input.LT(1); match(input,RULE_REAL,FOLLOW_RULE_REAL_in_ruleConcreteParserRule138); @@ -157,7 +159,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:103:2: (lv_elements= ruleInheritedParserRule )* + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:105:2: (lv_elements= ruleInheritedParserRule )* loop1: do { int alt1=2; @@ -170,7 +172,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:106:6: lv_elements= ruleInheritedParserRule + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:108:6: lv_elements= ruleInheritedParserRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -222,7 +224,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleInheritedParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:131:1: entryRuleInheritedParserRule returns [EObject current=null] : iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:133:1: entryRuleInheritedParserRule returns [EObject current=null] : iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ; public final EObject entryRuleInheritedParserRule() throws RecognitionException { EObject current = null; @@ -230,8 +232,8 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:131:61: (iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:132:2: iv_ruleInheritedParserRule= ruleInheritedParserRule EOF + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:133:61: (iv_ruleInheritedParserRule= ruleInheritedParserRule EOF ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:134:2: iv_ruleInheritedParserRule= ruleInheritedParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleInheritedParserRule_in_entryRuleInheritedParserRule232); @@ -257,7 +259,7 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleInheritedParserRule - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:139:1: ruleInheritedParserRule returns [EObject current=null] : ( 'element' (lv_name= RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:141:1: ruleInheritedParserRule returns [EObject current=null] : ( 'element' (lv_name= RULE_ID ) ) ; public final EObject ruleInheritedParserRule() throws RecognitionException { EObject current = null; @@ -265,18 +267,18 @@ public class InternalConcreteTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:141:33: ( ( 'element' (lv_name= RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:142:1: ( 'element' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:143:33: ( ( 'element' (lv_name= RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:144:1: ( 'element' (lv_name= RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:142:1: ( 'element' (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:142:2: 'element' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:144:1: ( 'element' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:144:2: 'element' (lv_name= RULE_ID ) { match(input,14,FOLLOW_14_in_ruleInheritedParserRule276); createLeafNode("classpath:/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:146:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:148:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:148:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g:150:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleInheritedParserRule297); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage__.g index 9e7698f..d64dbfa 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage__.g @@ -11,28 +11,28 @@ T12 : 'model' ; T13 : ':' ; T14 : 'element' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 172 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 174 RULE_REAL : RULE_INT '.' RULE_INT; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 174 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 176 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 176 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 178 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 178 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 180 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 180 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 182 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 182 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 184 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 184 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 186 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 186 +// $ANTLR src "./src-gen/org/eclipse/xtext/grammarinheritance/parser/internal/InternalConcreteTestLanguage.g" 188 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g index 6cce23b..67fd357 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java index 3c124ab..efaeb8e 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-16 15:27:07 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-18 11:06:18 package org.eclipse.xtext.metamodelreferencing.tests.parser.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/internal/InternalMetamodelRefTestLanguage.g:157:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:157:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:157:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159: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/internal/InternalMetamodelRefTestLanguage.g:157:12: '^' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159:12: '^' { match('^'); @@ -63,7 +63,7 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:157:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159: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/internal/InternalMetamodelRefTestLanguage.g:159:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:159:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161: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/internal/InternalMetamodelRefTestLanguage.g:159:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161: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/internal/InternalMetamodelRefTestLanguage.g:161:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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("161:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("163: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/internal/InternalMetamodelRefTestLanguage.g:161:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:161:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:161:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:161:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:161:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:161:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:161:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163: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/internal/InternalMetamodelRefTestLanguage.g:163:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:163:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165: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/internal/InternalMetamodelRefTestLanguage.g:163:52: . + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165: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/internal/InternalMetamodelRefTestLanguage.g:165:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167: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/internal/InternalMetamodelRefTestLanguage.g:165:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167: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/internal/InternalMetamodelRefTestLanguage.g:165:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167: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/internal/InternalMetamodelRefTestLanguage.g:165:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:165:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167: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/internal/InternalMetamodelRefTestLanguage.g:165:39: '\\r' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167: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/internal/InternalMetamodelRefTestLanguage.g:167:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:169:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:169:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:167:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:169:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -518,8 +518,8 @@ public class InternalMetamodelRefTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:169:16: ( . ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:169:18: . + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:171:16: ( . ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:171:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java index 29e7907..d8aaaa0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-16 15:27:07 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g 2008-12-18 11:06:18 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleFoo - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:64:1: entryRuleFoo returns [EObject current=null] : iv_ruleFoo= ruleFoo EOF ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:66:1: entryRuleFoo returns [EObject current=null] : iv_ruleFoo= ruleFoo EOF ; public final EObject entryRuleFoo() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:64:45: (iv_ruleFoo= ruleFoo EOF ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:65:2: iv_ruleFoo= ruleFoo EOF + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:66:45: (iv_ruleFoo= ruleFoo EOF ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:67:2: iv_ruleFoo= ruleFoo EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleFoo_in_entryRuleFoo71); @@ -97,7 +99,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleFoo - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:72:1: ruleFoo returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:74:1: ruleFoo returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ; public final EObject ruleFoo() throws RecognitionException { EObject current = null; @@ -107,14 +109,14 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:74:33: ( ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:75:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:76:33: ( ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:77:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:75:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:75:2: (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:77:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:77:2: (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:75:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:77:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:77:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:79:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFoo127); @@ -136,7 +138,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:95:2: (lv_nameRefs= ruleNameRef )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:97:2: (lv_nameRefs= ruleNameRef )* loop1: do { int alt1=2; @@ -149,7 +151,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:98:6: lv_nameRefs= ruleNameRef + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:100:6: lv_nameRefs= ruleNameRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -201,7 +203,7 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleNameRef - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:123:1: entryRuleNameRef returns [EObject current=null] : iv_ruleNameRef= ruleNameRef EOF ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:125:1: entryRuleNameRef returns [EObject current=null] : iv_ruleNameRef= ruleNameRef EOF ; public final EObject entryRuleNameRef() throws RecognitionException { EObject current = null; @@ -209,8 +211,8 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:123:49: (iv_ruleNameRef= ruleNameRef EOF ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:124:2: iv_ruleNameRef= ruleNameRef EOF + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:125:49: (iv_ruleNameRef= ruleNameRef EOF ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:126:2: iv_ruleNameRef= ruleNameRef EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleNameRef_in_entryRuleNameRef210); @@ -236,17 +238,17 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleNameRef - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:131:1: ruleNameRef returns [EObject current=null] : ( ( RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:133:1: ruleNameRef returns [EObject current=null] : ( ( RULE_ID ) ) ; public final EObject ruleNameRef() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:133:33: ( ( ( RULE_ID ) ) ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:134:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:135:33: ( ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:136:1: ( ( RULE_ID ) ) { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:134:1: ( ( RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:137:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:136:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:139:3: ( RULE_ID ) { if (current==null) { @@ -254,8 +256,8 @@ public class InternalMetamodelRefTestLanguageParser extends AbstractAntlrParser associateNodeWithAstElement(currentNode, current); } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:143:1: ( RULE_ID ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:144:2: RULE_ID + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:145:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g:146:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleNameRef268); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage__.g index b18eaf2..c704ca2 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage__.g @@ -7,25 +7,25 @@ package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; import org.eclipse.xtext.parser.antlr.Lexer; } -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 157 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 159 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 159 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 161 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 161 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 163 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 163 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 165 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 165 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 167 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 167 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 169 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 169 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMetamodelRefTestLanguage.g" 171 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g index 1cad8b4..4e0c912 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java index a93b4d8..41c6afc 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-16 15:27:07 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-18 11:06:19 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; @@ -32,10 +32,10 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:160:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:160:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:160:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -44,7 +44,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:160:12: '^' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:12: '^' { match('^'); @@ -63,7 +63,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:160:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -111,10 +111,10 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -128,7 +128,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:162:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:13: '0' .. '9' { matchRange('0','9'); @@ -158,7 +158,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166: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 InternalMultiGenMMTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("164:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("166: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/internal/InternalMultiGenMMTestLanguage.g:164:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -195,7 +195,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166: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 InternalMultiGenMMTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166: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 InternalMultiGenMMTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -257,7 +257,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166: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 InternalMultiGenMMTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:164:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166: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 InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -342,7 +342,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:166:52: . + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:52: . { matchAny(); @@ -371,12 +371,12 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -389,7 +389,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170: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 InternalMultiGenMMTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -419,9 +419,9 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -430,7 +430,7 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:168:39: '\\r' + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:39: '\\r' { match('\r'); @@ -461,10 +461,10 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:172:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:172:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:170:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:172:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -518,8 +518,8 @@ public class InternalMultiGenMMTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:172:16: ( . ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:172:18: . + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:174:16: ( . ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:174:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java index fab48be..4944d82 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-16 15:27:07 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g 2008-12-18 11:06:19 package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleFoo - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:64:1: entryRuleFoo returns [EObject current=null] : iv_ruleFoo= ruleFoo EOF ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:66:1: entryRuleFoo returns [EObject current=null] : iv_ruleFoo= ruleFoo EOF ; public final EObject entryRuleFoo() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:64:45: (iv_ruleFoo= ruleFoo EOF ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:65:2: iv_ruleFoo= ruleFoo EOF + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:66:45: (iv_ruleFoo= ruleFoo EOF ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:67:2: iv_ruleFoo= ruleFoo EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleFoo_in_entryRuleFoo71); @@ -97,7 +99,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleFoo - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:72:1: ruleFoo returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:74:1: ruleFoo returns [EObject current=null] : ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ; public final EObject ruleFoo() throws RecognitionException { EObject current = null; @@ -107,14 +109,14 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:74:33: ( ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:75:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:76:33: ( ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:77:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:75:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:75:2: (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:77:1: ( (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:77:2: (lv_name= RULE_ID ) (lv_nameRefs= ruleNameRef )* { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:75:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:77:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:77:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:79:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFoo127); @@ -136,7 +138,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:95:2: (lv_nameRefs= ruleNameRef )* + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:97:2: (lv_nameRefs= ruleNameRef )* loop1: do { int alt1=2; @@ -149,7 +151,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:98:6: lv_nameRefs= ruleNameRef + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:100:6: lv_nameRefs= ruleNameRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -201,7 +203,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleNameRef - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:123:1: entryRuleNameRef returns [EObject current=null] : iv_ruleNameRef= ruleNameRef EOF ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:125:1: entryRuleNameRef returns [EObject current=null] : iv_ruleNameRef= ruleNameRef EOF ; public final EObject entryRuleNameRef() throws RecognitionException { EObject current = null; @@ -209,8 +211,8 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:123:49: (iv_ruleNameRef= ruleNameRef EOF ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:124:2: iv_ruleNameRef= ruleNameRef EOF + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:125:49: (iv_ruleNameRef= ruleNameRef EOF ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:126:2: iv_ruleNameRef= ruleNameRef EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleNameRef_in_entryRuleNameRef210); @@ -236,7 +238,7 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleNameRef - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:131:1: ruleNameRef returns [EObject current=null] : (lv_name= RULE_STRING ) ; + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:133:1: ruleNameRef returns [EObject current=null] : (lv_name= RULE_STRING ) ; public final EObject ruleNameRef() throws RecognitionException { EObject current = null; @@ -244,11 +246,11 @@ public class InternalMultiGenMMTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:133:33: ( (lv_name= RULE_STRING ) ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:134:1: (lv_name= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:135:33: ( (lv_name= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:136:1: (lv_name= RULE_STRING ) { - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:134:1: (lv_name= RULE_STRING ) - // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:136:6: lv_name= RULE_STRING + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:136:1: (lv_name= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g:138:6: lv_name= RULE_STRING { lv_name=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleNameRef265); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage__.g index bd44469..b8ac1ed 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage__.g @@ -7,25 +7,25 @@ package org.eclipse.xtext.metamodelreferencing.tests.parser.internal; import org.eclipse.xtext.parser.antlr.Lexer; } -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 160 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 162 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 162 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 164 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 164 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 166 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 166 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 168 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 168 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 170 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 170 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 172 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 172 +// $ANTLR src "./src-gen/org/eclipse/xtext/metamodelreferencing/tests/parser/internal/InternalMultiGenMMTestLanguage.g" 174 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.ecore b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.ecore index 07ebf0c..a276075 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.ecore +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.ecore @@ -10,5 +10,11 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBigDecimal"/> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="vector"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="dots"> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eStructuralFeatures> </eClassifiers> </ecore:EPackage> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi index f7aaf0f..40afd54 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi @@ -22,13 +22,29 @@ </type> <alternatives xsi:type="xtext:Group"> <abstractTokens xsi:type="xtext:Group"> - <abstractTokens xsi:type="xtext:Assignment" feature="id" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.3"/> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Assignment" feature="id" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.3"/> + </abstractTokens> + <abstractTokens xsi:type="xtext:Group" cardinality="?"> + <abstractTokens xsi:type="xtext:Keyword" value=":"/> + <abstractTokens xsi:type="xtext:Assignment" feature="value" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.4"/> + </abstractTokens> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Group" cardinality="?"> + <abstractTokens xsi:type="xtext:Keyword" value="#"/> + <abstractTokens xsi:type="xtext:Assignment" feature="vector" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.5"/> + </abstractTokens> + </abstractTokens> </abstractTokens> <abstractTokens xsi:type="xtext:Group" cardinality="?"> - <abstractTokens xsi:type="xtext:Keyword" value=":"/> - <abstractTokens xsi:type="xtext:Assignment" feature="value" operator="="> - <terminal xsi:type="xtext:RuleCall" rule="//@rules.4"/> + <abstractTokens xsi:type="xtext:Keyword" value="+"/> + <abstractTokens xsi:type="xtext:Assignment" feature="dots" operator="="> + <terminal xsi:type="xtext:RuleCall" rule="//@rules.6"/> </abstractTokens> </abstractTokens> </abstractTokens> @@ -79,4 +95,35 @@ </abstractTokens> </alternatives> </rules> + <rules xsi:type="xtext:ParserRule" name="Vector"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </type> + <alternatives xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="("/> + <abstractTokens xsi:type="xtext:RuleCall"> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:RuleCall"> + <rule href="classpath:/org/eclipse/xtext/builtin/XtextBuiltin.xmi#//@rules.1"/> + </abstractTokens> + </abstractTokens> + <abstractTokens xsi:type="xtext:Keyword" value=")"/> + </alternatives> + </rules> + <rules xsi:type="xtext:ParserRule" name="Dots"> + <type metamodel="//@metamodelDeclarations.0"> + <type xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </type> + <alternatives xsi:type="xtext:Alternatives"> + <groups xsi:type="xtext:Group"> + <abstractTokens xsi:type="xtext:Keyword" value="."/> + <abstractTokens xsi:type="xtext:Keyword" value="."/> + </groups> + <groups xsi:type="xtext:Keyword" value=".."/> + </alternatives> + </rules> </xtext:Grammar> diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g index 63900e8..ed44745 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { @@ -111,11 +113,11 @@ entryRuleModel returns [EObject current=null] : ruleModel returns [EObject current=null] @init { EObject temp=null; setCurrentLookahead(); resetLookahead(); } @after { resetLookahead(); }: -((( +((((( { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); } lv_id=ruleNestedModelId { @@ -134,13 +136,13 @@ ruleModel returns [EObject current=null] )(':' { - createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); } ( { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); } lv_value=ruleFraction { @@ -157,6 +159,56 @@ ruleModel returns [EObject current=null] } } +))?)('#' + { + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + } +( + + + { + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + } + lv_vector=ruleVector + { + currentNode = currentNode.getParent(); + if ($current==null) { + $current = factory.create("Model"); + associateNodeWithAstElement(currentNode, $current); + } + + try { + factory.set($current, "vector", lv_vector,"Vector"); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + } + +))?)('+' + { + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + } +( + + + { + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + } + lv_dots=ruleDots + { + currentNode = currentNode.getParent(); + if ($current==null) { + $current = factory.create("Model"); + associateNodeWithAstElement(currentNode, $current); + } + + try { + factory.set($current, "dots", lv_dots,"Dots"); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + } + ))?)';' { createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -171,32 +223,29 @@ ruleModel returns [EObject current=null] entryRuleModelId returns [String current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); } iv_ruleModelId=ruleModelId - { $current=$iv_ruleModelId.current; } + { $current=$iv_ruleModelId.current.getText(); } EOF ; // Rule ModelId -ruleModelId returns [String current=null] - @init { StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); } - @after { resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; }: +ruleModelId returns [DatatypeRuleToken current=new DatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); } + @after { resetLookahead(); }: (( this_ID=RULE_ID { - - buffer.append($this_ID.text); - + $current.merge(this_ID); } { createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::RuleCall */, null); } -'.' + + kw='.' { - buffer.append("."); + $current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } ) this_ID=RULE_ID { - - buffer.append($this_ID.text); - + $current.merge(this_ID); } { @@ -213,30 +262,29 @@ ruleModelId returns [String current=null] entryRuleNestedModelId returns [String current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); } iv_ruleNestedModelId=ruleNestedModelId - { $current=$iv_ruleNestedModelId.current; } + { $current=$iv_ruleNestedModelId.current.getText(); } EOF ; // Rule NestedModelId -ruleNestedModelId returns [String current=null] - @init { StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); } - @after { resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; }: +ruleNestedModelId returns [DatatypeRuleToken current=new DatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); } + @after { resetLookahead(); }: (( { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::RuleCall */, currentNode); } this_ModelId=ruleModelId { - - if ($this_ModelId.current != null) buffer.append($this_ModelId.current); - + $current.merge(this_ModelId); } { currentNode = currentNode.getParent(); } -'.' + + kw='.' { - buffer.append("."); + $current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } ) @@ -244,9 +292,7 @@ ruleNestedModelId returns [String current=null] currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::RuleCall */, currentNode); } this_ModelId=ruleModelId { - - if ($this_ModelId.current != null) buffer.append($this_ModelId.current); - + $current.merge(this_ModelId); } { @@ -263,32 +309,29 @@ ruleNestedModelId returns [String current=null] entryRuleFraction returns [String current=null] : { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); } iv_ruleFraction=ruleFraction - { $current=$iv_ruleFraction.current; } + { $current=$iv_ruleFraction.current.getText(); } EOF ; // Rule Fraction -ruleFraction returns [String current=null] - @init { StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); } - @after { resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; }: +ruleFraction returns [DatatypeRuleToken current=new DatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); } + @after { resetLookahead(); }: ( this_INT=RULE_INT { - - buffer.append($this_INT.text); - + $current.merge(this_INT); } { createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, null); } -('/' +( + kw='/' { - buffer.append("/"); + $current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); } this_INT=RULE_INT { - - buffer.append($this_INT.text); - + $current.merge(this_INT); } { @@ -301,6 +344,89 @@ ruleFraction returns [String current=null] +// Entry rule entryRuleVector +entryRuleVector returns [String current=null] : + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); } + iv_ruleVector=ruleVector + { $current=$iv_ruleVector.current.getText(); } + EOF +; + +// Rule Vector +ruleVector returns [DatatypeRuleToken current=new DatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); } + @after { resetLookahead(); }: +((( + kw='(' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); + } + this_INT=RULE_INT { + $current.merge(this_INT); + } + + { + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, null); + } +) this_INT=RULE_INT { + $current.merge(this_INT); + } + + { + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, null); + } +) + kw=')' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); + } +) + ; + + + + + +// Entry rule entryRuleDots +entryRuleDots returns [String current=null] : + { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); } + iv_ruleDots=ruleDots + { $current=$iv_ruleDots.current.getText(); } + EOF +; + +// Rule Dots +ruleDots returns [DatatypeRuleToken current=new DatatypeRuleToken()] + @init { setCurrentLookahead(); resetLookahead(); } + @after { resetLookahead(); }: +(( + kw='.' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.0/@abstractTokens.0" /* xtext::Keyword */, null); + } + + kw='.' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.0/@abstractTokens.1" /* xtext::Keyword */, null); + } +) + | + kw='..' + { + $current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.1" /* xtext::Keyword */, 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/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.tokens b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.tokens index 3b51bc2..53e92ce 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.tokens +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.tokens @@ -5,7 +5,12 @@ RULE_INT=5 RULE_STRING=6 RULE_ANY_OTHER=10 RULE_SL_COMMENT=8 +'('=17 +'..'=19 ':'=11 -'.'=13 -';'=12 -'/'=14 +')'=18 +'#'=12 +'.'=15 +';'=14 +'+'=13 +'/'=16 diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java index 77ad2a6..a657d4b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-16 15:27:18 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-18 11:06:30 package org.eclipse.xtext.parser.datatyperules.parser.internal; @@ -16,16 +16,21 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public static final int RULE_ML_COMMENT=7; public static final int T14=14; public static final int RULE_ID=4; - public static final int RULE_WS=9; public static final int T11=11; - public static final int EOF=-1; - public static final int RULE_INT=5; public static final int RULE_STRING=6; public static final int T12=12; - public static final int Tokens=15; + public static final int T13=13; + public static final int T18=18; + public static final int RULE_WS=9; + public static final int T15=15; + public static final int RULE_INT=5; + public static final int EOF=-1; + public static final int T17=17; + public static final int Tokens=20; public static final int RULE_ANY_OTHER=10; + public static final int T16=16; public static final int RULE_SL_COMMENT=8; - public static final int T13=13; + public static final int T19=19; public InternalDatatypeRulesTestLanguageLexer() {;} public InternalDatatypeRulesTestLanguageLexer(CharStream input) { super(input); @@ -54,10 +59,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mT12() throws RecognitionException { try { int _type = T12; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:11:5: ( ';' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:11:7: ';' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:11:5: ( '#' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:11:7: '#' { - match(';'); + match('#'); } @@ -72,10 +77,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mT13() throws RecognitionException { try { int _type = T13; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:12:5: ( '.' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:12:7: '.' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:12:5: ( '+' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:12:7: '+' { - match('.'); + match('+'); } @@ -90,10 +95,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mT14() throws RecognitionException { try { int _type = T14; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:13:5: ( '/' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:13:7: '/' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:13:5: ( ';' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:13:7: ';' { - match('/'); + match(';'); } @@ -104,14 +109,105 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } // $ANTLR end T14 + // $ANTLR start T15 + public final void mT15() throws RecognitionException { + try { + int _type = T15; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:14:5: ( '.' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:14:7: '.' + { + match('.'); + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T15 + + // $ANTLR start T16 + public final void mT16() throws RecognitionException { + try { + int _type = T16; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:15:5: ( '/' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:15:7: '/' + { + match('/'); + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T16 + + // $ANTLR start T17 + public final void mT17() throws RecognitionException { + try { + int _type = T17; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:16:5: ( '(' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:16:7: '(' + { + match('('); + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T17 + + // $ANTLR start T18 + public final void mT18() throws RecognitionException { + try { + int _type = T18; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:17:5: ( ')' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:17:7: ')' + { + match(')'); + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T18 + + // $ANTLR start T19 + public final void mT19() throws RecognitionException { + try { + int _type = T19; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:18:5: ( '..' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:18:7: '..' + { + match(".."); + + + } + + this.type = _type; + } + finally { + } + } + // $ANTLR end T19 + // $ANTLR start RULE_ID public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:304:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:304:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:430:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:430:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:304:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:430:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -120,7 +216,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:304:12: '^' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:430:12: '^' { match('^'); @@ -139,7 +235,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:304:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:430:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -187,10 +283,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:306:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:306:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:432:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:432:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:306:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:432:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -204,7 +300,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:306:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:432:13: '0' .. '9' { matchRange('0','9'); @@ -234,7 +330,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -246,16 +342,16 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("308:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("434: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/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -271,7 +367,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434: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' ) { @@ -288,7 +384,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -314,10 +410,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -333,7 +429,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434: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' ) { @@ -350,7 +446,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:308:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:434:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -388,12 +484,12 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:310:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:310:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:436:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:436:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:310:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:436:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -418,7 +514,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:310:52: . + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:436:52: . { matchAny(); @@ -447,12 +543,12 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -465,7 +561,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438: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(); @@ -486,7 +582,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -495,9 +591,9 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -506,7 +602,7 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:312:39: '\\r' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:438:39: '\\r' { match('\r'); @@ -537,10 +633,10 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:314:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:314:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:440:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:440:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:314:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:440:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -594,8 +690,8 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:316:16: ( . ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:316:18: . + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:442:16: ( . ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:442:18: . { matchAny(); @@ -609,77 +705,95 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { // $ANTLR end RULE_ANY_OTHER public void mTokens() throws RecognitionException { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt12=11; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt12=16; int LA12_0 = input.LA(1); if ( (LA12_0==':') ) { alt12=1; } - else if ( (LA12_0==';') ) { + else if ( (LA12_0=='#') ) { alt12=2; } - else if ( (LA12_0=='.') ) { + else if ( (LA12_0=='+') ) { alt12=3; } + else if ( (LA12_0==';') ) { + alt12=4; + } + else if ( (LA12_0=='.') ) { + int LA12_5 = input.LA(2); + + if ( (LA12_5=='.') ) { + alt12=9; + } + else { + alt12=5;} + } else if ( (LA12_0=='/') ) { switch ( input.LA(2) ) { case '/': { - alt12=9; + alt12=14; } break; case '*': { - alt12=8; + alt12=13; } break; default: - alt12=4;} + alt12=6;} } + else if ( (LA12_0=='(') ) { + alt12=7; + } + else if ( (LA12_0==')') ) { + alt12=8; + } else if ( (LA12_0=='^') ) { - int LA12_5 = input.LA(2); + int LA12_9 = input.LA(2); - if ( ((LA12_5>='A' && LA12_5<='Z')||LA12_5=='_'||(LA12_5>='a' && LA12_5<='z')) ) { - alt12=5; + if ( ((LA12_9>='A' && LA12_9<='Z')||LA12_9=='_'||(LA12_9>='a' && LA12_9<='z')) ) { + alt12=10; } else { - alt12=11;} + alt12=16;} } else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='z')) ) { - alt12=5; + alt12=10; } else if ( ((LA12_0>='0' && LA12_0<='9')) ) { - alt12=6; + alt12=11; } else if ( (LA12_0=='\"') ) { - int LA12_8 = input.LA(2); + int LA12_12 = input.LA(2); - if ( ((LA12_8>='\u0000' && LA12_8<='\uFFFE')) ) { - alt12=7; + if ( ((LA12_12>='\u0000' && LA12_12<='\uFFFE')) ) { + alt12=12; } else { - alt12=11;} + alt12=16;} } else if ( (LA12_0=='\'') ) { - int LA12_9 = input.LA(2); + int LA12_13 = input.LA(2); - if ( ((LA12_9>='\u0000' && LA12_9<='\uFFFE')) ) { - alt12=7; + if ( ((LA12_13>='\u0000' && LA12_13<='\uFFFE')) ) { + alt12=12; } else { - alt12=11;} + alt12=16;} } else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) { - alt12=10; + alt12=15; } - else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='#' && LA12_0<='&')||(LA12_0>='(' && LA12_0<='-')||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) { - alt12=11; + else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||LA12_0=='!'||(LA12_0>='$' && LA12_0<='&')||LA12_0=='*'||(LA12_0>=',' && LA12_0<='-')||(LA12_0>='<' && LA12_0<='@')||(LA12_0>='[' && LA12_0<=']')||LA12_0=='`'||(LA12_0>='{' && LA12_0<='\uFFFE')) ) { + alt12=16; } else { NoViableAltException nvae = - new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input); + new NoViableAltException("1:1: Tokens : ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );", 12, 0, input); throw nvae; } @@ -713,49 +827,84 @@ public class InternalDatatypeRulesTestLanguageLexer extends Lexer { } break; case 5 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:26: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:26: T15 { - mRULE_ID(); + mT15(); } break; case 6 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:34: RULE_INT + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:30: T16 { - mRULE_INT(); + mT16(); } break; case 7 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:43: RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:34: T17 { - mRULE_STRING(); + mT17(); } break; case 8 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:55: RULE_ML_COMMENT + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:38: T18 { - mRULE_ML_COMMENT(); + mT18(); } break; case 9 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:71: RULE_SL_COMMENT + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:42: T19 { - mRULE_SL_COMMENT(); + mT19(); } break; case 10 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:87: RULE_WS + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:46: RULE_ID { - mRULE_WS(); + mRULE_ID(); } break; case 11 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:95: RULE_ANY_OTHER + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:54: RULE_INT + { + mRULE_INT(); + + } + break; + case 12 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:63: RULE_STRING + { + mRULE_STRING(); + + } + break; + case 13 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:75: RULE_ML_COMMENT + { + mRULE_ML_COMMENT(); + + } + break; + case 14 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:91: RULE_SL_COMMENT + { + mRULE_SL_COMMENT(); + + } + break; + case 15 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:107: RULE_WS + { + mRULE_WS(); + + } + break; + case 16 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:1:115: RULE_ANY_OTHER { mRULE_ANY_OTHER(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java index ddcb737..3abd452 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-16 15:27:18 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g 2008-12-18 11:06:30 package org.eclipse.xtext.parser.datatyperules.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -21,7 +23,7 @@ import java.util.ArrayList; public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "';'", "'.'", "'/'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "':'", "'#'", "'+'", "';'", "'.'", "'/'", "'('", "')'", "'..'" }; public static final int RULE_ML_COMMENT=7; public static final int RULE_ID=4; @@ -62,7 +64,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleCompositeModel - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:64:1: entryRuleCompositeModel returns [EObject current=null] : iv_ruleCompositeModel= ruleCompositeModel EOF ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:66:1: entryRuleCompositeModel returns [EObject current=null] : iv_ruleCompositeModel= ruleCompositeModel EOF ; public final EObject entryRuleCompositeModel() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:64:56: (iv_ruleCompositeModel= ruleCompositeModel EOF ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:65:2: iv_ruleCompositeModel= ruleCompositeModel EOF + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:66:56: (iv_ruleCompositeModel= ruleCompositeModel EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:67:2: iv_ruleCompositeModel= ruleCompositeModel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleCompositeModel_in_entryRuleCompositeModel71); @@ -97,7 +99,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleCompositeModel - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:72:1: ruleCompositeModel returns [EObject current=null] : (lv_model= ruleModel )+ ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:74:1: ruleCompositeModel returns [EObject current=null] : (lv_model= ruleModel )+ ; public final EObject ruleCompositeModel() throws RecognitionException { EObject current = null; @@ -106,10 +108,10 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:74:33: ( (lv_model= ruleModel )+ ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:75:1: (lv_model= ruleModel )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:76:33: ( (lv_model= ruleModel )+ ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:77:1: (lv_model= ruleModel )+ { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:75:1: (lv_model= ruleModel )+ + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:77:1: (lv_model= ruleModel )+ int cnt1=0; loop1: do { @@ -123,7 +125,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:78:6: lv_model= ruleModel + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:80:6: lv_model= ruleModel { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.0/@alternatives/@terminal" /* xtext::RuleCall */, currentNode); @@ -176,7 +178,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleModel - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:103:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:105:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -184,8 +186,8 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:103:47: (iv_ruleModel= ruleModel EOF ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:104:2: iv_ruleModel= ruleModel EOF + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:105:47: (iv_ruleModel= ruleModel EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:106:2: iv_ruleModel= ruleModel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleModel_in_entryRuleModel176); @@ -211,33 +213,43 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleModel - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:111:1: ruleModel returns [EObject current=null] : ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ';' ) ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:113:1: ruleModel returns [EObject current=null] : ( ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) ';' ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; - String lv_id = null; + DatatypeRuleToken lv_id = null; + + DatatypeRuleToken lv_value = null; - String lv_value = null; + DatatypeRuleToken lv_vector = null; + + DatatypeRuleToken lv_dots = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:113:33: ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ';' ) ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:1: ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:115:33: ( ( ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) ';' ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:1: ( ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) ';' ) + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:1: ( ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:2: ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) ';' { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:1: ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ';' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:2: ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ';' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:2: ( ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:3: ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) ( '+' (lv_dots= ruleDots ) )? { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:2: ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:3: (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:3: ( ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:4: ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) ( '#' (lv_vector= ruleVector ) )? { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:114:3: (lv_id= ruleNestedModelId ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:117:6: lv_id= ruleNestedModelId + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:4: ( (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:5: (lv_id= ruleNestedModelId ) ( ':' (lv_value= ruleFraction ) )? + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:116:5: (lv_id= ruleNestedModelId ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:119:6: lv_id= ruleNestedModelId { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleNestedModelId_in_ruleModel246); + pushFollow(FOLLOW_ruleNestedModelId_in_ruleModel248); lv_id=ruleNestedModelId(); _fsp--; @@ -257,7 +269,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:135:2: ( ':' (lv_value= ruleFraction ) )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:137:2: ( ':' (lv_value= ruleFraction ) )? int alt2=2; int LA2_0 = input.LA(1); @@ -266,19 +278,19 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:135:3: ':' (lv_value= ruleFraction ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:137:3: ':' (lv_value= ruleFraction ) { - match(input,11,FOLLOW_11_in_ruleModel260); + match(input,11,FOLLOW_11_in_ruleModel262); - createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:139:1: (lv_value= ruleFraction ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:142:6: lv_value= ruleFraction + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:141:1: (lv_value= ruleFraction ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:144:6: lv_value= ruleFraction { - currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleFraction_in_ruleModel294); + pushFollow(FOLLOW_ruleFraction_in_ruleModel296); lv_value=ruleFraction(); _fsp--; @@ -307,7 +319,107 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } - match(input,12,FOLLOW_12_in_ruleModel310); + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:162:5: ( '#' (lv_vector= ruleVector ) )? + int alt3=2; + int LA3_0 = input.LA(1); + + if ( (LA3_0==12) ) { + alt3=1; + } + switch (alt3) { + case 1 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:162:6: '#' (lv_vector= ruleVector ) + { + match(input,12,FOLLOW_12_in_ruleModel313); + + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:166:1: (lv_vector= ruleVector ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:169:6: lv_vector= ruleVector + { + + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + + pushFollow(FOLLOW_ruleVector_in_ruleModel347); + lv_vector=ruleVector(); + _fsp--; + + + currentNode = currentNode.getParent(); + if (current==null) { + current = factory.create("Model"); + associateNodeWithAstElement(currentNode, current); + } + + try { + factory.set(current, "vector", lv_vector,"Vector"); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + + + } + + + } + break; + + } + + + } + + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:187:5: ( '+' (lv_dots= ruleDots ) )? + int alt4=2; + int LA4_0 = input.LA(1); + + if ( (LA4_0==13) ) { + alt4=1; + } + switch (alt4) { + case 1 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:187:6: '+' (lv_dots= ruleDots ) + { + match(input,13,FOLLOW_13_in_ruleModel364); + + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); + + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:191:1: (lv_dots= ruleDots ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:194:6: lv_dots= ruleDots + { + + currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); + + pushFollow(FOLLOW_ruleDots_in_ruleModel398); + lv_dots=ruleDots(); + _fsp--; + + + currentNode = currentNode.getParent(); + if (current==null) { + current = factory.create("Model"); + associateNodeWithAstElement(currentNode, current); + } + + try { + factory.set(current, "dots", lv_dots,"Dots"); + } catch (ValueConverterException vce) { + handleValueConverterException(vce); + } + + + } + + + } + break; + + } + + + } + + match(input,14,FOLLOW_14_in_ruleModel414); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.1/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); @@ -332,24 +444,24 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleModelId - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:171:1: entryRuleModelId returns [String current=null] : iv_ruleModelId= ruleModelId EOF ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:223:1: entryRuleModelId returns [String current=null] : iv_ruleModelId= ruleModelId EOF ; public final String entryRuleModelId() throws RecognitionException { String current = null; - String iv_ruleModelId = null; + DatatypeRuleToken iv_ruleModelId = null; try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:171:48: (iv_ruleModelId= ruleModelId EOF ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:172:2: iv_ruleModelId= ruleModelId EOF + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:223:48: (iv_ruleModelId= ruleModelId EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:224:2: iv_ruleModelId= ruleModelId EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleModelId_in_entryRuleModelId344); + pushFollow(FOLLOW_ruleModelId_in_entryRuleModelId448); iv_ruleModelId=ruleModelId(); _fsp--; - current =iv_ruleModelId; - match(input,EOF,FOLLOW_EOF_in_entryRuleModelId355); + current =iv_ruleModelId.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleModelId459); } @@ -367,47 +479,45 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleModelId - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:179:1: ruleModelId returns [String current=null] : ( (this_ID= RULE_ID '.' ) this_ID= RULE_ID ) ; - public final String ruleModelId() throws RecognitionException { - String current = null; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:231:1: ruleModelId returns [DatatypeRuleToken current=new DatatypeRuleToken()] : ( (this_ID= RULE_ID kw= '.' ) this_ID= RULE_ID ) ; + public final DatatypeRuleToken ruleModelId() throws RecognitionException { + DatatypeRuleToken current = new DatatypeRuleToken(); Token this_ID=null; + Token kw=null; - StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); + setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:181:91: ( ( (this_ID= RULE_ID '.' ) this_ID= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:182:1: ( (this_ID= RULE_ID '.' ) this_ID= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:233:33: ( ( (this_ID= RULE_ID kw= '.' ) this_ID= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:234:1: ( (this_ID= RULE_ID kw= '.' ) this_ID= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:182:1: ( (this_ID= RULE_ID '.' ) this_ID= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:182:2: (this_ID= RULE_ID '.' ) this_ID= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:234:1: ( (this_ID= RULE_ID kw= '.' ) this_ID= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:234:2: (this_ID= RULE_ID kw= '.' ) this_ID= RULE_ID { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:182:2: (this_ID= RULE_ID '.' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:182:7: this_ID= RULE_ID '.' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:234:2: (this_ID= RULE_ID kw= '.' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:234:7: this_ID= RULE_ID kw= '.' { this_ID=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelId396); - - - buffer.append(this_ID.getText()); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelId500); + current.merge(this_ID); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::RuleCall */, null); - match(input,13,FOLLOW_13_in_ruleModelId410); + kw=(Token)input.LT(1); + match(input,15,FOLLOW_15_in_ruleModelId518); - buffer.append("."); + current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); } this_ID=(Token)input.LT(1); - match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelId426); - - - buffer.append(this_ID.getText()); + match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleModelId534); + current.merge(this_ID); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1" /* xtext::RuleCall */, null); @@ -418,7 +528,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } - resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; + resetLookahead(); } catch (RecognitionException re) { @@ -433,24 +543,24 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleNestedModelId - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:213:1: entryRuleNestedModelId returns [String current=null] : iv_ruleNestedModelId= ruleNestedModelId EOF ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:262:1: entryRuleNestedModelId returns [String current=null] : iv_ruleNestedModelId= ruleNestedModelId EOF ; public final String entryRuleNestedModelId() throws RecognitionException { String current = null; - String iv_ruleNestedModelId = null; + DatatypeRuleToken iv_ruleNestedModelId = null; try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:213:54: (iv_ruleNestedModelId= ruleNestedModelId EOF ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:214:2: iv_ruleNestedModelId= ruleNestedModelId EOF + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:262:54: (iv_ruleNestedModelId= ruleNestedModelId EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:263:2: iv_ruleNestedModelId= ruleNestedModelId EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleNestedModelId_in_entryRuleNestedModelId470); + pushFollow(FOLLOW_ruleNestedModelId_in_entryRuleNestedModelId578); iv_ruleNestedModelId=ruleNestedModelId(); _fsp--; - current =iv_ruleNestedModelId; - match(input,EOF,FOLLOW_EOF_in_entryRuleNestedModelId481); + current =iv_ruleNestedModelId.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleNestedModelId589); } @@ -468,42 +578,42 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleNestedModelId - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:221:1: ruleNestedModelId returns [String current=null] : ( (this_ModelId= ruleModelId '.' ) this_ModelId= ruleModelId ) ; - public final String ruleNestedModelId() throws RecognitionException { - String current = null; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:270:1: ruleNestedModelId returns [DatatypeRuleToken current=new DatatypeRuleToken()] : ( (this_ModelId= ruleModelId kw= '.' ) this_ModelId= ruleModelId ) ; + public final DatatypeRuleToken ruleNestedModelId() throws RecognitionException { + DatatypeRuleToken current = new DatatypeRuleToken(); - String this_ModelId = null; + Token kw=null; + DatatypeRuleToken this_ModelId = null; - StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); + setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:223:91: ( ( (this_ModelId= ruleModelId '.' ) this_ModelId= ruleModelId ) ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:224:1: ( (this_ModelId= ruleModelId '.' ) this_ModelId= ruleModelId ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:272:33: ( ( (this_ModelId= ruleModelId kw= '.' ) this_ModelId= ruleModelId ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:273:1: ( (this_ModelId= ruleModelId kw= '.' ) this_ModelId= ruleModelId ) { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:224:1: ( (this_ModelId= ruleModelId '.' ) this_ModelId= ruleModelId ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:224:2: (this_ModelId= ruleModelId '.' ) this_ModelId= ruleModelId + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:273:1: ( (this_ModelId= ruleModelId kw= '.' ) this_ModelId= ruleModelId ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:273:2: (this_ModelId= ruleModelId kw= '.' ) this_ModelId= ruleModelId { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:224:2: (this_ModelId= ruleModelId '.' ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:225:5: this_ModelId= ruleModelId '.' + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:273:2: (this_ModelId= ruleModelId kw= '.' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:274:5: this_ModelId= ruleModelId kw= '.' { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleModelId_in_ruleNestedModelId529); + pushFollow(FOLLOW_ruleModelId_in_ruleNestedModelId637); this_ModelId=ruleModelId(); _fsp--; - - if (this_ModelId != null) buffer.append(this_ModelId); - + current.merge(this_ModelId); currentNode = currentNode.getParent(); - match(input,13,FOLLOW_13_in_ruleNestedModelId543); + kw=(Token)input.LT(1); + match(input,15,FOLLOW_15_in_ruleNestedModelId655); - buffer.append("."); + current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::Keyword */, null); @@ -512,14 +622,12 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1" /* xtext::RuleCall */, currentNode); - pushFollow(FOLLOW_ruleModelId_in_ruleNestedModelId566); + pushFollow(FOLLOW_ruleModelId_in_ruleNestedModelId678); this_ModelId=ruleModelId(); _fsp--; - - if (this_ModelId != null) buffer.append(this_ModelId); - + current.merge(this_ModelId); currentNode = currentNode.getParent(); @@ -530,7 +638,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } - resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; + resetLookahead(); } catch (RecognitionException re) { @@ -545,24 +653,24 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleFraction - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:263:1: entryRuleFraction returns [String current=null] : iv_ruleFraction= ruleFraction EOF ; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:309:1: entryRuleFraction returns [String current=null] : iv_ruleFraction= ruleFraction EOF ; public final String entryRuleFraction() throws RecognitionException { String current = null; - String iv_ruleFraction = null; + DatatypeRuleToken iv_ruleFraction = null; try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:263:49: (iv_ruleFraction= ruleFraction EOF ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:264:2: iv_ruleFraction= ruleFraction EOF + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:309:49: (iv_ruleFraction= ruleFraction EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:310:2: iv_ruleFraction= ruleFraction EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); - pushFollow(FOLLOW_ruleFraction_in_entryRuleFraction610); + pushFollow(FOLLOW_ruleFraction_in_entryRuleFraction722); iv_ruleFraction=ruleFraction(); _fsp--; - current =iv_ruleFraction; - match(input,EOF,FOLLOW_EOF_in_entryRuleFraction621); + current =iv_ruleFraction.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleFraction733); } @@ -580,52 +688,50 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleFraction - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:271:1: ruleFraction returns [String current=null] : (this_INT= RULE_INT ( '/' this_INT= RULE_INT )? ) ; - public final String ruleFraction() throws RecognitionException { - String current = null; + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:317:1: ruleFraction returns [DatatypeRuleToken current=new DatatypeRuleToken()] : (this_INT= RULE_INT (kw= '/' this_INT= RULE_INT )? ) ; + public final DatatypeRuleToken ruleFraction() throws RecognitionException { + DatatypeRuleToken current = new DatatypeRuleToken(); Token this_INT=null; + Token kw=null; - StringBuilder buffer=new StringBuilder(20); setCurrentLookahead(); resetLookahead(); + setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:273:91: ( (this_INT= RULE_INT ( '/' this_INT= RULE_INT )? ) ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:274:1: (this_INT= RULE_INT ( '/' this_INT= RULE_INT )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:319:33: ( (this_INT= RULE_INT (kw= '/' this_INT= RULE_INT )? ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:320:1: (this_INT= RULE_INT (kw= '/' this_INT= RULE_INT )? ) { - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:274:1: (this_INT= RULE_INT ( '/' this_INT= RULE_INT )? ) - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:274:6: this_INT= RULE_INT ( '/' this_INT= RULE_INT )? + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:320:1: (this_INT= RULE_INT (kw= '/' this_INT= RULE_INT )? ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:320:6: this_INT= RULE_INT (kw= '/' this_INT= RULE_INT )? { this_INT=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFraction661); - - - buffer.append(this_INT.getText()); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFraction773); + current.merge(this_INT); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, null); - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:283:1: ( '/' this_INT= RULE_INT )? - int alt3=2; - int LA3_0 = input.LA(1); + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:327:1: (kw= '/' this_INT= RULE_INT )? + int alt5=2; + int LA5_0 = input.LA(1); - if ( (LA3_0==14) ) { - alt3=1; + if ( (LA5_0==16) ) { + alt5=1; } - switch (alt3) { + switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:283:2: '/' this_INT= RULE_INT + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:328:2: kw= '/' this_INT= RULE_INT { - match(input,14,FOLLOW_14_in_ruleFraction676); + kw=(Token)input.LT(1); + match(input,16,FOLLOW_16_in_ruleFraction792); - buffer.append("/"); + current.merge(kw); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); this_INT=(Token)input.LT(1); - match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFraction691); - - - buffer.append(this_INT.getText()); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFraction807); + current.merge(this_INT); createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@abstractTokens.1" /* xtext::RuleCall */, null); @@ -642,7 +748,7 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser } - resetLookahead(); current = buffer.length() > 0 ? buffer.toString() : null; + resetLookahead(); } catch (RecognitionException re) { @@ -656,6 +762,237 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser // $ANTLR end ruleFraction + // $ANTLR start entryRuleVector + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:348:1: entryRuleVector returns [String current=null] : iv_ruleVector= ruleVector EOF ; + public final String entryRuleVector() throws RecognitionException { + String current = null; + + DatatypeRuleToken iv_ruleVector = null; + + + try { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:348:47: (iv_ruleVector= ruleVector EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:349:2: iv_ruleVector= ruleVector EOF + { + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleVector_in_entryRuleVector853); + iv_ruleVector=ruleVector(); + _fsp--; + + current =iv_ruleVector.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleVector864); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end entryRuleVector + + + // $ANTLR start ruleVector + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:356:1: ruleVector returns [DatatypeRuleToken current=new DatatypeRuleToken()] : ( ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) kw= ')' ) ; + public final DatatypeRuleToken ruleVector() throws RecognitionException { + DatatypeRuleToken current = new DatatypeRuleToken(); + + Token kw=null; + Token this_INT=null; + + setCurrentLookahead(); resetLookahead(); + try { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:358:33: ( ( ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) kw= ')' ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:1: ( ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) kw= ')' ) + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:1: ( ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) kw= ')' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:2: ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) kw= ')' + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:2: ( (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:3: (kw= '(' this_INT= RULE_INT ) this_INT= RULE_INT + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:359:3: (kw= '(' this_INT= RULE_INT ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:360:2: kw= '(' this_INT= RULE_INT + { + kw=(Token)input.LT(1); + match(input,17,FOLLOW_17_in_ruleVector904); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); + + this_INT=(Token)input.LT(1); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleVector919); + + current.merge(this_INT); + + + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, null); + + + } + + this_INT=(Token)input.LT(1); + match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleVector940); + + current.merge(this_INT); + + + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.1" /* xtext::RuleCall */, null); + + + } + + kw=(Token)input.LT(1); + match(input,18,FOLLOW_18_in_ruleVector959); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.1" /* xtext::Keyword */, null); + + + } + + + } + + resetLookahead(); + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end ruleVector + + + // $ANTLR start entryRuleDots + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:393:1: entryRuleDots returns [String current=null] : iv_ruleDots= ruleDots EOF ; + public final String entryRuleDots() throws RecognitionException { + String current = null; + + DatatypeRuleToken iv_ruleDots = null; + + + try { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:393:45: (iv_ruleDots= ruleDots EOF ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:394:2: iv_ruleDots= ruleDots EOF + { + currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); + pushFollow(FOLLOW_ruleDots_in_entryRuleDots998); + iv_ruleDots=ruleDots(); + _fsp--; + + current =iv_ruleDots.getText(); + match(input,EOF,FOLLOW_EOF_in_entryRuleDots1009); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end entryRuleDots + + + // $ANTLR start ruleDots + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:401:1: ruleDots returns [DatatypeRuleToken current=new DatatypeRuleToken()] : ( (kw= '.' kw= '.' ) | kw= '..' ) ; + public final DatatypeRuleToken ruleDots() throws RecognitionException { + DatatypeRuleToken current = new DatatypeRuleToken(); + + Token kw=null; + + setCurrentLookahead(); resetLookahead(); + try { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:403:33: ( ( (kw= '.' kw= '.' ) | kw= '..' ) ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:404:1: ( (kw= '.' kw= '.' ) | kw= '..' ) + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:404:1: ( (kw= '.' kw= '.' ) | kw= '..' ) + int alt6=2; + int LA6_0 = input.LA(1); + + if ( (LA6_0==15) ) { + alt6=1; + } + else if ( (LA6_0==19) ) { + alt6=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("404:1: ( (kw= '.' kw= '.' ) | kw= '..' )", 6, 0, input); + + throw nvae; + } + switch (alt6) { + case 1 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:404:2: (kw= '.' kw= '.' ) + { + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:404:2: (kw= '.' kw= '.' ) + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:405:2: kw= '.' kw= '.' + { + kw=(Token)input.LT(1); + match(input,15,FOLLOW_15_in_ruleDots1048); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.0/@abstractTokens.0" /* xtext::Keyword */, null); + + kw=(Token)input.LT(1); + match(input,15,FOLLOW_15_in_ruleDots1061); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.0/@abstractTokens.1" /* xtext::Keyword */, null); + + + } + + + } + break; + case 2 : + // ./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g:418:2: kw= '..' + { + kw=(Token)input.LT(1); + match(input,19,FOLLOW_19_in_ruleDots1081); + + current.merge(kw); + createLeafNode("classpath:/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.xmi#//@rules.6/@alternatives/@groups.1" /* xtext::Keyword */, null); + + + } + break; + + } + + + } + + resetLookahead(); + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end ruleDots + + public static final BitSet FOLLOW_ruleCompositeModel_in_entryRuleCompositeModel71 = new BitSet(new long[]{0x0000000000000000L}); @@ -663,24 +1000,39 @@ public class InternalDatatypeRulesTestLanguageParser extends AbstractAntlrParser public static final BitSet FOLLOW_ruleModel_in_ruleCompositeModel139 = new BitSet(new long[]{0x0000000000000012L}); public static final BitSet FOLLOW_ruleModel_in_entryRuleModel176 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleModel186 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNestedModelId_in_ruleModel246 = new BitSet(new long[]{0x0000000000001800L}); - public static final BitSet FOLLOW_11_in_ruleModel260 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleFraction_in_ruleModel294 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleModel310 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleModelId_in_entryRuleModelId344 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleModelId355 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleModelId396 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleModelId410 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleModelId426 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNestedModelId_in_entryRuleNestedModelId470 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNestedModelId481 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleModelId_in_ruleNestedModelId529 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_13_in_ruleNestedModelId543 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_ruleModelId_in_ruleNestedModelId566 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFraction_in_entryRuleFraction610 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFraction621 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleFraction661 = new BitSet(new long[]{0x0000000000004002L}); - public static final BitSet FOLLOW_14_in_ruleFraction676 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleFraction691 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNestedModelId_in_ruleModel248 = new BitSet(new long[]{0x0000000000007800L}); + public static final BitSet FOLLOW_11_in_ruleModel262 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleFraction_in_ruleModel296 = new BitSet(new long[]{0x0000000000007000L}); + public static final BitSet FOLLOW_12_in_ruleModel313 = new BitSet(new long[]{0x0000000000020000L}); + public static final BitSet FOLLOW_ruleVector_in_ruleModel347 = new BitSet(new long[]{0x0000000000006000L}); + public static final BitSet FOLLOW_13_in_ruleModel364 = new BitSet(new long[]{0x0000000000088000L}); + public static final BitSet FOLLOW_ruleDots_in_ruleModel398 = new BitSet(new long[]{0x0000000000004000L}); + public static final BitSet FOLLOW_14_in_ruleModel414 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleModelId_in_entryRuleModelId448 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleModelId459 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleModelId500 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleModelId518 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleModelId534 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNestedModelId_in_entryRuleNestedModelId578 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNestedModelId589 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleModelId_in_ruleNestedModelId637 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleNestedModelId655 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_ruleModelId_in_ruleNestedModelId678 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFraction_in_entryRuleFraction722 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFraction733 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleFraction773 = new BitSet(new long[]{0x0000000000010002L}); + public static final BitSet FOLLOW_16_in_ruleFraction792 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleFraction807 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleVector_in_entryRuleVector853 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleVector864 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleVector904 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleVector919 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleVector940 = new BitSet(new long[]{0x0000000000040000L}); + public static final BitSet FOLLOW_18_in_ruleVector959 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDots_in_entryRuleDots998 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDots1009 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_15_in_ruleDots1048 = new BitSet(new long[]{0x0000000000008000L}); + public static final BitSet FOLLOW_15_in_ruleDots1061 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_19_in_ruleDots1081 = 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/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage__.g index 73a31c3..7585af9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage__.g @@ -8,29 +8,34 @@ import org.eclipse.xtext.parser.antlr.Lexer; } T11 : ':' ; -T12 : ';' ; -T13 : '.' ; -T14 : '/' ; - -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 304 +T12 : '#' ; +T13 : '+' ; +T14 : ';' ; +T15 : '.' ; +T16 : '/' ; +T17 : '(' ; +T18 : ')' ; +T19 : '..' ; + +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 430 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 306 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 432 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 308 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 434 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 310 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 436 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 312 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 438 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 314 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 440 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 316 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/datatyperules/parser/internal/InternalDatatypeRulesTestLanguage.g" 442 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java index 2c5a196..6019044 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/parsetree/reconstr/DatatypeRulesTestLanguageParseTreeConstructor.java @@ -34,6 +34,8 @@ public class DatatypeRulesTestLanguageParseTreeConstructor extends AbstractParse + + return null; } @@ -80,12 +82,12 @@ protected class CompositeModel_Assignment_model extends AssignmentToken { /************ begin Rule Model **************** * - * Model : id = NestedModelId ( ':' value = Fraction ) ? ';' ; + * Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ; * **/ -// id = NestedModelId ( ':' value = Fraction ) ? ';' +// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' protected class Model_Group extends GroupToken { public Model_Group(IInstanceDescription curr, AbstractToken pred) { @@ -113,7 +115,7 @@ protected class Model_Group extends GroupToken { } } -// id = NestedModelId ( ':' value = Fraction ) ? +// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? protected class Model_0_Group extends GroupToken { public Model_0_Group(IInstanceDescription curr, AbstractToken pred) { @@ -127,7 +129,63 @@ protected class Model_0_Group extends GroupToken { protected Solution createSolution() { Solution s1 = new Model_0_1_Group(current, this).firstSolution(); while(s1 != null) { - Solution s2 = new Model_0_0_Assignment_id(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + Solution s2 = new Model_0_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + if(s2 == null) { + s1 = s1.getPredecessor().nextSolution(this); + if(s1 == null) return null; + } else { + last = s2.getPredecessor(); + return s2; + } + } + return null; + + } +} + +// id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? +protected class Model_0_0_Group extends GroupToken { + + public Model_0_0_Group(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Group getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00Group(); + } + + protected Solution createSolution() { + Solution s1 = new Model_0_0_1_Group(current, this).firstSolution(); + while(s1 != null) { + Solution s2 = new Model_0_0_0_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + if(s2 == null) { + s1 = s1.getPredecessor().nextSolution(this); + if(s1 == null) return null; + } else { + last = s2.getPredecessor(); + return s2; + } + } + return null; + + } +} + +// id = NestedModelId ( ':' value = Fraction ) ? +protected class Model_0_0_0_Group extends GroupToken { + + public Model_0_0_0_Group(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Group getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele000Group(); + } + + protected Solution createSolution() { + Solution s1 = new Model_0_0_0_1_Group(current, this).firstSolution(); + while(s1 != null) { + Solution s2 = new Model_0_0_0_0_Assignment_id(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { s1 = s1.getPredecessor().nextSolution(this); if(s1 == null) return null; @@ -142,14 +200,14 @@ protected class Model_0_Group extends GroupToken { } // id = NestedModelId -protected class Model_0_0_Assignment_id extends AssignmentToken { +protected class Model_0_0_0_0_Assignment_id extends AssignmentToken { - public Model_0_0_Assignment_id(IInstanceDescription curr, AbstractToken pred) { + public Model_0_0_0_0_Assignment_id(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Assignment getGrammarElement() { - return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00AssignmentId(); + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0000AssignmentId(); } protected Solution createSolution() { @@ -158,7 +216,7 @@ protected class Model_0_0_Assignment_id extends AssignmentToken { if(true) { // xtext::RuleCall FIXME: check if value is valid for datatype rule type = AssignmentType.PRC; - element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele000ParserRuleCallNestedModelId(); + element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00000ParserRuleCallNestedModelId(); return new Solution(obj); } @@ -167,6 +225,140 @@ protected class Model_0_0_Assignment_id extends AssignmentToken { } // ( ':' value = Fraction ) ? +protected class Model_0_0_0_1_Group extends GroupToken { + + public Model_0_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, !IS_REQUIRED); + } + + public Group getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0001Group(); + } + + protected Solution createSolution() { + Solution s1 = new Model_0_0_0_1_1_Assignment_value(current, this).firstSolution(); + while(s1 != null) { + Solution s2 = new Model_0_0_0_1_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + if(s2 == null) { + s1 = s1.getPredecessor().nextSolution(this); + if(s1 == null) return null; + } else { + last = s2.getPredecessor(); + return s2; + } + } + return null; + + } +} + +// ':' +protected class Model_0_0_0_1_0_Keyword extends KeywordToken { + + public Model_0_0_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Keyword getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00010KeywordColon(); + } +} + +// value = Fraction +protected class Model_0_0_0_1_1_Assignment_value extends AssignmentToken { + + public Model_0_0_0_1_1_Assignment_value(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Assignment getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00011AssignmentValue(); + } + + protected Solution createSolution() { + if((value = current.getConsumable("value",!IS_REQUIRED)) == null) return null; + IInstanceDescription obj = current.cloneAndConsume("value"); + + if(true) { // xtext::RuleCall FIXME: check if value is valid for datatype rule + type = AssignmentType.PRC; + element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele000110ParserRuleCallFraction(); + return new Solution(obj); + } + + return null; + } +} + + + +// ( '#' vector = Vector ) ? +protected class Model_0_0_1_Group extends GroupToken { + + public Model_0_0_1_Group(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, !IS_REQUIRED); + } + + public Group getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele001Group(); + } + + protected Solution createSolution() { + Solution s1 = new Model_0_0_1_1_Assignment_vector(current, this).firstSolution(); + while(s1 != null) { + Solution s2 = new Model_0_0_1_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); + if(s2 == null) { + s1 = s1.getPredecessor().nextSolution(this); + if(s1 == null) return null; + } else { + last = s2.getPredecessor(); + return s2; + } + } + return null; + + } +} + +// '#' +protected class Model_0_0_1_0_Keyword extends KeywordToken { + + public Model_0_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Keyword getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0010KeywordNumberSign(); + } +} + +// vector = Vector +protected class Model_0_0_1_1_Assignment_vector extends AssignmentToken { + + public Model_0_0_1_1_Assignment_vector(IInstanceDescription curr, AbstractToken pred) { + super(curr, pred, !IS_MANY, IS_REQUIRED); + } + + public Assignment getGrammarElement() { + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0011AssignmentVector(); + } + + protected Solution createSolution() { + if((value = current.getConsumable("vector",!IS_REQUIRED)) == null) return null; + IInstanceDescription obj = current.cloneAndConsume("vector"); + + if(true) { // xtext::RuleCall FIXME: check if value is valid for datatype rule + type = AssignmentType.PRC; + element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele00110ParserRuleCallVector(); + return new Solution(obj); + } + + return null; + } +} + + + +// ( '+' dots = Dots ) ? protected class Model_0_1_Group extends GroupToken { public Model_0_1_Group(IInstanceDescription curr, AbstractToken pred) { @@ -178,7 +370,7 @@ protected class Model_0_1_Group extends GroupToken { } protected Solution createSolution() { - Solution s1 = new Model_0_1_1_Assignment_value(current, this).firstSolution(); + Solution s1 = new Model_0_1_1_Assignment_dots(current, this).firstSolution(); while(s1 != null) { Solution s2 = new Model_0_1_0_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution(); if(s2 == null) { @@ -194,7 +386,7 @@ protected class Model_0_1_Group extends GroupToken { } } -// ':' +// '+' protected class Model_0_1_0_Keyword extends KeywordToken { public Model_0_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) { @@ -202,28 +394,28 @@ protected class Model_0_1_0_Keyword extends KeywordToken { } public Keyword getGrammarElement() { - return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele010KeywordColon(); + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele010KeywordPlusSign(); } } -// value = Fraction -protected class Model_0_1_1_Assignment_value extends AssignmentToken { +// dots = Dots +protected class Model_0_1_1_Assignment_dots extends AssignmentToken { - public Model_0_1_1_Assignment_value(IInstanceDescription curr, AbstractToken pred) { + public Model_0_1_1_Assignment_dots(IInstanceDescription curr, AbstractToken pred) { super(curr, pred, !IS_MANY, IS_REQUIRED); } public Assignment getGrammarElement() { - return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele011AssignmentValue(); + return DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele011AssignmentDots(); } protected Solution createSolution() { - if((value = current.getConsumable("value",!IS_REQUIRED)) == null) return null; - IInstanceDescription obj = current.cloneAndConsume("value"); + if((value = current.getConsumable("dots",!IS_REQUIRED)) == null) return null; + IInstanceDescription obj = current.cloneAndConsume("dots"); if(true) { // xtext::RuleCall FIXME: check if value is valid for datatype rule type = AssignmentType.PRC; - element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0110ParserRuleCallFraction(); + element = DatatypeRulesTestLanguageGrammarAccess.INSTANCE.prModel().ele0110ParserRuleCallDots(); return new Solution(obj); } @@ -251,4 +443,6 @@ protected class Model_1_Keyword extends KeywordToken { + + } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java index eafd406..93a6823 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/datatyperules/services/DatatypeRulesTestLanguageGrammarAccess.java @@ -29,40 +29,80 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i private final ParserRule rule = (ParserRule) getGrammar().eContents().get(3); private final Group cGroup = (Group)rule.eContents().get(1); private final Group c0Group = (Group)cGroup.eContents().get(0); - private final Assignment c00AssignmentId = (Assignment)c0Group.eContents().get(0); - private final RuleCall c000ParserRuleCallNestedModelId = (RuleCall)c00AssignmentId.eContents().get(0); + private final Group c00Group = (Group)c0Group.eContents().get(0); + private final Group c000Group = (Group)c00Group.eContents().get(0); + private final Assignment c0000AssignmentId = (Assignment)c000Group.eContents().get(0); + private final RuleCall c00000ParserRuleCallNestedModelId = (RuleCall)c0000AssignmentId.eContents().get(0); + private final Group c0001Group = (Group)c000Group.eContents().get(1); + private final Keyword c00010KeywordColon = (Keyword)c0001Group.eContents().get(0); + private final Assignment c00011AssignmentValue = (Assignment)c0001Group.eContents().get(1); + private final RuleCall c000110ParserRuleCallFraction = (RuleCall)c00011AssignmentValue.eContents().get(0); + private final Group c001Group = (Group)c00Group.eContents().get(1); + private final Keyword c0010KeywordNumberSign = (Keyword)c001Group.eContents().get(0); + private final Assignment c0011AssignmentVector = (Assignment)c001Group.eContents().get(1); + private final RuleCall c00110ParserRuleCallVector = (RuleCall)c0011AssignmentVector.eContents().get(0); private final Group c01Group = (Group)c0Group.eContents().get(1); - private final Keyword c010KeywordColon = (Keyword)c01Group.eContents().get(0); - private final Assignment c011AssignmentValue = (Assignment)c01Group.eContents().get(1); - private final RuleCall c0110ParserRuleCallFraction = (RuleCall)c011AssignmentValue.eContents().get(0); + private final Keyword c010KeywordPlusSign = (Keyword)c01Group.eContents().get(0); + private final Assignment c011AssignmentDots = (Assignment)c01Group.eContents().get(1); + private final RuleCall c0110ParserRuleCallDots = (RuleCall)c011AssignmentDots.eContents().get(0); private final Keyword c1KeywordSemicolon = (Keyword)cGroup.eContents().get(1); - // Model : id = NestedModelId ( ':' value = Fraction ) ? ';' ; + // Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ; public ParserRule getRule() { return rule; } - // id = NestedModelId ( ':' value = Fraction ) ? ';' + // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' public Group eleGroup() { return cGroup; } - // id = NestedModelId ( ':' value = Fraction ) ? + // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? public Group ele0Group() { return c0Group; } + // id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? + public Group ele00Group() { return c00Group; } + + // id = NestedModelId ( ':' value = Fraction ) ? + public Group ele000Group() { return c000Group; } + // id = NestedModelId - public Assignment ele00AssignmentId() { return c00AssignmentId; } + public Assignment ele0000AssignmentId() { return c0000AssignmentId; } // NestedModelId - public RuleCall ele000ParserRuleCallNestedModelId() { return c000ParserRuleCallNestedModelId; } + public RuleCall ele00000ParserRuleCallNestedModelId() { return c00000ParserRuleCallNestedModelId; } // ( ':' value = Fraction ) ? - public Group ele01Group() { return c01Group; } + public Group ele0001Group() { return c0001Group; } // ':' - public Keyword ele010KeywordColon() { return c010KeywordColon; } + public Keyword ele00010KeywordColon() { return c00010KeywordColon; } // value = Fraction - public Assignment ele011AssignmentValue() { return c011AssignmentValue; } + public Assignment ele00011AssignmentValue() { return c00011AssignmentValue; } // Fraction - public RuleCall ele0110ParserRuleCallFraction() { return c0110ParserRuleCallFraction; } + public RuleCall ele000110ParserRuleCallFraction() { return c000110ParserRuleCallFraction; } + + // ( '#' vector = Vector ) ? + public Group ele001Group() { return c001Group; } + + // '#' + public Keyword ele0010KeywordNumberSign() { return c0010KeywordNumberSign; } + + // vector = Vector + public Assignment ele0011AssignmentVector() { return c0011AssignmentVector; } + + // Vector + public RuleCall ele00110ParserRuleCallVector() { return c00110ParserRuleCallVector; } + + // ( '+' dots = Dots ) ? + public Group ele01Group() { return c01Group; } + + // '+' + public Keyword ele010KeywordPlusSign() { return c010KeywordPlusSign; } + + // dots = Dots + public Assignment ele011AssignmentDots() { return c011AssignmentDots; } + + // Dots + public RuleCall ele0110ParserRuleCallDots() { return c0110ParserRuleCallDots; } // ';' public Keyword ele1KeywordSemicolon() { return c1KeywordSemicolon; } @@ -148,6 +188,68 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i // INT public RuleCall ele11LexerRuleCallINT() { return c11LexerRuleCallINT; } } + + public class VectorElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(7); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Group c0Group = (Group)cGroup.eContents().get(0); + private final Group c00Group = (Group)c0Group.eContents().get(0); + private final Keyword c000KeywordLeftParenthesis = (Keyword)c00Group.eContents().get(0); + private final RuleCall c001LexerRuleCallINT = (RuleCall)c00Group.eContents().get(1); + private final RuleCall c01LexerRuleCallINT = (RuleCall)c0Group.eContents().get(1); + private final Keyword c1KeywordRightParenthesis = (Keyword)cGroup.eContents().get(1); + + // Vector returns EString : '(' INT INT ')' ; + public ParserRule getRule() { return rule; } + + // '(' INT INT ')' + public Group eleGroup() { return cGroup; } + + // '(' INT INT + public Group ele0Group() { return c0Group; } + + // '(' INT + public Group ele00Group() { return c00Group; } + + // '(' + public Keyword ele000KeywordLeftParenthesis() { return c000KeywordLeftParenthesis; } + + // INT + public RuleCall ele001LexerRuleCallINT() { return c001LexerRuleCallINT; } + + // INT + public RuleCall ele01LexerRuleCallINT() { return c01LexerRuleCallINT; } + + // ')' + public Keyword ele1KeywordRightParenthesis() { return c1KeywordRightParenthesis; } + } + + public class DotsElements implements IParserRuleAccess { + private final ParserRule rule = (ParserRule) getGrammar().eContents().get(8); + private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); + private final Group c0Group = (Group)cAlternatives.eContents().get(0); + private final Keyword c00KeywordFullStop = (Keyword)c0Group.eContents().get(0); + private final Keyword c01KeywordFullStop = (Keyword)c0Group.eContents().get(1); + private final Keyword c1KeywordFullStopFullStop = (Keyword)cAlternatives.eContents().get(1); + + // Dots returns EString : '.' '.' | '..' ; + public ParserRule getRule() { return rule; } + + // '.' '.' | '..' + public Alternatives eleAlternatives() { return cAlternatives; } + + // '.' '.' + public Group ele0Group() { return c0Group; } + + // '.' + public Keyword ele00KeywordFullStop() { return c00KeywordFullStop; } + + // '.' + public Keyword ele01KeywordFullStop() { return c01KeywordFullStop; } + + // '..' + public Keyword ele1KeywordFullStopFullStop() { return c1KeywordFullStopFullStop; } + } public final static DatatypeRulesTestLanguageGrammarAccess INSTANCE = new DatatypeRulesTestLanguageGrammarAccess(); @@ -158,6 +260,8 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i private static ModelIdElements pModelId; private static NestedModelIdElements pNestedModelId; private static FractionElements pFraction; + private static VectorElements pVector; + private static DotsElements pDots; @SuppressWarnings("unused") public synchronized Grammar getGrammar() { @@ -179,7 +283,7 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i return (pCompositeModel != null) ? pCompositeModel : (pCompositeModel = new CompositeModelElements()); } - // Model : id = NestedModelId ( ':' value = Fraction ) ? ';' ; + // Model : id = NestedModelId ( ':' value = Fraction ) ? ( '#' vector = Vector ) ? ( '+' dots = Dots ) ? ';' ; public ModelElements prModel() { return (pModel != null) ? pModel : (pModel = new ModelElements()); } @@ -198,4 +302,14 @@ public class DatatypeRulesTestLanguageGrammarAccess extends BaseEPackageAccess i public FractionElements prFraction() { return (pFraction != null) ? pFraction : (pFraction = new FractionElements()); } + + // Vector returns EString : '(' INT INT ')' ; + public VectorElements prVector() { + return (pVector != null) ? pVector : (pVector = new VectorElements()); + } + + // Dots returns EString : '.' '.' | '..' ; + public DotsElements prDots() { + return (pDots != null) ? pDots : (pDots = new DotsElements()); + } } diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g index d350cb9..3993090 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java index 80181df..e5fe013 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-16 15:37:27 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-18 11:06:18 package org.eclipse.xtext.parser.internal; @@ -53,14 +53,14 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public InternalXtextGrammarTestLanguageLexer(CharStream input) { super(input); } - public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; } + public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; } // $ANTLR start T11 public final void mT11() throws RecognitionException { try { int _type = T11; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:5: ( 'abstract language' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:10:7: 'abstract language' { match("abstract language"); @@ -78,8 +78,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT12() throws RecognitionException { try { int _type = T12; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:5: ( 'language' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:11:7: 'language' { match("language"); @@ -97,8 +97,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT13() throws RecognitionException { try { int _type = T13; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:7: '.' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:5: ( '.' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:12:7: '.' { match('.'); @@ -115,8 +115,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT14() throws RecognitionException { try { int _type = T14; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:5: ( 'extends' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:13:7: 'extends' { match("extends"); @@ -134,8 +134,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT15() throws RecognitionException { try { int _type = T15; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:5: ( 'generate' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:14:7: 'generate' { match("generate"); @@ -153,8 +153,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT16() throws RecognitionException { try { int _type = T16; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:5: ( 'as' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:15:7: 'as' { match("as"); @@ -172,8 +172,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT17() throws RecognitionException { try { int _type = T17; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:5: ( 'import' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:16:7: 'import' { match("import"); @@ -191,8 +191,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT18() throws RecognitionException { try { int _type = T18; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:5: ( 'native' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:17:7: 'native' { match("native"); @@ -210,8 +210,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT19() throws RecognitionException { try { int _type = T19; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:5: ( 'lexer' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:18:7: 'lexer' { match("lexer"); @@ -229,8 +229,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT20() throws RecognitionException { try { int _type = T20; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:5: ( 'returns' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:19:7: 'returns' { match("returns"); @@ -248,8 +248,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT21() throws RecognitionException { try { int _type = T21; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:7: ':' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:5: ( ':' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:20:7: ':' { match(':'); @@ -266,8 +266,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT22() throws RecognitionException { try { int _type = T22; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:7: ';' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:5: ( ';' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:21:7: ';' { match(';'); @@ -284,8 +284,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT23() throws RecognitionException { try { int _type = T23; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:5: ( '::' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:7: '::' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:5: ( '::' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:22:7: '::' { match("::"); @@ -303,8 +303,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT24() throws RecognitionException { try { int _type = T24; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '|' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:7: '|' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:5: ( '|' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:23:7: '|' { match('|'); @@ -321,8 +321,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT25() throws RecognitionException { try { int _type = T25; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:5: ( '?' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:7: '?' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:5: ( '?' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:24:7: '?' { match('?'); @@ -339,8 +339,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT26() throws RecognitionException { try { int _type = T26; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:5: ( '*' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:7: '*' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:5: ( '*' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:25:7: '*' { match('*'); @@ -357,8 +357,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT27() throws RecognitionException { try { int _type = T27; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:5: ( '+' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:7: '+' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:5: ( '+' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:26:7: '+' { match('+'); @@ -375,8 +375,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT28() throws RecognitionException { try { int _type = T28; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '+=' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:7: '+=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:5: ( '+=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:27:7: '+=' { match("+="); @@ -394,8 +394,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT29() throws RecognitionException { try { int _type = T29; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '=' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:7: '=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:5: ( '=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:28:7: '=' { match('='); @@ -412,8 +412,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT30() throws RecognitionException { try { int _type = T30; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?=' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:7: '?=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:5: ( '?=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:29:7: '?=' { match("?="); @@ -431,8 +431,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT31() throws RecognitionException { try { int _type = T31; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '{' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:7: '{' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:5: ( '{' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:30:7: '{' { match('{'); @@ -449,8 +449,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT32() throws RecognitionException { try { int _type = T32; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:5: ( 'current' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:7: 'current' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:5: ( 'current' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:31:7: 'current' { match("current"); @@ -468,8 +468,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT33() throws RecognitionException { try { int _type = T33; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '}' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:7: '}' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:5: ( '}' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:32:7: '}' { match('}'); @@ -486,8 +486,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT34() throws RecognitionException { try { int _type = T34; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '[' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:7: '[' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:5: ( '[' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:33:7: '[' { match('['); @@ -504,8 +504,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT35() throws RecognitionException { try { int _type = T35; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:5: ( ']' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:7: ']' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:5: ( ']' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:34:7: ']' { match(']'); @@ -522,8 +522,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT36() throws RecognitionException { try { int _type = T36; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '(' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:7: '(' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:5: ( '(' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:35:7: '(' { match('('); @@ -540,8 +540,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mT37() throws RecognitionException { try { int _type = T37; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:5: ( ')' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:7: ')' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:5: ( ')' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:36:7: ')' { match(')'); @@ -558,10 +558,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1337:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1337:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1337:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -570,7 +570,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1337:12: '^' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:12: '^' { match('^'); @@ -589,7 +589,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1337:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -602,7 +602,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt2) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g: + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g: { if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -637,10 +637,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+ { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -654,7 +654,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1339:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:13: '0' .. '9' { matchRange('0','9'); @@ -684,7 +684,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -696,16 +696,16 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("1341:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("1343:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); throw nvae; } switch (alt6) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -721,7 +721,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343: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' ) { @@ -738,7 +738,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -764,10 +764,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -783,7 +783,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343: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' ) { @@ -800,7 +800,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1341:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -838,12 +838,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -868,7 +868,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1343:52: . + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:52: . { matchAny(); @@ -897,12 +897,12 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -915,7 +915,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347: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(); @@ -936,7 +936,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } } while (true); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -945,9 +945,9 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )? '\\n' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -956,7 +956,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1345:39: '\\r' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:39: '\\r' { match('\r'); @@ -987,10 +987,10 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1347:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -1004,7 +1004,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { switch (alt11) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g: + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g: { if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) { input.consume(); @@ -1044,8 +1044,8 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:16: ( . ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1349:18: . + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:16: ( . ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1351:18: . { matchAny(); @@ -1059,7 +1059,7 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { // $ANTLR end RULE_ANY_OTHER public void mTokens() throws RecognitionException { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:8: ( T11 | T12 | T13 | T14 | T15 | T16 | T17 | T18 | T19 | T20 | T21 | T22 | T23 | T24 | T25 | T26 | T27 | T28 | T29 | T30 | T31 | T32 | T33 | T34 | T35 | T36 | T37 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) int alt12=34; int LA12_0 = input.LA(1); @@ -1596,238 +1596,238 @@ public class InternalXtextGrammarTestLanguageLexer extends Lexer { } switch (alt12) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:10: T11 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:10: T11 { mT11(); } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:14: T12 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:14: T12 { mT12(); } break; case 3 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:18: T13 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:18: T13 { mT13(); } break; case 4 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:22: T14 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:22: T14 { mT14(); } break; case 5 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:26: T15 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:26: T15 { mT15(); } break; case 6 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:30: T16 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:30: T16 { mT16(); } break; case 7 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:34: T17 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:34: T17 { mT17(); } break; case 8 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:38: T18 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:38: T18 { mT18(); } break; case 9 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:42: T19 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:42: T19 { mT19(); } break; case 10 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:46: T20 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:46: T20 { mT20(); } break; case 11 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:50: T21 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:50: T21 { mT21(); } break; case 12 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:54: T22 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:54: T22 { mT22(); } break; case 13 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:58: T23 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:58: T23 { mT23(); } break; case 14 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:62: T24 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:62: T24 { mT24(); } break; case 15 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:66: T25 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:66: T25 { mT25(); } break; case 16 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:70: T26 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:70: T26 { mT26(); } break; case 17 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:74: T27 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:74: T27 { mT27(); } break; case 18 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:78: T28 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:78: T28 { mT28(); } break; case 19 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:82: T29 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:82: T29 { mT29(); } break; case 20 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:86: T30 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:86: T30 { mT30(); } break; case 21 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:90: T31 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:90: T31 { mT31(); } break; case 22 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:94: T32 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:94: T32 { mT32(); } break; case 23 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:98: T33 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:98: T33 { mT33(); } break; case 24 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:102: T34 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:102: T34 { mT34(); } break; case 25 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:106: T35 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:106: T35 { mT35(); } break; case 26 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:110: T36 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:110: T36 { mT36(); } break; case 27 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:114: T37 + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:114: T37 { mT37(); } break; case 28 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:118: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:118: RULE_ID { mRULE_ID(); } break; case 29 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:126: RULE_INT + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:126: RULE_INT { mRULE_INT(); } break; case 30 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:135: RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:135: RULE_STRING { mRULE_STRING(); } break; case 31 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:147: RULE_ML_COMMENT + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:147: RULE_ML_COMMENT { mRULE_ML_COMMENT(); } break; case 32 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:163: RULE_SL_COMMENT + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:163: RULE_SL_COMMENT { mRULE_SL_COMMENT(); } break; case 33 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:179: RULE_WS + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:179: RULE_WS { mRULE_WS(); } break; case 34 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_ANY_OTHER + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1:187: RULE_ANY_OTHER { mRULE_ANY_OTHER(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java index e0c9938..5c3c3e0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-16 15:37:27 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g 2008-12-18 11:06:17 package org.eclipse.xtext.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -38,7 +40,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser public String[] getTokenNames() { return tokenNames; } - public String getGrammarFileName() { return "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; } + public String getGrammarFileName() { return "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g"; } @@ -62,7 +64,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleGrammar - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:64:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:1: entryRuleGrammar returns [EObject current=null] : iv_ruleGrammar= ruleGrammar EOF ; public final EObject entryRuleGrammar() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:64:49: (iv_ruleGrammar= ruleGrammar EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:65:2: iv_ruleGrammar= ruleGrammar EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:66:49: (iv_ruleGrammar= ruleGrammar EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:67:2: iv_ruleGrammar= ruleGrammar EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleGrammar_in_entryRuleGrammar71); @@ -97,7 +99,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleGrammar - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:72:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:74:1: ruleGrammar returns [EObject current=null] : ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ; public final EObject ruleGrammar() throws RecognitionException { EObject current = null; @@ -111,25 +113,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:74:33: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:76:33: ( ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:1: ( ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) (lv_rules= ruleAbstractRule )+ { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:2: ( ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:3: ( ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:4: ( ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) ( '.' (lv_idElements= RULE_ID ) )* { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:5: ( ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' ) (lv_idElements= RULE_ID ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:6: ( (lv_abstract= 'abstract language' ) | 'language' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: ( (lv_abstract= 'abstract language' ) | 'language' ) int alt1=2; int LA1_0 = input.LA(1); @@ -141,16 +143,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("75:6: ( (lv_abstract= 'abstract language' ) | 'language' )", 1, 0, input); + new NoViableAltException("77:6: ( (lv_abstract= 'abstract language' ) | 'language' )", 1, 0, input); throw nvae; } switch (alt1) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:7: (lv_abstract= 'abstract language' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:75:7: (lv_abstract= 'abstract language' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:6: lv_abstract= 'abstract language' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:77:7: (lv_abstract= 'abstract language' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:79:6: lv_abstract= 'abstract language' { lv_abstract=(Token)input.LT(1); match(input,11,FOLLOW_11_in_ruleGrammar132); @@ -176,7 +178,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:96:6: 'language' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:98:6: 'language' { match(input,12,FOLLOW_12_in_ruleGrammar159); @@ -188,8 +190,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:100:2: (lv_idElements= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:102:6: lv_idElements= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:102:2: (lv_idElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:104:6: lv_idElements= RULE_ID { lv_idElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar181); @@ -214,7 +216,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:120:3: ( '.' (lv_idElements= RULE_ID ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:3: ( '.' (lv_idElements= RULE_ID ) )* loop2: do { int alt2=2; @@ -227,14 +229,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt2) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:120:4: '.' (lv_idElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:122:4: '.' (lv_idElements= RULE_ID ) { match(input,13,FOLLOW_13_in_ruleGrammar203); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:124:1: (lv_idElements= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:126:6: lv_idElements= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:126:1: (lv_idElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:128:6: lv_idElements= RULE_ID { lv_idElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar224); @@ -268,7 +270,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:144:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:5: ( ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* )? int alt4=2; int LA4_0 = input.LA(1); @@ -277,17 +279,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt4) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:144:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) ( '.' (lv_superGrammarIdElements= RULE_ID ) )* { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:144:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:144:7: 'extends' (lv_superGrammarIdElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:6: ( 'extends' (lv_superGrammarIdElements= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:146:7: 'extends' (lv_superGrammarIdElements= RULE_ID ) { match(input,14,FOLLOW_14_in_ruleGrammar249); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:148:1: (lv_superGrammarIdElements= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:150:6: lv_superGrammarIdElements= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:150:1: (lv_superGrammarIdElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:152:6: lv_superGrammarIdElements= RULE_ID { lv_superGrammarIdElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar270); @@ -312,7 +314,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:168:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:3: ( '.' (lv_superGrammarIdElements= RULE_ID ) )* loop3: do { int alt3=2; @@ -325,14 +327,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt3) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:168:4: '.' (lv_superGrammarIdElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:170:4: '.' (lv_superGrammarIdElements= RULE_ID ) { match(input,13,FOLLOW_13_in_ruleGrammar292); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:172:1: (lv_superGrammarIdElements= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:174:6: lv_superGrammarIdElements= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:174:1: (lv_superGrammarIdElements= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:176:6: lv_superGrammarIdElements= RULE_ID { lv_superGrammarIdElements=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGrammar313); @@ -372,7 +374,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:192:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:194:7: (lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration )* loop5: do { int alt5=2; @@ -385,7 +387,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt5) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:195:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:197:6: lv_metamodelDeclarations= ruleAbstractMetamodelDeclaration { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -419,7 +421,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:213:4: (lv_rules= ruleAbstractRule )+ + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:215:4: (lv_rules= ruleAbstractRule )+ int cnt6=0; loop6: do { @@ -433,7 +435,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt6) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:216:6: lv_rules= ruleAbstractRule + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:218:6: lv_rules= ruleAbstractRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -489,7 +491,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAbstractRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:241:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:1: entryRuleAbstractRule returns [EObject current=null] : iv_ruleAbstractRule= ruleAbstractRule EOF ; public final EObject entryRuleAbstractRule() throws RecognitionException { EObject current = null; @@ -497,8 +499,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:241:54: (iv_ruleAbstractRule= ruleAbstractRule EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:242:2: iv_ruleAbstractRule= ruleAbstractRule EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:243:54: (iv_ruleAbstractRule= ruleAbstractRule EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:244:2: iv_ruleAbstractRule= ruleAbstractRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractRule_in_entryRuleAbstractRule441); @@ -524,7 +526,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAbstractRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:249:1: ruleAbstractRule returns [EObject current=null] : (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:251:1: ruleAbstractRule returns [EObject current=null] : (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ; public final EObject ruleAbstractRule() throws RecognitionException { EObject current = null; @@ -535,10 +537,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:251:33: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:252:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:253:33: ( (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:252:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule ) int alt7=2; int LA7_0 = input.LA(1); @@ -550,13 +552,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("252:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )", 7, 0, input); + new NoViableAltException("254:1: (this_LexerRule= ruleLexerRule | this_ParserRule= ruleParserRule )", 7, 0, input); throw nvae; } switch (alt7) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:253:5: this_LexerRule= ruleLexerRule + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:255:5: this_LexerRule= ruleLexerRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode); @@ -573,7 +575,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:263:5: this_ParserRule= ruleParserRule + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:265:5: this_ParserRule= ruleParserRule { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.1/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -610,7 +612,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAbstractMetamodelDeclaration - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:278:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:1: entryRuleAbstractMetamodelDeclaration returns [EObject current=null] : iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ; public final EObject entryRuleAbstractMetamodelDeclaration() throws RecognitionException { EObject current = null; @@ -618,8 +620,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:278:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:279:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:280:70: (iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:281:2: iv_ruleAbstractMetamodelDeclaration= ruleAbstractMetamodelDeclaration EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractMetamodelDeclaration_in_entryRuleAbstractMetamodelDeclaration557); @@ -645,7 +647,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAbstractMetamodelDeclaration - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:286:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:288:1: ruleAbstractMetamodelDeclaration returns [EObject current=null] : (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ; public final EObject ruleAbstractMetamodelDeclaration() throws RecognitionException { EObject current = null; @@ -656,10 +658,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:288:33: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:289:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:290:33: ( (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:289:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel ) int alt8=2; int LA8_0 = input.LA(1); @@ -671,13 +673,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("289:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )", 8, 0, input); + new NoViableAltException("291:1: (this_GeneratedMetamodel= ruleGeneratedMetamodel | this_ReferencedMetamodel= ruleReferencedMetamodel )", 8, 0, input); throw nvae; } switch (alt8) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:290:5: this_GeneratedMetamodel= ruleGeneratedMetamodel + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:292:5: this_GeneratedMetamodel= ruleGeneratedMetamodel { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode); @@ -694,7 +696,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:300:5: this_ReferencedMetamodel= ruleReferencedMetamodel + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:302:5: this_ReferencedMetamodel= ruleReferencedMetamodel { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.2/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -731,7 +733,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleGeneratedMetamodel - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:315:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:1: entryRuleGeneratedMetamodel returns [EObject current=null] : iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ; public final EObject entryRuleGeneratedMetamodel() throws RecognitionException { EObject current = null; @@ -739,8 +741,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:315:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:316:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:317:60: (iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:318:2: iv_ruleGeneratedMetamodel= ruleGeneratedMetamodel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleGeneratedMetamodel_in_entryRuleGeneratedMetamodel673); @@ -766,7 +768,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleGeneratedMetamodel - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:323:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:325:1: ruleGeneratedMetamodel returns [EObject current=null] : ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; public final EObject ruleGeneratedMetamodel() throws RecognitionException { EObject current = null; @@ -776,24 +778,24 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:325:33: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:327:33: ( ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:1: ( ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:3: ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:2: ( ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) ) (lv_nsURI= RULE_STRING ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:3: ( 'generate' (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:326:4: 'generate' (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:3: ( 'generate' (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:328:4: 'generate' (lv_name= RULE_ID ) { match(input,15,FOLLOW_15_in_ruleGeneratedMetamodel719); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:330:1: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:332:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:332:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:334:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel740); @@ -818,8 +820,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:350:3: (lv_nsURI= RULE_STRING ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:352:6: lv_nsURI= RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:352:3: (lv_nsURI= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:354:6: lv_nsURI= RULE_STRING { lv_nsURI=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleGeneratedMetamodel773); @@ -844,7 +846,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:370:3: ( 'as' (lv_alias= RULE_ID ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:3: ( 'as' (lv_alias= RULE_ID ) )? int alt9=2; int LA9_0 = input.LA(1); @@ -853,14 +855,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt9) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:370:4: 'as' (lv_alias= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:372:4: 'as' (lv_alias= RULE_ID ) { match(input,16,FOLLOW_16_in_ruleGeneratedMetamodel795); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:374:1: (lv_alias= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:376:6: lv_alias= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:376:1: (lv_alias= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:378:6: lv_alias= RULE_ID { lv_alias=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleGeneratedMetamodel816); @@ -909,7 +911,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleReferencedMetamodel - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:401:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:1: entryRuleReferencedMetamodel returns [EObject current=null] : iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ; public final EObject entryRuleReferencedMetamodel() throws RecognitionException { EObject current = null; @@ -917,8 +919,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:401:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:402:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:403:61: (iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:404:2: iv_ruleReferencedMetamodel= ruleReferencedMetamodel EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleReferencedMetamodel_in_entryRuleReferencedMetamodel862); @@ -944,7 +946,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleReferencedMetamodel - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:409:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:411:1: ruleReferencedMetamodel returns [EObject current=null] : ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ; public final EObject ruleReferencedMetamodel() throws RecognitionException { EObject current = null; @@ -953,21 +955,21 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:411:33: ( ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:412:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:413:33: ( ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:412:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:412:2: ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:1: ( ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) ) ( 'as' (lv_alias= RULE_ID ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:412:2: ( 'import' (lv_uri= RULE_STRING ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:412:3: 'import' (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:2: ( 'import' (lv_uri= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:414:3: 'import' (lv_uri= RULE_STRING ) { match(input,17,FOLLOW_17_in_ruleReferencedMetamodel907); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:416:1: (lv_uri= RULE_STRING ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:418:6: lv_uri= RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:418:1: (lv_uri= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:420:6: lv_uri= RULE_STRING { lv_uri=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleReferencedMetamodel928); @@ -992,7 +994,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:436:3: ( 'as' (lv_alias= RULE_ID ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:3: ( 'as' (lv_alias= RULE_ID ) )? int alt10=2; int LA10_0 = input.LA(1); @@ -1001,14 +1003,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt10) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:436:4: 'as' (lv_alias= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:438:4: 'as' (lv_alias= RULE_ID ) { match(input,16,FOLLOW_16_in_ruleReferencedMetamodel950); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.4/@alternatives/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:440:1: (lv_alias= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:442:6: lv_alias= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:442:1: (lv_alias= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:444:6: lv_alias= RULE_ID { lv_alias=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReferencedMetamodel971); @@ -1057,7 +1059,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleLexerRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:467:1: entryRuleLexerRule returns [EObject current=null] : iv_ruleLexerRule= ruleLexerRule EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:1: entryRuleLexerRule returns [EObject current=null] : iv_ruleLexerRule= ruleLexerRule EOF ; public final EObject entryRuleLexerRule() throws RecognitionException { EObject current = null; @@ -1065,8 +1067,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:467:51: (iv_ruleLexerRule= ruleLexerRule EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:468:2: iv_ruleLexerRule= ruleLexerRule EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:469:51: (iv_ruleLexerRule= ruleLexerRule EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:470:2: iv_ruleLexerRule= ruleLexerRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleLexerRule_in_entryRuleLexerRule1017); @@ -1092,7 +1094,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleLexerRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:475:1: ruleLexerRule returns [EObject current=null] : ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:477:1: ruleLexerRule returns [EObject current=null] : ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ; public final EObject ruleLexerRule() throws RecognitionException { EObject current = null; @@ -1103,25 +1105,25 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:477:33: ( ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:479:33: ( ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:1: ( ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) ';' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:2: ( ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_body= RULE_STRING ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:3: ( ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:4: ( ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) ( 'returns' (lv_type= ruleTypeRef ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:6: ( 'native' | 'lexer' ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:5: ( ( 'native' | 'lexer' ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' ) (lv_name= RULE_ID ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:6: ( 'native' | 'lexer' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:6: ( 'native' | 'lexer' ) int alt11=2; int LA11_0 = input.LA(1); @@ -1133,13 +1135,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("478:6: ( 'native' | 'lexer' )", 11, 0, input); + new NoViableAltException("480:6: ( 'native' | 'lexer' )", 11, 0, input); throw nvae; } switch (alt11) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:478:7: 'native' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:480:7: 'native' { match(input,18,FOLLOW_18_in_ruleLexerRule1066); @@ -1149,7 +1151,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:483:6: 'lexer' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:485:6: 'lexer' { match(input,19,FOLLOW_19_in_ruleLexerRule1081); @@ -1161,8 +1163,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:487:2: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:489:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:489:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:491:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLexerRule1103); @@ -1187,7 +1189,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:507:3: ( 'returns' (lv_type= ruleTypeRef ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:3: ( 'returns' (lv_type= ruleTypeRef ) )? int alt12=2; int LA12_0 = input.LA(1); @@ -1196,14 +1198,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt12) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:507:4: 'returns' (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:509:4: 'returns' (lv_type= ruleTypeRef ) { match(input,20,FOLLOW_20_in_ruleLexerRule1125); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:511:1: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:514:6: lv_type= ruleTypeRef + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:513:1: (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:516:6: lv_type= ruleTypeRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.5/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -1244,8 +1246,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:536:2: (lv_body= RULE_STRING ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:538:6: lv_body= RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:538:2: (lv_body= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:540:6: lv_body= RULE_STRING { lv_body=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleLexerRule1197); @@ -1295,7 +1297,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleParserRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:567:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:1: entryRuleParserRule returns [EObject current=null] : iv_ruleParserRule= ruleParserRule EOF ; public final EObject entryRuleParserRule() throws RecognitionException { EObject current = null; @@ -1303,8 +1305,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:567:52: (iv_ruleParserRule= ruleParserRule EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:568:2: iv_ruleParserRule= ruleParserRule EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:569:52: (iv_ruleParserRule= ruleParserRule EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:570:2: iv_ruleParserRule= ruleParserRule EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleParserRule_in_entryRuleParserRule1251); @@ -1330,7 +1332,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleParserRule - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:575:1: ruleParserRule returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:577:1: ruleParserRule returns [EObject current=null] : ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ; public final EObject ruleParserRule() throws RecognitionException { EObject current = null; @@ -1342,23 +1344,23 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:577:33: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:579:33: ( ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:1: ( ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) ';' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:2: ( ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) (lv_alternatives= ruleAlternatives ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:3: ( ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) ':' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:5: (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:4: ( (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID ) ( 'returns' (lv_type= ruleTypeRef ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:578:5: (lv_name= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:580:5: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:582:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParserRule1310); @@ -1380,7 +1382,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:598:2: ( 'returns' (lv_type= ruleTypeRef ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:2: ( 'returns' (lv_type= ruleTypeRef ) )? int alt13=2; int LA13_0 = input.LA(1); @@ -1389,14 +1391,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt13) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:598:3: 'returns' (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:600:3: 'returns' (lv_type= ruleTypeRef ) { match(input,20,FOLLOW_20_in_ruleParserRule1331); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:602:1: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:605:6: lv_type= ruleTypeRef + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:604:1: (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:607:6: lv_type= ruleTypeRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -1437,8 +1439,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:627:2: (lv_alternatives= ruleAlternatives ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:630:6: lv_alternatives= ruleAlternatives + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:629:2: (lv_alternatives= ruleAlternatives ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:632:6: lv_alternatives= ruleAlternatives { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.6/@alternatives/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -1491,7 +1493,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleTypeRef - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:659:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:1: entryRuleTypeRef returns [EObject current=null] : iv_ruleTypeRef= ruleTypeRef EOF ; public final EObject entryRuleTypeRef() throws RecognitionException { EObject current = null; @@ -1499,8 +1501,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:659:49: (iv_ruleTypeRef= ruleTypeRef EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:660:2: iv_ruleTypeRef= ruleTypeRef EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:661:49: (iv_ruleTypeRef= ruleTypeRef EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:662:2: iv_ruleTypeRef= ruleTypeRef EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.7" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef1463); @@ -1526,19 +1528,19 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleTypeRef - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:667:1: ruleTypeRef returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:669:1: ruleTypeRef returns [EObject current=null] : ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ; public final EObject ruleTypeRef() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:669:33: ( ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:671:33: ( ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:2: ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:1: ( ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )? ( ( RULE_ID ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:2: ( ( ( RULE_ID ) ) '::' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:2: ( ( ( RULE_ID ) ) '::' )? int alt14=2; int LA14_0 = input.LA(1); @@ -1551,10 +1553,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt14) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:3: ( ( RULE_ID ) ) '::' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) ) '::' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:670:3: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:673:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:672:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:675:3: ( RULE_ID ) { if (current==null) { @@ -1562,8 +1564,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:679:1: ( RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:680:2: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:681:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:682:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1523); @@ -1585,8 +1587,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:689:3: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:692:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:691:3: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:694:3: ( RULE_ID ) { if (current==null) { @@ -1594,8 +1596,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:698:1: ( RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:699:2: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:700:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:701:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef1562); @@ -1628,7 +1630,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAlternatives - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:711:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:1: entryRuleAlternatives returns [EObject current=null] : iv_ruleAlternatives= ruleAlternatives EOF ; public final EObject entryRuleAlternatives() throws RecognitionException { EObject current = null; @@ -1636,8 +1638,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:711:54: (iv_ruleAlternatives= ruleAlternatives EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:712:2: iv_ruleAlternatives= ruleAlternatives EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:713:54: (iv_ruleAlternatives= ruleAlternatives EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:714:2: iv_ruleAlternatives= ruleAlternatives EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAlternatives_in_entryRuleAlternatives1599); @@ -1663,7 +1665,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAlternatives - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:719:1: ruleAlternatives returns [EObject current=null] : (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:721:1: ruleAlternatives returns [EObject current=null] : (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ; public final EObject ruleAlternatives() throws RecognitionException { EObject current = null; @@ -1674,11 +1676,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:721:33: ( (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:722:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:723:33: ( (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:722:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:723:5: this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:724:1: (this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:725:5: this_Group= ruleGroup ( ( () '|' ) (lv_groups= ruleGroup ) )* { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode); @@ -1691,7 +1693,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser current = this_Group; currentNode = currentNode.getParent(); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:731:1: ( ( () '|' ) (lv_groups= ruleGroup ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:1: ( ( () '|' ) (lv_groups= ruleGroup ) )* loop15: do { int alt15=2; @@ -1704,13 +1706,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt15) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:731:2: ( () '|' ) (lv_groups= ruleGroup ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' ) (lv_groups= ruleGroup ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:731:2: ( () '|' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:731:3: () '|' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:2: ( () '|' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: () '|' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:731:3: () - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:732:5: + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:733:3: () + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:734:5: { temp=factory.create("Alternatives"); @@ -1733,8 +1735,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:747:2: (lv_groups= ruleGroup ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:750:6: lv_groups= ruleGroup + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:749:2: (lv_groups= ruleGroup ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:752:6: lv_groups= ruleGroup { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.8/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -1789,7 +1791,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleGroup - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:775:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:1: entryRuleGroup returns [EObject current=null] : iv_ruleGroup= ruleGroup EOF ; public final EObject entryRuleGroup() throws RecognitionException { EObject current = null; @@ -1797,8 +1799,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:775:47: (iv_ruleGroup= ruleGroup EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:776:2: iv_ruleGroup= ruleGroup EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:777:47: (iv_ruleGroup= ruleGroup EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:778:2: iv_ruleGroup= ruleGroup EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleGroup_in_entryRuleGroup1749); @@ -1824,7 +1826,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleGroup - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:783:1: ruleGroup returns [EObject current=null] : (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:785:1: ruleGroup returns [EObject current=null] : (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ; public final EObject ruleGroup() throws RecognitionException { EObject current = null; @@ -1835,11 +1837,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:785:33: ( (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:786:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:787:33: ( (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:786:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:787:5: this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:788:1: (this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:789:5: this_AbstractToken= ruleAbstractToken ( () (lv_abstractTokens= ruleAbstractToken ) )* { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode); @@ -1852,7 +1854,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser current = this_AbstractToken; currentNode = currentNode.getParent(); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:795:1: ( () (lv_abstractTokens= ruleAbstractToken ) )* + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:1: ( () (lv_abstractTokens= ruleAbstractToken ) )* loop16: do { int alt16=2; @@ -1865,10 +1867,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser switch (alt16) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:795:2: () (lv_abstractTokens= ruleAbstractToken ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: () (lv_abstractTokens= ruleAbstractToken ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:795:2: () - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:796:5: + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:797:2: () + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:798:5: { temp=factory.create("Group"); @@ -1884,8 +1886,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:807:2: (lv_abstractTokens= ruleAbstractToken ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:810:6: lv_abstractTokens= ruleAbstractToken + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:809:2: (lv_abstractTokens= ruleAbstractToken ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:812:6: lv_abstractTokens= ruleAbstractToken { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.9/@alternatives/@abstractTokens.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -1940,7 +1942,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAbstractToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:835:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:1: entryRuleAbstractToken returns [EObject current=null] : iv_ruleAbstractToken= ruleAbstractToken EOF ; public final EObject entryRuleAbstractToken() throws RecognitionException { EObject current = null; @@ -1948,8 +1950,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:835:55: (iv_ruleAbstractToken= ruleAbstractToken EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:836:2: iv_ruleAbstractToken= ruleAbstractToken EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:837:55: (iv_ruleAbstractToken= ruleAbstractToken EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:838:2: iv_ruleAbstractToken= ruleAbstractToken EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractToken_in_entryRuleAbstractToken1888); @@ -1975,7 +1977,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAbstractToken - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:843:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:845:1: ruleAbstractToken returns [EObject current=null] : ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ; public final EObject ruleAbstractToken() throws RecognitionException { EObject current = null; @@ -1989,13 +1991,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:845:33: ( ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:847:33: ( ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:1: ( ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal ) int alt18=2; switch ( input.LA(1) ) { case RULE_ID: @@ -2010,7 +2012,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("846:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 18, 1, input); + new NoViableAltException("848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 18, 1, input); throw nvae; } @@ -2030,16 +2032,16 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser break; default: NoViableAltException nvae = - new NoViableAltException("846:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 18, 0, input); + new NoViableAltException("848:2: ( (this_Assignment= ruleAssignment | this_Action= ruleAction ) | this_AbstractTerminal= ruleAbstractTerminal )", 18, 0, input); throw nvae; } switch (alt18) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:3: (this_Assignment= ruleAssignment | this_Action= ruleAction ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:846:3: (this_Assignment= ruleAssignment | this_Action= ruleAction ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction ) int alt17=2; int LA17_0 = input.LA(1); @@ -2051,13 +2053,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("846:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )", 17, 0, input); + new NoViableAltException("848:3: (this_Assignment= ruleAssignment | this_Action= ruleAction )", 17, 0, input); throw nvae; } switch (alt17) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:847:5: this_Assignment= ruleAssignment + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:849:5: this_Assignment= ruleAssignment { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); @@ -2074,7 +2076,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:857:5: this_Action= ruleAction + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:859:5: this_Action= ruleAction { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); @@ -2097,7 +2099,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:867:5: this_AbstractTerminal= ruleAbstractTerminal + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:869:5: this_AbstractTerminal= ruleAbstractTerminal { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.10/@alternatives/@abstractTokens.0/@groups.1" /* xtext::RuleCall */, currentNode); @@ -2116,7 +2118,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:875:2: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:2: (lv_cardinality= ( ( '?' | '*' ) | '+' ) )? int alt21=2; int LA21_0 = input.LA(1); @@ -2125,9 +2127,9 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt21) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:6: lv_cardinality= ( ( '?' | '*' ) | '+' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:6: lv_cardinality= ( ( '?' | '*' ) | '+' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:21: ( ( '?' | '*' ) | '+' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:21: ( ( '?' | '*' ) | '+' ) int alt20=2; int LA20_0 = input.LA(1); @@ -2139,15 +2141,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("877:21: ( ( '?' | '*' ) | '+' )", 20, 0, input); + new NoViableAltException("879:21: ( ( '?' | '*' ) | '+' )", 20, 0, input); throw nvae; } switch (alt20) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:22: ( '?' | '*' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:22: ( '?' | '*' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:22: ( '?' | '*' ) int alt19=2; int LA19_0 = input.LA(1); @@ -2159,13 +2161,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("877:22: ( '?' | '*' )", 19, 0, input); + new NoViableAltException("879:22: ( '?' | '*' )", 19, 0, input); throw nvae; } switch (alt19) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:877:23: '?' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:879:23: '?' { match(input,25,FOLLOW_25_in_ruleAbstractToken2025); @@ -2175,7 +2177,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:882:6: '*' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:884:6: '*' { match(input,26,FOLLOW_26_in_ruleAbstractToken2040); @@ -2191,7 +2193,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:887:6: '+' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:889:6: '+' { match(input,27,FOLLOW_27_in_ruleAbstractToken2056); @@ -2242,7 +2244,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAssignment - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:912:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:1: entryRuleAssignment returns [EObject current=null] : iv_ruleAssignment= ruleAssignment EOF ; public final EObject entryRuleAssignment() throws RecognitionException { EObject current = null; @@ -2250,8 +2252,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:912:52: (iv_ruleAssignment= ruleAssignment EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:913:2: iv_ruleAssignment= ruleAssignment EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:914:52: (iv_ruleAssignment= ruleAssignment EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:915:2: iv_ruleAssignment= ruleAssignment EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.11" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAssignment_in_entryRuleAssignment2103); @@ -2277,7 +2279,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAssignment - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:920:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:922:1: ruleAssignment returns [EObject current=null] : ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ; public final EObject ruleAssignment() throws RecognitionException { EObject current = null; @@ -2288,17 +2290,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:922:33: ( ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:924:33: ( ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:1: ( ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) (lv_terminal= ruleAbstractTerminal ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:3: (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:2: ( (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID ) (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:923:3: (lv_feature= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:6: lv_feature= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:925:3: (lv_feature= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:927:6: lv_feature= RULE_ID { lv_feature=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAssignment2160); @@ -2320,10 +2322,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:943:2: (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:6: lv_operator= ( ( '+=' | '=' ) | '?=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:2: (lv_operator= ( ( '+=' | '=' ) | '?=' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:6: lv_operator= ( ( '+=' | '=' ) | '?=' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:18: ( ( '+=' | '=' ) | '?=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:18: ( ( '+=' | '=' ) | '?=' ) int alt23=2; int LA23_0 = input.LA(1); @@ -2335,15 +2337,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("945:18: ( ( '+=' | '=' ) | '?=' )", 23, 0, input); + new NoViableAltException("947:18: ( ( '+=' | '=' ) | '?=' )", 23, 0, input); throw nvae; } switch (alt23) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:19: ( '+=' | '=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:19: ( '+=' | '=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:19: ( '+=' | '=' ) int alt22=2; int LA22_0 = input.LA(1); @@ -2355,13 +2357,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("945:19: ( '+=' | '=' )", 22, 0, input); + new NoViableAltException("947:19: ( '+=' | '=' )", 22, 0, input); throw nvae; } switch (alt22) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:945:20: '+=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:947:20: '+=' { match(input,28,FOLLOW_28_in_ruleAssignment2194); @@ -2371,7 +2373,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:950:6: '=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:952:6: '=' { match(input,29,FOLLOW_29_in_ruleAssignment2209); @@ -2387,7 +2389,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:955:6: '?=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:957:6: '?=' { match(input,30,FOLLOW_30_in_ruleAssignment2225); @@ -2417,8 +2419,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:973:3: (lv_terminal= ruleAbstractTerminal ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:976:6: lv_terminal= ruleAbstractTerminal + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:975:3: (lv_terminal= ruleAbstractTerminal ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:978:6: lv_terminal= ruleAbstractTerminal { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.11/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -2464,7 +2466,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAction - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1001:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:1: entryRuleAction returns [EObject current=null] : iv_ruleAction= ruleAction EOF ; public final EObject entryRuleAction() throws RecognitionException { EObject current = null; @@ -2472,8 +2474,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1001:48: (iv_ruleAction= ruleAction EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1002:2: iv_ruleAction= ruleAction EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1003:48: (iv_ruleAction= ruleAction EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1004:2: iv_ruleAction= ruleAction EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAction_in_entryRuleAction2310); @@ -2499,7 +2501,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAction - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1009:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1011:1: ruleAction returns [EObject current=null] : ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ; public final EObject ruleAction() throws RecognitionException { EObject current = null; @@ -2510,35 +2512,35 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1011:33: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1013:33: ( ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:1: ( ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) '}' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:2: ( ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) 'current' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:3: ( ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) (lv_operator= ( '=' | '+=' ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:4: ( ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) (lv_feature= RULE_ID ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:5: ( ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) '.' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:7: ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:6: ( ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? ) (lv_typeName= ruleTypeRef ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:7: ( '{' ( 'current' '=' )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1012:8: '{' ( 'current' '=' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:7: ( '{' ( 'current' '=' )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1014:8: '{' ( 'current' '=' )? { match(input,31,FOLLOW_31_in_ruleAction2360); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1016:1: ( 'current' '=' )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:1: ( 'current' '=' )? int alt24=2; int LA24_0 = input.LA(1); @@ -2547,7 +2549,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt24) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1016:2: 'current' '=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1018:2: 'current' '=' { match(input,32,FOLLOW_32_in_ruleAction2370); @@ -2566,8 +2568,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1024:4: (lv_typeName= ruleTypeRef ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1027:6: lv_typeName= ruleTypeRef + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1026:4: (lv_typeName= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1029:6: lv_typeName= ruleTypeRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.12/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -2602,8 +2604,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1049:2: (lv_feature= RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1051:6: lv_feature= RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1051:2: (lv_feature= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1053:6: lv_feature= RULE_ID { lv_feature=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAction2452); @@ -2628,10 +2630,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1069:3: (lv_operator= ( '=' | '+=' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:6: lv_operator= ( '=' | '+=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:3: (lv_operator= ( '=' | '+=' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:6: lv_operator= ( '=' | '+=' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:18: ( '=' | '+=' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:18: ( '=' | '+=' ) int alt25=2; int LA25_0 = input.LA(1); @@ -2643,13 +2645,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("1071:18: ( '=' | '+=' )", 25, 0, input); + new NoViableAltException("1073:18: ( '=' | '+=' )", 25, 0, input); throw nvae; } switch (alt25) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1071:19: '=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1073:19: '=' { match(input,29,FOLLOW_29_in_ruleAction2486); @@ -2659,7 +2661,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1076:6: '+=' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1078:6: '+=' { match(input,28,FOLLOW_28_in_ruleAction2501); @@ -2721,7 +2723,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleAbstractTerminal - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1109:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:1: entryRuleAbstractTerminal returns [EObject current=null] : iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ; public final EObject entryRuleAbstractTerminal() throws RecognitionException { EObject current = null; @@ -2729,8 +2731,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1109:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1110:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1111:58: (iv_ruleAbstractTerminal= ruleAbstractTerminal EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1112:2: iv_ruleAbstractTerminal= ruleAbstractTerminal EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAbstractTerminal_in_entryRuleAbstractTerminal2567); @@ -2756,7 +2758,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleAbstractTerminal - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1117:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1119:1: ruleAbstractTerminal returns [EObject current=null] : ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ; public final EObject ruleAbstractTerminal() throws RecognitionException { EObject current = null; @@ -2771,10 +2773,10 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1119:33: ( ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1121:33: ( ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference ) int alt28=2; int LA28_0 = input.LA(1); @@ -2786,15 +2788,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("1120:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )", 28, 0, input); + new NoViableAltException("1122:1: ( ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) | this_CrossReference= ruleCrossReference )", 28, 0, input); throw nvae; } switch (alt28) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement ) int alt27=2; int LA27_0 = input.LA(1); @@ -2806,15 +2808,15 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("1120:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )", 27, 0, input); + new NoViableAltException("1122:2: ( (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) | this_ParenthesizedElement= ruleParenthesizedElement )", 27, 0, input); throw nvae; } switch (alt27) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1120:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall ) int alt26=2; int LA26_0 = input.LA(1); @@ -2826,13 +2828,13 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } else { NoViableAltException nvae = - new NoViableAltException("1120:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )", 26, 0, input); + new NoViableAltException("1122:3: (this_Keyword= ruleKeyword | this_RuleCall= ruleRuleCall )", 26, 0, input); throw nvae; } switch (alt26) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1121:5: this_Keyword= ruleKeyword + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1123:5: this_Keyword= ruleKeyword { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.0/@groups.0" /* xtext::RuleCall */, currentNode); @@ -2849,7 +2851,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1131:5: this_RuleCall= ruleRuleCall + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1133:5: this_RuleCall= ruleRuleCall { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); @@ -2872,7 +2874,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1141:5: this_ParenthesizedElement= ruleParenthesizedElement + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1143:5: this_ParenthesizedElement= ruleParenthesizedElement { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.0/@groups.1" /* xtext::RuleCall */, currentNode); @@ -2895,7 +2897,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } break; case 2 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1151:5: this_CrossReference= ruleCrossReference + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1153:5: this_CrossReference= ruleCrossReference { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.13/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -2932,7 +2934,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleCrossReference - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1166:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:1: entryRuleCrossReference returns [EObject current=null] : iv_ruleCrossReference= ruleCrossReference EOF ; public final EObject entryRuleCrossReference() throws RecognitionException { EObject current = null; @@ -2940,8 +2942,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1166:56: (iv_ruleCrossReference= ruleCrossReference EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1167:2: iv_ruleCrossReference= ruleCrossReference EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1168:56: (iv_ruleCrossReference= ruleCrossReference EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1169:2: iv_ruleCrossReference= ruleCrossReference EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleCrossReference_in_entryRuleCrossReference2741); @@ -2967,7 +2969,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleCrossReference - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1174:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1176:1: ruleCrossReference returns [EObject current=null] : ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ; public final EObject ruleCrossReference() throws RecognitionException { EObject current = null; @@ -2976,24 +2978,24 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1176:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1178:33: ( ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:1: ( ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) ']' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:2: ( ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) ) ( '|' ( ( RULE_ID ) ) )? { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:3: ( '[' (lv_type= ruleTypeRef ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1177:4: '[' (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:3: ( '[' (lv_type= ruleTypeRef ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1179:4: '[' (lv_type= ruleTypeRef ) { match(input,34,FOLLOW_34_in_ruleCrossReference2787); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1181:1: (lv_type= ruleTypeRef ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1184:6: lv_type= ruleTypeRef + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1183:1: (lv_type= ruleTypeRef ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1186:6: lv_type= ruleTypeRef { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -3021,7 +3023,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1202:3: ( '|' ( ( RULE_ID ) ) )? + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:3: ( '|' ( ( RULE_ID ) ) )? int alt29=2; int LA29_0 = input.LA(1); @@ -3030,14 +3032,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser } switch (alt29) { case 1 : - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1202:4: '|' ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1204:4: '|' ( ( RULE_ID ) ) { match(input,24,FOLLOW_24_in_ruleCrossReference2836); createLeafNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.14/@alternatives/@abstractTokens.0/@abstractTokens.1/@abstractTokens.0" /* xtext::Keyword */, null); - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1206:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1209:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1208:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1211:3: ( RULE_ID ) { if (current==null) { @@ -3045,8 +3047,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1215:1: ( RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1216:2: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1217:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1218:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCrossReference2860); @@ -3092,7 +3094,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleParenthesizedElement - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1232:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:1: entryRuleParenthesizedElement returns [EObject current=null] : iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ; public final EObject entryRuleParenthesizedElement() throws RecognitionException { EObject current = null; @@ -3100,8 +3102,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1232:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1233:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1234:62: (iv_ruleParenthesizedElement= ruleParenthesizedElement EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1235:2: iv_ruleParenthesizedElement= ruleParenthesizedElement EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.15" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleParenthesizedElement_in_entryRuleParenthesizedElement2909); @@ -3127,7 +3129,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleParenthesizedElement - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1240:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1242:1: ruleParenthesizedElement returns [EObject current=null] : ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ; public final EObject ruleParenthesizedElement() throws RecognitionException { EObject current = null; @@ -3136,14 +3138,14 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1242:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1243:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1244:33: ( ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1243:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1243:2: ( '(' this_Alternatives= ruleAlternatives ) ')' + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:1: ( ( '(' this_Alternatives= ruleAlternatives ) ')' ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives ) ')' { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1243:2: ( '(' this_Alternatives= ruleAlternatives ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1243:3: '(' this_Alternatives= ruleAlternatives + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:2: ( '(' this_Alternatives= ruleAlternatives ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1245:3: '(' this_Alternatives= ruleAlternatives { match(input,36,FOLLOW_36_in_ruleParenthesizedElement2954); @@ -3188,7 +3190,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleKeyword - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1267:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ; public final EObject entryRuleKeyword() throws RecognitionException { EObject current = null; @@ -3196,8 +3198,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1267:49: (iv_ruleKeyword= ruleKeyword EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1268:2: iv_ruleKeyword= ruleKeyword EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1269:49: (iv_ruleKeyword= ruleKeyword EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1270:2: iv_ruleKeyword= ruleKeyword EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.16" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword3018); @@ -3223,7 +3225,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleKeyword - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1275:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1277:1: ruleKeyword returns [EObject current=null] : (lv_value= RULE_STRING ) ; public final EObject ruleKeyword() throws RecognitionException { EObject current = null; @@ -3231,11 +3233,11 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1277:33: ( (lv_value= RULE_STRING ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1278:1: (lv_value= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1279:33: ( (lv_value= RULE_STRING ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1278:1: (lv_value= RULE_STRING ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:6: lv_value= RULE_STRING + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1280:1: (lv_value= RULE_STRING ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1282:6: lv_value= RULE_STRING { lv_value=(Token)input.LT(1); match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword3073); @@ -3275,7 +3277,7 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start entryRuleRuleCall - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1305:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:1: entryRuleRuleCall returns [EObject current=null] : iv_ruleRuleCall= ruleRuleCall EOF ; public final EObject entryRuleRuleCall() throws RecognitionException { EObject current = null; @@ -3283,8 +3285,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1305:50: (iv_ruleRuleCall= ruleRuleCall EOF ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1306:2: iv_ruleRuleCall= ruleRuleCall EOF + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1307:50: (iv_ruleRuleCall= ruleRuleCall EOF ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1308:2: iv_ruleRuleCall= ruleRuleCall EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/XtextGrammarTestLanguage.xmi#//@rules.17" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleRuleCall_in_entryRuleRuleCall3116); @@ -3310,17 +3312,17 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser // $ANTLR start ruleRuleCall - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1313:1: ruleRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ; + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1315:1: ruleRuleCall returns [EObject current=null] : ( ( RULE_ID ) ) ; public final EObject ruleRuleCall() throws RecognitionException { EObject current = null; EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1315:33: ( ( ( RULE_ID ) ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1316:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1317:33: ( ( ( RULE_ID ) ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) ) { - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1316:1: ( ( RULE_ID ) ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1319:3: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1318:1: ( ( RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1321:3: ( RULE_ID ) { if (current==null) { @@ -3328,8 +3330,8 @@ public class InternalXtextGrammarTestLanguageParser extends AbstractAntlrParser associateNodeWithAstElement(currentNode, current); } - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1325:1: ( RULE_ID ) - // ../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1326:2: RULE_ID + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1327:1: ( RULE_ID ) + // ./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g:1328:2: RULE_ID { match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleCall3174); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g index 402d03d..a069972 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage__.g @@ -35,25 +35,25 @@ T35 : ']' ; T36 : '(' ; T37 : ')' ; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1337 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1339 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1339 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1341 RULE_INT : ('0'..'9')+; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1341 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1343 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1343 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1345 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1345 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1347 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1347 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1349 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "../org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1349 +// $ANTLR src "./src-gen/org/eclipse/xtext/parser/internal/InternalXtextGrammarTestLanguage.g" 1351 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g index aa8ccda..2e8ac7a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java index 4bf2fbf..e7a3ff9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-16 15:27:17 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-18 11:06:29 package org.eclipse.xtext.parsetree.formatter.parser.internal; @@ -149,10 +149,10 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:282:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:282:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:282:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -161,7 +161,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:282:12: '^' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:12: '^' { match('^'); @@ -180,7 +180,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:282:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -228,10 +228,10 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -245,7 +245,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:284:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:13: '0' .. '9' { matchRange('0','9'); @@ -275,7 +275,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -287,16 +287,16 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("286:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("288: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/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -312,7 +312,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288: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' ) { @@ -329,7 +329,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -355,10 +355,10 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -374,7 +374,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288: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' ) { @@ -391,7 +391,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:286:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -429,12 +429,12 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -459,7 +459,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:288:52: . + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:52: . { matchAny(); @@ -488,12 +488,12 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -506,7 +506,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292: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(); @@ -527,7 +527,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -536,9 +536,9 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -547,7 +547,7 @@ public class InternalFormatterTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:290:39: '\\r' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:39: '\\r' { match('\r'); @@ -578,10 +578,10 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:294:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:294:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:292:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:294:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -635,8 +635,8 @@ public class InternalFormatterTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:294:16: ( . ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:294:18: . + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:296:16: ( . ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:296:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java index 4c173e8..7b922a3 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-16 15:27:17 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g 2008-12-18 11:06:29 package org.eclipse.xtext.parsetree.formatter.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleRoot - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:64:1: entryRuleRoot returns [EObject current=null] : iv_ruleRoot= ruleRoot EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:66:1: entryRuleRoot returns [EObject current=null] : iv_ruleRoot= ruleRoot EOF ; public final EObject entryRuleRoot() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:64:46: (iv_ruleRoot= ruleRoot EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:65:2: iv_ruleRoot= ruleRoot EOF + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:66:46: (iv_ruleRoot= ruleRoot EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:67:2: iv_ruleRoot= ruleRoot EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleRoot_in_entryRuleRoot71); @@ -97,7 +99,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleRoot - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:72:1: ruleRoot returns [EObject current=null] : ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:74:1: ruleRoot returns [EObject current=null] : ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) ; public final EObject ruleRoot() throws RecognitionException { EObject current = null; @@ -108,17 +110,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:74:33: ( ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:75:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:76:33: ( ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:77:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:75:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:75:2: 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:77:1: ( 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:77:2: 'test' (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) { match(input,11,FOLLOW_11_in_ruleRoot115); createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:79:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:81:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation ) int alt1=2; int LA1_0 = input.LA(1); @@ -130,13 +132,13 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { } else { NoViableAltException nvae = - new NoViableAltException("79:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation )", 1, 0, input); + new NoViableAltException("81:1: (this_TestLinewrap= ruleTestLinewrap | this_TestIndentation= ruleTestIndentation )", 1, 0, input); throw nvae; } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:80:5: this_TestLinewrap= ruleTestLinewrap + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:82:5: this_TestLinewrap= ruleTestLinewrap { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0" /* xtext::RuleCall */, currentNode); @@ -153,7 +155,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:90:5: this_TestIndentation= ruleTestIndentation + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:92:5: this_TestIndentation= ruleTestIndentation { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1" /* xtext::RuleCall */, currentNode); @@ -193,7 +195,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleLine - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:105:1: entryRuleLine returns [EObject current=null] : iv_ruleLine= ruleLine EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:107:1: entryRuleLine returns [EObject current=null] : iv_ruleLine= ruleLine EOF ; public final EObject entryRuleLine() throws RecognitionException { EObject current = null; @@ -201,8 +203,8 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:105:46: (iv_ruleLine= ruleLine EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:106:2: iv_ruleLine= ruleLine EOF + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:107:46: (iv_ruleLine= ruleLine EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:108:2: iv_ruleLine= ruleLine EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleLine_in_entryRuleLine198); @@ -228,7 +230,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleLine - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:113:1: ruleLine returns [EObject current=null] : ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:115:1: ruleLine returns [EObject current=null] : ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) ; public final EObject ruleLine() throws RecognitionException { EObject current = null; @@ -237,17 +239,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:115:33: ( ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:117:33: ( ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:1: ( ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) ';' { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:3: (lv_type= RULE_ID ) (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:2: ( (lv_type= RULE_ID ) (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:3: (lv_type= RULE_ID ) (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:116:3: (lv_type= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:6: lv_type= RULE_ID + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:118:3: (lv_type= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:120:6: lv_type= RULE_ID { lv_type=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLine255); @@ -269,8 +271,8 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:136:2: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:138:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:138:2: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:140:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleLine287); @@ -320,7 +322,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleTestLinewrap - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:167:1: entryRuleTestLinewrap returns [EObject current=null] : iv_ruleTestLinewrap= ruleTestLinewrap EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:169:1: entryRuleTestLinewrap returns [EObject current=null] : iv_ruleTestLinewrap= ruleTestLinewrap EOF ; public final EObject entryRuleTestLinewrap() throws RecognitionException { EObject current = null; @@ -328,8 +330,8 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:167:54: (iv_ruleTestLinewrap= ruleTestLinewrap EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:168:2: iv_ruleTestLinewrap= ruleTestLinewrap EOF + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:169:54: (iv_ruleTestLinewrap= ruleTestLinewrap EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:170:2: iv_ruleTestLinewrap= ruleTestLinewrap EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleTestLinewrap_in_entryRuleTestLinewrap341); @@ -355,7 +357,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleTestLinewrap - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:175:1: ruleTestLinewrap returns [EObject current=null] : ( 'linewrap' (lv_items= ruleLine )* ) ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:177:1: ruleTestLinewrap returns [EObject current=null] : ( 'linewrap' (lv_items= ruleLine )* ) ; public final EObject ruleTestLinewrap() throws RecognitionException { EObject current = null; @@ -364,17 +366,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:177:33: ( ( 'linewrap' (lv_items= ruleLine )* ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:178:1: ( 'linewrap' (lv_items= ruleLine )* ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:179:33: ( ( 'linewrap' (lv_items= ruleLine )* ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:180:1: ( 'linewrap' (lv_items= ruleLine )* ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:178:1: ( 'linewrap' (lv_items= ruleLine )* ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:178:2: 'linewrap' (lv_items= ruleLine )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:180:1: ( 'linewrap' (lv_items= ruleLine )* ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:180:2: 'linewrap' (lv_items= ruleLine )* { match(input,13,FOLLOW_13_in_ruleTestLinewrap385); createLeafNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.0" /* xtext::Keyword */, null); - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:182:1: (lv_items= ruleLine )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:184:1: (lv_items= ruleLine )* loop2: do { int alt2=2; @@ -387,7 +389,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:185:6: lv_items= ruleLine + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:187:6: lv_items= ruleLine { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.2/@alternatives/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -439,7 +441,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start entryRuleTestIndentation - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:210:1: entryRuleTestIndentation returns [EObject current=null] : iv_ruleTestIndentation= ruleTestIndentation EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:212:1: entryRuleTestIndentation returns [EObject current=null] : iv_ruleTestIndentation= ruleTestIndentation EOF ; public final EObject entryRuleTestIndentation() throws RecognitionException { EObject current = null; @@ -447,8 +449,8 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:210:57: (iv_ruleTestIndentation= ruleTestIndentation EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:211:2: iv_ruleTestIndentation= ruleTestIndentation EOF + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:212:57: (iv_ruleTestIndentation= ruleTestIndentation EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:213:2: iv_ruleTestIndentation= ruleTestIndentation EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleTestIndentation_in_entryRuleTestIndentation457); @@ -474,7 +476,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { // $ANTLR start ruleTestIndentation - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:218:1: ruleTestIndentation returns [EObject current=null] : ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) ; + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:220:1: ruleTestIndentation returns [EObject current=null] : ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) ; public final EObject ruleTestIndentation() throws RecognitionException { EObject current = null; @@ -485,17 +487,17 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:220:33: ( ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:222:33: ( ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:1: ( ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) '}' { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:3: ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:2: ( ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:3: ( 'indentation' '{' ) ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:3: ( 'indentation' '{' ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:221:4: 'indentation' '{' + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:3: ( 'indentation' '{' ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:223:4: 'indentation' '{' { match(input,14,FOLLOW_14_in_ruleTestIndentation503); @@ -508,7 +510,7 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { } - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:229:2: ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:231:2: ( (lv_sub= ruleTestIndentation ) | (lv_items= ruleLine ) )* loop3: do { int alt3=3; @@ -524,10 +526,10 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:229:3: (lv_sub= ruleTestIndentation ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:231:3: (lv_sub= ruleTestIndentation ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:229:3: (lv_sub= ruleTestIndentation ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:232:6: lv_sub= ruleTestIndentation + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:231:3: (lv_sub= ruleTestIndentation ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:234:6: lv_sub= ruleTestIndentation { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.0/@terminal" /* xtext::RuleCall */, currentNode); @@ -556,10 +558,10 @@ public class InternalFormatterTestLanguageParser extends AbstractAntlrParser { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:251:6: (lv_items= ruleLine ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:6: (lv_items= ruleLine ) { - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:251:6: (lv_items= ruleLine ) - // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:254:6: lv_items= ruleLine + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:253:6: (lv_items= ruleLine ) + // ./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g:256:6: lv_items= ruleLine { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xmi#//@rules.3/@alternatives/@abstractTokens.0/@abstractTokens.1/@groups.1/@terminal" /* xtext::RuleCall */, currentNode); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g index 50f3351..e5d9d88 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage__.g @@ -14,25 +14,25 @@ T14 : 'indentation' ; T15 : '{' ; T16 : '}' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 282 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 284 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 284 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 286 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 286 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 288 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 288 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 290 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 290 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 292 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 292 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 294 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 294 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/formatter/parser/internal/InternalFormatterTestLanguage.g" 296 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g index 55586c1..12bdced 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java index af7dd33..0c92243 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-16 15:27:10 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-18 11:06:22 package org.eclipse.xtext.parsetree.reconstr.parser.internal; @@ -127,10 +127,10 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:345:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:345:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:345:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -139,7 +139,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:345:12: '^' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:12: '^' { match('^'); @@ -158,7 +158,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:345:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -206,10 +206,10 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -223,7 +223,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:347:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:13: '0' .. '9' { matchRange('0','9'); @@ -253,7 +253,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -265,16 +265,16 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("349:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("351: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/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -290,7 +290,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351: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' ) { @@ -307,7 +307,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -333,10 +333,10 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -352,7 +352,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351: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' ) { @@ -369,7 +369,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:349:152: ~ ( '\\\\' | '\\'' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:152: ~ ( '\\\\' | '\\'' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -407,12 +407,12 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_ML_COMMENT() throws RecognitionException { try { int _type = RULE_ML_COMMENT; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:19: '/*' ( options {greedy=false; } : . )* '*/' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:24: ( options {greedy=false; } : . )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -437,7 +437,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:351:52: . + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:52: . { matchAny(); @@ -466,12 +466,12 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_SL_COMMENT() throws RecognitionException { try { int _type = RULE_SL_COMMENT; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:17: ( '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:19: '//' (~ ( '\\n' | '\\r' ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:24: (~ ( '\\n' | '\\r' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:24: (~ ( '\\n' | '\\r' ) )* loop8: do { int alt8=2; @@ -484,7 +484,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:24: ~ ( '\\n' | '\\r' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355: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(); @@ -505,7 +505,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } } while (true); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:38: ( ( '\\r' )? '\\n' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:38: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -514,9 +514,9 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:39: ( '\\r' )? '\\n' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:39: ( '\\r' )? '\\n' { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:39: ( '\\r' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:39: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -525,7 +525,7 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:353:39: '\\r' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:39: '\\r' { match('\r'); @@ -556,10 +556,10 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_WS() throws RecognitionException { try { int _type = RULE_WS; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:357:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:357:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:355:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:357:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -613,8 +613,8 @@ public class InternalComplexReconstrTestLanguageLexer extends Lexer { public final void mRULE_ANY_OTHER() throws RecognitionException { try { int _type = RULE_ANY_OTHER; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:357:16: ( . ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:357:18: . + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:359:16: ( . ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:359:18: . { matchAny(); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java index e02b2eb..9d17ae0 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguageParser.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-16 15:27:10 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g 2008-12-18 11:06:22 package org.eclipse.xtext.parsetree.reconstr.parser.internal; @@ -11,9 +11,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + import org.antlr.runtime.*; import java.util.Stack; import java.util.List; @@ -62,7 +64,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start entryRuleOp - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:64:1: entryRuleOp returns [EObject current=null] : iv_ruleOp= ruleOp EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:66:1: entryRuleOp returns [EObject current=null] : iv_ruleOp= ruleOp EOF ; public final EObject entryRuleOp() throws RecognitionException { EObject current = null; @@ -70,8 +72,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:64:44: (iv_ruleOp= ruleOp EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:65:2: iv_ruleOp= ruleOp EOF + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:66:44: (iv_ruleOp= ruleOp EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:67:2: iv_ruleOp= ruleOp EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleOp_in_entryRuleOp71); @@ -97,7 +99,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start ruleOp - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:72:1: ruleOp returns [EObject current=null] : (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:74:1: ruleOp returns [EObject current=null] : (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) ; public final EObject ruleOp() throws RecognitionException { EObject current = null; @@ -110,11 +112,11 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:74:33: ( (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:75:1: (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:76:33: ( (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:77:1: (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:75:1: (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:76:5: this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:77:1: (this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:78:5: this_Term= ruleTerm ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.0" /* xtext::RuleCall */, currentNode); @@ -127,7 +129,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars current = this_Term; currentNode = currentNode.getParent(); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:1: ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:1: ( ( ( () '+' ) (lv_addOperands= ruleTerm ) ) | ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) )* loop1: do { int alt1=3; @@ -143,16 +145,16 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:2: ( ( () '+' ) (lv_addOperands= ruleTerm ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:2: ( ( () '+' ) (lv_addOperands= ruleTerm ) ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:2: ( ( () '+' ) (lv_addOperands= ruleTerm ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:3: ( () '+' ) (lv_addOperands= ruleTerm ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:2: ( ( () '+' ) (lv_addOperands= ruleTerm ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:3: ( () '+' ) (lv_addOperands= ruleTerm ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:3: ( () '+' ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:4: () '+' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:3: ( () '+' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:4: () '+' { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:84:4: () - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:85:5: + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:86:4: () + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:87:5: { temp=factory.create("Add"); @@ -175,8 +177,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:100:2: (lv_addOperands= ruleTerm ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:103:6: lv_addOperands= ruleTerm + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:102:2: (lv_addOperands= ruleTerm ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:105:6: lv_addOperands= ruleTerm { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.0/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -208,16 +210,16 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:6: ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:6: ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:6: ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:7: ( () '-' ) (lv_minusOperands= ruleTerm ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:6: ( ( () '-' ) (lv_minusOperands= ruleTerm ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:7: ( () '-' ) (lv_minusOperands= ruleTerm ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:7: ( () '-' ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:8: () '-' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:7: ( () '-' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:8: () '-' { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:122:8: () - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:123:5: + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:124:8: () + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:125:5: { temp=factory.create("Minus"); @@ -240,8 +242,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:138:2: (lv_minusOperands= ruleTerm ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:141:6: lv_minusOperands= ruleTerm + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:140:2: (lv_minusOperands= ruleTerm ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:143:6: lv_minusOperands= ruleTerm { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.0/@alternatives/@abstractTokens.1/@groups.1/@abstractTokens.1/@terminal" /* xtext::RuleCall */, currentNode); @@ -299,7 +301,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start entryRuleTerm - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:166:1: entryRuleTerm returns [EObject current=null] : iv_ruleTerm= ruleTerm EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:168:1: entryRuleTerm returns [EObject current=null] : iv_ruleTerm= ruleTerm EOF ; public final EObject entryRuleTerm() throws RecognitionException { EObject current = null; @@ -307,8 +309,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:166:46: (iv_ruleTerm= ruleTerm EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:167:2: iv_ruleTerm= ruleTerm EOF + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:168:46: (iv_ruleTerm= ruleTerm EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:169:2: iv_ruleTerm= ruleTerm EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.1" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleTerm_in_entryRuleTerm289); @@ -334,7 +336,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start ruleTerm - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:174:1: ruleTerm returns [EObject current=null] : (this_Atom= ruleAtom | this_Parens= ruleParens ) ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:176:1: ruleTerm returns [EObject current=null] : (this_Atom= ruleAtom | this_Parens= ruleParens ) ; public final EObject ruleTerm() throws RecognitionException { EObject current = null; @@ -345,10 +347,10 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:176:33: ( (this_Atom= ruleAtom | this_Parens= ruleParens ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:177:1: (this_Atom= ruleAtom | this_Parens= ruleParens ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:178:33: ( (this_Atom= ruleAtom | this_Parens= ruleParens ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:179:1: (this_Atom= ruleAtom | this_Parens= ruleParens ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:177:1: (this_Atom= ruleAtom | this_Parens= ruleParens ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:179:1: (this_Atom= ruleAtom | this_Parens= ruleParens ) int alt2=2; int LA2_0 = input.LA(1); @@ -360,13 +362,13 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } else { NoViableAltException nvae = - new NoViableAltException("177:1: (this_Atom= ruleAtom | this_Parens= ruleParens )", 2, 0, input); + new NoViableAltException("179:1: (this_Atom= ruleAtom | this_Parens= ruleParens )", 2, 0, input); throw nvae; } switch (alt2) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:178:5: this_Atom= ruleAtom + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:180:5: this_Atom= ruleAtom { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.1/@alternatives/@groups.0" /* xtext::RuleCall */, currentNode); @@ -383,7 +385,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:188:5: this_Parens= ruleParens + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:190:5: this_Parens= ruleParens { currentNode=createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.1/@alternatives/@groups.1" /* xtext::RuleCall */, currentNode); @@ -420,7 +422,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start entryRuleAtom - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:203:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:205:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ; public final EObject entryRuleAtom() throws RecognitionException { EObject current = null; @@ -428,8 +430,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:203:46: (iv_ruleAtom= ruleAtom EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:204:2: iv_ruleAtom= ruleAtom EOF + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:205:46: (iv_ruleAtom= ruleAtom EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:206:2: iv_ruleAtom= ruleAtom EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.2" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleAtom_in_entryRuleAtom405); @@ -455,7 +457,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start ruleAtom - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:211:1: ruleAtom returns [EObject current=null] : (lv_name= RULE_ID ) ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:213:1: ruleAtom returns [EObject current=null] : (lv_name= RULE_ID ) ; public final EObject ruleAtom() throws RecognitionException { EObject current = null; @@ -463,11 +465,11 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:213:33: ( (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:214:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:215:33: ( (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:216:1: (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:214:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:216:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:216:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:218:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAtom460); @@ -507,7 +509,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start entryRuleParens - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:241:1: entryRuleParens returns [EObject current=null] : iv_ruleParens= ruleParens EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:243:1: entryRuleParens returns [EObject current=null] : iv_ruleParens= ruleParens EOF ; public final EObject entryRuleParens() throws RecognitionException { EObject current = null; @@ -515,8 +517,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:241:48: (iv_ruleParens= ruleParens EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:242:2: iv_ruleParens= ruleParens EOF + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:243:48: (iv_ruleParens= ruleParens EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:244:2: iv_ruleParens= ruleParens EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.3" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleParens_in_entryRuleParens503); @@ -542,7 +544,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start ruleParens - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:249:1: ruleParens returns [EObject current=null] : ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:251:1: ruleParens returns [EObject current=null] : ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) ; public final EObject ruleParens() throws RecognitionException { EObject current = null; @@ -552,17 +554,17 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:251:33: ( ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:1: ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:253:33: ( ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:1: ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:1: ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:2: ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:1: ( ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:2: ( ( '(' this_Op= ruleOp ) ')' ) (lv_em= '!' )? { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:2: ( ( '(' this_Op= ruleOp ) ')' ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:3: ( '(' this_Op= ruleOp ) ')' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:2: ( ( '(' this_Op= ruleOp ) ')' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:3: ( '(' this_Op= ruleOp ) ')' { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:3: ( '(' this_Op= ruleOp ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:252:4: '(' this_Op= ruleOp + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:3: ( '(' this_Op= ruleOp ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:254:4: '(' this_Op= ruleOp { match(input,13,FOLLOW_13_in_ruleParens549); @@ -589,7 +591,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:269:2: (lv_em= '!' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:271:2: (lv_em= '!' )? int alt3=2; int LA3_0 = input.LA(1); @@ -598,7 +600,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars } switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:271:6: lv_em= '!' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:273:6: lv_em= '!' { lv_em=(Token)input.LT(1); match(input,15,FOLLOW_15_in_ruleParens602); @@ -644,7 +646,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start entryRuleTrickyA1 - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:298:1: entryRuleTrickyA1 returns [EObject current=null] : iv_ruleTrickyA1= ruleTrickyA1 EOF ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:300:1: entryRuleTrickyA1 returns [EObject current=null] : iv_ruleTrickyA1= ruleTrickyA1 EOF ; public final EObject entryRuleTrickyA1() throws RecognitionException { EObject current = null; @@ -652,8 +654,8 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:298:50: (iv_ruleTrickyA1= ruleTrickyA1 EOF ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:299:2: iv_ruleTrickyA1= ruleTrickyA1 EOF + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:300:50: (iv_ruleTrickyA1= ruleTrickyA1 EOF ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:301:2: iv_ruleTrickyA1= ruleTrickyA1 EOF { currentNode = createCompositeNode("classpath:/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.xmi#//@rules.5" /* xtext::ParserRule */, currentNode); pushFollow(FOLLOW_ruleTrickyA1_in_entryRuleTrickyA1650); @@ -679,7 +681,7 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars // $ANTLR start ruleTrickyA1 - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:306:1: ruleTrickyA1 returns [EObject current=null] : (lv_name= RULE_ID ) ; + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:308:1: ruleTrickyA1 returns [EObject current=null] : (lv_name= RULE_ID ) ; public final EObject ruleTrickyA1() throws RecognitionException { EObject current = null; @@ -687,11 +689,11 @@ public class InternalComplexReconstrTestLanguageParser extends AbstractAntlrPars EObject temp=null; setCurrentLookahead(); resetLookahead(); try { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:308:33: ( (lv_name= RULE_ID ) ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:309:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:310:33: ( (lv_name= RULE_ID ) ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:311:1: (lv_name= RULE_ID ) { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:309:1: (lv_name= RULE_ID ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:311:6: lv_name= RULE_ID + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:311:1: (lv_name= RULE_ID ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g:313:6: lv_name= RULE_ID { lv_name=(Token)input.LT(1); match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTrickyA1705); diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage__.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage__.g index 3847ebc..7aa6144 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage__.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage__.g @@ -13,25 +13,25 @@ T13 : '(' ; T14 : ')' ; T15 : '!' ; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 345 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 347 RULE_ID : ('^')?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 347 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 349 RULE_INT : ('0'..'9')+; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 349 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 351 RULE_STRING : '"' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'"') )* '"' | '\'' ( '\\' ('b'|'t'|'n'|'f'|'r'|'\"'|'\''|'\\') | ~('\\'|'\'') )* '\''; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 351 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 353 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 353 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 355 RULE_SL_COMMENT : '//' ~('\n'|'\r')* ('\r'? '\n')? {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 355 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 357 RULE_WS : (' '|'\t'|'\r'|'\n')+ {$channel=HIDDEN;}; -// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 357 +// $ANTLR src "./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalComplexReconstrTestLanguage.g" 359 RULE_ANY_OTHER : .; diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g index 9b96dfd..a29ac3a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g @@ -27,7 +27,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parser.antlr.AbstractAntlrParser; import org.eclipse.xtext.parser.antlr.XtextTokenStream; +import org.eclipse.xtext.parser.antlr.DatatypeRuleToken; import org.eclipse.xtext.parser.antlr.ValueConverterException; + } @parser::members { diff --git a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java index 07d4743..4a45707 100644 --- a/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java +++ b/tests/org.eclipse.xtext.generator.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguageLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-16 15:27:09 +// $ANTLR 3.0.1 ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g 2008-12-18 11:06:21 package org.eclipse.xtext.parsetree.reconstr.parser.internal; @@ -266,10 +266,10 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:626:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:626:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:626:11: ( '^' )? + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -278,7 +278,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:626:12: '^' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:12: '^' { match('^'); @@ -297,7 +297,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { recover(mse); throw mse; } - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:626:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:41: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -345,10 +345,10 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { public final void mRULE_INT() throws RecognitionException { try { int _type = RULE_INT; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:10: ( ( '0' .. '9' )+ ) - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:10: ( ( '0' .. '9' )+ ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:12: ( '0' .. '9' )+ { - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:12: ( '0' .. '9' )+ + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -362,7 +362,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:628:13: '0' .. '9' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:13: '0' .. '9' { matchRange('0','9'); @@ -392,7 +392,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { public final void mRULE_STRING() throws RecognitionException { try { int _type = RULE_STRING; - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:13: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -404,16 +404,16 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { } else { NoViableAltException nvae = - new NoViableAltException("630:1: RULE_STRING : ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' );", 6, 0, input); + new NoViableAltException("632: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/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:15: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* '\"' { match('\"'); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:19: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\"' ) )* loop4: do { int alt4=3; @@ -429,7 +429,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632: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' ) { @@ -446,7 +446,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:65: ~ ( '\\\\' | '\"' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:65: ~ ( '\\\\' | '\"' ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFE') ) { input.consume(); @@ -472,10 +472,10 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { } break; case 2 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:101: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* '\\'' { match('\''); - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632:106: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) | ~ ( '\\\\' | '\\'' ) )* loop5: do { int alt5=3; @@ -491,7 +491,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:630:108: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | '\\\"' | '\\'' | '\\\\' ) + // ./src-gen/org/eclipse/xtext/parsetree/reconstr/parser/internal/InternalSimpleReconstrTestLanguage.g:632: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' ) { @@ -508,7 +508,7 @@ public class InternalSimpleReconstrTestLanguageLexer extends Lexer { |