Skip to content

Commit 5b664b2

Browse files
seidewitzseidewitz
committed
ST6RI-906 Created an interface ExpressionEvaluator.
- Updated ModelLevelExpressionEvaluator to implement the new interface. - Changed "evaluator" parameters to be typed by the new interface.
1 parent 27021d1 commit 5b664b2

49 files changed

Lines changed: 209 additions & 153 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ExistsFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package org.omg.sysml.execution.expressions.functions.control;
2222

2323
import org.eclipse.emf.common.util.EList;
24-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
24+
import org.omg.sysml.expressions.ExpressionEvaluator;
2525
import org.omg.sysml.lang.sysml.Element;
2626
import org.omg.sysml.lang.sysml.InvocationExpression;
2727
import org.omg.sysml.util.EvaluationUtil;
@@ -35,7 +35,7 @@ public String getFunctionName() {
3535

3636
@Override
3737
public EList<Element> invoke(InvocationExpression invocation, Element target,
38-
ModelLevelExpressionEvaluator evaluator) {
38+
ExpressionEvaluator evaluator) {
3939
Boolean result = forAll(invocation, target, evaluator, false);
4040
return result == null? EvaluationUtil.singletonList(invocation): EvaluationUtil.booleanResult(!result);
4141
}

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ForAllFunction.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package org.omg.sysml.execution.expressions.functions.control;
2222

2323
import org.eclipse.emf.common.util.EList;
24-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
24+
import org.omg.sysml.expressions.ExpressionEvaluator;
2525
import org.omg.sysml.expressions.functions.control.ControlFunction;
2626
import org.omg.sysml.lang.sysml.Element;
2727
import org.omg.sysml.lang.sysml.Expression;
@@ -36,7 +36,7 @@ public String getFunctionName() {
3636
}
3737

3838
public Boolean forAll(InvocationExpression invocation, Element target,
39-
ModelLevelExpressionEvaluator evaluator, Boolean test) {
39+
ExpressionEvaluator evaluator, Boolean test) {
4040
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
4141
Element expr = evaluator.argumentValue(invocation, 1, target);
4242
if (list == null || !(expr instanceof Expression)) {
@@ -60,7 +60,7 @@ public Boolean forAll(InvocationExpression invocation, Element target,
6060

6161
@Override
6262
public EList<Element> invoke(InvocationExpression invocation, Element target,
63-
ModelLevelExpressionEvaluator evaluator) {
63+
ExpressionEvaluator evaluator) {
6464
Boolean result = forAll(invocation, target, evaluator, true);
6565
return result == null? EvaluationUtil.singletonList(invocation): EvaluationUtil.booleanResult(result);
6666
}

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MaximizeFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.function.BiFunction;
2424

2525
import org.eclipse.emf.common.util.EList;
26-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
26+
import org.omg.sysml.expressions.ExpressionEvaluator;
2727
import org.omg.sysml.lang.sysml.Element;
2828
import org.omg.sysml.lang.sysml.Expression;
2929
import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -41,7 +41,7 @@ public String getFunctionName() {
4141

4242
@Override
4343
public EList<Element> invoke(InvocationExpression invocation, Element target,
44-
ModelLevelExpressionEvaluator evaluator) {
44+
ExpressionEvaluator evaluator) {
4545
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
4646
Element expr = evaluator.argumentValue(invocation, 1, target);
4747
if (list == null || !(expr instanceof Expression)) {

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/MinimizeFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.function.BiFunction;
2424

2525
import org.eclipse.emf.common.util.EList;
26-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
26+
import org.omg.sysml.expressions.ExpressionEvaluator;
2727
import org.omg.sysml.lang.sysml.Element;
2828
import org.omg.sysml.lang.sysml.Expression;
2929
import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -41,7 +41,7 @@ public String getFunctionName() {
4141

4242
@Override
4343
public EList<Element> invoke(InvocationExpression invocation, Element target,
44-
ModelLevelExpressionEvaluator evaluator) {
44+
ExpressionEvaluator evaluator) {
4545
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
4646
Element expr = evaluator.argumentValue(invocation, 1, target);
4747
if (list == null || !(expr instanceof Expression)) {

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/ReduceFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.function.BiFunction;
2424

2525
import org.eclipse.emf.common.util.EList;
26-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
26+
import org.omg.sysml.expressions.ExpressionEvaluator;
2727
import org.omg.sysml.expressions.functions.control.ControlFunction;
2828
import org.omg.sysml.lang.sysml.Element;
2929
import org.omg.sysml.lang.sysml.Expression;
@@ -55,7 +55,7 @@ protected EList<Element> reduce(InvocationExpression invocation, EList<Element>
5555

5656
@Override
5757
public EList<Element> invoke(InvocationExpression invocation, Element target,
58-
ModelLevelExpressionEvaluator evaluator) {
58+
ExpressionEvaluator evaluator) {
5959
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
6060
Element expr = evaluator.argumentValue(invocation, 1, target);
6161
if (list == null || !(expr instanceof Expression)) {

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/RejectFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.function.BiFunction;
2424

2525
import org.eclipse.emf.common.util.EList;
26-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
26+
import org.omg.sysml.expressions.ExpressionEvaluator;
2727
import org.omg.sysml.expressions.functions.control.ControlFunction;
2828
import org.omg.sysml.lang.sysml.Element;
2929
import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -38,7 +38,7 @@ public String getFunctionName() {
3838

3939
@Override
4040
public EList<Element> invoke(InvocationExpression invocation, Element target,
41-
ModelLevelExpressionEvaluator evaluator) {
41+
ExpressionEvaluator evaluator) {
4242
return collectSelected(invocation, target, evaluator, new BiFunction<>() {
4343
@Override
4444
public EList<Element> apply(Element value, EList<Element> exprValue) {

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/control/SelectOneFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package org.omg.sysml.execution.expressions.functions.control;
2222

2323
import org.eclipse.emf.common.util.EList;
24-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
24+
import org.omg.sysml.expressions.ExpressionEvaluator;
2525
import org.omg.sysml.expressions.functions.control.SelectFunction;
2626
import org.omg.sysml.lang.sysml.Element;
2727
import org.omg.sysml.lang.sysml.InvocationExpression;
@@ -36,7 +36,7 @@ public String getFunctionName() {
3636

3737
@Override
3838
public EList<Element> invoke(InvocationExpression invocation, Element target,
39-
ModelLevelExpressionEvaluator evaluator) {
39+
ExpressionEvaluator evaluator) {
4040
EList<Element> list = super.invoke(invocation, target, evaluator);
4141
return list.isEmpty()? EvaluationUtil.nullList():
4242
EvaluationUtil.singletonList(list.get(0));

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/numerical/ProdFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
package org.omg.sysml.execution.expressions.functions.numerical;
2323

2424
import org.eclipse.emf.common.util.EList;
25-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
25+
import org.omg.sysml.expressions.ExpressionEvaluator;
2626
import org.omg.sysml.lang.sysml.Element;
2727
import org.omg.sysml.lang.sysml.InvocationExpression;
2828
import org.omg.sysml.lang.sysml.LiteralInteger;
@@ -37,7 +37,7 @@ public String getFunctionName() {
3737
}
3838

3939
@Override
40-
public EList<Element> invoke(InvocationExpression invocation, Element target, ModelLevelExpressionEvaluator evaluator) {
40+
public EList<Element> invoke(InvocationExpression invocation, Element target, ExpressionEvaluator evaluator) {
4141
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
4242
if (list == null) {
4343
return EvaluationUtil.singletonList(invocation);

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/numerical/SumFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
package org.omg.sysml.execution.expressions.functions.numerical;
2323

2424
import org.eclipse.emf.common.util.EList;
25-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
25+
import org.omg.sysml.expressions.ExpressionEvaluator;
2626
import org.omg.sysml.lang.sysml.Element;
2727
import org.omg.sysml.lang.sysml.InvocationExpression;
2828
import org.omg.sysml.lang.sysml.LiteralInteger;
@@ -37,7 +37,7 @@ public String getFunctionName() {
3737
}
3838

3939
@Override
40-
public EList<Element> invoke(InvocationExpression invocation, Element target, ModelLevelExpressionEvaluator evaluator) {
40+
public EList<Element> invoke(InvocationExpression invocation, Element target, ExpressionEvaluator evaluator) {
4141
EList<Element> list = evaluator.evaluateArgument(invocation, 0, target);
4242
if (list == null) {
4343
return EvaluationUtil.singletonList(invocation);

‎org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/functions/sequence/ExcludesFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package org.omg.sysml.execution.expressions.functions.sequence;
2222

2323
import org.eclipse.emf.common.util.EList;
24-
import org.omg.sysml.expressions.ModelLevelExpressionEvaluator;
24+
import org.omg.sysml.expressions.ExpressionEvaluator;
2525
import org.omg.sysml.lang.sysml.Element;
2626
import org.omg.sysml.lang.sysml.InvocationExpression;
2727
import org.omg.sysml.util.EvaluationUtil;
@@ -34,7 +34,7 @@ public String getFunctionName() {
3434
}
3535

3636
@Override
37-
public EList<Element> invoke(InvocationExpression invocation, Element target, ModelLevelExpressionEvaluator evaluator) {
37+
public EList<Element> invoke(InvocationExpression invocation, Element target, ExpressionEvaluator evaluator) {
3838
EList<Element> list1 = evaluator.evaluateArgument(invocation, 0, target);
3939
EList<Element> list2 = evaluator.evaluateArgument(invocation, 1, target);
4040
return list1 == null || list2 == null? EvaluationUtil.singletonList(invocation):

0 commit comments

Comments
 (0)