Merge pull request #36 from ModelDriven/FUML15-2

FUML15-2 The fUML subset should support the raising and handling of
exceptions

Author: seidewitz

org.modeldriven.fuml/.classpath

@@ -34,5 +34,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.modeldriven.fuml/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>fuml</artifactId>
 	<packaging>jar</packaging>
 	<name>FUML Reference Implementation</name>
-	<version>1.4.3</version>
+	<version>1.4.4-SNAPSHOT</version>
 	<description>This open source software is a reference implementation, consisting of software and related files, for the OMG specification called the Semantics of a Foundational Subset for Executable UML Models (fUML). The reference implementation is intended to implement the execution semantics of UML activity models, accepting an XMI file from a conformant UML model as its input and providing an execution trace of the selected activity model(s) as its output. The core execution engine, which is directly generated from the normative syntactic and semantic models for fUML, may also be used as a library implementation of fUML in other software.</description>
 	<url>http:/fuml.modeldriven.org</url>
 	<licenses>

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/ActionActivation.java

@@ -3,8 +3,9 @@
  * as stated in the file entitled Licensing-Information. 
  * 
  * Modifications:
- * Copyright 2009-2012 Data Access Technologies, Inc.
+ * Copyright 2009-2017 Data Access Technologies, Inc.
  * Copyright 2020 Model Driven Solutions, Inc.
+ * Copyright 2020 CEA LIST.
  *
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
@@ -45,21 +46,20 @@
 import fuml.syntax.structuredclassifiers.Association;
 import fuml.syntax.values.LiteralBoolean;
 
-public abstract class ActionActivation extends
-		fuml.semantics.activities.ActivityNodeActivation {
+public abstract class ActionActivation extends fuml.semantics.activities.ExecutableNodeActivation {
 
-	public fuml.semantics.actions.PinActivationList pinActivations = new fuml.semantics.actions.PinActivationList();
 	public boolean firing = false;
-	
+	public fuml.semantics.actions.PinActivationList pinActivations = new fuml.semantics.actions.PinActivationList();
+
 	public void initialize(ActivityNode node, ActivityNodeActivationGroup group) {
 		// Initialize this action activation to be not firing.
-		
+
 		super.initialize(node, group);
 		this.firing = false;
 	}
 
 	public void run() {
-		// Run this action activation and any outoging fork node attached to it.
+		// Run this action activation and any outgoing fork node attached to it.
 
 		super.run();
 
@@ -111,8 +111,7 @@ public fuml.semantics.activities.TokenList takeOfferedTokens() {
 		return offeredTokens;
 	} // takeOfferedTokens
 
-	public void fire(
-			fuml.semantics.activities.TokenList incomingTokens) {
+	public void fire(fuml.semantics.activities.TokenList incomingTokens) {
 		// Do the main action behavior then concurrently fire all output pin
 		// activations
 		// and offer a single control token. Then activate the action again,
@@ -262,8 +261,7 @@ public void createNodeActivations() {
 		}
 	} // createNodeActivations
 
-	public void addOutgoingEdge(
-			fuml.semantics.activities.ActivityEdgeInstance edge) {
+	public void addOutgoingEdge(fuml.semantics.activities.ActivityEdgeInstance edge) {
 		// If there are no outgoing activity edge instances, create a single
 		// activity edge instance with a fork node execution at the other end.
 		// Add the give edge to the fork node execution that is the target of
@@ -286,16 +284,14 @@ public void addOutgoingEdge(
 		forkNodeActivation.addOutgoingEdge(edge);
 	} // addOutgoingEdge
 
-	public void addPinActivation(
-			fuml.semantics.actions.PinActivation pinActivation) {
+	public void addPinActivation(fuml.semantics.actions.PinActivation pinActivation) {
 		// Add a pin activation to this action activation.
 
 		this.pinActivations.addValue(pinActivation);
 		pinActivation.actionActivation = this;
 	} // addPinActivation
 
-	public fuml.semantics.actions.PinActivation getPinActivation(
-			fuml.syntax.actions.Pin pin) {
+	public fuml.semantics.actions.PinActivation getPinActivation(fuml.syntax.actions.Pin pin) {
 		// Precondition: The given pin is owned by the action of the action
 		// activation.
 		// Return the pin activation corresponding to the given pin.
@@ -315,8 +311,7 @@ public fuml.semantics.actions.PinActivation getPinActivation(
 
 	} // getPinActivation
 
-	public void putToken(fuml.syntax.actions.OutputPin pin,
-			fuml.semantics.values.Value value) {
+	public void putToken(fuml.syntax.actions.OutputPin pin, fuml.semantics.values.Value value) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Place a token for the given value on the pin activation corresponding
@@ -331,8 +326,7 @@ public void putToken(fuml.syntax.actions.OutputPin pin,
 		pinActivation.addToken(token);
 	} // putToken
 
-	public void putTokens(fuml.syntax.actions.OutputPin pin,
-			fuml.semantics.values.ValueList values) {
+	public void putTokens(fuml.syntax.actions.OutputPin pin, fuml.semantics.values.ValueList values) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Place tokens for the given values on the pin activation corresponding
@@ -347,8 +341,7 @@ public void putTokens(fuml.syntax.actions.OutputPin pin,
 
 	} // putTokens
 
-	public fuml.semantics.values.ValueList getTokens(
-			fuml.syntax.actions.InputPin pin) {
+	public fuml.semantics.values.ValueList getTokens(fuml.syntax.actions.InputPin pin) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Get any tokens held by the pin activation corresponding to the given
@@ -372,8 +365,7 @@ public fuml.semantics.values.ValueList getTokens(
 		return values;
 	} // getTokens
 
-	public fuml.semantics.values.ValueList takeTokens(
-			fuml.syntax.actions.InputPin pin) {
+	public fuml.semantics.values.ValueList takeTokens(fuml.syntax.actions.InputPin pin) {
 		// Precondition: The action execution has fired and the given pin is
 		// owned by the action of the action execution.
 		// Take any tokens held by the pin activation corresponding to the given
@@ -396,8 +388,7 @@ public fuml.semantics.values.ValueList takeTokens(
 		return values;
 	} // takeTokens
 
-	public boolean isSourceFor(
-			fuml.semantics.activities.ActivityEdgeInstance edgeInstance) {
+	public boolean isSourceFor(fuml.semantics.activities.ActivityEdgeInstance edgeInstance) {
 		// If this action has an outgoing fork node, check that the fork node is
 		// the source of the given edge instance.
 
@@ -410,8 +401,7 @@ public boolean isSourceFor(
 		return isSource;
 	} // isSourceFor
 
-	public boolean valueParticipatesInLink(
-			fuml.semantics.values.Value value,
+	public boolean valueParticipatesInLink(fuml.semantics.values.Value value,
 			fuml.semantics.structuredclassifiers.Link link) {
 		// Test if the given value participates in the given link.
 
@@ -537,8 +527,7 @@ public fuml.syntax.classification.Property getOppositeEnd(
 		return oppositeEnd;
 	} // getOppositeEnd
 
-	public fuml.semantics.simpleclassifiers.BooleanValue makeBooleanValue(
-			boolean value) {
+	public fuml.semantics.simpleclassifiers.BooleanValue makeBooleanValue(boolean value) {
 		// Make a Boolean value using the built-in Boolean primitive type.
 		// [This ensures that Boolean values created internally are the same as
 		// the default used for evaluating Boolean literals.]
@@ -549,4 +538,38 @@ public fuml.semantics.simpleclassifiers.BooleanValue makeBooleanValue(
 				.evaluate(booleanLiteral));
 	} // makeBooleanValue
 
-} // ActionActivation
+	public void handle(fuml.semantics.values.Value exception, fuml.syntax.activities.ExceptionHandler handler) {
+		// Handle the given exception by firing the body of the given
+		// exception handler. After the body fires, transfer its outputs
+		// to the output pins of this action activation.
+		
+		super.handle(exception, handler);
+		this.transferOutputs((Action)handler.handlerBody);
+	}
+
+	public void transferOutputs(fuml.syntax.actions.Action handlerBody) {
+		// Transfer the output values from activation of the given exception
+		// handler body to the output pins of this action activation.
+		
+		ActionActivation handlerBodyActivation = 
+				(ActionActivation)this.group.getNodeActivation(handlerBody);
+		OutputPinList sourceOutputs = handlerBody.output;
+		OutputPinList targetOutputs = ((Action) this.node).output;
+		
+		for (int i = 0; i < sourceOutputs.size(); i++) {
+			OutputPin sourcePin = sourceOutputs.getValue(i);
+			OutputPin targetPin = targetOutputs.getValue(i);
+			
+			PinActivation sourcePinActivation = handlerBodyActivation.getPinActivation(sourcePin);
+			TokenList tokens = sourcePinActivation.takeTokens();
+			ValueList values = new ValueList();
+			for (int j = 0; j < tokens.size(); j++) {
+				Token token = tokens.getValue(j);
+				values.addValue(token.getValue());
+			}
+			
+			this.putTokens(targetPin, values);
+		}
+	}
+
+} // ActionActivation

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/CallActionActivation.java

@@ -3,7 +3,10 @@
  * Initial version copyright 2008 Lockheed Martin Corporation, except  
  * as stated in the file entitled Licensing-Information. 
  * 
- * All modifications copyright 2009-2012 Data Access Technologies, Inc.
+ * Modifications:
+ * Copyright 2009-2012 Data Access Technologies, Inc.
+ * Copyright 2020 Model Driven Solutions, Inc.
+ * Copyright 2020 CEA LIST.
  *
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
@@ -31,9 +34,11 @@ public abstract class CallActionActivation extends
 	public void doAction() {
 		// Get the call execution object, set its input parameters from the
 		// argument pins and execute it.
-		// Once execution completes, copy the values of the output parameters of
-		// the call execution to the result pins of the call action execution,
-		// then destroy the execution.
+		// Once execution completes, if the execution raised an exception, then
+		// propagate the exception.
+		// Otherwise, copy the values of the output parameters of the call execution 
+		// to the result pins of the call action execution.
+		// In either case, destroy the execution.
 
 		Execution callExecution = this.getCallExecution();
 
@@ -63,30 +68,34 @@ public void doAction() {
 			}
 
 			callExecution.execute();
-
-			ParameterValueList outputParameterValues = callExecution
-					.getOutputParameterValues();
-
-			pinNumber = 1;
-			i = 1;
-			while (i <= parameters.size()) {
-				Parameter parameter = parameters.getValue(i - 1);
-				if ((parameter.direction == ParameterDirectionKind.inout)
-						| (parameter.direction == ParameterDirectionKind.out)
-						| (parameter.direction == ParameterDirectionKind.return_)) {
-					for (int j = 0; j < outputParameterValues.size(); j++) {
-						ParameterValue outputParameterValue = outputParameterValues
-								.getValue(j);
-						if (outputParameterValue.parameter == parameter) {
-							OutputPin resultPin = resultPins
-									.getValue(pinNumber - 1);
-							this.putTokens(resultPin,
-									outputParameterValue.values);
+			
+			if(callExecution.exception != null) {
+				this.propagateException(callExecution.exception);
+			} else {
+				ParameterValueList outputParameterValues = callExecution
+						.getOutputParameterValues();
+	
+				pinNumber = 1;
+				i = 1;
+				while (i <= parameters.size()) {
+					Parameter parameter = parameters.getValue(i - 1);
+					if ((parameter.direction == ParameterDirectionKind.inout)
+							| (parameter.direction == ParameterDirectionKind.out)
+							| (parameter.direction == ParameterDirectionKind.return_)) {
+						for (int j = 0; j < outputParameterValues.size(); j++) {
+							ParameterValue outputParameterValue = outputParameterValues
+									.getValue(j);
+							if (outputParameterValue.parameter == parameter) {
+								OutputPin resultPin = resultPins
+										.getValue(pinNumber - 1);
+								this.putTokens(resultPin,
+										outputParameterValue.values);
+							}
 						}
+						pinNumber = pinNumber + 1;
 					}
-					pinNumber = pinNumber + 1;
+					i = i + 1;
 				}
-				i = i + 1;
 			}
 
 			callExecution.destroy();

org.modeldriven.fuml/src/main/java/fuml/semantics/actions/RaiseExceptionActionActivation.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2020 Model Driven Solutions, Inc.
+ * Copyright 2020 CEA LIST.
+ *
+ * Licensed under the Academic Free License version 3.0 
+ * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
+ * in the file entitled Licensing-Information. 
+ */
+
+package fuml.semantics.actions;
+
+import fuml.Debug;
+import fuml.semantics.values.Value;
+import fuml.syntax.actions.RaiseExceptionAction;
+
+public class RaiseExceptionActionActivation extends ActionActivation {
+
+	@Override
+	public void doAction() {
+		// Get the value on the exception pin and propagate it as an exception.
+		
+		RaiseExceptionAction action = (RaiseExceptionAction)this.node;
+		Value exception = this.takeTokens(action.exception).getValue(0);
+		
+		Debug.println("[doAction] action = " + action.name + ", exception = " + exception);
+		
+		this.propagateException(exception);
+	}
+
+}