diff options
Diffstat (limited to 'plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org')
10 files changed, 992 insertions, 821 deletions
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtextbin Binary files differindex 13fff8c5c..0e4269732 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBase.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseGrammarResource.java index fd4a7057c..da6b0407c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseGrammarResource.java @@ -461,7 +461,7 @@ public class QVTcoreBaseGrammarResource extends AbstractGrammarResource PR_Identifier.setAlternatives(createRuleCall(PR_ID)); PR_LOWER.setAlternatives(createRuleCall(TR_INT)); PR_MultiplicityBoundsCS.setAlternatives(createGroup(createAssignment("lowerBound", "=", createRuleCall(PR_LOWER)), setCardinality("?", createGroup(createKeyword(".."), createAssignment("upperBound", "=", createRuleCall(PR_UPPER)))))); - PR_MultiplicityCS.setAlternatives(createGroup(createKeyword("["), createAlternatives(createRuleCall(PR_MultiplicityBoundsCS), createRuleCall(PR_MultiplicityStringCS)), createKeyword("]"))); + PR_MultiplicityCS.setAlternatives(createGroup(createKeyword("["), createAlternatives(createRuleCall(PR_MultiplicityBoundsCS), createRuleCall(PR_MultiplicityStringCS)), setCardinality("?", createAlternatives(createKeyword("|?"), createAssignment("isNullFree", "?=", createKeyword("|1")))), createKeyword("]"))); PR_MultiplicityStringCS.setAlternatives(createAssignment("stringBounds", "=", createAlternatives(createKeyword("*"), createKeyword("+"), createKeyword("?")))); PR_NUMBER_LITERAL.setAlternatives(createRuleCall(TR_INT)); PR_NextPathElementCS.setAlternatives(createAssignment("referredElement", "=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.NAMED_ELEMENT), createRuleCall(_EssentialOCL.PR_UnreservedName)))); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseStandaloneSetupGenerated.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseStandaloneSetupGenerated.java index 58e84fc20..2aca56a6e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseStandaloneSetupGenerated.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/QVTcoreBaseStandaloneSetupGenerated.java @@ -4,28 +4,18 @@ package org.eclipse.qvtd.xtext.qvtcorebase; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.xtext.ISetup; - +import org.eclipse.emf.ecore.resource.Resource; import com.google.inject.Guice; import com.google.inject.Injector; -import java.util.List; -import java.util.Arrays; - /** * Generated from StandaloneSetup.xpt! */ @SuppressWarnings("all") public class QVTcoreBaseStandaloneSetupGenerated implements ISetup { - /** - * */ - public List<String> getFileExtensions() { - return Arrays.asList("qvtcb"); - } - @Override public Injector createInjectorAndDoEMFRegistration() { org.eclipse.ocl.xtext.essentialocl.EssentialOCLStandaloneSetup.doSetup(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g index 566213115..f5baa0010 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g @@ -5588,9 +5588,29 @@ ruleMultiplicityCS returns [EObject current=null] $current = $this_MultiplicityStringCS_2.current; afterParserOrEnumRuleCall(); } -) otherlv_3=']' +)( otherlv_3='|?' { - newLeafNode(otherlv_3, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_2()); + newLeafNode(otherlv_3, grammarAccess.getMultiplicityCSAccess().getVerticalLineQuestionMarkKeyword_2_0()); + } + + |( +( + lv_isNullFree_4_0= '|1' + { + newLeafNode(lv_isNullFree_4_0, grammarAccess.getMultiplicityCSAccess().getIsNullFree1Keyword_2_1_0()); + } + + { + if ($current==null) { + $current = createModelElement(grammarAccess.getMultiplicityCSRule()); + } + setWithLastConsumed($current, "isNullFree", true, "|1"); + } + +) +))? otherlv_5=']' + { + newLeafNode(otherlv_5, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_3()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.tokens b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.tokens index 2ed54a2f6..3034e1ab6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.tokens +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.tokens @@ -1,4 +1,4 @@ -'&&'=94 +'&&'=96 '('=22 ')'=23 '*'=40 @@ -21,7 +21,7 @@ '='=47 '>'=43 '>='=45 -'?'=92 +'?'=94 '?->'=56 '?.'=55 '@'=80 @@ -50,7 +50,7 @@ 'elseif'=89 'endif'=88 'enforce'=31 -'extends'=93 +'extends'=95 'false'=77 'if'=85 'implies'=52 @@ -76,6 +76,8 @@ 'xor'=51 '{'=16 '|'=18 +'|1'=93 +'|?'=92 '}'=19 RULE_ANY_OTHER=15 RULE_DOUBLE_QUOTED_STRING=10 @@ -168,3 +170,5 @@ T__91=91 T__92=92 T__93=93 T__94=94 +T__95=95 +T__96=96 diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseLexer.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseLexer.java index 6c51ede46..041dfd93c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseLexer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseLexer.java @@ -37,6 +37,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { public static final int T__18=18; public static final int T__17=17; public static final int RULE_SIMPLE_ID=4; + public static final int T__96=96; + public static final int T__95=95; public static final int T__80=80; public static final int T__81=81; public static final int T__82=82; @@ -84,8 +86,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { public static final int T__42=42; public static final int T__43=43; public static final int T__40=40; - public static final int T__41=41; public static final int RULE_ML_SINGLE_QUOTED_STRING=11; + public static final int T__41=41; public static final int T__46=46; public static final int T__47=47; public static final int T__44=44; @@ -1700,10 +1702,11 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = T__92; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:87:7: ( '?' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:87:9: '?' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:87:7: ( '|?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:87:9: '|?' { - match('?'); + match("|?"); + } @@ -1720,10 +1723,10 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:88:7: ( 'extends' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:88:9: 'extends' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:88:7: ( '|1' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:88:9: '|1' { - match("extends"); + match("|1"); } @@ -1741,8 +1744,49 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:89:7: ( '&&' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:89:9: '&&' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:89:7: ( '?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:89:9: '?' + { + match('?'); + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__94" + + // $ANTLR start "T__95" + public final void mT__95() throws RecognitionException { + try { + int _type = T__95; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:90:7: ( 'extends' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:90:9: 'extends' + { + match("extends"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__95" + + // $ANTLR start "T__96" + public final void mT__96() throws RecognitionException { + try { + int _type = T__96; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:91:7: ( '&&' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:91:9: '&&' { match("&&"); @@ -1755,13 +1799,13 @@ public class InternalQVTcoreBaseLexer extends Lexer { finally { } } - // $ANTLR end "T__94" + // $ANTLR end "T__96" // $ANTLR start "RULE_ESCAPED_CHARACTER" public final void mRULE_ESCAPED_CHARACTER() throws RecognitionException { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6422:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6422:35: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6442:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6442:35: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { 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' && input.LA(1)<='u') ) { @@ -1785,8 +1829,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { // $ANTLR start "RULE_LETTER_CHARACTER" public final void mRULE_LETTER_CHARACTER() throws RecognitionException { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6424:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6424:34: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6444:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6444:34: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) { if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) { input.consume(); @@ -1811,11 +1855,11 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_DOUBLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6426:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6426:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6446:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6446:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6426:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6446:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* loop1: do { int alt1=3; @@ -1831,14 +1875,14 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt1) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6426:34: RULE_ESCAPED_CHARACTER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6446:34: RULE_ESCAPED_CHARACTER { mRULE_ESCAPED_CHARACTER(); } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6426:57: ~ ( ( '\\\\' | '\"' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6446:57: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1875,11 +1919,11 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_SINGLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6448:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6448:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6448:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* loop2: do { int alt2=3; @@ -1895,14 +1939,14 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt2) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:35: RULE_ESCAPED_CHARACTER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6448:35: RULE_ESCAPED_CHARACTER { mRULE_ESCAPED_CHARACTER(); } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:58: ~ ( ( '\\\\' | '\\'' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6448:58: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1939,12 +1983,12 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_ML_SINGLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6430:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6430:32: '/\\'' ( options {greedy=false; } : . )* '\\'/' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6450:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6450:32: '/\\'' ( options {greedy=false; } : . )* '\\'/' { match("/'"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6430:38: ( options {greedy=false; } : . )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6450:38: ( options {greedy=false; } : . )* loop3: do { int alt3=2; @@ -1969,7 +2013,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt3) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6430:66: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6450:66: . { matchAny(); @@ -1999,11 +2043,11 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_SIMPLE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6432:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6432:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6452:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6452:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* { mRULE_LETTER_CHARACTER(); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6432:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6452:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )* loop4: do { int alt4=2; @@ -2052,8 +2096,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_ESCAPED_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6434:17: ( '_' RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6434:19: '_' RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6454:17: ( '_' RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6454:19: '_' RULE_SINGLE_QUOTED_STRING { match('_'); mRULE_SINGLE_QUOTED_STRING(); @@ -2073,10 +2117,10 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6436:10: ( ( '0' .. '9' )+ ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6436:12: ( '0' .. '9' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6456:10: ( ( '0' .. '9' )+ ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6456:12: ( '0' .. '9' )+ { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6436:12: ( '0' .. '9' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6456:12: ( '0' .. '9' )+ int cnt5=0; loop5: do { @@ -2090,7 +2134,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt5) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6436:13: '0' .. '9' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6456:13: '0' .. '9' { matchRange('0','9'); @@ -2122,12 +2166,12 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6438:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6438:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6458:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6458:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6438:24: ( options {greedy=false; } : . )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6458:24: ( options {greedy=false; } : . )* loop6: do { int alt6=2; @@ -2152,7 +2196,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt6) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6438:52: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6458:52: . { matchAny(); @@ -2182,12 +2226,12 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("--"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:24: (~ ( ( '\\n' | '\\r' ) ) )* loop7: do { int alt7=2; @@ -2200,7 +2244,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { switch (alt7) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:24: ~ ( ( '\\n' | '\\r' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460: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(); @@ -2220,7 +2264,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { } } while (true); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:40: ( ( '\\r' )? '\\n' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:40: ( ( '\\r' )? '\\n' )? int alt9=2; int LA9_0 = input.LA(1); @@ -2229,9 +2273,9 @@ public class InternalQVTcoreBaseLexer extends Lexer { } switch (alt9) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:41: ( '\\r' )? '\\n' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:41: ( '\\r' )? '\\n' { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:41: ( '\\r' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:41: ( '\\r' )? int alt8=2; int LA8_0 = input.LA(1); @@ -2240,7 +2284,7 @@ public class InternalQVTcoreBaseLexer extends Lexer { } switch (alt8) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6440:41: '\\r' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6460:41: '\\r' { match('\r'); @@ -2272,10 +2316,10 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6442:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6442:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6462:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6462:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6442:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6462:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt10=0; loop10: do { @@ -2329,8 +2373,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6444:16: ( . ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6444:18: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6464:16: ( . ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6464:18: . { matchAny(); @@ -2345,8 +2389,8 @@ public class InternalQVTcoreBaseLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:8: ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt11=89; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:8: ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt11=91; alt11 = dfa11.predict(input); switch (alt11) { case 1 : @@ -2903,70 +2947,84 @@ public class InternalQVTcoreBaseLexer extends Lexer { } break; case 80 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:484: RULE_DOUBLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:484: T__95 { - mRULE_DOUBLE_QUOTED_STRING(); + mT__95(); } break; case 81 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:510: RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:490: T__96 { - mRULE_SINGLE_QUOTED_STRING(); + mT__96(); } break; case 82 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:536: RULE_ML_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:496: RULE_DOUBLE_QUOTED_STRING { - mRULE_ML_SINGLE_QUOTED_STRING(); + mRULE_DOUBLE_QUOTED_STRING(); } break; case 83 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:565: RULE_SIMPLE_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:522: RULE_SINGLE_QUOTED_STRING { - mRULE_SIMPLE_ID(); + mRULE_SINGLE_QUOTED_STRING(); } break; case 84 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:580: RULE_ESCAPED_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:548: RULE_ML_SINGLE_QUOTED_STRING { - mRULE_ESCAPED_ID(); + mRULE_ML_SINGLE_QUOTED_STRING(); } break; case 85 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:596: RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:577: RULE_SIMPLE_ID { - mRULE_INT(); + mRULE_SIMPLE_ID(); } break; case 86 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:605: RULE_ML_COMMENT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:592: RULE_ESCAPED_ID { - mRULE_ML_COMMENT(); + mRULE_ESCAPED_ID(); } break; case 87 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:621: RULE_SL_COMMENT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:608: RULE_INT { - mRULE_SL_COMMENT(); + mRULE_INT(); } break; case 88 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:637: RULE_WS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:617: RULE_ML_COMMENT { - mRULE_WS(); + mRULE_ML_COMMENT(); } break; case 89 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:645: RULE_ANY_OTHER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:633: RULE_SL_COMMENT + { + mRULE_SL_COMMENT(); + + } + break; + case 90 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:649: RULE_WS + { + mRULE_WS(); + + } + break; + case 91 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:1:657: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -2980,70 +3038,72 @@ public class InternalQVTcoreBaseLexer extends Lexer { protected DFA11 dfa11 = new DFA11(this); static final String DFA11_eotS = - "\5\uffff\2\77\2\uffff\1\105\1\uffff\10\77\1\125\1\77\1\uffff\1\133\1\135\1\137\1\143\1\uffff\3\77\1\151\1\154\13\77\1\uffff\1\77\2\uffff\1\77\3\67\1\77\10\uffff\1\77\1\u0088\1\u0089\1\uffff\1\77\6\uffff\14\77\3\uffff\2\77\15\uffff\1\77\1\u009d\1\77\5\uffff\16\77\1\uffff\1\77\2\uffff\1\77\6\uffff\2\77\2\uffff\12\77\1\u00bd\1\u00be\4\77\1\u00c3\1\77\1\u00c5\1\uffff\1\u00c6\1\u00c7\2\77\1\u00ca\3\77\1\u00ce\7\77\1\u00d8\4\77\1\u00dd\6\77\1\u00e5\2\77\2\uffff\2\77\1\u00ea\1\u00eb\1\uffff\1\u00ec\3\uffff\2\77\1\uffff\1\77\1\u00f0\1\77\1\uffff\11\77\1\uffff\1\u00fb\3\77\1\uffff\3\77\1\u0102\1\77\1\u0104\1\77\1\uffff\2\77\1\u0108\1\77\3\uffff\1\u010a\2\77\1\uffff\11\77\1\u0116\1\uffff\1\u0118\5\77\1\uffff\1\77\1\uffff\1\u011f\2\77\1\uffff\1\77\1\uffff\2\77\1\u0125\2\77\1\u0128\4\77\1\u012d\1\uffff\1\u012e\1\uffff\1\u012f\1\u0130\1\u0131\1\u0132\1\u0133\1\u0134\1\uffff\1\u0135\1\u0136\1\77\1\u0138\1\u0139\1\uffff\2\77\1\uffff\1\77\1\u013d\2\77\12\uffff\1\77\2\uffff\1\u0141\2\77\1\uffff\3\77\1\uffff\6\77\1\u014d\1\u014e\1\u014f\2\77\3\uffff\4\77\1\u0156\1\77\1\uffff\1\77\1\u0159\1\uffff"; + "\3\uffff\1\74\1\uffff\2\101\2\uffff\1\107\1\uffff\10\101\1\127\1\101\1\uffff\1\135\1\137\1\141\1\145\1\uffff\3\101\1\153\1\156\13\101\1\uffff\1\101\2\uffff\1\101\3\67\1\101\12\uffff\1\101\1\u008a\1\u008b\1\uffff\1\101\6\uffff\14\101\3\uffff\2\101\15\uffff\1\101\1\u009f\1\101\5\uffff\16\101\1\uffff\1\101\2\uffff\1\101\6\uffff\2\101\2\uffff\12\101\1\u00bf\1\u00c0\4\101\1\u00c5\1\101\1\u00c7\1\uffff\1\u00c8\1\u00c9\2\101\1\u00cc\3\101\1\u00d0\7\101\1\u00da\4\101\1\u00df\6\101\1\u00e7\2\101\2\uffff\2\101\1\u00ec\1\u00ed\1\uffff\1\u00ee\3\uffff\2\101\1\uffff\1\101\1\u00f2\1\101\1\uffff\11\101\1\uffff\1\u00fd\3\101\1\uffff\3\101\1\u0104\1\101\1\u0106\1\101\1\uffff\2\101\1\u010a\1\101\3\uffff\1\u010c\2\101\1\uffff\11\101\1\u0118\1\uffff\1\u011a\5\101\1\uffff\1\101\1\uffff\1\u0121\2\101\1\uffff\1\101\1\uffff\2\101\1\u0127\2\101\1\u012a\4\101\1\u012f\1\uffff\1\u0130\1\uffff\1\u0131\1\u0132\1\u0133\1\u0134\1\u0135\1\u0136\1\uffff\1\u0137\1\u0138\1\101\1\u013a\1\u013b\1\uffff\2\101\1\uffff\1\101\1\u013f\2\101\12\uffff\1\101\2\uffff\1\u0143\2\101\1\uffff\3\101\1\uffff\6\101\1\u014f\1\u0150\1\u0151\2\101\3\uffff\4\101\1\u0158\1\101\1\uffff\1\101\1\u015b\1\uffff"; static final String DFA11_eofS = - "\u015a\uffff"; + "\u015c\uffff"; static final String DFA11_minS = - "\1\0\4\uffff\1\146\1\163\2\uffff\1\72\1\uffff\2\145\1\150\1\154\1\145\1\141\1\165\1\150\1\55\1\157\1\uffff\1\47\1\53\1\75\1\55\1\uffff\1\156\1\162\1\157\1\56\1\55\1\141\1\165\1\141\1\156\2\145\1\156\1\143\1\157\2\141\1\uffff\1\162\2\uffff\1\145\1\46\2\0\1\47\10\uffff\1\160\2\60\1\uffff\1\145\6\uffff\1\146\1\141\1\145\1\144\1\163\1\164\1\142\1\164\1\160\1\145\1\141\1\145\3\uffff\1\164\1\154\15\uffff\1\144\1\60\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\161\2\154\1\144\1\154\1\155\1\154\1\uffff\1\145\2\uffff\1\154\6\uffff\1\154\1\141\2\uffff\1\163\1\141\1\154\1\151\1\143\1\157\1\151\2\145\1\162\2\60\1\162\1\156\1\145\1\156\1\60\1\154\1\60\1\uffff\2\60\2\154\1\60\1\145\1\154\1\151\1\60\1\165\1\151\1\101\1\145\1\154\1\142\1\163\1\60\1\146\1\162\1\151\1\154\1\60\1\165\1\151\1\156\1\153\1\162\1\146\1\60\1\156\1\141\2\uffff\1\171\1\163\2\60\1\uffff\1\60\3\uffff\2\145\1\uffff\1\147\1\60\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\144\1\145\1\uffff\1\60\1\164\1\145\1\151\1\uffff\1\154\1\172\1\145\1\60\1\143\1\60\1\146\1\uffff\1\144\1\162\1\60\1\146\3\uffff\1\60\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\141\1\60\1\uffff\1\60\1\163\1\144\1\164\1\145\1\163\1\uffff\1\145\1\uffff\1\60\1\163\1\171\1\uffff\1\157\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\60\1\uffff\1\60\1\uffff\6\60\1\uffff\2\60\1\162\2\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\12\uffff\1\155\2\uffff\1\60\1\144\1\151\1\uffff\1\145\1\157\1\141\1\uffff\1\116\1\144\1\164\1\156\1\164\1\141\3\60\1\151\1\164\3\uffff\1\157\1\165\1\156\1\162\1\60\1\141\1\uffff\1\154\1\60\1\uffff"; + "\1\0\2\uffff\1\61\1\uffff\1\146\1\163\2\uffff\1\72\1\uffff\2\145\1\150\1\154\1\145\1\141\1\165\1\150\1\55\1\157\1\uffff\1\47\1\53\1\75\1\55\1\uffff\1\156\1\162\1\157\1\56\1\55\1\141\1\165\1\141\1\156\2\145\1\156\1\143\1\157\2\141\1\uffff\1\162\2\uffff\1\145\1\46\2\0\1\47\12\uffff\1\160\2\60\1\uffff\1\145\6\uffff\1\146\1\141\1\145\1\144\1\163\1\164\1\142\1\164\1\160\1\145\1\141\1\145\3\uffff\1\164\1\154\15\uffff\1\144\1\60\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\161\2\154\1\144\1\154\1\155\1\154\1\uffff\1\145\2\uffff\1\154\6\uffff\1\154\1\141\2\uffff\1\163\1\141\1\154\1\151\1\143\1\157\1\151\2\145\1\162\2\60\1\162\1\156\1\145\1\156\1\60\1\154\1\60\1\uffff\2\60\2\154\1\60\1\145\1\154\1\151\1\60\1\165\1\151\1\101\1\145\1\154\1\142\1\163\1\60\1\146\1\162\1\151\1\154\1\60\1\165\1\151\1\156\1\153\1\162\1\146\1\60\1\156\1\141\2\uffff\1\171\1\163\2\60\1\uffff\1\60\3\uffff\2\145\1\uffff\1\147\1\60\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\144\1\145\1\uffff\1\60\1\164\1\145\1\151\1\uffff\1\154\1\172\1\145\1\60\1\143\1\60\1\146\1\uffff\1\144\1\162\1\60\1\146\3\uffff\1\60\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\141\1\60\1\uffff\1\60\1\163\1\144\1\164\1\145\1\163\1\uffff\1\145\1\uffff\1\60\1\163\1\171\1\uffff\1\157\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\60\1\uffff\1\60\1\uffff\6\60\1\uffff\2\60\1\162\2\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\12\uffff\1\155\2\uffff\1\60\1\144\1\151\1\uffff\1\145\1\157\1\141\1\uffff\1\116\1\144\1\164\1\156\1\164\1\141\3\60\1\151\1\164\3\uffff\1\157\1\165\1\156\1\162\1\60\1\141\1\uffff\1\154\1\60\1\uffff"; static final String DFA11_maxS = - "\1\uffff\4\uffff\1\156\1\163\2\uffff\1\75\1\uffff\2\145\1\150\1\170\1\151\1\141\1\165\1\162\1\76\1\165\1\uffff\1\52\1\53\1\75\1\76\1\uffff\1\156\1\162\1\157\2\56\1\141\1\165\1\157\1\156\1\145\1\164\1\156\1\162\1\157\2\141\1\uffff\1\162\2\uffff\1\145\1\46\2\uffff\1\47\10\uffff\1\160\2\172\1\uffff\1\145\6\uffff\2\146\1\145\1\146\1\163\1\164\1\142\1\164\1\160\1\145\1\165\1\145\3\uffff\1\164\1\154\15\uffff\1\144\1\172\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\164\2\154\1\144\1\154\1\155\1\154\1\uffff\1\145\2\uffff\1\154\6\uffff\1\157\1\141\2\uffff\1\163\1\141\1\154\1\151\1\143\1\157\1\151\2\145\1\162\2\172\1\162\1\156\1\145\1\156\1\172\1\154\1\172\1\uffff\2\172\2\154\1\172\1\145\1\154\1\151\1\172\1\165\1\151\1\126\1\145\1\154\1\142\1\163\1\172\1\146\1\162\1\151\1\154\1\172\1\165\1\151\1\156\1\153\1\162\1\146\1\172\1\156\1\141\2\uffff\1\171\1\163\2\172\1\uffff\1\172\3\uffff\2\145\1\uffff\1\147\1\172\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\144\1\145\1\uffff\1\172\1\164\1\145\1\151\1\uffff\1\154\1\172\1\145\1\172\1\143\1\172\1\146\1\uffff\1\144\1\162\1\172\1\146\3\uffff\1\172\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\141\1\172\1\uffff\1\172\1\163\1\144\1\164\1\145\1\163\1\uffff\1\145\1\uffff\1\172\1\163\1\171\1\uffff\1\157\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\172\1\uffff\1\172\1\uffff\6\172\1\uffff\2\172\1\162\2\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\12\uffff\1\155\2\uffff\1\172\1\144\1\151\1\uffff\1\145\1\157\1\141\1\uffff\1\116\1\144\1\164\1\156\1\164\1\141\3\172\1\151\1\164\3\uffff\1\157\1\165\1\156\1\162\1\172\1\141\1\uffff\1\154\1\172\1\uffff"; + "\1\uffff\2\uffff\1\77\1\uffff\1\156\1\163\2\uffff\1\75\1\uffff\2\145\1\150\1\170\1\151\1\141\1\165\1\162\1\76\1\165\1\uffff\1\52\1\53\1\75\1\76\1\uffff\1\156\1\162\1\157\2\56\1\141\1\165\1\157\1\156\1\145\1\164\1\156\1\162\1\157\2\141\1\uffff\1\162\2\uffff\1\145\1\46\2\uffff\1\47\12\uffff\1\160\2\172\1\uffff\1\145\6\uffff\2\146\1\145\1\146\1\163\1\164\1\142\1\164\1\160\1\145\1\165\1\145\3\uffff\1\164\1\154\15\uffff\1\144\1\172\1\162\5\uffff\2\160\1\157\1\147\1\164\1\141\1\162\1\164\2\154\1\144\1\154\1\155\1\154\1\uffff\1\145\2\uffff\1\154\6\uffff\1\157\1\141\2\uffff\1\163\1\141\1\154\1\151\1\143\1\157\1\151\2\145\1\162\2\172\1\162\1\156\1\145\1\156\1\172\1\154\1\172\1\uffff\2\172\2\154\1\172\1\145\1\154\1\151\1\172\1\165\1\151\1\126\1\145\1\154\1\142\1\163\1\172\1\146\1\162\1\151\1\154\1\172\1\165\1\151\1\156\1\153\1\162\1\146\1\172\1\156\1\141\2\uffff\1\171\1\163\2\172\1\uffff\1\172\3\uffff\2\145\1\uffff\1\147\1\172\1\156\1\uffff\1\145\1\155\2\156\1\157\1\162\1\145\1\144\1\145\1\uffff\1\172\1\164\1\145\1\151\1\uffff\1\154\1\172\1\145\1\172\1\143\1\172\1\146\1\uffff\1\144\1\162\1\172\1\146\3\uffff\1\172\1\141\1\145\1\uffff\1\147\1\156\1\151\1\171\1\166\1\151\1\145\1\143\1\141\1\172\1\uffff\1\172\1\163\1\144\1\164\1\145\1\163\1\uffff\1\145\1\uffff\1\172\1\163\1\171\1\uffff\1\157\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\172\1\uffff\1\172\1\uffff\6\172\1\uffff\2\172\1\162\2\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\12\uffff\1\155\2\uffff\1\172\1\144\1\151\1\uffff\1\145\1\157\1\141\1\uffff\1\116\1\144\1\164\1\156\1\164\1\141\3\172\1\151\1\164\3\uffff\1\157\1\165\1\156\1\162\1\172\1\141\1\uffff\1\154\1\172\1\uffff"; static final String DFA11_acceptS = - "\1\uffff\1\1\1\2\1\3\1\4\2\uffff\1\7\1\10\1\uffff\1\12\12\uffff\1\31\4\uffff\1\40\20\uffff\1\101\1\uffff\1\103\1\104\5\uffff\1\123\1\125\1\130\1\131\1\1\1\2\1\3\1\4\3\uffff\1\123\1\uffff\1\7\1\10\1\14\1\15\1\11\1\12\14\uffff\1\47\1\127\1\27\2\uffff\1\31\1\122\1\126\1\32\1\72\1\33\1\36\1\34\1\37\1\41\1\74\1\35\1\40\3\uffff\1\71\1\46\1\50\1\51\1\115\16\uffff\1\101\1\uffff\1\103\1\104\1\uffff\1\117\1\120\1\121\1\124\1\125\1\130\2\uffff\1\105\1\106\23\uffff\1\43\37\uffff\1\113\1\23\4\uffff\1\30\1\uffff\1\42\1\44\1\52\2\uffff\1\65\3\uffff\1\64\11\uffff\1\102\4\uffff\1\6\7\uffff\1\110\4\uffff\1\75\1\107\1\100\3\uffff\1\56\12\uffff\1\114\6\uffff\1\17\1\uffff\1\111\3\uffff\1\24\1\uffff\1\53\13\uffff\1\76\1\uffff\1\21\6\uffff\1\112\5\uffff\1\57\2\uffff\1\61\4\uffff\1\73\1\5\1\45\1\77\1\13\1\16\1\25\1\20\1\116\1\22\1\uffff\1\54\1\55\3\uffff\1\63\3\uffff\1\66\13\uffff\1\62\1\70\1\67\6\uffff\1\26\2\uffff\1\60"; + "\1\uffff\1\1\1\2\1\uffff\1\4\2\uffff\1\7\1\10\1\uffff\1\12\12\uffff\1\31\4\uffff\1\40\20\uffff\1\101\1\uffff\1\103\1\104\5\uffff\1\125\1\127\1\132\1\133\1\1\1\2\1\115\1\116\1\3\1\4\3\uffff\1\125\1\uffff\1\7\1\10\1\14\1\15\1\11\1\12\14\uffff\1\47\1\131\1\27\2\uffff\1\31\1\124\1\130\1\32\1\72\1\33\1\36\1\34\1\37\1\41\1\74\1\35\1\40\3\uffff\1\71\1\46\1\50\1\51\1\117\16\uffff\1\101\1\uffff\1\103\1\104\1\uffff\1\121\1\122\1\123\1\126\1\127\1\132\2\uffff\1\105\1\106\23\uffff\1\43\37\uffff\1\113\1\23\4\uffff\1\30\1\uffff\1\42\1\44\1\52\2\uffff\1\65\3\uffff\1\64\11\uffff\1\102\4\uffff\1\6\7\uffff\1\110\4\uffff\1\75\1\107\1\100\3\uffff\1\56\12\uffff\1\114\6\uffff\1\17\1\uffff\1\111\3\uffff\1\24\1\uffff\1\53\13\uffff\1\76\1\uffff\1\21\6\uffff\1\112\5\uffff\1\57\2\uffff\1\61\4\uffff\1\73\1\5\1\45\1\77\1\13\1\16\1\25\1\20\1\120\1\22\1\uffff\1\54\1\55\3\uffff\1\63\3\uffff\1\66\13\uffff\1\62\1\70\1\67\6\uffff\1\26\2\uffff\1\60"; static final String DFA11_specialS = - "\1\1\60\uffff\1\2\1\0\u0127\uffff}>"; + "\1\1\60\uffff\1\0\1\2\u0129\uffff}>"; static final String[] DFA11_transitionS = { "\11\67\2\66\2\67\1\66\22\67\1\66\1\67\1\61\3\67\1\60\1\62\1\7\1\10\1\25\1\27\1\2\1\23\1\36\1\26\12\65\1\11\1\12\1\31\1\32\1\30\1\37\1\53\1\64\1\42\1\50\5\64\1\43\2\64\1\51\1\40\1\64\1\47\2\64\1\44\1\45\1\41\1\46\5\64\1\55\1\67\1\56\1\67\1\63\1\67\1\33\1\64\1\15\1\13\1\16\1\52\2\64\1\5\2\64\1\17\1\20\1\24\1\34\1\54\1\21\1\14\1\57\1\22\1\6\2\64\1\35\2\64\1\1\1\3\1\4\uff82\67", "", "", + "\1\73\15\uffff\1\72", "", - "", - "\1\76\6\uffff\1\74\1\75", - "\1\100", + "\1\100\6\uffff\1\76\1\77", + "\1\102", "", "", - "\1\104\2\uffff\1\103", + "\1\106\2\uffff\1\105", "", - "\1\107", - "\1\110", "\1\111", - "\1\113\1\uffff\1\112\11\uffff\1\114", - "\1\116\3\uffff\1\115", - "\1\117", - "\1\120", - "\1\122\11\uffff\1\121", - "\1\124\20\uffff\1\123", - "\1\126\5\uffff\1\127", - "", - "\1\131\2\uffff\1\132", - "\1\134", + "\1\112", + "\1\113", + "\1\115\1\uffff\1\114\11\uffff\1\116", + "\1\120\3\uffff\1\117", + "\1\121", + "\1\122", + "\1\124\11\uffff\1\123", + "\1\126\20\uffff\1\125", + "\1\130\5\uffff\1\131", + "", + "\1\133\2\uffff\1\134", "\1\136", - "\1\142\17\uffff\1\140\1\141", + "\1\140", + "\1\144\17\uffff\1\142\1\143", "", - "\1\145", - "\1\146", "\1\147", "\1\150", - "\1\153\1\152", - "\1\155", - "\1\156", - "\1\160\15\uffff\1\157", - "\1\161", - "\1\162", - "\1\164\16\uffff\1\163", - "\1\165", - "\1\166\16\uffff\1\167", - "\1\170", - "\1\171", + "\1\151", + "\1\152", + "\1\155\1\154", + "\1\157", + "\1\160", + "\1\162\15\uffff\1\161", + "\1\163", + "\1\164", + "\1\166\16\uffff\1\165", + "\1\167", + "\1\170\16\uffff\1\171", "\1\172", - "", + "\1\173", "\1\174", "", + "\1\176", + "", + "", + "\1\u0081", + "\1\u0082", + "\0\u0083", + "\0\u0084", + "\1\u0085", + "", "", - "\1\177", - "\1\u0080", - "\0\u0081", - "\0\u0082", - "\1\u0083", "", "", "", @@ -3052,34 +3112,34 @@ public class InternalQVTcoreBaseLexer extends Lexer { "", "", "", - "\1\u0086", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\25\77\1\u0087\4\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u0088", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\25\101\1\u0089\4\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\1\u008a", + "\1\u008c", "", "", "", "", "", "", - "\1\u008b", - "\1\u008c\4\uffff\1\u008d", - "\1\u008e", - "\1\u0090\1\uffff\1\u008f", - "\1\u0091", - "\1\u0092", + "\1\u008d", + "\1\u008e\4\uffff\1\u008f", + "\1\u0090", + "\1\u0092\1\uffff\1\u0091", "\1\u0093", "\1\u0094", "\1\u0095", "\1\u0096", - "\1\u0097\23\uffff\1\u0098", - "\1\u0099", + "\1\u0097", + "\1\u0098", + "\1\u0099\23\uffff\1\u009a", + "\1\u009b", "", "", "", - "\1\u009a", - "\1\u009b", + "\1\u009c", + "\1\u009d", "", "", "", @@ -3093,45 +3153,43 @@ public class InternalQVTcoreBaseLexer extends Lexer { "", "", "", - "\1\u009c", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", "\1\u009e", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u00a0", "", "", "", "", "", - "\1\u009f", - "\1\u00a0", "\1\u00a1", "\1\u00a2", "\1\u00a3", "\1\u00a4", "\1\u00a5", - "\1\u00a7\2\uffff\1\u00a6", - "\1\u00a8", - "\1\u00a9", + "\1\u00a6", + "\1\u00a7", + "\1\u00a9\2\uffff\1\u00a8", "\1\u00aa", "\1\u00ab", "\1\u00ac", "\1\u00ad", - "", "\1\u00ae", - "", - "", "\1\u00af", "", + "\1\u00b0", "", "", + "\1\u00b1", "", "", "", - "\1\u00b1\2\uffff\1\u00b0", - "\1\u00b2", "", "", - "\1\u00b3", + "", + "\1\u00b3\2\uffff\1\u00b2", "\1\u00b4", + "", + "", "\1\u00b5", "\1\u00b6", "\1\u00b7", @@ -3140,67 +3198,67 @@ public class InternalQVTcoreBaseLexer extends Lexer { "\1\u00ba", "\1\u00bb", "\1\u00bc", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u00bf", - "\1\u00c0", + "\1\u00bd", + "\1\u00be", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u00c1", "\1\u00c2", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u00c3", "\1\u00c4", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u00c6", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u00c8", - "\1\u00c9", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u00ca", "\1\u00cb", - "\1\u00cc", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u00cd", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u00ce", "\1\u00cf", - "\1\u00d0", - "\1\u00d1\7\uffff\1\u00d2\14\uffff\1\u00d3", - "\1\u00d4", - "\1\u00d5", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u00d1", + "\1\u00d2", + "\1\u00d3\7\uffff\1\u00d4\14\uffff\1\u00d5", "\1\u00d6", "\1\u00d7", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u00d8", "\1\u00d9", - "\1\u00da", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u00db", "\1\u00dc", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u00dd", "\1\u00de", - "\1\u00df", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u00e0", "\1\u00e1", "\1\u00e2", "\1\u00e3", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\10\77\1\u00e4\21\77", - "\1\u00e6", - "\1\u00e7", - "", - "", + "\1\u00e4", + "\1\u00e5", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\10\101\1\u00e6\21\101", "\1\u00e8", "\1\u00e9", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", "", + "\1\u00ea", + "\1\u00eb", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", "", - "\1\u00ed", - "\1\u00ee", "", "\1\u00ef", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u00f1", + "\1\u00f0", "", - "\1\u00f2", + "\1\u00f1", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u00f3", + "", "\1\u00f4", "\1\u00f5", "\1\u00f6", @@ -3208,33 +3266,33 @@ public class InternalQVTcoreBaseLexer extends Lexer { "\1\u00f8", "\1\u00f9", "\1\u00fa", - "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u00fb", "\1\u00fc", - "\1\u00fd", - "\1\u00fe", "", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u00fe", "\1\u00ff", "\1\u0100", + "", "\1\u0101", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u0102", "\1\u0103", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u0105", - "", - "\1\u0106", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u0107", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u0109", "", + "\1\u0108", + "\1\u0109", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u010b", "", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u010b", - "\1\u010c", "", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u010d", "\1\u010e", + "", "\1\u010f", "\1\u0110", "\1\u0111", @@ -3242,59 +3300,59 @@ public class InternalQVTcoreBaseLexer extends Lexer { "\1\u0113", "\1\u0114", "\1\u0115", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u0116", + "\1\u0117", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\22\77\1\u0117\7\77", - "\1\u0119", - "\1\u011a", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\22\101\1\u0119\7\101", "\1\u011b", "\1\u011c", "\1\u011d", - "", "\1\u011e", + "\1\u011f", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", "\1\u0120", - "\1\u0121", "", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u0122", - "", "\1\u0123", + "", "\1\u0124", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "", + "\1\u0125", "\1\u0126", - "\1\u0127", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u0128", "\1\u0129", - "\1\u012a", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u012b", "\1\u012c", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u012d", + "\1\u012e", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u0137", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", - "\1\u013a", - "\1\u013b", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u0139", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "", "\1\u013c", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u013e", - "\1\u013f", - "", + "\1\u013d", "", + "\1\u013e", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u0140", + "\1\u0141", "", "", "", @@ -3303,40 +3361,42 @@ public class InternalQVTcoreBaseLexer extends Lexer { "", "", "", - "\1\u0140", "", "", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", "\1\u0142", - "\1\u0143", "", + "", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "\1\u0144", "\1\u0145", - "\1\u0146", "", + "\1\u0146", "\1\u0147", "\1\u0148", + "", "\1\u0149", "\1\u014a", "\1\u014b", "\1\u014c", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", - "\1\u0150", - "\1\u0151", + "\1\u014d", + "\1\u014e", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u0152", + "\1\u0153", "", "", "", - "\1\u0152", - "\1\u0153", "\1\u0154", "\1\u0155", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u0156", "\1\u0157", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", + "\1\u0159", "", - "\1\u0158", - "\12\77\7\uffff\32\77\4\uffff\1\77\1\uffff\32\77", + "\1\u015a", + "\12\101\7\uffff\32\101\4\uffff\1\101\1\uffff\32\101", "" }; @@ -3370,17 +3430,17 @@ public class InternalQVTcoreBaseLexer extends Lexer { this.transition = DFA11_transition; } public String getDescription() { - return "1:1: Tokens : ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | T__46 | T__47 | T__48 | T__49 | T__50 | T__51 | T__52 | T__53 | T__54 | T__55 | T__56 | T__57 | T__58 | T__59 | T__60 | T__61 | T__62 | T__63 | T__64 | T__65 | T__66 | T__67 | T__68 | T__69 | T__70 | T__71 | T__72 | T__73 | T__74 | T__75 | T__76 | T__77 | T__78 | T__79 | T__80 | T__81 | T__82 | T__83 | T__84 | T__85 | T__86 | T__87 | T__88 | T__89 | T__90 | T__91 | T__92 | T__93 | T__94 | T__95 | T__96 | RULE_DOUBLE_QUOTED_STRING | RULE_SINGLE_QUOTED_STRING | RULE_ML_SINGLE_QUOTED_STRING | RULE_SIMPLE_ID | RULE_ESCAPED_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; int _s = s; switch ( s ) { case 0 : - int LA11_50 = input.LA(1); + int LA11_49 = input.LA(1); s = -1; - if ( ((LA11_50>='\u0000' && LA11_50<='\uFFFF')) ) {s = 130;} + if ( ((LA11_49>='\u0000' && LA11_49<='\uFFFF')) ) {s = 131;} else s = 55; @@ -3503,10 +3563,10 @@ public class InternalQVTcoreBaseLexer extends Lexer { if ( s>=0 ) return s; break; case 2 : - int LA11_49 = input.LA(1); + int LA11_50 = input.LA(1); s = -1; - if ( ((LA11_49>='\u0000' && LA11_49<='\uFFFF')) ) {s = 129;} + if ( ((LA11_50>='\u0000' && LA11_50<='\uFFFF')) ) {s = 132;} else s = 55; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseParser.java index d02a2bf6f..cb5587307 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBaseParser.java @@ -22,7 +22,7 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_SIMPLE_ID", "RULE_ESCAPED_ID", "RULE_INT", "RULE_SINGLE_QUOTED_STRING", "RULE_ESCAPED_CHARACTER", "RULE_LETTER_CHARACTER", "RULE_DOUBLE_QUOTED_STRING", "RULE_ML_SINGLE_QUOTED_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "','", "'|'", "'}'", "'imports'", "'uses'", "'('", "')'", "':'", "';'", "'default'", "':='", "'::'", "'realize'", "'check'", "'enforce'", "'import'", "'library'", "'map'", "'query'", "'refines'", "'transformation'", "'-'", "'not'", "'*'", "'/'", "'+'", "'>'", "'<'", "'>='", "'<='", "'='", "'<>'", "'and'", "'or'", "'xor'", "'implies'", "'.'", "'->'", "'?.'", "'?->'", "'Map'", "'Tuple'", "'Boolean'", "'Integer'", "'Real'", "'String'", "'UnlimitedNatural'", "'OclAny'", "'OclInvalid'", "'OclVoid'", "'Set'", "'Bag'", "'Sequence'", "'Collection'", "'OrderedSet'", "'..'", "'++'", "'Lambda'", "'<-'", "'true'", "'false'", "'invalid'", "'null'", "'@'", "'pre'", "'['", "']'", "'in'", "'if'", "'then'", "'else'", "'endif'", "'elseif'", "'let'", "'self'", "'?'", "'extends'", "'&&'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_SIMPLE_ID", "RULE_ESCAPED_ID", "RULE_INT", "RULE_SINGLE_QUOTED_STRING", "RULE_ESCAPED_CHARACTER", "RULE_LETTER_CHARACTER", "RULE_DOUBLE_QUOTED_STRING", "RULE_ML_SINGLE_QUOTED_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'{'", "','", "'|'", "'}'", "'imports'", "'uses'", "'('", "')'", "':'", "';'", "'default'", "':='", "'::'", "'realize'", "'check'", "'enforce'", "'import'", "'library'", "'map'", "'query'", "'refines'", "'transformation'", "'-'", "'not'", "'*'", "'/'", "'+'", "'>'", "'<'", "'>='", "'<='", "'='", "'<>'", "'and'", "'or'", "'xor'", "'implies'", "'.'", "'->'", "'?.'", "'?->'", "'Map'", "'Tuple'", "'Boolean'", "'Integer'", "'Real'", "'String'", "'UnlimitedNatural'", "'OclAny'", "'OclInvalid'", "'OclVoid'", "'Set'", "'Bag'", "'Sequence'", "'Collection'", "'OrderedSet'", "'..'", "'++'", "'Lambda'", "'<-'", "'true'", "'false'", "'invalid'", "'null'", "'@'", "'pre'", "'['", "']'", "'in'", "'if'", "'then'", "'else'", "'endif'", "'elseif'", "'let'", "'self'", "'|?'", "'|1'", "'?'", "'extends'", "'&&'" }; public static final int T__29=29; public static final int T__28=28; @@ -49,6 +49,8 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { public static final int T__18=18; public static final int T__17=17; public static final int RULE_SIMPLE_ID=4; + public static final int T__96=96; + public static final int T__95=95; public static final int T__80=80; public static final int T__81=81; public static final int T__82=82; @@ -96,8 +98,8 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { public static final int T__42=42; public static final int T__43=43; public static final int T__40=40; - public static final int T__41=41; public static final int RULE_ML_SINGLE_QUOTED_STRING=11; + public static final int T__41=41; public static final int T__46=46; public static final int T__47=47; public static final int T__44=44; @@ -15927,12 +15929,14 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMultiplicityCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5558:1: ruleMultiplicityCS returns [EObject current=null] : (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5558:1: ruleMultiplicityCS returns [EObject current=null] : (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? otherlv_5= ']' ) ; public final EObject ruleMultiplicityCS() throws RecognitionException { EObject current = null; Token otherlv_0=null; Token otherlv_3=null; + Token lv_isNullFree_4_0=null; + Token otherlv_5=null; EObject this_MultiplicityBoundsCS_1 = null; EObject this_MultiplicityStringCS_2 = null; @@ -15941,11 +15945,11 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5561:28: ( (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5561:28: ( (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? otherlv_5= ']' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? otherlv_5= ']' ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:3: otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? otherlv_5= ']' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5562:3: otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? otherlv_5= ']' { otherlv_0=(Token)match(input,82,FollowSets000.FOLLOW_82_in_ruleMultiplicityCS12253); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -15960,7 +15964,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( (LA95_0==RULE_INT) ) { alt95=1; } - else if ( (LA95_0==40||LA95_0==42||LA95_0==92) ) { + else if ( (LA95_0==40||LA95_0==42||LA95_0==94) ) { alt95=2; } else { @@ -16028,10 +16032,68 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,83,FollowSets000.FOLLOW_83_in_ruleMultiplicityCS12321); if (state.failed) return current; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5591:2: (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? + int alt96=3; + int LA96_0 = input.LA(1); + + if ( (LA96_0==92) ) { + alt96=1; + } + else if ( (LA96_0==93) ) { + alt96=2; + } + switch (alt96) { + case 1 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5591:4: otherlv_3= '|?' + { + otherlv_3=(Token)match(input,92,FollowSets000.FOLLOW_92_in_ruleMultiplicityCS12322); if (state.failed) return current; + if ( state.backtracking==0 ) { + + newLeafNode(otherlv_3, grammarAccess.getMultiplicityCSAccess().getVerticalLineQuestionMarkKeyword_2_0()); + + } + + } + break; + case 2 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5596:6: ( (lv_isNullFree_4_0= '|1' ) ) + { + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5596:6: ( (lv_isNullFree_4_0= '|1' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5597:1: (lv_isNullFree_4_0= '|1' ) + { + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5597:1: (lv_isNullFree_4_0= '|1' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5598:3: lv_isNullFree_4_0= '|1' + { + lv_isNullFree_4_0=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleMultiplicityCS12346); if (state.failed) return current; + if ( state.backtracking==0 ) { + + newLeafNode(lv_isNullFree_4_0, grammarAccess.getMultiplicityCSAccess().getIsNullFree1Keyword_2_1_0()); + + } + if ( state.backtracking==0 ) { + + if (current==null) { + current = createModelElement(grammarAccess.getMultiplicityCSRule()); + } + setWithLastConsumed(current, "isNullFree", true, "|1"); + + } + + } + + + } + + + } + break; + + } + + otherlv_5=(Token)match(input,83,FollowSets000.FOLLOW_83_in_ruleMultiplicityCS12373); if (state.failed) return current; if ( state.backtracking==0 ) { - newLeafNode(otherlv_3, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_2()); + newLeafNode(otherlv_5, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_3()); } @@ -16057,7 +16119,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleMultiplicityStringCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5603:1: entryRuleMultiplicityStringCS returns [EObject current=null] : iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5623:1: entryRuleMultiplicityStringCS returns [EObject current=null] : iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ; public final EObject entryRuleMultiplicityStringCS() throws RecognitionException { EObject current = null; @@ -16065,13 +16127,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5604:2: (iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5605:2: iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5624:2: (iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5625:2: iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getMultiplicityStringCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS12357); + pushFollow(FollowSets000.FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS12409); iv_ruleMultiplicityStringCS=ruleMultiplicityStringCS(); state._fsp--; @@ -16079,7 +16141,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleMultiplicityStringCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleMultiplicityStringCS12367); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleMultiplicityStringCS12419); if (state.failed) return current; } @@ -16097,7 +16159,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMultiplicityStringCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5612:1: ruleMultiplicityStringCS returns [EObject current=null] : ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5632:1: ruleMultiplicityStringCS returns [EObject current=null] : ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ; public final EObject ruleMultiplicityStringCS() throws RecognitionException { EObject current = null; @@ -16108,46 +16170,46 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5615:28: ( ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5616:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5635:28: ( ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5636:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5616:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5617:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5636:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5637:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5617:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5618:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5637:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5638:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5618:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) - int alt96=3; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5638:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) + int alt97=3; switch ( input.LA(1) ) { case 40: { - alt96=1; + alt97=1; } break; case 42: { - alt96=2; + alt97=2; } break; - case 92: + case 94: { - alt96=3; + alt97=3; } break; default: if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 96, 0, input); + new NoViableAltException("", 97, 0, input); throw nvae; } - switch (alt96) { + switch (alt97) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5619:3: lv_stringBounds_0_1= '*' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5639:3: lv_stringBounds_0_1= '*' { - lv_stringBounds_0_1=(Token)match(input,40,FollowSets000.FOLLOW_40_in_ruleMultiplicityStringCS12411); if (state.failed) return current; + lv_stringBounds_0_1=(Token)match(input,40,FollowSets000.FOLLOW_40_in_ruleMultiplicityStringCS12463); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_1, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsAsteriskKeyword_0_0()); @@ -16165,9 +16227,9 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5631:8: lv_stringBounds_0_2= '+' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5651:8: lv_stringBounds_0_2= '+' { - lv_stringBounds_0_2=(Token)match(input,42,FollowSets000.FOLLOW_42_in_ruleMultiplicityStringCS12440); if (state.failed) return current; + lv_stringBounds_0_2=(Token)match(input,42,FollowSets000.FOLLOW_42_in_ruleMultiplicityStringCS12492); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_2, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsPlusSignKeyword_0_1()); @@ -16185,9 +16247,9 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5643:8: lv_stringBounds_0_3= '?' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5663:8: lv_stringBounds_0_3= '?' { - lv_stringBounds_0_3=(Token)match(input,92,FollowSets000.FOLLOW_92_in_ruleMultiplicityStringCS12469); if (state.failed) return current; + lv_stringBounds_0_3=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleMultiplicityStringCS12521); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_3, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsQuestionMarkKeyword_0_2()); @@ -16233,7 +16295,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRulePathNameCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5666:1: entryRulePathNameCS returns [EObject current=null] : iv_rulePathNameCS= rulePathNameCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5686:1: entryRulePathNameCS returns [EObject current=null] : iv_rulePathNameCS= rulePathNameCS EOF ; public final EObject entryRulePathNameCS() throws RecognitionException { EObject current = null; @@ -16241,13 +16303,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5667:2: (iv_rulePathNameCS= rulePathNameCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5668:2: iv_rulePathNameCS= rulePathNameCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5687:2: (iv_rulePathNameCS= rulePathNameCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5688:2: iv_rulePathNameCS= rulePathNameCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSRule()); } - pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_entryRulePathNameCS12520); + pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_entryRulePathNameCS12572); iv_rulePathNameCS=rulePathNameCS(); state._fsp--; @@ -16255,7 +16317,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_rulePathNameCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRulePathNameCS12530); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRulePathNameCS12582); if (state.failed) return current; } @@ -16273,7 +16335,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePathNameCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5675:1: rulePathNameCS returns [EObject current=null] : ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5695:1: rulePathNameCS returns [EObject current=null] : ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ; public final EObject rulePathNameCS() throws RecognitionException { EObject current = null; @@ -16286,24 +16348,24 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5678:28: ( ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5679:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5698:28: ( ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5699:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5679:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5679:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5699:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5699:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5679:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5680:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5699:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5700:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5680:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5681:3: lv_ownedPathElements_0_0= ruleFirstPathElementCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5700:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5701:3: lv_ownedPathElements_0_0= ruleFirstPathElementCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSAccess().getOwnedPathElementsFirstPathElementCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS12576); + pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS12628); lv_ownedPathElements_0_0=ruleFirstPathElementCS(); state._fsp--; @@ -16327,39 +16389,39 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5697:2: (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* - loop97: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5717:2: (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* + loop98: do { - int alt97=2; - int LA97_0 = input.LA(1); + int alt98=2; + int LA98_0 = input.LA(1); - if ( (LA97_0==28) ) { - alt97=1; + if ( (LA98_0==28) ) { + alt98=1; } - switch (alt97) { + switch (alt98) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5697:4: otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5717:4: otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) { - otherlv_1=(Token)match(input,28,FollowSets000.FOLLOW_28_in_rulePathNameCS12589); if (state.failed) return current; + otherlv_1=(Token)match(input,28,FollowSets000.FOLLOW_28_in_rulePathNameCS12641); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPathNameCSAccess().getColonColonKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5701:1: ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5702:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5721:1: ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5722:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5702:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5703:3: lv_ownedPathElements_2_0= ruleNextPathElementCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5722:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5723:3: lv_ownedPathElements_2_0= ruleNextPathElementCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSAccess().getOwnedPathElementsNextPathElementCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_rulePathNameCS12610); + pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_rulePathNameCS12662); lv_ownedPathElements_2_0=ruleNextPathElementCS(); state._fsp--; @@ -16388,7 +16450,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop97; + break loop98; } } while (true); @@ -16415,7 +16477,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleFirstPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5727:1: entryRuleFirstPathElementCS returns [EObject current=null] : iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5747:1: entryRuleFirstPathElementCS returns [EObject current=null] : iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ; public final EObject entryRuleFirstPathElementCS() throws RecognitionException { EObject current = null; @@ -16423,13 +16485,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5728:2: (iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5729:2: iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5748:2: (iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5749:2: iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getFirstPathElementCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS12648); + pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS12700); iv_ruleFirstPathElementCS=ruleFirstPathElementCS(); state._fsp--; @@ -16437,7 +16499,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleFirstPathElementCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleFirstPathElementCS12658); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleFirstPathElementCS12710); if (state.failed) return current; } @@ -16455,21 +16517,21 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleFirstPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5736:1: ruleFirstPathElementCS returns [EObject current=null] : ( ( ruleUnrestrictedName ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5756:1: ruleFirstPathElementCS returns [EObject current=null] : ( ( ruleUnrestrictedName ) ) ; public final EObject ruleFirstPathElementCS() throws RecognitionException { EObject current = null; enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5739:28: ( ( ( ruleUnrestrictedName ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5740:1: ( ( ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5759:28: ( ( ( ruleUnrestrictedName ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5760:1: ( ( ruleUnrestrictedName ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5740:1: ( ( ruleUnrestrictedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5741:1: ( ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5760:1: ( ( ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5761:1: ( ruleUnrestrictedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5741:1: ( ruleUnrestrictedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5742:3: ruleUnrestrictedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5761:1: ( ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5762:3: ruleUnrestrictedName { if ( state.backtracking==0 ) { @@ -16488,7 +16550,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getFirstPathElementCSAccess().getReferredElementNamedElementCrossReference_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS12709); + pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS12761); ruleUnrestrictedName(); state._fsp--; @@ -16524,7 +16586,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleNextPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5766:1: entryRuleNextPathElementCS returns [EObject current=null] : iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5786:1: entryRuleNextPathElementCS returns [EObject current=null] : iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ; public final EObject entryRuleNextPathElementCS() throws RecognitionException { EObject current = null; @@ -16532,13 +16594,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5767:2: (iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5768:2: iv_ruleNextPathElementCS= ruleNextPathElementCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5787:2: (iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5788:2: iv_ruleNextPathElementCS= ruleNextPathElementCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getNextPathElementCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS12744); + pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS12796); iv_ruleNextPathElementCS=ruleNextPathElementCS(); state._fsp--; @@ -16546,7 +16608,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleNextPathElementCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNextPathElementCS12754); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNextPathElementCS12806); if (state.failed) return current; } @@ -16564,21 +16626,21 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleNextPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5775:1: ruleNextPathElementCS returns [EObject current=null] : ( ( ruleUnreservedName ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5795:1: ruleNextPathElementCS returns [EObject current=null] : ( ( ruleUnreservedName ) ) ; public final EObject ruleNextPathElementCS() throws RecognitionException { EObject current = null; enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5778:28: ( ( ( ruleUnreservedName ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5779:1: ( ( ruleUnreservedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5798:28: ( ( ( ruleUnreservedName ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5799:1: ( ( ruleUnreservedName ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5779:1: ( ( ruleUnreservedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5780:1: ( ruleUnreservedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5799:1: ( ( ruleUnreservedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5800:1: ( ruleUnreservedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5780:1: ( ruleUnreservedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5781:3: ruleUnreservedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5800:1: ( ruleUnreservedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5801:3: ruleUnreservedName { if ( state.backtracking==0 ) { @@ -16597,7 +16659,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getNextPathElementCSAccess().getReferredElementNamedElementCrossReference_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS12805); + pushFollow(FollowSets000.FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS12857); ruleUnreservedName(); state._fsp--; @@ -16633,7 +16695,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTemplateBindingCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5805:1: entryRuleTemplateBindingCS returns [EObject current=null] : iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5825:1: entryRuleTemplateBindingCS returns [EObject current=null] : iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ; public final EObject entryRuleTemplateBindingCS() throws RecognitionException { EObject current = null; @@ -16641,13 +16703,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5806:2: (iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5807:2: iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5826:2: (iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5827:2: iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS12840); + pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS12892); iv_ruleTemplateBindingCS=ruleTemplateBindingCS(); state._fsp--; @@ -16655,7 +16717,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTemplateBindingCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateBindingCS12850); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateBindingCS12902); if (state.failed) return current; } @@ -16673,7 +16735,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTemplateBindingCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5814:1: ruleTemplateBindingCS returns [EObject current=null] : ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5834:1: ruleTemplateBindingCS returns [EObject current=null] : ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ; public final EObject ruleTemplateBindingCS() throws RecognitionException { EObject current = null; @@ -16688,24 +16750,24 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5817:28: ( ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5818:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5837:28: ( ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5838:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5818:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5818:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5838:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5838:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5818:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5819:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5838:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5839:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5819:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5820:3: lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5839:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5840:3: lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedSubstitutionsTemplateParameterSubstitutionCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12896); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12948); lv_ownedSubstitutions_0_0=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -16729,39 +16791,39 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5836:2: (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* - loop98: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5856:2: (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* + loop99: do { - int alt98=2; - int LA98_0 = input.LA(1); + int alt99=2; + int LA99_0 = input.LA(1); - if ( (LA98_0==17) ) { - alt98=1; + if ( (LA99_0==17) ) { + alt99=1; } - switch (alt98) { + switch (alt99) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5836:4: otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5856:4: otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) { - otherlv_1=(Token)match(input,17,FollowSets000.FOLLOW_17_in_ruleTemplateBindingCS12909); if (state.failed) return current; + otherlv_1=(Token)match(input,17,FollowSets000.FOLLOW_17_in_ruleTemplateBindingCS12961); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTemplateBindingCSAccess().getCommaKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5840:1: ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5841:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5860:1: ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5861:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5841:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5842:3: lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5861:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5862:3: lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedSubstitutionsTemplateParameterSubstitutionCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12930); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12982); lv_ownedSubstitutions_2_0=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -16790,30 +16852,30 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop98; + break loop99; } } while (true); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5858:4: ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? - int alt99=2; - int LA99_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5878:4: ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? + int alt100=2; + int LA100_0 = input.LA(1); - if ( (LA99_0==82) ) { - alt99=1; + if ( (LA100_0==82) ) { + alt100=1; } - switch (alt99) { + switch (alt100) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5859:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5879:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5859:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5860:3: lv_ownedMultiplicity_3_0= ruleMultiplicityCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5879:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5880:3: lv_ownedMultiplicity_3_0= ruleMultiplicityCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedMultiplicityMultiplicityCSParserRuleCall_2_0()); } - pushFollow(FollowSets000.FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS12953); + pushFollow(FollowSets000.FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS13005); lv_ownedMultiplicity_3_0=ruleMultiplicityCS(); state._fsp--; @@ -16863,7 +16925,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTemplateParameterSubstitutionCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5884:1: entryRuleTemplateParameterSubstitutionCS returns [EObject current=null] : iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5904:1: entryRuleTemplateParameterSubstitutionCS returns [EObject current=null] : iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ; public final EObject entryRuleTemplateParameterSubstitutionCS() throws RecognitionException { EObject current = null; @@ -16871,13 +16933,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5885:2: (iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5886:2: iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5905:2: (iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5906:2: iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateParameterSubstitutionCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS12990); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS13042); iv_ruleTemplateParameterSubstitutionCS=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -16885,7 +16947,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTemplateParameterSubstitutionCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS13000); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS13052); if (state.failed) return current; } @@ -16903,7 +16965,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTemplateParameterSubstitutionCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5893:1: ruleTemplateParameterSubstitutionCS returns [EObject current=null] : ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5913:1: ruleTemplateParameterSubstitutionCS returns [EObject current=null] : ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ; public final EObject ruleTemplateParameterSubstitutionCS() throws RecognitionException { EObject current = null; @@ -16913,21 +16975,21 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5896:28: ( ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5897:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5916:28: ( ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5917:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5897:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5898:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5917:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5918:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5898:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5899:3: lv_ownedActualParameter_0_0= ruleTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5918:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5919:3: lv_ownedActualParameter_0_0= ruleTypeRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateParameterSubstitutionCSAccess().getOwnedActualParameterTypeRefCSParserRuleCall_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS13045); + pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS13097); lv_ownedActualParameter_0_0=ruleTypeRefCS(); state._fsp--; @@ -16971,7 +17033,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypeParameterCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5925:1: entryRuleTypeParameterCS returns [EObject current=null] : iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5945:1: entryRuleTypeParameterCS returns [EObject current=null] : iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ; public final EObject entryRuleTypeParameterCS() throws RecognitionException { EObject current = null; @@ -16979,13 +17041,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5926:2: (iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5927:2: iv_ruleTypeParameterCS= ruleTypeParameterCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5946:2: (iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5947:2: iv_ruleTypeParameterCS= ruleTypeParameterCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS13082); + pushFollow(FollowSets000.FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS13134); iv_ruleTypeParameterCS=ruleTypeParameterCS(); state._fsp--; @@ -16993,7 +17055,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypeParameterCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeParameterCS13092); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeParameterCS13144); if (state.failed) return current; } @@ -17011,7 +17073,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypeParameterCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5934:1: ruleTypeParameterCS returns [EObject current=null] : ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5954:1: ruleTypeParameterCS returns [EObject current=null] : ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) ; public final EObject ruleTypeParameterCS() throws RecognitionException { EObject current = null; @@ -17027,24 +17089,24 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5937:28: ( ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5938:1: ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5957:28: ( ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5958:1: ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5938:1: ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5938:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5958:1: ( ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5958:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5938:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5939:1: (lv_name_0_0= ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5958:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5959:1: (lv_name_0_0= ruleUnrestrictedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5939:1: (lv_name_0_0= ruleUnrestrictedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5940:3: lv_name_0_0= ruleUnrestrictedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5959:1: (lv_name_0_0= ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5960:3: lv_name_0_0= ruleUnrestrictedName { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getNameUnrestrictedNameParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS13138); + pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS13190); lv_name_0_0=ruleUnrestrictedName(); state._fsp--; @@ -17068,35 +17130,35 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5956:2: (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? - int alt101=2; - int LA101_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5976:2: (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? + int alt102=2; + int LA102_0 = input.LA(1); - if ( (LA101_0==93) ) { - alt101=1; + if ( (LA102_0==95) ) { + alt102=1; } - switch (alt101) { + switch (alt102) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5956:4: otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5976:4: otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* { - otherlv_1=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleTypeParameterCS13151); if (state.failed) return current; + otherlv_1=(Token)match(input,95,FollowSets000.FOLLOW_95_in_ruleTypeParameterCS13203); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTypeParameterCSAccess().getExtendsKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5960:1: ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5961:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5980:1: ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5981:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5961:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5962:3: lv_ownedExtends_2_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5981:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5982:3: lv_ownedExtends_2_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13172); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13224); lv_ownedExtends_2_0=ruleTypedRefCS(); state._fsp--; @@ -17120,39 +17182,39 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5978:2: (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* - loop100: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5998:2: (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* + loop101: do { - int alt100=2; - int LA100_0 = input.LA(1); + int alt101=2; + int LA101_0 = input.LA(1); - if ( (LA100_0==94) ) { - alt100=1; + if ( (LA101_0==96) ) { + alt101=1; } - switch (alt100) { + switch (alt101) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5978:4: otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5998:4: otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) { - otherlv_3=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleTypeParameterCS13185); if (state.failed) return current; + otherlv_3=(Token)match(input,96,FollowSets000.FOLLOW_96_in_ruleTypeParameterCS13237); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getTypeParameterCSAccess().getAmpersandAmpersandKeyword_1_2_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5982:1: ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5983:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6002:1: ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6003:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5983:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:5984:3: lv_ownedExtends_4_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6003:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6004:3: lv_ownedExtends_4_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_1_2_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13206); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13258); lv_ownedExtends_4_0=ruleTypedRefCS(); state._fsp--; @@ -17181,7 +17243,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop100; + break loop101; } } while (true); @@ -17214,7 +17276,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6008:1: entryRuleTypeRefCS returns [EObject current=null] : iv_ruleTypeRefCS= ruleTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6028:1: entryRuleTypeRefCS returns [EObject current=null] : iv_ruleTypeRefCS= ruleTypeRefCS EOF ; public final EObject entryRuleTypeRefCS() throws RecognitionException { EObject current = null; @@ -17222,13 +17284,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6009:2: (iv_ruleTypeRefCS= ruleTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6010:2: iv_ruleTypeRefCS= ruleTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6029:2: (iv_ruleTypeRefCS= ruleTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6030:2: iv_ruleTypeRefCS= ruleTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS13246); + pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS13298); iv_ruleTypeRefCS=ruleTypeRefCS(); state._fsp--; @@ -17236,7 +17298,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeRefCS13256); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeRefCS13308); if (state.failed) return current; } @@ -17254,7 +17316,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6017:1: ruleTypeRefCS returns [EObject current=null] : (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6037:1: ruleTypeRefCS returns [EObject current=null] : (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ; public final EObject ruleTypeRefCS() throws RecognitionException { EObject current = null; @@ -17266,29 +17328,29 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6020:28: ( (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6021:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6040:28: ( (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6041:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6021:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) - int alt102=2; - int LA102_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6041:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) + int alt103=2; + int LA103_0 = input.LA(1); - if ( ((LA102_0>=RULE_SIMPLE_ID && LA102_0<=RULE_ESCAPED_ID)||(LA102_0>=20 && LA102_0<=21)||(LA102_0>=29 && LA102_0<=37)) ) { - alt102=1; + if ( ((LA103_0>=RULE_SIMPLE_ID && LA103_0<=RULE_ESCAPED_ID)||(LA103_0>=20 && LA103_0<=21)||(LA103_0>=29 && LA103_0<=37)) ) { + alt103=1; } - else if ( (LA102_0==92) ) { - alt102=2; + else if ( (LA103_0==94) ) { + alt103=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 102, 0, input); + new NoViableAltException("", 103, 0, input); throw nvae; } - switch (alt102) { + switch (alt103) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6022:2: this_TypedRefCS_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6042:2: this_TypedRefCS_0= ruleTypedRefCS { if ( state.backtracking==0 ) { @@ -17300,7 +17362,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypeRefCSAccess().getTypedRefCSParserRuleCall_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS13306); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS13358); this_TypedRefCS_0=ruleTypedRefCS(); state._fsp--; @@ -17315,7 +17377,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6035:2: this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6055:2: this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS { if ( state.backtracking==0 ) { @@ -17327,7 +17389,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypeRefCSAccess().getWildcardTypeRefCSParserRuleCall_1()); } - pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS13336); + pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS13388); this_WildcardTypeRefCS_1=ruleWildcardTypeRefCS(); state._fsp--; @@ -17364,7 +17426,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypedRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6054:1: entryRuleTypedRefCS returns [EObject current=null] : iv_ruleTypedRefCS= ruleTypedRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6074:1: entryRuleTypedRefCS returns [EObject current=null] : iv_ruleTypedRefCS= ruleTypedRefCS EOF ; public final EObject entryRuleTypedRefCS() throws RecognitionException { EObject current = null; @@ -17372,13 +17434,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6055:2: (iv_ruleTypedRefCS= ruleTypedRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6056:2: iv_ruleTypedRefCS= ruleTypedRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6075:2: (iv_ruleTypedRefCS= ruleTypedRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6076:2: iv_ruleTypedRefCS= ruleTypedRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS13371); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS13423); iv_ruleTypedRefCS=ruleTypedRefCS(); state._fsp--; @@ -17386,7 +17448,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypedRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedRefCS13381); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedRefCS13433); if (state.failed) return current; } @@ -17404,7 +17466,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypedRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6063:1: ruleTypedRefCS returns [EObject current=null] : this_TypedTypeRefCS_0= ruleTypedTypeRefCS ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6083:1: ruleTypedRefCS returns [EObject current=null] : this_TypedTypeRefCS_0= ruleTypedTypeRefCS ; public final EObject ruleTypedRefCS() throws RecognitionException { EObject current = null; @@ -17414,8 +17476,8 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6066:28: (this_TypedTypeRefCS_0= ruleTypedTypeRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6068:2: this_TypedTypeRefCS_0= ruleTypedTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6086:28: (this_TypedTypeRefCS_0= ruleTypedTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6088:2: this_TypedTypeRefCS_0= ruleTypedTypeRefCS { if ( state.backtracking==0 ) { @@ -17427,7 +17489,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypedRefCSAccess().getTypedTypeRefCSParserRuleCall()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS13430); + pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS13482); this_TypedTypeRefCS_0=ruleTypedTypeRefCS(); state._fsp--; @@ -17458,7 +17520,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypedTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6087:1: entryRuleTypedTypeRefCS returns [EObject current=null] : iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6107:1: entryRuleTypedTypeRefCS returns [EObject current=null] : iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ; public final EObject entryRuleTypedTypeRefCS() throws RecognitionException { EObject current = null; @@ -17466,13 +17528,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6088:2: (iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6089:2: iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6108:2: (iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6109:2: iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS13464); + pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS13516); iv_ruleTypedTypeRefCS=ruleTypedTypeRefCS(); state._fsp--; @@ -17480,7 +17542,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypedTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedTypeRefCS13474); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedTypeRefCS13526); if (state.failed) return current; } @@ -17498,7 +17560,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypedTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6096:1: ruleTypedTypeRefCS returns [EObject current=null] : ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6116:1: ruleTypedTypeRefCS returns [EObject current=null] : ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ; public final EObject ruleTypedTypeRefCS() throws RecognitionException { EObject current = null; @@ -17512,24 +17574,24 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6099:28: ( ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6100:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6119:28: ( ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6120:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6100:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6100:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6120:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6120:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6100:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6101:1: (lv_ownedPathName_0_0= rulePathNameCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6120:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6121:1: (lv_ownedPathName_0_0= rulePathNameCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6101:1: (lv_ownedPathName_0_0= rulePathNameCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6102:3: lv_ownedPathName_0_0= rulePathNameCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6121:1: (lv_ownedPathName_0_0= rulePathNameCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6122:3: lv_ownedPathName_0_0= rulePathNameCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSAccess().getOwnedPathNamePathNameCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS13520); + pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS13572); lv_ownedPathName_0_0=rulePathNameCS(); state._fsp--; @@ -17553,35 +17615,35 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6118:2: (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? - int alt103=2; - int LA103_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6138:2: (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? + int alt104=2; + int LA104_0 = input.LA(1); - if ( (LA103_0==22) ) { - alt103=1; + if ( (LA104_0==22) ) { + alt104=1; } - switch (alt103) { + switch (alt104) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6118:4: otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6138:4: otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' { - otherlv_1=(Token)match(input,22,FollowSets000.FOLLOW_22_in_ruleTypedTypeRefCS13533); if (state.failed) return current; + otherlv_1=(Token)match(input,22,FollowSets000.FOLLOW_22_in_ruleTypedTypeRefCS13585); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTypedTypeRefCSAccess().getLeftParenthesisKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6122:1: ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6123:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6142:1: ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6143:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6123:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6124:3: lv_ownedBinding_2_0= ruleTemplateBindingCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6143:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6144:3: lv_ownedBinding_2_0= ruleTemplateBindingCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSAccess().getOwnedBindingTemplateBindingCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS13554); + pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS13606); lv_ownedBinding_2_0=ruleTemplateBindingCS(); state._fsp--; @@ -17605,7 +17667,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,23,FollowSets000.FOLLOW_23_in_ruleTypedTypeRefCS13566); if (state.failed) return current; + otherlv_3=(Token)match(input,23,FollowSets000.FOLLOW_23_in_ruleTypedTypeRefCS13618); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getTypedTypeRefCSAccess().getRightParenthesisKeyword_1_2()); @@ -17640,7 +17702,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleWildcardTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6152:1: entryRuleWildcardTypeRefCS returns [EObject current=null] : iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6172:1: entryRuleWildcardTypeRefCS returns [EObject current=null] : iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ; public final EObject entryRuleWildcardTypeRefCS() throws RecognitionException { EObject current = null; @@ -17648,13 +17710,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6153:2: (iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6154:2: iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6173:2: (iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6174:2: iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getWildcardTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS13604); + pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS13656); iv_ruleWildcardTypeRefCS=ruleWildcardTypeRefCS(); state._fsp--; @@ -17662,7 +17724,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleWildcardTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleWildcardTypeRefCS13614); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleWildcardTypeRefCS13666); if (state.failed) return current; } @@ -17680,7 +17742,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleWildcardTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6161:1: ruleWildcardTypeRefCS returns [EObject current=null] : ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6181:1: ruleWildcardTypeRefCS returns [EObject current=null] : ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ; public final EObject ruleWildcardTypeRefCS() throws RecognitionException { EObject current = null; @@ -17692,14 +17754,14 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6164:28: ( ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6165:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6184:28: ( ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6185:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6165:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6165:2: () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6185:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6185:2: () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6165:2: () - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6166:2: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6185:2: () + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6186:2: { if ( state.backtracking==0 ) { @@ -17716,41 +17778,41 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,92,FollowSets000.FOLLOW_92_in_ruleWildcardTypeRefCS13663); if (state.failed) return current; + otherlv_1=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleWildcardTypeRefCS13715); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getWildcardTypeRefCSAccess().getQuestionMarkKeyword_1()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6178:1: (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? - int alt104=2; - int LA104_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6198:1: (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? + int alt105=2; + int LA105_0 = input.LA(1); - if ( (LA104_0==93) ) { - alt104=1; + if ( (LA105_0==95) ) { + alt105=1; } - switch (alt104) { + switch (alt105) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6178:3: otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6198:3: otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) { - otherlv_2=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleWildcardTypeRefCS13676); if (state.failed) return current; + otherlv_2=(Token)match(input,95,FollowSets000.FOLLOW_95_in_ruleWildcardTypeRefCS13728); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getWildcardTypeRefCSAccess().getExtendsKeyword_2_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6182:1: ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6183:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6202:1: ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6203:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6183:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6184:3: lv_ownedExtends_3_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6203:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6204:3: lv_ownedExtends_3_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getWildcardTypeRefCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_2_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS13697); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS13749); lv_ownedExtends_3_0=ruleTypedRefCS(); state._fsp--; @@ -17803,7 +17865,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleID" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6208:1: entryRuleID returns [String current=null] : iv_ruleID= ruleID EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6228:1: entryRuleID returns [String current=null] : iv_ruleID= ruleID EOF ; public final String entryRuleID() throws RecognitionException { String current = null; @@ -17811,13 +17873,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6209:2: (iv_ruleID= ruleID EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6210:2: iv_ruleID= ruleID EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6229:2: (iv_ruleID= ruleID EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6230:2: iv_ruleID= ruleID EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIDRule()); } - pushFollow(FollowSets000.FOLLOW_ruleID_in_entryRuleID13736); + pushFollow(FollowSets000.FOLLOW_ruleID_in_entryRuleID13788); iv_ruleID=ruleID(); state._fsp--; @@ -17825,7 +17887,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleID.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleID13747); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleID13799); if (state.failed) return current; } @@ -17843,7 +17905,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleID" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6217:1: ruleID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6237:1: ruleID returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ; public final AntlrDatatypeRuleToken ruleID() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -17853,31 +17915,31 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6220:28: ( (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6221:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6240:28: ( (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6241:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6221:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) - int alt105=2; - int LA105_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6241:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) + int alt106=2; + int LA106_0 = input.LA(1); - if ( (LA105_0==RULE_SIMPLE_ID) ) { - alt105=1; + if ( (LA106_0==RULE_SIMPLE_ID) ) { + alt106=1; } - else if ( (LA105_0==RULE_ESCAPED_ID) ) { - alt105=2; + else if ( (LA106_0==RULE_ESCAPED_ID) ) { + alt106=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 105, 0, input); + new NoViableAltException("", 106, 0, input); throw nvae; } - switch (alt105) { + switch (alt106) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6221:6: this_SIMPLE_ID_0= RULE_SIMPLE_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6241:6: this_SIMPLE_ID_0= RULE_SIMPLE_ID { - this_SIMPLE_ID_0=(Token)match(input,RULE_SIMPLE_ID,FollowSets000.FOLLOW_RULE_SIMPLE_ID_in_ruleID13787); if (state.failed) return current; + this_SIMPLE_ID_0=(Token)match(input,RULE_SIMPLE_ID,FollowSets000.FOLLOW_RULE_SIMPLE_ID_in_ruleID13839); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SIMPLE_ID_0); @@ -17892,9 +17954,9 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6229:10: this_ESCAPED_ID_1= RULE_ESCAPED_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6249:10: this_ESCAPED_ID_1= RULE_ESCAPED_ID { - this_ESCAPED_ID_1=(Token)match(input,RULE_ESCAPED_ID,FollowSets000.FOLLOW_RULE_ESCAPED_ID_in_ruleID13813); if (state.failed) return current; + this_ESCAPED_ID_1=(Token)match(input,RULE_ESCAPED_ID,FollowSets000.FOLLOW_RULE_ESCAPED_ID_in_ruleID13865); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_ESCAPED_ID_1); @@ -17931,7 +17993,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleIdentifier" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6244:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6264:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ; public final String entryRuleIdentifier() throws RecognitionException { String current = null; @@ -17939,13 +18001,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6245:2: (iv_ruleIdentifier= ruleIdentifier EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6246:2: iv_ruleIdentifier= ruleIdentifier EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6265:2: (iv_ruleIdentifier= ruleIdentifier EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6266:2: iv_ruleIdentifier= ruleIdentifier EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIdentifierRule()); } - pushFollow(FollowSets000.FOLLOW_ruleIdentifier_in_entryRuleIdentifier13859); + pushFollow(FollowSets000.FOLLOW_ruleIdentifier_in_entryRuleIdentifier13911); iv_ruleIdentifier=ruleIdentifier(); state._fsp--; @@ -17953,7 +18015,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleIdentifier.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleIdentifier13870); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleIdentifier13922); if (state.failed) return current; } @@ -17971,7 +18033,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleIdentifier" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6253:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= ruleID ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6273:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= ruleID ; public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -17981,15 +18043,15 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6256:28: (this_ID_0= ruleID ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6258:5: this_ID_0= ruleID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6276:28: (this_ID_0= ruleID ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6278:5: this_ID_0= ruleID { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIdentifierAccess().getIDParserRuleCall()); } - pushFollow(FollowSets000.FOLLOW_ruleID_in_ruleIdentifier13916); + pushFollow(FollowSets000.FOLLOW_ruleID_in_ruleIdentifier13968); this_ID_0=ruleID(); state._fsp--; @@ -18024,7 +18086,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleLOWER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6276:1: entryRuleLOWER returns [String current=null] : iv_ruleLOWER= ruleLOWER EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6296:1: entryRuleLOWER returns [String current=null] : iv_ruleLOWER= ruleLOWER EOF ; public final String entryRuleLOWER() throws RecognitionException { String current = null; @@ -18032,13 +18094,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6277:2: (iv_ruleLOWER= ruleLOWER EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6278:2: iv_ruleLOWER= ruleLOWER EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6297:2: (iv_ruleLOWER= ruleLOWER EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6298:2: iv_ruleLOWER= ruleLOWER EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getLOWERRule()); } - pushFollow(FollowSets000.FOLLOW_ruleLOWER_in_entryRuleLOWER13961); + pushFollow(FollowSets000.FOLLOW_ruleLOWER_in_entryRuleLOWER14013); iv_ruleLOWER=ruleLOWER(); state._fsp--; @@ -18046,7 +18108,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleLOWER.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleLOWER13972); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleLOWER14024); if (state.failed) return current; } @@ -18064,7 +18126,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleLOWER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6285:1: ruleLOWER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6305:1: ruleLOWER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; public final AntlrDatatypeRuleToken ruleLOWER() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -18073,10 +18135,10 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6288:28: (this_INT_0= RULE_INT ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6289:5: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6308:28: (this_INT_0= RULE_INT ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6309:5: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleLOWER14011); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleLOWER14063); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -18107,7 +18169,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleNUMBER_LITERAL" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6304:1: entryRuleNUMBER_LITERAL returns [String current=null] : iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6324:1: entryRuleNUMBER_LITERAL returns [String current=null] : iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ; public final String entryRuleNUMBER_LITERAL() throws RecognitionException { String current = null; @@ -18115,13 +18177,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6305:2: (iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6306:2: iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6325:2: (iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6326:2: iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getNUMBER_LITERALRule()); } - pushFollow(FollowSets000.FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL14056); + pushFollow(FollowSets000.FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL14108); iv_ruleNUMBER_LITERAL=ruleNUMBER_LITERAL(); state._fsp--; @@ -18129,7 +18191,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleNUMBER_LITERAL.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNUMBER_LITERAL14067); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNUMBER_LITERAL14119); if (state.failed) return current; } @@ -18147,7 +18209,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleNUMBER_LITERAL" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6313:1: ruleNUMBER_LITERAL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6333:1: ruleNUMBER_LITERAL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; public final AntlrDatatypeRuleToken ruleNUMBER_LITERAL() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -18156,10 +18218,10 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6316:28: (this_INT_0= RULE_INT ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6317:5: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6336:28: (this_INT_0= RULE_INT ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6337:5: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL14106); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL14158); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -18190,7 +18252,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleStringLiteral" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6332:1: entryRuleStringLiteral returns [String current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6352:1: entryRuleStringLiteral returns [String current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ; public final String entryRuleStringLiteral() throws RecognitionException { String current = null; @@ -18198,13 +18260,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6333:2: (iv_ruleStringLiteral= ruleStringLiteral EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6334:2: iv_ruleStringLiteral= ruleStringLiteral EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6353:2: (iv_ruleStringLiteral= ruleStringLiteral EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6354:2: iv_ruleStringLiteral= ruleStringLiteral EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getStringLiteralRule()); } - pushFollow(FollowSets000.FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral14151); + pushFollow(FollowSets000.FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral14203); iv_ruleStringLiteral=ruleStringLiteral(); state._fsp--; @@ -18212,7 +18274,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleStringLiteral.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleStringLiteral14162); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleStringLiteral14214); if (state.failed) return current; } @@ -18230,7 +18292,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleStringLiteral" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6341:1: ruleStringLiteral returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6361:1: ruleStringLiteral returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; public final AntlrDatatypeRuleToken ruleStringLiteral() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -18239,10 +18301,10 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6344:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6345:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6364:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6365:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING { - this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral14201); if (state.failed) return current; + this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral14253); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SINGLE_QUOTED_STRING_0); @@ -18273,7 +18335,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleUPPER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6360:1: entryRuleUPPER returns [String current=null] : iv_ruleUPPER= ruleUPPER EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6380:1: entryRuleUPPER returns [String current=null] : iv_ruleUPPER= ruleUPPER EOF ; public final String entryRuleUPPER() throws RecognitionException { String current = null; @@ -18281,13 +18343,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6361:2: (iv_ruleUPPER= ruleUPPER EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6362:2: iv_ruleUPPER= ruleUPPER EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6381:2: (iv_ruleUPPER= ruleUPPER EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6382:2: iv_ruleUPPER= ruleUPPER EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getUPPERRule()); } - pushFollow(FollowSets000.FOLLOW_ruleUPPER_in_entryRuleUPPER14246); + pushFollow(FollowSets000.FOLLOW_ruleUPPER_in_entryRuleUPPER14298); iv_ruleUPPER=ruleUPPER(); state._fsp--; @@ -18295,7 +18357,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleUPPER.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleUPPER14257); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleUPPER14309); if (state.failed) return current; } @@ -18313,7 +18375,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleUPPER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6369:1: ruleUPPER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6389:1: ruleUPPER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ; public final AntlrDatatypeRuleToken ruleUPPER() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -18323,31 +18385,31 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6372:28: ( (this_INT_0= RULE_INT | kw= '*' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6373:1: (this_INT_0= RULE_INT | kw= '*' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6392:28: ( (this_INT_0= RULE_INT | kw= '*' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6393:1: (this_INT_0= RULE_INT | kw= '*' ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6373:1: (this_INT_0= RULE_INT | kw= '*' ) - int alt106=2; - int LA106_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6393:1: (this_INT_0= RULE_INT | kw= '*' ) + int alt107=2; + int LA107_0 = input.LA(1); - if ( (LA106_0==RULE_INT) ) { - alt106=1; + if ( (LA107_0==RULE_INT) ) { + alt107=1; } - else if ( (LA106_0==40) ) { - alt106=2; + else if ( (LA107_0==40) ) { + alt107=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 106, 0, input); + new NoViableAltException("", 107, 0, input); throw nvae; } - switch (alt106) { + switch (alt107) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6373:6: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6393:6: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleUPPER14297); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleUPPER14349); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -18362,9 +18424,9 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6382:2: kw= '*' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6402:2: kw= '*' { - kw=(Token)match(input,40,FollowSets000.FOLLOW_40_in_ruleUPPER14321); if (state.failed) return current; + kw=(Token)match(input,40,FollowSets000.FOLLOW_40_in_ruleUPPER14373); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -18397,7 +18459,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleURI" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6395:1: entryRuleURI returns [String current=null] : iv_ruleURI= ruleURI EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6415:1: entryRuleURI returns [String current=null] : iv_ruleURI= ruleURI EOF ; public final String entryRuleURI() throws RecognitionException { String current = null; @@ -18405,13 +18467,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6396:2: (iv_ruleURI= ruleURI EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6397:2: iv_ruleURI= ruleURI EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6416:2: (iv_ruleURI= ruleURI EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6417:2: iv_ruleURI= ruleURI EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getURIRule()); } - pushFollow(FollowSets000.FOLLOW_ruleURI_in_entryRuleURI14362); + pushFollow(FollowSets000.FOLLOW_ruleURI_in_entryRuleURI14414); iv_ruleURI=ruleURI(); state._fsp--; @@ -18419,7 +18481,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleURI.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleURI14373); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleURI14425); if (state.failed) return current; } @@ -18437,7 +18499,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleURI" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6404:1: ruleURI returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6424:1: ruleURI returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; public final AntlrDatatypeRuleToken ruleURI() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -18446,10 +18508,10 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6407:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6408:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6427:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:6428:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING { - this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI14412); if (state.failed) return current; + this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI14464); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SINGLE_QUOTED_STRING_0); @@ -18503,25 +18565,25 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { { otherlv_0=(Token)match(input,16,FollowSets000.FOLLOW_16_in_synpred5_InternalQVTcoreBase129); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:90:1: ( ( (lv_ownedUnrealizedVariables_1_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_2_0= ruleRealizedVariableCS ) ) ) - int alt108=2; - int LA108_0 = input.LA(1); + int alt109=2; + int LA109_0 = input.LA(1); - if ( ((LA108_0>=RULE_SIMPLE_ID && LA108_0<=RULE_ESCAPED_ID)||(LA108_0>=20 && LA108_0<=21)||(LA108_0>=30 && LA108_0<=37)) ) { - alt108=1; + if ( ((LA109_0>=RULE_SIMPLE_ID && LA109_0<=RULE_ESCAPED_ID)||(LA109_0>=20 && LA109_0<=21)||(LA109_0>=30 && LA109_0<=37)) ) { + alt109=1; } - else if ( (LA108_0==29) ) { - int LA108_2 = input.LA(2); + else if ( (LA109_0==29) ) { + int LA109_2 = input.LA(2); - if ( ((LA108_2>=RULE_SIMPLE_ID && LA108_2<=RULE_ESCAPED_ID)||(LA108_2>=20 && LA108_2<=21)||(LA108_2>=29 && LA108_2<=37)) ) { - alt108=2; + if ( ((LA109_2>=RULE_SIMPLE_ID && LA109_2<=RULE_ESCAPED_ID)||(LA109_2>=20 && LA109_2<=21)||(LA109_2>=29 && LA109_2<=37)) ) { + alt109=2; } - else if ( ((LA108_2>=17 && LA108_2<=18)||LA108_2==24||LA108_2==27) ) { - alt108=1; + else if ( ((LA109_2>=17 && LA109_2<=18)||LA109_2==24||LA109_2==27) ) { + alt109=1; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 108, 2, input); + new NoViableAltException("", 109, 2, input); throw nvae; } @@ -18529,11 +18591,11 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 108, 0, input); + new NoViableAltException("", 109, 0, input); throw nvae; } - switch (alt108) { + switch (alt109) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:90:2: ( (lv_ownedUnrealizedVariables_1_0= ruleUnrealizedVariableCS ) ) { @@ -18594,41 +18656,41 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:127:3: (otherlv_3= ',' ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) )* - loop110: + loop111: do { - int alt110=2; - int LA110_0 = input.LA(1); + int alt111=2; + int LA111_0 = input.LA(1); - if ( (LA110_0==17) ) { - alt110=1; + if ( (LA111_0==17) ) { + alt111=1; } - switch (alt110) { + switch (alt111) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:127:5: otherlv_3= ',' ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) { otherlv_3=(Token)match(input,17,FollowSets000.FOLLOW_17_in_synpred5_InternalQVTcoreBase192); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:131:1: ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) - int alt109=2; - int LA109_0 = input.LA(1); + int alt110=2; + int LA110_0 = input.LA(1); - if ( ((LA109_0>=RULE_SIMPLE_ID && LA109_0<=RULE_ESCAPED_ID)||(LA109_0>=20 && LA109_0<=21)||(LA109_0>=30 && LA109_0<=37)) ) { - alt109=1; + if ( ((LA110_0>=RULE_SIMPLE_ID && LA110_0<=RULE_ESCAPED_ID)||(LA110_0>=20 && LA110_0<=21)||(LA110_0>=30 && LA110_0<=37)) ) { + alt110=1; } - else if ( (LA109_0==29) ) { - int LA109_2 = input.LA(2); + else if ( (LA110_0==29) ) { + int LA110_2 = input.LA(2); - if ( ((LA109_2>=RULE_SIMPLE_ID && LA109_2<=RULE_ESCAPED_ID)||(LA109_2>=20 && LA109_2<=21)||(LA109_2>=29 && LA109_2<=37)) ) { - alt109=2; + if ( ((LA110_2>=17 && LA110_2<=18)||LA110_2==24||LA110_2==27) ) { + alt110=1; } - else if ( ((LA109_2>=17 && LA109_2<=18)||LA109_2==24||LA109_2==27) ) { - alt109=1; + else if ( ((LA110_2>=RULE_SIMPLE_ID && LA110_2<=RULE_ESCAPED_ID)||(LA110_2>=20 && LA110_2<=21)||(LA110_2>=29 && LA110_2<=37)) ) { + alt110=2; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 109, 2, input); + new NoViableAltException("", 110, 2, input); throw nvae; } @@ -18636,11 +18698,11 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 109, 0, input); + new NoViableAltException("", 110, 0, input); throw nvae; } - switch (alt109) { + switch (alt110) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:131:2: ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) { @@ -18705,23 +18767,23 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop110; + break loop111; } } while (true); otherlv_6=(Token)match(input,18,FollowSets000.FOLLOW_18_in_synpred5_InternalQVTcoreBase256); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:172:1: ( (lv_ownedConstraints_7_0= rulePredicateOrAssignmentCS ) )* - loop111: + loop112: do { - int alt111=2; - int LA111_0 = input.LA(1); + int alt112=2; + int LA112_0 = input.LA(1); - if ( ((LA111_0>=RULE_SIMPLE_ID && LA111_0<=RULE_SINGLE_QUOTED_STRING)||(LA111_0>=20 && LA111_0<=22)||LA111_0==26||(LA111_0>=29 && LA111_0<=40)||(LA111_0>=57 && LA111_0<=71)||LA111_0==74||(LA111_0>=76 && LA111_0<=79)||LA111_0==85||(LA111_0>=90 && LA111_0<=91)) ) { - alt111=1; + if ( ((LA112_0>=RULE_SIMPLE_ID && LA112_0<=RULE_SINGLE_QUOTED_STRING)||(LA112_0>=20 && LA112_0<=22)||LA112_0==26||(LA112_0>=29 && LA112_0<=40)||(LA112_0>=57 && LA112_0<=71)||LA112_0==74||(LA112_0>=76 && LA112_0<=79)||LA112_0==85||(LA112_0>=90 && LA112_0<=91)) ) { + alt112=1; } - switch (alt111) { + switch (alt112) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:173:1: (lv_ownedConstraints_7_0= rulePredicateOrAssignmentCS ) { @@ -18746,7 +18808,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop111; + break loop112; } } while (true); @@ -18781,25 +18843,25 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { { otherlv_9=(Token)match(input,16,FollowSets000.FOLLOW_16_in_synpred9_InternalQVTcoreBase310); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:199:1: ( ( (lv_ownedUnrealizedVariables_10_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_11_0= ruleRealizedVariableCS ) ) ) - int alt113=2; - int LA113_0 = input.LA(1); + int alt114=2; + int LA114_0 = input.LA(1); - if ( ((LA113_0>=RULE_SIMPLE_ID && LA113_0<=RULE_ESCAPED_ID)||(LA113_0>=20 && LA113_0<=21)||(LA113_0>=30 && LA113_0<=37)) ) { - alt113=1; + if ( ((LA114_0>=RULE_SIMPLE_ID && LA114_0<=RULE_ESCAPED_ID)||(LA114_0>=20 && LA114_0<=21)||(LA114_0>=30 && LA114_0<=37)) ) { + alt114=1; } - else if ( (LA113_0==29) ) { - int LA113_2 = input.LA(2); + else if ( (LA114_0==29) ) { + int LA114_2 = input.LA(2); - if ( (LA113_2==17||LA113_2==19||LA113_2==24||LA113_2==27) ) { - alt113=1; + if ( ((LA114_2>=RULE_SIMPLE_ID && LA114_2<=RULE_ESCAPED_ID)||(LA114_2>=20 && LA114_2<=21)||(LA114_2>=29 && LA114_2<=37)) ) { + alt114=2; } - else if ( ((LA113_2>=RULE_SIMPLE_ID && LA113_2<=RULE_ESCAPED_ID)||(LA113_2>=20 && LA113_2<=21)||(LA113_2>=29 && LA113_2<=37)) ) { - alt113=2; + else if ( (LA114_2==17||LA114_2==19||LA114_2==24||LA114_2==27) ) { + alt114=1; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 113, 2, input); + new NoViableAltException("", 114, 2, input); throw nvae; } @@ -18807,11 +18869,11 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 113, 0, input); + new NoViableAltException("", 114, 0, input); throw nvae; } - switch (alt113) { + switch (alt114) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:199:2: ( (lv_ownedUnrealizedVariables_10_0= ruleUnrealizedVariableCS ) ) { @@ -18872,41 +18934,41 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:236:3: (otherlv_12= ',' ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) )* - loop115: + loop116: do { - int alt115=2; - int LA115_0 = input.LA(1); + int alt116=2; + int LA116_0 = input.LA(1); - if ( (LA115_0==17) ) { - alt115=1; + if ( (LA116_0==17) ) { + alt116=1; } - switch (alt115) { + switch (alt116) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:236:5: otherlv_12= ',' ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) { otherlv_12=(Token)match(input,17,FollowSets000.FOLLOW_17_in_synpred9_InternalQVTcoreBase373); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:240:1: ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) - int alt114=2; - int LA114_0 = input.LA(1); + int alt115=2; + int LA115_0 = input.LA(1); - if ( ((LA114_0>=RULE_SIMPLE_ID && LA114_0<=RULE_ESCAPED_ID)||(LA114_0>=20 && LA114_0<=21)||(LA114_0>=30 && LA114_0<=37)) ) { - alt114=1; + if ( ((LA115_0>=RULE_SIMPLE_ID && LA115_0<=RULE_ESCAPED_ID)||(LA115_0>=20 && LA115_0<=21)||(LA115_0>=30 && LA115_0<=37)) ) { + alt115=1; } - else if ( (LA114_0==29) ) { - int LA114_2 = input.LA(2); + else if ( (LA115_0==29) ) { + int LA115_2 = input.LA(2); - if ( (LA114_2==17||LA114_2==19||LA114_2==24||LA114_2==27) ) { - alt114=1; + if ( (LA115_2==17||LA115_2==19||LA115_2==24||LA115_2==27) ) { + alt115=1; } - else if ( ((LA114_2>=RULE_SIMPLE_ID && LA114_2<=RULE_ESCAPED_ID)||(LA114_2>=20 && LA114_2<=21)||(LA114_2>=29 && LA114_2<=37)) ) { - alt114=2; + else if ( ((LA115_2>=RULE_SIMPLE_ID && LA115_2<=RULE_ESCAPED_ID)||(LA115_2>=20 && LA115_2<=21)||(LA115_2>=29 && LA115_2<=37)) ) { + alt115=2; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 114, 2, input); + new NoViableAltException("", 115, 2, input); throw nvae; } @@ -18914,11 +18976,11 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 114, 0, input); + new NoViableAltException("", 115, 0, input); throw nvae; } - switch (alt114) { + switch (alt115) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:240:2: ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) { @@ -18983,7 +19045,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop115; + break loop116; } } while (true); @@ -19011,18 +19073,18 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { { otherlv_16=(Token)match(input,16,FollowSets000.FOLLOW_16_in_synpred11_InternalQVTcoreBase457); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:286:1: ( (lv_ownedConstraints_17_0= rulePredicateOrAssignmentCS ) )+ - int cnt116=0; - loop116: + int cnt117=0; + loop117: do { - int alt116=2; - int LA116_0 = input.LA(1); + int alt117=2; + int LA117_0 = input.LA(1); - if ( ((LA116_0>=RULE_SIMPLE_ID && LA116_0<=RULE_SINGLE_QUOTED_STRING)||(LA116_0>=20 && LA116_0<=22)||LA116_0==26||(LA116_0>=29 && LA116_0<=40)||(LA116_0>=57 && LA116_0<=71)||LA116_0==74||(LA116_0>=76 && LA116_0<=79)||LA116_0==85||(LA116_0>=90 && LA116_0<=91)) ) { - alt116=1; + if ( ((LA117_0>=RULE_SIMPLE_ID && LA117_0<=RULE_SINGLE_QUOTED_STRING)||(LA117_0>=20 && LA117_0<=22)||LA117_0==26||(LA117_0>=29 && LA117_0<=40)||(LA117_0>=57 && LA117_0<=71)||LA117_0==74||(LA117_0>=76 && LA117_0<=79)||LA117_0==85||(LA117_0>=90 && LA117_0<=91)) ) { + alt117=1; } - switch (alt116) { + switch (alt117) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:287:1: (lv_ownedConstraints_17_0= rulePredicateOrAssignmentCS ) { @@ -19047,13 +19109,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - if ( cnt116 >= 1 ) break loop116; + if ( cnt117 >= 1 ) break loop117; if (state.backtracking>0) {state.failed=true; return ;} EarlyExitException eee = - new EarlyExitException(116, input); + new EarlyExitException(117, input); throw eee; } - cnt116++; + cnt117++; } while (true); otherlv_18=(Token)match(input,19,FollowSets000.FOLLOW_19_in_synpred11_InternalQVTcoreBase491); if (state.failed) return ; @@ -19108,17 +19170,17 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:505:2: (otherlv_2= ',' ( (lv_ownedUnrealizedVariables_3_0= ruleGuardVariableCS ) ) )* - loop119: + loop120: do { - int alt119=2; - int LA119_0 = input.LA(1); + int alt120=2; + int LA120_0 = input.LA(1); - if ( (LA119_0==17) ) { - alt119=1; + if ( (LA120_0==17) ) { + alt120=1; } - switch (alt119) { + switch (alt120) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:505:4: otherlv_2= ',' ( (lv_ownedUnrealizedVariables_3_0= ruleGuardVariableCS ) ) { @@ -19150,23 +19212,23 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop119; + break loop120; } } while (true); otherlv_4=(Token)match(input,18,FollowSets000.FOLLOW_18_in_synpred19_InternalQVTcoreBase962); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:531:1: ( (lv_ownedPredicates_5_0= rulePredicateCS ) )* - loop120: + loop121: do { - int alt120=2; - int LA120_0 = input.LA(1); + int alt121=2; + int LA121_0 = input.LA(1); - if ( ((LA120_0>=RULE_SIMPLE_ID && LA120_0<=RULE_SINGLE_QUOTED_STRING)||(LA120_0>=20 && LA120_0<=22)||(LA120_0>=29 && LA120_0<=40)||(LA120_0>=57 && LA120_0<=71)||LA120_0==74||(LA120_0>=76 && LA120_0<=79)||LA120_0==85||(LA120_0>=90 && LA120_0<=91)) ) { - alt120=1; + if ( ((LA121_0>=RULE_SIMPLE_ID && LA121_0<=RULE_SINGLE_QUOTED_STRING)||(LA121_0>=20 && LA121_0<=22)||(LA121_0>=29 && LA121_0<=40)||(LA121_0>=57 && LA121_0<=71)||LA121_0==74||(LA121_0>=76 && LA121_0<=79)||LA121_0==85||(LA121_0>=90 && LA121_0<=91)) ) { + alt121=1; } - switch (alt120) { + switch (alt121) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:532:1: (lv_ownedPredicates_5_0= rulePredicateCS ) { @@ -19191,7 +19253,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop120; + break loop121; } } while (true); @@ -19244,17 +19306,17 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:576:2: (otherlv_9= ',' ( (lv_ownedUnrealizedVariables_10_0= ruleGuardVariableCS ) ) )* - loop121: + loop122: do { - int alt121=2; - int LA121_0 = input.LA(1); + int alt122=2; + int LA122_0 = input.LA(1); - if ( (LA121_0==17) ) { - alt121=1; + if ( (LA122_0==17) ) { + alt122=1; } - switch (alt121) { + switch (alt122) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:576:4: otherlv_9= ',' ( (lv_ownedUnrealizedVariables_10_0= ruleGuardVariableCS ) ) { @@ -19286,7 +19348,7 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - break loop121; + break loop122; } } while (true); @@ -19314,18 +19376,18 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { { otherlv_12=(Token)match(input,22,FollowSets000.FOLLOW_22_in_synpred23_InternalQVTcoreBase1105); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:607:1: ( (lv_ownedPredicates_13_0= rulePredicateCS ) )+ - int cnt122=0; - loop122: + int cnt123=0; + loop123: do { - int alt122=2; - int LA122_0 = input.LA(1); + int alt123=2; + int LA123_0 = input.LA(1); - if ( ((LA122_0>=RULE_SIMPLE_ID && LA122_0<=RULE_SINGLE_QUOTED_STRING)||(LA122_0>=20 && LA122_0<=22)||(LA122_0>=29 && LA122_0<=40)||(LA122_0>=57 && LA122_0<=71)||LA122_0==74||(LA122_0>=76 && LA122_0<=79)||LA122_0==85||(LA122_0>=90 && LA122_0<=91)) ) { - alt122=1; + if ( ((LA123_0>=RULE_SIMPLE_ID && LA123_0<=RULE_SINGLE_QUOTED_STRING)||(LA123_0>=20 && LA123_0<=22)||(LA123_0>=29 && LA123_0<=40)||(LA123_0>=57 && LA123_0<=71)||LA123_0==74||(LA123_0>=76 && LA123_0<=79)||LA123_0==85||(LA123_0>=90 && LA123_0<=91)) ) { + alt123=1; } - switch (alt122) { + switch (alt123) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:608:1: (lv_ownedPredicates_13_0= rulePredicateCS ) { @@ -19350,13 +19412,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { break; default : - if ( cnt122 >= 1 ) break loop122; + if ( cnt123 >= 1 ) break loop123; if (state.backtracking>0) {state.failed=true; return ;} EarlyExitException eee = - new EarlyExitException(122, input); + new EarlyExitException(123, input); throw eee; } - cnt122++; + cnt123++; } while (true); otherlv_14=(Token)match(input,23,FollowSets000.FOLLOW_23_in_synpred23_InternalQVTcoreBase1139); if (state.failed) return ; @@ -19417,13 +19479,13 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { state._fsp--; if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:3750:1: ( () ( (lv_name_2_0= ruleBinaryOperatorName ) ) ( (lv_ownedRight_3_0= ruleExpCS ) ) )? - int alt131=2; - int LA131_0 = input.LA(1); + int alt132=2; + int LA132_0 = input.LA(1); - if ( (LA131_0==38||(LA131_0>=40 && LA131_0<=56)) ) { - alt131=1; + if ( (LA132_0==38||(LA132_0>=40 && LA132_0<=56)) ) { + alt132=1; } - switch (alt131) { + switch (alt132) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/parser/antlr/internal/InternalQVTcoreBase.g:3750:2: () ( (lv_name_2_0= ruleBinaryOperatorName ) ) ( (lv_ownedRight_3_0= ruleExpCS ) ) { @@ -21011,83 +21073,85 @@ public class InternalQVTcoreBaseParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleUPPER_in_ruleMultiplicityBoundsCS12168 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleMultiplicityCS_in_entryRuleMultiplicityCS12206 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityCS12216 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_82_in_ruleMultiplicityCS12253 = new BitSet(new long[]{0x0000050000000040L,0x0000000010000000L}); - public static final BitSet FOLLOW_ruleMultiplicityBoundsCS_in_ruleMultiplicityCS12279 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); - public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_ruleMultiplicityCS12309 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); - public static final BitSet FOLLOW_83_in_ruleMultiplicityCS12321 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS12357 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityStringCS12367 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_40_in_ruleMultiplicityStringCS12411 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_42_in_ruleMultiplicityStringCS12440 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_92_in_ruleMultiplicityStringCS12469 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePathNameCS_in_entryRulePathNameCS12520 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePathNameCS12530 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS12576 = new BitSet(new long[]{0x0000000010000002L}); - public static final BitSet FOLLOW_28_in_rulePathNameCS12589 = new BitSet(new long[]{0xFE00003FE0300030L,0x00000000000000FFL}); - public static final BitSet FOLLOW_ruleNextPathElementCS_in_rulePathNameCS12610 = new BitSet(new long[]{0x0000000010000002L}); - public static final BitSet FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS12648 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFirstPathElementCS12658 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS12709 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS12744 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNextPathElementCS12754 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS12805 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS12840 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTemplateBindingCS12850 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12896 = new BitSet(new long[]{0x0000000000020002L,0x0000000000040000L}); - public static final BitSet FOLLOW_17_in_ruleTemplateBindingCS12909 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000001820F4FFL}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12930 = new BitSet(new long[]{0x0000000000020002L,0x0000000000040000L}); - public static final BitSet FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS12953 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS12990 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS13000 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS13045 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS13082 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeParameterCS13092 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS13138 = new BitSet(new long[]{0x0000000000000002L,0x0000000020000000L}); - public static final BitSet FOLLOW_93_in_ruleTypeParameterCS13151 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13172 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L}); - public static final BitSet FOLLOW_94_in_ruleTypeParameterCS13185 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13206 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L}); - public static final BitSet FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS13246 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeRefCS13256 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS13306 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS13336 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS13371 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypedRefCS13381 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS13430 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS13464 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypedTypeRefCS13474 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS13520 = new BitSet(new long[]{0x0000000000400002L}); - public static final BitSet FOLLOW_22_in_ruleTypedTypeRefCS13533 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000001820F4FFL}); - public static final BitSet FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS13554 = new BitSet(new long[]{0x0000000000800000L}); - public static final BitSet FOLLOW_23_in_ruleTypedTypeRefCS13566 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS13604 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleWildcardTypeRefCS13614 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_92_in_ruleWildcardTypeRefCS13663 = new BitSet(new long[]{0x0000000000000002L,0x0000000020000000L}); - public static final BitSet FOLLOW_93_in_ruleWildcardTypeRefCS13676 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS13697 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleID_in_entryRuleID13736 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleID13747 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SIMPLE_ID_in_ruleID13787 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ESCAPED_ID_in_ruleID13813 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier13859 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier13870 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleID_in_ruleIdentifier13916 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLOWER_in_entryRuleLOWER13961 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLOWER13972 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleLOWER14011 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL14056 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNUMBER_LITERAL14067 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL14106 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral14151 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral14162 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral14201 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUPPER_in_entryRuleUPPER14246 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUPPER14257 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleUPPER14297 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_40_in_ruleUPPER14321 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleURI_in_entryRuleURI14362 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleURI14373 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI14412 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_82_in_ruleMultiplicityCS12253 = new BitSet(new long[]{0x0000050000000040L,0x0000000040000000L}); + public static final BitSet FOLLOW_ruleMultiplicityBoundsCS_in_ruleMultiplicityCS12279 = new BitSet(new long[]{0x0000000000000000L,0x0000000030080000L}); + public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_ruleMultiplicityCS12309 = new BitSet(new long[]{0x0000000000000000L,0x0000000030080000L}); + public static final BitSet FOLLOW_92_in_ruleMultiplicityCS12322 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); + public static final BitSet FOLLOW_93_in_ruleMultiplicityCS12346 = new BitSet(new long[]{0x0000000000000000L,0x0000000000080000L}); + public static final BitSet FOLLOW_83_in_ruleMultiplicityCS12373 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS12409 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityStringCS12419 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_40_in_ruleMultiplicityStringCS12463 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_42_in_ruleMultiplicityStringCS12492 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_94_in_ruleMultiplicityStringCS12521 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePathNameCS_in_entryRulePathNameCS12572 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePathNameCS12582 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS12628 = new BitSet(new long[]{0x0000000010000002L}); + public static final BitSet FOLLOW_28_in_rulePathNameCS12641 = new BitSet(new long[]{0xFE00003FE0300030L,0x00000000000000FFL}); + public static final BitSet FOLLOW_ruleNextPathElementCS_in_rulePathNameCS12662 = new BitSet(new long[]{0x0000000010000002L}); + public static final BitSet FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS12700 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFirstPathElementCS12710 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS12761 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS12796 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNextPathElementCS12806 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS12857 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS12892 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTemplateBindingCS12902 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12948 = new BitSet(new long[]{0x0000000000020002L,0x0000000000040000L}); + public static final BitSet FOLLOW_17_in_ruleTemplateBindingCS12961 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000004820F4FFL}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS12982 = new BitSet(new long[]{0x0000000000020002L,0x0000000000040000L}); + public static final BitSet FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS13005 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS13042 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS13052 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS13097 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS13134 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeParameterCS13144 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS13190 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L}); + public static final BitSet FOLLOW_95_in_ruleTypeParameterCS13203 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13224 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L}); + public static final BitSet FOLLOW_96_in_ruleTypeParameterCS13237 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS13258 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L}); + public static final BitSet FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS13298 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeRefCS13308 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS13358 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS13388 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS13423 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypedRefCS13433 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS13482 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS13516 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypedTypeRefCS13526 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS13572 = new BitSet(new long[]{0x0000000000400002L}); + public static final BitSet FOLLOW_22_in_ruleTypedTypeRefCS13585 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000004820F4FFL}); + public static final BitSet FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS13606 = new BitSet(new long[]{0x0000000000800000L}); + public static final BitSet FOLLOW_23_in_ruleTypedTypeRefCS13618 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS13656 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleWildcardTypeRefCS13666 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_94_in_ruleWildcardTypeRefCS13715 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L}); + public static final BitSet FOLLOW_95_in_ruleWildcardTypeRefCS13728 = new BitSet(new long[]{0xFE0001FFE07000F0L,0x000000000820F4FFL}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS13749 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleID_in_entryRuleID13788 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleID13799 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SIMPLE_ID_in_ruleID13839 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ESCAPED_ID_in_ruleID13865 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier13911 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier13922 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleID_in_ruleIdentifier13968 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLOWER_in_entryRuleLOWER14013 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLOWER14024 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleLOWER14063 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL14108 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNUMBER_LITERAL14119 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL14158 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral14203 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral14214 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral14253 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUPPER_in_entryRuleUPPER14298 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUPPER14309 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleUPPER14349 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_40_in_ruleUPPER14373 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleURI_in_entryRuleURI14414 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleURI14425 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI14464 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_16_in_synpred5_InternalQVTcoreBase129 = new BitSet(new long[]{0x0000003FE0300030L}); public static final BitSet FOLLOW_ruleUnrealizedVariableCS_in_synpred5_InternalQVTcoreBase151 = new BitSet(new long[]{0x0000000000060000L}); public static final BitSet FOLLOW_ruleRealizedVariableCS_in_synpred5_InternalQVTcoreBase178 = new BitSet(new long[]{0x0000000000060000L}); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSemanticSequencer.java index 476a3b687..c5215014f 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSemanticSequencer.java @@ -91,11 +91,25 @@ public abstract class AbstractQVTcoreBaseSemanticSequencer extends EssentialOCLS sequence_ImportCS(context, (ImportCS) semanticObject); return; case BaseCSPackage.MULTIPLICITY_BOUNDS_CS: - sequence_MultiplicityBoundsCS(context, (MultiplicityBoundsCS) semanticObject); - return; + if(context == grammarAccess.getMultiplicityBoundsCSRule()) { + sequence_MultiplicityBoundsCS(context, (MultiplicityBoundsCS) semanticObject); + return; + } + else if(context == grammarAccess.getMultiplicityCSRule()) { + sequence_MultiplicityBoundsCS_MultiplicityCS(context, (MultiplicityBoundsCS) semanticObject); + return; + } + else break; case BaseCSPackage.MULTIPLICITY_STRING_CS: - sequence_MultiplicityStringCS(context, (MultiplicityStringCS) semanticObject); - return; + if(context == grammarAccess.getMultiplicityCSRule()) { + sequence_MultiplicityCS_MultiplicityStringCS(context, (MultiplicityStringCS) semanticObject); + return; + } + else if(context == grammarAccess.getMultiplicityStringCSRule()) { + sequence_MultiplicityStringCS(context, (MultiplicityStringCS) semanticObject); + return; + } + else break; case BaseCSPackage.PATH_ELEMENT_CS: if(context == grammarAccess.getFirstPathElementCSRule()) { sequence_FirstPathElementCS(context, (PathElementCS) semanticObject); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSyntacticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSyntacticSequencer.java index 0a8646dc4..77a0b5603 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSyntacticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/serializer/AbstractQVTcoreBaseSyntacticSequencer.java @@ -21,11 +21,13 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; public abstract class AbstractQVTcoreBaseSyntacticSequencer extends AbstractSyntacticSequencer { protected QVTcoreBaseGrammarAccess grammarAccess; + protected AbstractElementAlias match_MultiplicityCS_VerticalLineQuestionMarkKeyword_2_0_q; protected AbstractElementAlias match_TupleTypeCS___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q; @Inject protected void init(IGrammarAccess access) { grammarAccess = (QVTcoreBaseGrammarAccess) access; + match_MultiplicityCS_VerticalLineQuestionMarkKeyword_2_0_q = new TokenAlias(false, true, grammarAccess.getMultiplicityCSAccess().getVerticalLineQuestionMarkKeyword_2_0()); match_TupleTypeCS___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getTupleTypeCSAccess().getLeftParenthesisKeyword_1_0()), new TokenAlias(false, false, grammarAccess.getTupleTypeCSAccess().getRightParenthesisKeyword_1_2())); } @@ -41,7 +43,9 @@ public abstract class AbstractQVTcoreBaseSyntacticSequencer extends AbstractSynt List<INode> transitionNodes = collectNodes(fromNode, toNode); for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) { List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax); - if(match_TupleTypeCS___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q.equals(syntax)) + if(match_MultiplicityCS_VerticalLineQuestionMarkKeyword_2_0_q.equals(syntax)) + emit_MultiplicityCS_VerticalLineQuestionMarkKeyword_2_0_q(semanticObject, getLastNavigableState(), syntaxNodes); + else if(match_TupleTypeCS___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q.equals(syntax)) emit_TupleTypeCS___LeftParenthesisKeyword_1_0_RightParenthesisKeyword_1_2__q(semanticObject, getLastNavigableState(), syntaxNodes); else acceptNodes(getLastNavigableState(), syntaxNodes); } @@ -49,6 +53,21 @@ public abstract class AbstractQVTcoreBaseSyntacticSequencer extends AbstractSynt /** * Ambiguous syntax: + * '|?'? + * + * This ambiguous syntax occurs at: + * lowerBound=LOWER (ambiguity) ']' (rule end) + * stringBounds='*' (ambiguity) ']' (rule end) + * stringBounds='+' (ambiguity) ']' (rule end) + * stringBounds='?' (ambiguity) ']' (rule end) + * upperBound=UPPER (ambiguity) ']' (rule end) + */ + protected void emit_MultiplicityCS_VerticalLineQuestionMarkKeyword_2_0_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) { + acceptNodes(transition, nodes); + } + + /** + * Ambiguous syntax: * ('(' ')')? * * This ambiguous syntax occurs at: diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/services/QVTcoreBaseGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/services/QVTcoreBaseGrammarAccess.java index 649c83878..8fa020913 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/services/QVTcoreBaseGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase/src-gen/org/eclipse/qvtd/xtext/qvtcorebase/services/QVTcoreBaseGrammarAccess.java @@ -2077,7 +2077,7 @@ public class QVTcoreBaseGrammarAccess extends AbstractGrammarElementFinder { } //MultiplicityCS: - // "[" (MultiplicityBoundsCS | MultiplicityStringCS) "]"; + // "[" (MultiplicityBoundsCS | MultiplicityStringCS) ("|?" | isNullFree?="|1")? "]"; public BaseGrammarAccess.MultiplicityCSElements getMultiplicityCSAccess() { return gaEssentialOCL.getMultiplicityCSAccess(); } |