Simplify aliases management + start import

Author: jecisc

src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st

@@ -140,7 +140,8 @@ Class {
 		'tUnaryOperator',
 		'tAssignment',
 		'variable',
-		'structuralEntity'
+		'structuralEntity',
+		'import'
 	],
 	#category : 'FAST-Python-Model-Generator',
 	#package : 'FAST-Python-Model-Generator'
@@ -230,6 +231,7 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	identifier := builder ensureClassNamed: #Identifier."Todo"
 	ifClause := builder ensureClassNamed: #IfClause."Todo"
 	ifStatement := builder ensureClassNamed: #IfStatement."Todo"
+	import := builder ensureClassNamed: #Import. "To review"
 	importFromStatement := builder ensureClassNamed: #ImportFromStatement."Todo"
 	importPrefix := builder ensureClassNamed: #ImportPrefix."Todo"
 	importStatement := builder ensureClassNamed: #ImportStatement."Todo"
@@ -331,6 +333,10 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	self flag: #todo. "I am not sure this should be the case but the importer is too young and we need this to not have everything breaking."
 	identifier --|> expression. 
 
+	importStatement --|> import.
+	
+	importFromStatement --|> import.
+	
 	float --|> literal.
 
 	functionDefinition --|> tNamedBehaviouralEntity.

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

@@ -0,0 +1,16 @@
+Class {
+	#name : 'FASTPyImport',
+	#superclass : 'FASTPyEntity',
+	#category : 'FAST-Python-Model-Entities',
+	#package : 'FAST-Python-Model',
+	#tag : 'Entities'
+}
+
+{ #category : 'meta' }
+FASTPyImport class >> annotation [
+
+	<FMClass: #Import super: #FASTPyEntity>
+	<package: #'FAST-Python-Model'>
+	<generated>
+	^ self
+]

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

@@ -1,6 +1,6 @@
 Class {
 	#name : 'FASTPyImportFromStatement',
-	#superclass : 'FASTPyEntity',
+	#superclass : 'FASTPyImport',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -9,7 +9,7 @@ Class {
 { #category : 'meta' }
 FASTPyImportFromStatement class >> annotation [
 
-	<FMClass: #ImportFromStatement super: #FASTPyEntity>
+	<FMClass: #ImportFromStatement super: #FASTPyImport>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self

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

@@ -1,6 +1,6 @@
 Class {
 	#name : 'FASTPyImportStatement',
-	#superclass : 'FASTPyEntity',
+	#superclass : 'FASTPyImport',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -9,7 +9,7 @@ Class {
 { #category : 'meta' }
 FASTPyImportStatement class >> annotation [
 
-	<FMClass: #ImportStatement super: #FASTPyEntity>
+	<FMClass: #ImportStatement super: #FASTPyImport>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self

src/FAST-Python-Model/FASTPyTEntityCreator.trait.st

@@ -447,6 +447,13 @@ FASTPyTEntityCreator >> newIfStatement [
 	^ self add: FASTPyIfStatement new
 ]
 
+{ #category : 'entity creation' }
+FASTPyTEntityCreator >> newImport [
+
+	<generated>
+	^ self add: FASTPyImport new
+]
+
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newImportFromStatement [
 

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

@@ -281,6 +281,19 @@ FASTPythonImporterTest >> testFunctionParameters [
 	self assertCollection: (function parameters collect: #name) hasSameElements: #( 'a' 'b' )
 ]
 
+{ #category : 'tests' }
+FASTPythonImporterTest >> testImport [
+
+	| import |
+	self parse: 'import random'.
+
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyImportStatement) size equals: 1.
+
+	import := (fast allWithType: FASTPyImportStatement) anyOne.
+	self assert: import sourceCode equals: 'import random'.
+]
+
 { #category : 'tests - literals' }
 FASTPythonImporterTest >> testInteger [
 

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

@@ -16,14 +16,12 @@ TSFASTPythonImporter >> initialize [
 TSFASTPythonImporter >> manageBinaryOperator: aTSNode ofKind: aClass [
 
 	| fastEntity |
-	fastEntity := self instantiateFastEntity: aClass from: aTSNode.
+	self onNextContextDo: [ :contextEntry |
+			contextEntry
+				add: 'leftOperand' asAliasOfField: 'left';
+				add: 'rightOperand' asAliasOfField: 'right' ].
 
-	self setParentOf: fastEntity.
-
-	self pushContext: fastEntity node: aTSNode during: [
-			context top add: 'leftOperand' asAliasOfField: 'left'.
-			context top add: 'rightOperand' asAliasOfField: 'right'.
-			self visitChildren: aTSNode in: fastEntity ].
+	fastEntity := self createEntityForNode: aTSNode.
 
 	"TreeSitter does not seems to manage operator. See: https://github.com/tree-sitter/tree-sitter-python/issues/328
 	So I try to het this property manually."
@@ -35,17 +33,12 @@ TSFASTPythonImporter >> manageBinaryOperator: aTSNode ofKind: aClass [
 { #category : 'visiting' }
 TSFASTPythonImporter >> visitAssignment: aTSNode [
 
-	| fastEntity |
-	fastEntity := self instantiateFastEntity: FASTPyAssignment from: aTSNode.
-
-	self setParentOf: fastEntity.
-
-	self pushContext: fastEntity node: aTSNode during: [
-			context top add: 'variable' asAliasOfField: 'left'.
-			context top add: 'expression' asAliasOfField: 'right'.
-			self visitChildren: aTSNode in: fastEntity ].
+	self onNextContextDo: [ :contextEntry |
+			contextEntry
+				add: 'variable' asAliasOfField: 'left';
+				add: 'expression' asAliasOfField: 'right' ].
 
-	^ fastEntity
+	^ self createEntityForNode: aTSNode
 ]
 
 { #category : 'visiting' }
@@ -64,14 +57,10 @@ TSFASTPythonImporter >> visitBooleanOperator: aTSNode [
 TSFASTPythonImporter >> visitComparisonOperator: aTSNode [
 
 	| fastEntity |
-	fastEntity := self instantiateFastEntity: FASTPyComparisonOperator from: aTSNode.
-
-	self setParentOf: fastEntity.
-
-	self pushContext: fastEntity node: aTSNode during: [
-			context top add: 'operands' asAliasOfField: '<unnamedChild>'.
-			self visitChildren: aTSNode in: fastEntity ].
-		
+	self onNextContextDo: [ :contextEntry | contextEntry add: 'operands' asAliasOfField: '<unnamedChild>' ].
+	
+	fastEntity := self createEntityForNode: aTSNode.
+	
 	"The node does not gives us the operators so we try to get them ourselves."
 	fastEntity operators:
 		(fastEntity operands overlappingPairsCollect: [ :operand1 :operand2 | (fastEntity sourceText copyFrom: operand1 endPos + 1 to: operand2 startPos - 1) trim ]).