commit 94d2183ecd3d5ded6dfe272ca86b4a7e420a5fe7
author Ed Willink <ed@willink.me.uk> Fri Mar 03 16:02:44 2017 +0000
committer Ed Willink <ed@willink.me.uk> Wed Mar 15 08:40:45 2017 +0000
tree 01fd755cda75072ec159665e3f2261de0f7b354a
parent 9463567255e435d5b68d2442c469dee386a9625e

[unrelated] Fix some warnings

tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/refSimplerRelToCorePivotizedBeautyfied.qvtr

diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/refSimplerRelToCorePivotizedBeautyfied.qvtr b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/refSimplerRelToCorePivotizedBeautyfied.qvtr
index 597c24a..44f8c9c 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/refSimplerRelToCorePivotizedBeautyfied.qvtr
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/refSimplerRelToCorePivotizedBeautyfied.qvtr
@@ -41,7 +41,7 @@
         r.domain->iterate(d; vars: Set(pivotocl::Variable) = Set{} |
             if (vars->isEmpty())
             then
-                vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo)
+                vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo->asSet())
             else
                 vars->intersection(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo)
             endif
@@ -56,7 +56,7 @@
         r.domain->iterate(d; vars: Set(pivotocl::Variable) = Set{} |
             if (vars->isEmpty())
             then
-                vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo)
+                vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo->asSet())
             else
                 vars->intersection(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo)
             endif
@@ -65,7 +65,7 @@
     
     -- Get variables occuring in an ocl expression
     -- Note: this function is not complete! It needs to be completed for other expressions
-    query getVarsOfExp(e:pivotocl::OCLExpression):Set(pivotocl::Variable)
+    query getVarsOfExp(e:pivotocl::OCLExpression[1]):Set(pivotocl::Variable)
     {
         -- Walk the expr tree of the OclExpression and
         -- collect the variables used in those expressions
@@ -413,7 +413,7 @@
         mbVars: Set(pivotocl::Variable);
         mt: qvtbase::Transformation;
         oppositeDomainVars = rOppositeDomains->iterate(d; vars: Set(pivotocl::Variable) = Set{} | 
-            	vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo)
+            	vars->union(d.oclAsType(qvtrelation::RelationDomain).pattern.bindsTo->asSet())
             );
         predicatesWithVarBindings = filterOutPredicatesThatReferToVars(rpSet, domainBottomUnSharedVars);
         predicatesWithoutVarBindings = rpSet - predicatesWithVarBindings;
@@ -595,7 +595,7 @@
         domainBottomUnSharedVars = (domainVars - whenVars - sharedDomainVars)->excluding(tev);
         domainTopVars = domainVars->intersection(whenVars)->including(tev);
         oppositeDomainVars = rOppositeDomains->iterate(d; vars: Set(pivotocl::Variable) = Set{} | 
-            	vars->union(d.pattern.bindsTo)
+            	vars->union(d.pattern.bindsTo->asSet())
             );
         predicatesWithVarBindings = filterOutPredicatesThatReferToVars(rpSet, domainBottomUnSharedVars);
         predicatesWithoutVarBindings = rpSet - predicatesWithVarBindings;