Made minor improvements to sequence expansion expression mappings.

- Avoided creating a structured activity node for a primary expression
that does not map to any elements.
- Correctly set the types of the expansion nodes for collect, iterate
and isUnique expressions.

Author: seidewitz

org.modeldriven.alf.eclipse/UML/Expressions_Sequence_Expansion_Reduction.uml

@@ -24,7 +24,7 @@
 
 public abstract class AlfBase {
 
-    public static final String ALF_VERSION = "1.0.3";
+    public static final String ALF_VERSION = "1.0.4/dev-01";
 
     protected boolean isVerbose = false;
 

org.modeldriven.alf.eclipse/UML/_RunTests.uml

@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright 2011, 2013 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011, 2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -17,6 +16,7 @@
 import org.modeldriven.alf.syntax.expressions.CollectOrIterateExpression;
 
 import org.modeldriven.alf.uml.ActivityNode;
+import org.modeldriven.alf.uml.Classifier;
 
 public class CollectOrIterateExpressionMapping extends
 		SequenceExpansionExpressionMapping {
@@ -42,11 +42,13 @@ protected ActivityNode mapNestedGraph(
     }
 
     @Override
-    public void map() throws MappingError {
-        super.map();
+    public Classifier map() throws MappingError {
+        Classifier argumentType = super.map();
+        this.region.getOutputElement().get(0).setType(argumentType);
         if ("iterate".equals(this.getCollectOrIterateExpression().getOperation())) {
             this.region.setMode("iterative");
         }
+        return argumentType;
     }
 
 	public CollectOrIterateExpression getCollectOrIterateExpression() {

org.modeldriven.alf/dist/alf-base.jar

@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright 2011-2015 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -20,6 +19,7 @@
 import org.modeldriven.alf.uml.TestIdentityAction;
 import org.modeldriven.alf.uml.ValueSpecificationAction;
 import org.modeldriven.alf.uml.ActivityNode;
+import org.modeldriven.alf.uml.Classifier;
 
 public class ForAllOrExistsOrOneExpressionMapping extends
 		SequenceExpansionExpressionMapping {
@@ -83,8 +83,8 @@ protected boolean isTerminated(String operation) {
     }
 
     @Override
-    public void map() throws MappingError {
-        super.map();
+    public Classifier map() throws MappingError {
+        Classifier argumentType = super.map();
 
         String operation = this.getForAllOrExistsOrOneExpression().getOperation();
 
@@ -102,6 +102,8 @@ public void map() throws MappingError {
             this.graph.addObjectFlow(valueAction.getResult(), testAction.getSecond());
             this.resultSource = testAction.getResult();
         }
+        
+        return argumentType;
     }
 
 	public ForAllOrExistsOrOneExpression getForAllOrExistsOrOneExpression() {

org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java

@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright 2011-2015 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -49,8 +48,9 @@ protected boolean isSelectLike(String operation) {
     }
 
     @Override
-    public void map() throws MappingError {
-        super.map();
+    public Classifier map() throws MappingError {
+        Classifier argumentType = super.map();
+        this.region.getOutputElement().get(0).setType(argumentType);
 
         ActivityGraph nestedGraph = this.createActivityGraph();
         ActivityNode forkNode = 
@@ -87,16 +87,20 @@ public void map() throws MappingError {
         // result in an input pin at the expansion region boundary.
         IsUniqueExpression expression = this.getIsUniqueExpression();
         ExpansionRegion region = this.graph.addExpansionRegion(
-                "Uniqueness(" + expression.getClass().getSimpleName()+ 
+                "Uniqueness(" + expression.getClass().getSimpleName() + 
                             "@" + expression.getId() + ")", 
                 "parallel", 
                 nestedGraph.getModelElements(), 
-                forkNode, variableSource, nestedResult);
+                forkNode, variableSource, nestedResult);
+        region.getInputElement().get(0).setType(argumentType);
+        region.getOutputElement().get(0).setType(argumentType);
         this.graph.addControlFlow(forkStructureNode, region);
         this.resultSource = region.getOutputElement().get(0);
 
         // Add the final check that there are no elements with a count != 1.
-        this.addBehaviorCall(RootNamespace.getRootScope().getSequenceFunctionIsEmpty());
+        this.addBehaviorCall(RootNamespace.getRootScope().getSequenceFunctionIsEmpty());
+        
+        return argumentType;
     }
 
 	public IsUniqueExpression getIsUniqueExpression() {

org.modeldriven.alf/src/org/modeldriven/alf/fuml/mapping/expressions/CollectOrIterateExpressionMapping.java

@@ -1,6 +1,5 @@
-
 /*******************************************************************************
- * Copyright 2011-2015 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -115,9 +114,11 @@ protected void mapRegion(
         this.mapTo(this.region);
     }
 
-    public void map() throws MappingError {
+    public Classifier map() throws MappingError {
         SequenceExpansionExpression expression = 
-            this.getSequenceExpansionExpression();
+            this.getSequenceExpansionExpression();
+        
+        Classifier argumentType = null;
 
         ExtentOrExpression primary = expression.getPrimary();
         FumlMapping mapping = this.fumlMap(
@@ -127,10 +128,14 @@ public void map() throws MappingError {
                     mapping.getErrorMessage());
         } else {
             ExpressionMapping primaryMapping = (ExpressionMapping)mapping;
-            ActivityNode primaryNode = this.graph.addStructuredActivityNode(
-                    "Primary(" + expression.getClass().getSimpleName() + 
-                        "@" + expression.getId() + ")", 
-                    primaryMapping.getModelElements());
+            Collection<Element> elements = primaryMapping.getModelElements();
+            ActivityNode primaryNode = null;
+            if (!elements.isEmpty()) {
+                primaryNode = this.graph.addStructuredActivityNode(
+                        "Primary(" + expression.getClass().getSimpleName() + 
+                            "@" + expression.getId() + ")", 
+                        primaryMapping.getModelElements());
+            }
             ActivityGraph nestedGraph = this.createActivityGraph();
             this.variableSource = nestedGraph.addForkNode(
                     "Fork(" + expression.getVariable() + ")");
@@ -140,7 +145,8 @@ public void map() throws MappingError {
                 this.throwError("Error mapping argument: " + 
                         mapping.getErrorMessage());
             } else {
-                ExpressionMapping argumentMapping = (ExpressionMapping)mapping;                
+                ExpressionMapping argumentMapping = (ExpressionMapping)mapping;
+                argumentType = argumentMapping.getType();
                 nestedGraph.addAll(argumentMapping.getGraph());
 
                 this.mapRegion(
@@ -151,9 +157,13 @@ public void map() throws MappingError {
                         this.variableSource);
                 this.region.getInputElement().get(0).setType(primaryMapping.getType());
                 this.region.getOutputElement().get(0).setType(primaryMapping.getType());
-                this.graph.addControlFlow(primaryNode, this.region);
+                if (primaryNode != null) {
+                    this.graph.addControlFlow(primaryNode, this.region);
+                }
             }
-        }
+        }
+        
+        return argumentType;
     }
 
     //Used by subclasses