Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2019-12-02 11:13:22 +0000
committerEd Willink2019-12-02 11:13:22 +0000
commit07d8799f2d939fa08a797b5983dd5940bdc3d8d5 (patch)
tree966d9c9a921c1d4f748e242503e1a582097071c6
parentd29afadfff0e43c789674bc0d064339ca5aab0ed (diff)
downloadorg.eclipse.qvtd-07d8799f2d939fa08a797b5983dd5940bdc3d8d5.tar.gz
org.eclipse.qvtd-07d8799f2d939fa08a797b5983dd5940bdc3d8d5.tar.xz
org.eclipse.qvtd-07d8799f2d939fa08a797b5983dd5940bdc3d8d5.zip
2
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
index e285bdb15..46b757804 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java
@@ -1528,7 +1528,7 @@ public class RelationAnalysis extends RuleAnalysis
if (synthesizeEqualsPredicate(predicateExpression)) {
return;
}
- Node resultNode = predicateExpression.accept(rootExpressionSynthesizer); //.getConditionalExpressionSynthesizer()); // See Bug 547263
+ Node resultNode = predicateExpression.accept(rootExpressionSynthesizer.getExpressionSynthesizer(InitUtility.NON_NULL_MATCHED)); //.getConditionalExpressionSynthesizer()); // See Bug 547263
/* if (resultNode != null) {
ClassDatum classDatum = QVTscheduleUtil.getClassDatum(resultNode);
if (!resultNode.isRequired() || (classDatum != scheduleManager.getBooleanClassDatum())) {
@@ -1541,16 +1541,16 @@ public class RelationAnalysis extends RuleAnalysis
// ClassDatum classDatum = QVTscheduleUtil.getClassDatum(resultNode);
// if (!resultNode.isRequired() || (classDatum != scheduleManager.getBooleanClassDatum())) {
if (!resultNode.isRequired()) {
- Node trueNode = createBooleanLiteralNode(InitUtility.NON_NULL_MATCHED, true);
- createPredicateEdge(InitUtility.NON_NULL_MATCHED, resultNode, null, trueNode);
+ Node trueNode = createBooleanLiteralNode(resultNode.getInitUtility(), true);
+ createPredicateEdge(resultNode.getInitUtility(), resultNode, null, trueNode);
}
// else if (classDatum != scheduleManager.getBooleanClassDatum()) {
// Node trueNode = createBooleanLiteralNode(true);
// createPredicateEdge(resultNode, null, trueNode);
// }
else if (!(resultNode instanceof BooleanLiteralNode)) {
- Node trueNode = createBooleanLiteralNode(InitUtility.NON_NULL_MATCHED, true);
- createPredicateEdge(InitUtility.NON_NULL_MATCHED, resultNode, null, trueNode);
+ Node trueNode = createBooleanLiteralNode(resultNode.getInitUtility(), true);
+ createPredicateEdge(resultNode.getInitUtility(), resultNode, null, trueNode);
}
}
}

Back to the top