Build: fix aspects initialization

diverse-project · Sep 1, 2015 · 3339f18 · 3339f18
1 parent 0885d2c
commit 3339f18
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageBuilder.xtend b/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/LanguageBuilder.xtend
@@ -138,4 +138,8 @@ class LanguageBuilder extends Builder{
 			]
 		]
 	}
+
+	def WeaveBuilder findBuilder(Weave w){
+		return builders.filter(WeaveBuilder).findFirst[it.source === w]
+	}
 }
diff --git a/...r.inria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/WeaveBuilder.xtend b/...r.inria.diverse.melange/src/main/java/fr/inria/diverse/melange/builder/WeaveBuilder.xtend
@@ -1,18 +1,16 @@
 package fr.inria.diverse.melange.builder
 
 import com.google.inject.Inject
-import org.eclipse.xtext.common.types.JvmDeclaredType
-import fr.inria.diverse.melange.metamodel.melange.Weave
-import java.util.ArrayList
 import fr.inria.diverse.melange.ast.AspectExtensions
+import fr.inria.diverse.melange.metamodel.melange.Weave
 import fr.inria.diverse.melange.utils.AspectToEcore
-import fr.inria.diverse.melange.ast.MetamodelExtensions
+import java.util.ArrayList
+import org.eclipse.xtext.common.types.JvmDeclaredType
 
 class WeaveBuilder extends OperatorBuilder{
 
 	@Inject extension AspectExtensions
 	@Inject extension AspectToEcore
-	@Inject extension MetamodelExtensions
 
 	LanguageBuilder rootLanguage
 
@@ -29,4 +27,8 @@ class WeaveBuilder extends OperatorBuilder{
 
 		return new ArrayList
 	}
+
+	def Weave getSource(){
+		return source as Weave
+	}
 }
diff --git a/...diverse.melange/src/main/java/fr/inria/diverse/melange/processors/LanguageProcessor.xtend b/...diverse.melange/src/main/java/fr/inria/diverse/melange/processors/LanguageProcessor.xtend
@@ -67,12 +67,15 @@ class LanguageProcessor extends DispatchMelangeProcessor{
 		typeRefBuilder = typeRefBuilderFactory.create(root.eResource.resourceSet)
 
 		root.languages.forEach[language |
-			language.initialize
+			language.initializeSyntax
 		]
 		root.languages.forEach[language |
 			val langBuilder = builder.getBuilder(language)
 			build(langBuilder)
 		]
+		root.languages.forEach[language |
+			language.initializeSemantic
+		]
 	}
 
 	/**
@@ -162,10 +165,7 @@ class LanguageProcessor extends DispatchMelangeProcessor{
 		return res
 	}
 
-	/**
-	 * Initialize syntax & semantics
-	 */
-	def void initialize(Language language) {
+	def void initializeSyntax(Language language) {
 
 		language.syntax = MelangeFactory.eINSTANCE.createMetamodel
 		if (language.isGeneratedByMelange) {
@@ -179,6 +179,10 @@ class LanguageProcessor extends DispatchMelangeProcessor{
 			}
 		}
 
+
+	}
+
+	def void initializeSemantic(Language language) {
 		language.semantics.clear
 		language.semantics += language.operators.filter(Weave)
 		.filter[aspectTypeRef?.type instanceof JvmDeclaredType]
@@ -189,6 +193,7 @@ class LanguageProcessor extends DispatchMelangeProcessor{
 				val className = aspectTypeRef.aspectAnnotationValue
 				if (className !== null){
 					aspectedClass = language.syntax.findClass(className)
+					ecoreFragment = builder.getBuilder(language).findBuilder(w).model
 				}
 			]
 		]