Manage lists

jecisc · jecisc · commit 24f2a7000965 · 2026-03-01T00:25:22.000+01:00
diff --git a/src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st b/src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st
@@ -346,6 +346,8 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	
 	integer --|> literal.
 	
+	list --|> expression.
+
 	literal --|> tLiteral.
 	
 	none --|> literal.
@@ -412,9 +414,13 @@ FASTPythonMetamodelGenerator >> defineRelations [
 	((import property: #importedEntities) comment: 'List of the imported entities.')
 	<>-* ((importedEntity property: #import) comment: 'Import declaring me as imported entity.').
 
-	((importFromStatement property: #fromModule) comment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..')
+	((importFromStatement property: #fromModule) comment:
+		 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..')
 	<>- ((fromModule property: #import) comment: 'Import declaring me as from import module.').
 
+	((list property: #initializers) comment: 'Each initializer defines one element.')
+	<>-* ((tExpression property: #collectionInitializers) comment: 'The owner of the expression').
+
 	((tUnaryOperator property: #argument) comment: 'Expression influanced by the unary operator..')
 	<>- ((tExpression property: #parentUnaryOperator) comment: 'Parent unary operator in which I am.')
 ]
diff --git a/src/FAST-Python-Model/FASTPyAssignment.class.st b/src/FAST-Python-Model/FASTPyAssignment.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyBinaryOperator.class.st b/src/FAST-Python-Model/FASTPyBinaryOperator.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyBoolean.class.st b/src/FAST-Python-Model/FASTPyBoolean.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyBooleanOperator.class.st b/src/FAST-Python-Model/FASTPyBooleanOperator.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyCall.class.st b/src/FAST-Python-Model/FASTPyCall.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyEntity.class.st b/src/FAST-Python-Model/FASTPyEntity.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `genericParent` | `FASTPyEntity` | `genericChildren` | `FASTPyEntity` | |
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
diff --git a/src/FAST-Python-Model/FASTPyExpression.class.st b/src/FAST-Python-Model/FASTPyExpression.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyList.class.st b/src/FAST-Python-Model/FASTPyList.class.st
@@ -1,6 +1,18 @@
+"
+## Relations
+======================
+
+### Children
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `initializers` | `FASTPyList` | `collectionInitializers` | `FASTTExpression` | Each initializer defines one element.|
+
+
+
+"
 Class {
 	#name : 'FASTPyList',
-	#superclass : 'FASTPyEntity',
+	#superclass : 'FASTPyExpression',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -9,8 +21,40 @@ Class {
 { #category : 'meta' }
 FASTPyList class >> annotation [
 
-	<FMClass: #List super: #FASTPyEntity>
+	<FMClass: #List super: #FASTPyExpression>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self
 ]
+
+{ #category : 'adding' }
+FASTPyList >> addInitializer: anObject [
+	<generated>
+	^ self initializers add: anObject
+]
+
+{ #category : 'accessing' }
+FASTPyList >> initializers [
+	"Relation named: #initializers type: #FASTTExpression opposite: #collectionInitializers"
+
+	<generated>
+	<FMComment: 'Each initializer defines one element.'>
+	<derived>
+	<FMProperty: #initializers type: #FASTTExpression opposite: #collectionInitializers>
+	<multivalued>
+	^ self attributeAt: #initializers ifAbsentPut: [ FMMultivalueLink on: self opposite: #collectionInitializers: ]
+]
+
+{ #category : 'accessing' }
+FASTPyList >> initializers: anObject [
+
+	<generated>
+	self initializers value: anObject
+]
+
+{ #category : 'navigation' }
+FASTPyList >> initializersGroup [
+	<generated>
+	<navigation: 'Initializers'>
+	^ MooseSpecializedGroup withAll: self initializers asSet
+]
diff --git a/src/FAST-Python-Model/FASTPyLiteral.class.st b/src/FAST-Python-Model/FASTPyLiteral.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTPyString.class.st b/src/FAST-Python-Model/FASTPyString.class.st
@@ -7,6 +7,7 @@
 |---|
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
+| `collectionInitializers` | `FASTTExpression` | `initializers` | `FASTPyList` | The owner of the expression|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentComparisonOperator` | `FASTTExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditionalStatement` | `FASTTExpression` | `condition` | `FASTTConditionalStatement` | Optional condition statement where this expression is used|
diff --git a/src/FAST-Python-Model/FASTTExpression.extension.st b/src/FAST-Python-Model/FASTTExpression.extension.st
@@ -1,5 +1,24 @@
 Extension { #name : 'FASTTExpression' }
 
+{ #category : '*FAST-Python-Model-accessing' }
+FASTTExpression >> collectionInitializers [
+	"Relation named: #collectionInitializers type: #FASTPyList opposite: #initializers"
+
+	<generated>
+	<FMComment: 'The owner of the expression'>
+	<container>
+	<FMProperty: #collectionInitializers type: #FASTPyList opposite: #initializers>
+	<package: #'FAST-Python-Model'>
+	^ self attributeAt: #collectionInitializers ifAbsent: [ nil ]
+]
+
+{ #category : '*FAST-Python-Model-accessing' }
+FASTTExpression >> collectionInitializers: anObject [
+
+	<generated>
+	self attributeAt: #collectionInitializers put: (FMMultivalueLink on: self update: #initializers from: self collectionInitializers to: anObject).
+]
+
 { #category : '*FAST-Python-Model-accessing' }
 FASTTExpression >> parentComparisonOperator [
 	"Relation named: #parentComparisonOperator type: #FASTPyComparisonOperator opposite: #operands"
diff --git a/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st b/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st
@@ -1122,6 +1122,40 @@ FASTPythonImporterTest >> testInteger [
 	self assert: (boolean isOfType: FASTTLiteral)
 ]
 
+{ #category : 'tests' }
+FASTPythonImporterTest >> testList [
+	"Generated as regression test by FASTPythonImporterTest class>>#generateTestNamed:fromCode:protocol: "
+
+	self parse: '[1, 2, 3]'.
+
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyList) size equals: 1.
+	self assert: (fast allWithType: FASTPyInteger) size equals: 3.
+
+	stack push: fast rootEntities anyOne genericChildren first.
+	self assert: self topEntity sourceCode equals: '[1, 2, 3]'.
+	self assert: (self topEntity isOfType: FASTPyList).
+	
+	"Testing value of multivalued relation initializers"
+	self assert: self topEntity initializers size equals: 3.
+	
+		stack push: (stack top initializers at: 1).
+		self assert: self topEntity sourceCode equals: '1'.
+		self assert: (self topEntity isOfType: FASTPyInteger).
+		stack pop.
+		
+		stack push: (stack top initializers at: 2).
+		self assert: self topEntity sourceCode equals: '2'.
+		self assert: (self topEntity isOfType: FASTPyInteger).
+		stack pop.
+		
+		stack push: (stack top initializers at: 3).
+		self assert: self topEntity sourceCode equals: '3'.
+		self assert: (self topEntity isOfType: FASTPyInteger).
+		stack pop.
+		
+]
+
 { #category : 'tests' }
 FASTPythonImporterTest >> testMethodDefinition [
 
diff --git a/src/FAST-Python-Tools/TSFASTPythonImporter.class.st b/src/FAST-Python-Tools/TSFASTPythonImporter.class.st
@@ -203,6 +203,14 @@ TSFASTPythonImporter >> visitImportStatement: aTSNode [
 	^ self createEntityForNode: aTSNode
 ]
 
+{ #category : 'visiting' }
+TSFASTPythonImporter >> visitList: aTSNode [
+
+	self onNextContextDo: [ :entry | entry add: #initializers asAliasOfField: '<unnamedChild>' ].
+
+	^ self createEntityForNode: aTSNode kind: FASTPyList
+]
+
 { #category : 'visiting' }
 TSFASTPythonImporter >> visitParameters: aNode [
 	"For parameters we want one by parameter. Not one node for multiple ones."
