Merge 05c653c

Author: jecisc

resources/examples/project1/src/moduleAtRoot13.py

@@ -174,3 +174,19 @@ def function_to_invoke_in_list_splat(indices):
 indices = [0, 2, 4, 6, 8]
 
 var = [*function_to_invoke_in_list_splat(slice, indices[:-1], indices[1:])]
+
+variableToAccessInTuple = 7
+aTuple = (1, 2, variableToAccessInTuple, 4)
+
+def variable_to_access_in_tuple_return():
+    variableToAccessInTuple = 8
+    return 0, variableToAccessInTuple
+
+def function_with_keyword_argument(arg0, arg1=10):
+    return arg0 + arg1
+
+variableToAccessInKeywordArgumentCall = 42
+function_with_keyword_argument(1, arg1 = variableToAccessInKeywordArgumentCall)
+
+variableToAccessInKeywordArgumentCallInParenthesis = 42 
+function_with_keyword_argument(1, arg1 = (variableToAccessInKeywordArgumentCallInParenthesis))

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

@@ -5749,6 +5749,28 @@ FamixPythonProject1Test >> testReadAccessInDictionarySplat [
 	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
 ]
 
+{ #category : 'tests - accesses' }
+FamixPythonProject1Test >> testReadAccessInExpressionList [
+	"same as tuple but it becomes an expression_list node in some cases like in a return:
+	def func():
+		return a, b
+	 "
+	| local function access |
+	local := self localVariableNamed: 'variableToAccessInTuple'.
+	function := self functionNamed: 'variable_to_access_in_tuple_return'.
+
+	access := (local incomingAccesses select: [ :anAccess | anAccess accessor = function ]) detectMax: [ :anAccess | anAccess sourceAnchor startPos ].
+
+	self assert: access class equals: FamixPythonAccess.
+	self assert: access source equals: function.
+	self assert: access accessor equals: function.
+	self assert: access target equals: local.
+	self assert: access variable equals: local.
+	self deny: access isWrite.
+	self assert: access isRead.
+	self assert: (function accesses anySatisfy: [ :anAccess | anAccess variable = local ])
+]
+
 { #category : 'tests - accesses' }
 FamixPythonProject1Test >> testReadAccessInGeneratorExpression [
 
@@ -5761,6 +5783,44 @@ FamixPythonProject1Test >> testReadAccessInGeneratorExpression [
 	self assert: accesses size equals: 2
 ]
 
+{ #category : 'tests - accesses' }
+FamixPythonProject1Test >> testReadAccessInKeywordArgument [
+
+	| global module access |
+	global := self globalVariableNamed: 'variableToAccessInKeywordArgumentCall'.
+	module := self moduleNamed: 'moduleAtRoot13'.
+
+	access := (global incomingAccesses select: [ :anAccess | anAccess accessor = module ]) detectMax: [ :anAccess | anAccess sourceAnchor startPos ].
+
+	self assert: access class equals: FamixPythonAccess.
+	self assert: access source equals: module.
+	self assert: access accessor equals: module.
+	self assert: access target equals: global.
+	self assert: access variable equals: global.
+	self deny: access isWrite.
+	self assert: access isRead.
+	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
+]
+
+{ #category : 'tests - accesses' }
+FamixPythonProject1Test >> testReadAccessInKeywordArgumentInParenthesis [
+
+	| global module access |
+	global := self globalVariableNamed: 'variableToAccessInKeywordArgumentCallInParenthesis'.
+	module := self moduleNamed: 'moduleAtRoot13'.
+
+	access := (global incomingAccesses select: [ :anAccess | anAccess accessor = module ]) detectMax: [ :anAccess | anAccess sourceAnchor startPos ].
+
+	self assert: access class equals: FamixPythonAccess.
+	self assert: access source equals: module.
+	self assert: access accessor equals: module.
+	self assert: access target equals: global.
+	self assert: access variable equals: global.
+	self deny: access isWrite.
+	self assert: access isRead.
+	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
+]
+
 { #category : 'tests - accesses' }
 FamixPythonProject1Test >> testReadAccessInLambdaBody [
 
@@ -5923,6 +5983,25 @@ FamixPythonProject1Test >> testReadAccessInPair [
 	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
 ]
 
+{ #category : 'tests - accesses' }
+FamixPythonProject1Test >> testReadAccessInTuple [
+
+	| global module access |
+	global := self globalVariableNamed: 'variableToAccessInTuple'.
+	module := self moduleNamed: 'moduleAtRoot13'.
+
+	access := (global incomingAccesses select: [ :anAccess | anAccess accessor = module ]) detectMax: [ :anAccess | anAccess sourceAnchor startPos ].
+
+	self assert: access class equals: FamixPythonAccess.
+	self assert: access source equals: module.
+	self assert: access accessor equals: module.
+	self assert: access target equals: global.
+	self assert: access variable equals: global.
+	self deny: access isWrite.
+	self assert: access isRead.
+	self assert: (module accesses anySatisfy: [ :anAccess | anAccess variable = global ])
+]
+
 { #category : 'tests - accesses' }
 FamixPythonProject1Test >> testReadAccessInTypedDefaultParameter [
 

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

@@ -1009,6 +1009,12 @@ FamixPythonVisitor >> visitEscapeSequence: aNode [
 	^ self visitChildren: aNode
 ]
 
+{ #category : 'visiting - visitChildren' }
+FamixPythonVisitor >> visitExpressionList: aNode [
+
+	^ self visitChildren: aNode
+]
+
 { #category : 'visiting - visitChildren' }
 FamixPythonVisitor >> visitExpressionStatement: aNode [
 

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

@@ -12,10 +12,12 @@ FamixTSNodeWrapper >> isAccessOrReferenceNode [
 	"I should return true if an Identifier node represent an access or a reference."
 
 	(self parent type = #attribute and: [ self parent isInCall ]) ifTrue: [ ^ true ].
+	
+	(self isInField: #value ofParentOfType: #keyword_argument) ifTrue: [ ^ true ].
 
 	^ #( elif_clause list argument_list return_statement lambda if_statement comparison_operator binary_operator assignment not_operator expression_statement
 	     augmented_assignment unary_operator boolean_operator pair list_splat default_parameter dictionary_splat #if_clause #for_in_clause generator_expression
-	     list_comprehension dictionary_comprehension string_content interpolation subscript) includes: self parent type
+	     list_comprehension dictionary_comprehension string_content interpolation subscript tuple expression_list) includes: self parent type
 ]
 
 { #category : '*Famix-Python-Importer' }