Clean management of FieldAccessExpressionNode

moosetechnology · Dec 11, 2024 · f04f996 · f04f996
1 parent cf70289
commit f04f996
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 17 deletions.
diff --git a/src/Famix-Python-Importer/FamixPythonImportPathNode.class.st b/src/Famix-Python-Importer/FamixPythonImportPathNode.class.st
@@ -0,0 +1,16 @@
+"
+I reperesent a specialization of `PyFieldAccessExpressionNode`. I represent a path in an import.
+"
+Class {
+	#name : 'FamixPythonImportPathNode',
+	#superclass : 'PyFieldAccessExpressionNode',
+	#category : 'Famix-Python-Importer-Nodes',
+	#package : 'Famix-Python-Importer',
+	#tag : 'Nodes'
+}
+
+{ #category : 'generated' }
+FamixPythonImportPathNode >> acceptVisitor: aRootVisitor [
+
+	^ aRootVisitor visitImportPath: self
+]
diff --git a/src/Famix-Python-Importer/FamixPythonImporter.class.st b/src/Famix-Python-Importer/FamixPythonImporter.class.st
@@ -69,7 +69,7 @@ FamixPythonImporter >> importFileReference: aFileReference [
 			files first isPythonPackageDeclaration ifTrue: [ visitor popScope ] ].
 		^ self ].
 
-	(self isPythonExtension: aFileReference extension) ifFalse: [ ^ self ].
+	aFileReference extension = 'py' ifFalse: [ ^ self ].
 
 	self importPythonFile: aFileReference
 ]
@@ -82,12 +82,6 @@ FamixPythonImporter >> importPythonFile: aFileReference [
 	(PythonParser parseFileWithErrors: aFileReference) acceptVisitor: visitor
 ]
 
-{ #category : 'testing' }
-FamixPythonImporter >> isPythonExtension: aString [
-
-	^aString = 'py'
-]
-
 { #category : 'accessing' }
 FamixPythonImporter >> visitor [
 

diff --git a/src/Famix-Python-Importer/FamixPythonImporterVisitor.class.st b/src/Famix-Python-Importer/FamixPythonImporterVisitor.class.st
@@ -788,6 +788,12 @@ FamixPythonImporterVisitor >> visitFunctionDefinition: aFunctionDefinition [
 	^ self useCurrentEntity: fmx during: [ super visitFunctionDefinition: aFunctionDefinition ]
 ]
 
+{ #category : 'generated' }
+FamixPythonImporterVisitor >> visitImportPath: anImportPath [
+
+	^ anImportPath source
+]
+
 { #category : 'visiting' }
 FamixPythonImporterVisitor >> visitImportStatement: anImport [
 
@@ -920,9 +926,9 @@ FamixPythonImporterVisitor >> visitVariableExpression: aVariableExpression [
 				 notFoundReplacementEntity: [ :unresolved :currentEntity | "1 halt." self ensureStubUnknownAccessedOrReferencedEntityNamed: unresolved identifier ];
 				 yourself)
 		foundAction: [ :entity :currentEntity |
-			self flag: #todo. "The ifNotNil should be removed later."
-			(entity createAccessOrReferenceFrom: currentEntity node: aVariableExpression) ifNotNil: [ :association |
-				self setSourceAnchor: association from: aVariableExpression ] ].
+			| association |
+			association := entity createAccessOrReferenceFrom: currentEntity node: aVariableExpression.
+			self setSourceAnchor: association from: aVariableExpression ].
 
 	^ aVariableExpression name
 ]
diff --git a/src/Famix-Python-Importer/FamixPythonSmaCCASTSpecializer.class.st b/src/Famix-Python-Importer/FamixPythonSmaCCASTSpecializer.class.st
@@ -13,7 +13,9 @@ Class {
 FamixPythonSmaCCASTSpecializer >> visitFieldAccessExpression: aFieldAccessExpression [
 	"This node is used in multiple situations. I am trying to remove some ambiguity by specializing the nodes."
 
-	aFieldAccessExpression isInstanceVariableAssignation ifTrue: [ ^ FamixPythonAssignedInstanceVariableNode adoptInstance: aFieldAccessExpression ]
+	aFieldAccessExpression isInstanceVariableAssignation ifTrue: [ ^ FamixPythonAssignedInstanceVariableNode adoptInstance: aFieldAccessExpression ].
+
+	aFieldAccessExpression isInImport ifTrue: [ ^ FamixPythonImportPathNode adoptInstance: aFieldAccessExpression ]
 ]
 
 { #category : 'generated' }

diff --git a/src/Famix-Python-Importer/PyRootNode.extension.st b/src/Famix-Python-Importer/PyRootNode.extension.st
@@ -41,6 +41,12 @@ PyRootNode >> isImport [
 	^ false
 ]
 
+{ #category : '*Famix-Python-Importer' }
+PyRootNode >> isInImport [
+
+	^ self parent isImport
+]
+
 { #category : '*Famix-Python-Importer' }
 PyRootNode >> isLeftSideOfAssignation: aNode [
 

diff --git a/src/Famix-Python-Importer/PyVariableExpressionNode.extension.st b/src/Famix-Python-Importer/PyVariableExpressionNode.extension.st
@@ -1,11 +1,5 @@
 Extension { #name : 'PyVariableExpressionNode' }
 
-{ #category : '*Famix-Python-Importer' }
-PyVariableExpressionNode >> isInImport [
-
-	^ self parent isImport
-]
-
 { #category : '*Famix-Python-Importer' }
 PyVariableExpressionNode >> isLeftSideOfAssignation [
 

diff --git a/src/Famix-Python-Importer/TPyRootNodeVisitor.extension.st b/src/Famix-Python-Importer/TPyRootNodeVisitor.extension.st
@@ -18,6 +18,11 @@ TPyRootNodeVisitor >> visitFunctionCallReceiverVariable: aFunctionCallReceiverVa
 	^ self visitVariableExpression: aFunctionCallReceiverVariable
 ]
 
+{ #category : '*Famix-Python-Importer' }
+TPyRootNodeVisitor >> visitImportPath: anImportPath [
+	^ self visitExpression: anImportPath
+]
+
 { #category : '*Famix-Python-Importer' }
 TPyRootNodeVisitor >> visitImportVariableExpression: anImportVariableExpression [