Merge fc3eed5

Author: JMLF

resources/examples/project1/src/moduleAtRoot15.py

@@ -1,4 +1,4 @@
-# Some examples of temporary variables usage. Note everything is here.
+# Some examples of temporary variables usage. Not everything is here.
 
 print(localVarInGeneratorExpression for localVarInGeneratorExpression in range(5))
 

resources/examples/project1/src/moduleAtRoot4.py

@@ -9,3 +9,9 @@
 moduleAtRootSpaceString = ' '
 
 numpy.random.random(50000)**2
+
+
+# next two lines are for a regression test
+from tensorflow.python.ops import variable_scope
+
+variable_scope.variable_scope(moduleAtRootSpaceString or "rnn_decoder")

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

@@ -2327,8 +2327,6 @@ FamixPythonProject1Test >> testFunctionSourceAnchor [
 FamixPythonProject1Test >> testFunctionTypedDefaultParameter [
 
 	| function parameter |
-	self skip.
-	self flag: #todo. "Manage assertions on types."
 	function := self functionNamed: 'function_with_typed_default_parameter'.
 	parameter := self parameterNamed: 'default_typed_parameter'.
 
@@ -2340,14 +2338,32 @@ FamixPythonProject1Test >> testFunctionTypedDefaultParameter [
 	self assert: parameter parentBehaviouralEntity equals: function.
 	self assert: parameter hasDefaultValue.
 	self deny: parameter isListSplat.
-	self deny: parameter isDictionarySplat
+	self deny: parameter isDictionarySplat.
+
+
+	self flag: #todo "Manage assertions on types."
 ]
 
 { #category : 'tests - parameters' }
 FamixPythonProject1Test >> testFunctionTypedParameter [
 
-	self flag: #todo.
-	self skip
+	| function parameter |
+	function := self functionNamed: 'function_with_typed_parameter'.
+	parameter := self parameterNamed: 'typed_parameter'.
+
+	self assert: function parameters size equals: 1.
+	self assert: function keywordSeparatorPosition equals: nil.
+	self assert: function positionalSeparatorPosition equals: nil.
+	self assertCollection: function parameters hasSameElements: { parameter }.
+	self assert: parameter name equals: 'typed_parameter'.
+	self deny: parameter isStub.
+	self assert: parameter class equals: FamixPythonParameter.
+	self assert: parameter parentBehaviouralEntity equals: function.
+	self deny: parameter hasDefaultValue.
+	self deny: parameter isListSplat.
+	self deny: parameter isDictionarySplat.
+	
+	 self flag: #todo. "Add assertions on type because we currently only have assertions on the existance of the parameter."
 ]
 
 { #category : 'tests - functions' }
@@ -3205,6 +3221,21 @@ FamixPythonProject1Test >> testInvocationToUnknowEntityOfSameNameAsUnknowPackage
 	self assert: unknowFunction isStub
 ]
 
+{ #category : 'tests' }
+FamixPythonProject1Test >> testInvocationToUnknowEntityOfSameNameAsUnknowPackage2 [
+	"Regression test"
+
+	| unknowFunction |
+	"I get the one without children to have the bottom most entity of this name since it should be in an entity of the same name."
+	unknowFunction := self model entities detect: [ :entity |
+		                  entity class = FamixPythonUnknownEntity and: [ entity name = 'variable_scope' and: [ entity childEntities isEmpty ] ] ].
+
+	self assert: unknowFunction name equals: 'variable_scope'.
+	self assert: unknowFunction parentPackage name equals: 'variable_scope'.
+	self deny: unknowFunction identicalTo: unknowFunction parentPackage.
+	self assert: unknowFunction isStub
+]
+
 { #category : 'tests - invocations' }
 FamixPythonProject1Test >> testInvocationsThatCannotBeResolved [
 	"I created a file with a lot of invocations that cannot be resolved and we will ensure we do not create any invocation for them."

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

@@ -389,7 +389,8 @@ FamixPythonVisitor >> manageAttributeAsCallReceiver: aNode [
 						   expectedKind: {
 								   FamixPythonFunction.
 								   FamixPythonClass };
-						   notFoundReplacementEntity: [ :unresolved :currentEntity | "This one can be a function or a class"
+						   notFoundReplacementEntity: [ :unresolved :currentEntity |
+								"This one can be a function or a class"
 								   (self ensureStubUnknownEntityNamed: unresolved identifier)
 									   parentPackage: import importedEntity;
 									   yourself ];
@@ -402,10 +403,7 @@ FamixPythonVisitor >> manageAttributeAsCallReceiver: aNode [
 		ifFound: [ :import |
 				^ self
 					  resolve: ((FamixPythonDependencyFromImportedEntityResolvable identifier: identifier import: import)
-							   notFoundReplacementEntity: [ :unresolved :currentEntity |
-									   (self ensureStubUnknownEntityNamed: unresolved identifier)
-										   parentPackage: unresolved import importedEntity;
-										   yourself ];
+							   notFoundReplacementEntity: [ :unresolved :currentEntity | self ensureStubUnknownEntityNamed: unresolved identifier in: unresolved import importedEntity ];
 							   yourself)
 					  foundAction: [ :result :currentEntity | self createAssociationsForFunctionCallNode: (aNode parentOfType: #call) forResult: result in: currentEntity ] ].
 
@@ -1654,6 +1652,18 @@ FamixPythonVisitor >> visitTuplePattern: aNode [
 	^ self visitChildren: aNode
 ]
 
+{ #category : 'visiting' }
+FamixPythonVisitor >> visitTypedDefaultParameter: aNode [
+	"
+	TODO
+	"
+
+	self flag: #todo. "Manage typing"
+	(self visit: aNode _name) attributeAt: #hasDefaultValue put: true.
+	self visit: aNode _type.
+	self visit: aNode _value
+]
+
 { #category : 'visiting - visitChildren' }
 FamixPythonVisitor >> visitUnaryOperator: aNode [
 	"

src/Famix-Python-Importer/FamixTSNodeWrapper.extension.st

@@ -90,7 +90,15 @@ FamixTSNodeWrapper >> isParameterDeclaration [
 	"In a default parameter, it represent the parameter if it's in the name field."
 	"def f(arg=3):"
 	(self parent type = #default_parameter and: [ self parent _name = self ]) ifTrue: [ ^ true ].
-
+	
+	"Typed parameter
+	def f(arg: int):"
+	(self parent type = #typed_parameter) ifTrue: [ ^ true].
+	
+	"Typed default parameter
+	def (arg: int = 5):"
+	(self parent type = #typed_default_parameter) ifTrue: [ ^true ].
+	
 	^ false
 ]