Start to manage local variables

Author: jecisc

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

@@ -37,6 +37,96 @@ x'.
 	self assert: usedVariable equals: assignedVariable localDeclaration localUses second
 ]
 
+{ #category : 'tests' }
+FASTPythonLocalResolverTest >> testGlobalAndTemporaryOfTheSameNameInFunction [
+
+	| globalAssignment assignedGlobal usedGlobal temporaryAssignment assignedTemporary temporaryUsage1 temporaryUsage2 |
+	self parseAndResolve: 'glob = 1
+
+def fun():
+    glob = 3
+    print(glob)
+    return glob
+
+fun()
+print(glob)'.
+
+	globalAssignment := model module statements first.
+	assignedGlobal := globalAssignment left.
+	self assert: assignedGlobal localDeclaration equals: globalAssignment.
+	self assert: assignedGlobal localDeclaration left name equals: 'glob'.
+	self deny: assignedGlobal localDeclaration isNonLocalDeclaration.
+	self assert: assignedGlobal localDeclaration localUses size equals: 2.
+	self assert: assignedGlobal localDeclaration localUses first equals: assignedGlobal.
+
+	usedGlobal := model module statements fourth arguments first.
+	self assert: usedGlobal localDeclaration equals: globalAssignment.
+	self assert: usedGlobal equals: assignedGlobal localDeclaration localUses second.
+
+	temporaryAssignment := model module statements second statements first.
+	assignedTemporary := temporaryAssignment left.
+	self assert: assignedTemporary localDeclaration equals: temporaryAssignment.
+	self assert: assignedTemporary localDeclaration left name equals: 'glob'.
+	self deny: assignedTemporary localDeclaration isNonLocalDeclaration.
+	self assert: assignedTemporary localDeclaration localUses size equals: 3.
+	self assert: assignedTemporary localDeclaration localUses first equals: assignedTemporary.
+
+	temporaryUsage1 := model module statements second statements second arguments first.
+	self assert: temporaryUsage1 localDeclaration equals: temporaryAssignment.
+	self assert: temporaryUsage1 equals: assignedTemporary localDeclaration localUses second.
+
+	temporaryUsage2 := model module statements second statements third expression.
+	self assert: temporaryUsage2 localDeclaration equals: temporaryAssignment.
+	self assert: temporaryUsage2 equals: assignedTemporary localDeclaration localUses third
+]
+
+{ #category : 'tests' }
+FASTPythonLocalResolverTest >> testGlobalUsedInFunction [
+
+	| assignment assignedVariable usedVariable |
+	self parseAndResolve: 'glob = 1
+
+def fun():
+    return glob
+
+print(fun())'.
+
+	assignment := model module statements first.
+	assignedVariable := assignment left.
+	self assert: assignedVariable localDeclaration equals: assignment.
+	self assert: assignedVariable localDeclaration left name equals: 'glob'.
+	self deny: assignedVariable localDeclaration isNonLocalDeclaration.
+	self assert: assignedVariable localDeclaration localUses size equals: 2.
+	self assert: assignedVariable localDeclaration localUses first equals: assignedVariable.
+
+	usedVariable := model module statements second statements first expression.
+	self assert: usedVariable localDeclaration equals: assignment.
+	self assert: usedVariable equals: assignedVariable localDeclaration localUses second
+]
+
+{ #category : 'tests' }
+FASTPythonLocalResolverTest >> testLocalVariableInFunction [
+
+	| assignment assignedVariable usedVariable |
+	self parseAndResolve: 'def f():
+	x = 1
+	return x
+	
+print(f())'.
+
+	assignment := model module statements first statements first.
+	assignedVariable := assignment left.
+	self assert: assignedVariable localDeclaration equals: assignment.
+	self assert: assignedVariable localDeclaration left name equals: 'x'.
+	self deny: assignedVariable localDeclaration isNonLocalDeclaration.
+	self assert: assignedVariable localDeclaration localUses size equals: 2.
+	self assert: assignedVariable localDeclaration localUses first equals: assignedVariable.
+
+	usedVariable := model module statements first statements second expression.
+	self assert: usedVariable localDeclaration equals: assignment.
+	self assert: usedVariable equals: assignedVariable localDeclaration localUses second
+]
+
 { #category : 'tests' }
 FASTPythonLocalResolverTest >> testTwoAssignationsCreateOneDeclaration [
 

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

@@ -63,8 +63,8 @@ FASTPythonLocalResolverVisitor >> visitFASTPyIdentifier: anIdentifier [
 
 { #category : 'visiting' }
 FASTPythonLocalResolverVisitor >> visitFASTPyVariable: aVariable [
-
 	"We are declaring a variable in an assignation"
+
 	aVariable parentAssignmentLeft ifNotNil: [ :assignment |
 			[
 				scoper scopeAdd: aVariable name declaration: assignment.
@@ -74,3 +74,13 @@ FASTPythonLocalResolverVisitor >> visitFASTPyVariable: aVariable [
 
 	super visitFASTPyVariable: aVariable
 ]
+
+{ #category : 'visiting' }
+FASTPythonLocalResolverVisitor >> visitFASTTStatementBlock: aFASTJavaStatementBlock [
+
+	scoper pushScope.
+
+	super visitFASTTStatementBlock: aFASTJavaStatementBlock.
+
+	^ scoper popScope
+]