Manage call function

jecisc · jecisc · commit c426dfd4c8d0 · 2026-03-23T18:44:17.000+01:00
diff --git a/src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st b/src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st
@@ -151,7 +151,8 @@ Class {
 		'splat',
 		'splatParameter',
 		'comprehension',
-		'tSuperclass'
+		'tSuperclass',
+		'tCallable'
 	],
 	#category : 'FAST-Python-Model-Generator',
 	#package : 'FAST-Python-Model-Generator'
@@ -364,6 +365,7 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	conditionalExpression --|> expression.
 	conditionalExpression --|> tWithCondition.
 	conditionalExpression --|> tSuperclass.
+	conditionalExpression --|> tCallable.
 	
 	continueStatement --|> statement.
 	
@@ -450,6 +452,7 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	lambda --|> expression.
 	lambda --|> tWithParameters.
 	lambda --|> tDecoratorExpression.
+	lambda --|> tCallable.
 	
 	list --|> collectionInitializer.
 	list --|> tAsPatternTarget.
@@ -536,6 +539,7 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	tReturnReferenceable --|> tDecoratorExpression.
 	tReturnReferenceable --|> tDeletable.
 	tReturnReferenceable --|> tSuperclass.
+	tReturnReferenceable --|> tCallable.
 
 	thenClause --|> tStatementBlock.
 
@@ -636,7 +640,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
 
 	((call property: #callee) comment:
 		 'I represent what is called. Can be a class for an instantiation. A function invocation. A method invocation. The call of the return of a call. The call of something invoked from an array access...')
-	<>- ((expression property: #caller) comment: 'The call entity calling me (if it''s the case)').
+	<>- ((tCallable property: #caller) comment: 'The call entity calling me (if it''s the case)').
 	
 	(caseClause property: #pattern) <>-(tPattern property: #parentCaseClause).
 	
@@ -782,37 +786,39 @@ FASTPythonMetamodelGenerator >> defineTraits [
 
 	tAsPatternSource := (builder newTraitNamed: #TAsPatternSource) comment: 'I represent an entity that could be aliased in an as pattern.'.
 
-	(tAssignable := builder newTraitNamed: #TAssignable) comment: 'I represent something that can be assigned in an assignment'.
+	tAssignable := (builder newTraitNamed: #TAssignable) comment: 'I represent something that can be assigned in an assignment'.
 	
-	(tClassPatternElement := builder newTraitNamed: #TClassPatternElement) comment: 'I represent the elements of a class pattern in python pattern matcher. The first element is the class name, the others the arguments.'.
+	tCallable := (builder newTraitNamed: #TCallable) comment: 'I represent something that can be the receiver of a call'.
+	
+	tClassPatternElement := (builder newTraitNamed: #TClassPatternElement) comment: 'I represent the elements of a class pattern in python pattern matcher. The first element is the class name, the others the arguments.'.
 
-	(tDecoratorExpression := builder newTraitNamed: #TDecoratorExpression) comment: 'I represent an entity that *can* be the expression of a decorator.'.
+	tDecoratorExpression := (builder newTraitNamed: #TDecoratorExpression) comment: 'I represent an entity that *can* be the expression of a decorator.'.
 
 	tDefinition := builder newTraitNamed: #TDefinition.
 
-	(tDeletable := builder newTraitNamed: #TDeletable) comment: 'I represent an expression that can be in a delete statement.'.
+	tDeletable := (builder newTraitNamed: #TDeletable) comment: 'I represent an expression that can be in a delete statement.'.
 	
-	(tPattern := builder newTraitNamed: #TPattern) comment: 'I represent an entity that can be the pattern of a case clause in a match statement..'.
+	tPattern := (builder newTraitNamed: #TPattern) comment: 'I represent an entity that can be the pattern of a case clause in a match statement..'.
 
-	(tRaised := builder newTraitNamed: #TRaised) comment: 'I represent an expression that can give an exception to raise in a raise statement.'.
+	tRaised := (builder newTraitNamed: #TRaised) comment: 'I represent an expression that can give an exception to raise in a raise statement.'.
 
-	((tReturnReferenceable := builder newTraitNamed: #TReturnReferenceable) comment: 'Lot of relations in python points to references. And some nodes can return lot of those references such as call, subscript, tuple, attribute. I am here to group those dependences.').
+	tReturnReferenceable := (builder newTraitNamed: #TReturnReferenceable) comment: 'Lot of relations in python points to references. And some nodes can return lot of those references such as call, subscript, tuple, attribute. I am here to group those dependences.'.
 
 	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.'.
 
 	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.'.
 	
 	tSuperclass := (builder newTraitNamed: #TSuperclass) comment: 'My users are expressions that can define a superclass in a class declaration.'.
 	
-	(tTypeContent := builder newTraitNamed: #TTypeContent) comment: 'My user can be used as a type declaration'.
+	tTypeContent := (builder newTraitNamed: #TTypeContent) comment: 'My user can be used as a type declaration'.
 
 	tUnaryOperator := builder newTraitNamed: #TUnaryOperator.
 	
 	tWithElseClause := builder newTraitNamed: #TWithElseClause.
 
 	tWithStatementItem := (builder newTraitNamed: #TWithStatementItem) comment: 'I represent an entity that can be the item of a with_statement.'.
 
-	(tWithTypeParameters := builder newTraitNamed: #TWithTypeParameters) comment: 'I represent an entity with type parameters such as generic types, function/method definition or class definition'.
+	tWithTypeParameters := (builder newTraitNamed: #TWithTypeParameters) comment: 'I represent an entity with type parameters such as generic types, function/method definition or class definition'.
 	
 	"Remotes"
 	tAssignment := self remoteTrait: #TAssignment withPrefix: #FAST.
diff --git a/src/FAST-Python-Model/FASTPyAttributeAccess.class.st b/src/FAST-Python-Model/FASTPyAttributeAccess.class.st
@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `invokedIn` | `FASTTNamedEntity` | `invoked` | `FASTTInvocation` | Optional invocation where this name is used|
 | `parentAsPatternSource` | `FASTPyTAsPatternSource` | `source` | `FASTPyAsPattern` | |
 | `parentAsPatternTarget` | `FASTPyTAsPatternTarget` | `target` | `FASTPyAsPattern` | |
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|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `expressionStatementOwner` | `FASTTExpression` | `expression` | `FASTTExpressionStatement` | The expression statement that own me (if it's the case|
 | `parentAsPatternSource` | `FASTPyTAsPatternSource` | `source` | `FASTPyAsPattern` | |
 | `parentAssignmentLeft` | `FASTPyTAssignable` | `left` | `FASTPyAssignment` | |
@@ -26,7 +27,7 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `arguments` | `FASTTWithArguments` | `argumentOwner` | `FASTTExpression` | My arguments|
-| `callee` | `FASTPyCall` | `caller` | `FASTPyExpression` | I represent what is called. Can be a class for an instantiation. A function invocation. A method invocation. The call of the return of a call. The call of something invoked from an array access...|
+| `callee` | `FASTPyCall` | `caller` | `FASTPyTCallable` | I represent what is called. Can be a class for an instantiation. A function invocation. A method invocation. The call of the return of a call. The call of something invoked from an array access...|
 | `invoked` | `FASTTInvocation` | `invokedIn` | `FASTTNamedEntity` | The name of the behavioural invoked|
 
 
@@ -45,7 +46,7 @@ Class {
 	#traits : 'FASTPyTReturnReferenceable + FASTPyTWithStatementItem + FASTTInvocation',
 	#classTraits : 'FASTPyTReturnReferenceable classTrait + FASTPyTWithStatementItem classTrait + FASTTInvocation classTrait',
 	#instVars : [
-		'#callee => FMOne type: #FASTPyExpression opposite: #caller'
+		'#callee => FMOne type: #FASTPyTCallable opposite: #caller'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
@@ -63,7 +64,7 @@ FASTPyCall class >> annotation [
 
 { #category : 'accessing' }
 FASTPyCall >> callee [
-	"Relation named: #callee type: #FASTPyExpression opposite: #caller"
+	"Relation named: #callee type: #FASTPyTCallable opposite: #caller"
 
 	<generated>
 	<FMComment: 'I represent what is called. Can be a class for an instantiation. A function invocation. A method invocation. The call of the return of a call. The call of something invoked from an array access...'>
diff --git a/src/FAST-Python-Model/FASTPyConditionalExpression.class.st b/src/FAST-Python-Model/FASTPyConditionalExpression.class.st
@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `parentClassDefinition` | `FASTPyTSuperclass` | `superclasses` | `FASTPyClassDefinition` | |
 
 ### Children
@@ -20,8 +21,8 @@
 Class {
 	#name : 'FASTPyConditionalExpression',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTSuperclass + FASTTWithCondition',
-	#classTraits : 'FASTPyTSuperclass classTrait + FASTTWithCondition classTrait',
+	#traits : 'FASTPyTCallable + FASTPyTSuperclass + FASTTWithCondition',
+	#classTraits : 'FASTPyTCallable classTrait + FASTPyTSuperclass classTrait + FASTTWithCondition classTrait',
 	#instVars : [
 		'#elseExpression => FMOne type: #FASTPyExpression opposite: #conditionalExpressionElseOwner',
 		'#thenExpression => FMOne type: #FASTPyExpression opposite: #conditionalExpressionThenOwner'
diff --git a/src/FAST-Python-Model/FASTPyExpression.class.st b/src/FAST-Python-Model/FASTPyExpression.class.st
@@ -8,7 +8,6 @@
 | `argumentOwner` | `FASTTExpression` | `arguments` | `FASTTWithArguments` | my owner|
 | `assignedIn` | `FASTTExpression` | `expression` | `FASTTAssignment` | Optional assignment where this expression is used|
 | `attributeObjectOwner` | `FASTPyExpression` | `value` | `FASTPyAttributeAccess` | My parent if I define the object of an attribute access (if it's the case).|
-| `caller` | `FASTPyExpression` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `collectionInitializer` | `FASTPyExpression` | `initializers` | `FASTPyCollectionInitializer` | The owner of the expression|
 | `conditionalExpressionElseOwner` | `FASTPyExpression` | `elseExpression` | `FASTPyConditionalExpression` | |
 | `conditionalExpressionThenOwner` | `FASTPyExpression` | `thenExpression` | `FASTPyConditionalExpression` | |
@@ -64,7 +63,6 @@ Class {
 	#classTraits : 'FASTPyTTypeContent classTrait + FASTTExpression classTrait',
 	#instVars : [
 		'#attributeObjectOwner => FMOne type: #FASTPyAttributeAccess opposite: #value',
-		'#caller => FMOne type: #FASTPyCall opposite: #callee',
 		'#collectionInitializer => FMOne type: #FASTPyCollectionInitializer opposite: #initializers',
 		'#conditionalExpressionElseOwner => FMOne type: #FASTPyConditionalExpression opposite: #elseExpression',
 		'#conditionalExpressionThenOwner => FMOne type: #FASTPyConditionalExpression opposite: #thenExpression',
@@ -135,31 +133,6 @@ FASTPyExpression >> attributeObjectOwnerGroup [
 	^ MooseSpecializedGroup with: self attributeObjectOwner
 ]
 
-{ #category : 'accessing' }
-FASTPyExpression >> caller [
-	"Relation named: #caller type: #FASTPyCall opposite: #callee"
-
-	<generated>
-	<FMComment: 'The call entity calling me (if it''s the case)'>
-	<container>
-	<derived>
-	^ caller
-]
-
-{ #category : 'accessing' }
-FASTPyExpression >> caller: anObject [
-
-	<generated>
-	caller := anObject
-]
-
-{ #category : 'navigation' }
-FASTPyExpression >> callerGroup [
-	<generated>
-	<navigation: 'Caller'>
-	^ MooseSpecializedGroup with: self caller
-]
-
 { #category : 'accessing' }
 FASTPyExpression >> collectionInitializer [
 	"Relation named: #collectionInitializer type: #FASTPyCollectionInitializer opposite: #initializers"
diff --git a/src/FAST-Python-Model/FASTPyIdentifier.class.st b/src/FAST-Python-Model/FASTPyIdentifier.class.st
@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `parentAsPatternSource` | `FASTPyTAsPatternSource` | `source` | `FASTPyAsPattern` | |
 | `parentAsPatternTarget` | `FASTPyTAsPatternTarget` | `target` | `FASTPyAsPattern` | |
 | `parentAssignmentLeft` | `FASTPyTAssignable` | `left` | `FASTPyAssignment` | |
diff --git a/src/FAST-Python-Model/FASTPyLambda.class.st b/src/FAST-Python-Model/FASTPyLambda.class.st
@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `parentDeclarator` | `FASTPyTDecoratorExpression` | `expression` | `FASTPyDecorator` | |
 
 ### Children
@@ -19,8 +20,8 @@
 Class {
 	#name : 'FASTPyLambda',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTDecoratorExpression + FASTTWithParameters',
-	#classTraits : 'FASTPyTDecoratorExpression classTrait + FASTTWithParameters classTrait',
+	#traits : 'FASTPyTCallable + FASTPyTDecoratorExpression + FASTTWithParameters',
+	#classTraits : 'FASTPyTCallable classTrait + FASTPyTDecoratorExpression classTrait + FASTTWithParameters classTrait',
 	#instVars : [
 		'#expression => FMOne type: #FASTPyExpression opposite: #lambdaOwner'
 	],
diff --git a/src/FAST-Python-Model/FASTPySubscript.class.st b/src/FAST-Python-Model/FASTPySubscript.class.st
@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `parentAsPatternSource` | `FASTPyTAsPatternSource` | `source` | `FASTPyAsPattern` | |
 | `parentAsPatternTarget` | `FASTPyTAsPatternTarget` | `target` | `FASTPyAsPattern` | |
 | `parentAssignmentLeft` | `FASTPyTAssignable` | `left` | `FASTPyAssignment` | |
diff --git a/src/FAST-Python-Model/FASTPyTCallable.trait.st b/src/FAST-Python-Model/FASTPyTCallable.trait.st
@@ -0,0 +1,57 @@
+"
+I represent something that can be the receiver of a call
+
+## Relations
+======================
+
+### Parents
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
+
+
+
+"
+Trait {
+	#name : 'FASTPyTCallable',
+	#instVars : [
+		'#caller => FMOne type: #FASTPyCall opposite: #callee'
+	],
+	#category : 'FAST-Python-Model-Traits',
+	#package : 'FAST-Python-Model',
+	#tag : 'Traits'
+}
+
+{ #category : 'meta' }
+FASTPyTCallable classSide >> annotation [
+
+	<FMClass: #TCallable super: #Object>
+	<package: #'FAST-Python-Model'>
+	<generated>
+	^ self
+]
+
+{ #category : 'accessing' }
+FASTPyTCallable >> caller [
+	"Relation named: #caller type: #FASTPyCall opposite: #callee"
+
+	<generated>
+	<FMComment: 'The call entity calling me (if it''s the case)'>
+	<container>
+	<derived>
+	^ caller
+]
+
+{ #category : 'accessing' }
+FASTPyTCallable >> caller: anObject [
+
+	<generated>
+	caller := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyTCallable >> callerGroup [
+	<generated>
+	<navigation: 'Caller'>
+	^ MooseSpecializedGroup with: self caller
+]
diff --git a/src/FAST-Python-Model/FASTPyTReturnReferenceable.trait.st b/src/FAST-Python-Model/FASTPyTReturnReferenceable.trait.st
@@ -7,6 +7,7 @@ Lot of relations in python points to references. And some nodes can return lot o
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `caller` | `FASTPyTCallable` | `callee` | `FASTPyCall` | The call entity calling me (if it's the case)|
 | `parentAsPatternSource` | `FASTPyTAsPatternSource` | `source` | `FASTPyAsPattern` | |
 | `parentAssignmentLeft` | `FASTPyTAssignable` | `left` | `FASTPyAssignment` | |
 | `parentClassDefinition` | `FASTPyTSuperclass` | `superclasses` | `FASTPyClassDefinition` | |
@@ -20,8 +21,8 @@ Lot of relations in python points to references. And some nodes can return lot o
 "
 Trait {
 	#name : 'FASTPyTReturnReferenceable',
-	#traits : 'FASTPyTAsPatternSource + FASTPyTAssignable + FASTPyTDecoratorExpression + FASTPyTDeletable + FASTPyTRaised + FASTPyTSplatExpression + FASTPyTSuperclass',
-	#classTraits : 'FASTPyTAsPatternSource classTrait + FASTPyTAssignable classTrait + FASTPyTDecoratorExpression classTrait + FASTPyTDeletable classTrait + FASTPyTRaised classTrait + FASTPyTSplatExpression classTrait + FASTPyTSuperclass classTrait',
+	#traits : 'FASTPyTAsPatternSource + FASTPyTAssignable + FASTPyTCallable + FASTPyTDecoratorExpression + FASTPyTDeletable + FASTPyTRaised + FASTPyTSplatExpression + FASTPyTSuperclass',
+	#classTraits : 'FASTPyTAsPatternSource classTrait + FASTPyTAssignable classTrait + FASTPyTCallable classTrait + FASTPyTDecoratorExpression classTrait + FASTPyTDeletable classTrait + FASTPyTRaised classTrait + FASTPyTSplatExpression classTrait + FASTPyTSuperclass classTrait',
 	#category : 'FAST-Python-Model-Traits',
 	#package : 'FAST-Python-Model',
 	#tag : 'Traits'
diff --git a/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st b/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st
