Issue #63 - Corrected finding Impl constructor.

ModelDriven · Aug 31, 2018 · 6816270 · 6816270
1 parent eaf68ea
commit 6816270
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/...n.alf/src/org/modeldriven/alf/syntax/expressions/impl/InstanceCreationExpressionImpl.java b/...n.alf/src/org/modeldriven/alf/syntax/expressions/impl/InstanceCreationExpressionImpl.java
@@ -171,17 +171,19 @@ protected ElementReference deriveReferent() {
                                     // "Impl" inserted and resolving it makes sure
                                     // that all template bindings are handled 
                                     // correctly.
-                                    implConstructor = qualification.getQualification();
+                                    implConstructor = 
+                                            qualification.getImpl().copy().getQualification();
                                     if (implConstructor == null) {
                                         implConstructor = new QualifiedName();
                                         implConstructor.getImpl().
                                             setCurrentScope(namespaceDefinition);
                                     }
                                     implConstructor.getImpl().addName("Impl").
-                                    addNameBinding(qualification.getUnqualifiedName());
+                                        addNameBinding(qualification.getUnqualifiedName());
                                 }
 
-                                implConstructor.addNameBinding(unqualifiedName);
+                                implConstructor.addNameBinding(unqualifiedName);
+                                implConstructor.getImpl().setIsVisibleOnly(false);
                                 ElementReference implOperationReferent = 
                                         implConstructor.getImpl().getOperationReferent();
 

diff --git a/org.modeldriven.alf/tests/Package_Library_Impl.alf b/org.modeldriven.alf/tests/Package_Library_Impl.alf
@@ -1,15 +1,17 @@
-package Library {
-	public abstract class Class {
-		@Create public Class() { }
-    }
-
-    private package Impl {
-		public class Class specializes Library::Class {
-			@Create public Class() redefines Library::Class::Class { }
+package Library_Impl {
+	public package Library {
+		public abstract class Class {
+			@Create public Class() { }
 	    }
+
+	    private package Impl {
+			public class Class specializes Library::Class {
+				@Create public Class() redefines Library::Class::Class { }
+		    }
+		}
 	}
 
-	public activity Instantiate(): Class {
-		return new Class();
+	public activity Instantiate(): Library::Class {
+		return new Library::Class();
 	}
 }