Mostly handle yield statement

Author: jecisc

src/FAST-Python-Model-Generator/FASTPythonMetamodelGenerator.class.st

@@ -582,7 +582,9 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	whileStatement --|> tWithElseClause.
 
 	withStatement --|> statement.
-	withStatement --|> tStatementBlock
+	withStatement --|> tStatementBlock.
+	
+	yield --|> expression
 ]
 
 { #category : 'definition' }
@@ -781,7 +783,9 @@ FASTPythonMetamodelGenerator >> defineRelations [
 
 	(unionType property: #types) <>-* (type property: #parentUnionType).
 
-	(withStatement property: #items) <>-* (tWithStatementItem property: #parentWithStatementItem)
+	(withStatement property: #items) <>-* (tWithStatementItem property: #parentWithStatementItem).
+	
+	(yield property: #expression) <>- (expression property: #parentYield)
 ]
 
 { #category : 'definition' }

src/FAST-Python-Model/FASTPyExpression.class.st

@@ -43,6 +43,7 @@
 | `parentType` | `FASTPyTTypeContent` | `content` | `FASTPyType` | |
 | `parentUnaryOperator` | `FASTPyExpression` | `argument` | `FASTPyTUnaryOperator` | Parent unary operator in which I am.|
 | `parentWalrus` | `FASTPyExpression` | `value` | `FASTPyWalrus` | |
+| `parentYield` | `FASTPyExpression` | `expression` | `FASTPyYield` | |
 | `prarentPrintStatement` | `FASTPyExpression` | `expressions` | `FASTPyPrintStatement` | |
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
 
@@ -91,6 +92,7 @@ Class {
 		'#parentSubscriptValue => FMOne type: #FASTPySubscript opposite: #value',
 		'#parentUnaryOperator => FMOne type: #FASTPyTUnaryOperator opposite: #argument',
 		'#parentWalrus => FMOne type: #FASTPyWalrus opposite: #value',
+		'#parentYield => FMOne type: #FASTPyYield opposite: #expression',
 		'#prarentPrintStatement => FMOne type: #FASTPyPrintStatement opposite: #expressions'
 	],
 	#category : 'FAST-Python-Model-Entities',
@@ -805,6 +807,30 @@ FASTPyExpression >> parentWalrusGroup [
 	^ MooseSpecializedGroup with: self parentWalrus
 ]
 
+{ #category : 'accessing' }
+FASTPyExpression >> parentYield [
+	"Relation named: #parentYield type: #FASTPyYield opposite: #expression"
+
+	<generated>
+	<container>
+	<derived>
+	^ parentYield
+]
+
+{ #category : 'accessing' }
+FASTPyExpression >> parentYield: anObject [
+
+	<generated>
+	parentYield := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyExpression >> parentYieldGroup [
+	<generated>
+	<navigation: 'ParentYield'>
+	^ MooseSpecializedGroup with: self parentYield
+]
+
 { #category : 'accessing' }
 FASTPyExpression >> prarentPrintStatement [
 	"Relation named: #prarentPrintStatement type: #FASTPyPrintStatement opposite: #expressions"

src/FAST-Python-Model/FASTPyYield.class.st

@@ -1,6 +1,21 @@
+"
+## Relations
+======================
+
+### Children
+| Relation | Origin | Opposite | Type | Comment |
+|---|
+| `expression` | `FASTPyYield` | `parentYield` | `FASTPyExpression` | |
+
+
+
+"
 Class {
 	#name : 'FASTPyYield',
-	#superclass : 'FASTPyEntity',
+	#superclass : 'FASTPyExpression',
+	#instVars : [
+		'#expression => FMOne type: #FASTPyExpression opposite: #parentYield'
+	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
@@ -9,8 +24,30 @@ Class {
 { #category : 'meta' }
 FASTPyYield class >> annotation [
 
-	<FMClass: #Yield super: #FASTPyEntity>
+	<FMClass: #Yield super: #FASTPyExpression>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self
 ]
+
+{ #category : 'accessing' }
+FASTPyYield >> expression [
+	"Relation named: #expression type: #FASTPyExpression opposite: #parentYield"
+
+	<generated>
+	^ expression
+]
+
+{ #category : 'accessing' }
+FASTPyYield >> expression: anObject [
+
+	<generated>
+	expression := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyYield >> expressionGroup [
+	<generated>
+	<navigation: 'Expression'>
+	^ MooseSpecializedGroup with: self expression
+]

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

@@ -51857,6 +51857,70 @@ FASTPythonImporterTest >> testWithStatementWithMultipleAsPattern [
 		self assert: (self topEntity isOfType: FASTPyPassStatement)
 ]
 
+{ #category : 'tests' }
+FASTPythonImporterTest >> testYield [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testYield 	"
+
+	self parse: 'yield'.
+
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyYield) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'yield'.
+	self assert: (self topEntity isOfType: FASTPyYield)
+]
+
+{ #category : 'tests' }
+FASTPythonImporterTest >> testYieldFrom [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testYieldFrom 	"
+
+	self parse: 'yield from x'.
+
+	self assert: (fast allWithType: FASTPyIdentifier) size equals: 1.
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyYield) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'yield from x'.
+	self assert: (self topEntity isOfType: FASTPyYield).
+	
+	"Testing value of monovalue relation expression"
+	self assert: self topEntity expression isNotNil.
+
+		stack push: self topEntity expression.
+		self assert: self topEntity sourceCode equals: 'x'.
+		self assert: (self topEntity isOfType: FASTPyIdentifier)
+]
+
+{ #category : 'tests' }
+FASTPythonImporterTest >> testYieldWithIdentifier [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testYieldWithIdentifier 	"
+
+	self parse: 'yield x'.
+
+	self assert: (fast allWithType: FASTPyIdentifier) size equals: 1.
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyYield) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'yield x'.
+	self assert: (self topEntity isOfType: FASTPyYield).
+	
+	"Testing value of monovalue relation expression"
+	self assert: self topEntity expression isNotNil.
+
+		stack push: self topEntity expression.
+		self assert: self topEntity sourceCode equals: 'x'.
+		self assert: (self topEntity isOfType: FASTPyIdentifier)
+]
+
 { #category : 'running' }
 FASTPythonImporterTest >> topEntity [
 

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

@@ -1065,3 +1065,11 @@ TSFASTPythonImporter >> visitWithStatement: aTSNode [
 
 	^ self handleNode: aTSNode kind: FASTPyWithStatement
 ]
+
+{ #category : 'visiting - alias' }
+TSFASTPythonImporter >> visitYield: aNode [
+
+	self onNextContextDo: [ :entry | entry aliasUnnamedFieldAs: #expression ].
+
+	^ self handleNode: aNode kind: FASTPyYield
+]