diff options
| author | Ed Willink | 2016-05-05 11:04:06 +0000 |
|---|---|---|
| committer | Ed Willink | 2016-05-05 13:32:18 +0000 |
| commit | 7789cddc7721e1fb4ab6b0e90126ab999211b7ce (patch) | |
| tree | 2f0e622b1f4c1798ffc6c6ef5abc861caf369c7b | |
| parent | 53e9225359a0707b5a64e17a87738144c8f368a4 (diff) | |
| download | org.eclipse.qvtd-7789cddc7721e1fb4ab6b0e90126ab999211b7ce.tar.gz org.eclipse.qvtd-7789cddc7721e1fb4ab6b0e90126ab999211b7ce.tar.xz org.eclipse.qvtd-7789cddc7721e1fb4ab6b0e90126ab999211b7ce.zip | |
[486722] No opposite caches for anonymous container navigation
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiGlobalContext.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiGlobalContext.java index 1afc5956b..c5649c8df 100644 --- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiGlobalContext.java +++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/QVTiGlobalContext.java @@ -39,7 +39,7 @@ public class QVTiGlobalContext extends JavaGlobalContext<QVTiCodeGenerator> } public @NonNull String addOppositeProperty(@NonNull Property pivotProperty) { - assert !pivotProperty.isIsImplicit(); + assert !pivotProperty.isIsImplicit() && !pivotProperty.isIsComposite(); if (oppositeProperty2oppositeCacheName == null) { oppositeProperty2oppositeCacheName = new HashMap<@NonNull Property, @NonNull String>(); } diff --git a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiTransformationAnalysis.java b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiTransformationAnalysis.java index d19c26216..28686bedd 100644 --- a/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiTransformationAnalysis.java +++ b/plugins/org.eclipse.qvtd.pivot.qvtimperative/src/org/eclipse/qvtd/pivot/qvtimperative/evaluation/QVTiTransformationAnalysis.java @@ -331,7 +331,7 @@ public class QVTiTransformationAnalysis else if (eObject instanceof OppositePropertyCallExp) { OppositePropertyCallExp oppositePropertyCallExp = (OppositePropertyCallExp)eObject; Property navigableProperty = oppositePropertyCallExp.getReferredProperty(); - if (navigableProperty != null) { + if ((navigableProperty != null) && !navigableProperty.isIsComposite()) { int cacheIndex = allocateCacheIndex(oppositePropertyCallExp.getOwnedSource(), navigableProperty); oppositePropertyCallExp2cacheIndex.put(oppositePropertyCallExp, cacheIndex); } |