Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/DNF_bbox/DNF_bbox.qvtr2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/QVTrelationParser.java2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g12
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelationParser.java52
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/DomainCS.java27
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java44
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/DomainCSImpl.java54
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java26
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore1
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtextbinbin19050 -> 19045 bytes
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/QVTrelationGrammarResource.java2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g10
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelationParser.java40
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/serializer/AbstractQVTrelationSemanticSequencer.java2
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/services/QVTrelationGrammarAccess.java20
-rw-r--r--plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext2
17 files changed, 210 insertions, 88 deletions
diff --git a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/DNF_bbox/DNF_bbox.qvtr b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/DNF_bbox/DNF_bbox.qvtr
index 3dca23f2c..e6508586c 100644
--- a/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/DNF_bbox/DNF_bbox.qvtr
+++ b/examples/org.eclipse.qvtd.examples.qvtrelation.modelmorf/qvtrsrc/DNF_bbox/DNF_bbox.qvtr
@@ -266,6 +266,6 @@ transformation DNF_bbox(expr1:exprMM, expr2:exprMM)
{
domain expr1 e1:Expr {};
- enforce domain expr2 e2:Expr {} implementedby CopyExpr(e1, e2);
+ enforce domain expr2 e2:Expr {} implementedby CopyExpr;
}
}
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java
index 11bb6659d..51208c83a 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/AbstractQVTrelationProposalProvider.java
@@ -56,7 +56,7 @@ public class AbstractQVTrelationProposalProvider extends org.eclipse.ocl.xtext.e
public void completeDomainCS_OwnedPattern(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
- public void completeDomainCS_OwnedImplementedBy(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+ public void completeDomainCS_ImplementedBy(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
completeRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);
}
public void completeDomainCS_OwnedDefaultValues(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
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 5236f346f..aaec86138 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
@@ -230,7 +230,7 @@ public class QVTrelationParser extends AbstractContentAssistParser {
put(grammarAccess.getDomainCSAccess().getIsEnforceAssignment_0_1(), "rule__DomainCS__IsEnforceAssignment_0_1");
put(grammarAccess.getDomainCSAccess().getModelIdAssignment_2(), "rule__DomainCS__ModelIdAssignment_2");
put(grammarAccess.getDomainCSAccess().getOwnedPatternAssignment_3(), "rule__DomainCS__OwnedPatternAssignment_3");
- put(grammarAccess.getDomainCSAccess().getOwnedImplementedByAssignment_4_1(), "rule__DomainCS__OwnedImplementedByAssignment_4_1");
+ put(grammarAccess.getDomainCSAccess().getImplementedByAssignment_4_1(), "rule__DomainCS__ImplementedByAssignment_4_1");
put(grammarAccess.getDomainCSAccess().getOwnedDefaultValuesAssignment_5_2(), "rule__DomainCS__OwnedDefaultValuesAssignment_5_2");
put(grammarAccess.getDomainPatternCSAccess().getOwnedTemplateAssignment(), "rule__DomainPatternCS__OwnedTemplateAssignment");
put(grammarAccess.getElementTemplateCSAccess().getNameAssignment(), "rule__ElementTemplateCS__NameAssignment");
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 215a7a446..e073df5e3 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
@@ -5229,9 +5229,9 @@ rule__DomainCS__Group_4__1__Impl
}
:
(
-{ before(grammarAccess.getDomainCSAccess().getOwnedImplementedByAssignment_4_1()); }
-(rule__DomainCS__OwnedImplementedByAssignment_4_1)
-{ after(grammarAccess.getDomainCSAccess().getOwnedImplementedByAssignment_4_1()); }
+{ before(grammarAccess.getDomainCSAccess().getImplementedByAssignment_4_1()); }
+(rule__DomainCS__ImplementedByAssignment_4_1)
+{ after(grammarAccess.getDomainCSAccess().getImplementedByAssignment_4_1()); }
)
;
@@ -17105,14 +17105,14 @@ finally {
restoreStackSize(stackSize);
}
-rule__DomainCS__OwnedImplementedByAssignment_4_1
+rule__DomainCS__ImplementedByAssignment_4_1
@init {
int stackSize = keepStackSize();
}
:
(
-{ before(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0()); }
- ruleExpCS{ after(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0()); }
+{ before(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_0()); }
+ ruleUnrestrictedName{ after(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_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 3eba96e7c..debe127da 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
@@ -16705,26 +16705,26 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
// $ANTLR start "rule__DomainCS__Group_4__1__Impl"
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5226:1: rule__DomainCS__Group_4__1__Impl : ( ( rule__DomainCS__OwnedImplementedByAssignment_4_1 ) ) ;
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5226:1: rule__DomainCS__Group_4__1__Impl : ( ( rule__DomainCS__ImplementedByAssignment_4_1 ) ) ;
public final void rule__DomainCS__Group_4__1__Impl() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5230:1: ( ( ( rule__DomainCS__OwnedImplementedByAssignment_4_1 ) ) )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5231:1: ( ( rule__DomainCS__OwnedImplementedByAssignment_4_1 ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5230:1: ( ( ( rule__DomainCS__ImplementedByAssignment_4_1 ) ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5231:1: ( ( rule__DomainCS__ImplementedByAssignment_4_1 ) )
{
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5231:1: ( ( rule__DomainCS__OwnedImplementedByAssignment_4_1 ) )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5232:1: ( rule__DomainCS__OwnedImplementedByAssignment_4_1 )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5231:1: ( ( rule__DomainCS__ImplementedByAssignment_4_1 ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5232:1: ( rule__DomainCS__ImplementedByAssignment_4_1 )
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getDomainCSAccess().getOwnedImplementedByAssignment_4_1());
+ before(grammarAccess.getDomainCSAccess().getImplementedByAssignment_4_1());
}
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5233:1: ( rule__DomainCS__OwnedImplementedByAssignment_4_1 )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5233:2: rule__DomainCS__OwnedImplementedByAssignment_4_1
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5233:1: ( rule__DomainCS__ImplementedByAssignment_4_1 )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:5233:2: rule__DomainCS__ImplementedByAssignment_4_1
{
- pushFollow(FollowSets000.FOLLOW_rule__DomainCS__OwnedImplementedByAssignment_4_1_in_rule__DomainCS__Group_4__1__Impl11280);
- rule__DomainCS__OwnedImplementedByAssignment_4_1();
+ pushFollow(FollowSets000.FOLLOW_rule__DomainCS__ImplementedByAssignment_4_1_in_rule__DomainCS__Group_4__1__Impl11280);
+ rule__DomainCS__ImplementedByAssignment_4_1();
state._fsp--;
if (state.failed) return ;
@@ -16732,7 +16732,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
}
if ( state.backtracking==0 ) {
- after(grammarAccess.getDomainCSAccess().getOwnedImplementedByAssignment_4_1());
+ after(grammarAccess.getDomainCSAccess().getImplementedByAssignment_4_1());
}
}
@@ -49152,29 +49152,29 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
// $ANTLR end "rule__DomainCS__OwnedPatternAssignment_3"
- // $ANTLR start "rule__DomainCS__OwnedImplementedByAssignment_4_1"
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17108:1: rule__DomainCS__OwnedImplementedByAssignment_4_1 : ( ruleExpCS ) ;
- public final void rule__DomainCS__OwnedImplementedByAssignment_4_1() throws RecognitionException {
+ // $ANTLR start "rule__DomainCS__ImplementedByAssignment_4_1"
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17108:1: rule__DomainCS__ImplementedByAssignment_4_1 : ( ruleUnrestrictedName ) ;
+ public final void rule__DomainCS__ImplementedByAssignment_4_1() throws RecognitionException {
int stackSize = keepStackSize();
try {
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17112:1: ( ( ruleExpCS ) )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17113:1: ( ruleExpCS )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17112:1: ( ( ruleUnrestrictedName ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17113:1: ( ruleUnrestrictedName )
{
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17113:1: ( ruleExpCS )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17114:1: ruleExpCS
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17113:1: ( ruleUnrestrictedName )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src-gen/org/eclipse/qvtd/xtext/qvtrelation/ui/contentassist/antlr/internal/InternalQVTrelation.g:17114:1: ruleUnrestrictedName
{
if ( state.backtracking==0 ) {
- before(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0());
+ before(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_0());
}
- pushFollow(FollowSets001.FOLLOW_ruleExpCS_in_rule__DomainCS__OwnedImplementedByAssignment_4_134668);
- ruleExpCS();
+ pushFollow(FollowSets001.FOLLOW_ruleUnrestrictedName_in_rule__DomainCS__ImplementedByAssignment_4_134668);
+ ruleUnrestrictedName();
state._fsp--;
if (state.failed) return ;
if ( state.backtracking==0 ) {
- after(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0());
+ after(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_0());
}
}
@@ -49194,7 +49194,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
}
return ;
}
- // $ANTLR end "rule__DomainCS__OwnedImplementedByAssignment_4_1"
+ // $ANTLR end "rule__DomainCS__ImplementedByAssignment_4_1"
// $ANTLR start "rule__DomainCS__OwnedDefaultValuesAssignment_5_2"
@@ -59579,11 +59579,11 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
public static final BitSet FOLLOW_rule__DomainCS__Group_5__0_in_rule__DomainCS__Group__5__Impl11087 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__DomainCS__Group__6__Impl_in_rule__DomainCS__Group__611118 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_17_in_rule__DomainCS__Group__6__Impl11146 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__DomainCS__Group_4__0__Impl_in_rule__DomainCS__Group_4__011191 = new BitSet(new long[]{0xFF80007FFFFD00F0L,0x000000019843881FL});
+ public static final BitSet FOLLOW_rule__DomainCS__Group_4__0__Impl_in_rule__DomainCS__Group_4__011191 = new BitSet(new long[]{0x0000000FFFFD00C0L});
public static final BitSet FOLLOW_rule__DomainCS__Group_4__1_in_rule__DomainCS__Group_4__011194 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_23_in_rule__DomainCS__Group_4__0__Impl11222 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__DomainCS__Group_4__1__Impl_in_rule__DomainCS__Group_4__111253 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_rule__DomainCS__OwnedImplementedByAssignment_4_1_in_rule__DomainCS__Group_4__1__Impl11280 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_rule__DomainCS__ImplementedByAssignment_4_1_in_rule__DomainCS__Group_4__1__Impl11280 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_rule__DomainCS__Group_5__0__Impl_in_rule__DomainCS__Group_5__011314 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000080L});
public static final BitSet FOLLOW_rule__DomainCS__Group_5__1_in_rule__DomainCS__Group_5__011317 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_19_in_rule__DomainCS__Group_5__0__Impl11345 = new BitSet(new long[]{0x0000000000000002L});
@@ -60572,7 +60572,7 @@ public class InternalQVTrelationParser extends AbstractInternalContentAssistPars
public static final BitSet FOLLOW_21_in_rule__DomainCS__IsEnforceAssignment_0_134559 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleUnrestrictedName_in_rule__DomainCS__ModelIdAssignment_234602 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDomainPatternCS_in_rule__DomainCS__OwnedPatternAssignment_334637 = new BitSet(new long[]{0x0000000000000002L});
- public static final BitSet FOLLOW_ruleExpCS_in_rule__DomainCS__OwnedImplementedByAssignment_4_134668 = new BitSet(new long[]{0x0000000000000002L});
+ public static final BitSet FOLLOW_ruleUnrestrictedName_in_rule__DomainCS__ImplementedByAssignment_4_134668 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleDefaultValueCS_in_rule__DomainCS__OwnedDefaultValuesAssignment_5_234699 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleTemplateCS_in_rule__DomainPatternCS__OwnedTemplateAssignment34730 = new BitSet(new long[]{0x0000000000000002L});
public static final BitSet FOLLOW_ruleUnrestrictedName_in_rule__ElementTemplateCS__NameAssignment34761 = new BitSet(new long[]{0x0000000000000002L});
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/DomainCS.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/DomainCS.java
index 10eff739f..124eaa7b3 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/DomainCS.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/DomainCS.java
@@ -23,6 +23,7 @@ import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
* The following features are supported:
* </p>
* <ul>
+ * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#getImplementedBy <em>Implemented By</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#isIsCheckonly <em>Is Checkonly</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#isIsEnforce <em>Is Enforce</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#getModelId <em>Model Id</em>}</li>
@@ -38,6 +39,32 @@ import org.eclipse.qvtd.pivot.qvtbase.TypedModel;
*/
public interface DomainCS extends AbstractDomainCS {
/**
+ * Returns the value of the '<em><b>Implemented By</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Implemented By</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Implemented By</em>' attribute.
+ * @see #setImplementedBy(String)
+ * @see org.eclipse.qvtd.xtext.qvtrelationcs.QVTrelationCSPackage#getDomainCS_ImplementedBy()
+ * @model dataType="org.eclipse.ocl.pivot.String"
+ * @generated
+ */
+ String getImplementedBy();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#getImplementedBy <em>Implemented By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Implemented By</em>' attribute.
+ * @see #getImplementedBy()
+ * @generated
+ */
+ void setImplementedBy(String value);
+
+ /**
* Returns the value of the '<em><b>Is Checkonly</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java
index 85904fd07..137af78b8 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/QVTrelationCSPackage.java
@@ -611,13 +611,22 @@ public interface QVTrelationCSPackage extends EPackage {
int DOMAIN_CS__OWNED_ANNOTATIONS = ABSTRACT_DOMAIN_CS__OWNED_ANNOTATIONS;
/**
+ * The feature id for the '<em><b>Implemented By</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DOMAIN_CS__IMPLEMENTED_BY = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 0;
+
+ /**
* The feature id for the '<em><b>Is Checkonly</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DOMAIN_CS__IS_CHECKONLY = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 0;
+ int DOMAIN_CS__IS_CHECKONLY = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Is Enforce</b></em>' attribute.
@@ -626,7 +635,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__IS_ENFORCE = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 1;
+ int DOMAIN_CS__IS_ENFORCE = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Model Id</b></em>' reference.
@@ -635,7 +644,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__MODEL_ID = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 2;
+ int DOMAIN_CS__MODEL_ID = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Is Replace</b></em>' attribute.
@@ -644,7 +653,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__IS_REPLACE = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 3;
+ int DOMAIN_CS__IS_REPLACE = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Owned Pattern</b></em>' containment reference.
@@ -653,7 +662,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__OWNED_PATTERN = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 4;
+ int DOMAIN_CS__OWNED_PATTERN = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Owned Default Values</b></em>' containment reference list.
@@ -662,7 +671,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__OWNED_DEFAULT_VALUES = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 5;
+ int DOMAIN_CS__OWNED_DEFAULT_VALUES = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Owned Implemented By</b></em>' containment reference.
@@ -671,7 +680,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS__OWNED_IMPLEMENTED_BY = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 6;
+ int DOMAIN_CS__OWNED_IMPLEMENTED_BY = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 7;
/**
* The number of structural features of the '<em>Domain CS</em>' class.
@@ -680,7 +689,7 @@ public interface QVTrelationCSPackage extends EPackage {
* @generated
* @ordered
*/
- int DOMAIN_CS_FEATURE_COUNT = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 7;
+ int DOMAIN_CS_FEATURE_COUNT = ABSTRACT_DOMAIN_CS_FEATURE_COUNT + 8;
/**
* The meta object id for the '{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.DomainPatternCSImpl <em>Domain Pattern CS</em>}' class.
@@ -2512,6 +2521,17 @@ public interface QVTrelationCSPackage extends EPackage {
EClass getDomainCS();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#getImplementedBy <em>Implemented By</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Implemented By</em>'.
+ * @see org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#getImplementedBy()
+ * @see #getDomainCS()
+ * @generated
+ */
+ EAttribute getDomainCS_ImplementedBy();
+
+ /**
* Returns the meta object for the attribute '{@link org.eclipse.qvtd.xtext.qvtrelationcs.DomainCS#isIsCheckonly <em>Is Checkonly</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3247,6 +3267,14 @@ public interface QVTrelationCSPackage extends EPackage {
EClass DOMAIN_CS = eINSTANCE.getDomainCS();
/**
+ * The meta object literal for the '<em><b>Implemented By</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute DOMAIN_CS__IMPLEMENTED_BY = eINSTANCE.getDomainCS_ImplementedBy();
+
+ /**
* The meta object literal for the '<em><b>Is Checkonly</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/DomainCSImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/DomainCSImpl.java
index aafe697d9..fda8d0b0b 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/DomainCSImpl.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/DomainCSImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.qvtd.xtext.qvtrelationcs.util.QVTrelationCSVisitor;
* The following features are implemented:
* </p>
* <ul>
+ * <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.DomainCSImpl#getImplementedBy <em>Implemented By</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.DomainCSImpl#isIsCheckonly <em>Is Checkonly</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.DomainCSImpl#isIsEnforce <em>Is Enforce</em>}</li>
* <li>{@link org.eclipse.qvtd.xtext.qvtrelationcs.impl.DomainCSImpl#getModelId <em>Model Id</em>}</li>
@@ -52,6 +53,26 @@ import org.eclipse.qvtd.xtext.qvtrelationcs.util.QVTrelationCSVisitor;
*/
public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
/**
+ * The default value of the '{@link #getImplementedBy() <em>Implemented By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getImplementedBy()
+ * @generated
+ * @ordered
+ */
+ protected static final String IMPLEMENTED_BY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getImplementedBy() <em>Implemented By</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getImplementedBy()
+ * @generated
+ * @ordered
+ */
+ protected String implementedBy = IMPLEMENTED_BY_EDEFAULT;
+
+ /**
* The default value of the '{@link #isIsCheckonly() <em>Is Checkonly</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -176,6 +197,29 @@ public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
* @generated
*/
@Override
+ public String getImplementedBy() {
+ return implementedBy;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setImplementedBy(String newImplementedBy) {
+ String oldImplementedBy = implementedBy;
+ implementedBy = newImplementedBy;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, QVTrelationCSPackage.DOMAIN_CS__IMPLEMENTED_BY, oldImplementedBy, implementedBy));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public boolean isIsCheckonly() {
return isCheckonly;
}
@@ -418,6 +462,8 @@ public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case QVTrelationCSPackage.DOMAIN_CS__IMPLEMENTED_BY:
+ return getImplementedBy();
case QVTrelationCSPackage.DOMAIN_CS__IS_CHECKONLY:
return isIsCheckonly();
case QVTrelationCSPackage.DOMAIN_CS__IS_ENFORCE:
@@ -446,6 +492,9 @@ public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case QVTrelationCSPackage.DOMAIN_CS__IMPLEMENTED_BY:
+ setImplementedBy((String)newValue);
+ return;
case QVTrelationCSPackage.DOMAIN_CS__IS_CHECKONLY:
setIsCheckonly((Boolean)newValue);
return;
@@ -480,6 +529,9 @@ public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case QVTrelationCSPackage.DOMAIN_CS__IMPLEMENTED_BY:
+ setImplementedBy(IMPLEMENTED_BY_EDEFAULT);
+ return;
case QVTrelationCSPackage.DOMAIN_CS__IS_CHECKONLY:
setIsCheckonly(IS_CHECKONLY_EDEFAULT);
return;
@@ -513,6 +565,8 @@ public class DomainCSImpl extends AbstractDomainCSImpl implements DomainCS {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case QVTrelationCSPackage.DOMAIN_CS__IMPLEMENTED_BY:
+ return IMPLEMENTED_BY_EDEFAULT == null ? implementedBy != null : !IMPLEMENTED_BY_EDEFAULT.equals(implementedBy);
case QVTrelationCSPackage.DOMAIN_CS__IS_CHECKONLY:
return isCheckonly != IS_CHECKONLY_EDEFAULT;
case QVTrelationCSPackage.DOMAIN_CS__IS_ENFORCE:
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java
index 2d2c15a2e..9fdaa4f90 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/emf-gen/org/eclipse/qvtd/xtext/qvtrelationcs/impl/QVTrelationCSPackageImpl.java
@@ -365,7 +365,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
* @generated
*/
@Override
- public EAttribute getDomainCS_IsCheckonly() {
+ public EAttribute getDomainCS_ImplementedBy() {
return (EAttribute)domainCSEClass.getEStructuralFeatures().get(0);
}
@@ -375,7 +375,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
* @generated
*/
@Override
- public EAttribute getDomainCS_IsEnforce() {
+ public EAttribute getDomainCS_IsCheckonly() {
return (EAttribute)domainCSEClass.getEStructuralFeatures().get(1);
}
@@ -385,8 +385,18 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
* @generated
*/
@Override
+ public EAttribute getDomainCS_IsEnforce() {
+ return (EAttribute)domainCSEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
public EReference getDomainCS_ModelId() {
- return (EReference)domainCSEClass.getEStructuralFeatures().get(2);
+ return (EReference)domainCSEClass.getEStructuralFeatures().get(3);
}
/**
@@ -396,7 +406,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
*/
@Override
public EAttribute getDomainCS_IsReplace() {
- return (EAttribute)domainCSEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)domainCSEClass.getEStructuralFeatures().get(4);
}
/**
@@ -406,7 +416,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
*/
@Override
public EReference getDomainCS_OwnedPattern() {
- return (EReference)domainCSEClass.getEStructuralFeatures().get(4);
+ return (EReference)domainCSEClass.getEStructuralFeatures().get(5);
}
/**
@@ -416,7 +426,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
*/
@Override
public EReference getDomainCS_OwnedDefaultValues() {
- return (EReference)domainCSEClass.getEStructuralFeatures().get(5);
+ return (EReference)domainCSEClass.getEStructuralFeatures().get(6);
}
/**
@@ -426,7 +436,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
*/
@Override
public EReference getDomainCS_OwnedImplementedBy() {
- return (EReference)domainCSEClass.getEStructuralFeatures().get(6);
+ return (EReference)domainCSEClass.getEStructuralFeatures().get(7);
}
/**
@@ -999,6 +1009,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
createEReference(defaultValueCSEClass, DEFAULT_VALUE_CS__PROPERTY_ID);
domainCSEClass = createEClass(DOMAIN_CS);
+ createEAttribute(domainCSEClass, DOMAIN_CS__IMPLEMENTED_BY);
createEAttribute(domainCSEClass, DOMAIN_CS__IS_CHECKONLY);
createEAttribute(domainCSEClass, DOMAIN_CS__IS_ENFORCE);
createEReference(domainCSEClass, DOMAIN_CS__MODEL_ID);
@@ -1154,6 +1165,7 @@ public class QVTrelationCSPackageImpl extends EPackageImpl implements QVTrelatio
initEReference(getDefaultValueCS_PropertyId(), thePivotPackage.getVariable(), null, "propertyId", null, 1, 1, DefaultValueCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(domainCSEClass, DomainCS.class, "DomainCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getDomainCS_ImplementedBy(), thePivotPackage.getString(), "implementedBy", null, 0, 1, DomainCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDomainCS_IsCheckonly(), ecorePackage.getEBoolean(), "isCheckonly", null, 0, 1, DomainCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDomainCS_IsEnforce(), ecorePackage.getEBoolean(), "isEnforce", null, 0, 1, DomainCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDomainCS_ModelId(), theQVTbasePackage.getTypedModel(), null, "modelId", null, 0, 1, DomainCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
index 364c52da8..5e00806a9 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/model/QVTrelationCS.ecore
@@ -16,6 +16,7 @@
eType="ecore:EClass ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//Variable"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DomainCS" eSuperTypes="#//AbstractDomainCS">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementedBy" eType="ecore:EDataType ../../org.eclipse.ocl.pivot/model/Pivot.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isCheckonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="isEnforce" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="modelId" eType="ecore:EClass ../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore#//TypedModel"/>
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
index 7f5f3fd72..6f61bfe0d 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
Binary files differ
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 a4aae9968..f73f9165e 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
@@ -129,7 +129,7 @@ public class QVTrelationGrammarResource extends AbstractGrammarResource
private static void initParserRules() {
PR_CollectionTemplateCS.setAlternatives(createGroup(setCardinality("?", createAssignment("name", "=", createRuleCall(PR_UnrestrictedName))), createKeyword(":"), createAssignment("ownedType", "=", createRuleCall(_EssentialOCL.PR_CollectionTypeCS)), createKeyword("{"), setCardinality("?", createGroup(createAssignment("ownedMemberIdentifiers", "+=", createAlternatives(createRuleCall(PR_TemplateCS), createRuleCall(PR_ElementTemplateCS))), setCardinality("*", createGroup(createKeyword(","), createAssignment("ownedMemberIdentifiers", "+=", createAlternatives(createRuleCall(PR_TemplateCS), createRuleCall(PR_ElementTemplateCS))))), createKeyword("++"), createAssignment("restIdentifier", "=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.VARIABLE), createRuleCall(PR_UnrestrictedName))))), createKeyword("}")));
PR_DefaultValueCS.setAlternatives(createGroup(createAssignment("propertyId", "=", createCrossReference(createTypeRef(MM_pivot, org.eclipse.ocl.pivot.PivotPackage.Literals.VARIABLE), createRuleCall(PR_UnrestrictedName))), createKeyword("="), createAssignment("ownedInitExpression", "=", createRuleCall(_EssentialOCL.PR_ExpCS)), createKeyword(";")));
- PR_DomainCS.setAlternatives(createGroup(setCardinality("?", createAlternatives(createAssignment("isCheckonly", "?=", createKeyword("checkonly")), createAssignment("isEnforce", "?=", createKeyword("enforce")), createKeyword("replace"))), createKeyword("domain"), createAssignment("modelId", "=", createCrossReference(createTypeRef(MM_qvtbase, org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage.Literals.TYPED_MODEL), createRuleCall(PR_UnrestrictedName))), createAssignment("ownedPattern", "=", createRuleCall(PR_DomainPatternCS)), setCardinality("?", createGroup(createKeyword("implementedby"), createAssignment("ownedImplementedBy", "=", createRuleCall(_EssentialOCL.PR_ExpCS)))), setCardinality("?", createGroup(createKeyword("default_values"), createKeyword("{"), setCardinality("+", createAssignment("ownedDefaultValues", "+=", createRuleCall(PR_DefaultValueCS))), createKeyword("}"))), createKeyword(";")));
+ PR_DomainCS.setAlternatives(createGroup(setCardinality("?", createAlternatives(createAssignment("isCheckonly", "?=", createKeyword("checkonly")), createAssignment("isEnforce", "?=", createKeyword("enforce")), createKeyword("replace"))), createKeyword("domain"), createAssignment("modelId", "=", createCrossReference(createTypeRef(MM_qvtbase, org.eclipse.qvtd.pivot.qvtbase.QVTbasePackage.Literals.TYPED_MODEL), createRuleCall(PR_UnrestrictedName))), createAssignment("ownedPattern", "=", createRuleCall(PR_DomainPatternCS)), setCardinality("?", createGroup(createKeyword("implementedby"), createAssignment("implementedBy", "=", createRuleCall(PR_UnrestrictedName)))), setCardinality("?", createGroup(createKeyword("default_values"), createKeyword("{"), setCardinality("+", createAssignment("ownedDefaultValues", "+=", createRuleCall(PR_DefaultValueCS))), createKeyword("}"))), createKeyword(";")));
PR_DomainPatternCS.setAlternatives(createAssignment("ownedTemplate", "=", createRuleCall(PR_TemplateCS)));
PR_ElementTemplateCS.setAlternatives(createAssignment("name", "=", createRuleCall(PR_UnrestrictedName)));
PR_ExpCSOrTemplateCS.setAlternatives(createAlternatives(createRuleCall(_EssentialOCL.PR_ExpCS), createRuleCall(PR_TemplateCS)));
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 dc3b4af7e..339dcd969 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
@@ -474,17 +474,17 @@ ruleDomainCS returns [EObject current=null]
(
(
{
- newCompositeNode(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0());
+ newCompositeNode(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_0());
}
- lv_ownedImplementedBy_7_0=ruleExpCS {
+ lv_implementedBy_7_0=ruleUnrestrictedName {
if ($current==null) {
$current = createModelElementForParent(grammarAccess.getDomainCSRule());
}
set(
$current,
- "ownedImplementedBy",
- lv_ownedImplementedBy_7_0,
- "ExpCS");
+ "implementedBy",
+ lv_implementedBy_7_0,
+ "UnrestrictedName");
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 c7c463e8f..efa520fe1 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
@@ -1050,7 +1050,7 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
// $ANTLR start "ruleDomainCS"
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:390:1: ruleDomainCS returns [EObject current=null] : ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' ) ;
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:390:1: ruleDomainCS returns [EObject current=null] : ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' ) ;
public final EObject ruleDomainCS() throws RecognitionException {
EObject current = null;
@@ -1065,7 +1065,7 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
Token otherlv_12=null;
EObject lv_ownedPattern_5_0 = null;
- EObject lv_ownedImplementedBy_7_0 = null;
+ AntlrDatatypeRuleToken lv_implementedBy_7_0 = null;
EObject lv_ownedDefaultValues_10_0 = null;
@@ -1073,11 +1073,11 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
enterRule();
try {
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:393:28: ( ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' ) )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:1: ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:393:28: ( ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:1: ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' )
{
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:1: ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:2: ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';'
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:1: ( ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';' )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:2: ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )? otherlv_3= 'domain' ( ( ruleUnrestrictedName ) ) ( (lv_ownedPattern_5_0= ruleDomainPatternCS ) ) (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )? (otherlv_8= 'default_values' otherlv_9= '{' ( (lv_ownedDefaultValues_10_0= ruleDefaultValueCS ) )+ otherlv_11= '}' )? otherlv_12= ';'
{
// ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:394:2: ( ( (lv_isCheckonly_0_0= 'checkonly' ) ) | ( (lv_isEnforce_1_0= 'enforce' ) ) | otherlv_2= 'replace' )?
int alt8=4;
@@ -1259,7 +1259,7 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
}
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:470:2: (otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) ) )?
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:470:2: (otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) ) )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -1268,7 +1268,7 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
}
switch (alt9) {
case 1 :
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:470:4: otherlv_6= 'implementedby' ( (lv_ownedImplementedBy_7_0= ruleExpCS ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:470:4: otherlv_6= 'implementedby' ( (lv_implementedBy_7_0= ruleUnrestrictedName ) )
{
otherlv_6=(Token)match(input,27,FollowSets000.FOLLOW_27_in_ruleDomainCS862); if (state.failed) return current;
if ( state.backtracking==0 ) {
@@ -1276,19 +1276,19 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
newLeafNode(otherlv_6, grammarAccess.getDomainCSAccess().getImplementedbyKeyword_4_0());
}
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:474:1: ( (lv_ownedImplementedBy_7_0= ruleExpCS ) )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:475:1: (lv_ownedImplementedBy_7_0= ruleExpCS )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:474:1: ( (lv_implementedBy_7_0= ruleUnrestrictedName ) )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:475:1: (lv_implementedBy_7_0= ruleUnrestrictedName )
{
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:475:1: (lv_ownedImplementedBy_7_0= ruleExpCS )
- // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:476:3: lv_ownedImplementedBy_7_0= ruleExpCS
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:475:1: (lv_implementedBy_7_0= ruleUnrestrictedName )
+ // ../../plugins/org.eclipse.qvtd.xtext.qvtrelation/src-gen/org/eclipse/qvtd/xtext/qvtrelation/parser/antlr/internal/InternalQVTrelation.g:476:3: lv_implementedBy_7_0= ruleUnrestrictedName
{
if ( state.backtracking==0 ) {
- newCompositeNode(grammarAccess.getDomainCSAccess().getOwnedImplementedByExpCSParserRuleCall_4_1_0());
+ newCompositeNode(grammarAccess.getDomainCSAccess().getImplementedByUnrestrictedNameParserRuleCall_4_1_0());
}
- pushFollow(FollowSets000.FOLLOW_ruleExpCS_in_ruleDomainCS883);
- lv_ownedImplementedBy_7_0=ruleExpCS();
+ pushFollow(FollowSets000.FOLLOW_ruleUnrestrictedName_in_ruleDomainCS883);
+ lv_implementedBy_7_0=ruleUnrestrictedName();
state._fsp--;
if (state.failed) return current;
@@ -1299,9 +1299,9 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
}
set(
current,
- "ownedImplementedBy",
- lv_ownedImplementedBy_7_0,
- "ExpCS");
+ "implementedBy",
+ lv_implementedBy_7_0,
+ "UnrestrictedName");
afterParserOrEnumRuleCall();
}
@@ -23315,8 +23315,8 @@ public class InternalQVTrelationParser extends AbstractInternalAntlrParser {
public static final BitSet FOLLOW_26_in_ruleDomainCS801 = new BitSet(new long[]{0x0000377E7F800030L});
public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleDomainCS828 = new BitSet(new long[]{0x0000377E7F810030L});
public static final BitSet FOLLOW_ruleDomainPatternCS_in_ruleDomainCS849 = new BitSet(new long[]{0x0000000018400000L});
- public static final BitSet FOLLOW_27_in_ruleDomainCS862 = new BitSet(new long[]{0x8000FF7EFF8000F0L,0x00000000C207DFFFL});
- public static final BitSet FOLLOW_ruleExpCS_in_ruleDomainCS883 = new BitSet(new long[]{0x0000000010400000L});
+ public static final BitSet FOLLOW_27_in_ruleDomainCS862 = new BitSet(new long[]{0x0000377E7F800030L});
+ public static final BitSet FOLLOW_ruleUnrestrictedName_in_ruleDomainCS883 = new BitSet(new long[]{0x0000000010400000L});
public static final BitSet FOLLOW_28_in_ruleDomainCS898 = new BitSet(new long[]{0x0000000000020000L});
public static final BitSet FOLLOW_17_in_ruleDomainCS910 = new BitSet(new long[]{0x0000377E7F800030L});
public static final BitSet FOLLOW_ruleDefaultValueCS_in_ruleDomainCS931 = new BitSet(new long[]{0x0000377E7F900030L});
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 6228b4a36..06bfb71d5 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
@@ -477,7 +477,7 @@ public abstract class AbstractQVTrelationSemanticSequencer extends EssentialOCLS
* (isCheckonly?='checkonly' | isEnforce?='enforce')?
* modelId=[TypedModel|UnrestrictedName]
* ownedPattern=DomainPatternCS
- * ownedImplementedBy=ExpCS?
+ * implementedBy=UnrestrictedName?
* ownedDefaultValues+=DefaultValueCS*
* )
*/
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 68b17546b..4f2412a15 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
@@ -225,8 +225,8 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
private final RuleCall cOwnedPatternDomainPatternCSParserRuleCall_3_0 = (RuleCall)cOwnedPatternAssignment_3.eContents().get(0);
private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
private final Keyword cImplementedbyKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
- private final Assignment cOwnedImplementedByAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
- private final RuleCall cOwnedImplementedByExpCSParserRuleCall_4_1_0 = (RuleCall)cOwnedImplementedByAssignment_4_1.eContents().get(0);
+ private final Assignment cImplementedByAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
+ private final RuleCall cImplementedByUnrestrictedNameParserRuleCall_4_1_0 = (RuleCall)cImplementedByAssignment_4_1.eContents().get(0);
private final Group cGroup_5 = (Group)cGroup.eContents().get(5);
private final Keyword cDefault_valuesKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);
private final Keyword cLeftCurlyBracketKeyword_5_1 = (Keyword)cGroup_5.eContents().get(1);
@@ -238,11 +238,11 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
//DomainCS:
// (isCheckonly?="checkonly" | isEnforce?="enforce" | "replace")? "domain"
// modelId=[qvtbase::TypedModel|UnrestrictedName] ownedPattern=DomainPatternCS ("implementedby"
- // ownedImplementedBy=ExpCS)? ("default_values" "{" ownedDefaultValues+=DefaultValueCS+ "}")? ";";
+ // implementedBy=UnrestrictedName)? ("default_values" "{" ownedDefaultValues+=DefaultValueCS+ "}")? ";";
@Override public ParserRule getRule() { return rule; }
//(isCheckonly?="checkonly" | isEnforce?="enforce" | "replace")? "domain" modelId=[qvtbase::TypedModel|UnrestrictedName]
- //ownedPattern=DomainPatternCS ("implementedby" ownedImplementedBy=ExpCS)? ("default_values" "{"
+ //ownedPattern=DomainPatternCS ("implementedby" implementedBy=UnrestrictedName)? ("default_values" "{"
//ownedDefaultValues+=DefaultValueCS+ "}")? ";"
public Group getGroup() { return cGroup; }
@@ -282,17 +282,17 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
//DomainPatternCS
public RuleCall getOwnedPatternDomainPatternCSParserRuleCall_3_0() { return cOwnedPatternDomainPatternCSParserRuleCall_3_0; }
- //("implementedby" ownedImplementedBy=ExpCS)?
+ //("implementedby" implementedBy=UnrestrictedName)?
public Group getGroup_4() { return cGroup_4; }
//"implementedby"
public Keyword getImplementedbyKeyword_4_0() { return cImplementedbyKeyword_4_0; }
- //ownedImplementedBy=ExpCS
- public Assignment getOwnedImplementedByAssignment_4_1() { return cOwnedImplementedByAssignment_4_1; }
+ //implementedBy=UnrestrictedName
+ public Assignment getImplementedByAssignment_4_1() { return cImplementedByAssignment_4_1; }
- //ExpCS
- public RuleCall getOwnedImplementedByExpCSParserRuleCall_4_1_0() { return cOwnedImplementedByExpCSParserRuleCall_4_1_0; }
+ //UnrestrictedName
+ public RuleCall getImplementedByUnrestrictedNameParserRuleCall_4_1_0() { return cImplementedByUnrestrictedNameParserRuleCall_4_1_0; }
//("default_values" "{" ownedDefaultValues+=DefaultValueCS+ "}")?
public Group getGroup_5() { return cGroup_5; }
@@ -1778,7 +1778,7 @@ public class QVTrelationGrammarAccess extends AbstractGrammarElementFinder {
//DomainCS:
// (isCheckonly?="checkonly" | isEnforce?="enforce" | "replace")? "domain"
// modelId=[qvtbase::TypedModel|UnrestrictedName] ownedPattern=DomainPatternCS ("implementedby"
- // ownedImplementedBy=ExpCS)? ("default_values" "{" ownedDefaultValues+=DefaultValueCS+ "}")? ";";
+ // implementedBy=UnrestrictedName)? ("default_values" "{" ownedDefaultValues+=DefaultValueCS+ "}")? ";";
public DomainCSElements getDomainCSAccess() {
return pDomainCS;
}
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
index 38e713f4b..79c6c7c82 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/QVTrelation.xtext
@@ -34,7 +34,7 @@ CollectionTemplateCS: name=UnrestrictedName? ':' ownedType=CollectionTypeCS
DefaultValueCS: propertyId=[pivot::Variable|UnrestrictedName] '=' ownedInitExpression=ExpCS ';';
DomainCS: (isCheckonly?='checkonly' | isEnforce?='enforce' | 'replace')? 'domain' modelId=[qvtbase::TypedModel|UnrestrictedName] ownedPattern=DomainPatternCS
- ('implementedby' ownedImplementedBy=ExpCS)?
+ ('implementedby' implementedBy=UnrestrictedName)?
('default_values' '{' (ownedDefaultValues+=DefaultValueCS)+ '}')?
';';

Back to the top