Introduced ExpInstanceOp as parent class of ExpObjOp and ExpInstanceConstructor

Author: stefanschoon

use-core/src/main/java/org/tzi/use/parser/ocl/ASTOperationExpression.java

@@ -629,10 +629,10 @@ private Expression genObjOperation(Context ctx, MClassifier srcClassifier, Expre
         	}
 
             try {
+                // constructor performs additional checks
                 if (op.isConstructor()) {
                     res = new ExpInstanceConstructor(op, fArgExprs);
                 } else {
-                    // constructor performs additional checks
                     res = new ExpObjOp(op, fArgExprs);
                 }
                 res.setSourcePosition(new SrcPos(fOp));

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

@@ -45,14 +45,14 @@ public ExpInstanceConstructor(MOperation constructor, Expression[] args) throws
 
         if (!(args[0].type().isTypeOfClass() || args[0].type().isTypeOfDataType()))
             throw new ExpInvalidException(
-                    "Target expression of constructor must have " +
+                    "Target expression of instance constructor must have " +
                             "object type, found `" + args[0].type() + "'.");
 
         // check for matching arguments
         VarDeclList params = fOp.paramList();
         if (params.size() != (args.length - 1) )
             throw new ExpInvalidException(
-                    "Number of arguments does not match declaration of constructor `" +
+                    "Number of arguments does not match declaration of instance constructor `" +
                             fOp.name() + "'. Expected " + params.size() + " argument(s), found " +
                             (args.length - 1) + ".");