Handle better the parameters.

Only thing left on parameters now is to refine the default value type by introducing a new trait

Author: jecisc

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

@@ -28,9 +28,7 @@ Class {
 		'conditionalExpression',
 		'constrainedType',
 		'continueStatement',
-		'decoratedDefinition',
 		'decorator',
-		'defaultParameter',
 		'deleteStatement',
 		'dictPattern',
 		'dictionary',
@@ -50,7 +48,6 @@ Class {
 		'forInClause',
 		'forStatement',
 		'formatExpression',
-		'formatSpecifier',
 		'functionDefinition',
 		'generatorExpression',
 		'genericType',
@@ -67,7 +64,6 @@ Class {
 		'keywordSeparator',
 		'lambda',
 		'lambdaParameters',
-		'lineContinuation',
 		'list',
 		'listComprehension',
 		'listPattern',
@@ -81,7 +77,6 @@ Class {
 		'notOperator',
 		'pair',
 		'parameter',
-		'parenthesizedExpression',
 		'parenthesizedListSplat',
 		'passStatement',
 		'patternList',
@@ -102,9 +97,6 @@ Class {
 		'type',
 		'typeAliasStatement',
 		'typeConversion',
-		'typeParameter',
-		'typedDefaultParameter',
-		'typedParameter',
 		'unaryOperator',
 		'unionPattern',
 		'unionType',
@@ -219,7 +211,6 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	constrainedType := builder ensureClassNamed: #ConstrainedType."Todo"
 	continueStatement := builder ensureClassNamed: #ContinueStatement.
 	decorator := builder ensureClassNamed: #Decorator."Todo"
-	defaultParameter := builder ensureClassNamed: #DefaultParameter."Todo"
 	deleteStatement := builder ensureClassNamed: #DeleteStatement.
 	dictPattern := builder ensureClassNamed: #DictPattern."Todo"
 	dictionary := builder ensureClassNamed: #Dictionary."To Review"
@@ -299,9 +290,6 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	type := builder ensureClassNamed: #Type."Todo"
 	typeAliasStatement := builder ensureClassNamed: #TypeAliasStatement."Todo"
 	typeConversion := builder ensureClassNamed: #TypeConversion."Todo"
-	typeParameter := builder ensureClassNamed: #TypeParameter."Todo"
-	typedDefaultParameter := builder ensureClassNamed: #TypedDefaultParameter."Todo"
-	typedParameter := builder ensureClassNamed: #TypedParameter."Todo"
 	unaryOperator := builder ensureClassNamed: #UnaryOperator.
 	unionPattern := builder ensureClassNamed: #UnionPattern."Todo"
 	unionType := builder ensureClassNamed: #UnionType."Todo"
@@ -674,6 +662,10 @@ FASTPythonMetamodelGenerator >> defineRelations [
 	(pair property: #key) <>- (expression property: #pairKeyOwner).
 
 	(pair property: #value) <>- (expression property: #pairValueOwner).
+	
+	(parameter property: #type) <>- (type property: #parentParameter).
+	
+	(parameter property: #defaultValue) <>- (expression property: #parentDefaultParameterValue). "I need to refine the relation with a new trait."
 
 	(patternList property: #elements) <>-* (expression property: #patternListOwner).
 

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

@@ -31,6 +31,7 @@
 | `parentAwait` | `FASTPyExpression` | `expression` | `FASTPyAwait` | |
 | `parentComparisonOperator` | `FASTPyExpression` | `operands` | `FASTPyComparisonOperator` | Parent comparison expression of which I am.|
 | `parentConditional` | `FASTTExpression` | `condition` | `FASTTWithCondition` | Optional condition statement/expression where this expression is used|
+| `parentDefaultParameterValue` | `FASTPyExpression` | `defaultValue` | `FASTPyParameter` | |
 | `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|
@@ -83,6 +84,7 @@ Class {
 		'#parentAssignmentRight => FMOne type: #FASTPyAssignment opposite: #right',
 		'#parentAwait => FMOne type: #FASTPyAwait opposite: #expression',
 		'#parentComparisonOperator => FMOne type: #FASTPyComparisonOperator opposite: #operands',
+		'#parentDefaultParameterValue => FMOne type: #FASTPyParameter opposite: #defaultValue',
 		'#parentInterpolation => FMOne type: #FASTPyInterpolation opposite: #expression',
 		'#parentType => FMOne type: #FASTPyType opposite: #expression',
 		'#parentUnaryOperator => FMOne type: #FASTPyTUnaryOperator opposite: #argument',
@@ -639,6 +641,30 @@ FASTPyExpression >> parentComparisonOperatorGroup [
 	^ MooseSpecializedGroup with: self parentComparisonOperator
 ]
 
+{ #category : 'accessing' }
+FASTPyExpression >> parentDefaultParameterValue [
+	"Relation named: #parentDefaultParameterValue type: #FASTPyParameter opposite: #defaultValue"
+
+	<generated>
+	<container>
+	<derived>
+	^ parentDefaultParameterValue
+]
+
+{ #category : 'accessing' }
+FASTPyExpression >> parentDefaultParameterValue: anObject [
+
+	<generated>
+	parentDefaultParameterValue := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyExpression >> parentDefaultParameterValueGroup [
+	<generated>
+	<navigation: 'ParentDefaultParameterValue'>
+	^ MooseSpecializedGroup with: self parentDefaultParameterValue
+]
+
 { #category : 'accessing' }
 FASTPyExpression >> parentInterpolation [
 	"Relation named: #parentInterpolation type: #FASTPyInterpolation opposite: #expression"

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

@@ -9,6 +9,12 @@
 | `parameterOwner` | `FASTTVariableEntity` | `parameters` | `FASTTWithParameters` | parameterOwner|
 | `parentAssignmentExpression` | `FASTTVariableEntity` | `variable` | `FASTTAssignment` | Optional assignment to the variable|
 
+### Children
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `defaultValue` | `FASTPyParameter` | `parentDefaultParameterValue` | `FASTPyExpression` | |
+| `type` | `FASTPyParameter` | `parentParameter` | `FASTPyType` | |
+
 
 ## Properties
 ======================
@@ -25,6 +31,10 @@ Class {
 	#superclass : 'FASTPyEntity',
 	#traits : 'FASTTVariableEntity',
 	#classTraits : 'FASTTVariableEntity classTrait',
+	#instVars : [
+		'#defaultValue => FMOne type: #FASTPyExpression opposite: #parentDefaultParameterValue',
+		'#type => FMOne type: #FASTPyType opposite: #parentParameter'
+	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -38,3 +48,47 @@ FASTPyParameter class >> annotation [
 	<generated>
 	^ self
 ]
+
+{ #category : 'accessing' }
+FASTPyParameter >> defaultValue [
+	"Relation named: #defaultValue type: #FASTPyExpression opposite: #parentDefaultParameterValue"
+
+	<generated>
+	^ defaultValue
+]
+
+{ #category : 'accessing' }
+FASTPyParameter >> defaultValue: anObject [
+
+	<generated>
+	defaultValue := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyParameter >> defaultValueGroup [
+	<generated>
+	<navigation: 'DefaultValue'>
+	^ MooseSpecializedGroup with: self defaultValue
+]
+
+{ #category : 'accessing' }
+FASTPyParameter >> type [
+	"Relation named: #type type: #FASTPyType opposite: #parentParameter"
+
+	<generated>
+	^ type
+]
+
+{ #category : 'accessing' }
+FASTPyParameter >> type: anObject [
+
+	<generated>
+	type := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyParameter >> typeGroup [
+	<generated>
+	<navigation: 'Type'>
+	^ MooseSpecializedGroup with: self type
+]

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

@@ -216,13 +216,6 @@ FASTPyTEntityCreator >> newDecorator [
 	^ self add: FASTPyDecorator new
 ]
 
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newDefaultParameter [
-
-	<generated>
-	^ self add: FASTPyDefaultParameter new
-]
-
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newDeleteStatement [
 
@@ -783,27 +776,6 @@ FASTPyTEntityCreator >> newTypeConversion [
 	^ self add: FASTPyTypeConversion new
 ]
 
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newTypeParameter [
-
-	<generated>
-	^ self add: FASTPyTypeParameter new
-]
-
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newTypedDefaultParameter [
-
-	<generated>
-	^ self add: FASTPyTypedDefaultParameter new
-]
-
-{ #category : 'entity creation' }
-FASTPyTEntityCreator >> newTypedParameter [
-
-	<generated>
-	^ self add: FASTPyTypedParameter new
-]
-
 { #category : 'entity creation' }
 FASTPyTEntityCreator >> newUnaryOperator [
 

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

@@ -6,6 +6,7 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `parentFunctionDefinition` | `FASTPyType` | `returnType` | `FASTPyFunctionDefinition` | |
+| `parentParameter` | `FASTPyType` | `type` | `FASTPyParameter` | |
 | `parentyTypeAliasStatementAlias` | `FASTPyType` | `left` | `FASTPyTypeAliasStatement` | |
 | `parentyTypeAliasStatementType` | `FASTPyType` | `right` | `FASTPyTypeAliasStatement` | |
 
@@ -23,6 +24,7 @@ Class {
 	#instVars : [
 		'#expression => FMOne type: #FASTPyExpression opposite: #parentType',
 		'#parentFunctionDefinition => FMOne type: #FASTPyFunctionDefinition opposite: #returnType',
+		'#parentParameter => FMOne type: #FASTPyParameter opposite: #type',
 		'#parentyTypeAliasStatementAlias => FMOne type: #FASTPyTypeAliasStatement opposite: #left',
 		'#parentyTypeAliasStatementType => FMOne type: #FASTPyTypeAliasStatement opposite: #right'
 	],
@@ -86,6 +88,30 @@ FASTPyType >> parentFunctionDefinitionGroup [
 	^ MooseSpecializedGroup with: self parentFunctionDefinition
 ]
 
+{ #category : 'accessing' }
+FASTPyType >> parentParameter [
+	"Relation named: #parentParameter type: #FASTPyParameter opposite: #type"
+
+	<generated>
+	<container>
+	<derived>
+	^ parentParameter
+]
+
+{ #category : 'accessing' }
+FASTPyType >> parentParameter: anObject [
+
+	<generated>
+	parentParameter := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyType >> parentParameterGroup [
+	<generated>
+	<navigation: 'ParentParameter'>
+	^ MooseSpecializedGroup with: self parentParameter
+]
+
 { #category : 'accessing' }
 FASTPyType >> parentyTypeAliasStatementAlias [
 	"Relation named: #parentyTypeAliasStatementAlias type: #FASTPyTypeAliasStatement opposite: #left"