wip

1 files changed, 4 insertions, 17 deletions

diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvticgmodel/utilities/QVTiCGModelFieldingAnalysisVisitor.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvticgmodel/utilities/QVTiCGModelFieldingAnalysisVisitor.java
index 853a5ed95..e85cbff46 100644
--- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvticgmodel/utilities/QVTiCGModelFieldingAnalysisVisitor.java
+++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvticgmodel/utilities/QVTiCGModelFieldingAnalysisVisitor.java
@@ -1,16 +1,13 @@
 package org.eclipse.qvtd.codegen.qvticgmodel.utilities;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.examples.codegen.analyzer.FieldingAnalysisVisitor;
 import org.eclipse.ocl.examples.codegen.analyzer.FieldingAnalyzer;
 import org.eclipse.ocl.examples.codegen.analyzer.FieldingAnalyzer.ReturnState;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGAccumulator;
-import org.eclipse.ocl.examples.codegen.cgmodel.CGIterationCallExp;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGIterator;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGValuedElement;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGVariable;
 import org.eclipse.ocl.examples.codegen.utilities.CGUtil;
-import org.eclipse.ocl.pivot.Iteration;
 import org.eclipse.ocl.pivot.VariableDeclaration;
 import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingCall;
 import org.eclipse.qvtd.codegen.qvticgmodel.CGMappingLoop;
@@ -78,21 +75,11 @@ public class QVTiCGModelFieldingAnalysisVisitor extends AbstractQVTiCGModelField
 		for (CGIterator cgCoIterator : CGUtil.getCoIterators(cgMappingLoop)) {
 			mustBeThrownVisitor.visit(cgCoIterator);
 		}
-		doIterationCallBody(cgMappingLoop);
-		// Although individual body evaluations may be caught and accumulated, the accumulated result is thrown.
+		CGValuedElement cgBody = CGUtil.getBody(cgMappingLoop);
+		mustBeThrownVisitor.visit(cgBody);
+		// Although individual body evaluations are executed concurrently, the preamble is thrown.
 		cgMappingLoop.setCaught(false);
-		return /*returnState == ReturnState.IS_VALID ? ReturnState.IS_VALID :*/ ReturnState.IS_THROWN;
-	}
-	private @NonNull ReturnState doIterationCallBody(@NonNull CGIterationCallExp cgIterationCallExp) {
-		Iteration asIteration = cgIterationCallExp.getAsIteration();
-		FieldingAnalysisVisitor bodyAnalysisVisitor = getMustBeThrownVisitor();
-		CGValuedElement cgBody = CGUtil.getBody(cgIterationCallExp);
-		boolean isValid = cgBody.isNonInvalid();
-		ReturnState returnState = bodyAnalysisVisitor.visit(cgBody);
-		//	assert isValid || returnState.isSuitableFor(asIteration.isIsValidating() ? ReturnState.IS_CAUGHT : ReturnState.IS_THROWN);
-		//	return returnState;
-		// Body is executed concurrently. It's valid wrt caller.
-		return ReturnState.IS_VALID;
+		return ReturnState.IS_THROWN;
 	}
 
 	/*		@Override