diff options
Diffstat (limited to 'plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd')
10 files changed, 986 insertions, 815 deletions
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin Binary files differindex e4bcf0096..a9924dc06 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcore.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java index 91813dc6b..5d5313222 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreGrammarResource.java @@ -509,7 +509,7 @@ public class QVTcoreGrammarResource 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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreStandaloneSetupGenerated.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreStandaloneSetupGenerated.java index 24497e357..027d37f0d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreStandaloneSetupGenerated.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/QVTcoreStandaloneSetupGenerated.java @@ -4,28 +4,18 @@ package org.eclipse.qvtd.xtext.qvtcore; 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 QVTcoreStandaloneSetupGenerated implements ISetup { - /** - * */ - public List<String> getFileExtensions() { - return Arrays.asList("qvtc"); - } - @Override public Injector createInjectorAndDoEMFRegistration() { org.eclipse.qvtd.xtext.qvtcorebase.QVTcoreBaseStandaloneSetup.doSetup(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g index 48d5524f1..dc1fe81f6 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g @@ -6384,9 +6384,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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.tokens b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.tokens index 096c43dc5..0e2d42003 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.tokens +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.tokens @@ -1,4 +1,4 @@ -'&&'=95 +'&&'=97 '('=27 ')'=28 '*'=32 @@ -21,7 +21,7 @@ '='=49 '>'=45 '>='=47 -'?'=93 +'?'=95 '?->'=58 '?.'=57 '@'=82 @@ -50,7 +50,7 @@ 'elseif'=90 'endif'=89 'enforce'=35 -'extends'=94 +'extends'=96 'false'=79 'if'=86 'implies'=54 @@ -77,6 +77,8 @@ 'xor'=53 '{'=21 '|'=24 +'|1'=94 +'|?'=93 '}'=23 RULE_ANY_OTHER=15 RULE_DOUBLE_QUOTED_STRING=10 @@ -170,3 +172,5 @@ T__92=92 T__93=93 T__94=94 T__95=95 +T__96=96 +T__97=97 diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreLexer.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreLexer.java index 92b718c38..4f2424af3 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreLexer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreLexer.java @@ -37,6 +37,8 @@ public class InternalQVTcoreLexer 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__97=97; + 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; @@ -49,8 +51,8 @@ public class InternalQVTcoreLexer extends Lexer { public static final int T__86=86; public static final int T__89=89; public static final int T__88=88; - public static final int RULE_LETTER_CHARACTER=9; public static final int RULE_ML_COMMENT=12; + public static final int RULE_LETTER_CHARACTER=9; public static final int T__71=71; public static final int T__72=72; public static final int T__70=70; @@ -1722,10 +1724,11 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = T__93; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:88:7: ( '?' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:88:9: '?' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:88:7: ( '|?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:88:9: '|?' { - match('?'); + match("|?"); + } @@ -1742,10 +1745,10 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = T__94; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:89:7: ( 'extends' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:89:9: 'extends' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:89:7: ( '|1' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:89:9: '|1' { - match("extends"); + match("|1"); } @@ -1763,8 +1766,49 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = T__95; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:90:7: ( '&&' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:90:9: '&&' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:90:7: ( '?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:90:9: '?' + { + match('?'); + + } + + 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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:91:7: ( 'extends' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:91:9: 'extends' + { + match("extends"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__96" + + // $ANTLR start "T__97" + public final void mT__97() throws RecognitionException { + try { + int _type = T__97; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:92:7: ( '&&' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:92:9: '&&' { match("&&"); @@ -1777,13 +1821,13 @@ public class InternalQVTcoreLexer extends Lexer { finally { } } - // $ANTLR end "T__95" + // $ANTLR end "T__97" // $ANTLR start "RULE_ESCAPED_CHARACTER" public final void mRULE_ESCAPED_CHARACTER() throws RecognitionException { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7218:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7218:35: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7238:33: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7238: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') ) { @@ -1807,8 +1851,8 @@ public class InternalQVTcoreLexer extends Lexer { // $ANTLR start "RULE_LETTER_CHARACTER" public final void mRULE_LETTER_CHARACTER() throws RecognitionException { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7220:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7220:34: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7240:32: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7240: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(); @@ -1833,11 +1877,11 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_DOUBLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7222:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7222:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7242:27: ( '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7242:29: '\"' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7222:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7242:33: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\"' ) ) )* loop1: do { int alt1=3; @@ -1853,14 +1897,14 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt1) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7222:34: RULE_ESCAPED_CHARACTER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7242:34: RULE_ESCAPED_CHARACTER { mRULE_ESCAPED_CHARACTER(); } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7222:57: ~ ( ( '\\\\' | '\"' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7242:57: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1897,11 +1941,11 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_SINGLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7244:27: ( '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7244:29: '\\'' ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7244:34: ( RULE_ESCAPED_CHARACTER | ~ ( ( '\\\\' | '\\'' ) ) )* loop2: do { int alt2=3; @@ -1917,14 +1961,14 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt2) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224:35: RULE_ESCAPED_CHARACTER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7244:35: RULE_ESCAPED_CHARACTER { mRULE_ESCAPED_CHARACTER(); } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224:58: ~ ( ( '\\\\' | '\\'' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7244:58: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1961,12 +2005,12 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_ML_SINGLE_QUOTED_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7226:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7226:32: '/\\'' ( options {greedy=false; } : . )* '\\'/' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7246:30: ( '/\\'' ( options {greedy=false; } : . )* '\\'/' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7246:32: '/\\'' ( options {greedy=false; } : . )* '\\'/' { match("/'"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7226:38: ( options {greedy=false; } : . )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7246:38: ( options {greedy=false; } : . )* loop3: do { int alt3=2; @@ -1991,7 +2035,7 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt3) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7226:66: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7246:66: . { matchAny(); @@ -2021,11 +2065,11 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_SIMPLE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7228:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7228:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7248:16: ( RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7248:18: RULE_LETTER_CHARACTER ( RULE_LETTER_CHARACTER | '0' .. '9' )* { mRULE_LETTER_CHARACTER(); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7228:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7248:40: ( RULE_LETTER_CHARACTER | '0' .. '9' )* loop4: do { int alt4=2; @@ -2074,8 +2118,8 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_ESCAPED_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7230:17: ( '_' RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7230:19: '_' RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7250:17: ( '_' RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7250:19: '_' RULE_SINGLE_QUOTED_STRING { match('_'); mRULE_SINGLE_QUOTED_STRING(); @@ -2095,10 +2139,10 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7232:10: ( ( '0' .. '9' )+ ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7232:12: ( '0' .. '9' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7252:10: ( ( '0' .. '9' )+ ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7252:12: ( '0' .. '9' )+ { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7232:12: ( '0' .. '9' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7252:12: ( '0' .. '9' )+ int cnt5=0; loop5: do { @@ -2112,7 +2156,7 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt5) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7232:13: '0' .. '9' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7252:13: '0' .. '9' { matchRange('0','9'); @@ -2144,12 +2188,12 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7234:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7234:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7254:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7254:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7234:24: ( options {greedy=false; } : . )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7254:24: ( options {greedy=false; } : . )* loop6: do { int alt6=2; @@ -2174,7 +2218,7 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt6) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7234:52: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7254:52: . { matchAny(); @@ -2204,12 +2248,12 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:17: ( '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:19: '--' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("--"); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:24: (~ ( ( '\\n' | '\\r' ) ) )* loop7: do { int alt7=2; @@ -2222,7 +2266,7 @@ public class InternalQVTcoreLexer extends Lexer { switch (alt7) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:24: ~ ( ( '\\n' | '\\r' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256: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(); @@ -2242,7 +2286,7 @@ public class InternalQVTcoreLexer extends Lexer { } } while (true); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:40: ( ( '\\r' )? '\\n' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:40: ( ( '\\r' )? '\\n' )? int alt9=2; int LA9_0 = input.LA(1); @@ -2251,9 +2295,9 @@ public class InternalQVTcoreLexer extends Lexer { } switch (alt9) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:41: ( '\\r' )? '\\n' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:41: ( '\\r' )? '\\n' { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:41: ( '\\r' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:41: ( '\\r' )? int alt8=2; int LA8_0 = input.LA(1); @@ -2262,7 +2306,7 @@ public class InternalQVTcoreLexer extends Lexer { } switch (alt8) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7236:41: '\\r' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7256:41: '\\r' { match('\r'); @@ -2294,10 +2338,10 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7238:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7258:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7258:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7238:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7258:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt10=0; loop10: do { @@ -2351,8 +2395,8 @@ public class InternalQVTcoreLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7240:16: ( . ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7240:18: . + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7260:16: ( . ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7260:18: . { matchAny(); @@ -2367,8 +2411,8 @@ public class InternalQVTcoreLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.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 | 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=90; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.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 | T__97 | 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=92; alt11 = dfa11.predict(input); switch (alt11) { case 1 : @@ -2932,70 +2976,84 @@ public class InternalQVTcoreLexer extends Lexer { } break; case 81 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:490: RULE_DOUBLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:490: T__96 { - mRULE_DOUBLE_QUOTED_STRING(); + mT__96(); } break; case 82 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:516: RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:496: T__97 { - mRULE_SINGLE_QUOTED_STRING(); + mT__97(); } break; case 83 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:542: RULE_ML_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:502: RULE_DOUBLE_QUOTED_STRING { - mRULE_ML_SINGLE_QUOTED_STRING(); + mRULE_DOUBLE_QUOTED_STRING(); } break; case 84 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:571: RULE_SIMPLE_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:528: RULE_SINGLE_QUOTED_STRING { - mRULE_SIMPLE_ID(); + mRULE_SINGLE_QUOTED_STRING(); } break; case 85 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:586: RULE_ESCAPED_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:554: RULE_ML_SINGLE_QUOTED_STRING { - mRULE_ESCAPED_ID(); + mRULE_ML_SINGLE_QUOTED_STRING(); } break; case 86 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:602: RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:583: RULE_SIMPLE_ID { - mRULE_INT(); + mRULE_SIMPLE_ID(); } break; case 87 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:611: RULE_ML_COMMENT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:598: RULE_ESCAPED_ID { - mRULE_ML_COMMENT(); + mRULE_ESCAPED_ID(); } break; case 88 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:627: RULE_SL_COMMENT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:614: RULE_INT { - mRULE_SL_COMMENT(); + mRULE_INT(); } break; case 89 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:643: RULE_WS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:623: RULE_ML_COMMENT { - mRULE_WS(); + mRULE_ML_COMMENT(); } break; case 90 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:651: RULE_ANY_OTHER + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:639: RULE_SL_COMMENT + { + mRULE_SL_COMMENT(); + + } + break; + case 91 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:655: RULE_WS + { + mRULE_WS(); + + } + break; + case 92 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:1:663: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -3009,17 +3067,17 @@ public class InternalQVTcoreLexer extends Lexer { protected DFA11 dfa11 = new DFA11(this); static final String DFA11_eotS = - "\1\uffff\4\72\2\uffff\1\72\2\uffff\1\72\2\uffff\1\112\2\uffff\5\72\1\130\1\72\1\135\1\137\1\141\1\145\1\uffff\3\72\1\153\1\156\13\72\1\uffff\1\72\2\uffff\1\72\3\70\1\72\4\uffff\1\72\1\uffff\1\72\1\u008b\1\72\1\u008d\1\72\2\uffff\1\72\2\uffff\1\72\7\uffff\11\72\3\uffff\2\72\14\uffff\1\72\1\u00a0\1\72\5\uffff\16\72\1\uffff\1\72\2\uffff\1\72\6\uffff\1\72\1\u00b4\1\72\1\uffff\1\72\1\uffff\16\72\1\u00c6\1\u00c7\1\72\1\u00c9\1\uffff\1\u00ca\1\u00cb\2\72\1\u00ce\3\72\1\u00d2\7\72\1\u00dc\2\72\1\uffff\6\72\1\u00e5\3\72\1\u00ea\3\72\1\u00ee\1\u00ef\1\72\2\uffff\1\u00f1\3\uffff\2\72\1\uffff\1\72\1\u00f5\1\72\1\uffff\11\72\1\uffff\1\u0100\6\72\1\u0107\1\uffff\1\u0108\1\72\1\u010a\1\72\1\uffff\1\72\1\u010d\1\72\2\uffff\1\72\1\uffff\1\u0110\2\72\1\uffff\11\72\1\u011c\1\uffff\2\72\1\u0120\3\72\2\uffff\1\72\1\uffff\1\u0125\1\72\1\uffff\2\72\1\uffff\2\72\1\u012b\2\72\1\u012e\4\72\1\u0133\1\uffff\1\u0134\1\u0135\1\u0136\1\uffff\1\u0137\1\u0138\1\u0139\1\u013a\1\uffff\1\u013b\1\72\1\u013d\1\u013e\1\u013f\1\uffff\2\72\1\uffff\1\72\1\u0143\2\72\11\uffff\1\72\3\uffff\1\u0147\2\72\1\uffff\3\72\1\uffff\6\72\1\u0153\1\u0154\1\u0155\2\72\3\uffff\4\72\1\u015c\1\72\1\uffff\1\72\1\u015f\1\uffff"; + "\1\uffff\4\72\2\uffff\1\72\1\uffff\1\106\1\72\2\uffff\1\114\2\uffff\5\72\1\132\1\72\1\137\1\141\1\143\1\147\1\uffff\3\72\1\155\1\160\13\72\1\uffff\1\72\2\uffff\1\72\3\70\1\72\4\uffff\1\72\1\uffff\1\72\1\u008d\1\72\1\u008f\1\72\2\uffff\1\72\4\uffff\1\72\7\uffff\11\72\3\uffff\2\72\14\uffff\1\72\1\u00a2\1\72\5\uffff\16\72\1\uffff\1\72\2\uffff\1\72\6\uffff\1\72\1\u00b6\1\72\1\uffff\1\72\1\uffff\16\72\1\u00c8\1\u00c9\1\72\1\u00cb\1\uffff\1\u00cc\1\u00cd\2\72\1\u00d0\3\72\1\u00d4\7\72\1\u00de\2\72\1\uffff\6\72\1\u00e7\3\72\1\u00ec\3\72\1\u00f0\1\u00f1\1\72\2\uffff\1\u00f3\3\uffff\2\72\1\uffff\1\72\1\u00f7\1\72\1\uffff\11\72\1\uffff\1\u0102\6\72\1\u0109\1\uffff\1\u010a\1\72\1\u010c\1\72\1\uffff\1\72\1\u010f\1\72\2\uffff\1\72\1\uffff\1\u0112\2\72\1\uffff\11\72\1\u011e\1\uffff\2\72\1\u0122\3\72\2\uffff\1\72\1\uffff\1\u0127\1\72\1\uffff\2\72\1\uffff\2\72\1\u012d\2\72\1\u0130\4\72\1\u0135\1\uffff\1\u0136\1\u0137\1\u0138\1\uffff\1\u0139\1\u013a\1\u013b\1\u013c\1\uffff\1\u013d\1\72\1\u013f\1\u0140\1\u0141\1\uffff\2\72\1\uffff\1\72\1\u0145\2\72\11\uffff\1\72\3\uffff\1\u0149\2\72\1\uffff\3\72\1\uffff\6\72\1\u0155\1\u0156\1\u0157\2\72\3\uffff\4\72\1\u015e\1\72\1\uffff\1\72\1\u0161\1\uffff"; static final String DFA11_eofS = - "\u0160\uffff"; + "\u0162\uffff"; static final String DFA11_minS = - "\1\0\1\145\1\141\1\146\1\145\2\uffff\1\150\2\uffff\1\163\2\uffff\1\72\2\uffff\1\150\1\154\1\165\1\150\1\145\1\55\1\157\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\4\uffff\1\146\1\uffff\1\160\1\60\1\160\1\60\1\141\2\uffff\1\145\2\uffff\1\145\7\uffff\1\145\1\144\1\163\1\164\1\145\1\141\1\145\1\142\1\164\3\uffff\1\164\1\154\14\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\141\1\60\1\141\1\uffff\1\154\1\uffff\1\151\1\154\1\162\1\163\1\143\1\157\1\151\2\145\1\162\1\156\1\145\1\156\1\162\2\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\165\1\uffff\1\154\1\162\1\151\1\156\1\151\1\145\1\60\1\153\1\162\1\146\1\60\1\156\1\171\1\163\2\60\1\141\2\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\154\1\151\1\164\2\145\1\172\1\60\1\uffff\1\60\1\143\1\60\1\146\1\uffff\1\144\1\60\1\146\2\uffff\1\162\1\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\164\1\144\1\60\2\163\1\145\2\uffff\1\145\1\uffff\1\60\1\163\1\uffff\1\157\1\171\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\60\1\uffff\3\60\1\uffff\4\60\1\uffff\1\60\1\162\3\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\11\uffff\1\155\3\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\1\145\1\141\1\146\1\145\2\uffff\1\150\1\uffff\1\61\1\163\2\uffff\1\72\2\uffff\1\150\1\154\1\165\1\150\1\145\1\55\1\157\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\4\uffff\1\146\1\uffff\1\160\1\60\1\160\1\60\1\141\2\uffff\1\145\4\uffff\1\145\7\uffff\1\145\1\144\1\163\1\164\1\145\1\141\1\145\1\142\1\164\3\uffff\1\164\1\154\14\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\141\1\60\1\141\1\uffff\1\154\1\uffff\1\151\1\154\1\162\1\163\1\143\1\157\1\151\2\145\1\162\1\156\1\145\1\156\1\162\2\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\165\1\uffff\1\154\1\162\1\151\1\156\1\151\1\145\1\60\1\153\1\162\1\146\1\60\1\156\1\171\1\163\2\60\1\141\2\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\154\1\151\1\164\2\145\1\172\1\60\1\uffff\1\60\1\143\1\60\1\146\1\uffff\1\144\1\60\1\146\2\uffff\1\162\1\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\164\1\144\1\60\2\163\1\145\2\uffff\1\145\1\uffff\1\60\1\163\1\uffff\1\157\1\171\1\uffff\1\156\1\162\1\60\1\143\1\164\1\60\1\141\2\144\1\164\1\60\1\uffff\3\60\1\uffff\4\60\1\uffff\1\60\1\162\3\60\1\uffff\2\145\1\uffff\1\154\1\60\1\123\1\151\11\uffff\1\155\3\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\1\145\1\141\1\156\1\145\2\uffff\1\150\2\uffff\1\163\2\uffff\1\75\2\uffff\1\150\1\170\1\165\1\162\1\151\1\76\1\165\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\4\uffff\1\146\1\uffff\1\160\1\172\1\160\1\172\1\146\2\uffff\1\145\2\uffff\1\145\7\uffff\1\145\1\146\1\163\1\164\1\145\1\165\1\145\1\142\1\164\3\uffff\1\164\1\154\14\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\141\1\172\1\141\1\uffff\1\157\1\uffff\1\151\1\154\1\162\1\163\1\143\1\157\1\151\2\145\1\162\1\156\1\145\1\156\1\162\2\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\165\1\uffff\1\154\1\162\1\151\1\156\1\151\1\145\1\172\1\153\1\162\1\146\1\172\1\156\1\171\1\163\2\172\1\141\2\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\154\1\151\1\164\2\145\2\172\1\uffff\1\172\1\143\1\172\1\146\1\uffff\1\144\1\172\1\146\2\uffff\1\162\1\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\164\1\144\1\172\2\163\1\145\2\uffff\1\145\1\uffff\1\172\1\163\1\uffff\1\157\1\171\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\172\1\uffff\3\172\1\uffff\4\172\1\uffff\1\172\1\162\3\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\11\uffff\1\155\3\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\1\145\1\141\1\156\1\145\2\uffff\1\150\1\uffff\1\77\1\163\2\uffff\1\75\2\uffff\1\150\1\170\1\165\1\162\1\151\1\76\1\165\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\4\uffff\1\146\1\uffff\1\160\1\172\1\160\1\172\1\146\2\uffff\1\145\4\uffff\1\145\7\uffff\1\145\1\146\1\163\1\164\1\145\1\165\1\145\1\142\1\164\3\uffff\1\164\1\154\14\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\141\1\172\1\141\1\uffff\1\157\1\uffff\1\151\1\154\1\162\1\163\1\143\1\157\1\151\2\145\1\162\1\156\1\145\1\156\1\162\2\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\165\1\uffff\1\154\1\162\1\151\1\156\1\151\1\145\1\172\1\153\1\162\1\146\1\172\1\156\1\171\1\163\2\172\1\141\2\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\154\1\151\1\164\2\145\2\172\1\uffff\1\172\1\143\1\172\1\146\1\uffff\1\144\1\172\1\146\2\uffff\1\162\1\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\164\1\144\1\172\2\163\1\145\2\uffff\1\145\1\uffff\1\172\1\163\1\uffff\1\157\1\171\1\uffff\1\156\1\162\1\172\1\143\1\164\1\172\1\141\2\144\1\164\1\172\1\uffff\3\172\1\uffff\4\172\1\uffff\1\172\1\162\3\172\1\uffff\2\145\1\uffff\1\154\1\172\1\123\1\151\11\uffff\1\155\3\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 = - "\5\uffff\1\5\1\6\1\uffff\1\10\1\11\1\uffff\1\14\1\15\1\uffff\1\21\1\22\13\uffff\1\42\20\uffff\1\103\1\uffff\1\105\1\106\5\uffff\1\124\1\126\1\131\1\132\1\uffff\1\124\5\uffff\1\5\1\6\1\uffff\1\10\1\11\1\uffff\1\14\1\15\1\20\1\25\1\16\1\21\1\22\11\uffff\1\51\1\130\1\32\2\uffff\1\123\1\127\1\34\1\74\1\35\1\40\1\36\1\41\1\43\1\76\1\37\1\42\3\uffff\1\73\1\50\1\52\1\53\1\116\16\uffff\1\103\1\uffff\1\105\1\106\1\uffff\1\120\1\121\1\122\1\125\1\126\1\131\3\uffff\1\3\1\uffff\1\107\22\uffff\1\45\23\uffff\1\2\21\uffff\1\114\1\33\1\uffff\1\44\1\46\1\54\2\uffff\1\67\3\uffff\1\66\11\uffff\1\104\10\uffff\1\13\4\uffff\1\111\3\uffff\1\77\1\110\1\uffff\1\102\3\uffff\1\60\12\uffff\1\115\6\uffff\1\7\1\23\1\uffff\1\112\2\uffff\1\26\2\uffff\1\55\13\uffff\1\100\3\uffff\1\17\4\uffff\1\113\5\uffff\1\61\2\uffff\1\63\4\uffff\1\75\1\1\1\101\1\12\1\47\1\4\1\30\1\24\1\117\1\uffff\1\31\1\56\1\57\3\uffff\1\65\3\uffff\1\70\13\uffff\1\64\1\72\1\71\6\uffff\1\27\2\uffff\1\62"; + "\5\uffff\1\5\1\6\1\uffff\1\10\2\uffff\1\14\1\15\1\uffff\1\21\1\22\13\uffff\1\42\20\uffff\1\103\1\uffff\1\105\1\106\5\uffff\1\126\1\130\1\133\1\134\1\uffff\1\126\5\uffff\1\5\1\6\1\uffff\1\10\1\116\1\117\1\11\1\uffff\1\14\1\15\1\20\1\25\1\16\1\21\1\22\11\uffff\1\51\1\132\1\32\2\uffff\1\125\1\131\1\34\1\74\1\35\1\40\1\36\1\41\1\43\1\76\1\37\1\42\3\uffff\1\73\1\50\1\52\1\53\1\120\16\uffff\1\103\1\uffff\1\105\1\106\1\uffff\1\122\1\123\1\124\1\127\1\130\1\133\3\uffff\1\3\1\uffff\1\107\22\uffff\1\45\23\uffff\1\2\21\uffff\1\114\1\33\1\uffff\1\44\1\46\1\54\2\uffff\1\67\3\uffff\1\66\11\uffff\1\104\10\uffff\1\13\4\uffff\1\111\3\uffff\1\77\1\110\1\uffff\1\102\3\uffff\1\60\12\uffff\1\115\6\uffff\1\7\1\23\1\uffff\1\112\2\uffff\1\26\2\uffff\1\55\13\uffff\1\100\3\uffff\1\17\4\uffff\1\113\5\uffff\1\61\2\uffff\1\63\4\uffff\1\75\1\1\1\101\1\12\1\47\1\4\1\30\1\24\1\121\1\uffff\1\31\1\56\1\57\3\uffff\1\65\3\uffff\1\70\13\uffff\1\64\1\72\1\71\6\uffff\1\27\2\uffff\1\62"; static final String DFA11_specialS = - "\1\1\61\uffff\1\0\1\2\u012c\uffff}>"; + "\1\0\61\uffff\1\2\1\1\u012e\uffff}>"; static final String[] DFA11_transitionS = { "\11\70\2\67\2\70\1\67\22\70\1\67\1\70\1\62\3\70\1\61\1\63\1\13\1\14\1\16\1\30\1\5\1\25\1\37\1\27\12\66\1\15\1\17\1\32\1\33\1\31\1\40\1\54\1\65\1\43\1\51\5\65\1\44\2\65\1\52\1\41\1\65\1\50\2\65\1\45\1\46\1\42\1\47\5\65\1\56\1\70\1\57\1\70\1\64\1\70\1\34\1\65\1\20\1\1\1\21\1\53\2\65\1\3\2\65\1\24\1\2\1\26\1\35\1\55\1\22\1\4\1\60\1\23\1\12\1\65\1\7\1\36\2\65\1\6\1\11\1\10\uff82\70", "\1\71", @@ -3030,88 +3088,90 @@ public class InternalQVTcoreLexer extends Lexer { "", "\1\102", "", + "\1\105\15\uffff\1\104", + "\1\107", "", - "\1\105", "", + "\1\112\2\uffff\1\113", "", - "\1\110\2\uffff\1\111", "", - "", - "\1\115", - "\1\117\1\uffff\1\116\11\uffff\1\120", - "\1\121", - "\1\123\11\uffff\1\122", - "\1\125\3\uffff\1\124", - "\1\127\20\uffff\1\126", - "\1\131\5\uffff\1\132", - "\1\133\2\uffff\1\134", - "\1\136", + "\1\117", + "\1\121\1\uffff\1\120\11\uffff\1\122", + "\1\123", + "\1\125\11\uffff\1\124", + "\1\127\3\uffff\1\126", + "\1\131\20\uffff\1\130", + "\1\133\5\uffff\1\134", + "\1\135\2\uffff\1\136", "\1\140", - "\1\144\17\uffff\1\142\1\143", + "\1\142", + "\1\146\17\uffff\1\144\1\145", "", - "\1\147", - "\1\150", "\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\153", + "\1\154", + "\1\157\1\156", + "\1\161", + "\1\162", + "\1\164\15\uffff\1\163", + "\1\165", + "\1\166", + "\1\170\16\uffff\1\167", + "\1\171", + "\1\172\16\uffff\1\173", "\1\174", - "", + "\1\175", "\1\176", "", + "\1\u0080", + "", "", - "\1\u0081", - "\1\u0082", - "\0\u0083", - "\0\u0084", - "\1\u0085", + "\1\u0083", + "\1\u0084", + "\0\u0085", + "\0\u0086", + "\1\u0087", "", "", "", "", - "\1\u0088", + "\1\u008a", "", - "\1\u0089", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\25\72\1\u008a\4\72", - "\1\u008c", + "\1\u008b", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\25\72\1\u008c\4\72", + "\1\u008e", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u008f\4\uffff\1\u008e", + "\1\u0091\4\uffff\1\u0090", "", "", - "\1\u0090", + "\1\u0092", "", "", - "\1\u0091", "", "", + "\1\u0093", "", "", "", "", "", - "\1\u0092", - "\1\u0094\1\uffff\1\u0093", - "\1\u0095", - "\1\u0096", + "", + "", + "\1\u0094", + "\1\u0096\1\uffff\1\u0095", "\1\u0097", - "\1\u0098\23\uffff\1\u0099", - "\1\u009a", - "\1\u009b", + "\1\u0098", + "\1\u0099", + "\1\u009a\23\uffff\1\u009b", "\1\u009c", + "\1\u009d", + "\1\u009e", "", "", "", - "\1\u009d", - "\1\u009e", + "\1\u009f", + "\1\u00a0", "", "", "", @@ -3124,47 +3184,45 @@ public class InternalQVTcoreLexer extends Lexer { "", "", "", - "\1\u009f", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u00a1", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00a3", "", "", "", "", "", - "\1\u00a2", - "\1\u00a3", "\1\u00a4", "\1\u00a5", "\1\u00a6", "\1\u00a7", "\1\u00a8", - "\1\u00aa\2\uffff\1\u00a9", - "\1\u00ab", - "\1\u00ac", + "\1\u00a9", + "\1\u00aa", + "\1\u00ac\2\uffff\1\u00ab", "\1\u00ad", "\1\u00ae", "\1\u00af", "\1\u00b0", - "", "\1\u00b1", + "\1\u00b2", "", + "\1\u00b3", "", - "\1\u00b2", + "", + "\1\u00b4", "", "", "", "", "", "", - "\1\u00b3", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u00b5", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00b7", "", - "\1\u00b7\2\uffff\1\u00b6", + "\1\u00b9\2\uffff\1\u00b8", "", - "\1\u00b8", - "\1\u00b9", "\1\u00ba", "\1\u00bb", "\1\u00bc", @@ -3177,63 +3235,63 @@ public class InternalQVTcoreLexer extends Lexer { "\1\u00c3", "\1\u00c4", "\1\u00c5", + "\1\u00c6", + "\1\u00c7", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u00c8", + "\1\u00ca", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u00cc", - "\1\u00cd", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00ce", "\1\u00cf", - "\1\u00d0", - "\1\u00d1", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00d1", + "\1\u00d2", "\1\u00d3", - "\1\u00d4", - "\1\u00d5\7\uffff\1\u00d6\14\uffff\1\u00d7", - "\1\u00d8", - "\1\u00d9", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00d5", + "\1\u00d6", + "\1\u00d7\7\uffff\1\u00d8\14\uffff\1\u00d9", "\1\u00da", "\1\u00db", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00dc", "\1\u00dd", - "\1\u00de", - "", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u00df", "\1\u00e0", + "", "\1\u00e1", "\1\u00e2", "\1\u00e3", "\1\u00e4", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u00e5", "\1\u00e6", - "\1\u00e7", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u00e8", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\10\72\1\u00e9\21\72", - "\1\u00eb", - "\1\u00ec", + "\1\u00e9", + "\1\u00ea", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\10\72\1\u00eb\21\72", "\1\u00ed", + "\1\u00ee", + "\1\u00ef", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u00f0", + "\1\u00f2", "", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", "", "", - "\1\u00f2", - "\1\u00f3", - "", "\1\u00f4", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u00f6", + "\1\u00f5", "", - "\1\u00f7", + "\1\u00f6", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u00f8", + "", "\1\u00f9", "\1\u00fa", "\1\u00fb", @@ -3241,34 +3299,34 @@ public class InternalQVTcoreLexer extends Lexer { "\1\u00fd", "\1\u00fe", "\1\u00ff", + "\1\u0100", + "\1\u0101", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u0101", - "\1\u0102", "\1\u0103", "\1\u0104", "\1\u0105", "\1\u0106", + "\1\u0107", + "\1\u0108", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u0109", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u010b", - "", - "\1\u010c", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u010e", + "\1\u010d", "", + "\1\u010e", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u0110", "", - "\1\u010f", "", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u0111", - "\1\u0112", "", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u0113", "\1\u0114", + "", "\1\u0115", "\1\u0116", "\1\u0117", @@ -3276,34 +3334,36 @@ public class InternalQVTcoreLexer extends Lexer { "\1\u0119", "\1\u011a", "\1\u011b", + "\1\u011c", + "\1\u011d", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", - "\1\u011d", - "\1\u011e", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\22\72\1\u011f\7\72", - "\1\u0121", - "\1\u0122", + "\1\u011f", + "\1\u0120", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\22\72\1\u0121\7\72", "\1\u0123", - "", - "", "\1\u0124", + "\1\u0125", + "", "", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u0126", "", - "\1\u0127", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u0128", "", "\1\u0129", "\1\u012a", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "", + "\1\u012b", "\1\u012c", - "\1\u012d", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u012e", "\1\u012f", - "\1\u0130", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\1\u0131", "\1\u0132", + "\1\u0133", + "\1\u0134", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", @@ -3316,18 +3376,18 @@ public class InternalQVTcoreLexer extends Lexer { "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u013c", + "\1\u013e", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "", - "\1\u0140", - "\1\u0141", - "", "\1\u0142", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u0143", + "", "\1\u0144", - "\1\u0145", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u0146", + "\1\u0147", "", "", "", @@ -3337,40 +3397,40 @@ public class InternalQVTcoreLexer extends Lexer { "", "", "", - "\1\u0146", + "\1\u0148", "", "", "", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u0148", - "\1\u0149", - "", "\1\u014a", "\1\u014b", - "\1\u014c", "", + "\1\u014c", "\1\u014d", "\1\u014e", + "", "\1\u014f", "\1\u0150", "\1\u0151", "\1\u0152", + "\1\u0153", + "\1\u0154", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", - "\1\u0156", - "\1\u0157", + "\1\u0158", + "\1\u0159", "", "", "", - "\1\u0158", - "\1\u0159", "\1\u015a", "\1\u015b", - "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u015c", "\1\u015d", + "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", + "\1\u015f", "", - "\1\u015e", + "\1\u0160", "\12\72\7\uffff\32\72\4\uffff\1\72\1\uffff\32\72", "" }; @@ -3405,23 +3465,13 @@ public class InternalQVTcoreLexer 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 | T__95 | 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 | T__97 | 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); - - s = -1; - if ( ((LA11_50>='\u0000' && LA11_50<='\uFFFF')) ) {s = 131;} - - else s = 56; - - if ( s>=0 ) return s; - break; - case 1 : int LA11_0 = input.LA(1); s = -1; @@ -3539,11 +3589,21 @@ public class InternalQVTcoreLexer extends Lexer { if ( s>=0 ) return s; break; - case 2 : + case 1 : int LA11_51 = input.LA(1); s = -1; - if ( ((LA11_51>='\u0000' && LA11_51<='\uFFFF')) ) {s = 132;} + if ( ((LA11_51>='\u0000' && LA11_51<='\uFFFF')) ) {s = 134;} + + else s = 56; + + if ( s>=0 ) return s; + break; + case 2 : + int LA11_50 = input.LA(1); + + s = -1; + if ( ((LA11_50>='\u0000' && LA11_50<='\uFFFF')) ) {s = 133;} else s = 56; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java index 0caa06fcc..3549376a3 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcoreParser.java @@ -22,7 +22,7 @@ import java.util.HashMap; @SuppressWarnings("all") public class InternalQVTcoreParser 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", "'default'", "'map'", "'in'", "'refines'", "','", "'{'", "'where'", "'}'", "'|'", "'imports'", "'uses'", "'('", "')'", "':'", "'import'", "'::'", "'*'", "';'", "'check'", "'enforce'", "':='", "'query'", "'transformation'", "'realize'", "'library'", "'-'", "'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'", "'['", "']'", "'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", "'default'", "'map'", "'in'", "'refines'", "','", "'{'", "'where'", "'}'", "'|'", "'imports'", "'uses'", "'('", "')'", "':'", "'import'", "'::'", "'*'", "';'", "'check'", "'enforce'", "':='", "'query'", "'transformation'", "'realize'", "'library'", "'-'", "'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'", "'['", "']'", "'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 InternalQVTcoreParser 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__97=97; + 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; @@ -1183,12 +1185,12 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else if ( (LA11_0==39) ) { int LA11_2 = input.LA(2); - if ( ((LA11_2>=RULE_SIMPLE_ID && LA11_2<=RULE_ESCAPED_ID)||LA11_2==17||LA11_2==19||(LA11_2>=25 && LA11_2<=26)||LA11_2==30||(LA11_2>=34 && LA11_2<=35)||(LA11_2>=37 && LA11_2<=40)) ) { - alt11=2; - } - else if ( (LA11_2==20||LA11_2==24||LA11_2==29||LA11_2==36) ) { + if ( (LA11_2==20||LA11_2==24||LA11_2==29||LA11_2==36) ) { alt11=1; } + else if ( ((LA11_2>=RULE_SIMPLE_ID && LA11_2<=RULE_ESCAPED_ID)||LA11_2==17||LA11_2==19||(LA11_2>=25 && LA11_2<=26)||LA11_2==30||(LA11_2>=34 && LA11_2<=35)||(LA11_2>=37 && LA11_2<=40)) ) { + alt11=2; + } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = @@ -1321,12 +1323,12 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else if ( (LA12_0==39) ) { int LA12_2 = input.LA(2); - if ( ((LA12_2>=RULE_SIMPLE_ID && LA12_2<=RULE_ESCAPED_ID)||LA12_2==17||LA12_2==19||(LA12_2>=25 && LA12_2<=26)||LA12_2==30||(LA12_2>=34 && LA12_2<=35)||(LA12_2>=37 && LA12_2<=40)) ) { - alt12=2; - } - else if ( (LA12_2==20||LA12_2==24||LA12_2==29||LA12_2==36) ) { + if ( (LA12_2==20||LA12_2==24||LA12_2==29||LA12_2==36) ) { alt12=1; } + else if ( ((LA12_2>=RULE_SIMPLE_ID && LA12_2<=RULE_ESCAPED_ID)||LA12_2==17||LA12_2==19||(LA12_2>=25 && LA12_2<=26)||LA12_2==30||(LA12_2>=34 && LA12_2<=35)||(LA12_2>=37 && LA12_2<=40)) ) { + alt12=2; + } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = @@ -1530,12 +1532,12 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else if ( (LA15_0==39) ) { int LA15_2 = input.LA(2); - if ( (LA15_2==20||LA15_2==23||LA15_2==29||LA15_2==36) ) { - alt15=1; - } - else if ( ((LA15_2>=RULE_SIMPLE_ID && LA15_2<=RULE_ESCAPED_ID)||LA15_2==17||LA15_2==19||(LA15_2>=25 && LA15_2<=26)||LA15_2==30||(LA15_2>=34 && LA15_2<=35)||(LA15_2>=37 && LA15_2<=40)) ) { + if ( ((LA15_2>=RULE_SIMPLE_ID && LA15_2<=RULE_ESCAPED_ID)||LA15_2==17||LA15_2==19||(LA15_2>=25 && LA15_2<=26)||LA15_2==30||(LA15_2>=34 && LA15_2<=35)||(LA15_2>=37 && LA15_2<=40)) ) { alt15=2; } + else if ( (LA15_2==20||LA15_2==23||LA15_2==29||LA15_2==36) ) { + alt15=1; + } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = @@ -18178,12 +18180,14 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMultiplicityCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6354:1: ruleMultiplicityCS returns [EObject current=null] : (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6354: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; @@ -18192,11 +18196,11 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6357:28: ( (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6357: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358:1: (otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358:3: otherlv_0= '[' (this_MultiplicityBoundsCS_1= ruleMultiplicityBoundsCS | this_MultiplicityStringCS_2= ruleMultiplicityStringCS ) otherlv_3= ']' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6358: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,84,FollowSets000.FOLLOW_84_in_ruleMultiplicityCS13809); if (state.failed) return current; if ( state.backtracking==0 ) { @@ -18211,7 +18215,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( (LA114_0==RULE_INT) ) { alt114=1; } - else if ( (LA114_0==32||LA114_0==44||LA114_0==93) ) { + else if ( (LA114_0==32||LA114_0==44||LA114_0==95) ) { alt114=2; } else { @@ -18279,10 +18283,68 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,85,FollowSets000.FOLLOW_85_in_ruleMultiplicityCS13877); if (state.failed) return current; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6387:2: (otherlv_3= '|?' | ( (lv_isNullFree_4_0= '|1' ) ) )? + int alt115=3; + int LA115_0 = input.LA(1); + + if ( (LA115_0==93) ) { + alt115=1; + } + else if ( (LA115_0==94) ) { + alt115=2; + } + switch (alt115) { + case 1 : + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6387:4: otherlv_3= '|?' + { + otherlv_3=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleMultiplicityCS13878); 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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6392:6: ( (lv_isNullFree_4_0= '|1' ) ) + { + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6392:6: ( (lv_isNullFree_4_0= '|1' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6393:1: (lv_isNullFree_4_0= '|1' ) + { + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6393:1: (lv_isNullFree_4_0= '|1' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6394:3: lv_isNullFree_4_0= '|1' + { + lv_isNullFree_4_0=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleMultiplicityCS13902); 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,85,FollowSets000.FOLLOW_85_in_ruleMultiplicityCS13929); if (state.failed) return current; if ( state.backtracking==0 ) { - newLeafNode(otherlv_3, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_2()); + newLeafNode(otherlv_5, grammarAccess.getMultiplicityCSAccess().getRightSquareBracketKeyword_3()); } @@ -18308,7 +18370,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleMultiplicityStringCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6399:1: entryRuleMultiplicityStringCS returns [EObject current=null] : iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6419:1: entryRuleMultiplicityStringCS returns [EObject current=null] : iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ; public final EObject entryRuleMultiplicityStringCS() throws RecognitionException { EObject current = null; @@ -18316,13 +18378,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6400:2: (iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6401:2: iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6420:2: (iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6421:2: iv_ruleMultiplicityStringCS= ruleMultiplicityStringCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getMultiplicityStringCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS13913); + pushFollow(FollowSets000.FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS13965); iv_ruleMultiplicityStringCS=ruleMultiplicityStringCS(); state._fsp--; @@ -18330,7 +18392,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleMultiplicityStringCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleMultiplicityStringCS13923); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleMultiplicityStringCS13975); if (state.failed) return current; } @@ -18348,7 +18410,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMultiplicityStringCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6408:1: ruleMultiplicityStringCS returns [EObject current=null] : ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6428: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; @@ -18359,46 +18421,46 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6411:28: ( ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6412:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6431:28: ( ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6432:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6412:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6413:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6432:1: ( ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6433:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6413:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6414:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6433:1: ( (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6434:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6414:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) - int alt115=3; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6434:1: (lv_stringBounds_0_1= '*' | lv_stringBounds_0_2= '+' | lv_stringBounds_0_3= '?' ) + int alt116=3; switch ( input.LA(1) ) { case 32: { - alt115=1; + alt116=1; } break; case 44: { - alt115=2; + alt116=2; } break; - case 93: + case 95: { - alt115=3; + alt116=3; } break; default: if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 115, 0, input); + new NoViableAltException("", 116, 0, input); throw nvae; } - switch (alt115) { + switch (alt116) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6415:3: lv_stringBounds_0_1= '*' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6435:3: lv_stringBounds_0_1= '*' { - lv_stringBounds_0_1=(Token)match(input,32,FollowSets000.FOLLOW_32_in_ruleMultiplicityStringCS13967); if (state.failed) return current; + lv_stringBounds_0_1=(Token)match(input,32,FollowSets000.FOLLOW_32_in_ruleMultiplicityStringCS14019); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_1, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsAsteriskKeyword_0_0()); @@ -18416,9 +18478,9 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6427:8: lv_stringBounds_0_2= '+' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6447:8: lv_stringBounds_0_2= '+' { - lv_stringBounds_0_2=(Token)match(input,44,FollowSets000.FOLLOW_44_in_ruleMultiplicityStringCS13996); if (state.failed) return current; + lv_stringBounds_0_2=(Token)match(input,44,FollowSets000.FOLLOW_44_in_ruleMultiplicityStringCS14048); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_2, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsPlusSignKeyword_0_1()); @@ -18436,9 +18498,9 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6439:8: lv_stringBounds_0_3= '?' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6459:8: lv_stringBounds_0_3= '?' { - lv_stringBounds_0_3=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleMultiplicityStringCS14025); if (state.failed) return current; + lv_stringBounds_0_3=(Token)match(input,95,FollowSets000.FOLLOW_95_in_ruleMultiplicityStringCS14077); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(lv_stringBounds_0_3, grammarAccess.getMultiplicityStringCSAccess().getStringBoundsQuestionMarkKeyword_0_2()); @@ -18484,7 +18546,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRulePathNameCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6462:1: entryRulePathNameCS returns [EObject current=null] : iv_rulePathNameCS= rulePathNameCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6482:1: entryRulePathNameCS returns [EObject current=null] : iv_rulePathNameCS= rulePathNameCS EOF ; public final EObject entryRulePathNameCS() throws RecognitionException { EObject current = null; @@ -18492,13 +18554,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6463:2: (iv_rulePathNameCS= rulePathNameCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6464:2: iv_rulePathNameCS= rulePathNameCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6483:2: (iv_rulePathNameCS= rulePathNameCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6484:2: iv_rulePathNameCS= rulePathNameCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSRule()); } - pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_entryRulePathNameCS14076); + pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_entryRulePathNameCS14128); iv_rulePathNameCS=rulePathNameCS(); state._fsp--; @@ -18506,7 +18568,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_rulePathNameCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRulePathNameCS14086); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRulePathNameCS14138); if (state.failed) return current; } @@ -18524,7 +18586,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePathNameCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6471:1: rulePathNameCS returns [EObject current=null] : ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6491: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; @@ -18537,24 +18599,24 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6474:28: ( ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6475:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6494:28: ( ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6495:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6475:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6475:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6495:1: ( ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6495:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6475:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6476:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6495:2: ( (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6496:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6476:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6477:3: lv_ownedPathElements_0_0= ruleFirstPathElementCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6496:1: (lv_ownedPathElements_0_0= ruleFirstPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6497:3: lv_ownedPathElements_0_0= ruleFirstPathElementCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSAccess().getOwnedPathElementsFirstPathElementCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS14132); + pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS14184); lv_ownedPathElements_0_0=ruleFirstPathElementCS(); state._fsp--; @@ -18578,39 +18640,39 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6493:2: (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* - loop116: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6513:2: (otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) )* + loop117: do { - int alt116=2; - int LA116_0 = input.LA(1); + int alt117=2; + int LA117_0 = input.LA(1); - if ( (LA116_0==31) ) { - alt116=1; + if ( (LA117_0==31) ) { + alt117=1; } - switch (alt116) { + switch (alt117) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6493:4: otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6513:4: otherlv_1= '::' ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) { - otherlv_1=(Token)match(input,31,FollowSets000.FOLLOW_31_in_rulePathNameCS14145); if (state.failed) return current; + otherlv_1=(Token)match(input,31,FollowSets000.FOLLOW_31_in_rulePathNameCS14197); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getPathNameCSAccess().getColonColonKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6497:1: ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6498:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6517:1: ( (lv_ownedPathElements_2_0= ruleNextPathElementCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6518:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6498:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6499:3: lv_ownedPathElements_2_0= ruleNextPathElementCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6518:1: (lv_ownedPathElements_2_0= ruleNextPathElementCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6519:3: lv_ownedPathElements_2_0= ruleNextPathElementCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getPathNameCSAccess().getOwnedPathElementsNextPathElementCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_rulePathNameCS14166); + pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_rulePathNameCS14218); lv_ownedPathElements_2_0=ruleNextPathElementCS(); state._fsp--; @@ -18639,7 +18701,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop116; + break loop117; } } while (true); @@ -18666,7 +18728,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleFirstPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6523:1: entryRuleFirstPathElementCS returns [EObject current=null] : iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6543:1: entryRuleFirstPathElementCS returns [EObject current=null] : iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ; public final EObject entryRuleFirstPathElementCS() throws RecognitionException { EObject current = null; @@ -18674,13 +18736,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6524:2: (iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6525:2: iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6544:2: (iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6545:2: iv_ruleFirstPathElementCS= ruleFirstPathElementCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getFirstPathElementCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS14204); + pushFollow(FollowSets000.FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS14256); iv_ruleFirstPathElementCS=ruleFirstPathElementCS(); state._fsp--; @@ -18688,7 +18750,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleFirstPathElementCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleFirstPathElementCS14214); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleFirstPathElementCS14266); if (state.failed) return current; } @@ -18706,21 +18768,21 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleFirstPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6532:1: ruleFirstPathElementCS returns [EObject current=null] : ( ( ruleUnrestrictedName ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6552:1: ruleFirstPathElementCS returns [EObject current=null] : ( ( ruleUnrestrictedName ) ) ; public final EObject ruleFirstPathElementCS() throws RecognitionException { EObject current = null; enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6535:28: ( ( ( ruleUnrestrictedName ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6536:1: ( ( ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6555:28: ( ( ( ruleUnrestrictedName ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6556:1: ( ( ruleUnrestrictedName ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6536:1: ( ( ruleUnrestrictedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6537:1: ( ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6556:1: ( ( ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6557:1: ( ruleUnrestrictedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6537:1: ( ruleUnrestrictedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6538:3: ruleUnrestrictedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6557:1: ( ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6558:3: ruleUnrestrictedName { if ( state.backtracking==0 ) { @@ -18739,7 +18801,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getFirstPathElementCSAccess().getReferredElementNamedElementCrossReference_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS14265); + pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS14317); ruleUnrestrictedName(); state._fsp--; @@ -18775,7 +18837,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleNextPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6562:1: entryRuleNextPathElementCS returns [EObject current=null] : iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6582:1: entryRuleNextPathElementCS returns [EObject current=null] : iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ; public final EObject entryRuleNextPathElementCS() throws RecognitionException { EObject current = null; @@ -18783,13 +18845,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6563:2: (iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6564:2: iv_ruleNextPathElementCS= ruleNextPathElementCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6583:2: (iv_ruleNextPathElementCS= ruleNextPathElementCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6584:2: iv_ruleNextPathElementCS= ruleNextPathElementCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getNextPathElementCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS14300); + pushFollow(FollowSets000.FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS14352); iv_ruleNextPathElementCS=ruleNextPathElementCS(); state._fsp--; @@ -18797,7 +18859,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleNextPathElementCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNextPathElementCS14310); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNextPathElementCS14362); if (state.failed) return current; } @@ -18815,21 +18877,21 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleNextPathElementCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6571:1: ruleNextPathElementCS returns [EObject current=null] : ( ( ruleUnreservedName ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6591:1: ruleNextPathElementCS returns [EObject current=null] : ( ( ruleUnreservedName ) ) ; public final EObject ruleNextPathElementCS() throws RecognitionException { EObject current = null; enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6574:28: ( ( ( ruleUnreservedName ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6575:1: ( ( ruleUnreservedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6594:28: ( ( ( ruleUnreservedName ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6595:1: ( ( ruleUnreservedName ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6575:1: ( ( ruleUnreservedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6576:1: ( ruleUnreservedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6595:1: ( ( ruleUnreservedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6596:1: ( ruleUnreservedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6576:1: ( ruleUnreservedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6577:3: ruleUnreservedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6596:1: ( ruleUnreservedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6597:3: ruleUnreservedName { if ( state.backtracking==0 ) { @@ -18848,7 +18910,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getNextPathElementCSAccess().getReferredElementNamedElementCrossReference_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS14361); + pushFollow(FollowSets000.FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS14413); ruleUnreservedName(); state._fsp--; @@ -18884,7 +18946,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTemplateBindingCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6601:1: entryRuleTemplateBindingCS returns [EObject current=null] : iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6621:1: entryRuleTemplateBindingCS returns [EObject current=null] : iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ; public final EObject entryRuleTemplateBindingCS() throws RecognitionException { EObject current = null; @@ -18892,13 +18954,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6602:2: (iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6603:2: iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6622:2: (iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6623:2: iv_ruleTemplateBindingCS= ruleTemplateBindingCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS14396); + pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS14448); iv_ruleTemplateBindingCS=ruleTemplateBindingCS(); state._fsp--; @@ -18906,7 +18968,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTemplateBindingCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateBindingCS14406); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateBindingCS14458); if (state.failed) return current; } @@ -18924,7 +18986,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTemplateBindingCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6610: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6630: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; @@ -18939,24 +19001,24 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6613:28: ( ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6614:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6633:28: ( ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6634:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6614:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6614:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6634:1: ( ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6634:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6614:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6615:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6634:2: ( (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6635:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6615:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6616:3: lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6635:1: (lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6636:3: lv_ownedSubstitutions_0_0= ruleTemplateParameterSubstitutionCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedSubstitutionsTemplateParameterSubstitutionCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14452); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14504); lv_ownedSubstitutions_0_0=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -18980,39 +19042,39 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6632:2: (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* - loop117: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6652:2: (otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) )* + loop118: do { - int alt117=2; - int LA117_0 = input.LA(1); + int alt118=2; + int LA118_0 = input.LA(1); - if ( (LA117_0==20) ) { - alt117=1; + if ( (LA118_0==20) ) { + alt118=1; } - switch (alt117) { + switch (alt118) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6632:4: otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6652:4: otherlv_1= ',' ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) { - otherlv_1=(Token)match(input,20,FollowSets000.FOLLOW_20_in_ruleTemplateBindingCS14465); if (state.failed) return current; + otherlv_1=(Token)match(input,20,FollowSets000.FOLLOW_20_in_ruleTemplateBindingCS14517); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTemplateBindingCSAccess().getCommaKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6636:1: ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6637:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6656:1: ( (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6657:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6637:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6638:3: lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6657:1: (lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6658:3: lv_ownedSubstitutions_2_0= ruleTemplateParameterSubstitutionCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedSubstitutionsTemplateParameterSubstitutionCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14486); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14538); lv_ownedSubstitutions_2_0=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -19041,30 +19103,30 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop117; + break loop118; } } while (true); - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6654:4: ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? - int alt118=2; - int LA118_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6674:4: ( (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) )? + int alt119=2; + int LA119_0 = input.LA(1); - if ( (LA118_0==84) ) { - alt118=1; + if ( (LA119_0==84) ) { + alt119=1; } - switch (alt118) { + switch (alt119) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6655:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6675:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6655:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6656:3: lv_ownedMultiplicity_3_0= ruleMultiplicityCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6675:1: (lv_ownedMultiplicity_3_0= ruleMultiplicityCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6676:3: lv_ownedMultiplicity_3_0= ruleMultiplicityCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateBindingCSAccess().getOwnedMultiplicityMultiplicityCSParserRuleCall_2_0()); } - pushFollow(FollowSets000.FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS14509); + pushFollow(FollowSets000.FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS14561); lv_ownedMultiplicity_3_0=ruleMultiplicityCS(); state._fsp--; @@ -19114,7 +19176,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTemplateParameterSubstitutionCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6680:1: entryRuleTemplateParameterSubstitutionCS returns [EObject current=null] : iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6700:1: entryRuleTemplateParameterSubstitutionCS returns [EObject current=null] : iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ; public final EObject entryRuleTemplateParameterSubstitutionCS() throws RecognitionException { EObject current = null; @@ -19122,13 +19184,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6681:2: (iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6682:2: iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6701:2: (iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6702:2: iv_ruleTemplateParameterSubstitutionCS= ruleTemplateParameterSubstitutionCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateParameterSubstitutionCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS14546); + pushFollow(FollowSets000.FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS14598); iv_ruleTemplateParameterSubstitutionCS=ruleTemplateParameterSubstitutionCS(); state._fsp--; @@ -19136,7 +19198,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTemplateParameterSubstitutionCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS14556); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS14608); if (state.failed) return current; } @@ -19154,7 +19216,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTemplateParameterSubstitutionCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6689:1: ruleTemplateParameterSubstitutionCS returns [EObject current=null] : ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6709:1: ruleTemplateParameterSubstitutionCS returns [EObject current=null] : ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ; public final EObject ruleTemplateParameterSubstitutionCS() throws RecognitionException { EObject current = null; @@ -19164,21 +19226,21 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6692:28: ( ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6693:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6712:28: ( ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6713:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6693:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6694:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6713:1: ( (lv_ownedActualParameter_0_0= ruleTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6714:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6694:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6695:3: lv_ownedActualParameter_0_0= ruleTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6714:1: (lv_ownedActualParameter_0_0= ruleTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6715:3: lv_ownedActualParameter_0_0= ruleTypeRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTemplateParameterSubstitutionCSAccess().getOwnedActualParameterTypeRefCSParserRuleCall_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS14601); + pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS14653); lv_ownedActualParameter_0_0=ruleTypeRefCS(); state._fsp--; @@ -19222,7 +19284,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypeParameterCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6721:1: entryRuleTypeParameterCS returns [EObject current=null] : iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6741:1: entryRuleTypeParameterCS returns [EObject current=null] : iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ; public final EObject entryRuleTypeParameterCS() throws RecognitionException { EObject current = null; @@ -19230,13 +19292,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6722:2: (iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6723:2: iv_ruleTypeParameterCS= ruleTypeParameterCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6742:2: (iv_ruleTypeParameterCS= ruleTypeParameterCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6743:2: iv_ruleTypeParameterCS= ruleTypeParameterCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS14638); + pushFollow(FollowSets000.FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS14690); iv_ruleTypeParameterCS=ruleTypeParameterCS(); state._fsp--; @@ -19244,7 +19306,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypeParameterCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeParameterCS14648); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeParameterCS14700); if (state.failed) return current; } @@ -19262,7 +19324,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypeParameterCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6730: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6750: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; @@ -19278,24 +19340,24 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6733: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6734: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6753: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6754: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6734: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6734: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6754: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6754: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6734:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6735:1: (lv_name_0_0= ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6754:2: ( (lv_name_0_0= ruleUnrestrictedName ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6755:1: (lv_name_0_0= ruleUnrestrictedName ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6735:1: (lv_name_0_0= ruleUnrestrictedName ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6736:3: lv_name_0_0= ruleUnrestrictedName + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6755:1: (lv_name_0_0= ruleUnrestrictedName ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6756:3: lv_name_0_0= ruleUnrestrictedName { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getNameUnrestrictedNameParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS14694); + pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS14746); lv_name_0_0=ruleUnrestrictedName(); state._fsp--; @@ -19319,35 +19381,35 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6752:2: (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? - int alt120=2; - int LA120_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6772:2: (otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* )? + int alt121=2; + int LA121_0 = input.LA(1); - if ( (LA120_0==94) ) { - alt120=1; + if ( (LA121_0==96) ) { + alt121=1; } - switch (alt120) { + switch (alt121) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6752:4: otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6772:4: otherlv_1= 'extends' ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* { - otherlv_1=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleTypeParameterCS14707); if (state.failed) return current; + otherlv_1=(Token)match(input,96,FollowSets000.FOLLOW_96_in_ruleTypeParameterCS14759); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTypeParameterCSAccess().getExtendsKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6756:1: ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6757:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6776:1: ( (lv_ownedExtends_2_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6777:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6757:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6758:3: lv_ownedExtends_2_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6777:1: (lv_ownedExtends_2_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6778:3: lv_ownedExtends_2_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14728); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14780); lv_ownedExtends_2_0=ruleTypedRefCS(); state._fsp--; @@ -19371,39 +19433,39 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6774:2: (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* - loop119: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6794:2: (otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) )* + loop120: do { - int alt119=2; - int LA119_0 = input.LA(1); + int alt120=2; + int LA120_0 = input.LA(1); - if ( (LA119_0==95) ) { - alt119=1; + if ( (LA120_0==97) ) { + alt120=1; } - switch (alt119) { + switch (alt120) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6774:4: otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6794:4: otherlv_3= '&&' ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) { - otherlv_3=(Token)match(input,95,FollowSets000.FOLLOW_95_in_ruleTypeParameterCS14741); if (state.failed) return current; + otherlv_3=(Token)match(input,97,FollowSets000.FOLLOW_97_in_ruleTypeParameterCS14793); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getTypeParameterCSAccess().getAmpersandAmpersandKeyword_1_2_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6778:1: ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6779:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6798:1: ( (lv_ownedExtends_4_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6799:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6779:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6780:3: lv_ownedExtends_4_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6799:1: (lv_ownedExtends_4_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6800:3: lv_ownedExtends_4_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeParameterCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_1_2_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14762); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14814); lv_ownedExtends_4_0=ruleTypedRefCS(); state._fsp--; @@ -19432,7 +19494,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop119; + break loop120; } } while (true); @@ -19465,7 +19527,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6804:1: entryRuleTypeRefCS returns [EObject current=null] : iv_ruleTypeRefCS= ruleTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6824:1: entryRuleTypeRefCS returns [EObject current=null] : iv_ruleTypeRefCS= ruleTypeRefCS EOF ; public final EObject entryRuleTypeRefCS() throws RecognitionException { EObject current = null; @@ -19473,13 +19535,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6805:2: (iv_ruleTypeRefCS= ruleTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6806:2: iv_ruleTypeRefCS= ruleTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6825:2: (iv_ruleTypeRefCS= ruleTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6826:2: iv_ruleTypeRefCS= ruleTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS14802); + pushFollow(FollowSets000.FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS14854); iv_ruleTypeRefCS=ruleTypeRefCS(); state._fsp--; @@ -19487,7 +19549,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeRefCS14812); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypeRefCS14864); if (state.failed) return current; } @@ -19505,7 +19567,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6813:1: ruleTypeRefCS returns [EObject current=null] : (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6833:1: ruleTypeRefCS returns [EObject current=null] : (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ; public final EObject ruleTypeRefCS() throws RecognitionException { EObject current = null; @@ -19517,29 +19579,29 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6816:28: ( (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6817:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6836:28: ( (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6837:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6817:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) - int alt121=2; - int LA121_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6837:1: (this_TypedRefCS_0= ruleTypedRefCS | this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS ) + int alt122=2; + int LA122_0 = input.LA(1); - if ( ((LA121_0>=RULE_SIMPLE_ID && LA121_0<=RULE_ESCAPED_ID)||LA121_0==17||LA121_0==19||(LA121_0>=25 && LA121_0<=26)||LA121_0==30||(LA121_0>=34 && LA121_0<=35)||(LA121_0>=37 && LA121_0<=40)) ) { - alt121=1; + if ( ((LA122_0>=RULE_SIMPLE_ID && LA122_0<=RULE_ESCAPED_ID)||LA122_0==17||LA122_0==19||(LA122_0>=25 && LA122_0<=26)||LA122_0==30||(LA122_0>=34 && LA122_0<=35)||(LA122_0>=37 && LA122_0<=40)) ) { + alt122=1; } - else if ( (LA121_0==93) ) { - alt121=2; + else if ( (LA122_0==95) ) { + alt122=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 121, 0, input); + new NoViableAltException("", 122, 0, input); throw nvae; } - switch (alt121) { + switch (alt122) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6818:2: this_TypedRefCS_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6838:2: this_TypedRefCS_0= ruleTypedRefCS { if ( state.backtracking==0 ) { @@ -19551,7 +19613,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypeRefCSAccess().getTypedRefCSParserRuleCall_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS14862); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS14914); this_TypedRefCS_0=ruleTypedRefCS(); state._fsp--; @@ -19566,7 +19628,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6831:2: this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6851:2: this_WildcardTypeRefCS_1= ruleWildcardTypeRefCS { if ( state.backtracking==0 ) { @@ -19578,7 +19640,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypeRefCSAccess().getWildcardTypeRefCSParserRuleCall_1()); } - pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS14892); + pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS14944); this_WildcardTypeRefCS_1=ruleWildcardTypeRefCS(); state._fsp--; @@ -19615,7 +19677,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypedRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6850:1: entryRuleTypedRefCS returns [EObject current=null] : iv_ruleTypedRefCS= ruleTypedRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6870:1: entryRuleTypedRefCS returns [EObject current=null] : iv_ruleTypedRefCS= ruleTypedRefCS EOF ; public final EObject entryRuleTypedRefCS() throws RecognitionException { EObject current = null; @@ -19623,13 +19685,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6851:2: (iv_ruleTypedRefCS= ruleTypedRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6852:2: iv_ruleTypedRefCS= ruleTypedRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6871:2: (iv_ruleTypedRefCS= ruleTypedRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6872:2: iv_ruleTypedRefCS= ruleTypedRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS14927); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS14979); iv_ruleTypedRefCS=ruleTypedRefCS(); state._fsp--; @@ -19637,7 +19699,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypedRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedRefCS14937); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedRefCS14989); if (state.failed) return current; } @@ -19655,7 +19717,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypedRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6859:1: ruleTypedRefCS returns [EObject current=null] : this_TypedTypeRefCS_0= ruleTypedTypeRefCS ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6879:1: ruleTypedRefCS returns [EObject current=null] : this_TypedTypeRefCS_0= ruleTypedTypeRefCS ; public final EObject ruleTypedRefCS() throws RecognitionException { EObject current = null; @@ -19665,8 +19727,8 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6862:28: (this_TypedTypeRefCS_0= ruleTypedTypeRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6864:2: this_TypedTypeRefCS_0= ruleTypedTypeRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6882:28: (this_TypedTypeRefCS_0= ruleTypedTypeRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6884:2: this_TypedTypeRefCS_0= ruleTypedTypeRefCS { if ( state.backtracking==0 ) { @@ -19678,7 +19740,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { newCompositeNode(grammarAccess.getTypedRefCSAccess().getTypedTypeRefCSParserRuleCall()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS14986); + pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS15038); this_TypedTypeRefCS_0=ruleTypedTypeRefCS(); state._fsp--; @@ -19709,7 +19771,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleTypedTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6883:1: entryRuleTypedTypeRefCS returns [EObject current=null] : iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6903:1: entryRuleTypedTypeRefCS returns [EObject current=null] : iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ; public final EObject entryRuleTypedTypeRefCS() throws RecognitionException { EObject current = null; @@ -19717,13 +19779,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6884:2: (iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6885:2: iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6904:2: (iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6905:2: iv_ruleTypedTypeRefCS= ruleTypedTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS15020); + pushFollow(FollowSets000.FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS15072); iv_ruleTypedTypeRefCS=ruleTypedTypeRefCS(); state._fsp--; @@ -19731,7 +19793,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleTypedTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedTypeRefCS15030); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleTypedTypeRefCS15082); if (state.failed) return current; } @@ -19749,7 +19811,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleTypedTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6892: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6912: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; @@ -19763,24 +19825,24 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6895:28: ( ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6896:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6915:28: ( ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6916:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6896:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6896:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6916:1: ( ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6916:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6896:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6897:1: (lv_ownedPathName_0_0= rulePathNameCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6916:2: ( (lv_ownedPathName_0_0= rulePathNameCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6917:1: (lv_ownedPathName_0_0= rulePathNameCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6897:1: (lv_ownedPathName_0_0= rulePathNameCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6898:3: lv_ownedPathName_0_0= rulePathNameCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6917:1: (lv_ownedPathName_0_0= rulePathNameCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6918:3: lv_ownedPathName_0_0= rulePathNameCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSAccess().getOwnedPathNamePathNameCSParserRuleCall_0_0()); } - pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS15076); + pushFollow(FollowSets000.FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS15128); lv_ownedPathName_0_0=rulePathNameCS(); state._fsp--; @@ -19804,35 +19866,35 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6914:2: (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? - int alt122=2; - int LA122_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6934:2: (otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' )? + int alt123=2; + int LA123_0 = input.LA(1); - if ( (LA122_0==27) ) { - alt122=1; + if ( (LA123_0==27) ) { + alt123=1; } - switch (alt122) { + switch (alt123) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6914:4: otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6934:4: otherlv_1= '(' ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) otherlv_3= ')' { - otherlv_1=(Token)match(input,27,FollowSets000.FOLLOW_27_in_ruleTypedTypeRefCS15089); if (state.failed) return current; + otherlv_1=(Token)match(input,27,FollowSets000.FOLLOW_27_in_ruleTypedTypeRefCS15141); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getTypedTypeRefCSAccess().getLeftParenthesisKeyword_1_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6918:1: ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6919:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6938:1: ( (lv_ownedBinding_2_0= ruleTemplateBindingCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6939:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6919:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6920:3: lv_ownedBinding_2_0= ruleTemplateBindingCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6939:1: (lv_ownedBinding_2_0= ruleTemplateBindingCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6940:3: lv_ownedBinding_2_0= ruleTemplateBindingCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getTypedTypeRefCSAccess().getOwnedBindingTemplateBindingCSParserRuleCall_1_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS15110); + pushFollow(FollowSets000.FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS15162); lv_ownedBinding_2_0=ruleTemplateBindingCS(); state._fsp--; @@ -19856,7 +19918,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,28,FollowSets000.FOLLOW_28_in_ruleTypedTypeRefCS15122); if (state.failed) return current; + otherlv_3=(Token)match(input,28,FollowSets000.FOLLOW_28_in_ruleTypedTypeRefCS15174); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_3, grammarAccess.getTypedTypeRefCSAccess().getRightParenthesisKeyword_1_2()); @@ -19891,7 +19953,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleWildcardTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6948:1: entryRuleWildcardTypeRefCS returns [EObject current=null] : iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6968:1: entryRuleWildcardTypeRefCS returns [EObject current=null] : iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ; public final EObject entryRuleWildcardTypeRefCS() throws RecognitionException { EObject current = null; @@ -19899,13 +19961,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6949:2: (iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6950:2: iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6969:2: (iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6970:2: iv_ruleWildcardTypeRefCS= ruleWildcardTypeRefCS EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getWildcardTypeRefCSRule()); } - pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS15160); + pushFollow(FollowSets000.FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS15212); iv_ruleWildcardTypeRefCS=ruleWildcardTypeRefCS(); state._fsp--; @@ -19913,7 +19975,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleWildcardTypeRefCS; } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleWildcardTypeRefCS15170); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleWildcardTypeRefCS15222); if (state.failed) return current; } @@ -19931,7 +19993,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleWildcardTypeRefCS" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6957:1: ruleWildcardTypeRefCS returns [EObject current=null] : ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6977: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; @@ -19943,14 +20005,14 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6960:28: ( ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6961:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6980:28: ( ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6981:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6961:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6961:2: () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6981:1: ( () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6981:2: () otherlv_1= '?' (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6961:2: () - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6962:2: + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6981:2: () + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6982:2: { if ( state.backtracking==0 ) { @@ -19967,41 +20029,41 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,93,FollowSets000.FOLLOW_93_in_ruleWildcardTypeRefCS15219); if (state.failed) return current; + otherlv_1=(Token)match(input,95,FollowSets000.FOLLOW_95_in_ruleWildcardTypeRefCS15271); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_1, grammarAccess.getWildcardTypeRefCSAccess().getQuestionMarkKeyword_1()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6974:1: (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? - int alt123=2; - int LA123_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6994:1: (otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) )? + int alt124=2; + int LA124_0 = input.LA(1); - if ( (LA123_0==94) ) { - alt123=1; + if ( (LA124_0==96) ) { + alt124=1; } - switch (alt123) { + switch (alt124) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6974:3: otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6994:3: otherlv_2= 'extends' ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) { - otherlv_2=(Token)match(input,94,FollowSets000.FOLLOW_94_in_ruleWildcardTypeRefCS15232); if (state.failed) return current; + otherlv_2=(Token)match(input,96,FollowSets000.FOLLOW_96_in_ruleWildcardTypeRefCS15284); if (state.failed) return current; if ( state.backtracking==0 ) { newLeafNode(otherlv_2, grammarAccess.getWildcardTypeRefCSAccess().getExtendsKeyword_2_0()); } - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6978:1: ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6979:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6998:1: ( (lv_ownedExtends_3_0= ruleTypedRefCS ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6999:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6979:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6980:3: lv_ownedExtends_3_0= ruleTypedRefCS + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:6999:1: (lv_ownedExtends_3_0= ruleTypedRefCS ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7000:3: lv_ownedExtends_3_0= ruleTypedRefCS { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getWildcardTypeRefCSAccess().getOwnedExtendsTypedRefCSParserRuleCall_2_1_0()); } - pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS15253); + pushFollow(FollowSets000.FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS15305); lv_ownedExtends_3_0=ruleTypedRefCS(); state._fsp--; @@ -20054,7 +20116,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleID" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7004:1: entryRuleID returns [String current=null] : iv_ruleID= ruleID EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7024:1: entryRuleID returns [String current=null] : iv_ruleID= ruleID EOF ; public final String entryRuleID() throws RecognitionException { String current = null; @@ -20062,13 +20124,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7005:2: (iv_ruleID= ruleID EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7006:2: iv_ruleID= ruleID EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7025:2: (iv_ruleID= ruleID EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7026:2: iv_ruleID= ruleID EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIDRule()); } - pushFollow(FollowSets000.FOLLOW_ruleID_in_entryRuleID15292); + pushFollow(FollowSets000.FOLLOW_ruleID_in_entryRuleID15344); iv_ruleID=ruleID(); state._fsp--; @@ -20076,7 +20138,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleID.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleID15303); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleID15355); if (state.failed) return current; } @@ -20094,7 +20156,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleID" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7013: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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7033: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(); @@ -20104,31 +20166,31 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7016:28: ( (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7017:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7036:28: ( (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7037:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7017:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) - int alt124=2; - int LA124_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7037:1: (this_SIMPLE_ID_0= RULE_SIMPLE_ID | this_ESCAPED_ID_1= RULE_ESCAPED_ID ) + int alt125=2; + int LA125_0 = input.LA(1); - if ( (LA124_0==RULE_SIMPLE_ID) ) { - alt124=1; + if ( (LA125_0==RULE_SIMPLE_ID) ) { + alt125=1; } - else if ( (LA124_0==RULE_ESCAPED_ID) ) { - alt124=2; + else if ( (LA125_0==RULE_ESCAPED_ID) ) { + alt125=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 124, 0, input); + new NoViableAltException("", 125, 0, input); throw nvae; } - switch (alt124) { + switch (alt125) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7017:6: this_SIMPLE_ID_0= RULE_SIMPLE_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7037:6: this_SIMPLE_ID_0= RULE_SIMPLE_ID { - this_SIMPLE_ID_0=(Token)match(input,RULE_SIMPLE_ID,FollowSets000.FOLLOW_RULE_SIMPLE_ID_in_ruleID15343); if (state.failed) return current; + this_SIMPLE_ID_0=(Token)match(input,RULE_SIMPLE_ID,FollowSets000.FOLLOW_RULE_SIMPLE_ID_in_ruleID15395); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SIMPLE_ID_0); @@ -20143,9 +20205,9 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7025:10: this_ESCAPED_ID_1= RULE_ESCAPED_ID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7045:10: this_ESCAPED_ID_1= RULE_ESCAPED_ID { - this_ESCAPED_ID_1=(Token)match(input,RULE_ESCAPED_ID,FollowSets000.FOLLOW_RULE_ESCAPED_ID_in_ruleID15369); if (state.failed) return current; + this_ESCAPED_ID_1=(Token)match(input,RULE_ESCAPED_ID,FollowSets000.FOLLOW_RULE_ESCAPED_ID_in_ruleID15421); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_ESCAPED_ID_1); @@ -20182,7 +20244,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleIdentifier" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7040:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7060:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ; public final String entryRuleIdentifier() throws RecognitionException { String current = null; @@ -20190,13 +20252,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7041:2: (iv_ruleIdentifier= ruleIdentifier EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7042:2: iv_ruleIdentifier= ruleIdentifier EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7061:2: (iv_ruleIdentifier= ruleIdentifier EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7062:2: iv_ruleIdentifier= ruleIdentifier EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIdentifierRule()); } - pushFollow(FollowSets000.FOLLOW_ruleIdentifier_in_entryRuleIdentifier15415); + pushFollow(FollowSets000.FOLLOW_ruleIdentifier_in_entryRuleIdentifier15467); iv_ruleIdentifier=ruleIdentifier(); state._fsp--; @@ -20204,7 +20266,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleIdentifier.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleIdentifier15426); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleIdentifier15478); if (state.failed) return current; } @@ -20222,7 +20284,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleIdentifier" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7049:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= ruleID ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7069:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_ID_0= ruleID ; public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -20232,15 +20294,15 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7052:28: (this_ID_0= ruleID ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7054:5: this_ID_0= ruleID + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7072:28: (this_ID_0= ruleID ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7074:5: this_ID_0= ruleID { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getIdentifierAccess().getIDParserRuleCall()); } - pushFollow(FollowSets000.FOLLOW_ruleID_in_ruleIdentifier15472); + pushFollow(FollowSets000.FOLLOW_ruleID_in_ruleIdentifier15524); this_ID_0=ruleID(); state._fsp--; @@ -20275,7 +20337,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleLOWER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7072:1: entryRuleLOWER returns [String current=null] : iv_ruleLOWER= ruleLOWER EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7092:1: entryRuleLOWER returns [String current=null] : iv_ruleLOWER= ruleLOWER EOF ; public final String entryRuleLOWER() throws RecognitionException { String current = null; @@ -20283,13 +20345,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7073:2: (iv_ruleLOWER= ruleLOWER EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7074:2: iv_ruleLOWER= ruleLOWER EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7093:2: (iv_ruleLOWER= ruleLOWER EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7094:2: iv_ruleLOWER= ruleLOWER EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getLOWERRule()); } - pushFollow(FollowSets000.FOLLOW_ruleLOWER_in_entryRuleLOWER15517); + pushFollow(FollowSets000.FOLLOW_ruleLOWER_in_entryRuleLOWER15569); iv_ruleLOWER=ruleLOWER(); state._fsp--; @@ -20297,7 +20359,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleLOWER.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleLOWER15528); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleLOWER15580); if (state.failed) return current; } @@ -20315,7 +20377,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleLOWER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7081:1: ruleLOWER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7101:1: ruleLOWER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; public final AntlrDatatypeRuleToken ruleLOWER() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -20324,10 +20386,10 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7084:28: (this_INT_0= RULE_INT ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7085:5: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7104:28: (this_INT_0= RULE_INT ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7105:5: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleLOWER15567); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleLOWER15619); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -20358,7 +20420,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleNUMBER_LITERAL" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7100:1: entryRuleNUMBER_LITERAL returns [String current=null] : iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7120:1: entryRuleNUMBER_LITERAL returns [String current=null] : iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ; public final String entryRuleNUMBER_LITERAL() throws RecognitionException { String current = null; @@ -20366,13 +20428,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7101:2: (iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7102:2: iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7121:2: (iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7122:2: iv_ruleNUMBER_LITERAL= ruleNUMBER_LITERAL EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getNUMBER_LITERALRule()); } - pushFollow(FollowSets000.FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL15612); + pushFollow(FollowSets000.FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL15664); iv_ruleNUMBER_LITERAL=ruleNUMBER_LITERAL(); state._fsp--; @@ -20380,7 +20442,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleNUMBER_LITERAL.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNUMBER_LITERAL15623); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleNUMBER_LITERAL15675); if (state.failed) return current; } @@ -20398,7 +20460,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleNUMBER_LITERAL" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7109:1: ruleNUMBER_LITERAL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7129:1: ruleNUMBER_LITERAL returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_INT_0= RULE_INT ; public final AntlrDatatypeRuleToken ruleNUMBER_LITERAL() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -20407,10 +20469,10 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7112:28: (this_INT_0= RULE_INT ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7113:5: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7132:28: (this_INT_0= RULE_INT ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7133:5: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL15662); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL15714); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -20441,7 +20503,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleStringLiteral" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7128:1: entryRuleStringLiteral returns [String current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7148:1: entryRuleStringLiteral returns [String current=null] : iv_ruleStringLiteral= ruleStringLiteral EOF ; public final String entryRuleStringLiteral() throws RecognitionException { String current = null; @@ -20449,13 +20511,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7129:2: (iv_ruleStringLiteral= ruleStringLiteral EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7130:2: iv_ruleStringLiteral= ruleStringLiteral EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7149:2: (iv_ruleStringLiteral= ruleStringLiteral EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7150:2: iv_ruleStringLiteral= ruleStringLiteral EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getStringLiteralRule()); } - pushFollow(FollowSets000.FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral15707); + pushFollow(FollowSets000.FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral15759); iv_ruleStringLiteral=ruleStringLiteral(); state._fsp--; @@ -20463,7 +20525,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleStringLiteral.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleStringLiteral15718); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleStringLiteral15770); if (state.failed) return current; } @@ -20481,7 +20543,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleStringLiteral" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7137:1: ruleStringLiteral returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7157: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(); @@ -20490,10 +20552,10 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7140:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7141:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7160:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7161: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_ruleStringLiteral15757); if (state.failed) return current; + this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral15809); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SINGLE_QUOTED_STRING_0); @@ -20524,7 +20586,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleUPPER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7156:1: entryRuleUPPER returns [String current=null] : iv_ruleUPPER= ruleUPPER EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7176:1: entryRuleUPPER returns [String current=null] : iv_ruleUPPER= ruleUPPER EOF ; public final String entryRuleUPPER() throws RecognitionException { String current = null; @@ -20532,13 +20594,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7157:2: (iv_ruleUPPER= ruleUPPER EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7158:2: iv_ruleUPPER= ruleUPPER EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7177:2: (iv_ruleUPPER= ruleUPPER EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7178:2: iv_ruleUPPER= ruleUPPER EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getUPPERRule()); } - pushFollow(FollowSets000.FOLLOW_ruleUPPER_in_entryRuleUPPER15802); + pushFollow(FollowSets000.FOLLOW_ruleUPPER_in_entryRuleUPPER15854); iv_ruleUPPER=ruleUPPER(); state._fsp--; @@ -20546,7 +20608,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleUPPER.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleUPPER15813); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleUPPER15865); if (state.failed) return current; } @@ -20564,7 +20626,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleUPPER" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7165:1: ruleUPPER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7185:1: ruleUPPER returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ; public final AntlrDatatypeRuleToken ruleUPPER() throws RecognitionException { AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken(); @@ -20574,31 +20636,31 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7168:28: ( (this_INT_0= RULE_INT | kw= '*' ) ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7169:1: (this_INT_0= RULE_INT | kw= '*' ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7188:28: ( (this_INT_0= RULE_INT | kw= '*' ) ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7189:1: (this_INT_0= RULE_INT | kw= '*' ) { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7169:1: (this_INT_0= RULE_INT | kw= '*' ) - int alt125=2; - int LA125_0 = input.LA(1); + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7189:1: (this_INT_0= RULE_INT | kw= '*' ) + int alt126=2; + int LA126_0 = input.LA(1); - if ( (LA125_0==RULE_INT) ) { - alt125=1; + if ( (LA126_0==RULE_INT) ) { + alt126=1; } - else if ( (LA125_0==32) ) { - alt125=2; + else if ( (LA126_0==32) ) { + alt126=2; } else { if (state.backtracking>0) {state.failed=true; return current;} NoViableAltException nvae = - new NoViableAltException("", 125, 0, input); + new NoViableAltException("", 126, 0, input); throw nvae; } - switch (alt125) { + switch (alt126) { case 1 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7169:6: this_INT_0= RULE_INT + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7189:6: this_INT_0= RULE_INT { - this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleUPPER15853); if (state.failed) return current; + this_INT_0=(Token)match(input,RULE_INT,FollowSets000.FOLLOW_RULE_INT_in_ruleUPPER15905); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_INT_0); @@ -20613,9 +20675,9 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7178:2: kw= '*' + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7198:2: kw= '*' { - kw=(Token)match(input,32,FollowSets000.FOLLOW_32_in_ruleUPPER15877); if (state.failed) return current; + kw=(Token)match(input,32,FollowSets000.FOLLOW_32_in_ruleUPPER15929); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(kw); @@ -20648,7 +20710,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleURI" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7191:1: entryRuleURI returns [String current=null] : iv_ruleURI= ruleURI EOF ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7211:1: entryRuleURI returns [String current=null] : iv_ruleURI= ruleURI EOF ; public final String entryRuleURI() throws RecognitionException { String current = null; @@ -20656,13 +20718,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7192:2: (iv_ruleURI= ruleURI EOF ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7193:2: iv_ruleURI= ruleURI EOF + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7212:2: (iv_ruleURI= ruleURI EOF ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7213:2: iv_ruleURI= ruleURI EOF { if ( state.backtracking==0 ) { newCompositeNode(grammarAccess.getURIRule()); } - pushFollow(FollowSets000.FOLLOW_ruleURI_in_entryRuleURI15918); + pushFollow(FollowSets000.FOLLOW_ruleURI_in_entryRuleURI15970); iv_ruleURI=ruleURI(); state._fsp--; @@ -20670,7 +20732,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { if ( state.backtracking==0 ) { current =iv_ruleURI.getText(); } - match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleURI15929); if (state.failed) return current; + match(input,EOF,FollowSets000.FOLLOW_EOF_in_entryRuleURI15981); if (state.failed) return current; } @@ -20688,7 +20750,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleURI" - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7200:1: ruleURI returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ; + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7220: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(); @@ -20697,10 +20759,10 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7203:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) - // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7204:5: this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7223:28: (this_SINGLE_QUOTED_STRING_0= RULE_SINGLE_QUOTED_STRING ) + // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:7224: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_ruleURI15968); if (state.failed) return current; + this_SINGLE_QUOTED_STRING_0=(Token)match(input,RULE_SINGLE_QUOTED_STRING,FollowSets000.FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI16020); if (state.failed) return current; if ( state.backtracking==0 ) { current.merge(this_SINGLE_QUOTED_STRING_0); @@ -20754,25 +20816,25 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { { otherlv_0=(Token)match(input,21,FollowSets000.FOLLOW_21_in_synpred17_InternalQVTcore673); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:384:1: ( ( (lv_ownedUnrealizedVariables_1_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_2_0= ruleRealizedVariableCS ) ) ) - int alt128=2; - int LA128_0 = input.LA(1); + int alt129=2; + int LA129_0 = input.LA(1); - if ( ((LA128_0>=RULE_SIMPLE_ID && LA128_0<=RULE_ESCAPED_ID)||LA128_0==17||LA128_0==19||(LA128_0>=25 && LA128_0<=26)||LA128_0==30||(LA128_0>=34 && LA128_0<=35)||(LA128_0>=37 && LA128_0<=38)||LA128_0==40) ) { - alt128=1; + if ( ((LA129_0>=RULE_SIMPLE_ID && LA129_0<=RULE_ESCAPED_ID)||LA129_0==17||LA129_0==19||(LA129_0>=25 && LA129_0<=26)||LA129_0==30||(LA129_0>=34 && LA129_0<=35)||(LA129_0>=37 && LA129_0<=38)||LA129_0==40) ) { + alt129=1; } - else if ( (LA128_0==39) ) { - int LA128_2 = input.LA(2); + else if ( (LA129_0==39) ) { + int LA129_2 = input.LA(2); - if ( ((LA128_2>=RULE_SIMPLE_ID && LA128_2<=RULE_ESCAPED_ID)||LA128_2==17||LA128_2==19||(LA128_2>=25 && LA128_2<=26)||LA128_2==30||(LA128_2>=34 && LA128_2<=35)||(LA128_2>=37 && LA128_2<=40)) ) { - alt128=2; + if ( (LA129_2==20||LA129_2==24||LA129_2==29||LA129_2==36) ) { + alt129=1; } - else if ( (LA128_2==20||LA128_2==24||LA128_2==29||LA128_2==36) ) { - alt128=1; + else if ( ((LA129_2>=RULE_SIMPLE_ID && LA129_2<=RULE_ESCAPED_ID)||LA129_2==17||LA129_2==19||(LA129_2>=25 && LA129_2<=26)||LA129_2==30||(LA129_2>=34 && LA129_2<=35)||(LA129_2>=37 && LA129_2<=40)) ) { + alt129=2; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 128, 2, input); + new NoViableAltException("", 129, 2, input); throw nvae; } @@ -20780,11 +20842,11 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 128, 0, input); + new NoViableAltException("", 129, 0, input); throw nvae; } - switch (alt128) { + switch (alt129) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:384:2: ( (lv_ownedUnrealizedVariables_1_0= ruleUnrealizedVariableCS ) ) { @@ -20845,41 +20907,41 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:421:3: (otherlv_3= ',' ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) )* - loop130: + loop131: do { - int alt130=2; - int LA130_0 = input.LA(1); + int alt131=2; + int LA131_0 = input.LA(1); - if ( (LA130_0==20) ) { - alt130=1; + if ( (LA131_0==20) ) { + alt131=1; } - switch (alt130) { + switch (alt131) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:421:5: otherlv_3= ',' ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) { otherlv_3=(Token)match(input,20,FollowSets000.FOLLOW_20_in_synpred17_InternalQVTcore736); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:425:1: ( ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_5_0= ruleRealizedVariableCS ) ) ) - int alt129=2; - int LA129_0 = input.LA(1); + int alt130=2; + int LA130_0 = input.LA(1); - if ( ((LA129_0>=RULE_SIMPLE_ID && LA129_0<=RULE_ESCAPED_ID)||LA129_0==17||LA129_0==19||(LA129_0>=25 && LA129_0<=26)||LA129_0==30||(LA129_0>=34 && LA129_0<=35)||(LA129_0>=37 && LA129_0<=38)||LA129_0==40) ) { - alt129=1; + if ( ((LA130_0>=RULE_SIMPLE_ID && LA130_0<=RULE_ESCAPED_ID)||LA130_0==17||LA130_0==19||(LA130_0>=25 && LA130_0<=26)||LA130_0==30||(LA130_0>=34 && LA130_0<=35)||(LA130_0>=37 && LA130_0<=38)||LA130_0==40) ) { + alt130=1; } - else if ( (LA129_0==39) ) { - int LA129_2 = input.LA(2); + else if ( (LA130_0==39) ) { + int LA130_2 = input.LA(2); - if ( (LA129_2==20||LA129_2==24||LA129_2==29||LA129_2==36) ) { - alt129=1; + if ( ((LA130_2>=RULE_SIMPLE_ID && LA130_2<=RULE_ESCAPED_ID)||LA130_2==17||LA130_2==19||(LA130_2>=25 && LA130_2<=26)||LA130_2==30||(LA130_2>=34 && LA130_2<=35)||(LA130_2>=37 && LA130_2<=40)) ) { + alt130=2; } - else if ( ((LA129_2>=RULE_SIMPLE_ID && LA129_2<=RULE_ESCAPED_ID)||LA129_2==17||LA129_2==19||(LA129_2>=25 && LA129_2<=26)||LA129_2==30||(LA129_2>=34 && LA129_2<=35)||(LA129_2>=37 && LA129_2<=40)) ) { - alt129=2; + else if ( (LA130_2==20||LA130_2==24||LA130_2==29||LA130_2==36) ) { + alt130=1; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 129, 2, input); + new NoViableAltException("", 130, 2, input); throw nvae; } @@ -20887,11 +20949,11 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 129, 0, input); + new NoViableAltException("", 130, 0, input); throw nvae; } - switch (alt129) { + switch (alt130) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:425:2: ( (lv_ownedUnrealizedVariables_4_0= ruleUnrealizedVariableCS ) ) { @@ -20956,23 +21018,23 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop130; + break loop131; } } while (true); otherlv_6=(Token)match(input,24,FollowSets000.FOLLOW_24_in_synpred17_InternalQVTcore800); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:466:1: ( (lv_ownedConstraints_7_0= rulePredicateOrAssignmentCS ) )* - loop131: + loop132: do { - int alt131=2; - int LA131_0 = input.LA(1); + int alt132=2; + int LA132_0 = input.LA(1); - if ( ((LA131_0>=RULE_SIMPLE_ID && LA131_0<=RULE_SINGLE_QUOTED_STRING)||(LA131_0>=16 && LA131_0<=17)||LA131_0==19||(LA131_0>=25 && LA131_0<=27)||LA131_0==30||LA131_0==32||(LA131_0>=34 && LA131_0<=35)||(LA131_0>=37 && LA131_0<=42)||(LA131_0>=59 && LA131_0<=73)||LA131_0==76||(LA131_0>=78 && LA131_0<=81)||LA131_0==86||(LA131_0>=91 && LA131_0<=92)) ) { - alt131=1; + if ( ((LA132_0>=RULE_SIMPLE_ID && LA132_0<=RULE_SINGLE_QUOTED_STRING)||(LA132_0>=16 && LA132_0<=17)||LA132_0==19||(LA132_0>=25 && LA132_0<=27)||LA132_0==30||LA132_0==32||(LA132_0>=34 && LA132_0<=35)||(LA132_0>=37 && LA132_0<=42)||(LA132_0>=59 && LA132_0<=73)||LA132_0==76||(LA132_0>=78 && LA132_0<=81)||LA132_0==86||(LA132_0>=91 && LA132_0<=92)) ) { + alt132=1; } - switch (alt131) { + switch (alt132) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:467:1: (lv_ownedConstraints_7_0= rulePredicateOrAssignmentCS ) { @@ -20997,7 +21059,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop131; + break loop132; } } while (true); @@ -21032,25 +21094,25 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { { otherlv_9=(Token)match(input,21,FollowSets000.FOLLOW_21_in_synpred21_InternalQVTcore854); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:493:1: ( ( (lv_ownedUnrealizedVariables_10_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_11_0= ruleRealizedVariableCS ) ) ) - int alt133=2; - int LA133_0 = input.LA(1); + int alt134=2; + int LA134_0 = input.LA(1); - if ( ((LA133_0>=RULE_SIMPLE_ID && LA133_0<=RULE_ESCAPED_ID)||LA133_0==17||LA133_0==19||(LA133_0>=25 && LA133_0<=26)||LA133_0==30||(LA133_0>=34 && LA133_0<=35)||(LA133_0>=37 && LA133_0<=38)||LA133_0==40) ) { - alt133=1; + if ( ((LA134_0>=RULE_SIMPLE_ID && LA134_0<=RULE_ESCAPED_ID)||LA134_0==17||LA134_0==19||(LA134_0>=25 && LA134_0<=26)||LA134_0==30||(LA134_0>=34 && LA134_0<=35)||(LA134_0>=37 && LA134_0<=38)||LA134_0==40) ) { + alt134=1; } - else if ( (LA133_0==39) ) { - int LA133_2 = input.LA(2); + else if ( (LA134_0==39) ) { + int LA134_2 = input.LA(2); - if ( ((LA133_2>=RULE_SIMPLE_ID && LA133_2<=RULE_ESCAPED_ID)||LA133_2==17||LA133_2==19||(LA133_2>=25 && LA133_2<=26)||LA133_2==30||(LA133_2>=34 && LA133_2<=35)||(LA133_2>=37 && LA133_2<=40)) ) { - alt133=2; + if ( (LA134_2==20||LA134_2==23||LA134_2==29||LA134_2==36) ) { + alt134=1; } - else if ( (LA133_2==20||LA133_2==23||LA133_2==29||LA133_2==36) ) { - alt133=1; + else if ( ((LA134_2>=RULE_SIMPLE_ID && LA134_2<=RULE_ESCAPED_ID)||LA134_2==17||LA134_2==19||(LA134_2>=25 && LA134_2<=26)||LA134_2==30||(LA134_2>=34 && LA134_2<=35)||(LA134_2>=37 && LA134_2<=40)) ) { + alt134=2; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 133, 2, input); + new NoViableAltException("", 134, 2, input); throw nvae; } @@ -21058,11 +21120,11 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 133, 0, input); + new NoViableAltException("", 134, 0, input); throw nvae; } - switch (alt133) { + switch (alt134) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:493:2: ( (lv_ownedUnrealizedVariables_10_0= ruleUnrealizedVariableCS ) ) { @@ -21123,41 +21185,41 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:530:3: (otherlv_12= ',' ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) )* - loop135: + loop136: do { - int alt135=2; - int LA135_0 = input.LA(1); + int alt136=2; + int LA136_0 = input.LA(1); - if ( (LA135_0==20) ) { - alt135=1; + if ( (LA136_0==20) ) { + alt136=1; } - switch (alt135) { + switch (alt136) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:530:5: otherlv_12= ',' ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) { otherlv_12=(Token)match(input,20,FollowSets000.FOLLOW_20_in_synpred21_InternalQVTcore917); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:534:1: ( ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) | ( (lv_ownedRealizedVariables_14_0= ruleRealizedVariableCS ) ) ) - int alt134=2; - int LA134_0 = input.LA(1); + int alt135=2; + int LA135_0 = input.LA(1); - if ( ((LA134_0>=RULE_SIMPLE_ID && LA134_0<=RULE_ESCAPED_ID)||LA134_0==17||LA134_0==19||(LA134_0>=25 && LA134_0<=26)||LA134_0==30||(LA134_0>=34 && LA134_0<=35)||(LA134_0>=37 && LA134_0<=38)||LA134_0==40) ) { - alt134=1; + if ( ((LA135_0>=RULE_SIMPLE_ID && LA135_0<=RULE_ESCAPED_ID)||LA135_0==17||LA135_0==19||(LA135_0>=25 && LA135_0<=26)||LA135_0==30||(LA135_0>=34 && LA135_0<=35)||(LA135_0>=37 && LA135_0<=38)||LA135_0==40) ) { + alt135=1; } - else if ( (LA134_0==39) ) { - int LA134_2 = input.LA(2); + else if ( (LA135_0==39) ) { + int LA135_2 = input.LA(2); - if ( (LA134_2==20||LA134_2==23||LA134_2==29||LA134_2==36) ) { - alt134=1; + if ( (LA135_2==20||LA135_2==23||LA135_2==29||LA135_2==36) ) { + alt135=1; } - else if ( ((LA134_2>=RULE_SIMPLE_ID && LA134_2<=RULE_ESCAPED_ID)||LA134_2==17||LA134_2==19||(LA134_2>=25 && LA134_2<=26)||LA134_2==30||(LA134_2>=34 && LA134_2<=35)||(LA134_2>=37 && LA134_2<=40)) ) { - alt134=2; + else if ( ((LA135_2>=RULE_SIMPLE_ID && LA135_2<=RULE_ESCAPED_ID)||LA135_2==17||LA135_2==19||(LA135_2>=25 && LA135_2<=26)||LA135_2==30||(LA135_2>=34 && LA135_2<=35)||(LA135_2>=37 && LA135_2<=40)) ) { + alt135=2; } else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 134, 2, input); + new NoViableAltException("", 135, 2, input); throw nvae; } @@ -21165,11 +21227,11 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { else { if (state.backtracking>0) {state.failed=true; return ;} NoViableAltException nvae = - new NoViableAltException("", 134, 0, input); + new NoViableAltException("", 135, 0, input); throw nvae; } - switch (alt134) { + switch (alt135) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:534:2: ( (lv_ownedUnrealizedVariables_13_0= ruleUnrealizedVariableCS ) ) { @@ -21234,7 +21296,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop135; + break loop136; } } while (true); @@ -21262,18 +21324,18 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { { otherlv_16=(Token)match(input,21,FollowSets000.FOLLOW_21_in_synpred23_InternalQVTcore1001); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:580:1: ( (lv_ownedConstraints_17_0= rulePredicateOrAssignmentCS ) )+ - int cnt136=0; - loop136: + int cnt137=0; + loop137: do { - int alt136=2; - int LA136_0 = input.LA(1); + int alt137=2; + int LA137_0 = input.LA(1); - if ( ((LA136_0>=RULE_SIMPLE_ID && LA136_0<=RULE_SINGLE_QUOTED_STRING)||(LA136_0>=16 && LA136_0<=17)||LA136_0==19||(LA136_0>=25 && LA136_0<=27)||LA136_0==30||LA136_0==32||(LA136_0>=34 && LA136_0<=35)||(LA136_0>=37 && LA136_0<=42)||(LA136_0>=59 && LA136_0<=73)||LA136_0==76||(LA136_0>=78 && LA136_0<=81)||LA136_0==86||(LA136_0>=91 && LA136_0<=92)) ) { - alt136=1; + if ( ((LA137_0>=RULE_SIMPLE_ID && LA137_0<=RULE_SINGLE_QUOTED_STRING)||(LA137_0>=16 && LA137_0<=17)||LA137_0==19||(LA137_0>=25 && LA137_0<=27)||LA137_0==30||LA137_0==32||(LA137_0>=34 && LA137_0<=35)||(LA137_0>=37 && LA137_0<=42)||(LA137_0>=59 && LA137_0<=73)||LA137_0==76||(LA137_0>=78 && LA137_0<=81)||LA137_0==86||(LA137_0>=91 && LA137_0<=92)) ) { + alt137=1; } - switch (alt136) { + switch (alt137) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:581:1: (lv_ownedConstraints_17_0= rulePredicateOrAssignmentCS ) { @@ -21298,13 +21360,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - if ( cnt136 >= 1 ) break loop136; + if ( cnt137 >= 1 ) break loop137; if (state.backtracking>0) {state.failed=true; return ;} EarlyExitException eee = - new EarlyExitException(136, input); + new EarlyExitException(137, input); throw eee; } - cnt136++; + cnt137++; } while (true); otherlv_18=(Token)match(input,23,FollowSets000.FOLLOW_23_in_synpred23_InternalQVTcore1035); if (state.failed) return ; @@ -21359,17 +21421,17 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:799:2: (otherlv_2= ',' ( (lv_ownedUnrealizedVariables_3_0= ruleGuardVariableCS ) ) )* - loop139: + loop140: do { - int alt139=2; - int LA139_0 = input.LA(1); + int alt140=2; + int LA140_0 = input.LA(1); - if ( (LA139_0==20) ) { - alt139=1; + if ( (LA140_0==20) ) { + alt140=1; } - switch (alt139) { + switch (alt140) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:799:4: otherlv_2= ',' ( (lv_ownedUnrealizedVariables_3_0= ruleGuardVariableCS ) ) { @@ -21401,23 +21463,23 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop139; + break loop140; } } while (true); otherlv_4=(Token)match(input,24,FollowSets000.FOLLOW_24_in_synpred31_InternalQVTcore1506); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:825:1: ( (lv_ownedPredicates_5_0= rulePredicateCS ) )* - loop140: + loop141: do { - int alt140=2; - int LA140_0 = input.LA(1); + int alt141=2; + int LA141_0 = input.LA(1); - if ( ((LA140_0>=RULE_SIMPLE_ID && LA140_0<=RULE_SINGLE_QUOTED_STRING)||LA140_0==17||LA140_0==19||(LA140_0>=25 && LA140_0<=27)||LA140_0==30||LA140_0==32||(LA140_0>=34 && LA140_0<=35)||(LA140_0>=37 && LA140_0<=42)||(LA140_0>=59 && LA140_0<=73)||LA140_0==76||(LA140_0>=78 && LA140_0<=81)||LA140_0==86||(LA140_0>=91 && LA140_0<=92)) ) { - alt140=1; + if ( ((LA141_0>=RULE_SIMPLE_ID && LA141_0<=RULE_SINGLE_QUOTED_STRING)||LA141_0==17||LA141_0==19||(LA141_0>=25 && LA141_0<=27)||LA141_0==30||LA141_0==32||(LA141_0>=34 && LA141_0<=35)||(LA141_0>=37 && LA141_0<=42)||(LA141_0>=59 && LA141_0<=73)||LA141_0==76||(LA141_0>=78 && LA141_0<=81)||LA141_0==86||(LA141_0>=91 && LA141_0<=92)) ) { + alt141=1; } - switch (alt140) { + switch (alt141) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:826:1: (lv_ownedPredicates_5_0= rulePredicateCS ) { @@ -21442,7 +21504,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop140; + break loop141; } } while (true); @@ -21495,17 +21557,17 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:870:2: (otherlv_9= ',' ( (lv_ownedUnrealizedVariables_10_0= ruleGuardVariableCS ) ) )* - loop141: + loop142: do { - int alt141=2; - int LA141_0 = input.LA(1); + int alt142=2; + int LA142_0 = input.LA(1); - if ( (LA141_0==20) ) { - alt141=1; + if ( (LA142_0==20) ) { + alt142=1; } - switch (alt141) { + switch (alt142) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:870:4: otherlv_9= ',' ( (lv_ownedUnrealizedVariables_10_0= ruleGuardVariableCS ) ) { @@ -21537,7 +21599,7 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - break loop141; + break loop142; } } while (true); @@ -21565,18 +21627,18 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { { otherlv_12=(Token)match(input,27,FollowSets000.FOLLOW_27_in_synpred35_InternalQVTcore1649); if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:901:1: ( (lv_ownedPredicates_13_0= rulePredicateCS ) )+ - int cnt142=0; - loop142: + int cnt143=0; + loop143: do { - int alt142=2; - int LA142_0 = input.LA(1); + int alt143=2; + int LA143_0 = input.LA(1); - if ( ((LA142_0>=RULE_SIMPLE_ID && LA142_0<=RULE_SINGLE_QUOTED_STRING)||LA142_0==17||LA142_0==19||(LA142_0>=25 && LA142_0<=27)||LA142_0==30||LA142_0==32||(LA142_0>=34 && LA142_0<=35)||(LA142_0>=37 && LA142_0<=42)||(LA142_0>=59 && LA142_0<=73)||LA142_0==76||(LA142_0>=78 && LA142_0<=81)||LA142_0==86||(LA142_0>=91 && LA142_0<=92)) ) { - alt142=1; + if ( ((LA143_0>=RULE_SIMPLE_ID && LA143_0<=RULE_SINGLE_QUOTED_STRING)||LA143_0==17||LA143_0==19||(LA143_0>=25 && LA143_0<=27)||LA143_0==30||LA143_0==32||(LA143_0>=34 && LA143_0<=35)||(LA143_0>=37 && LA143_0<=42)||(LA143_0>=59 && LA143_0<=73)||LA143_0==76||(LA143_0>=78 && LA143_0<=81)||LA143_0==86||(LA143_0>=91 && LA143_0<=92)) ) { + alt143=1; } - switch (alt142) { + switch (alt143) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:902:1: (lv_ownedPredicates_13_0= rulePredicateCS ) { @@ -21601,13 +21663,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { break; default : - if ( cnt142 >= 1 ) break loop142; + if ( cnt143 >= 1 ) break loop143; if (state.backtracking>0) {state.failed=true; return ;} EarlyExitException eee = - new EarlyExitException(142, input); + new EarlyExitException(143, input); throw eee; } - cnt142++; + cnt143++; } while (true); otherlv_14=(Token)match(input,28,FollowSets000.FOLLOW_28_in_synpred35_InternalQVTcore1683); if (state.failed) return ; @@ -21693,13 +21755,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { } // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:4410:2: (otherlv_2= '{' ( (lv_ownedPatternGuard_3_0= ruleExpCS ) ) otherlv_4= '}' )? - int alt151=2; - int LA151_0 = input.LA(1); + int alt152=2; + int LA152_0 = input.LA(1); - if ( (LA151_0==21) ) { - alt151=1; + if ( (LA152_0==21) ) { + alt152=1; } - switch (alt151) { + switch (alt152) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:4410:4: otherlv_2= '{' ( (lv_ownedPatternGuard_3_0= ruleExpCS ) ) otherlv_4= '}' { @@ -21787,13 +21849,13 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { state._fsp--; if (state.failed) return ; // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:4546:1: ( () ( (lv_name_2_0= ruleBinaryOperatorName ) ) ( (lv_ownedRight_3_0= ruleExpCS ) ) )? - int alt152=2; - int LA152_0 = input.LA(1); + int alt153=2; + int LA153_0 = input.LA(1); - if ( (LA152_0==32||LA152_0==41||(LA152_0>=43 && LA152_0<=58)) ) { - alt152=1; + if ( (LA153_0==32||LA153_0==41||(LA153_0>=43 && LA153_0<=58)) ) { + alt153=1; } - switch (alt152) { + switch (alt153) { case 1 : // ../../plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/parser/antlr/internal/InternalQVTcore.g:4546:2: () ( (lv_name_2_0= ruleBinaryOperatorName ) ) ( (lv_ownedRight_3_0= ruleExpCS ) ) { @@ -23800,83 +23862,85 @@ public class InternalQVTcoreParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleUPPER_in_ruleMultiplicityBoundsCS13724 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleMultiplicityCS_in_entryRuleMultiplicityCS13762 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityCS13772 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_84_in_ruleMultiplicityCS13809 = new BitSet(new long[]{0x0000100100000040L,0x0000000020000000L}); - public static final BitSet FOLLOW_ruleMultiplicityBoundsCS_in_ruleMultiplicityCS13835 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); - public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_ruleMultiplicityCS13865 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); - public static final BitSet FOLLOW_85_in_ruleMultiplicityCS13877 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS13913 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityStringCS13923 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_ruleMultiplicityStringCS13967 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_44_in_ruleMultiplicityStringCS13996 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_93_in_ruleMultiplicityStringCS14025 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePathNameCS_in_entryRulePathNameCS14076 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePathNameCS14086 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS14132 = new BitSet(new long[]{0x0000000080000002L}); - public static final BitSet FOLLOW_31_in_rulePathNameCS14145 = new BitSet(new long[]{0xF80001EC460A0030L,0x00000000000003FFL}); - public static final BitSet FOLLOW_ruleNextPathElementCS_in_rulePathNameCS14166 = new BitSet(new long[]{0x0000000080000002L}); - public static final BitSet FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS14204 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFirstPathElementCS14214 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS14265 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS14300 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNextPathElementCS14310 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS14361 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS14396 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTemplateBindingCS14406 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14452 = new BitSet(new long[]{0x0000000000100002L,0x0000000000100000L}); - public static final BitSet FOLLOW_20_in_ruleTemplateBindingCS14465 = new BitSet(new long[]{0x000001EC460A0030L,0x0000000020000000L}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14486 = new BitSet(new long[]{0x0000000000100002L,0x0000000000100000L}); - public static final BitSet FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS14509 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS14546 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS14556 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS14601 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS14638 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeParameterCS14648 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS14694 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L}); - public static final BitSet FOLLOW_94_in_ruleTypeParameterCS14707 = new BitSet(new long[]{0x000001EC460A0030L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14728 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L}); - public static final BitSet FOLLOW_95_in_ruleTypeParameterCS14741 = new BitSet(new long[]{0x000001EC460A0030L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14762 = new BitSet(new long[]{0x0000000000000002L,0x0000000080000000L}); - public static final BitSet FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS14802 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypeRefCS14812 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS14862 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS14892 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS14927 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypedRefCS14937 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS14986 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS15020 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleTypedTypeRefCS15030 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS15076 = new BitSet(new long[]{0x0000000008000002L}); - public static final BitSet FOLLOW_27_in_ruleTypedTypeRefCS15089 = new BitSet(new long[]{0x000001EC460A0030L,0x0000000020000000L}); - public static final BitSet FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS15110 = new BitSet(new long[]{0x0000000010000000L}); - public static final BitSet FOLLOW_28_in_ruleTypedTypeRefCS15122 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS15160 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleWildcardTypeRefCS15170 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_93_in_ruleWildcardTypeRefCS15219 = new BitSet(new long[]{0x0000000000000002L,0x0000000040000000L}); - public static final BitSet FOLLOW_94_in_ruleWildcardTypeRefCS15232 = new BitSet(new long[]{0x000001EC460A0030L}); - public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS15253 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleID_in_entryRuleID15292 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleID15303 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SIMPLE_ID_in_ruleID15343 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ESCAPED_ID_in_ruleID15369 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier15415 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier15426 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleID_in_ruleIdentifier15472 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleLOWER_in_entryRuleLOWER15517 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleLOWER15528 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleLOWER15567 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL15612 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleNUMBER_LITERAL15623 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL15662 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral15707 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral15718 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral15757 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleUPPER_in_entryRuleUPPER15802 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleUPPER15813 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleUPPER15853 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_ruleUPPER15877 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleURI_in_entryRuleURI15918 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleURI15929 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI15968 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_84_in_ruleMultiplicityCS13809 = new BitSet(new long[]{0x0000100100000040L,0x0000000080000000L}); + public static final BitSet FOLLOW_ruleMultiplicityBoundsCS_in_ruleMultiplicityCS13835 = new BitSet(new long[]{0x0000000000000000L,0x0000000060200000L}); + public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_ruleMultiplicityCS13865 = new BitSet(new long[]{0x0000000000000000L,0x0000000060200000L}); + public static final BitSet FOLLOW_93_in_ruleMultiplicityCS13878 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); + public static final BitSet FOLLOW_94_in_ruleMultiplicityCS13902 = new BitSet(new long[]{0x0000000000000000L,0x0000000000200000L}); + public static final BitSet FOLLOW_85_in_ruleMultiplicityCS13929 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleMultiplicityStringCS_in_entryRuleMultiplicityStringCS13965 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleMultiplicityStringCS13975 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_ruleMultiplicityStringCS14019 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_44_in_ruleMultiplicityStringCS14048 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_95_in_ruleMultiplicityStringCS14077 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePathNameCS_in_entryRulePathNameCS14128 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePathNameCS14138 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFirstPathElementCS_in_rulePathNameCS14184 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_31_in_rulePathNameCS14197 = new BitSet(new long[]{0xF80001EC460A0030L,0x00000000000003FFL}); + public static final BitSet FOLLOW_ruleNextPathElementCS_in_rulePathNameCS14218 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_ruleFirstPathElementCS_in_entryRuleFirstPathElementCS14256 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFirstPathElementCS14266 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleFirstPathElementCS14317 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNextPathElementCS_in_entryRuleNextPathElementCS14352 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNextPathElementCS14362 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnreservedName_in_ruleNextPathElementCS14413 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateBindingCS_in_entryRuleTemplateBindingCS14448 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTemplateBindingCS14458 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14504 = new BitSet(new long[]{0x0000000000100002L,0x0000000000100000L}); + public static final BitSet FOLLOW_20_in_ruleTemplateBindingCS14517 = new BitSet(new long[]{0x000001EC460A0030L,0x0000000080000000L}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_ruleTemplateBindingCS14538 = new BitSet(new long[]{0x0000000000100002L,0x0000000000100000L}); + public static final BitSet FOLLOW_ruleMultiplicityCS_in_ruleTemplateBindingCS14561 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTemplateParameterSubstitutionCS_in_entryRuleTemplateParameterSubstitutionCS14598 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTemplateParameterSubstitutionCS14608 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeRefCS_in_ruleTemplateParameterSubstitutionCS14653 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypeParameterCS_in_entryRuleTypeParameterCS14690 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeParameterCS14700 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleTypeParameterCS14746 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L}); + public static final BitSet FOLLOW_96_in_ruleTypeParameterCS14759 = new BitSet(new long[]{0x000001EC460A0030L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14780 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L}); + public static final BitSet FOLLOW_97_in_ruleTypeParameterCS14793 = new BitSet(new long[]{0x000001EC460A0030L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeParameterCS14814 = new BitSet(new long[]{0x0000000000000002L,0x0000000200000000L}); + public static final BitSet FOLLOW_ruleTypeRefCS_in_entryRuleTypeRefCS14854 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypeRefCS14864 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleTypeRefCS14914 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_ruleTypeRefCS14944 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_entryRuleTypedRefCS14979 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypedRefCS14989 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_ruleTypedRefCS15038 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleTypedTypeRefCS_in_entryRuleTypedTypeRefCS15072 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleTypedTypeRefCS15082 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePathNameCS_in_ruleTypedTypeRefCS15128 = new BitSet(new long[]{0x0000000008000002L}); + public static final BitSet FOLLOW_27_in_ruleTypedTypeRefCS15141 = new BitSet(new long[]{0x000001EC460A0030L,0x0000000080000000L}); + public static final BitSet FOLLOW_ruleTemplateBindingCS_in_ruleTypedTypeRefCS15162 = new BitSet(new long[]{0x0000000010000000L}); + public static final BitSet FOLLOW_28_in_ruleTypedTypeRefCS15174 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleWildcardTypeRefCS_in_entryRuleWildcardTypeRefCS15212 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleWildcardTypeRefCS15222 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_95_in_ruleWildcardTypeRefCS15271 = new BitSet(new long[]{0x0000000000000002L,0x0000000100000000L}); + public static final BitSet FOLLOW_96_in_ruleWildcardTypeRefCS15284 = new BitSet(new long[]{0x000001EC460A0030L}); + public static final BitSet FOLLOW_ruleTypedRefCS_in_ruleWildcardTypeRefCS15305 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleID_in_entryRuleID15344 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleID15355 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SIMPLE_ID_in_ruleID15395 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ESCAPED_ID_in_ruleID15421 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleIdentifier_in_entryRuleIdentifier15467 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleIdentifier15478 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleID_in_ruleIdentifier15524 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleLOWER_in_entryRuleLOWER15569 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleLOWER15580 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleLOWER15619 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleNUMBER_LITERAL_in_entryRuleNUMBER_LITERAL15664 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleNUMBER_LITERAL15675 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleNUMBER_LITERAL15714 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleStringLiteral_in_entryRuleStringLiteral15759 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleStringLiteral15770 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleStringLiteral15809 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleUPPER_in_entryRuleUPPER15854 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleUPPER15865 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleUPPER15905 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_32_in_ruleUPPER15929 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleURI_in_entryRuleURI15970 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleURI15981 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_SINGLE_QUOTED_STRING_in_ruleURI16020 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_21_in_synpred17_InternalQVTcore673 = new BitSet(new long[]{0x000001EC460A0030L}); public static final BitSet FOLLOW_ruleUnrealizedVariableCS_in_synpred17_InternalQVTcore695 = new BitSet(new long[]{0x0000000001100000L}); public static final BitSet FOLLOW_ruleRealizedVariableCS_in_synpred17_InternalQVTcore722 = new BitSet(new long[]{0x0000000001100000L}); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java index 4b52a184a..d877846a7 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSemanticSequencer.java @@ -94,11 +94,25 @@ public abstract class AbstractQVTcoreSemanticSequencer extends QVTcoreBaseSemant 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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSyntacticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSyntacticSequencer.java index df9dc6eb9..9e34d7120 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSyntacticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/serializer/AbstractQVTcoreSyntacticSequencer.java @@ -21,11 +21,13 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer; public abstract class AbstractQVTcoreSyntacticSequencer extends AbstractSyntacticSequencer { protected QVTcoreGrammarAccess 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 = (QVTcoreGrammarAccess) 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 AbstractQVTcoreSyntacticSequencer extends AbstractSyntacti 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 AbstractQVTcoreSyntacticSequencer extends AbstractSyntacti /** * 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.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java index e25c29c51..a538246ad 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore/src-gen/org/eclipse/qvtd/xtext/qvtcore/services/QVTcoreGrammarAccess.java @@ -1154,7 +1154,7 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { } //MultiplicityCS: - // "[" (MultiplicityBoundsCS | MultiplicityStringCS) "]"; + // "[" (MultiplicityBoundsCS | MultiplicityStringCS) ("|?" | isNullFree?="|1")? "]"; public BaseGrammarAccess.MultiplicityCSElements getMultiplicityCSAccess() { return gaQVTcoreBase.getMultiplicityCSAccess(); } |