WIP: Manage Try

Else and Finally are not yet managed but basic Try is working

Author: jecisc

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

@@ -1933,17 +1933,17 @@ FASTPythonCFGTest >> testFunctionWithTry [
 	self assert: tryBlock isConditional.
 	self assert: tryBlock isTry.
 	self deny: tryBlock isFinal.
-	self assert: tryBlock statements size equals: 1.
+	self assert: tryBlock statements size equals: 3.
 	self assert: (tryBlock statements first isOfType: FASTPyCall).
+	self assert: (tryBlock statements second isOfType: FASTPyCall).
+	self assert: (tryBlock statements third isOfType: FASTPyCall).
 
 	self assert: ((tryBlock patterns at: 1) isOfType: FASTPyIdentifier).
 	exceptBlock := tryBlock nextBlocks at: 1.
 	self deny: exceptBlock isConditional.
 	self deny: exceptBlock isFinal.
-	self assert: exceptBlock statements size equals: 3.
+	self assert: exceptBlock statements size equals: 1.
 	self assert: (exceptBlock statements first isOfType: FASTPyCall).
-	self assert: (exceptBlock statements second isOfType: FASTPyCall).
-	self assert: (exceptBlock statements third isOfType: FASTPyCall).
 
 	self assert: (tryBlock patterns at: 2) isNil.
 	lastBlock := tryBlock nextBlocks at: 2.

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

@@ -2,7 +2,6 @@ Class {
 	#name : 'FASTCFGAbstractMultipleConditionBlock',
 	#superclass : 'FASTCFGAbstractConditionalBlock',
 	#instVars : [
-		'isFull',
 		'blocksMap'
 	],
 	#category : 'FAST-Python-Tools-CFG/DataFlow',
@@ -39,20 +38,7 @@ FASTCFGAbstractMultipleConditionBlock >> addPattern: aFASTNode [
 FASTCFGAbstractMultipleConditionBlock >> initialize [
 
 	super initialize.
-	blocksMap := OrderedDictionary new.
-	isFull := false
-]
-
-{ #category : 'accessing' }
-FASTCFGAbstractMultipleConditionBlock >> isFull [
-	"In the case of a switch, we cannot know with just the node so the algo will tell us when it is full at the closing of the switch.."
-
-	^ isFull
-]
-
-{ #category : 'accessing' }
-FASTCFGAbstractMultipleConditionBlock >> isFull: anObject [
-	isFull := anObject
+	blocksMap := OrderedDictionary new
 ]
 
 { #category : 'accessing' }

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

@@ -1,6 +1,9 @@
 Class {
 	#name : 'FASTCFGSwitchBlock',
 	#superclass : 'FASTCFGAbstractMultipleConditionBlock',
+	#instVars : [
+		'isFull'
+	],
 	#category : 'FAST-Python-Tools-CFG/DataFlow',
 	#package : 'FAST-Python-Tools',
 	#tag : 'CFG/DataFlow'
@@ -18,6 +21,25 @@ FASTCFGSwitchBlock >> includesPattern: aPattern [
 	^ self patterns anySatisfy: [ :pattern | pattern isSameAsCFGCasePattern: aPattern ]
 ]
 
+{ #category : 'initialization' }
+FASTCFGSwitchBlock >> initialize [
+
+	super initialize.
+	isFull := false
+]
+
+{ #category : 'accessing' }
+FASTCFGSwitchBlock >> isFull [
+	"In the case of a switch, we cannot know with just the node so the algo will tell us when it is full at the closing of the switch.."
+
+	^ isFull
+]
+
+{ #category : 'accessing' }
+FASTCFGSwitchBlock >> isFull: anObject [
+	isFull := anObject
+]
+
 { #category : 'testing' }
 FASTCFGSwitchBlock >> isSwitch [
 

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

@@ -6,6 +6,16 @@ Class {
 	#tag : 'CFG/DataFlow'
 }
 
+{ #category : 'testing' }
+FASTCFGTryBlock >> isFull [
+	"I am full when I have a branch pointing what happens if there is no exception caught and this branch has a nil pattern."
+
+	^ blocksMap
+		  at: nil
+		  ifPresent: [ :value | value isNotNil ]
+		  ifAbsent: [ false ]
+]
+
 { #category : 'testing' }
 FASTCFGTryBlock >> isTry [
 

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

@@ -78,6 +78,18 @@ FASTPythonCFGVisitor >> visitFASTPyElifClause: anElifClause [
 	self visitFASTTStatementBlock: anElifClause
 ]
 
+{ #category : 'visiting' }
+FASTPythonCFGVisitor >> visitFASTPyExceptClause: anExceptClause [
+
+	| try |
+	try := context top conditional.
+	self assert: try isTry.
+
+	try addPattern: anExceptClause expression.
+
+	self visitFASTTStatementBlock: anExceptClause
+]
+
 { #category : 'visiting' }
 FASTPythonCFGVisitor >> visitFASTPyExpression: aFASTPyExpression [
 	"We ignore expressions that are not in a statement block"
@@ -134,13 +146,11 @@ FASTPythonCFGVisitor >> visitFASTPyMatchStatement: aMatchStatement [
 FASTPythonCFGVisitor >> visitFASTPyTryStatement: aTryStatement [
 
 	self buildBlockIfNeeded.
-
 	self visitCollection: aTryStatement statements.
 
-	self buildAndUse: FASTCFGTryBlock during: [
-			self visitFASTPyTWithElseClause: aTryStatement.
-
+	self buildAndUseTryDuring: [
 			self visitCollection: aTryStatement excepts.
+			self visitFASTPyTWithElseClause: aTryStatement.
 			self visitEntity: aTryStatement finally ]
 ]
 

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

@@ -88,9 +88,9 @@ FASTTCFGUtility >> buildAndUseSwitchDuring: aBlock [
 { #category : 'running' }
 FASTTCFGUtility >> buildAndUseTryDuring: aBlock [
 
-	^ self buildAndUse: FASTCFGTryBlock during: [ :switch |
-			  aBlock cull: switch.
-			  switch isFull: true ]
+	^ self buildAndUse: FASTCFGTryBlock during: [ :try |
+			  aBlock cull: try.
+			  try isFull ifFalse: [ try addPattern: nil ] ]
 ]
 
 { #category : 'running' }