Manage for statement left and right

Author: jecisc

src/FAST-Python-Tools-Tests/FASTPythonLocalResolverTest.class.st

@@ -86,45 +86,39 @@ print(x)'.
 { #category : 'tests' }
 FASTPythonLocalResolverTest >> testVariableAccessedInForIn [
 
-	| assignment1 assignment2 assignedVariable usedVariable |
-	self skip. "Todo"
+	| assignment assignedVariable usedVariable |
 	self parseAndResolve: 'fruits = ["apple", "banana", "cherry"]
 for x in fruits:
-  print(x)'.
+  pass'.
 
-	assignment1 := model module statements first.
-	assignedVariable := assignment1 left.
-	self assert: assignedVariable localDeclaration equals: assignment1.
-	self assert: assignedVariable localDeclaration left name equals: 'x'.
+	assignment := model module statements first.
+	assignedVariable := assignment left.
+	self assert: assignedVariable localDeclaration equals: assignment.
+	self assert: assignedVariable localDeclaration left name equals: 'fruits'.
 	self deny: assignedVariable localDeclaration isNonLocalDeclaration.
 	self assert: assignedVariable localDeclaration localUses size equals: 2.
 
-	assignment2 := model module statements second.
-	assignedVariable := assignment2 left.
-	self assert: assignedVariable localDeclaration equals: assignment1.
-	self assert: assignedVariable equals: assignedVariable localDeclaration localUses first.
-
-	usedVariable := model module statements third.
-	self assert: usedVariable localDeclaration equals: assignment1.
+	usedVariable := model module statements second right.
+	self assert: usedVariable localDeclaration equals: assignment.
 	self assert: usedVariable equals: assignedVariable localDeclaration localUses second
 ]
 
 { #category : 'tests' }
 FASTPythonLocalResolverTest >> testVariableOfFor [
 
 	| for declared usedVariable |
-	self skip. "Todo"
 	self parseAndResolve: 'for x in "banana":
   print(x)'.
 
 	for := model module statements first.
 	declared := for left.
 	self assert: declared localDeclaration equals: for.
-	self assert: declared localDeclaration left name equals: 'x'.
+	self assert: declared localDeclaration left sourceCode equals: 'x'.
 	self deny: declared localDeclaration isNonLocalDeclaration.
-	self assert: declared localDeclaration localUses size equals: 1.
+	self assert: declared localDeclaration localUses size equals: 2.
+	self assert: declared localDeclaration localUses first equals: declared.
 
 	usedVariable := for statements first arguments first.
 	self assert: usedVariable localDeclaration equals: for.
-	self assert: usedVariable equals: declared localDeclaration localUses first
+	self assert: usedVariable equals: declared localDeclaration localUses second
 ]

src/FAST-Python-Tools/FASTPythonLocalResolverVisitor.class.st

@@ -49,14 +49,16 @@ FASTPythonLocalResolverVisitor >> visitFASTPyForStatement: aForStatement [
 
 { #category : 'visiting' }
 FASTPythonLocalResolverVisitor >> visitFASTPyIdentifier: anIdentifier [
-	"I define a variable in a for statement. Thus I need to create a new declaration"
 
-	self halt.
+	| name |
+	name := anIdentifier sourceCode.
+
+	"I define a variable in a for statement. Thus I need to create a new declaration"
 	anIdentifier parentForStatementLeft ifNotNil: [ :forStatement |
-			scoper scopeAdd: anIdentifier sourceCode declaration: forStatement.
+			scoper scopeAdd: name declaration: forStatement.
 			anIdentifier localDeclaration: forStatement ].
 
-	scoper bind: anIdentifier toLocalDeclaration: anIdentifier sourceCode
+	scoper bind: anIdentifier toLocalDeclaration: name
 ]
 
 { #category : 'visiting' }