Fix the setting of next blocks of breack statements

Author: jecisc

src/FAST-Python-Tools-Tests/FASTPythonCFGTest.class.st

@@ -985,7 +985,7 @@ FASTPythonCFGTest >> testFunctionWithWhileWithBreakInIfThen2 [
         break
         c()
       d()'.
-	self skip. "To fix"
+
 	self assert: startBlock isConditional.
 	self deny: startBlock isFinal.
 	self assert: startBlock statements size equals: 1.
@@ -1015,7 +1015,7 @@ FASTPythonCFGTest >> testFunctionWithWhileWithBreakInIfThen2 [
 
 	nullBlock := startBlock nextFalseBlock.
 	self assert: nullBlock isNullBlock.
-	self assert: endOfWhile nextBlock equals: nullBlock.
+	self assert: thenBlock nextBlock equals: nullBlock.
 	self assert: nullBlock isFinal
 ]
 
@@ -1273,7 +1273,7 @@ FASTPythonCFGTest >> testFunctionWithWhileWithIfInElif [
 		else:
 			e()
 	f()'.
-	self skip. "Not working for now because break are not well managed"
+
 	self assert: startBlock isConditional.
 	self deny: startBlock isFinal.
 	self assert: startBlock statements size equals: 1.

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

@@ -29,6 +29,12 @@ FASTCFGAbstractBlock >> allFollowingBlocks [
 	^ self deep: #nextBlocks collect: #yourself
 ]
 
+{ #category : 'testing' }
+FASTCFGAbstractBlock >> endsWithBreakStatement [
+
+	^ self subclassResponsibility
+]
+
 { #category : 'initialization' }
 FASTCFGAbstractBlock >> initialize [
 
@@ -91,6 +97,15 @@ FASTCFGAbstractBlock >> previousBlocks [
 	^ previousBlocks
 ]
 
+{ #category : 'asserting' }
+FASTCFGAbstractBlock >> shouldBreakInContext: context [
+	"I should breack this node if it's a breack and that we are currently visiting a loop. This node is breaking the loop in all cases of the current branch. "
+
+	self endsWithBreakStatement ifFalse: [ ^ false ].
+
+	^ context anySatisfy: #isLoop
+]
+
 { #category : 'accessing' }
 FASTCFGAbstractBlock >> sourceCode [
 

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

@@ -12,6 +12,13 @@ FASTCFGNullBlock >> addNextBlock: aBlock [
 	self error: 'A null block cannot have a next block since it represent a virtual block merging all exit points if the exit point is not unique.'
 ]
 
+{ #category : 'testing' }
+FASTCFGNullBlock >> endsWithBreakStatement [
+	"I cannot contain a breack"
+
+	^ false
+]
+
 { #category : 'testing' }
 FASTCFGNullBlock >> isNullBlock [
 

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

@@ -143,7 +143,7 @@ FASTTCFGUtility >> managePreviousBlocksOf: newBlock [
 
 	topContext currentBlocks ifEmpty: [ topContext conditional addNextBlock: newBlock ] ifNotEmpty: [ :blocksAtScope |
 			(blocksAtScope flatCollect: #withAllFollowingBlocks)
-				reject: [ :block | block isFull ]
+				reject: [ :block | block isFull or: [ block shouldBreakInContext: context ] ]
 				thenDo: [ :block | block addNextBlock: newBlock ] ]
 ]