From 3a2c145e87053e1c4df9f87493922710b640c8ab Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Mon, 11 Jan 2021 06:48:18 +0100 Subject: [PATCH] [#1655] fixed k=x generation if k is set in parser options Signed-off-by: Christian Dietrich --- .../internal/InternalNoJdtTestLanguage.g | 1 + .../InternalNoJdtTestLanguageLexer.java | 74 +++--- .../InternalNoJdtTestLanguageParser.java | 214 +++++++++--------- .../internal/InternalNoJdtTestLanguage.g | 1 + .../InternalNoJdtTestLanguageLexer.java | 74 +++--- .../InternalNoJdtTestLanguageParser.java | 56 ++--- .../noJdt/NoJdtTestLanguage.mwe2 | 6 +- .../antlr/AbstractAntlrGrammarGenerator.xtend | 4 +- .../antlr/AbstractAntlrGrammarGenerator.java | 4 +- 9 files changed, 218 insertions(+), 216 deletions(-) diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguage.g b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguage.g index 283288788..353348272 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguage.g +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguage.g @@ -5,6 +5,7 @@ grammar InternalNoJdtTestLanguage; options { superClass=AbstractInternalContentAssistParser; + k=1; } @lexer::header { diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageLexer.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageLexer.java index e51e18294..1605ffa1c 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageLexer.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageLexer.java @@ -146,10 +146,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:367:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalNoJdtTestLanguage.g:367:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalNoJdtTestLanguage.g:368:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalNoJdtTestLanguage.g:368:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalNoJdtTestLanguage.g:367:11: ( '^' )? + // InternalNoJdtTestLanguage.g:368:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -158,7 +158,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalNoJdtTestLanguage.g:367:11: '^' + // InternalNoJdtTestLanguage.g:368:11: '^' { match('^'); @@ -176,7 +176,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalNoJdtTestLanguage.g:367:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalNoJdtTestLanguage.g:368:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -225,10 +225,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:369:10: ( ( '0' .. '9' )+ ) - // InternalNoJdtTestLanguage.g:369:12: ( '0' .. '9' )+ + // InternalNoJdtTestLanguage.g:370:10: ( ( '0' .. '9' )+ ) + // InternalNoJdtTestLanguage.g:370:12: ( '0' .. '9' )+ { - // InternalNoJdtTestLanguage.g:369:12: ( '0' .. '9' )+ + // InternalNoJdtTestLanguage.g:370:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -242,7 +242,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // InternalNoJdtTestLanguage.g:369:13: '0' .. '9' + // InternalNoJdtTestLanguage.g:370:13: '0' .. '9' { matchRange('0','9'); @@ -274,10 +274,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:371:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalNoJdtTestLanguage.g:371:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalNoJdtTestLanguage.g:372:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalNoJdtTestLanguage.g:372:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalNoJdtTestLanguage.g:371:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalNoJdtTestLanguage.g:372:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -295,10 +295,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // InternalNoJdtTestLanguage.g:371:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalNoJdtTestLanguage.g:372:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalNoJdtTestLanguage.g:371:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalNoJdtTestLanguage.g:372:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -314,7 +314,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalNoJdtTestLanguage.g:371:21: '\\\\' . + // InternalNoJdtTestLanguage.g:372:21: '\\\\' . { match('\\'); matchAny(); @@ -322,7 +322,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:371:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalNoJdtTestLanguage.g:372:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -347,10 +347,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:371:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalNoJdtTestLanguage.g:372:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalNoJdtTestLanguage.g:371:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalNoJdtTestLanguage.g:372:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -366,7 +366,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalNoJdtTestLanguage.g:371:54: '\\\\' . + // InternalNoJdtTestLanguage.g:372:54: '\\\\' . { match('\\'); matchAny(); @@ -374,7 +374,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:371:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalNoJdtTestLanguage.g:372:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -417,12 +417,12 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:373:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalNoJdtTestLanguage.g:373:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalNoJdtTestLanguage.g:374:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalNoJdtTestLanguage.g:374:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalNoJdtTestLanguage.g:373:24: ( options {greedy=false; } : . )* + // InternalNoJdtTestLanguage.g:374:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -447,7 +447,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalNoJdtTestLanguage.g:373:52: . + // InternalNoJdtTestLanguage.g:374:52: . { matchAny(); @@ -477,12 +477,12 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:375:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalNoJdtTestLanguage.g:375:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalNoJdtTestLanguage.g:376:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalNoJdtTestLanguage.g:376:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalNoJdtTestLanguage.g:375:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalNoJdtTestLanguage.g:376:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -495,7 +495,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalNoJdtTestLanguage.g:375:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalNoJdtTestLanguage.g:376: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)<='\uFFFF') ) { input.consume(); @@ -515,7 +515,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } } while (true); - // InternalNoJdtTestLanguage.g:375:40: ( ( '\\r' )? '\\n' )? + // InternalNoJdtTestLanguage.g:376:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -524,9 +524,9 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalNoJdtTestLanguage.g:375:41: ( '\\r' )? '\\n' + // InternalNoJdtTestLanguage.g:376:41: ( '\\r' )? '\\n' { - // InternalNoJdtTestLanguage.g:375:41: ( '\\r' )? + // InternalNoJdtTestLanguage.g:376:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -535,7 +535,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalNoJdtTestLanguage.g:375:41: '\\r' + // InternalNoJdtTestLanguage.g:376:41: '\\r' { match('\r'); @@ -567,10 +567,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:377:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalNoJdtTestLanguage.g:377:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalNoJdtTestLanguage.g:378:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalNoJdtTestLanguage.g:378:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalNoJdtTestLanguage.g:377:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalNoJdtTestLanguage.g:378:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -624,8 +624,8 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:379:16: ( . ) - // InternalNoJdtTestLanguage.g:379:18: . + // InternalNoJdtTestLanguage.g:380:16: ( . ) + // InternalNoJdtTestLanguage.g:380:18: . { matchAny(); diff --git a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageParser.java b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageParser.java index d68ad11f4..3327fb0be 100644 --- a/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageParser.java +++ b/org.eclipse.xtext.testlanguages.ide/src-gen/org/eclipse/xtext/testlanguages/noJdt/ide/contentassist/antlr/internal/InternalNoJdtTestLanguageParser.java @@ -74,11 +74,11 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "entryRuleModel" - // InternalNoJdtTestLanguage.g:53:1: entryRuleModel : ruleModel EOF ; + // InternalNoJdtTestLanguage.g:54:1: entryRuleModel : ruleModel EOF ; public final void entryRuleModel() throws RecognitionException { try { - // InternalNoJdtTestLanguage.g:54:1: ( ruleModel EOF ) - // InternalNoJdtTestLanguage.g:55:1: ruleModel EOF + // InternalNoJdtTestLanguage.g:55:1: ( ruleModel EOF ) + // InternalNoJdtTestLanguage.g:56:1: ruleModel EOF { before(grammarAccess.getModelRule()); pushFollow(FOLLOW_1); @@ -104,21 +104,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "ruleModel" - // InternalNoJdtTestLanguage.g:62:1: ruleModel : ( ( rule__Model__GreetingsAssignment ) ) ; + // InternalNoJdtTestLanguage.g:63:1: ruleModel : ( ( rule__Model__GreetingsAssignment ) ) ; public final void ruleModel() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:66:2: ( ( ( rule__Model__GreetingsAssignment ) ) ) - // InternalNoJdtTestLanguage.g:67:2: ( ( rule__Model__GreetingsAssignment ) ) + // InternalNoJdtTestLanguage.g:67:2: ( ( ( rule__Model__GreetingsAssignment ) ) ) + // InternalNoJdtTestLanguage.g:68:2: ( ( rule__Model__GreetingsAssignment ) ) { - // InternalNoJdtTestLanguage.g:67:2: ( ( rule__Model__GreetingsAssignment ) ) - // InternalNoJdtTestLanguage.g:68:3: ( rule__Model__GreetingsAssignment ) + // InternalNoJdtTestLanguage.g:68:2: ( ( rule__Model__GreetingsAssignment ) ) + // InternalNoJdtTestLanguage.g:69:3: ( rule__Model__GreetingsAssignment ) { before(grammarAccess.getModelAccess().getGreetingsAssignment()); - // InternalNoJdtTestLanguage.g:69:3: ( rule__Model__GreetingsAssignment ) - // InternalNoJdtTestLanguage.g:69:4: rule__Model__GreetingsAssignment + // InternalNoJdtTestLanguage.g:70:3: ( rule__Model__GreetingsAssignment ) + // InternalNoJdtTestLanguage.g:70:4: rule__Model__GreetingsAssignment { pushFollow(FOLLOW_2); rule__Model__GreetingsAssignment(); @@ -151,11 +151,11 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "entryRuleGreeting" - // InternalNoJdtTestLanguage.g:78:1: entryRuleGreeting : ruleGreeting EOF ; + // InternalNoJdtTestLanguage.g:79:1: entryRuleGreeting : ruleGreeting EOF ; public final void entryRuleGreeting() throws RecognitionException { try { - // InternalNoJdtTestLanguage.g:79:1: ( ruleGreeting EOF ) - // InternalNoJdtTestLanguage.g:80:1: ruleGreeting EOF + // InternalNoJdtTestLanguage.g:80:1: ( ruleGreeting EOF ) + // InternalNoJdtTestLanguage.g:81:1: ruleGreeting EOF { before(grammarAccess.getGreetingRule()); pushFollow(FOLLOW_1); @@ -181,21 +181,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "ruleGreeting" - // InternalNoJdtTestLanguage.g:87:1: ruleGreeting : ( ( rule__Greeting__Group__0 ) ) ; + // InternalNoJdtTestLanguage.g:88:1: ruleGreeting : ( ( rule__Greeting__Group__0 ) ) ; public final void ruleGreeting() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:91:2: ( ( ( rule__Greeting__Group__0 ) ) ) - // InternalNoJdtTestLanguage.g:92:2: ( ( rule__Greeting__Group__0 ) ) + // InternalNoJdtTestLanguage.g:92:2: ( ( ( rule__Greeting__Group__0 ) ) ) + // InternalNoJdtTestLanguage.g:93:2: ( ( rule__Greeting__Group__0 ) ) { - // InternalNoJdtTestLanguage.g:92:2: ( ( rule__Greeting__Group__0 ) ) - // InternalNoJdtTestLanguage.g:93:3: ( rule__Greeting__Group__0 ) + // InternalNoJdtTestLanguage.g:93:2: ( ( rule__Greeting__Group__0 ) ) + // InternalNoJdtTestLanguage.g:94:3: ( rule__Greeting__Group__0 ) { before(grammarAccess.getGreetingAccess().getGroup()); - // InternalNoJdtTestLanguage.g:94:3: ( rule__Greeting__Group__0 ) - // InternalNoJdtTestLanguage.g:94:4: rule__Greeting__Group__0 + // InternalNoJdtTestLanguage.g:95:3: ( rule__Greeting__Group__0 ) + // InternalNoJdtTestLanguage.g:95:4: rule__Greeting__Group__0 { pushFollow(FOLLOW_2); rule__Greeting__Group__0(); @@ -228,14 +228,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__0" - // InternalNoJdtTestLanguage.g:102:1: rule__Greeting__Group__0 : rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ; + // InternalNoJdtTestLanguage.g:103:1: rule__Greeting__Group__0 : rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ; public final void rule__Greeting__Group__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:106:1: ( rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ) - // InternalNoJdtTestLanguage.g:107:2: rule__Greeting__Group__0__Impl rule__Greeting__Group__1 + // InternalNoJdtTestLanguage.g:107:1: ( rule__Greeting__Group__0__Impl rule__Greeting__Group__1 ) + // InternalNoJdtTestLanguage.g:108:2: rule__Greeting__Group__0__Impl rule__Greeting__Group__1 { pushFollow(FOLLOW_3); rule__Greeting__Group__0__Impl(); @@ -266,17 +266,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__0__Impl" - // InternalNoJdtTestLanguage.g:114:1: rule__Greeting__Group__0__Impl : ( 'Hello' ) ; + // InternalNoJdtTestLanguage.g:115:1: rule__Greeting__Group__0__Impl : ( 'Hello' ) ; public final void rule__Greeting__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:118:1: ( ( 'Hello' ) ) - // InternalNoJdtTestLanguage.g:119:1: ( 'Hello' ) + // InternalNoJdtTestLanguage.g:119:1: ( ( 'Hello' ) ) + // InternalNoJdtTestLanguage.g:120:1: ( 'Hello' ) { - // InternalNoJdtTestLanguage.g:119:1: ( 'Hello' ) - // InternalNoJdtTestLanguage.g:120:2: 'Hello' + // InternalNoJdtTestLanguage.g:120:1: ( 'Hello' ) + // InternalNoJdtTestLanguage.g:121:2: 'Hello' { before(grammarAccess.getGreetingAccess().getHelloKeyword_0()); match(input,11,FOLLOW_2); @@ -303,14 +303,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__1" - // InternalNoJdtTestLanguage.g:129:1: rule__Greeting__Group__1 : rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ; + // InternalNoJdtTestLanguage.g:130:1: rule__Greeting__Group__1 : rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ; public final void rule__Greeting__Group__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:133:1: ( rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ) - // InternalNoJdtTestLanguage.g:134:2: rule__Greeting__Group__1__Impl rule__Greeting__Group__2 + // InternalNoJdtTestLanguage.g:134:1: ( rule__Greeting__Group__1__Impl rule__Greeting__Group__2 ) + // InternalNoJdtTestLanguage.g:135:2: rule__Greeting__Group__1__Impl rule__Greeting__Group__2 { pushFollow(FOLLOW_4); rule__Greeting__Group__1__Impl(); @@ -341,21 +341,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__1__Impl" - // InternalNoJdtTestLanguage.g:141:1: rule__Greeting__Group__1__Impl : ( ( rule__Greeting__NameAssignment_1 ) ) ; + // InternalNoJdtTestLanguage.g:142:1: rule__Greeting__Group__1__Impl : ( ( rule__Greeting__NameAssignment_1 ) ) ; public final void rule__Greeting__Group__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:145:1: ( ( ( rule__Greeting__NameAssignment_1 ) ) ) - // InternalNoJdtTestLanguage.g:146:1: ( ( rule__Greeting__NameAssignment_1 ) ) + // InternalNoJdtTestLanguage.g:146:1: ( ( ( rule__Greeting__NameAssignment_1 ) ) ) + // InternalNoJdtTestLanguage.g:147:1: ( ( rule__Greeting__NameAssignment_1 ) ) { - // InternalNoJdtTestLanguage.g:146:1: ( ( rule__Greeting__NameAssignment_1 ) ) - // InternalNoJdtTestLanguage.g:147:2: ( rule__Greeting__NameAssignment_1 ) + // InternalNoJdtTestLanguage.g:147:1: ( ( rule__Greeting__NameAssignment_1 ) ) + // InternalNoJdtTestLanguage.g:148:2: ( rule__Greeting__NameAssignment_1 ) { before(grammarAccess.getGreetingAccess().getNameAssignment_1()); - // InternalNoJdtTestLanguage.g:148:2: ( rule__Greeting__NameAssignment_1 ) - // InternalNoJdtTestLanguage.g:148:3: rule__Greeting__NameAssignment_1 + // InternalNoJdtTestLanguage.g:149:2: ( rule__Greeting__NameAssignment_1 ) + // InternalNoJdtTestLanguage.g:149:3: rule__Greeting__NameAssignment_1 { pushFollow(FOLLOW_2); rule__Greeting__NameAssignment_1(); @@ -388,14 +388,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__2" - // InternalNoJdtTestLanguage.g:156:1: rule__Greeting__Group__2 : rule__Greeting__Group__2__Impl rule__Greeting__Group__3 ; + // InternalNoJdtTestLanguage.g:157:1: rule__Greeting__Group__2 : rule__Greeting__Group__2__Impl rule__Greeting__Group__3 ; public final void rule__Greeting__Group__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:160:1: ( rule__Greeting__Group__2__Impl rule__Greeting__Group__3 ) - // InternalNoJdtTestLanguage.g:161:2: rule__Greeting__Group__2__Impl rule__Greeting__Group__3 + // InternalNoJdtTestLanguage.g:161:1: ( rule__Greeting__Group__2__Impl rule__Greeting__Group__3 ) + // InternalNoJdtTestLanguage.g:162:2: rule__Greeting__Group__2__Impl rule__Greeting__Group__3 { pushFollow(FOLLOW_4); rule__Greeting__Group__2__Impl(); @@ -426,20 +426,20 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__2__Impl" - // InternalNoJdtTestLanguage.g:168:1: rule__Greeting__Group__2__Impl : ( ( rule__Greeting__Group_2__0 )? ) ; + // InternalNoJdtTestLanguage.g:169:1: rule__Greeting__Group__2__Impl : ( ( rule__Greeting__Group_2__0 )? ) ; public final void rule__Greeting__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:172:1: ( ( ( rule__Greeting__Group_2__0 )? ) ) - // InternalNoJdtTestLanguage.g:173:1: ( ( rule__Greeting__Group_2__0 )? ) + // InternalNoJdtTestLanguage.g:173:1: ( ( ( rule__Greeting__Group_2__0 )? ) ) + // InternalNoJdtTestLanguage.g:174:1: ( ( rule__Greeting__Group_2__0 )? ) { - // InternalNoJdtTestLanguage.g:173:1: ( ( rule__Greeting__Group_2__0 )? ) - // InternalNoJdtTestLanguage.g:174:2: ( rule__Greeting__Group_2__0 )? + // InternalNoJdtTestLanguage.g:174:1: ( ( rule__Greeting__Group_2__0 )? ) + // InternalNoJdtTestLanguage.g:175:2: ( rule__Greeting__Group_2__0 )? { before(grammarAccess.getGreetingAccess().getGroup_2()); - // InternalNoJdtTestLanguage.g:175:2: ( rule__Greeting__Group_2__0 )? + // InternalNoJdtTestLanguage.g:176:2: ( rule__Greeting__Group_2__0 )? int alt1=2; int LA1_0 = input.LA(1); @@ -448,7 +448,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi } switch (alt1) { case 1 : - // InternalNoJdtTestLanguage.g:175:3: rule__Greeting__Group_2__0 + // InternalNoJdtTestLanguage.g:176:3: rule__Greeting__Group_2__0 { pushFollow(FOLLOW_2); rule__Greeting__Group_2__0(); @@ -484,14 +484,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__3" - // InternalNoJdtTestLanguage.g:183:1: rule__Greeting__Group__3 : rule__Greeting__Group__3__Impl ; + // InternalNoJdtTestLanguage.g:184:1: rule__Greeting__Group__3 : rule__Greeting__Group__3__Impl ; public final void rule__Greeting__Group__3() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:187:1: ( rule__Greeting__Group__3__Impl ) - // InternalNoJdtTestLanguage.g:188:2: rule__Greeting__Group__3__Impl + // InternalNoJdtTestLanguage.g:188:1: ( rule__Greeting__Group__3__Impl ) + // InternalNoJdtTestLanguage.g:189:2: rule__Greeting__Group__3__Impl { pushFollow(FOLLOW_2); rule__Greeting__Group__3__Impl(); @@ -517,17 +517,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group__3__Impl" - // InternalNoJdtTestLanguage.g:194:1: rule__Greeting__Group__3__Impl : ( '!' ) ; + // InternalNoJdtTestLanguage.g:195:1: rule__Greeting__Group__3__Impl : ( '!' ) ; public final void rule__Greeting__Group__3__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:198:1: ( ( '!' ) ) - // InternalNoJdtTestLanguage.g:199:1: ( '!' ) + // InternalNoJdtTestLanguage.g:199:1: ( ( '!' ) ) + // InternalNoJdtTestLanguage.g:200:1: ( '!' ) { - // InternalNoJdtTestLanguage.g:199:1: ( '!' ) - // InternalNoJdtTestLanguage.g:200:2: '!' + // InternalNoJdtTestLanguage.g:200:1: ( '!' ) + // InternalNoJdtTestLanguage.g:201:2: '!' { before(grammarAccess.getGreetingAccess().getExclamationMarkKeyword_3()); match(input,12,FOLLOW_2); @@ -554,14 +554,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__0" - // InternalNoJdtTestLanguage.g:210:1: rule__Greeting__Group_2__0 : rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 ; + // InternalNoJdtTestLanguage.g:211:1: rule__Greeting__Group_2__0 : rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 ; public final void rule__Greeting__Group_2__0() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:214:1: ( rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 ) - // InternalNoJdtTestLanguage.g:215:2: rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 + // InternalNoJdtTestLanguage.g:215:1: ( rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 ) + // InternalNoJdtTestLanguage.g:216:2: rule__Greeting__Group_2__0__Impl rule__Greeting__Group_2__1 { pushFollow(FOLLOW_5); rule__Greeting__Group_2__0__Impl(); @@ -592,17 +592,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__0__Impl" - // InternalNoJdtTestLanguage.g:222:1: rule__Greeting__Group_2__0__Impl : ( '(' ) ; + // InternalNoJdtTestLanguage.g:223:1: rule__Greeting__Group_2__0__Impl : ( '(' ) ; public final void rule__Greeting__Group_2__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:226:1: ( ( '(' ) ) - // InternalNoJdtTestLanguage.g:227:1: ( '(' ) + // InternalNoJdtTestLanguage.g:227:1: ( ( '(' ) ) + // InternalNoJdtTestLanguage.g:228:1: ( '(' ) { - // InternalNoJdtTestLanguage.g:227:1: ( '(' ) - // InternalNoJdtTestLanguage.g:228:2: '(' + // InternalNoJdtTestLanguage.g:228:1: ( '(' ) + // InternalNoJdtTestLanguage.g:229:2: '(' { before(grammarAccess.getGreetingAccess().getLeftParenthesisKeyword_2_0()); match(input,13,FOLLOW_2); @@ -629,14 +629,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__1" - // InternalNoJdtTestLanguage.g:237:1: rule__Greeting__Group_2__1 : rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 ; + // InternalNoJdtTestLanguage.g:238:1: rule__Greeting__Group_2__1 : rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 ; public final void rule__Greeting__Group_2__1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:241:1: ( rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 ) - // InternalNoJdtTestLanguage.g:242:2: rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 + // InternalNoJdtTestLanguage.g:242:1: ( rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 ) + // InternalNoJdtTestLanguage.g:243:2: rule__Greeting__Group_2__1__Impl rule__Greeting__Group_2__2 { pushFollow(FOLLOW_3); rule__Greeting__Group_2__1__Impl(); @@ -667,17 +667,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__1__Impl" - // InternalNoJdtTestLanguage.g:249:1: rule__Greeting__Group_2__1__Impl : ( 'from' ) ; + // InternalNoJdtTestLanguage.g:250:1: rule__Greeting__Group_2__1__Impl : ( 'from' ) ; public final void rule__Greeting__Group_2__1__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:253:1: ( ( 'from' ) ) - // InternalNoJdtTestLanguage.g:254:1: ( 'from' ) + // InternalNoJdtTestLanguage.g:254:1: ( ( 'from' ) ) + // InternalNoJdtTestLanguage.g:255:1: ( 'from' ) { - // InternalNoJdtTestLanguage.g:254:1: ( 'from' ) - // InternalNoJdtTestLanguage.g:255:2: 'from' + // InternalNoJdtTestLanguage.g:255:1: ( 'from' ) + // InternalNoJdtTestLanguage.g:256:2: 'from' { before(grammarAccess.getGreetingAccess().getFromKeyword_2_1()); match(input,14,FOLLOW_2); @@ -704,14 +704,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__2" - // InternalNoJdtTestLanguage.g:264:1: rule__Greeting__Group_2__2 : rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 ; + // InternalNoJdtTestLanguage.g:265:1: rule__Greeting__Group_2__2 : rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 ; public final void rule__Greeting__Group_2__2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:268:1: ( rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 ) - // InternalNoJdtTestLanguage.g:269:2: rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 + // InternalNoJdtTestLanguage.g:269:1: ( rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 ) + // InternalNoJdtTestLanguage.g:270:2: rule__Greeting__Group_2__2__Impl rule__Greeting__Group_2__3 { pushFollow(FOLLOW_6); rule__Greeting__Group_2__2__Impl(); @@ -742,21 +742,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__2__Impl" - // InternalNoJdtTestLanguage.g:276:1: rule__Greeting__Group_2__2__Impl : ( ( rule__Greeting__OtherAssignment_2_2 ) ) ; + // InternalNoJdtTestLanguage.g:277:1: rule__Greeting__Group_2__2__Impl : ( ( rule__Greeting__OtherAssignment_2_2 ) ) ; public final void rule__Greeting__Group_2__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:280:1: ( ( ( rule__Greeting__OtherAssignment_2_2 ) ) ) - // InternalNoJdtTestLanguage.g:281:1: ( ( rule__Greeting__OtherAssignment_2_2 ) ) + // InternalNoJdtTestLanguage.g:281:1: ( ( ( rule__Greeting__OtherAssignment_2_2 ) ) ) + // InternalNoJdtTestLanguage.g:282:1: ( ( rule__Greeting__OtherAssignment_2_2 ) ) { - // InternalNoJdtTestLanguage.g:281:1: ( ( rule__Greeting__OtherAssignment_2_2 ) ) - // InternalNoJdtTestLanguage.g:282:2: ( rule__Greeting__OtherAssignment_2_2 ) + // InternalNoJdtTestLanguage.g:282:1: ( ( rule__Greeting__OtherAssignment_2_2 ) ) + // InternalNoJdtTestLanguage.g:283:2: ( rule__Greeting__OtherAssignment_2_2 ) { before(grammarAccess.getGreetingAccess().getOtherAssignment_2_2()); - // InternalNoJdtTestLanguage.g:283:2: ( rule__Greeting__OtherAssignment_2_2 ) - // InternalNoJdtTestLanguage.g:283:3: rule__Greeting__OtherAssignment_2_2 + // InternalNoJdtTestLanguage.g:284:2: ( rule__Greeting__OtherAssignment_2_2 ) + // InternalNoJdtTestLanguage.g:284:3: rule__Greeting__OtherAssignment_2_2 { pushFollow(FOLLOW_2); rule__Greeting__OtherAssignment_2_2(); @@ -789,14 +789,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__3" - // InternalNoJdtTestLanguage.g:291:1: rule__Greeting__Group_2__3 : rule__Greeting__Group_2__3__Impl ; + // InternalNoJdtTestLanguage.g:292:1: rule__Greeting__Group_2__3 : rule__Greeting__Group_2__3__Impl ; public final void rule__Greeting__Group_2__3() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:295:1: ( rule__Greeting__Group_2__3__Impl ) - // InternalNoJdtTestLanguage.g:296:2: rule__Greeting__Group_2__3__Impl + // InternalNoJdtTestLanguage.g:296:1: ( rule__Greeting__Group_2__3__Impl ) + // InternalNoJdtTestLanguage.g:297:2: rule__Greeting__Group_2__3__Impl { pushFollow(FOLLOW_2); rule__Greeting__Group_2__3__Impl(); @@ -822,17 +822,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__Group_2__3__Impl" - // InternalNoJdtTestLanguage.g:302:1: rule__Greeting__Group_2__3__Impl : ( ')' ) ; + // InternalNoJdtTestLanguage.g:303:1: rule__Greeting__Group_2__3__Impl : ( ')' ) ; public final void rule__Greeting__Group_2__3__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:306:1: ( ( ')' ) ) - // InternalNoJdtTestLanguage.g:307:1: ( ')' ) + // InternalNoJdtTestLanguage.g:307:1: ( ( ')' ) ) + // InternalNoJdtTestLanguage.g:308:1: ( ')' ) { - // InternalNoJdtTestLanguage.g:307:1: ( ')' ) - // InternalNoJdtTestLanguage.g:308:2: ')' + // InternalNoJdtTestLanguage.g:308:1: ( ')' ) + // InternalNoJdtTestLanguage.g:309:2: ')' { before(grammarAccess.getGreetingAccess().getRightParenthesisKeyword_2_3()); match(input,15,FOLLOW_2); @@ -859,17 +859,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Model__GreetingsAssignment" - // InternalNoJdtTestLanguage.g:318:1: rule__Model__GreetingsAssignment : ( ruleGreeting ) ; + // InternalNoJdtTestLanguage.g:319:1: rule__Model__GreetingsAssignment : ( ruleGreeting ) ; public final void rule__Model__GreetingsAssignment() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:322:1: ( ( ruleGreeting ) ) - // InternalNoJdtTestLanguage.g:323:2: ( ruleGreeting ) + // InternalNoJdtTestLanguage.g:323:1: ( ( ruleGreeting ) ) + // InternalNoJdtTestLanguage.g:324:2: ( ruleGreeting ) { - // InternalNoJdtTestLanguage.g:323:2: ( ruleGreeting ) - // InternalNoJdtTestLanguage.g:324:3: ruleGreeting + // InternalNoJdtTestLanguage.g:324:2: ( ruleGreeting ) + // InternalNoJdtTestLanguage.g:325:3: ruleGreeting { before(grammarAccess.getModelAccess().getGreetingsGreetingParserRuleCall_0()); pushFollow(FOLLOW_2); @@ -900,17 +900,17 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__NameAssignment_1" - // InternalNoJdtTestLanguage.g:333:1: rule__Greeting__NameAssignment_1 : ( RULE_ID ) ; + // InternalNoJdtTestLanguage.g:334:1: rule__Greeting__NameAssignment_1 : ( RULE_ID ) ; public final void rule__Greeting__NameAssignment_1() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:337:1: ( ( RULE_ID ) ) - // InternalNoJdtTestLanguage.g:338:2: ( RULE_ID ) + // InternalNoJdtTestLanguage.g:338:1: ( ( RULE_ID ) ) + // InternalNoJdtTestLanguage.g:339:2: ( RULE_ID ) { - // InternalNoJdtTestLanguage.g:338:2: ( RULE_ID ) - // InternalNoJdtTestLanguage.g:339:3: RULE_ID + // InternalNoJdtTestLanguage.g:339:2: ( RULE_ID ) + // InternalNoJdtTestLanguage.g:340:3: RULE_ID { before(grammarAccess.getGreetingAccess().getNameIDTerminalRuleCall_1_0()); match(input,RULE_ID,FOLLOW_2); @@ -937,21 +937,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalContentAssi // $ANTLR start "rule__Greeting__OtherAssignment_2_2" - // InternalNoJdtTestLanguage.g:348:1: rule__Greeting__OtherAssignment_2_2 : ( ( RULE_ID ) ) ; + // InternalNoJdtTestLanguage.g:349:1: rule__Greeting__OtherAssignment_2_2 : ( ( RULE_ID ) ) ; public final void rule__Greeting__OtherAssignment_2_2() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalNoJdtTestLanguage.g:352:1: ( ( ( RULE_ID ) ) ) - // InternalNoJdtTestLanguage.g:353:2: ( ( RULE_ID ) ) + // InternalNoJdtTestLanguage.g:353:1: ( ( ( RULE_ID ) ) ) + // InternalNoJdtTestLanguage.g:354:2: ( ( RULE_ID ) ) { - // InternalNoJdtTestLanguage.g:353:2: ( ( RULE_ID ) ) - // InternalNoJdtTestLanguage.g:354:3: ( RULE_ID ) + // InternalNoJdtTestLanguage.g:354:2: ( ( RULE_ID ) ) + // InternalNoJdtTestLanguage.g:355:3: ( RULE_ID ) { before(grammarAccess.getGreetingAccess().getOtherGreetingCrossReference_2_2_0()); - // InternalNoJdtTestLanguage.g:355:3: ( RULE_ID ) - // InternalNoJdtTestLanguage.g:356:4: RULE_ID + // InternalNoJdtTestLanguage.g:356:3: ( RULE_ID ) + // InternalNoJdtTestLanguage.g:357:4: RULE_ID { before(grammarAccess.getGreetingAccess().getOtherGreetingIDTerminalRuleCall_2_2_0_1()); match(input,RULE_ID,FOLLOW_2); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguage.g b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguage.g index b8b5b9fdd..dc640dd1c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguage.g +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguage.g @@ -5,6 +5,7 @@ grammar InternalNoJdtTestLanguage; options { superClass=AbstractInternalAntlrParser; + k=1; } @lexer::header { diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageLexer.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageLexer.java index 10f343e6b..08ea3fff6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageLexer.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageLexer.java @@ -146,10 +146,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:171:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // InternalNoJdtTestLanguage.g:171:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalNoJdtTestLanguage.g:172:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // InternalNoJdtTestLanguage.g:172:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // InternalNoJdtTestLanguage.g:171:11: ( '^' )? + // InternalNoJdtTestLanguage.g:172:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -158,7 +158,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt1) { case 1 : - // InternalNoJdtTestLanguage.g:171:11: '^' + // InternalNoJdtTestLanguage.g:172:11: '^' { match('^'); @@ -176,7 +176,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { recover(mse); throw mse;} - // InternalNoJdtTestLanguage.g:171:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // InternalNoJdtTestLanguage.g:172:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -225,10 +225,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:173:10: ( ( '0' .. '9' )+ ) - // InternalNoJdtTestLanguage.g:173:12: ( '0' .. '9' )+ + // InternalNoJdtTestLanguage.g:174:10: ( ( '0' .. '9' )+ ) + // InternalNoJdtTestLanguage.g:174:12: ( '0' .. '9' )+ { - // InternalNoJdtTestLanguage.g:173:12: ( '0' .. '9' )+ + // InternalNoJdtTestLanguage.g:174:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -242,7 +242,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt3) { case 1 : - // InternalNoJdtTestLanguage.g:173:13: '0' .. '9' + // InternalNoJdtTestLanguage.g:174:13: '0' .. '9' { matchRange('0','9'); @@ -274,10 +274,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:175:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // InternalNoJdtTestLanguage.g:175:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalNoJdtTestLanguage.g:176:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // InternalNoJdtTestLanguage.g:176:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // InternalNoJdtTestLanguage.g:175:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // InternalNoJdtTestLanguage.g:176:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -295,10 +295,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt6) { case 1 : - // InternalNoJdtTestLanguage.g:175:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // InternalNoJdtTestLanguage.g:176:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // InternalNoJdtTestLanguage.g:175:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* + // InternalNoJdtTestLanguage.g:176:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -314,7 +314,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt4) { case 1 : - // InternalNoJdtTestLanguage.g:175:21: '\\\\' . + // InternalNoJdtTestLanguage.g:176:21: '\\\\' . { match('\\'); matchAny(); @@ -322,7 +322,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:175:28: ~ ( ( '\\\\' | '\"' ) ) + // InternalNoJdtTestLanguage.g:176:28: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -347,10 +347,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:175:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // InternalNoJdtTestLanguage.g:176:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // InternalNoJdtTestLanguage.g:175:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* + // InternalNoJdtTestLanguage.g:176:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -366,7 +366,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt5) { case 1 : - // InternalNoJdtTestLanguage.g:175:54: '\\\\' . + // InternalNoJdtTestLanguage.g:176:54: '\\\\' . { match('\\'); matchAny(); @@ -374,7 +374,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } break; case 2 : - // InternalNoJdtTestLanguage.g:175:61: ~ ( ( '\\\\' | '\\'' ) ) + // InternalNoJdtTestLanguage.g:176:61: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -417,12 +417,12 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:177:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // InternalNoJdtTestLanguage.g:177:19: '/*' ( options {greedy=false; } : . )* '*/' + // InternalNoJdtTestLanguage.g:178:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // InternalNoJdtTestLanguage.g:178:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // InternalNoJdtTestLanguage.g:177:24: ( options {greedy=false; } : . )* + // InternalNoJdtTestLanguage.g:178:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -447,7 +447,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt7) { case 1 : - // InternalNoJdtTestLanguage.g:177:52: . + // InternalNoJdtTestLanguage.g:178:52: . { matchAny(); @@ -477,12 +477,12 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:179:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // InternalNoJdtTestLanguage.g:179:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // InternalNoJdtTestLanguage.g:180:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // InternalNoJdtTestLanguage.g:180:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // InternalNoJdtTestLanguage.g:179:24: (~ ( ( '\\n' | '\\r' ) ) )* + // InternalNoJdtTestLanguage.g:180:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -495,7 +495,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { switch (alt8) { case 1 : - // InternalNoJdtTestLanguage.g:179:24: ~ ( ( '\\n' | '\\r' ) ) + // InternalNoJdtTestLanguage.g:180: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)<='\uFFFF') ) { input.consume(); @@ -515,7 +515,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } } while (true); - // InternalNoJdtTestLanguage.g:179:40: ( ( '\\r' )? '\\n' )? + // InternalNoJdtTestLanguage.g:180:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -524,9 +524,9 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt10) { case 1 : - // InternalNoJdtTestLanguage.g:179:41: ( '\\r' )? '\\n' + // InternalNoJdtTestLanguage.g:180:41: ( '\\r' )? '\\n' { - // InternalNoJdtTestLanguage.g:179:41: ( '\\r' )? + // InternalNoJdtTestLanguage.g:180:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -535,7 +535,7 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { } switch (alt9) { case 1 : - // InternalNoJdtTestLanguage.g:179:41: '\\r' + // InternalNoJdtTestLanguage.g:180:41: '\\r' { match('\r'); @@ -567,10 +567,10 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:181:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // InternalNoJdtTestLanguage.g:181:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalNoJdtTestLanguage.g:182:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // InternalNoJdtTestLanguage.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // InternalNoJdtTestLanguage.g:181:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // InternalNoJdtTestLanguage.g:182:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -624,8 +624,8 @@ public class InternalNoJdtTestLanguageLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // InternalNoJdtTestLanguage.g:183:16: ( . ) - // InternalNoJdtTestLanguage.g:183:18: . + // InternalNoJdtTestLanguage.g:184:16: ( . ) + // InternalNoJdtTestLanguage.g:184:18: . { matchAny(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageParser.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageParser.java index 3b1e72102..51eec141e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageParser.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/parser/antlr/internal/InternalNoJdtTestLanguageParser.java @@ -77,7 +77,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start "entryRuleModel" - // InternalNoJdtTestLanguage.g:64:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; + // InternalNoJdtTestLanguage.g:65:1: entryRuleModel returns [EObject current=null] : iv_ruleModel= ruleModel EOF ; public final EObject entryRuleModel() throws RecognitionException { EObject current = null; @@ -85,8 +85,8 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser try { - // InternalNoJdtTestLanguage.g:64:46: (iv_ruleModel= ruleModel EOF ) - // InternalNoJdtTestLanguage.g:65:2: iv_ruleModel= ruleModel EOF + // InternalNoJdtTestLanguage.g:65:46: (iv_ruleModel= ruleModel EOF ) + // InternalNoJdtTestLanguage.g:66:2: iv_ruleModel= ruleModel EOF { newCompositeNode(grammarAccess.getModelRule()); pushFollow(FOLLOW_1); @@ -113,7 +113,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start "ruleModel" - // InternalNoJdtTestLanguage.g:71:1: ruleModel returns [EObject current=null] : ( (lv_greetings_0_0= ruleGreeting ) ) ; + // InternalNoJdtTestLanguage.g:72:1: ruleModel returns [EObject current=null] : ( (lv_greetings_0_0= ruleGreeting ) ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -124,14 +124,14 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser enterRule(); try { - // InternalNoJdtTestLanguage.g:77:2: ( ( (lv_greetings_0_0= ruleGreeting ) ) ) - // InternalNoJdtTestLanguage.g:78:2: ( (lv_greetings_0_0= ruleGreeting ) ) + // InternalNoJdtTestLanguage.g:78:2: ( ( (lv_greetings_0_0= ruleGreeting ) ) ) + // InternalNoJdtTestLanguage.g:79:2: ( (lv_greetings_0_0= ruleGreeting ) ) { - // InternalNoJdtTestLanguage.g:78:2: ( (lv_greetings_0_0= ruleGreeting ) ) - // InternalNoJdtTestLanguage.g:79:3: (lv_greetings_0_0= ruleGreeting ) + // InternalNoJdtTestLanguage.g:79:2: ( (lv_greetings_0_0= ruleGreeting ) ) + // InternalNoJdtTestLanguage.g:80:3: (lv_greetings_0_0= ruleGreeting ) { - // InternalNoJdtTestLanguage.g:79:3: (lv_greetings_0_0= ruleGreeting ) - // InternalNoJdtTestLanguage.g:80:4: lv_greetings_0_0= ruleGreeting + // InternalNoJdtTestLanguage.g:80:3: (lv_greetings_0_0= ruleGreeting ) + // InternalNoJdtTestLanguage.g:81:4: lv_greetings_0_0= ruleGreeting { newCompositeNode(grammarAccess.getModelAccess().getGreetingsGreetingParserRuleCall_0()); @@ -178,7 +178,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start "entryRuleGreeting" - // InternalNoJdtTestLanguage.g:100:1: entryRuleGreeting returns [EObject current=null] : iv_ruleGreeting= ruleGreeting EOF ; + // InternalNoJdtTestLanguage.g:101:1: entryRuleGreeting returns [EObject current=null] : iv_ruleGreeting= ruleGreeting EOF ; public final EObject entryRuleGreeting() throws RecognitionException { EObject current = null; @@ -186,8 +186,8 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser try { - // InternalNoJdtTestLanguage.g:100:49: (iv_ruleGreeting= ruleGreeting EOF ) - // InternalNoJdtTestLanguage.g:101:2: iv_ruleGreeting= ruleGreeting EOF + // InternalNoJdtTestLanguage.g:101:49: (iv_ruleGreeting= ruleGreeting EOF ) + // InternalNoJdtTestLanguage.g:102:2: iv_ruleGreeting= ruleGreeting EOF { newCompositeNode(grammarAccess.getGreetingRule()); pushFollow(FOLLOW_1); @@ -214,7 +214,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser // $ANTLR start "ruleGreeting" - // InternalNoJdtTestLanguage.g:107:1: ruleGreeting returns [EObject current=null] : (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) ; + // InternalNoJdtTestLanguage.g:108:1: ruleGreeting returns [EObject current=null] : (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) ; public final EObject ruleGreeting() throws RecognitionException { EObject current = null; @@ -230,21 +230,21 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser enterRule(); try { - // InternalNoJdtTestLanguage.g:113:2: ( (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) ) - // InternalNoJdtTestLanguage.g:114:2: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) + // InternalNoJdtTestLanguage.g:114:2: ( (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) ) + // InternalNoJdtTestLanguage.g:115:2: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) { - // InternalNoJdtTestLanguage.g:114:2: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) - // InternalNoJdtTestLanguage.g:115:3: otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' + // InternalNoJdtTestLanguage.g:115:2: (otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' ) + // InternalNoJdtTestLanguage.g:116:3: otherlv_0= 'Hello' ( (lv_name_1_0= RULE_ID ) ) (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? otherlv_6= '!' { otherlv_0=(Token)match(input,11,FOLLOW_3); newLeafNode(otherlv_0, grammarAccess.getGreetingAccess().getHelloKeyword_0()); - // InternalNoJdtTestLanguage.g:119:3: ( (lv_name_1_0= RULE_ID ) ) - // InternalNoJdtTestLanguage.g:120:4: (lv_name_1_0= RULE_ID ) + // InternalNoJdtTestLanguage.g:120:3: ( (lv_name_1_0= RULE_ID ) ) + // InternalNoJdtTestLanguage.g:121:4: (lv_name_1_0= RULE_ID ) { - // InternalNoJdtTestLanguage.g:120:4: (lv_name_1_0= RULE_ID ) - // InternalNoJdtTestLanguage.g:121:5: lv_name_1_0= RULE_ID + // InternalNoJdtTestLanguage.g:121:4: (lv_name_1_0= RULE_ID ) + // InternalNoJdtTestLanguage.g:122:5: lv_name_1_0= RULE_ID { lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); @@ -266,7 +266,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser } - // InternalNoJdtTestLanguage.g:137:3: (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? + // InternalNoJdtTestLanguage.g:138:3: (otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' )? int alt1=2; int LA1_0 = input.LA(1); @@ -275,7 +275,7 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser } switch (alt1) { case 1 : - // InternalNoJdtTestLanguage.g:138:4: otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' + // InternalNoJdtTestLanguage.g:139:4: otherlv_2= '(' otherlv_3= 'from' ( (otherlv_4= RULE_ID ) ) otherlv_5= ')' { otherlv_2=(Token)match(input,12,FOLLOW_5); @@ -285,11 +285,11 @@ public class InternalNoJdtTestLanguageParser extends AbstractInternalAntlrParser newLeafNode(otherlv_3, grammarAccess.getGreetingAccess().getFromKeyword_2_1()); - // InternalNoJdtTestLanguage.g:146:4: ( (otherlv_4= RULE_ID ) ) - // InternalNoJdtTestLanguage.g:147:5: (otherlv_4= RULE_ID ) + // InternalNoJdtTestLanguage.g:147:4: ( (otherlv_4= RULE_ID ) ) + // InternalNoJdtTestLanguage.g:148:5: (otherlv_4= RULE_ID ) { - // InternalNoJdtTestLanguage.g:147:5: (otherlv_4= RULE_ID ) - // InternalNoJdtTestLanguage.g:148:6: otherlv_4= RULE_ID + // InternalNoJdtTestLanguage.g:148:5: (otherlv_4= RULE_ID ) + // InternalNoJdtTestLanguage.g:149:6: otherlv_4= RULE_ID { if (current==null) { diff --git a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 index 34f93d959..2b11be7ac 100644 --- a/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 +++ b/org.eclipse.xtext.testlanguages/src/org/eclipse/xtext/testlanguages/noJdt/NoJdtTestLanguage.mwe2 @@ -27,9 +27,9 @@ XtextGeneratorLanguage { // The antlr parser generator fragment. fragment = parser.antlr.XtextAntlrGeneratorFragment2 auto-inject { - // options = { - // backtrack = true - // } + options = { + k = 1 + } } // fragment = org.eclipse.xtext.generator.parser.antlr.XtextAntlrGeneratorComparisonFragment {} diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend index 0d9383e41..658f22582 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -115,7 +115,7 @@ abstract class AbstractAntlrGrammarGenerator { memoize=true; «ENDIF» «IF options.k >= 0» - memoize=«options.k»; + k=«options.k»; «ENDIF» «ENDIF» } diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java index 52c92a623..95d8e2976 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others. + * Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License 2.0 which is available at * http://www.eclipse.org/legal/epl-2.0. @@ -217,7 +217,7 @@ public abstract class AbstractAntlrGrammarGenerator { boolean _greaterEqualsThan = (_k >= 0); if (_greaterEqualsThan) { _builder.append("\t"); - _builder.append("memoize="); + _builder.append("k="); int _k_1 = options.getK(); _builder.append(_k_1, "\t"); _builder.append(";");