Improve type resolution of iterator parameter inside for loop

epsilonlabs · May 30, 2024 · 96701fb · 96701fb
1 parent 50a28a8
commit 96701fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...ilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/.gitignore b/...ilon.eol.staticanalyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/.gitignore
@@ -0,0 +1,2 @@
+*.eol
+*.model
diff --git a/...alyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/EolStaticAnalyserTests.java b/...alyser.tests/src/org/eclipse/epsilon/eol/staticanalyser/tests/EolStaticAnalyserTests.java
@@ -262,8 +262,8 @@ public void testBuiltinMethods() throws Exception {
 	public void testMultiplePossibleTypes() throws Exception {
 		StringBuffer st = new StringBuffer();
 		st.append("model M driver EMF {nsuri='sa'};");
-		st.append("for (a in B.all) {\n"
-				+ "    var v1 = a.foo();\n" //why no resolved type for this assignment statement?
+		st.append("for (a in A.all) {\n"
+				+ "    var v1 = a.foo();\n"
 				+ "    var v2 = v1.foo();\n"
 				+ "}\n"
 				+ "operation B foo() : B {return self;}\n"
@@ -276,7 +276,7 @@ public void testTypeResolutionWithAll() throws Exception {
 		StringBuffer st = new StringBuffer();
 		st.append("model M driver EMF {nsuri='sa'};");
 		st.append("for (a in B.all) {\n"
-				+ "    /*B*/var v = a;\n" //why no resolved type for this assignment statement?
+				+ "    var v = (/*B*/a);\n"
 				+ "}\n");
 		assertValid(st.toString());
 	}

diff --git a/...ilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java b/...ilon.eol.staticanalyser/src/org/eclipse/epsilon/eol/staticanalyser/EolStaticAnalyser.java
@@ -404,7 +404,15 @@ public void visit(ForStatement forStatement) {
 		context.getFrameStack().enterLocal(FrameType.UNPROTECTED, forStatement.getBodyStatementBlock(),
 				new Variable("loopCount", EolPrimitiveType.Integer), new Variable("hasMore", EolPrimitiveType.Boolean));
 
-		forStatement.getIteratorParameter().accept(this);
+		Parameter iteratorParameter = forStatement.getIteratorParameter();
+		iteratorParameter.accept(this);
+		if (getType(iteratorParameter) == EolAnyType.Instance) {
+			EolType iteratorType = getResolvedType(forStatement.getIteratedExpression());
+			if (iteratorType instanceof EolCollectionType) {
+				context.getFrameStack().get(iteratorParameter.getName())
+						.setType(((EolCollectionType) iteratorType).getContentType());
+			}
+		}
 		forStatement.getBodyStatementBlock().accept(this);
 		context.getFrameStack().leaveLocal(forStatement.getBodyStatementBlock());