fixed several issues related to missing includes in generated code

Author: doczir

plugins/hu.bme.mit.incquery.localsearch.cpp/src/hu/bme/mit/incquery/localsearch/cpp/generator/internal/LocalsearchGeneratorOutputProvider.xtend

@@ -1,34 +1,27 @@
-package hu.bme.mit.incquery.localsearch.cpp.generator.internal
-
-import hu.bme.mit.incquery.localsearch.cpp.generator.api.GeneratorOutputRecord
-import hu.bme.mit.incquery.localsearch.cpp.generator.api.ILocalsearchGeneratorOutputProvider
-import hu.bme.mit.incquery.localsearch.cpp.generator.model.QueryStub
-import java.util.ArrayList
-import java.util.Collection
-
-abstract class LocalsearchGeneratorOutputProvider implements ILocalsearchGeneratorOutputProvider {
-	
-	var QueryStub query
-
-	var ArrayList<GeneratorOutputRecord> records
-	
-	override initialize(QueryStub query) {
-		this.query = query
-
-		this.records = newArrayList
-	}
-
-	override getOutput() {
-		val generators = initializeGenerators(query)
-		val root = "Viatra/Query"
-
-		generators.forEach [
-			records.add(new GeneratorOutputRecord('''«root»/«query.name.toFirstUpper»''', fileName, compile))
-		]
-
-		return records
-	}
-
-	def Collection<IGenerator> initializeGenerators(QueryStub query)
-	
+package hu.bme.mit.incquery.localsearch.cpp.generator.internal
+
+import hu.bme.mit.incquery.localsearch.cpp.generator.api.GeneratorOutputRecord
+import hu.bme.mit.incquery.localsearch.cpp.generator.api.ILocalsearchGeneratorOutputProvider
+import hu.bme.mit.incquery.localsearch.cpp.generator.model.QueryStub
+import java.util.Collection
+
+abstract class LocalsearchGeneratorOutputProvider implements ILocalsearchGeneratorOutputProvider {
+	
+	var QueryStub query
+
+	override initialize(QueryStub query) {
+		this.query = query
+	}
+
+	override getOutput() {
+		val generators = initializeGenerators(query)
+		val root = "Viatra/Query"
+
+		return generators.map[
+			new GeneratorOutputRecord('''«root»/«query.name.toFirstUpper»''', fileName, compile)
+		].toList
+	}
+
+	def Collection<IGenerator> initializeGenerators(QueryStub query)
+	
 }

plugins/hu.bme.mit.incquery.localsearch.cpp/src/hu/bme/mit/incquery/localsearch/cpp/generator/internal/common/MatchGenerator.xtend

@@ -2,12 +2,10 @@ package hu.bme.mit.incquery.localsearch.cpp.generator.internal.common
 
 import hu.bme.mit.incquery.localsearch.cpp.generator.internal.ViatraQueryHeaderGenerator
 import hu.bme.mit.incquery.localsearch.cpp.generator.model.MatchingFrameStub
-import java.util.List
 import org.eclipse.emf.ecore.EClass
 import org.eclipse.emf.ecore.EDataType
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable
-import org.eclipse.xtend.lib.annotations.Accessors
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter
+import org.eclipse.xtend.lib.annotations.Accessors
 
 class MatchGenerator extends ViatraQueryHeaderGenerator {
 

plugins/hu.bme.mit.incquery.localsearch.cpp/src/hu/bme/mit/incquery/localsearch/cpp/generator/internal/common/QueryGroupGenerator.xtend

@@ -14,7 +14,12 @@ class QueryGroupGenerator extends ViatraQueryHeaderGenerator {
 	}
 
 	override initialize() {
+		includes += new Include("Viatra/Query/Matcher/ISearchContext.h")
+		includes += new Include("Viatra/Query/Matcher/ClassHelper.h")		
 
+		includes += query.classes.map[
+			Include::fromEClass(it)	
+		]
 	}
 
 	override compileInner() '''

plugins/hu.bme.mit.incquery.localsearch.cpp/src/hu/bme/mit/incquery/localsearch/cpp/generator/internal/runtime/RuntimeQuerySpecificationGenerator.xtend

@@ -29,6 +29,7 @@ class RuntimeQuerySpecificationGenerator extends QuerySpecificationGenerator {
 	}
 
 	override initialize() {
+		super.initialize
 		includes += frameGenerators.map[include]
 	}
 

runtime/Localsearch_Runtime/Viatra/Query/Matcher/ModelIndex.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <list>
+
 namespace Viatra {
 namespace Query {