Refactore the context management to allow the build of CFG from multiple entry points (function def, method def, class def or module)

This will be done in a future commit

Author: jecisc

src/FAST-Python-Tools/FASTCFGContextEntry.class.st

@@ -32,6 +32,11 @@ FASTCFGContextEntry >> addBlock: aBlock [
 	currentBlocks add: aBlock
 ]
 
+{ #category : 'adding' }
+FASTCFGContextEntry >> addNextBlock: aBlock [ 
+	self conditional addNextBlock: aBlock
+]
+
 { #category : 'accessing' }
 FASTCFGContextEntry >> conditional [
 	^ conditional
@@ -63,7 +68,7 @@ FASTCFGContextEntry >> flushCurrentBlocks [
 FASTCFGContextEntry >> initialize [
 
 	super initialize.
-	self flushCurrentBlocks
+	currentBlocks := OrderedCollection new
 ]
 
 { #category : 'accessing' }
@@ -81,7 +86,7 @@ FASTCFGContextEntry >> printOn: aStream [
 
 	aStream nextPutAll: ' [ '.
 	self conditional
-		ifNil: [ aStream nextPutAll: 'Root' ]
+		ifNil: [ aStream nextPutAll: 'No block' ]
 		ifNotNil: [ self conditional printOn: aStream ].
 	aStream nextPutAll: ' ]'
 ]

src/FAST-Python-Tools/FASTCFGRootContextEntry.class.st

@@ -0,0 +1,36 @@
+"
+I am the root context entry to represent the statement block that is given to prodiuce the CFG
+"
+Class {
+	#name : 'FASTCFGRootContextEntry',
+	#superclass : 'FASTCFGContextEntry',
+	#category : 'FAST-Python-Tools-CFG/DataFlow',
+	#package : 'FAST-Python-Tools',
+	#tag : 'CFG/DataFlow'
+}
+
+{ #category : 'adding' }
+FASTCFGRootContextEntry >> addNextBlock: aBlock [
+	"Nothing to do at root."
+
+	
+]
+
+{ #category : 'accessing' }
+FASTCFGRootContextEntry >> conditional [
+
+	^ nil
+]
+
+{ #category : 'accessing' }
+FASTCFGRootContextEntry >> flushCurrentBlocks [ 
+	"In the root entry we do nothing because we want to keep the info of the root blocks to set the null block if needed."
+]
+
+{ #category : 'printing' }
+FASTCFGRootContextEntry >> printOn: aStream [
+
+	super printOn: aStream.
+
+	aStream nextPutAll: ' - Root'
+]

src/FAST-Python-Tools/FASTPythonCFGVisitor.class.st

@@ -127,9 +127,7 @@ FASTPythonCFGVisitor >> visitFASTPyForStatement: aForStatement [
 FASTPythonCFGVisitor >> visitFASTPyFunctionDefinition: aFunction [
 	"We do not manage the function in itself only its content"
 
-	(aFunction containedEntities sorted: #endPos ascending) do: [ :child | child accept: self ].
-
-	self buildBlockIfNeeded
+	self visitFASTPyTDefinition: aFunction
 ]
 
 { #category : 'visiting' }

src/FAST-Python-Tools/FASTTCFGUtility.trait.st

@@ -136,7 +136,7 @@ FASTTCFGUtility >> buildBlockOfType: aBlockClass [
 { #category : 'running' }
 FASTTCFGUtility >> buildCFGOf: aFASTModel [
 
-	context push: FASTCFGContextEntry new.
+	context push: FASTCFGRootContextEntry new.
 	aFASTModel accept: self.
 	self shouldBuildNullBlock ifTrue: [ self buildBlockOfType: FASTCFGNullBlock ].
 	self assert: context size = 1.
@@ -160,7 +160,7 @@ FASTTCFGUtility >> endBlock [
 
 	"In case we are finishing the first block of a loop, we finilize the loop.
 	In the past, this was done before popping loops from the context, but doing it here with this condition allows to easily manage the else clause of loops in Python."
-	( self currentConditional isLoop and: [  self currentConditional nextBlocks size = 1 ]) ifTrue: [ self finializeLoop ].
+	( context top isLoop and: [  self currentConditional nextBlocks size = 1 ]) ifTrue: [ self finializeLoop ].
 
 	"We are changing of statement block so we flush the blocks we saved for the previous statement block."
 	context top flushCurrentBlocks
@@ -196,7 +196,7 @@ FASTTCFGUtility >> managePreviousBlocksOf: newBlock [
 			newBlock isStart: true.
 			^ self ].
 
-	context top currentBlocks ifEmpty: [  self currentConditional addNextBlock: newBlock ] ifNotEmpty: [ :blocksAtScope |
+	context top currentBlocks ifEmpty: [  context top addNextBlock: newBlock ] ifNotEmpty: [ :blocksAtScope |
 			(blocksAtScope flatCollectAsSet: #withAllFollowingBlocks)
 				reject: [ :block | block isFull or: [ block shouldBreakOrContinueInContext: context ] ]
 				thenDo: [ :block | block addNextBlock: newBlock ] ]