Manage most cases of list splats

Author: jecisc

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

@@ -357,6 +357,7 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	classDefinition --|> tDefinition.
 
 	collectionInitializer --|> expression.
+	collectionInitializer --|> tCanBeSplatExpression.
 
 	collectionSplat --|> expression.
 
@@ -377,7 +378,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	deleteStatement --|> statement.
 
 	dictionary --|> collectionInitializer.
-	dictionary --|> tCanBeSplatExpression.
 
 	dictionaryComprehension --|> expression.
 	dictionaryComprehension --|> tComprehension.
@@ -448,8 +448,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	literal --|> expression.
 	literal --|> tLiteral.
-	
-	listSplat --|> expression.
 
 	methodDefinition --|> tNamedBehaviouralEntity.
 	methodDefinition --|> tDefinition.
@@ -490,6 +488,7 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	string --|> literal.
 	string --|> tStringLiteral.
+	string --|> tCanBeSplatExpression.
 
 	subscript --|> expression.
 	subscript --|> tDecoratorExpression.
@@ -617,9 +616,6 @@ FASTPythonMetamodelGenerator >> defineRelations [
 
 	(lambda property: #expression) <>- (expression property: #lambdaOwner).
 
-	((listSplat property: #iterable) comment: 'The iterable to unpack. Can be a collection, a call, an attribute access or a subscript.')
-	<>- ((expression property: #listSplatOwner) comment: 'List splat unpacking me (if it''s the case)').
-
 	((nonlocalStatement property: #variables) comment: 'The variables scoped')
 	<>-* ((variable property: #nonlocalOwner) comment: 'The global statement defining my scope (if it''s the case)').
 

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

@@ -2,6 +2,11 @@
 ## Relations
 ======================
 
+### Parents
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `parentSplat` | `FASTPyTCanBeSplatExpression` | `expression` | `FASTPyCollectionSplat` | |
+
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
@@ -13,6 +18,8 @@
 Class {
 	#name : 'FASTPyCollectionInitializer',
 	#superclass : 'FASTPyExpression',
+	#traits : 'FASTPyTCanBeSplatExpression',
+	#classTraits : 'FASTPyTCanBeSplatExpression classTrait',
 	#instVars : [
 		'#initializers => FMMany type: #FASTPyExpression opposite: #collectionInitializer'
 	],

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

@@ -13,8 +13,6 @@
 Class {
 	#name : 'FASTPyDictionary',
 	#superclass : 'FASTPyCollectionInitializer',
-	#traits : 'FASTPyTCanBeSplatExpression',
-	#classTraits : 'FASTPyTCanBeSplatExpression classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -24,7 +24,6 @@
 | `ifClauseOwner` | `FASTPyExpression` | `expression` | `FASTPyIfClause` | |
 | `keywordArgumentOwner` | `FASTPyExpression` | `value` | `FASTPyKeywordArgument` | Keyword argument from which I am the value (if it's the case)|
 | `lambdaOwner` | `FASTPyExpression` | `expression` | `FASTPyLambda` | |
-| `listSplatOwner` | `FASTPyExpression` | `iterable` | `FASTPyListSplat` | List splat unpacking me (if it's the case)|
 | `pairKeyOwner` | `FASTTExpression` | `key` | `FASTPyPair` | |
 | `pairValueOwner` | `FASTTExpression` | `value` | `FASTPyPair` | |
 | `parentAssertStatement` | `FASTPyExpression` | `expressions` | `FASTPyAssertStatement` | The assert statement that own the expression (if it's the case)|
@@ -76,7 +75,6 @@ Class {
 		'#ifClauseOwner => FMOne type: #FASTPyIfClause opposite: #expression',
 		'#keywordArgumentOwner => FMOne type: #FASTPyKeywordArgument opposite: #value',
 		'#lambdaOwner => FMOne type: #FASTPyLambda opposite: #expression',
-		'#listSplatOwner => FMOne type: #FASTPyListSplat opposite: #iterable',
 		'#parentAssertStatement => FMOne type: #FASTPyAssertStatement opposite: #expressions',
 		'#parentAwait => FMOne type: #FASTPyAwait opposite: #expression',
 		'#parentComparisonOperator => FMOne type: #FASTPyComparisonOperator opposite: #operands',
@@ -491,31 +489,6 @@ FASTPyExpression >> lambdaOwnerGroup [
 	^ MooseSpecializedGroup with: self lambdaOwner
 ]
 
-{ #category : 'accessing' }
-FASTPyExpression >> listSplatOwner [
-	"Relation named: #listSplatOwner type: #FASTPyListSplat opposite: #iterable"
-
-	<generated>
-	<FMComment: 'List splat unpacking me (if it''s the case)'>
-	<container>
-	<derived>
-	^ listSplatOwner
-]
-
-{ #category : 'accessing' }
-FASTPyExpression >> listSplatOwner: anObject [
-
-	<generated>
-	listSplatOwner := anObject
-]
-
-{ #category : 'navigation' }
-FASTPyExpression >> listSplatOwnerGroup [
-	<generated>
-	<navigation: 'ListSplatOwner'>
-	^ MooseSpecializedGroup with: self listSplatOwner
-]
-
 { #category : 'accessing' }
 FASTPyExpression >> parentAssertStatement [
 	"Relation named: #parentAssertStatement type: #FASTPyAssertStatement opposite: #expressions"

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

@@ -2,10 +2,10 @@
 ## Relations
 ======================
 
-### Children
+### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `initializers` | `FASTPyTCollectionInitializer` | `collectionInitializers` | `FASTTExpression` | Each initializer defines one element.|
+| `parentSplat` | `FASTPyTCanBeSplatExpression` | `expression` | `FASTPyCollectionSplat` | |
 
 
 

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

@@ -12,10 +12,7 @@
 "
 Class {
 	#name : 'FASTPyListSplat',
-	#superclass : 'FASTPyExpression',
-	#instVars : [
-		'#iterable => FMOne type: #FASTPyExpression opposite: #listSplatOwner'
-	],
+	#superclass : 'FASTPyCollectionSplat',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -24,31 +21,8 @@ Class {
 { #category : 'meta' }
 FASTPyListSplat class >> annotation [
 
-	<FMClass: #ListSplat super: #FASTPyExpression>
+	<FMClass: #ListSplat super: #FASTPyCollectionSplat>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self
 ]
-
-{ #category : 'accessing' }
-FASTPyListSplat >> iterable [
-	"Relation named: #iterable type: #FASTPyExpression opposite: #listSplatOwner"
-
-	<generated>
-	<FMComment: 'The iterable to unpack. Can be a collection, a call, an attribute access or a subscript.'>
-	^ iterable
-]
-
-{ #category : 'accessing' }
-FASTPyListSplat >> iterable: anObject [
-
-	<generated>
-	iterable := anObject
-]
-
-{ #category : 'navigation' }
-FASTPyListSplat >> iterableGroup [
-	<generated>
-	<navigation: 'Iterable'>
-	^ MooseSpecializedGroup with: self iterable
-]

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

@@ -15,6 +15,7 @@
 | `parentExpression` | `FASTTExpression` | `expression` | `FASTTUnaryExpression` | Parent (unary) expression|
 | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
 | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
+| `parentSplat` | `FASTPyTCanBeSplatExpression` | `expression` | `FASTPyCollectionSplat` | |
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
 ### Children
@@ -36,8 +37,8 @@
 Class {
 	#name : 'FASTPyString',
 	#superclass : 'FASTPyLiteral',
-	#traits : 'FASTTStringLiteral',
-	#classTraits : 'FASTTStringLiteral classTrait',
+	#traits : 'FASTPyTCanBeSplatExpression + FASTTStringLiteral',
+	#classTraits : 'FASTPyTCanBeSplatExpression classTrait + FASTTStringLiteral classTrait',
 	#instVars : [
 		'#interpolations => FMMany type: #FASTPyInterpolation opposite: #parentString',
 		'#parentConcatenatedString => FMOne type: #FASTPyConcatenatedString opposite: #strings'