Introduced ExpInstanceOp as parent class of ExpObjOp and ExpInstanceConstructor

Author: stefanschoon

use-core/src/main/java/org/tzi/use/parser/use/ASTOperation.java

@@ -138,7 +138,7 @@ public void genFinal(Context ctx) throws SemanticException
             return;
 
         if (fIsConstructor && fOperation.resultType() != fOperation.cls()) {
-            throw new SemanticException(fName, "Constructor " + StringUtil.inQuotes(fName.getText()) +
+            throw new SemanticException(fName, "Instance constructor " + StringUtil.inQuotes(fName.getText()) +
                     " must not have result type.");
         }
 
@@ -162,7 +162,7 @@ public void genFinal(Context ctx) throws SemanticException
         try {
             if (fExpr != null ) {
                 if (fIsConstructor) {
-                    throw new MInvalidModelException("Constructor " + StringUtil.inQuotes(fName.getText())
+                    throw new MInvalidModelException("Instance constructor " + StringUtil.inQuotes(fName.getText())
                             + " must not have body.");
                 }
                 Expression expr = fExpr.gen(ctx);

use-core/src/main/java/org/tzi/use/uml/mm/MDataTypeImpl.java

@@ -179,7 +179,7 @@ public void addOperation(MOperation op) throws MInvalidModelException {
                     .map(MModelElementImpl::name).collect(Collectors.toList());
             List<String> paramNames = op.paramNames();
             if (!CollectionUtil.equalLists(allAttributes, paramNames, Comparator.comparing(String::toString))) {
-                throw new MInvalidModelException("Constructor `" + opname + "' is missing parent attribute(s).");
+                throw new MInvalidModelException("Instance constructor `" + opname + "' is missing parent attribute(s).");
             }
         }
 

use-core/src/main/java/org/tzi/use/uml/ocl/expr/ExpInstanceConstructor.java

@@ -25,7 +25,6 @@
 import org.tzi.use.uml.sys.*;
 import org.tzi.use.uml.ocl.value.Value;
 import org.tzi.use.uml.sys.ppcHandling.ExpressionPPCHandler;
-import org.tzi.use.util.Log;
 import org.tzi.use.util.StringUtil;
 
 import java.util.HashMap;

use-core/src/test/resources/org/tzi/use/parser/t25.fail

@@ -1 +1,2 @@
-t25.use:8:6: Definition of constructor `C' only possible in data types.
+t25.use:9:6: Definition of constructor `C' only possible in data types.
+t25.use:5:2: Instance constructor `D' must not have body.

use-core/src/test/resources/org/tzi/use/parser/t25.use

@@ -2,7 +2,8 @@ model t25
 
 dataType D
 operations
-  D(a : Integer, b : Integer)
+  D(a : Integer, b : Integer) =
+    D(a, b)
 end
 
 class C

use-core/src/test/resources/org/tzi/use/parser/t26.fail

@@ -1,6 +1,6 @@
 t26.use:3:9: Data type `C' already contains an attribute named `c0'.
 t26.use:3:9: Data type `C' already contains an operation named `C'.
 t26.use:9:9: Attribute with name `c0' already defined in a super data type.
-t26.use:14:9: Constructor `E' is missing parent attribute(s).
-t26.use:19:9: Constructor `F' is missing parent attribute(s).
-t26.use:36:2: Constructor `I' must not have result type.
+t26.use:14:9: Instance constructor `E' is missing parent attribute(s).
+t26.use:19:9: Instance constructor `F' is missing parent attribute(s).
+t26.use:36:2: Instance constructor `I' must not have result type.

use-core/src/test/resources/org/tzi/use/parser/t27.fail

@@ -1 +1 @@
-t27.use:8:9: Constructor `B' is missing parent attribute(s).
+t27.use:8:9: Instance constructor `B' is missing parent attribute(s).