diff options
author | Ed Willink | 2021-12-16 11:02:55 +0000 |
---|---|---|
committer | Ed Willink | 2021-12-16 11:02:55 +0000 |
commit | 1bed8b6dae78da56ed0f489bddf0498ea7cc8ffe (patch) | |
tree | 469be6f3dfc18879df54856f4abba6fed0d19b25 | |
parent | 49300ac5ba3a6ae4b1f4e83043309725665eb9b9 (diff) | |
download | org.eclipse.qvtd-1bed8b6dae78da56ed0f489bddf0498ea7cc8ffe.tar.gz org.eclipse.qvtd-1bed8b6dae78da56ed0f489bddf0498ea7cc8ffe.tar.xz org.eclipse.qvtd-1bed8b6dae78da56ed0f489bddf0498ea7cc8ffe.zip |
[577614] Regenerate editors
33 files changed, 322 insertions, 322 deletions
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/QVTbaseParser.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/QVTbaseParser.java index a7bef166a..8706e4d1e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/QVTbaseParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/QVTbaseParser.java @@ -423,8 +423,8 @@ public class QVTbaseParser extends AbstractContentAssistParser { put(grammarAccess.getMapLiteralExpCSAccess().getOwnedTypeAssignment_0(), "rule__MapLiteralExpCS__OwnedTypeAssignment_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_0(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_1_1(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0(), "rule__MapLiteralPartCS__OwnedKeyAssignment_0"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2(), "rule__MapLiteralPartCS__OwnedValueAssignment_2"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0(), "rule__MapLiteralPartCS__OwnedValueAssignment_0"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2(), "rule__MapLiteralPartCS__OwnedKeyAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_2(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_3_1(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_3_1"); put(grammarAccess.getTupleLiteralPartCSAccess().getNameAssignment_0(), "rule__TupleLiteralPartCS__NameAssignment_0"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbase.g b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbase.g index 414afdae5..4c05f6cc5 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbase.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbase.g @@ -13164,9 +13164,9 @@ rule__MapLiteralPartCS__Group__0__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } -(rule__MapLiteralPartCS__OwnedKeyAssignment_0) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } +(rule__MapLiteralPartCS__OwnedValueAssignment_0) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } ) ; @@ -13223,9 +13223,9 @@ rule__MapLiteralPartCS__Group__2__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } -(rule__MapLiteralPartCS__OwnedValueAssignment_2) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } +(rule__MapLiteralPartCS__OwnedKeyAssignment_2) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } ) ; @@ -22487,14 +22487,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedKeyAssignment_0 +rule__MapLiteralPartCS__OwnedValueAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } ) ; @@ -22502,14 +22502,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedValueAssignment_2 +rule__MapLiteralPartCS__OwnedKeyAssignment_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbaseParser.java b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbaseParser.java index 31afca850..94022227f 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbaseParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase.ui/src-gen/org/eclipse/qvtd/xtext/qvtbase/ui/contentassist/antlr/internal/InternalQVTbaseParser.java @@ -40175,26 +40175,26 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__MapLiteralPartCS__Group__0__Impl" - // InternalQVTbase.g:13161:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ; + // InternalQVTbase.g:13161:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ; public final void rule__MapLiteralPartCS__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTbase.g:13165:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ) - // InternalQVTbase.g:13166:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) + // InternalQVTbase.g:13165:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ) + // InternalQVTbase.g:13166:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) { - // InternalQVTbase.g:13166:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) - // InternalQVTbase.g:13167:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) + // InternalQVTbase.g:13166:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) + // InternalQVTbase.g:13167:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } - // InternalQVTbase.g:13168:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) - // InternalQVTbase.g:13168:2: rule__MapLiteralPartCS__OwnedKeyAssignment_0 + // InternalQVTbase.g:13168:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) + // InternalQVTbase.g:13168:2: rule__MapLiteralPartCS__OwnedValueAssignment_0 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedKeyAssignment_0(); + rule__MapLiteralPartCS__OwnedValueAssignment_0(); state._fsp--; if (state.failed) return ; @@ -40202,7 +40202,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } } @@ -40338,26 +40338,26 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__MapLiteralPartCS__Group__2__Impl" - // InternalQVTbase.g:13220:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ; + // InternalQVTbase.g:13220:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ; public final void rule__MapLiteralPartCS__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTbase.g:13224:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ) - // InternalQVTbase.g:13225:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) + // InternalQVTbase.g:13224:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ) + // InternalQVTbase.g:13225:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) { - // InternalQVTbase.g:13225:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) - // InternalQVTbase.g:13226:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) + // InternalQVTbase.g:13225:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) + // InternalQVTbase.g:13226:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } - // InternalQVTbase.g:13227:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) - // InternalQVTbase.g:13227:2: rule__MapLiteralPartCS__OwnedValueAssignment_2 + // InternalQVTbase.g:13227:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) + // InternalQVTbase.g:13227:2: rule__MapLiteralPartCS__OwnedKeyAssignment_2 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedValueAssignment_2(); + rule__MapLiteralPartCS__OwnedKeyAssignment_2(); state._fsp--; if (state.failed) return ; @@ -40365,7 +40365,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } } @@ -65337,9 +65337,9 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1" - // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_0" - // InternalQVTbase.g:22490:1: rule__MapLiteralPartCS__OwnedKeyAssignment_0 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedKeyAssignment_0() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_0" + // InternalQVTbase.g:22490:1: rule__MapLiteralPartCS__OwnedValueAssignment_0 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedValueAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); @@ -65351,7 +65351,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { // InternalQVTbase.g:22496:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -65359,7 +65359,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } } @@ -65379,12 +65379,12 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_0" + // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_0" - // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_2" - // InternalQVTbase.g:22505:1: rule__MapLiteralPartCS__OwnedValueAssignment_2 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedValueAssignment_2() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_2" + // InternalQVTbase.g:22505:1: rule__MapLiteralPartCS__OwnedKeyAssignment_2 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedKeyAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); @@ -65396,7 +65396,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { // InternalQVTbase.g:22511:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -65404,7 +65404,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } } @@ -65424,7 +65424,7 @@ public class InternalQVTbaseParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_2" + // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_2" // $ANTLR start "rule__TupleLiteralExpCS__OwnedPartsAssignment_2" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin Binary files differindex 9eda2ed69..fbf73fd98 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbase.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbaseGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbaseGrammarResource.java index 2255af3fd..c680dcdf4 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbaseGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/QVTbaseGrammarResource.java @@ -810,9 +810,9 @@ public class QVTbaseGrammarResource extends AbstractGrammarResource createKeyword("}"))); PR_MapLiteralPartCS.setAlternatives( createGroup( - createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)), + createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)), createKeyword("<-"), - createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)))); + createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)))); PR_MapTypeCS.setAlternatives( createGroup( createAssignment("name", "=", createKeyword("Map")), diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbase.g b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbase.g index a4ab1eafb..9fc01dde0 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbase.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbase.g @@ -4459,16 +4459,16 @@ ruleMapLiteralPartCS returns [EObject current=null] (( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } - lv_ownedKey_0_0=ruleExpCS { + lv_ownedValue_0_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } @@ -4481,16 +4481,16 @@ ruleMapLiteralPartCS returns [EObject current=null] ( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } - lv_ownedValue_2_0=ruleExpCS { + lv_ownedKey_2_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbaseParser.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbaseParser.java index 81ec46c90..a63359b34 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbaseParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/parser/antlr/internal/InternalQVTbaseParser.java @@ -13386,38 +13386,38 @@ public class InternalQVTbaseParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleMapLiteralPartCS" - // InternalQVTbase.g:4455:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ; + // InternalQVTbase.g:4455:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ; public final EObject ruleMapLiteralPartCS() throws RecognitionException { EObject current = null; Token otherlv_1=null; - EObject lv_ownedKey_0_0 = null; + EObject lv_ownedValue_0_0 = null; - EObject lv_ownedValue_2_0 = null; + EObject lv_ownedKey_2_0 = null; enterRule(); try { - // InternalQVTbase.g:4458:28: ( ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ) - // InternalQVTbase.g:4459:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) + // InternalQVTbase.g:4458:28: ( ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ) + // InternalQVTbase.g:4459:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) { - // InternalQVTbase.g:4459:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) - // InternalQVTbase.g:4459:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) + // InternalQVTbase.g:4459:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) + // InternalQVTbase.g:4459:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) { - // InternalQVTbase.g:4459:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) - // InternalQVTbase.g:4460:1: (lv_ownedKey_0_0= ruleExpCS ) + // InternalQVTbase.g:4459:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) + // InternalQVTbase.g:4460:1: (lv_ownedValue_0_0= ruleExpCS ) { - // InternalQVTbase.g:4460:1: (lv_ownedKey_0_0= ruleExpCS ) - // InternalQVTbase.g:4461:3: lv_ownedKey_0_0= ruleExpCS + // InternalQVTbase.g:4460:1: (lv_ownedValue_0_0= ruleExpCS ) + // InternalQVTbase.g:4461:3: lv_ownedValue_0_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_79); - lv_ownedKey_0_0=ruleExpCS(); + lv_ownedValue_0_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -13428,8 +13428,8 @@ public class InternalQVTbaseParser extends AbstractInternalAntlrParser { } set( current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); @@ -13446,19 +13446,19 @@ public class InternalQVTbaseParser extends AbstractInternalAntlrParser { newLeafNode(otherlv_1, grammarAccess.getMapLiteralPartCSAccess().getLessThanSignHyphenMinusKeyword_1()); } - // InternalQVTbase.g:4481:1: ( (lv_ownedValue_2_0= ruleExpCS ) ) - // InternalQVTbase.g:4482:1: (lv_ownedValue_2_0= ruleExpCS ) + // InternalQVTbase.g:4481:1: ( (lv_ownedKey_2_0= ruleExpCS ) ) + // InternalQVTbase.g:4482:1: (lv_ownedKey_2_0= ruleExpCS ) { - // InternalQVTbase.g:4482:1: (lv_ownedValue_2_0= ruleExpCS ) - // InternalQVTbase.g:4483:3: lv_ownedValue_2_0= ruleExpCS + // InternalQVTbase.g:4482:1: (lv_ownedKey_2_0= ruleExpCS ) + // InternalQVTbase.g:4483:3: lv_ownedKey_2_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); - lv_ownedValue_2_0=ruleExpCS(); + lv_ownedKey_2_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -13469,8 +13469,8 @@ public class InternalQVTbaseParser extends AbstractInternalAntlrParser { } set( current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java index 52bd8c739..3d09af944 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src-gen/org/eclipse/qvtd/xtext/qvtbase/services/QVTbaseGrammarAccess.java @@ -2941,7 +2941,7 @@ public class QVTbaseGrammarAccess extends AbstractGrammarElementFinder { } //MapLiteralPartCS: - // ownedKey=ExpCS '<-' ownedValue=ExpCS; + // ownedValue=ExpCS '<-' ownedKey=ExpCS; public EssentialOCLGrammarAccess.MapLiteralPartCSElements getMapLiteralPartCSAccess() { return gaEssentialOCL.getMapLiteralPartCSAccess(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java index fa54db4ff..e4ab4fcea 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/QVTcoreParser.java @@ -565,8 +565,8 @@ public class QVTcoreParser extends AbstractContentAssistParser { put(grammarAccess.getMapLiteralExpCSAccess().getOwnedTypeAssignment_0(), "rule__MapLiteralExpCS__OwnedTypeAssignment_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_0(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_1_1(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0(), "rule__MapLiteralPartCS__OwnedKeyAssignment_0"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2(), "rule__MapLiteralPartCS__OwnedValueAssignment_2"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0(), "rule__MapLiteralPartCS__OwnedValueAssignment_0"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2(), "rule__MapLiteralPartCS__OwnedKeyAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_2(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_3_1(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_3_1"); put(grammarAccess.getTupleLiteralPartCSAccess().getNameAssignment_0(), "rule__TupleLiteralPartCS__NameAssignment_0"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g index 759d3c5d9..dc24751c8 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcore.g @@ -20117,9 +20117,9 @@ rule__MapLiteralPartCS__Group__0__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } -(rule__MapLiteralPartCS__OwnedKeyAssignment_0) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } +(rule__MapLiteralPartCS__OwnedValueAssignment_0) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } ) ; @@ -20176,9 +20176,9 @@ rule__MapLiteralPartCS__Group__2__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } -(rule__MapLiteralPartCS__OwnedValueAssignment_2) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } +(rule__MapLiteralPartCS__OwnedKeyAssignment_2) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } ) ; @@ -30771,14 +30771,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedKeyAssignment_0 +rule__MapLiteralPartCS__OwnedValueAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } ) ; @@ -30786,14 +30786,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedValueAssignment_2 +rule__MapLiteralPartCS__OwnedKeyAssignment_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java index 8df7add0d..9581b46fb 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src-gen/org/eclipse/qvtd/xtext/qvtcore/ui/contentassist/antlr/internal/InternalQVTcoreParser.java @@ -60407,26 +60407,26 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__MapLiteralPartCS__Group__0__Impl" - // InternalQVTcore.g:20114:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ; + // InternalQVTcore.g:20114:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ; public final void rule__MapLiteralPartCS__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTcore.g:20118:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ) - // InternalQVTcore.g:20119:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) + // InternalQVTcore.g:20118:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ) + // InternalQVTcore.g:20119:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) { - // InternalQVTcore.g:20119:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) - // InternalQVTcore.g:20120:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) + // InternalQVTcore.g:20119:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) + // InternalQVTcore.g:20120:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } - // InternalQVTcore.g:20121:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) - // InternalQVTcore.g:20121:2: rule__MapLiteralPartCS__OwnedKeyAssignment_0 + // InternalQVTcore.g:20121:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) + // InternalQVTcore.g:20121:2: rule__MapLiteralPartCS__OwnedValueAssignment_0 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedKeyAssignment_0(); + rule__MapLiteralPartCS__OwnedValueAssignment_0(); state._fsp--; if (state.failed) return ; @@ -60434,7 +60434,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } } @@ -60570,26 +60570,26 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // $ANTLR start "rule__MapLiteralPartCS__Group__2__Impl" - // InternalQVTcore.g:20173:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ; + // InternalQVTcore.g:20173:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ; public final void rule__MapLiteralPartCS__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTcore.g:20177:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ) - // InternalQVTcore.g:20178:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) + // InternalQVTcore.g:20177:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ) + // InternalQVTcore.g:20178:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) { - // InternalQVTcore.g:20178:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) - // InternalQVTcore.g:20179:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) + // InternalQVTcore.g:20178:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) + // InternalQVTcore.g:20179:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } - // InternalQVTcore.g:20180:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) - // InternalQVTcore.g:20180:2: rule__MapLiteralPartCS__OwnedValueAssignment_2 + // InternalQVTcore.g:20180:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) + // InternalQVTcore.g:20180:2: rule__MapLiteralPartCS__OwnedKeyAssignment_2 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedValueAssignment_2(); + rule__MapLiteralPartCS__OwnedKeyAssignment_2(); state._fsp--; if (state.failed) return ; @@ -60597,7 +60597,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } } @@ -89456,9 +89456,9 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // $ANTLR end "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1" - // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_0" - // InternalQVTcore.g:30774:1: rule__MapLiteralPartCS__OwnedKeyAssignment_0 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedKeyAssignment_0() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_0" + // InternalQVTcore.g:30774:1: rule__MapLiteralPartCS__OwnedValueAssignment_0 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedValueAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); @@ -89470,7 +89470,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // InternalQVTcore.g:30780:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -89478,7 +89478,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } } @@ -89498,12 +89498,12 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_0" + // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_0" - // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_2" - // InternalQVTcore.g:30789:1: rule__MapLiteralPartCS__OwnedValueAssignment_2 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedValueAssignment_2() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_2" + // InternalQVTcore.g:30789:1: rule__MapLiteralPartCS__OwnedKeyAssignment_2 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedKeyAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); @@ -89515,7 +89515,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { // InternalQVTcore.g:30795:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -89523,7 +89523,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } } @@ -89543,7 +89543,7 @@ public class InternalQVTcoreParser extends AbstractInternalContentAssistParser { } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_2" + // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_2" // $ANTLR start "rule__TupleLiteralExpCS__OwnedPartsAssignment_2" 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 f4e40cc67..75f370915 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 3d6e2c6d5..51202927c 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 @@ -1158,9 +1158,9 @@ public class QVTcoreGrammarResource extends AbstractGrammarResource createKeyword("}"))); PR_MapLiteralPartCS.setAlternatives( createGroup( - createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)), + createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)), createKeyword("<-"), - createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)))); + createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)))); PR_MapTypeCS.setAlternatives( createGroup( createAssignment("name", "=", createKeyword("Map")), 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 dde6ca9af..eb456e5bd 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 @@ -7185,16 +7185,16 @@ ruleMapLiteralPartCS returns [EObject current=null] (( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } - lv_ownedKey_0_0=ruleExpCS { + lv_ownedValue_0_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } @@ -7207,16 +7207,16 @@ ruleMapLiteralPartCS returns [EObject current=null] ( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } - lv_ownedValue_2_0=ruleExpCS { + lv_ownedKey_2_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } 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 b59c975ec..247241e94 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 @@ -21369,38 +21369,38 @@ public class InternalQVTcoreParser extends org.eclipse.ocl.xtext.base.utilities. // $ANTLR start "ruleMapLiteralPartCS" - // InternalQVTcore.g:7181:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ; + // InternalQVTcore.g:7181:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ; public final EObject ruleMapLiteralPartCS() throws RecognitionException { EObject current = null; Token otherlv_1=null; - EObject lv_ownedKey_0_0 = null; + EObject lv_ownedValue_0_0 = null; - EObject lv_ownedValue_2_0 = null; + EObject lv_ownedKey_2_0 = null; enterRule(); try { - // InternalQVTcore.g:7184:28: ( ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ) - // InternalQVTcore.g:7185:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) + // InternalQVTcore.g:7184:28: ( ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ) + // InternalQVTcore.g:7185:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) { - // InternalQVTcore.g:7185:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) - // InternalQVTcore.g:7185:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) + // InternalQVTcore.g:7185:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) + // InternalQVTcore.g:7185:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) { - // InternalQVTcore.g:7185:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) - // InternalQVTcore.g:7186:1: (lv_ownedKey_0_0= ruleExpCS ) + // InternalQVTcore.g:7185:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) + // InternalQVTcore.g:7186:1: (lv_ownedValue_0_0= ruleExpCS ) { - // InternalQVTcore.g:7186:1: (lv_ownedKey_0_0= ruleExpCS ) - // InternalQVTcore.g:7187:3: lv_ownedKey_0_0= ruleExpCS + // InternalQVTcore.g:7186:1: (lv_ownedValue_0_0= ruleExpCS ) + // InternalQVTcore.g:7187:3: lv_ownedValue_0_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_111); - lv_ownedKey_0_0=ruleExpCS(); + lv_ownedValue_0_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -21411,8 +21411,8 @@ public class InternalQVTcoreParser extends org.eclipse.ocl.xtext.base.utilities. } set( current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); @@ -21429,19 +21429,19 @@ public class InternalQVTcoreParser extends org.eclipse.ocl.xtext.base.utilities. newLeafNode(otherlv_1, grammarAccess.getMapLiteralPartCSAccess().getLessThanSignHyphenMinusKeyword_1()); } - // InternalQVTcore.g:7207:1: ( (lv_ownedValue_2_0= ruleExpCS ) ) - // InternalQVTcore.g:7208:1: (lv_ownedValue_2_0= ruleExpCS ) + // InternalQVTcore.g:7207:1: ( (lv_ownedKey_2_0= ruleExpCS ) ) + // InternalQVTcore.g:7208:1: (lv_ownedKey_2_0= ruleExpCS ) { - // InternalQVTcore.g:7208:1: (lv_ownedValue_2_0= ruleExpCS ) - // InternalQVTcore.g:7209:3: lv_ownedValue_2_0= ruleExpCS + // InternalQVTcore.g:7208:1: (lv_ownedKey_2_0= ruleExpCS ) + // InternalQVTcore.g:7209:3: lv_ownedKey_2_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); - lv_ownedValue_2_0=ruleExpCS(); + lv_ownedKey_2_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -21452,8 +21452,8 @@ public class InternalQVTcoreParser extends org.eclipse.ocl.xtext.base.utilities. } set( current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); 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 127a45847..41f548837 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 @@ -2588,7 +2588,7 @@ public class QVTcoreGrammarAccess extends AbstractGrammarElementFinder { } //MapLiteralPartCS: - // ownedKey=ExpCS '<-' ownedValue=ExpCS; + // ownedValue=ExpCS '<-' ownedKey=ExpCS; public EssentialOCLGrammarAccess.MapLiteralPartCSElements getMapLiteralPartCSAccess() { return gaEssentialOCL.getMapLiteralPartCSAccess(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java index 26d6e7dcb..67241d8c7 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/QVTimperativeParser.java @@ -625,8 +625,8 @@ public class QVTimperativeParser extends AbstractContentAssistParser { put(grammarAccess.getMapLiteralExpCSAccess().getOwnedTypeAssignment_0(), "rule__MapLiteralExpCS__OwnedTypeAssignment_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_0(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_1_1(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0(), "rule__MapLiteralPartCS__OwnedKeyAssignment_0"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2(), "rule__MapLiteralPartCS__OwnedValueAssignment_2"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0(), "rule__MapLiteralPartCS__OwnedValueAssignment_0"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2(), "rule__MapLiteralPartCS__OwnedKeyAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_2(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_3_1(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_3_1"); put(grammarAccess.getTupleLiteralPartCSAccess().getNameAssignment_0(), "rule__TupleLiteralPartCS__NameAssignment_0"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g index 2016514a2..086fad773 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperative.g @@ -23554,9 +23554,9 @@ rule__MapLiteralPartCS__Group__0__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } -(rule__MapLiteralPartCS__OwnedKeyAssignment_0) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } +(rule__MapLiteralPartCS__OwnedValueAssignment_0) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } ) ; @@ -23613,9 +23613,9 @@ rule__MapLiteralPartCS__Group__2__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } -(rule__MapLiteralPartCS__OwnedValueAssignment_2) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } +(rule__MapLiteralPartCS__OwnedKeyAssignment_2) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } ) ; @@ -34858,14 +34858,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedKeyAssignment_0 +rule__MapLiteralPartCS__OwnedValueAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } ) ; @@ -34873,14 +34873,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedValueAssignment_2 +rule__MapLiteralPartCS__OwnedKeyAssignment_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java index 9d2aab719..9e2d3184c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src-gen/org/eclipse/qvtd/xtext/qvtimperative/ui/contentassist/antlr/internal/InternalQVTimperativeParser.java @@ -69739,26 +69739,26 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa // $ANTLR start "rule__MapLiteralPartCS__Group__0__Impl" - // InternalQVTimperative.g:23551:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ; + // InternalQVTimperative.g:23551:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ; public final void rule__MapLiteralPartCS__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTimperative.g:23555:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ) - // InternalQVTimperative.g:23556:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) + // InternalQVTimperative.g:23555:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ) + // InternalQVTimperative.g:23556:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) { - // InternalQVTimperative.g:23556:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) - // InternalQVTimperative.g:23557:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) + // InternalQVTimperative.g:23556:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) + // InternalQVTimperative.g:23557:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } - // InternalQVTimperative.g:23558:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) - // InternalQVTimperative.g:23558:2: rule__MapLiteralPartCS__OwnedKeyAssignment_0 + // InternalQVTimperative.g:23558:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) + // InternalQVTimperative.g:23558:2: rule__MapLiteralPartCS__OwnedValueAssignment_0 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedKeyAssignment_0(); + rule__MapLiteralPartCS__OwnedValueAssignment_0(); state._fsp--; if (state.failed) return ; @@ -69766,7 +69766,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } } @@ -69902,26 +69902,26 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa // $ANTLR start "rule__MapLiteralPartCS__Group__2__Impl" - // InternalQVTimperative.g:23610:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ; + // InternalQVTimperative.g:23610:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ; public final void rule__MapLiteralPartCS__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTimperative.g:23614:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ) - // InternalQVTimperative.g:23615:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) + // InternalQVTimperative.g:23614:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ) + // InternalQVTimperative.g:23615:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) { - // InternalQVTimperative.g:23615:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) - // InternalQVTimperative.g:23616:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) + // InternalQVTimperative.g:23615:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) + // InternalQVTimperative.g:23616:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } - // InternalQVTimperative.g:23617:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) - // InternalQVTimperative.g:23617:2: rule__MapLiteralPartCS__OwnedValueAssignment_2 + // InternalQVTimperative.g:23617:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) + // InternalQVTimperative.g:23617:2: rule__MapLiteralPartCS__OwnedKeyAssignment_2 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedValueAssignment_2(); + rule__MapLiteralPartCS__OwnedKeyAssignment_2(); state._fsp--; if (state.failed) return ; @@ -69929,7 +69929,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } } @@ -100616,9 +100616,9 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa // $ANTLR end "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1" - // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_0" - // InternalQVTimperative.g:34861:1: rule__MapLiteralPartCS__OwnedKeyAssignment_0 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedKeyAssignment_0() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_0" + // InternalQVTimperative.g:34861:1: rule__MapLiteralPartCS__OwnedValueAssignment_0 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedValueAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); @@ -100630,7 +100630,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa // InternalQVTimperative.g:34867:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -100638,7 +100638,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } } @@ -100658,12 +100658,12 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_0" + // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_0" - // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_2" - // InternalQVTimperative.g:34876:1: rule__MapLiteralPartCS__OwnedValueAssignment_2 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedValueAssignment_2() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_2" + // InternalQVTimperative.g:34876:1: rule__MapLiteralPartCS__OwnedKeyAssignment_2 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedKeyAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); @@ -100675,7 +100675,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa // InternalQVTimperative.g:34882:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -100683,7 +100683,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } } @@ -100703,7 +100703,7 @@ public class InternalQVTimperativeParser extends AbstractInternalContentAssistPa } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_2" + // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_2" // $ANTLR start "rule__TupleLiteralExpCS__OwnedPartsAssignment_2" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin Binary files differindex fbd4f492b..74925b46d 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperative.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperativeGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperativeGrammarResource.java index f9ee07ed1..97bb3402c 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperativeGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/QVTimperativeGrammarResource.java @@ -1345,9 +1345,9 @@ public class QVTimperativeGrammarResource extends AbstractGrammarResource createKeyword("}"))); PR_MapLiteralPartCS.setAlternatives( createGroup( - createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)), + createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)), createKeyword("<-"), - createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)))); + createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)))); PR_MapTypeCS.setAlternatives( createGroup( createAssignment("name", "=", createKeyword("Map")), diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperative.g b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperative.g index 5f819e1dd..0c1ce7e90 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperative.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperative.g @@ -8528,16 +8528,16 @@ ruleMapLiteralPartCS returns [EObject current=null] (( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } - lv_ownedKey_0_0=ruleExpCS { + lv_ownedValue_0_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } @@ -8550,16 +8550,16 @@ ruleMapLiteralPartCS returns [EObject current=null] ( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } - lv_ownedValue_2_0=ruleExpCS { + lv_ownedKey_2_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperativeParser.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperativeParser.java index b5325fcd1..6693c7750 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperativeParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/parser/antlr/internal/InternalQVTimperativeParser.java @@ -24664,38 +24664,38 @@ public class InternalQVTimperativeParser extends org.eclipse.ocl.xtext.base.util // $ANTLR start "ruleMapLiteralPartCS" - // InternalQVTimperative.g:8524:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ; + // InternalQVTimperative.g:8524:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ; public final EObject ruleMapLiteralPartCS() throws RecognitionException { EObject current = null; Token otherlv_1=null; - EObject lv_ownedKey_0_0 = null; + EObject lv_ownedValue_0_0 = null; - EObject lv_ownedValue_2_0 = null; + EObject lv_ownedKey_2_0 = null; enterRule(); try { - // InternalQVTimperative.g:8527:28: ( ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ) - // InternalQVTimperative.g:8528:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) + // InternalQVTimperative.g:8527:28: ( ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ) + // InternalQVTimperative.g:8528:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) { - // InternalQVTimperative.g:8528:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) - // InternalQVTimperative.g:8528:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) + // InternalQVTimperative.g:8528:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) + // InternalQVTimperative.g:8528:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) { - // InternalQVTimperative.g:8528:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) - // InternalQVTimperative.g:8529:1: (lv_ownedKey_0_0= ruleExpCS ) + // InternalQVTimperative.g:8528:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) + // InternalQVTimperative.g:8529:1: (lv_ownedValue_0_0= ruleExpCS ) { - // InternalQVTimperative.g:8529:1: (lv_ownedKey_0_0= ruleExpCS ) - // InternalQVTimperative.g:8530:3: lv_ownedKey_0_0= ruleExpCS + // InternalQVTimperative.g:8529:1: (lv_ownedValue_0_0= ruleExpCS ) + // InternalQVTimperative.g:8530:3: lv_ownedValue_0_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_132); - lv_ownedKey_0_0=ruleExpCS(); + lv_ownedValue_0_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -24706,8 +24706,8 @@ public class InternalQVTimperativeParser extends org.eclipse.ocl.xtext.base.util } set( current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); @@ -24724,19 +24724,19 @@ public class InternalQVTimperativeParser extends org.eclipse.ocl.xtext.base.util newLeafNode(otherlv_1, grammarAccess.getMapLiteralPartCSAccess().getLessThanSignHyphenMinusKeyword_1()); } - // InternalQVTimperative.g:8550:1: ( (lv_ownedValue_2_0= ruleExpCS ) ) - // InternalQVTimperative.g:8551:1: (lv_ownedValue_2_0= ruleExpCS ) + // InternalQVTimperative.g:8550:1: ( (lv_ownedKey_2_0= ruleExpCS ) ) + // InternalQVTimperative.g:8551:1: (lv_ownedKey_2_0= ruleExpCS ) { - // InternalQVTimperative.g:8551:1: (lv_ownedValue_2_0= ruleExpCS ) - // InternalQVTimperative.g:8552:3: lv_ownedValue_2_0= ruleExpCS + // InternalQVTimperative.g:8551:1: (lv_ownedKey_2_0= ruleExpCS ) + // InternalQVTimperative.g:8552:3: lv_ownedKey_2_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); - lv_ownedValue_2_0=ruleExpCS(); + lv_ownedKey_2_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -24747,8 +24747,8 @@ public class InternalQVTimperativeParser extends org.eclipse.ocl.xtext.base.util } set( current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java index eb2de17dc..abef6a1da 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative/src-gen/org/eclipse/qvtd/xtext/qvtimperative/services/QVTimperativeGrammarAccess.java @@ -3641,7 +3641,7 @@ public class QVTimperativeGrammarAccess extends AbstractGrammarElementFinder { } //MapLiteralPartCS: - // ownedKey=ExpCS '<-' ownedValue=ExpCS; + // ownedValue=ExpCS '<-' ownedKey=ExpCS; public EssentialOCLGrammarAccess.MapLiteralPartCSElements getMapLiteralPartCSAccess() { return gaEssentialOCL.getMapLiteralPartCSAccess(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java index bde2543a3..c4bed1790 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java @@ -607,8 +607,8 @@ public class QVTrelationParser extends AbstractContentAssistParser { put(grammarAccess.getMapLiteralExpCSAccess().getOwnedTypeAssignment_0(), "rule__MapLiteralExpCS__OwnedTypeAssignment_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_0(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_0"); put(grammarAccess.getMapLiteralExpCSAccess().getOwnedPartsAssignment_2_1_1(), "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0(), "rule__MapLiteralPartCS__OwnedKeyAssignment_0"); - put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2(), "rule__MapLiteralPartCS__OwnedValueAssignment_2"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0(), "rule__MapLiteralPartCS__OwnedValueAssignment_0"); + put(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2(), "rule__MapLiteralPartCS__OwnedKeyAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_2(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_2"); put(grammarAccess.getTupleLiteralExpCSAccess().getOwnedPartsAssignment_3_1(), "rule__TupleLiteralExpCS__OwnedPartsAssignment_3_1"); put(grammarAccess.getTupleLiteralPartCSAccess().getNameAssignment_0(), "rule__TupleLiteralPartCS__NameAssignment_0"); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g index f45321f89..b12fafe17 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g @@ -22421,9 +22421,9 @@ rule__MapLiteralPartCS__Group__0__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } -(rule__MapLiteralPartCS__OwnedKeyAssignment_0) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } +(rule__MapLiteralPartCS__OwnedValueAssignment_0) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } ) ; @@ -22480,9 +22480,9 @@ rule__MapLiteralPartCS__Group__2__Impl } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } -(rule__MapLiteralPartCS__OwnedValueAssignment_2) -{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } +(rule__MapLiteralPartCS__OwnedKeyAssignment_2) +{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } ) ; @@ -33088,14 +33088,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedKeyAssignment_0 +rule__MapLiteralPartCS__OwnedValueAssignment_0 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } ) ; @@ -33103,14 +33103,14 @@ finally { restoreStackSize(stackSize); } -rule__MapLiteralPartCS__OwnedValueAssignment_2 +rule__MapLiteralPartCS__OwnedKeyAssignment_2 @init { int stackSize = keepStackSize(); } : ( -{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } - ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); } +{ before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } + ruleExpCS{ after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } ) ; diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java index ab334b534..c2103b4dc 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java @@ -66969,26 +66969,26 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // $ANTLR start "rule__MapLiteralPartCS__Group__0__Impl" - // InternalQVTrelation.g:22418:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ; + // InternalQVTrelation.g:22418:1: rule__MapLiteralPartCS__Group__0__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ; public final void rule__MapLiteralPartCS__Group__0__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTrelation.g:22422:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) ) - // InternalQVTrelation.g:22423:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) + // InternalQVTrelation.g:22422:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) ) + // InternalQVTrelation.g:22423:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) { - // InternalQVTrelation.g:22423:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) ) - // InternalQVTrelation.g:22424:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) + // InternalQVTrelation.g:22423:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) ) + // InternalQVTrelation.g:22424:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } - // InternalQVTrelation.g:22425:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_0 ) - // InternalQVTrelation.g:22425:2: rule__MapLiteralPartCS__OwnedKeyAssignment_0 + // InternalQVTrelation.g:22425:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_0 ) + // InternalQVTrelation.g:22425:2: rule__MapLiteralPartCS__OwnedValueAssignment_0 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedKeyAssignment_0(); + rule__MapLiteralPartCS__OwnedValueAssignment_0(); state._fsp--; if (state.failed) return ; @@ -66996,7 +66996,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_0()); } } @@ -67132,26 +67132,26 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // $ANTLR start "rule__MapLiteralPartCS__Group__2__Impl" - // InternalQVTrelation.g:22477:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ; + // InternalQVTrelation.g:22477:1: rule__MapLiteralPartCS__Group__2__Impl : ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ; public final void rule__MapLiteralPartCS__Group__2__Impl() throws RecognitionException { int stackSize = keepStackSize(); try { - // InternalQVTrelation.g:22481:1: ( ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) ) - // InternalQVTrelation.g:22482:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) + // InternalQVTrelation.g:22481:1: ( ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) ) + // InternalQVTrelation.g:22482:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) { - // InternalQVTrelation.g:22482:1: ( ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) ) - // InternalQVTrelation.g:22483:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) + // InternalQVTrelation.g:22482:1: ( ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) ) + // InternalQVTrelation.g:22483:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } - // InternalQVTrelation.g:22484:1: ( rule__MapLiteralPartCS__OwnedValueAssignment_2 ) - // InternalQVTrelation.g:22484:2: rule__MapLiteralPartCS__OwnedValueAssignment_2 + // InternalQVTrelation.g:22484:1: ( rule__MapLiteralPartCS__OwnedKeyAssignment_2 ) + // InternalQVTrelation.g:22484:2: rule__MapLiteralPartCS__OwnedKeyAssignment_2 { pushFollow(FollowSets000.FOLLOW_2); - rule__MapLiteralPartCS__OwnedValueAssignment_2(); + rule__MapLiteralPartCS__OwnedKeyAssignment_2(); state._fsp--; if (state.failed) return ; @@ -67159,7 +67159,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueAssignment_2()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyAssignment_2()); } } @@ -96129,9 +96129,9 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // $ANTLR end "rule__MapLiteralExpCS__OwnedPartsAssignment_2_1_1" - // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_0" - // InternalQVTrelation.g:33091:1: rule__MapLiteralPartCS__OwnedKeyAssignment_0 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedKeyAssignment_0() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_0" + // InternalQVTrelation.g:33091:1: rule__MapLiteralPartCS__OwnedValueAssignment_0 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedValueAssignment_0() throws RecognitionException { int stackSize = keepStackSize(); @@ -96143,7 +96143,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // InternalQVTrelation.g:33097:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -96151,7 +96151,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } } @@ -96171,12 +96171,12 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_0" + // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_0" - // $ANTLR start "rule__MapLiteralPartCS__OwnedValueAssignment_2" - // InternalQVTrelation.g:33106:1: rule__MapLiteralPartCS__OwnedValueAssignment_2 : ( ruleExpCS ) ; - public final void rule__MapLiteralPartCS__OwnedValueAssignment_2() throws RecognitionException { + // $ANTLR start "rule__MapLiteralPartCS__OwnedKeyAssignment_2" + // InternalQVTrelation.g:33106:1: rule__MapLiteralPartCS__OwnedKeyAssignment_2 : ( ruleExpCS ) ; + public final void rule__MapLiteralPartCS__OwnedKeyAssignment_2() throws RecognitionException { int stackSize = keepStackSize(); @@ -96188,7 +96188,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars // InternalQVTrelation.g:33112:1: ruleExpCS { if ( state.backtracking==0 ) { - before(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + before(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); ruleExpCS(); @@ -96196,7 +96196,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars state._fsp--; if (state.failed) return ; if ( state.backtracking==0 ) { - after(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + after(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } } @@ -96216,7 +96216,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars } return ; } - // $ANTLR end "rule__MapLiteralPartCS__OwnedValueAssignment_2" + // $ANTLR end "rule__MapLiteralPartCS__OwnedKeyAssignment_2" // $ANTLR start "rule__TupleLiteralExpCS__OwnedPartsAssignment_2" diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin Binary files differindex d54f074d0..a41f292c8 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbin diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java index 763c92803..74308b1c2 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java @@ -1289,9 +1289,9 @@ public class QVTrelationGrammarResource extends AbstractGrammarResource createKeyword("}"))); PR_MapLiteralPartCS.setAlternatives( createGroup( - createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)), + createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)), createKeyword("<-"), - createAssignment("ownedValue", "=", createRuleCall(PR_ExpCS)))); + createAssignment("ownedKey", "=", createRuleCall(PR_ExpCS)))); PR_MapTypeCS.setAlternatives( createGroup( createAssignment("name", "=", createKeyword("Map")), diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g index 76b2f80bf..60991a57e 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g @@ -7969,16 +7969,16 @@ ruleMapLiteralPartCS returns [EObject current=null] (( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } - lv_ownedKey_0_0=ruleExpCS { + lv_ownedValue_0_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } @@ -7991,16 +7991,16 @@ ruleMapLiteralPartCS returns [EObject current=null] ( ( { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } - lv_ownedValue_2_0=ruleExpCS { + lv_ownedKey_2_0=ruleExpCS { if ($current==null) { $current = createModelElementForParent(grammarAccess.getMapLiteralPartCSRule()); } set( $current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); } diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java index ea8440672..8dcf31365 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java @@ -23717,38 +23717,38 @@ public class InternalQVTrelationParser extends org.eclipse.ocl.xtext.base.utilit // $ANTLR start "ruleMapLiteralPartCS" - // InternalQVTrelation.g:7965:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ; + // InternalQVTrelation.g:7965:1: ruleMapLiteralPartCS returns [EObject current=null] : ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ; public final EObject ruleMapLiteralPartCS() throws RecognitionException { EObject current = null; Token otherlv_1=null; - EObject lv_ownedKey_0_0 = null; + EObject lv_ownedValue_0_0 = null; - EObject lv_ownedValue_2_0 = null; + EObject lv_ownedKey_2_0 = null; enterRule(); try { - // InternalQVTrelation.g:7968:28: ( ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) ) - // InternalQVTrelation.g:7969:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) + // InternalQVTrelation.g:7968:28: ( ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) ) + // InternalQVTrelation.g:7969:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) { - // InternalQVTrelation.g:7969:1: ( ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) ) - // InternalQVTrelation.g:7969:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedValue_2_0= ruleExpCS ) ) + // InternalQVTrelation.g:7969:1: ( ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) ) + // InternalQVTrelation.g:7969:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) otherlv_1= '<-' ( (lv_ownedKey_2_0= ruleExpCS ) ) { - // InternalQVTrelation.g:7969:2: ( (lv_ownedKey_0_0= ruleExpCS ) ) - // InternalQVTrelation.g:7970:1: (lv_ownedKey_0_0= ruleExpCS ) + // InternalQVTrelation.g:7969:2: ( (lv_ownedValue_0_0= ruleExpCS ) ) + // InternalQVTrelation.g:7970:1: (lv_ownedValue_0_0= ruleExpCS ) { - // InternalQVTrelation.g:7970:1: (lv_ownedKey_0_0= ruleExpCS ) - // InternalQVTrelation.g:7971:3: lv_ownedKey_0_0= ruleExpCS + // InternalQVTrelation.g:7970:1: (lv_ownedValue_0_0= ruleExpCS ) + // InternalQVTrelation.g:7971:3: lv_ownedValue_0_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_0_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_0_0()); } pushFollow(FollowSets000.FOLLOW_113); - lv_ownedKey_0_0=ruleExpCS(); + lv_ownedValue_0_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -23759,8 +23759,8 @@ public class InternalQVTrelationParser extends org.eclipse.ocl.xtext.base.utilit } set( current, - "ownedKey", - lv_ownedKey_0_0, + "ownedValue", + lv_ownedValue_0_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); @@ -23777,19 +23777,19 @@ public class InternalQVTrelationParser extends org.eclipse.ocl.xtext.base.utilit newLeafNode(otherlv_1, grammarAccess.getMapLiteralPartCSAccess().getLessThanSignHyphenMinusKeyword_1()); } - // InternalQVTrelation.g:7991:1: ( (lv_ownedValue_2_0= ruleExpCS ) ) - // InternalQVTrelation.g:7992:1: (lv_ownedValue_2_0= ruleExpCS ) + // InternalQVTrelation.g:7991:1: ( (lv_ownedKey_2_0= ruleExpCS ) ) + // InternalQVTrelation.g:7992:1: (lv_ownedKey_2_0= ruleExpCS ) { - // InternalQVTrelation.g:7992:1: (lv_ownedValue_2_0= ruleExpCS ) - // InternalQVTrelation.g:7993:3: lv_ownedValue_2_0= ruleExpCS + // InternalQVTrelation.g:7992:1: (lv_ownedKey_2_0= ruleExpCS ) + // InternalQVTrelation.g:7993:3: lv_ownedKey_2_0= ruleExpCS { if ( state.backtracking==0 ) { - newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedValueExpCSParserRuleCall_2_0()); + newCompositeNode(grammarAccess.getMapLiteralPartCSAccess().getOwnedKeyExpCSParserRuleCall_2_0()); } pushFollow(FollowSets000.FOLLOW_2); - lv_ownedValue_2_0=ruleExpCS(); + lv_ownedKey_2_0=ruleExpCS(); state._fsp--; if (state.failed) return current; @@ -23800,8 +23800,8 @@ public class InternalQVTrelationParser extends org.eclipse.ocl.xtext.base.utilit } set( current, - "ownedValue", - lv_ownedValue_2_0, + "ownedKey", + lv_ownedKey_2_0, "org.eclipse.ocl.xtext.essentialocl.EssentialOCL.ExpCS"); afterParserOrEnumRuleCall(); diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java index 3a7cddb1f..6a3c96f2b 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java @@ -613,8 +613,8 @@ public abstract class AbstractQVTrelationSemanticSequencer extends QVTbaseSemant * ownedType=CollectionTypeCS * ( * (ownedMemberIdentifiers+=TemplateCS | ownedMemberIdentifiers+=ElementTemplateCS) - * ownedMemberIdentifiers+=TemplateCS? - * (ownedMemberIdentifiers+=ElementTemplateCS? ownedMemberIdentifiers+=TemplateCS?)* + * ownedMemberIdentifiers+=ElementTemplateCS? + * (ownedMemberIdentifiers+=TemplateCS? ownedMemberIdentifiers+=ElementTemplateCS?)* * ownedRestIdentifier=ElementTemplateCS * )? * ownedGuardExpression=ExpCS? diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java index 5beda058a..39149319a 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java @@ -3304,7 +3304,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder { } //MapLiteralPartCS: - // ownedKey=ExpCS '<-' ownedValue=ExpCS; + // ownedValue=ExpCS '<-' ownedKey=ExpCS; public EssentialOCLGrammarAccess.MapLiteralPartCSElements getMapLiteralPartCSAccess() { return gaEssentialOCL.getMapLiteralPartCSAccess(); } |