Update API to latest Moose

Author: jecisc

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

@@ -5270,7 +5270,7 @@ FamixPythonProject1Test >> testPackageWithoutInitFile [
 
 	self assert: rootPackage class equals: FamixPythonPackage.
 	self assert: rootPackage name equals: 'root4'.
-	self assert: (rootPackage query descendants ofType: FamixTModule) size equals: 2
+	self assert: (rootPackage query containedEntities ofType: FamixTModule) size equals: 2
 ]
 
 { #category : 'tests - packages' }

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

@@ -24,11 +24,11 @@ FamixPythonAbstractImportResolvable >> findTargetEntityFor: aPath from: startEnt
 	possibleEntities := startEntities select: [ :possibleEntity | possibleEntity name = splittedPath first and: [ possibleEntity isStub not ] ].
 	splittedPath removeFirst.
 	[ splittedPath isNotEmpty ] whileTrue: [
-		| childName |
-		childName := splittedPath anyOne.
-		splittedPath removeFirst.
-		possibleEntities := possibleEntities flatCollect: [ :possibleEntity |
-			                    possibleEntity children select: [ :child | (child isPackage or: [ child isModule ]) and: [ child name = childName ] ] ] ].
+			| childName |
+			childName := splittedPath anyOne.
+			splittedPath removeFirst.
+			possibleEntities := possibleEntities flatCollect: [ :possibleEntity |
+				                    possibleEntity containedEntities select: [ :child | (child isPackage or: [ child isModule ]) and: [ child name = childName ] ] ] ].
 	possibleEntities ifEmpty: [ SRNoResolutionPossible signal ].
 
 	possibleEntities size = 1 ifFalse: [ self error: 'There should be only one possible entity to import.' ].

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

@@ -42,33 +42,26 @@ FamixPythonFromImportResolvable >> resolveInScope: aScope currentEntity: current
 	"If the path is '.' then we are in the parent of the current entity.
 	Else we will need to resolve the path."
 	targetModule := path = '.'
-		                ifTrue: [ (currentEntity query ancestors ofType: FamixTPackage) anyOne ]
+		                ifTrue: [ (currentEntity query containers ofType: FamixTPackage) anyOne ]
 		                ifFalse: [
 				                | remainingPath |
 				                (path beginsWith: '.')
 					                ifTrue: [
 							                | currentPackage |
 							                "In case of a relative path we need to find the origin package for the resolution"
 							                remainingPath := path allButFirst.
-							                currentPackage := (currentEntity query ancestors ofType: FamixTPackage) anyOne. "If we have a module, we need to start with its parent package. If we have a package, it starts in itself."
+							                currentPackage := (currentEntity query containers ofType: FamixTPackage) anyOne. "If we have a module, we need to start with its parent package. If we have a package, it starts in itself."
 							                [ remainingPath beginsWith: '.' ] whileTrue: [
 									                currentPackage := currentPackage parentPackage.
 									                remainingPath := remainingPath allButFirst ].
-							                possibleEntities := currentPackage children ]
+							                possibleEntities := currentPackage containedEntities ]
 					                ifFalse: [ "If we have an absolute path we just start at the root."
 							                remainingPath := path.
-							                possibleEntities := currentEntity rootParents flatCollect: #children ].
-
-				                "We trim the path because we can have spaces after the dots in relativ paths."
-				                self findTargetEntityFor: remainingPath trim from: possibleEntities ].
-
-
-	"If we have an import all then we import the targeted module directly."
+							                possibleEntities := currentEntity rootContainers flatCollect: #children ]. "We trim the path because we can have spaces after the dots in relativ paths."
+				                self findTargetEntityFor: remainingPath trim from: possibleEntities ]. "If we have an import all then we import the targeted module directly."
 	possibleEntities := entityName = '*'
 		                    ifTrue: [ { targetModule } ]
-		                    ifFalse: [ targetModule allChildren select: [ :child | child isNamedEntity and: [ child name = entityName ] ] ].
-
-	"It is possible that we have multiple entities with the same name and in that case, python select the last one declared. So we sort by source anchor position to find this one."
+		                    ifFalse: [ targetModule allContainedEntities select: [ :child | child isNamedEntity and: [ child name = entityName ] ] ]. "It is possible that we have multiple entities with the same name and in that case, python select the last one declared. So we sort by source anchor position to find this one."
 	self result: (possibleEntities detectMax: [ :possibleEntity |
 				 possibleEntity sourceAnchor
 					 ifNil: [ 1 "Packages might not have sources." ]

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

@@ -36,7 +36,7 @@ FamixPythonMethodInvocationResolvable >> identifier: anObject [
 FamixPythonMethodInvocationResolvable >> resolveInScope: aScope currentEntity: currentEntity [
 
 	| reacheableClasses candidates |
-	reacheableClasses := aScope entity withAllParents flatCollect: [ :entity | entity reachableEntities select: #isClass ].
+	reacheableClasses := aScope entity withAllContainers flatCollect: [ :entity | entity reachableEntities select: #isClass ].
 	candidates := OrderedCollection new.
 
 	reacheableClasses do: [ :class |

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

@@ -36,7 +36,7 @@ FamixPythonVisitor >> checkShadowingOfName: aString during: aBlock [
 
 	| shadowedEntity newEntity |
 	self withCurrentEntityDo: [ :entity |
-			((entity query descendants ofType: FamixTShadowable) select: [ :child | child name = aString ]) ifNotEmpty: [ :entities |
+			((entity query containedEntities ofType: FamixTShadowable) select: [ :child | child name = aString ]) ifNotEmpty: [ :entities |
 				shadowedEntity := entities detectMax: [ :anEntity | anEntity sourceAnchor startPos ] ] ].
 
 	newEntity := aBlock value.
@@ -208,7 +208,7 @@ FamixPythonVisitor >> ensureStubUnknownEntityNamed: aString [
 { #category : 'ensure entity' }
 FamixPythonVisitor >> ensureStubUnknownEntityNamed: aString in: anEntity [
 
-	^ anEntity children
+	^ anEntity containedEntities
 		  detect: [ :child | child name = aString ]
 		  ifNone: [
 				  (model newUnknownEntityNamed: aString)
@@ -582,10 +582,8 @@ FamixPythonVisitor >> manageWriteAccessTo: aNode [
 	"I'm managing the write access to an identifier. I have an alternative for access to an attibute such as `instance.var = 3`. See #manageAttributeWriteAccessTo: for this."
 
 	| variable name |
-	name := aNode sourceText.
-
-	"If we have a variable of this name already, we should not recreate it. Except if this variable got shadowed! In that case, we should recreate it."
-	(self currentEntity query descendants ofType: FamixTStructuralEntity)
+	name := aNode sourceText. "If we have a variable of this name already, we should not recreate it. Except if this variable got shadowed! In that case, we should recreate it."
+	(self currentEntity query containedEntities ofType: FamixTStructuralEntity)
 		detect: [ :child | child name = name and: [ child isShadowable not or: [ child isShadowed not ] ] ]
 		ifFound: [ :var | variable := var ]
 		ifNone: [
@@ -1408,7 +1406,7 @@ FamixPythonVisitor >> visitModule: aModuleNode [
 
 				self currentEntity: entity ].
 
-		fileReference basename = #'moduleAtRoot111.py' ifTrue: [ 1 halt ].
+		fileReference basename = #'moduleAtRoot2ip.py' ifTrue: [ 1 halt ].
 
 		self visitChildren: aModuleNode.
 

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

@@ -4,7 +4,7 @@ Extension { #name : 'TEntityMetaLevelDependency' }
 TEntityMetaLevelDependency >> allEffectiveImports [
 	"Return all the imports effective in this entity."
 
-	^ self withAllParents flatCollect: [ :entity | entity query outgoing local dependenciesOfType: FamixPythonImport ]
+	^ self withAllContainers flatCollect: [ :entity | entity query outgoing local dependenciesOfType: FamixPythonImport ]
 ]
 
 { #category : '*Famix-Python-Importer' }