Merge list and dictionary splat parameters

Author: jecisc

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

@@ -143,18 +143,16 @@ Class {
 		'tAssignable',
 		'tReturnReferenceable',
 		'tSplatExpression',
-		'listSplatParameter',
 		'tSplatParameterTarget',
-		'tSplatParameter',
-		'dictionarySplatParameter',
 		'tPattern',
 		'tClassPatternElement',
 		'tUnionMember',
 		'tDeletable',
 		'tTypeContent',
 		'typeParameter',
 		'tWithTypeParameters',
-		'splat'
+		'splat',
+		'splatParameter'
 	],
 	#category : 'FAST-Python-Model-Generator',
 	#package : 'FAST-Python-Model-Generator'
@@ -212,7 +210,6 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	deleteStatement := builder ensureClassNamed: #DeleteStatement.
 	dictionary := builder ensureClassNamed: #Dictionary."To Review"
 	dictionaryComprehension := builder ensureClassNamed: #DictionaryComprehension."Todo"
-	dictionarySplatParameter := builder ensureClassNamed: #DictionarySplatParameter."Todo"
 	dottedName := builder ensureClassNamed: #DottedName."Todo"
 	elifClause := builder ensureClassNamed: #ElifClause."Todo"
 	ellipsis := builder ensureClassNamed: #Ellipsis.
@@ -248,7 +245,6 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	lambdaParameters := builder ensureClassNamed: #LambdaParameters."Todo"
 	list := builder ensureClassNamed: #List.
 	listComprehension := builder ensureClassNamed: #ListComprehension."Todo"
-	listSplatParameter := builder ensureClassNamed: #ListSplatParameter."Todo"
 	literal := builder ensureClassNamed: #Literal.
 	matchStatement := builder ensureClassNamed: #MatchStatement."Todo"
 	memberType := builder ensureClassNamed: #MemberType."Todo"
@@ -271,6 +267,7 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	setComprehension := builder ensureClassNamed: #SetComprehension."Todo"
 	slice := builder ensureClassNamed: #Slice. "To review"
 	(splat := builder ensureClassNamed: #Splat) comment: 'In Python a collection (list or dictionary) splat is the unpacking of a collection in a call or in the definition of another definition like `[ *list , 4 ]` or `func(*list)`'.
+	splatParameter := builder ensureClassNamed: #SplatParameter.
 	splatType := builder ensureClassNamed: #SplatType."Todo"
 	statement := builder ensureClassNamed: #Statement.
 	string := builder ensureClassNamed: #String.
@@ -377,9 +374,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	dictionaryComprehension --|> expression.
 	dictionaryComprehension --|> tComprehension.
 
-	dictionarySplatParameter --|> parameter.
-	dictionarySplatParameter --|> tSplatParameter.
-	
 	dottedName --|> expression.
 	dottedName --|> tPattern.
 	dottedName --|> tClassPatternElement.
@@ -463,9 +457,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	listComprehension --|> expression.
 	listComprehension --|> tComprehension.
 
-	listSplatParameter --|> parameter.
-	listSplatParameter --|> tSplatParameter.
-
 	literal --|> expression.
 	literal --|> tLiteral.
 	literal --|> tPattern.
@@ -516,6 +507,8 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	splat --|> expression.
 	splat --|> tPattern.
+
+	splatParameter --|> parameter.
 
 	splatType --|> tTypeContent.
 	splatType --|> tNamedEntity.
@@ -760,7 +753,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
 
 	(tryStatement property: #excepts) <>-* (exceptClause property: #parentTryStatement).
 
-	(tSplatParameter property: #target) <>- (tSplatParameterTarget property: #parentSplatParameter).
+	(splatParameter property: #target) <>- (tSplatParameterTarget property: #parentSplatParameter).
 
 	((tUnaryOperator property: #argument) comment: 'Expression influanced by the unary operator..')
 	<>- ((expression property: #parentUnaryOperator) comment: 'Parent unary operator in which I am.').
@@ -816,8 +809,6 @@ FASTPythonMetamodelGenerator >> defineTraits [
 
 	tSplatExpression := (builder newTraitNamed: #TSplatExpression) comment: 'My users are expressions that can be in a collection splat. For example in `[ *getList(), 3 ]`, we have a list splat on the call `getList()`. Get list, is the expression of the splat.'.
 
-	(tSplatParameter := builder newTraitNamed: #TSplatParameter) comment: 'I represent a parameter that is a list or dictionary splat.'.
-
 	tSplatParameterTarget := (builder newTraitNamed: #TSplatParameterTarget) comment: 'My users are parameter target in a splat. For example in `def f(*list): pass`, we have a list splat parameter named list.'.
 
 	(tTypeContent := builder newTraitNamed: #TTypeContent) comment: 'My user can be used as a type declaration'.

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

@@ -12,7 +12,7 @@
 | `parentDeleteStatement` | `FASTPyTDeletable` | `expression` | `FASTPyDeleteStatement` | The delete statement that own the expression (if it's the case)|
 | `parentRaiseStatement` | `FASTPyTRaised` | `exception` | `FASTPyRaiseStatement` | |
 | `parentSplat` | `FASTPyTSplatExpression` | `expression` | `FASTPySplat` | |
-| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPyTSplatParameter` | |
+| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPySplatParameter` | |
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |

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

@@ -13,7 +13,7 @@
 | `parentDeleteStatement` | `FASTPyTDeletable` | `expression` | `FASTPyDeleteStatement` | The delete statement that own the expression (if it's the case)|
 | `parentRaiseStatement` | `FASTPyTRaised` | `exception` | `FASTPyRaiseStatement` | |
 | `parentSplat` | `FASTPyTSplatExpression` | `expression` | `FASTPySplat` | |
-| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPyTSplatParameter` | |
+| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPySplatParameter` | |
 
 
 

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

@@ -1,53 +1,52 @@
 "
-I represent a parameter that is a list or dictionary splat.
-
 ## Relations
 ======================
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `target` | `FASTPyTSplatParameter` | `parentSplatParameter` | `FASTPyTSplatParameterTarget` | |
+| `target` | `FASTPySplatParameter` | `parentSplatParameter` | `FASTPyTSplatParameterTarget` | |
 
 
 
 "
-Trait {
-	#name : 'FASTPyTSplatParameter',
+Class {
+	#name : 'FASTPySplatParameter',
+	#superclass : 'FASTPyParameter',
 	#instVars : [
 		'#target => FMOne type: #FASTPyTSplatParameterTarget opposite: #parentSplatParameter'
 	],
-	#category : 'FAST-Python-Model-Traits',
+	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
-	#tag : 'Traits'
+	#tag : 'Entities'
 }
 
 { #category : 'meta' }
-FASTPyTSplatParameter classSide >> annotation [
+FASTPySplatParameter class >> annotation [
 
-	<FMClass: #TSplatParameter super: #Object>
+	<FMClass: #SplatParameter super: #FASTPyParameter>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self
 ]
 
 { #category : 'accessing' }
-FASTPyTSplatParameter >> target [
+FASTPySplatParameter >> target [
 	"Relation named: #target type: #FASTPyTSplatParameterTarget opposite: #parentSplatParameter"
 
 	<generated>
 	^ target
 ]
 
 { #category : 'accessing' }
-FASTPyTSplatParameter >> target: anObject [
+FASTPySplatParameter >> target: anObject [
 
 	<generated>
 	target := anObject
 ]
 
 { #category : 'navigation' }
-FASTPyTSplatParameter >> targetGroup [
+FASTPySplatParameter >> targetGroup [
 	<generated>
 	<navigation: 'Target'>
 	^ MooseSpecializedGroup with: self target

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

@@ -216,13 +216,6 @@ FASTPyTEntityCreator >> newDictionaryComprehension [
 	^ self add: FASTPyDictionaryComprehension new
 ]
 
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newDictionarySplatParameter [
-
-	<generated>
-	^ self add: FASTPyDictionarySplatParameter new
-]
-
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newDottedName [
 
@@ -475,13 +468,6 @@ FASTPyTEntityCreator >> newListComprehension [
 	^ self add: FASTPyListComprehension new
 ]
 
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newListSplatParameter [
-
-	<generated>
-	^ self add: FASTPyListSplatParameter new
-]
-
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newLiteral [
 
@@ -629,6 +615,13 @@ FASTPyTEntityCreator >> newSplat [
 	^ self add: FASTPySplat new
 ]
 
+{ #category : 'entity creation' }
+FASTPyTEntityCreator >> newSplatParameter [
+
+	<generated>
+	^ self add: FASTPySplatParameter new
+]
+
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newSplatType [
 

…hon-Model/FASTPyTSplatParameter.trait.st …thon-Model/FASTPySplatParameter.class.stsrc/FAST-Python-Model/FASTPyTSplatParameter.trait.st renamed to src/FAST-Python-Model/FASTPySplatParameter.class.st src/FAST-Python-Model/FASTPyTSplatParameter.trait.st renamed to src/FAST-Python-Model/FASTPySplatParameter.class.st

@@ -7,15 +7,15 @@ My users are parameter target in a splat. For example in `def f(*list): pass`, w
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPyTSplatParameter` | |
+| `parentSplatParameter` | `FASTPyTSplatParameterTarget` | `target` | `FASTPySplatParameter` | |
 
 
 
 "
 Trait {
 	#name : 'FASTPyTSplatParameterTarget',
 	#instVars : [
-		'#parentSplatParameter => FMOne type: #FASTPyTSplatParameter opposite: #target'
+		'#parentSplatParameter => FMOne type: #FASTPySplatParameter opposite: #target'
 	],
 	#category : 'FAST-Python-Model-Traits',
 	#package : 'FAST-Python-Model',
@@ -33,7 +33,7 @@ FASTPyTSplatParameterTarget classSide >> annotation [
 
 { #category : 'accessing' }
 FASTPyTSplatParameterTarget >> parentSplatParameter [
-	"Relation named: #parentSplatParameter type: #FASTPyTSplatParameter opposite: #target"
+	"Relation named: #parentSplatParameter type: #FASTPySplatParameter opposite: #target"
 
 	<generated>
 	<container>