Minor changes to union compatibilty checker for binary id relations

cwi-swat · Jan 12, 2021 · 54b6ff2 · 54b6ff2
1 parent 8c76649
commit 54b6ff2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.project b/.project
@@ -37,4 +37,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>rascal_eclipse.term_nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1607933581072</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/src/ide/UnionCompatibilityChecker.rsc b/src/ide/UnionCompatibilityChecker.rsc
@@ -328,12 +328,12 @@ void check(e:(AlleExpr)`<AlleExpr expr> where <Criteria crit>`, Environment env,
   
 void check(e:(AlleExpr)`~<AlleExpr expr>`, Environment env, CheckFunctions cf) { 
   check(expr,env,cf);
-  checkBinaryIdRel(e@\loc, cf);
+  checkBinaryIdRel(e@\loc, expr@\loc, cf);
 }
     
 void check(e:(AlleExpr)`^<AlleExpr expr>`, Environment env, CheckFunctions cf) { 
   check(expr,env,cf);
-  checkBinaryIdRel(e@\loc, cf);
+  checkBinaryIdRel(e@\loc, expr@\loc, cf);
 }
 
 void check(e:(AlleExpr)`*<AlleExpr expr>`, Environment env, CheckFunctions cf) { 

diff --git a/src/translation/Imploder.rsc b/src/translation/Imploder.rsc
@@ -14,7 +14,7 @@ translation::AST::Problem implodeProblem(translation::Syntax::Problem p) {
   Maybe[translation::AST::ObjectiveSection] s = (/translation::Syntax::ObjectiveSection objSec := p.objSection) ? just(implode(objSec)) : nothing();
   Maybe[translation::AST::Expect] e = (/translation::Syntax::Expect exp := p.expect) ? just(implode(exp)) : nothing();
 
-  map[str, translation::AST::AllePredicate] predicates = ("<p.name>" : implode(p) | (AlleConstraint)`<AllePredicate p>` <- p.constraints);
+  map[str, translation::AST::AllePredicate] predicates = ("<pred.name>" : implode(pred) | (AlleConstraint)`<AllePredicate pred>` <- p.constraints);
   list[translation::AST::AlleFormula] constraints = [implode(f) | (AlleConstraint)`<AlleFormula f>` <- p.constraints]; 
 
   return problem([implode(r) | r <- p.relations], constraints, predicates, s, e);
@@ -183,7 +183,7 @@ translation::AST::AlleExpr implode((AlleExpr)`<AlleExpr lhs> ⨯ <AlleExpr rhs>`
   = product(implode(lhs), implode(rhs));
 
 translation::AST::AlleExpr implode(f:(AlleExpr)`{<{VarDeclaration ","}+ decls> | <AlleFormula form>}`)
-  = comprehension([implode(d) | d <- decls], implode(form), origLoc=f@\loc);
+  = comprehension([implode(d) | d <- decls], implode(form));
 
 translation::AST::TupleAttributeSelection implode ((TupleAttributeSelection)`\<<AttributeName first>,<AttributeName second>\>`) 
   = order("<first>","<second>");