Importing Class attributes and Method localVariables

moosetechnology · May 13, 2024 · b3a0eb0 · b3a0eb0
1 parent 1c74f22
commit b3a0eb0
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 0 deletions.
diff --git a/src/MoosePy/FamixPythonClass.extension.st b/src/MoosePy/FamixPythonClass.extension.st
@@ -0,0 +1,14 @@
+Extension { #name : #FamixPythonClass }
+
+{ #category : #'*MoosePy' }
+FamixPythonClass >> createLocalVariable: aString [ 
+	^mooseModel newAttribute
+		name: aString ;
+		parentType: self ;
+		yourself
+]
+
+{ #category : #'*MoosePy' }
+FamixPythonClass >> dictLocalVariables [
+	^self attributeAt: #dictLocalVariables ifAbsentPut: [ Dictionary new ] 
+]
diff --git a/src/MoosePy/FamixPythonMethod.extension.st b/src/MoosePy/FamixPythonMethod.extension.st
@@ -0,0 +1,14 @@
+Extension { #name : #FamixPythonMethod }
+
+{ #category : #'*MoosePy' }
+FamixPythonMethod >> createLocalVariable: aString [ 
+	^mooseModel newLocalVariable
+		name: aString ;
+		parentBehaviouralEntity: self ;
+		yourself
+]
+
+{ #category : #'*MoosePy' }
+FamixPythonMethod >> dictLocalVariables [
+	^self attributeAt: #dictLocalVariables ifAbsentPut: [ Dictionary new ] 
+]
diff --git a/src/MoosePy/FamixPythonModule.extension.st b/src/MoosePy/FamixPythonModule.extension.st
@@ -1,5 +1,15 @@
 Extension { #name : #FamixPythonModule }
 
+{ #category : #'*MoosePy' }
+FamixPythonModule >> createLocalVariable: aString [ 
+
+]
+
+{ #category : #'*MoosePy' }
+FamixPythonModule >> dictLocalVariables [
+	^self attributeAt: #dictLocalVariables ifAbsentPut: [ Dictionary new ] 
+]
+
 { #category : #'*MoosePy' }
 FamixPythonModule >> manualAddImport: aFamixImport [
 

diff --git a/src/MoosePy/MSEPythonImporterTest.class.st b/src/MoosePy/MSEPythonImporterTest.class.st
@@ -238,6 +238,20 @@ MSEPythonImporterTest >> testImportClassKnowsItsMethods [
 
 ]
 
+{ #category : #'tests - classes' }
+MSEPythonImporterTest >> testImportFamixAttribute [
+
+	| clazz |
+	importer accept: pyDoc.
+	clazz := importer classNamed: 'Player'.
+	self assert: clazz attributes size equals: 3.
+	clazz attributes do: [ :att |
+		self assert: (#(width height my_joystick) anySatisfy: [:name | name = att name]).
+	].
+
+
+]
+
 { #category : #'tests - classes' }
 MSEPythonImporterTest >> testImportFamixClass [
 

diff --git a/src/MoosePy/MSEPythonToFamixImporterVisitor.class.st b/src/MoosePy/MSEPythonToFamixImporterVisitor.class.st
@@ -286,6 +286,14 @@ MSEPythonToFamixImporterVisitor >> ensureParameters: theParameters inBehavioural
 				  self createParameter: parameter inBehavioural: aFamixBehavioural ] ] ]
 ]
 
+{ #category : #visiting }
+MSEPythonToFamixImporterVisitor >> ensureVariable: aName localTo: aFamixEntity [
+
+	aFamixEntity dictLocalVariables
+		at: aName
+		ifAbsent: [ aFamixEntity createLocalVariable: aName ]
+]
+
 { #category : #accessing }
 MSEPythonToFamixImporterVisitor >> extractArgumentsInformation: aSignature [
 
@@ -635,6 +643,13 @@ MSEPythonToFamixImporterVisitor >> visitAnnotatedSymbol: anAnnotatedSymbol [
 	^ super visitAnnotatedSymbol: anAnnotatedSymbol
 ]
 
+{ #category : #visiting }
+MSEPythonToFamixImporterVisitor >> visitAssignmentStmt: anExprStmt [
+
+	(anExprStmt testlist class = PySymbolNode)
+		ifTrue: [ ^self ensureVariable: anExprStmt testlist nameToken value localTo: context top]
+]
+
 { #category : #visiting }
 MSEPythonToFamixImporterVisitor >> visitClassdef: aClassDef [
 
@@ -671,6 +686,11 @@ MSEPythonToFamixImporterVisitor >> visitDottedName: anDottedNameNode [
 	^$. join: (anDottedNameNode names collect: [:name | self acceptNode: name])
 ]
 
+{ #category : #visiting }
+MSEPythonToFamixImporterVisitor >> visitExprStmt: anExprStmt [
+	anExprStmt isAssignment ifTrue: [ self visitAssignmentStmt: anExprStmt ]
+]
+
 { #category : #visiting }
 MSEPythonToFamixImporterVisitor >> visitFileInput: aFileInputNode [