Tests for while and for were wrong

Author: jecisc

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

@@ -45,10 +45,10 @@ FASTPythonCFGTest >> testFunctionWithFor [
 	self deny: forBlock isFinal.
 	self assert: forBlock statements size equals: 1.
 	self assert: (forBlock statements first isOfType: FASTPyCall).
+	self assert: forBlock nextBlock equals: startBlock.
 
 	nullBlock := startBlock nextFalseBlock.
 	self assert: nullBlock isNullBlock.
-	self assert: nullBlock identicalTo: forBlock nextBlock.
 	self assert: nullBlock isFinal
 ]
 
@@ -442,9 +442,9 @@ FASTPythonCFGTest >> testFunctionWithWhile [
 	self assert: whileBlock statements size equals: 2.
 	self assert: (whileBlock statements first isOfType: FASTPyAugmentedAssignment).
 	self assert: (whileBlock statements second isOfType: FASTPyCall).
-	
+	self assert: whileBlock nextBlock equals: startBlock.
+
 	nullBlock := startBlock nextFalseBlock.
 	self assert: nullBlock isNullBlock.
-	self assert: nullBlock identicalTo: whileBlock nextBlock.
 	self assert: nullBlock isFinal
 ]

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

@@ -2,6 +2,7 @@ Class {
 	#name : 'FASTCFGAbstractBlock',
 	#superclass : 'Object',
 	#instVars : [
+		'isStart',
 		'statements',
 		'previousBlocks'
 	],
@@ -26,7 +27,8 @@ FASTCFGAbstractBlock >> addPreviousBlock: aBlock [
 FASTCFGAbstractBlock >> initialize [
 
 	super initialize.
-	previousBlocks := OrderedCollection new
+	previousBlocks := OrderedCollection new.
+	isStart := false
 ]
 
 { #category : 'inspector' }
@@ -62,10 +64,14 @@ FASTCFGAbstractBlock >> isNullBlock [
 	^ false
 ]
 
-{ #category : 'testing' }
+{ #category : 'accessing' }
 FASTCFGAbstractBlock >> isStart [
+	^ isStart
+]
 
-	^ self previousBlocks isEmpty
+{ #category : 'accessing' }
+FASTCFGAbstractBlock >> isStart: anObject [
+	isStart := anObject
 ]
 
 { #category : 'accessing' }

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

@@ -0,0 +1,19 @@
+Class {
+	#name : 'FASTCFGLoopConditionalBlock',
+	#superclass : 'FASTCFGConditionalBlock',
+	#category : 'FAST-Python-Tools-CFG/DataFlow',
+	#package : 'FAST-Python-Tools',
+	#tag : 'CFG/DataFlow'
+}
+
+{ #category : 'adding' }
+FASTCFGLoopConditionalBlock >> addNextBlock: aBlock [
+
+	| nextBlock |
+	nextBlock := super addNextBlock: aBlock.
+
+	"In a loop, by default my first node loop to myself. There is an edge case when the first statement is a break, but this will be managed elsewhere."
+	(self nextBlocks indexOf: nextBlock) = 1 ifTrue: [ nextBlock addNextBlock: self ].
+
+	^ nextBlock
+]

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

@@ -39,7 +39,7 @@ FASTPythonCFGVisitor >> visitFASTPyForStatement: aForStatement [
 	self addStatement: aForStatement left.
 	self addStatement: aForStatement right.
 
-	self buildAndUseConditionalBlockDuring: [
+	self buildAndUseLoopConditionalBlockDuring: [
 			self visitFASTTStatementBlock: aForStatement.
 
 			self flag: #todo. "Manage and test else clause"
@@ -71,7 +71,7 @@ FASTPythonCFGVisitor >> visitFASTPyWhileStatement: aWhileStatement [
 
 	self visitFASTTConditionalStatement: aWhileStatement.
 
-	self buildAndUseConditionalBlockDuring: [
+	self buildAndUseLoopConditionalBlockDuring: [
 			self visitFASTTStatementBlock: aWhileStatement.
 
 			self flag: #todo. "Manage and test else clause"

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

@@ -33,16 +33,28 @@ FASTTCFGUtility >> allBlocks [
 { #category : 'running' }
 FASTTCFGUtility >> buildAndUseConditionalBlockDuring: aBlock [
 
+	^ self buildAndUseConditionalOfKind: FASTCFGConditionalBlock during: aBlock
+]
+
+{ #category : 'running' }
+FASTTCFGUtility >> buildAndUseConditionalOfKind: aClass during: aBlock [
+
 	| conditional |
 	[
-		conditional := self buildBlockOfType: FASTCFGConditionalBlock.
+		conditional := self buildBlockOfType: aClass.
 		currentConditionals push: conditional.
 
 		aBlock value ] ensure: [
 			self assert: conditional == currentConditionals top description: 'The top conditional does not match the one produced before the execution of the block'.
 			currentConditionals pop ]
 ]
 
+{ #category : 'running' }
+FASTTCFGUtility >> buildAndUseLoopConditionalBlockDuring: aBlock [
+
+	^ self buildAndUseConditionalOfKind: FASTCFGLoopConditionalBlock during: aBlock
+]
+
 { #category : 'running' }
 FASTTCFGUtility >> buildBlockIfNeeded [
 	"If we have statements stocked, we create a new block with them. Else we do nothing."
@@ -61,7 +73,9 @@ FASTTCFGUtility >> buildBlockOfType: aBlockClass [
 
 	self managePreviousBlocksOf: newBlock.
 
-	startBlock ifNil: [ startBlock := newBlock ].
+	startBlock ifNil: [
+			startBlock := newBlock.
+			newBlock isStart: true ].
 
 	^ newBlock
 ]