Issue #31 (ALF11-14) - Updated to be consistent w/ proposed resolution.

Author: seidewitz

org.modeldriven.alf.eclipse/lib/alf-base.jar

@@ -143,41 +143,47 @@ public static StructuredActivityNode wrapAction(
      * to feature references.
      */
 
-    /**
-     * BEHAVIOR INVOCATION MAPPING
-     * 
-     * 1. A behavior invocation expression whose qualified name disambiguates to
-     * a feature reference is mapped as if it were a feature invocation
-     * expression. Otherwise, a behavior invocation expression is mapped as
-     * either a behavior call or an association read.
-     * 
-     * 2. A behavior invocation expression whose qualified name resolves to a
-     * behavior maps to a call behavior action for the named behavior. If the
-     * behavior invocation expression has a non-empty tuple, then the call
-     * behavior action is the target of a control flow whose source is the
-     * structured activity node mapped from the tuple. Each input pin of the
-     * call behavior action corresponds to an in or inout parameter of the
-     * called behavior. If there is an argument expression for that parameter in
-     * the tuple, then the input pin is the target of an object flow whose
-     * source is the result source element of the argument expression.
-     * Similarly, each output pin of the call behavior action (other than the
-     * output pin for a return parameter) corresponds to an out or inout
-     * parameter. If there is an argument expression for that parameter in the
-     * type, then the output pin is the source of an object flow whose target is
-     * assigned value input for the argument expression. NOTE: Call behavior
-     * action pins corresponding to unmatched parameters remain unconnected. If
-     * the behavior has a return parameter, then the output pin of the call
-     * behavior action corresponding to that parameter is the result source
-     * element for the behavior invocation action. Otherwise it has no result
-     * source element.
-     * 
-     * 3. A behavior invocation expression whose qualified name resolves to an
-     * association end maps to a read link action with end data for the ends of
-     * the named association. Except for the end data for the target end, the
-     * value input pins for each end are the target of an object flow from the
-     * result source element of the mapping of the corresponding argument
-     * expression. The result output pin of the read link action is the result
-     * source element for the association selection.
+    /**
+     * BEHAVIOR INVOCATION MAPPING
+     * 
+     * 1. A behavior invocation expression whose qualified name disambiguates to
+     * a feature reference is mapped as if it were a feature invocation
+     * expression. Otherwise, a behavior invocation expression is mapped as
+     * either a behavior call or an association read.
+     * 
+     * 2. A behavior invocation expression whose qualified name resolves to a
+     * behavior maps to a call behavior action for the named behavior. If the
+     * behavior invocation expression has a non-empty tuple, then the call
+     * behavior action is the target of a control flow whose source is the
+     * structured activity node mapped from the tuple. Each input pin of the
+     * call behavior action corresponds to an in or inout parameter of the
+     * called behavior. If there is an argument expression for that parameter in
+     * the tuple, then the input pin is the target of an object flow whose
+     * source is the result source element of the argument expression.
+     * Similarly, each output pin of the call behavior action (other than the
+     * output pin for a return parameter) corresponds to an out or inout
+     * parameter. If there is an argument expression for that parameter in the
+     * tuple, then the output pin is the source of an object flow whose target
+     * is assigned value input for the argument expression. NOTE: Call behavior
+     * action pins corresponding to unmatched parameters remain unconnected. If
+     * the behavior does not have a return parameter, then the behavior
+     * invocation expression has no result source element. Otherwise, the output
+     * pin of the call behavior action corresponding to that parameter is the
+     * result source element for the behavior invocation expression, unless
+     * indexing from 0 applies to the behavior invocation expression and the
+     * invocation is of a library function whose return value is affected by
+     * this, in which case the output pin is connected by an object flow to an
+     * invocation of the IntegerFunctions::- function whose second argument is
+     * 1, and the result of that invocation provides the result source element
+     * for the behavior invocation expression.
+     * 
+     * 3. A behavior invocation expression whose qualified name resolves to an
+     * association end maps to a read link action with end data for the ends of
+     * the named association. Except for the end data for the target end, the
+     * value input pins for each end are the target of an object flow from the
+     * result source element of the mapping of the corresponding argument
+     * expression. The result output pin of the read link action is the result
+     * source element for the association selection.
      */
 
     /**

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

@@ -35,7 +35,11 @@ public class LinkOperationExpressionMapping extends InvocationExpressionMapping
      * association end is ordered, then the insertAt input pin for that end is
      * the target of an object flow from the result source element of the
      * mapping of the corresponding index expression (which defaults to * if not
-     * given explicitly).
+     * given explicitly). If indexing from 0 applies to the link operation
+     * expression, then the mapping of the index expression is adjusted as for
+     * the index expression of a sequence access expression, except that the
+     * value is first tested whether it is equal to * and then converted to an
+     * integer and incremented only if it is not.
      * 
      * 2. A link operation expression for the operation destroyLink maps to a
      * destroy link action for the named association. The value input pin of the
@@ -46,7 +50,11 @@ public class LinkOperationExpressionMapping extends InvocationExpressionMapping
      * isDestroyDuplicates=false and the insertAt input pin for that end is the
      * target of an object flow from the result source element of the mapping of
      * the corresponding index expression (which defaults to * if not given
-     * explicitly).
+     * explicitly). If indexing from 0 applies to the link operation
+     * expression, then the mapping of the index expression is adjusted as for
+     * the index expression of a sequence access expression, except that the
+     * value is first tested whether it is equal to * and then converted to an
+     * integer and incremented only if it is not.
      * 
      * 3. A link operation expression for the link operation clearAssoc maps to
      * a clear association action for the named association. The object input

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

@@ -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 
@@ -23,15 +22,24 @@ public class SequenceAccessExpressionMapping extends BehaviorInvocationExpressio
     private InvocationExpression invocation = null;
     private ActivityNode indexSource = null;
 
-    /*
-     * A sequence access expression is mapped to a call to the primitive
+    /**
+     * 1. A sequence access expression is mapped to a call to the primitive
      * behavior Alf::Library::PrimitiveBehaviors::SequenceFunctions::At. The
      * result source element of the primary expression of the sequence access
      * expression is connected by an object flow to the first argument input pin
      * of the call behavior action. The result source element of the index
      * expression is connected by an object flow to the second argument input
      * pin. The result output pin of the call behavior action is the result
      * source element for the sequence access expression.
+     * 
+     * 2. If indexing from 0 applies to the sequence access expression, then the
+     * mapping of its index expression is adjusted as follows. The result source
+     * element of the index expression is connected by an object flow to the
+     * first argument pin of a call to the primitive behavior
+     * Alf::Library::PrimitiveBehaviors::IntegerFunctions::+, and the result of
+     * a value specification action for the value 1 is connected to the second
+     * argument pin. The result output pin of the call behavior action is then
+     * used as the result source element for the index.
      */
 
     @Override

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

@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
@@ -74,7 +73,11 @@ public abstract class TupleMapping extends SyntaxElementMapping {
      * connected by an object flow to an invocation of the
      * BitStringFunctions::toBitString function, and the result of that
      * invocation provides the source for setting the value of the associated
-     * parameter.
+     * parameter. If the tuple is in a behavior invocation expression or
+     * sequence operation expression to which indexing from 0 applies, and the
+     * parameter is an affected index parameter, then the mapping of the
+     * argument expression is adjusted as for the index expression of a sequence
+     * access expression.
      * 
      * 3. For an argument for an out parameter, the argument expression is
      * mapped as a left hand side of an assignment: an argument that is a local

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

@@ -253,7 +253,7 @@ public Collection<Element> getModelElements() throws MappingError {
 	}
 
 	public boolean isIndexFrom0() {
-	    return this.getStatement().getImpl().isIndexFrom0();
+	    return this.getStatement().getImpl().getIsIndexFrom0();
 	}
 
     public FumlMapping exprMap(Expression expression) {

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

@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright 2011, 2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
@@ -98,6 +97,14 @@ public void setIsIsolated(Boolean isIsolated) {
 		this.getImpl().setIsIsolated(isIsolated);
 	}
 
+    public Boolean getIsIndexFrom0() {
+        return this.getImpl().getIsIndexFrom0();
+    }
+    
+    public void setIsIndexFrom0(Boolean isIndexFrom0) {
+        this.getImpl().setIsIndexFrom0(isIndexFrom0);
+    }
+
 	/**
 	 * All the annotations of a statement must be allowed, as given by the
 	 * annotationAllowed operation for the statement.
@@ -120,6 +127,15 @@ public boolean statementIsIsolatedDerivation() {
 		return this.getImpl().statementIsIsolatedDerivation();
 	}
 
+    /**
+     * A statement has indexing from 0 if it has an @indexFrom0 annotation, or
+     * it is contained in a statement with indexing from 0 and it does not have
+     * an @indexFrom1 annotation applied.
+     */
+    public boolean statementIsIndexFrom0Derivation() {
+        return this.getImpl().statementIsIndexFrom0Derivation();
+    }
+    
 	/**
 	 * Returns true if the given annotation is allowed for this kind of
 	 * statement. By default, only an @isolated annotation is allowed, with no
@@ -144,6 +160,7 @@ public void _deriveAll() {
 		this.getAssignmentAfter();
 		this.getEnclosingStatement();
 		this.getIsIsolated();
+		this.getIsIndexFrom0();
 		super._deriveAll();
 		Collection<Annotation> annotation = this.getAnnotation();
 		if (annotation != null) {
@@ -163,10 +180,14 @@ public void checkConstraints(Collection<ConstraintViolation> violations) {
 			violations.add(new ConstraintViolation(
 					"statementUniqueAssignments", this));
 		}
-		if (!this.statementIsIsolatedDerivation()) {
-			violations.add(new ConstraintViolation(
-					"statementIsIsolatedDerivation", this));
-		}
+        if (!this.statementIsIsolatedDerivation()) {
+            violations.add(new ConstraintViolation(
+                    "statementIsIsolatedDerivation", this));
+        }
+        if (!this.statementIsIndexFrom0Derivation()) {
+            violations.add(new ConstraintViolation(
+                    "statementIsIndexFrom0Derivation", this));
+        }
 		Collection<Annotation> annotation = this.getAnnotation();
 		if (annotation != null) {
 			for (Object _annotation : annotation.toArray()) {
@@ -180,6 +201,8 @@ public String _toString(boolean includeDerived) {
 		if (includeDerived) {
 			s.append(" /isIsolated:");
 			s.append(this.getIsIsolated());
+			s.append(" /isIndexFrom0:");
+			s.append(this.getIsIndexFrom0());
 		}
 		return s.toString();
 	}

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

@@ -1,4 +1,3 @@
-
 /*******************************************************************************
  * Copyright 2011, 2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
@@ -35,7 +34,8 @@ public abstract class StatementImpl extends DocumentedElementImpl {
 	private Map<String, AssignedSource> assignmentBefore = null; // DERIVED
 	private Map<String, AssignedSource> assignmentAfter = null; // DERIVED
 	private Statement enclosingStatement = null; // DERIVED
-	private Boolean isIsolated = null; // DERIVED
+	private Boolean isIsolated = null; // DERIVED
+	private Boolean isIndexFrom0 = null; // DERIVED
 
 	public StatementImpl(Statement self) {
 		super(self);
@@ -161,6 +161,17 @@ public void setIsIsolated(Boolean isIsolated) {
 		this.isIsolated = isIsolated;
 	}
 
+    public Boolean getIsIndexFrom0() {
+        if (this.isIndexFrom0 == null) {
+            this.setIsIndexFrom0(this.deriveIsIndexFrom0());
+        }
+        return this.isIndexFrom0;
+    }
+    
+    public void setIsIndexFrom0(Boolean isIndexFrom0) {
+        this.isIndexFrom0 = isIndexFrom0;
+    }
+
     /**
      * The assignments before are usually set externally.
      */
@@ -189,15 +200,37 @@ protected Boolean deriveIsIsolated() {
 		return this.hasAnnotation("isolated");
 	}
 
+    /**
+     * A statement has indexing from 0 if it has an @indexFrom0 annotation, or
+     * it is contained in a statement with indexing from 0 and it does not have
+     * an @indexFrom1 annotation applied.
+     */
+    protected Boolean deriveIsIndexFrom0() {
+        if (this.hasAnnotation("indexFrom0")) {
+            return true;
+        } else if (this.hasAnnotation("indexFrom1")) {
+            return false;
+        } else {
+            Statement enclosingStatement = this.getSelf().getEnclosingStatement();
+            return enclosingStatement != null && 
+                   enclosingStatement.getIsIndexFrom0();
+        }
+    }
+    
 	/*
 	 * Derivations
 	 */
 
-	public boolean statementIsIsolatedDerivation() {
-		this.getSelf().getIsIsolated();
-		return true;
-	}
-	
+    public boolean statementIsIsolatedDerivation() {
+        this.getSelf().getIsIsolated();
+        return true;
+    }
+    
+    public boolean statementIsIndexFrom0Derivation() {
+        this.getSelf().getIsIsolated();
+        return true;
+    }
+    
 	/*
 	 * Constraints
 	 */
@@ -259,18 +292,6 @@ public boolean hasAnnotation(String name) {
         return false;
     }
 
-    public boolean isIndexFrom0() {
-        if (this.hasAnnotation("indexFrom0")) {
-            return true;
-        } else if (this.hasAnnotation("indexFrom1")) {
-            return false;
-        } else {
-            Statement enclosingStatement = this.getSelf().getEnclosingStatement();
-            return enclosingStatement != null && 
-                    enclosingStatement.getImpl().isIndexFrom0();
-        }
-    }
-    
     private static boolean uniqueAssignments(Collection<AssignedSource> assignments) {
         return new HashSet<AssignedSource>(assignments).size() == assignments.size();
     }