Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorEd Willink2016-02-27 10:27:37 +0000
committerEd Willink2016-02-27 15:42:03 +0000
commitcd0d2346925b03310ab5aa2e6e97c7185bd82ad8 (patch)
tree72209b9b13c0eec0e8f66bceae6d7f2186e31eeb /releng
parent9f842084465cc8964811f7bf39b14a8018047ede (diff)
downloadorg.eclipse.qvtd-cd0d2346925b03310ab5aa2e6e97c7185bd82ad8.tar.gz
org.eclipse.qvtd-cd0d2346925b03310ab5aa2e6e97c7185bd82ad8.tar.xz
org.eclipse.qvtd-cd0d2346925b03310ab5aa2e6e97c7185bd82ad8.zip
[481704] Eliminate CGPredicate, CGVariablePredicate
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java2
-rw-r--r--releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java7
2 files changed, 0 insertions, 9 deletions
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java
index 51ba22090..c48be6bba 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGTypedElementModelSpec.java
@@ -17,7 +17,6 @@ import org.eclipse.ocl.examples.build.modelspecs.CGTypedElementModelSpec;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.qvtd.codegen.qvticgmodel.CGMapping;
import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingExp;
-import org.eclipse.qvtd.codegen.qvticgmodel.CGPredicate;
/**
* QVTdCGTypedElementModelSpec supports generation of the CGTypedElement.getASTypeId() method hierarchy.
@@ -35,7 +34,6 @@ public class QVTdCGTypedElementModelSpec extends CGTypedElementModelSpec
public Register() {
new QVTdCGTypedElementModelSpec(CGMapping.class, ATI_BOOL);
new QVTdCGTypedElementModelSpec(CGMappingExp.class, ATI_BOOL);
- new QVTdCGTypedElementModelSpec(CGPredicate.class, ATI_BOOL);
}
}
diff --git a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java
index 3937b5193..6f4667b1a 100644
--- a/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java
+++ b/releng/org.eclipse.qvtd.build/src/org/eclipse/qvtd/build/modelspecs/QVTdCGValuedElementModelSpec.java
@@ -17,7 +17,6 @@ import org.eclipse.ocl.examples.build.modelspecs.CGValuedElementModelSpec;
import org.eclipse.ocl.examples.codegen.cgmodel.CGInvalid;
import org.eclipse.ocl.examples.codegen.java.ImportUtils;
import org.eclipse.qvtd.codegen.qvti.cse.MappingExpPlaces;
-import org.eclipse.qvtd.codegen.qvti.cse.PredicatePlaces;
import org.eclipse.qvtd.codegen.qvticgmodel.CGEcoreRealizedVariable;
import org.eclipse.qvtd.codegen.qvticgmodel.CGFunction;
import org.eclipse.qvtd.codegen.qvticgmodel.CGFunctionCallExp;
@@ -31,7 +30,6 @@ import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingCallBinding;
import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingExp;
import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingLoop;
import org.eclipse.qvtd.codegen.qvticgmodel.CGMiddlePropertyCallExp;
-import org.eclipse.qvtd.codegen.qvticgmodel.CGPredicate;
import org.eclipse.qvtd.codegen.qvticgmodel.CGPropertyAssignment;
import org.eclipse.qvtd.codegen.qvticgmodel.CGRealizedVariable;
import org.eclipse.qvtd.codegen.qvticgmodel.CGSequence;
@@ -49,10 +47,6 @@ public class QVTdCGValuedElementModelSpec extends CGValuedElementModelSpec
return "return " + classRef(MappingExpPlaces.class) + ".createMappingExpPlaces(element2place, this);";
}};
- public static final @NonNull Ctl CTL_PRED = new Ctl() { public @NonNull String generate(@NonNull CGValuedElementModelSpec cgModelSpec, @NonNull GenModel genModel) {
- return "return " + classRef(PredicatePlaces.class) + ".createPredicatePlaces(element2place, this);";
- }};
-
public static final @NonNull Inv INV_PRED = new Inv() {
@Override public @Nullable String generateGetInvalidValue(@NonNull CGValuedElementModelSpec cgModelSpec, @NonNull GenModel genModel) {
return classRef(CGInvalid.class) + " invalidValue = (conditionExpression != null) ? conditionExpression.getInvalidValue() : null;\n" +
@@ -101,7 +95,6 @@ public class QVTdCGValuedElementModelSpec extends CGValuedElementModelSpec
new QVTdCGValuedElementModelSpec(CGConnectionAssignment.class, "initValue", Box.DELEG, null , null , null , null , Glo.FALSE, null , null , null , null , null , null , null , null , Com.FALSE, null , Eq.UNSUP);
new QVTdCGValuedElementModelSpec(CGMappingCallBinding.class, "value", Box.DELEG, null , null , null , null , Glo.FALSE, null , null , null , null , null , null , null , null , Com.FALSE, null , Eq.SELF );
new QVTdCGValuedElementModelSpec(CGMiddlePropertyCallExp.class, null, Box.UNBOX, null , null , null , null , Glo.FALSE, null , null , null , null , null , null , null , null , null , null , null );
- new QVTdCGValuedElementModelSpec(CGPredicate.class, "conditionExpression", Box.ALL , null , LOG_PRED , Nul.NEVER, INV_PRED , Glo.FALSE, null , null , null , null , null , null , null , CTL_PRED , null , null , Eq.SELF );
new QVTdCGValuedElementModelSpec(CGPropertyAssignment.class, "initValue", Box.DELEG, null , null , null , null , Glo.FALSE, null , null , null , null , null , null , null , null , null , null , EQ_EQUIV);
new QVTdCGValuedElementModelSpec(CGFunction.class, null, Box.BOX , null , null , null , null , null , null , null , null , null , null , null , null , null , null , null , null );

Back to the top