Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2019-12-01 14:33:52 +0000
committerEd Willink2019-12-01 14:33:52 +0000
commitc7aa44f7e70a5ad61c248fd69888320ddba03f62 (patch)
tree1c62d38e28ea637a596432774927712e77235339
parentc2db9149c7557d66b2cbb551c27b6cd5ae8f72b7 (diff)
downloadorg.eclipse.qvtd-c7aa44f7e70a5ad61c248fd69888320ddba03f62.tar.gz
org.eclipse.qvtd-c7aa44f7e70a5ad61c248fd69888320ddba03f62.tar.xz
org.eclipse.qvtd-c7aa44f7e70a5ad61c248fd69888320ddba03f62.zip
ok 3
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvts/RelationAnalysis.java6
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java3
-rw-r--r--plugins/org.eclipse.qvtd.pivot.qvtschedule/src/org/eclipse/qvtd/pivot/qvtschedule/utilities/QVTscheduleUtil.java4
3 files changed, 8 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 105862b65..0507e9210 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
@@ -1269,7 +1269,7 @@ public class RelationAnalysis extends RuleAnalysis
if (memberNode != null) {
Node selfNode = residueNode;
assert selfNode != null;
- residueNode = createOperationCallNode(isUnconditional(member), InitUtility.NON_NULL_MATCHED, null, collectionExcludingOperation, collectionTemplateExp, residueNode, memberNode);
+ residueNode = createOperationCallNode(true, InitUtility.NON_NULL_MATCHED, null, collectionExcludingOperation, collectionTemplateExp, residueNode, memberNode);
createOperationSelfEdge(selfNode.getInitUtility(), selfNode, QVTrelationUtil.getType(collectionExcludingOperation), residueNode);
createOperationParameterEdge(memberNode.getInitUtility(), memberNode, QVTrelationUtil.getOwnedParameter(collectionExcludingOperation, 0), -1, residueNode);
}
@@ -1284,7 +1284,7 @@ public class RelationAnalysis extends RuleAnalysis
if (memberNode != null) {
Node selfNode = residueNode;
assert selfNode != null;
- residueNode = createOperationCallNode(isUnconditional(rest), InitUtility.NON_NULL_MATCHED, null, collectionExcludingOperation, collectionTemplateExp, residueNode, memberNode);
+ residueNode = createOperationCallNode(true, InitUtility.NON_NULL_MATCHED, null, collectionExcludingOperation, collectionTemplateExp, residueNode, memberNode);
createOperationSelfEdge(selfNode.getInitUtility(), selfNode, QVTrelationUtil.getType(collectionExcludingOperation), residueNode);
createOperationParameterEdge(memberNode.getInitUtility(), memberNode, QVTrelationUtil.getOwnedParameter(collectionExcludingOperation, 0), -1, residueNode);
}
@@ -1294,7 +1294,7 @@ public class RelationAnalysis extends RuleAnalysis
}
if (rest == null) {
Operation collectionIsEmptyOperation = scheduleManager.getStandardLibraryHelper().getCollectionIsEmptyOperation();
- Node isEmptyNode = createOperationCallNode(isUnconditional(collectionTemplateExp), InitUtility.NON_NULL_MATCHED, null, collectionIsEmptyOperation, collectionTemplateExp, residueNode);
+ Node isEmptyNode = createOperationCallNode(true, InitUtility.NON_NULL_MATCHED, null, collectionIsEmptyOperation, collectionTemplateExp, residueNode);
createPredicatedStepNode(InitUtility.NOT_KNOWN, isEmptyNode, false);
}
}
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
index b28b469dc..55464617e 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/emf-gen/org/eclipse/qvtd/pivot/qvtschedule/impl/NodeImpl.java
@@ -918,6 +918,9 @@ public abstract class NodeImpl extends ElementImpl implements Node {
@Override
public void initialize(@NonNull Role nodeRole, @NonNull Region region, @NonNull InitUtility initUtility, /*@NonNull*/ String name, /*@NonNull*/ ClassDatum classDatum) {
assert name != null;
+ if ("column".equals(name)) {
+ getClass();
+ }
assert classDatum != null;
setNodeRole(nodeRole);
setOwningRegion(region);
diff --git a/plugins/org.eclipse.qvtd.pivot.qvtschedule/src/org/eclipse/qvtd/pivot/qvtschedule/utilities/QVTscheduleUtil.java b/plugins/org.eclipse.qvtd.pivot.qvtschedule/src/org/eclipse/qvtd/pivot/qvtschedule/utilities/QVTscheduleUtil.java
index 865366bbe..56a10e1cf 100644
--- a/plugins/org.eclipse.qvtd.pivot.qvtschedule/src/org/eclipse/qvtd/pivot/qvtschedule/utilities/QVTscheduleUtil.java
+++ b/plugins/org.eclipse.qvtd.pivot.qvtschedule/src/org/eclipse/qvtd/pivot/qvtschedule/utilities/QVTscheduleUtil.java
@@ -752,7 +752,7 @@ public class QVTscheduleUtil extends QVTscheduleConstants
else if (!typedElement.isIsRequired()) {
return false;
}
- return isUnconditional(typedElement);
+ return true; //isUnconditional(typedElement);
}
throw new UnsupportedOperationException();
}
@@ -772,7 +772,7 @@ public class QVTscheduleUtil extends QVTscheduleConstants
return "«includes»".equals(edge.getName()) || "«includesAll»".equals(edge.getName());
} */
- public static boolean isUnconditional(@NonNull TypedElement typedElement) {
+ private static boolean isUnconditional(@NonNull TypedElement typedElement) {
EObject eContainer = typedElement.eContainer();
if (eContainer instanceof IfExp) {
IfExp ifExp = (IfExp)eContainer;

Back to the top