Manage splat type

Author: jecisc

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

@@ -522,6 +522,9 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	slice --|> expression.
 
+	splatType --|> tTypeContent.
+	splatType --|> tNamedEntity.
+	
 	statement --|> tStatement.
 
 	string --|> literal.

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

@@ -1,6 +1,29 @@
+"
+## Relations
+======================
+
+### Parents
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `invokedIn` | `FASTTNamedEntity` | `invoked` | `FASTTInvocation` | Optional invocation where this name is used|
+| `parentType` | `FASTPyTTypeContent` | `content` | `FASTPyType` | |
+
+
+## Properties
+======================
+
+| Name | Type | Default value | Comment |
+|---|
+| `endPos` | `Number` | nil | |
+| `name` | `String` | nil | |
+| `startPos` | `Number` | nil | |
+
+"
 Class {
 	#name : 'FASTPySplatType',
 	#superclass : 'FASTPyEntity',
+	#traits : 'FASTPyTTypeContent + FASTTNamedEntity',
+	#classTraits : 'FASTPyTTypeContent classTrait + FASTTNamedEntity classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -21406,6 +21406,73 @@ FASTPythonImporterTest >> testSliceWithStep [
 		self assert: (self topEntity isOfType: FASTPyIdentifier)
 ]
 
+{ #category : 'tests - types' }
+FASTPythonImporterTest >> testSplatType [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testSplatType 	"
+
+	self parse: 'def f(*items: *Ts): pass'.
+
+	self assert: (fast allWithType: FASTPyBlock) size equals: 1.
+	self assert: (fast allWithType: FASTPyFunctionDefinition) size equals: 1.
+	self assert: (fast allWithType: FASTPyListSplatParameter) size equals: 1.
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyPassStatement) size equals: 1.
+	self assert: (fast allWithType: FASTPySplatType) size equals: 1.
+	self assert: (fast allWithType: FASTPyType) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'def f(*items: *Ts): pass'.
+	self assert: (self topEntity isOfType: FASTPyFunctionDefinition).
+	self assert: (self topEntity isOfType: FASTPyTDefinition).
+	self assert: (self topEntity isOfType: FASTTWithParameters).
+	self assert: (self topEntity isOfType: FASTTWithStatements).
+	self assert: self topEntity name equals: 'f'.
+	
+	"Testing value of multivalued relation parameters"
+	self assert: self topEntity parameters size equals: 1.
+	
+		stack push: (stack top parameters at: 1).
+		self assert: self topEntity sourceCode equals: '*items: *Ts'.
+		self assert: (self topEntity isOfType: FASTPyListSplatParameter).
+		self assert: (self topEntity isOfType: FASTTVariableEntity).
+		self assert: self topEntity name equals: 'items'.
+		
+		"Testing value of monovalue relation type"
+		self assert: self topEntity type isNotNil.
+
+			stack push: self topEntity type.
+			self assert: self topEntity sourceCode equals: '*Ts'.
+			self assert: (self topEntity isOfType: FASTPyType).
+			
+			"Testing value of monovalue relation content"
+			self assert: self topEntity content isNotNil.
+
+				stack push: self topEntity content.
+				self assert: self topEntity sourceCode equals: '*Ts'.
+				self assert: (self topEntity isOfType: FASTPySplatType).
+				self assert: self topEntity name equals: 'Ts'.
+				stack pop.
+			stack pop.
+		stack pop.
+	
+	"Testing value of monovalue relation statementBlock"
+	self assert: self topEntity statementBlock isNotNil.
+
+		stack push: self topEntity statementBlock.
+		self assert: self topEntity sourceCode equals: 'pass'.
+		self assert: (self topEntity isOfType: FASTPyBlock).
+		self assert: (self topEntity isOfType: FASTTStatementBlock).
+		
+		"Testing value of multivalued relation statements"
+		self assert: self topEntity statements size equals: 1.
+		
+			stack push: (stack top statements at: 1).
+			self assert: self topEntity sourceCode equals: 'pass'.
+			self assert: (self topEntity isOfType: FASTPyPassStatement)
+]
+
 { #category : 'tests - literals' }
 FASTPythonImporterTest >> testStringWithEscapedInterpolation [
 	<generated>

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

@@ -70,14 +70,9 @@ TSFASTPythonImporter >> isInParameter: aNode [
 { #category : 'testing' }
 TSFASTPythonImporter >> shouldIdentifierSetNameProperty [
 
-	(context top isOfFASTType: FASTPyGenericType) ifTrue: [ ^ true ].
-
-	^ context top field = #name and: [
-			  {
-				  FASTPyMethodDefinition.
-				  FASTPyClassDefinition.
-				  FASTPyFunctionDefinition.
-				  FASTPyKeywordArgument } anySatisfy: [ :class | context top isOfFASTType: class ] ]
+	({ FASTPyGenericType.  FASTPySplatType } anySatisfy: [ :class | context top isOfFASTType: class ]) ifTrue: [ ^ true ].
+
+	^ context top field = #name and: [ context top isOfFASTType: FASTTNamedEntity ]
 ]
 
 { #category : 'visiting - skip' }