First test on invocations

src/Famix-Python-Entities/FamixPythonClass.class.st

@@ -19,6 +19,7 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `accesses` | `FamixTWithAccesses` | `accessor` | `FamixTAccess` | Accesses to variables made by this behaviour.|
+| `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
 | `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
 | `superInheritances` | `FamixTWithInheritances` | `subclass` | `FamixTInheritance` | Superinheritance relationships, i.e. known superclasses of this type.|
 
@@ -55,8 +56,8 @@
 Class {
 	#name : 'FamixPythonClass',
 	#superclass : 'FamixPythonType',
-	#traits : 'FamixTClass + FamixTImportable + FamixTShadowable + FamixTShadower + FamixTWithAccesses + FamixTWithAnnotationInstances + FamixTWithLambdas + FamixTWithReferences',
-	#classTraits : 'FamixTClass classTrait + FamixTImportable classTrait + FamixTShadowable classTrait + FamixTShadower classTrait + FamixTWithAccesses classTrait + FamixTWithAnnotationInstances classTrait + FamixTWithLambdas classTrait + FamixTWithReferences classTrait',
+	#traits : 'FamixTClass + FamixTImportable + FamixTShadowable + FamixTShadower + FamixTWithAccesses + FamixTWithAnnotationInstances + FamixTWithInvocations + FamixTWithLambdas + FamixTWithReferences',
+	#classTraits : 'FamixTClass classTrait + FamixTImportable classTrait + FamixTShadowable classTrait + FamixTShadower classTrait + FamixTWithAccesses classTrait + FamixTWithAnnotationInstances classTrait + FamixTWithInvocations classTrait + FamixTWithLambdas classTrait + FamixTWithReferences classTrait',
 	#instVars : [
 		'#instancedClasses => FMMany type: #FamixPythonClass opposite: #metaclass',
 		'#isMetaclass => FMProperty',

src/Famix-Python-Entities/FamixPythonPackage.class.st

@@ -20,6 +20,7 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `accesses` | `FamixTWithAccesses` | `accessor` | `FamixTAccess` | Accesses to variables made by this behaviour.|
+| `outgoingInvocations` | `FamixTWithInvocations` | `sender` | `FamixTInvocation` | Outgoing invocations sent by this behaviour.|
 | `outgoingReferences` | `FamixTWithReferences` | `referencer` | `FamixTReference` | References from this entity to other entities.|
 
 ### Incoming dependencies
@@ -46,8 +47,8 @@
 Class {
 	#name : 'FamixPythonPackage',
 	#superclass : 'FamixPythonContainerEntity',
-	#traits : 'FamixTImportable + FamixTPackage + FamixTPackageable + FamixTReferenceable + FamixTWithAccesses + FamixTWithComments + FamixTWithFunctions + FamixTWithGlobalVariables + FamixTWithLambdas + FamixTWithReferences',
-	#classTraits : 'FamixTImportable classTrait + FamixTPackage classTrait + FamixTPackageable classTrait + FamixTReferenceable classTrait + FamixTWithAccesses classTrait + FamixTWithComments classTrait + FamixTWithFunctions classTrait + FamixTWithGlobalVariables classTrait + FamixTWithLambdas classTrait + FamixTWithReferences classTrait',
+	#traits : 'FamixTImportable + FamixTPackage + FamixTPackageable + FamixTReferenceable + FamixTWithAccesses + FamixTWithComments + FamixTWithFunctions + FamixTWithGlobalVariables + FamixTWithInvocations + FamixTWithLambdas + FamixTWithReferences',
+	#classTraits : 'FamixTImportable classTrait + FamixTPackage classTrait + FamixTPackageable classTrait + FamixTReferenceable classTrait + FamixTWithAccesses classTrait + FamixTWithComments classTrait + FamixTWithFunctions classTrait + FamixTWithGlobalVariables classTrait + FamixTWithInvocations classTrait + FamixTWithLambdas classTrait + FamixTWithReferences classTrait',
 	#category : 'Famix-Python-Entities-Entities',
 	#package : 'Famix-Python-Entities',
 	#tag : 'Entities'

src/Famix-Python-Generator/FamixPythonGenerator.class.st

@@ -94,6 +94,7 @@ FamixPythonGenerator >> defineHierarchy [
 	class --|> #TShadower.
 	class --|> #TWithAccesses.  
 	class --|> #TWithReferences. 
+	class --|> #TWithInvocations.
 
 	containerEntity --|> namedEntity.
 	containerEntity --|> #TWithClasses.
@@ -185,6 +186,7 @@ FamixPythonGenerator >> defineHierarchy [
 	package --|> #TWithAccesses.
 	package --|> #TWithReferences.
 	package --|> #TReferenceable.
+	package --|> #TWithInvocations.
 
 	parameter --|> namedEntity.
 	parameter --|> #TParameter.

src/Famix-Python-Importer-Tests/FamixPythonProject1Test.class.st

@@ -779,6 +779,23 @@ FamixPythonProject1Test >> testFunctionInAPackage [
 	self assert: function functionOwner equals: (self packageNamed: 'subsubpackage1')
 ]
 
+{ #category : 'tests - invocations' }
+FamixPythonProject1Test >> testFunctionInvocationFromModule [
+
+	| module function invocation |
+	function := self functionNamed: 'function_printing_arg'.
+	module := self moduleNamed: 'moduleAtRoot'.
+
+	invocation := function incomingInvocations detect: [ :aReference | aReference sender = module ].
+
+	self assert: invocation class equals: FamixPythonInvocation.
+	self assert: invocation source equals: module.
+	self assert: invocation sender equals: module.
+	self assertCollection: invocation target hasSameElements: { function }.
+	self assert: invocation anyCandidate equals: function.
+	self assert: (module outgoingInvocations anySatisfy: [ :aReference | aReference anyCandidate = function ])
+]
+
 { #category : 'tests - references' }
 FamixPythonProject1Test >> testFunctionReferenceFromClass [
 
@@ -1019,9 +1036,9 @@ FamixPythonProject1Test >> testFunctionSourceAnchor [
 
 	self assert: function sourceAnchor isNotNil.
 	self assert: function sourceText equals: ('def sort_list(list1, list2):
-	zipped_pairs = zip(list2, list1)
-	z = [x for _, x in sorted(zipped_pairs)]
-	return z' copyReplaceAll: String cr with: String lf)
+    zipped_pairs = zip(list2, list1)
+    z = [x for _, x in sorted(zipped_pairs)]
+    return z' copyReplaceAll: String cr with: String lf)
 ]
 
 { #category : 'tests - functions' }

src/Famix-Python-Importer/FamixPythonImporter.class.st

@@ -78,7 +78,7 @@ FamixPythonImporter >> importFileReference: aFileReference [
 FamixPythonImporter >> importPythonFile: aFileReference [
 
 	('Importing ' , aFileReference pathString) traceCr.
-	"(aFileReference basename = #'moduleAtRoot6.py') ifTrue: [ 1halt ]."
+	"(aFileReference basename = #'moduleAtRoot.py') ifTrue: [ 1halt ]."
 	(PythonParser parseFileWithErrors: aFileReference) acceptVisitor: visitor
 ]
 

src/Famix-Python-Importer/FamixPythonImporterVisitor.class.st

@@ -278,6 +278,17 @@ FamixPythonImporterVisitor >> ensureStubContainerNamed: aString [
 			  yourself ]
 ]
 
+{ #category : 'private-entity-creation' }
+FamixPythonImporterVisitor >> ensureStubFunctionNamed: aName [
+
+	^ model allFunctions
+		  detect: [ :function | function isStub and: [ function name = aName ] ]
+		  ifNone: [
+			  (model newFunctionNamed: aName)
+				  isStub: true;
+				  yourself ]
+]
+
 { #category : 'private-entity-creation' }
 FamixPythonImporterVisitor >> ensureStubPackageNamed: aString [
 
@@ -811,6 +822,28 @@ FamixPythonImporterVisitor >> visitFile: aFileNode [
 		  ifFalse: [ self popScope ]
 ]
 
+{ #category : 'visiting' }
+FamixPythonImporterVisitor >> visitFunctionCallExpression: aFunctionCallExpression [
+
+	self flag: #todo. "Temporary hack"
+	(aFunctionCallExpression receiver isKindOf: PyFunctionCallExpressionNode) ifFalse: [
+		self
+			resolve: ((SRInvocationWithNode identifier: aFunctionCallExpression receiver name)
+					 expectedKind: FamixPythonFunction;
+					 notFoundReplacementEntity: [ :unresolved :currentEntity | unresolved identifier = 'inner_function' ifTrue: [ 1halt ]. "1 halt." { (self ensureStubFunctionNamed: unresolved identifier) } ];
+					 yourself)
+			foundAction: [ :entities :currentEntity |
+				| invocation |
+				invocation := self model newInvocation
+					              candidates: entities;
+					              sender: currentEntity;
+					              yourself.
+				self setSourceAnchor: invocation from: aFunctionCallExpression ] ].
+
+
+	^ super visitFunctionCallExpression: aFunctionCallExpression
+]
+
 { #category : 'visiting' }
 FamixPythonImporterVisitor >> visitFunctionCallReceiverVariable: aFunctionCallReceiverVariable [