Fail gracefully when languages/MTs names miss

diverse-project · Aug 3, 2015 · 175ff16 · 175ff16
1 parent 9d7de92
commit 175ff16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/LanguageExtensions.xtend b/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/LanguageExtensions.xtend
@@ -41,7 +41,7 @@ class LanguageExtensions
 	}
 
 	def boolean getIsComplete(Language l) {
-		return l.syntax !== null && l.syntax.isComplete && l.semantics.forall[isComplete]
+		return l.name !== null && l.syntax !== null && l.syntax.isComplete && l.semantics.forall[isComplete]
 	}
 
 	/**

diff --git a/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/ModelTypeExtensions.xtend b/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/ModelTypeExtensions.xtend
@@ -26,6 +26,7 @@ class ModelTypeExtensions
 
 	def boolean getIsComplete(ModelType mt) {
 		return
+			mt.name !== null &&
 			if (mt.isExtracted)
 				mt.extracted.isComplete
 			else

diff --git a/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/utils/EPackageProvider.xtend b/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/utils/EPackageProvider.xtend
@@ -132,10 +132,10 @@ class EPackageProvider
 	}
 
 	def dispatch String getFqn(Metamodel mm) {
-		return mm.owningLanguage.fullyQualifiedName.toString
+		return mm.owningLanguage.fullyQualifiedName?.toString
 	}
 
 	def dispatch String getFqn(ModelType mt) {
-		return mt.fullyQualifiedName.toString
+		return mt.fullyQualifiedName?.toString
 	}
 }