Skip to content

Commit 157df27

Browse files
committed
Updated for latest code changes
- Also corrected org.modeldriven.alf.eclipse.papyrus.library. integerfunctions.Divide to properly set the type of the return value.
1 parent b0cc4ec commit 157df27

File tree

7 files changed

+118383
-102521
lines changed

7 files changed

+118383
-102521
lines changed

org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/library/integerfunctions/Divide.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors.OpaqueBehaviorExecution;
1010
import org.eclipse.papyrus.moka.fuml.Semantics.CommonBehaviors.BasicBehaviors.ParameterValue;
1111
import org.eclipse.papyrus.moka.fuml.debug.Debug;
12+
import org.eclipse.uml2.uml.PrimitiveType;
1213
import org.modeldriven.alf.eclipse.papyrus.library.LibraryFunctions;
1314

1415
public class Divide extends OpaqueBehaviorExecution {
@@ -23,6 +24,7 @@ public void doBody(List<ParameterValue> inputParameters, List<ParameterValue> ou
2324
} else {
2425
RealValue result = new RealValue();
2526
result.value = ((float)x)/((float)y);
27+
result.type = (PrimitiveType) this.locus.factory.getBuiltInType("Real");
2628
List<Value> outputs = new ArrayList<Value>();
2729
outputs.add(result);
2830
outputParameters.get(0).values = outputs;

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

Lines changed: 18457 additions & 11438 deletions
Large diffs are not rendered by default.

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

Lines changed: 4814 additions & 4017 deletions
Large diffs are not rendered by default.

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

Lines changed: 95110 additions & 87065 deletions
Large diffs are not rendered by default.
6.55 KB
Binary file not shown.
6.55 KB
Binary file not shown.

org.modeldriven.alf/tests-x/Expressions_Sequence_Construction.alf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class Expressions_Sequence_Construction specializes Test {
3939
AssertList("list1.at(2)", list1.at(2).toSequence(), any[]{"strawberry","raspberry"});
4040

4141
AssertList("seq8", seq8, Real[]{1.0, 1.5, 2.0});
42-
AssertTrue("seq8 instanceof Real", seq8->forAll r (r instanceof Real));
4342
AssertEqual("n", n, 1);
4443
AssertTrue("test1", test1);
4544
AssertTrue("test2", test2);

0 commit comments

Comments
 (0)