Add support for shadowing information in the LocalResolver

Author: jecisc

src/FAST-Python-Model/FASTPyEntity.class.st

@@ -195,6 +195,58 @@ FASTPyEntity >> isVariableWriteAccess [
 	^ self variableDeclarator isNotNil
 ]
 
+{ #category : 'accessing' }
+FASTPyEntity >> shadowedBy [
+
+	<FMProperty: #shadowedBy type: #FASTPyEntity opposite: #shadowing>
+	<FMComment:
+	'Return the entity shadowing me, if it exists. Else, return nil. An entity is shadowed went a named entity of a different kind is defined after me with the same name. Be careful, this works only if the local resolution was done and it works only on the local declaration.'>
+	^ self attributeAt: #shadowedBy ifAbsent: [ nil ]
+]
+
+{ #category : 'accessing' }
+FASTPyEntity >> shadowedBy: aFASTEntity [
+
+	| otherSide |
+	otherSide := self shadowedBy.
+
+	otherSide == aFASTEntity ifTrue: [ ^ aFASTEntity ].
+
+	aFASTEntity
+		ifNil: [
+				self attributeAt: #shadowedBy put: aFASTEntity.
+				otherSide shadowing: nil ]
+		ifNotNil: [
+				self attributeAt: #shadowedBy put: aFASTEntity.
+				aFASTEntity shadowing: self ]
+]
+
+{ #category : 'accessing' }
+FASTPyEntity >> shadowing [
+
+	<FMProperty: #shadowing type: #FASTPyEntity opposite: #shadowedBy>
+	<FMComment:
+	'Return the entity I possibly shadow. Else, return nil. An entity is shadowed went a named entity of a different kind is defined after me with the same name. Be careful, this works only if the local resolution was done and it works only on the local declaration.'>
+	^ self attributeAt: #shadowing ifAbsent: [ nil ]
+]
+
+{ #category : 'accessing' }
+FASTPyEntity >> shadowing: aFASTEntity [
+
+	| otherSide |
+	otherSide := self shadowing.
+
+	otherSide == aFASTEntity ifTrue: [ ^ aFASTEntity ].
+
+	aFASTEntity
+		ifNil: [
+				self attributeAt: #shadowing put: aFASTEntity.
+				otherSide shadowedBy: nil ]
+		ifNotNil: [
+				self attributeAt: #shadowing put: aFASTEntity.
+				aFASTEntity shadowedBy: self ]
+]
+
 { #category : 'accessing' }
 FASTPyEntity >> variableDeclarator [
 	"In case I am a write access to a variable, I return the node categorized as my declaration. Else I return nil.

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

@@ -582,7 +582,10 @@ print(x.y)'.
 
 	usedImportedEntity := model module statements fourth arguments first.
 	self assert: usedImportedEntity localDeclaration equals: import.
-	self assert: usedImportedEntity equals: importedEntity localDeclaration localUses second
+	self assert: usedImportedEntity equals: importedEntity localDeclaration localUses second.
+
+	self assert: assignedVariable localDeclaration shadowedBy equals: import.
+	self assert: importedEntity localDeclaration shadowing equals: assignedVariable
 ]
 
 { #category : 'tests - shadowing' }
@@ -651,7 +654,10 @@ print(x)'.
 
 	usedFunction := model module statements fourth arguments first.
 	self assert: usedFunction localDeclaration equals: function.
-	self assert: usedFunction equals: function localDeclaration localUses second
+	self assert: usedFunction equals: function localDeclaration localUses second.
+
+	self assert: assignedVariable localDeclaration shadowedBy equals: function.
+	self assert: function localDeclaration shadowing equals: assignedVariable
 ]
 
 { #category : 'tests - shadowing' }
@@ -690,7 +696,10 @@ print(x)'.
 
 	usedImportedEntity := model module statements fourth arguments first.
 	self assert: usedImportedEntity localDeclaration equals: import.
-	self assert: usedImportedEntity equals: importedEntity localDeclaration localUses second
+	self assert: usedImportedEntity equals: importedEntity localDeclaration localUses second.
+	
+	self assert: assignedVariable localDeclaration shadowedBy equals: import.
+	self assert: importedEntity localDeclaration shadowing equals: assignedVariable
 ]
 
 { #category : 'tests - shadowing' }

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

@@ -68,7 +68,10 @@ FASTPythonLocalResolverVisitor >> ensureDeclarationOf: aName declaration: aFASTN
 		  ifPresent: [ :declaration |
 				  declaration localResolverKind = aFASTNode localResolverKind
 					  ifTrue: [ ^ declaration ]
-					  ifFalse: [ "If the kind is different, we save a new declaration."
+					  ifFalse: [
+							  declaration shadowedBy: aFASTNode.
+
+							  "If the kind is different, we save a new declaration."
 							  aFASTNode ensureLocalUses.
 							  scope at: aName put: aFASTNode ] ]
 		  ifAbsentPut: [