fixed a bug with mismatching generated plans and matching frames

Author: doczir

plugins/hu.bme.mit.incquery.localsearch.cpp/src/hu/bme/mit/incquery/localsearch/cpp/generator/planner/PlanCompiler.xtend

@@ -4,15 +4,20 @@ import com.google.common.collect.ImmutableSet
 import com.google.common.collect.Iterables
 import hu.bme.mit.incquery.localsearch.cpp.generator.model.PatternStub
 import java.util.List
+import java.util.Set
+import java.util.concurrent.atomic.AtomicInteger
 import org.apache.log4j.Logger
 import org.eclipse.viatra.query.runtime.emf.EMFQueryMetaContext
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation
 import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PDisjunction
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 import org.eclipse.viatra.query.runtime.matchers.psystem.rewriters.DefaultFlattenCallPredicate
 import org.eclipse.viatra.query.runtime.matchers.psystem.rewriters.PBodyNormalizer
 import org.eclipse.viatra.query.runtime.matchers.psystem.rewriters.PQueryFlattener
+import java.util.Collection
 
 class PlanCompiler {
 
@@ -32,46 +37,53 @@ class PlanCompiler {
 
 	def compilePlan(PQuery pQuery) {
 		val frameRegistry = new MatchingFrameRegistry
+		
+		val flatDisjunction = flattener.rewrite(pQuery.disjunctBodies)
+		val normalizedDisjunction = normalizer.rewrite(flatDisjunction)
+		
+		val normalizedBodies = normalizedDisjunction.bodies.toList
+		
 		val bindings = pQuery.allAnnotations.filter[name == "Bind"]
 		val boundPatternStubs = bindings.map[ binding |
-			val boundParameters = binding.getAllValues("parameters").map [
-				switch (it) {
-					ParameterReference: #[it]
-					List<ParameterReference>: it
-				}
-			].flatten.map[
-				pQuery.parameters.get(pQuery.getPositionOfParameter(it.name))
-			].toSet
+			val boundParameters = getBoundParameters(binding, pQuery) 
 
-			val bodies = pQuery.compile(boundParameters, false, frameRegistry)
+			val bodies = normalizedBodies.compile(boundParameters, frameRegistry)
 			return new PatternStub(pQuery, bodies, boundParameters)
 		]
 
-		val bodies = pQuery.compile(#{}, true, frameRegistry)
+		val bodies  = if(normalizedDisjunction.sensibleWithoutBinding) {
+			normalizedBodies.compile(#{}, frameRegistry)
+		} else {
+			#{}
+		}
 		val unboundPatternStub = new PatternStub(pQuery, bodies)
 		// copy to prevent lazy evaluation
 		return ImmutableSet::copyOf(Iterables::concat(#[unboundPatternStub], boundPatternStubs))
 	}
+	
+	private def getBoundParameters(PAnnotation binding, PQuery pQuery) {
+		binding.getAllValues("parameters").map [
+			switch (it) {
+				ParameterReference: #[it]
+				List<ParameterReference>: it
+			}
+		].flatten.map[
+			pQuery.parameters.get(pQuery.getPositionOfParameter(it.name))
+		].toSet
+	}
 
-	def compile(PQuery pQuery, Iterable<PParameter> boundParameters, boolean checkSanity, MatchingFrameRegistry frameRegistry) {
-
-		val flatDisjunction = flattener.rewrite(pQuery.disjunctBodies)
-		val normalizedDisjunction = normalizer.rewrite(flatDisjunction)
-		
-		if (checkSanity && !normalizedDisjunction.sensibleWithoutBinding) 
-			return #{}
-		
-		val normalizedBodies = normalizedDisjunction.bodies
+	def compile(List<PBody> normalizedBodies, Iterable<PParameter> boundParameters, MatchingFrameRegistry frameRegistry) {
 
+		val AtomicInteger counter = new AtomicInteger(0)
 		val patternBodyStubs = normalizedBodies.map[pBody |
 			val boundPVariables = boundParameters.map[pBody.getVariableByNameChecked(name)]
 												 .toSet
 
-			val acceptor = new CPPSearchOperationAcceptor(frameRegistry)
+			val acceptor = new CPPSearchOperationAcceptor(counter.getAndIncrement, frameRegistry)
 			pBody.plan(Logger::getLogger(PlanCompiler), boundPVariables, EMFQueryMetaContext.INSTANCE, null, #{})
 				 .compile(pBody, boundPVariables, acceptor)
 
-			return acceptor.patternBodyStub				 
+			return acceptor.patternBodyStub
 		].toSet
 
 		return patternBodyStubs