Manage assignment type

Author: jecisc

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

@@ -605,6 +605,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
 
 	(assignment property: #left) <>- (tAssignable property: #parentAssignmentLeft).
 	(assignment property: #right) <>- (expression property: #parentAssignmentRight).
+	(assignment property: #type) <>- (type property: #parentAssignment).
 
 	(asPattern property: #target) <>- (tAsPatternTarget property: #parentAsPatternTarget).
 

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

@@ -7,6 +7,7 @@
 |---|
 | `left` | `FASTPyAssignment` | `parentAssignmentLeft` | `FASTPyTAssignable` | |
 | `right` | `FASTPyAssignment` | `parentAssignmentRight` | `FASTPyExpression` | |
+| `type` | `FASTPyAssignment` | `parentAssignment` | `FASTPyType` | |
 
 
 
@@ -16,7 +17,8 @@ Class {
 	#superclass : 'FASTPyStatement',
 	#instVars : [
 		'#left => FMOne type: #FASTPyTAssignable opposite: #parentAssignmentLeft',
-		'#right => FMOne type: #FASTPyExpression opposite: #parentAssignmentRight'
+		'#right => FMOne type: #FASTPyExpression opposite: #parentAssignmentRight',
+		'#type => FMOne type: #FASTPyType opposite: #parentAssignment'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
@@ -75,3 +77,25 @@ FASTPyAssignment >> rightGroup [
 	<navigation: 'Right'>
 	^ MooseSpecializedGroup with: self right
 ]
+
+{ #category : 'accessing' }
+FASTPyAssignment >> type [
+	"Relation named: #type type: #FASTPyType opposite: #parentAssignment"
+
+	<generated>
+	^ type
+]
+
+{ #category : 'accessing' }
+FASTPyAssignment >> type: anObject [
+
+	<generated>
+	type := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyAssignment >> typeGroup [
+	<generated>
+	<navigation: 'Type'>
+	^ MooseSpecializedGroup with: self type
+]

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

@@ -5,6 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
+| `parentAssignment` | `FASTPyType` | `type` | `FASTPyAssignment` | |
 | `parentFunctionDefinition` | `FASTPyType` | `returnType` | `FASTPyFunctionDefinition` | |
 | `parentParameter` | `FASTPyType` | `type` | `FASTPyParameter` | |
 | `parentyTypeAliasStatementAlias` | `FASTPyType` | `left` | `FASTPyTypeAliasStatement` | |
@@ -23,6 +24,7 @@ Class {
 	#superclass : 'FASTPyEntity',
 	#instVars : [
 		'#expression => FMOne type: #FASTPyExpression opposite: #parentType',
+		'#parentAssignment => FMOne type: #FASTPyAssignment opposite: #type',
 		'#parentFunctionDefinition => FMOne type: #FASTPyFunctionDefinition opposite: #returnType',
 		'#parentParameter => FMOne type: #FASTPyParameter opposite: #type',
 		'#parentyTypeAliasStatementAlias => FMOne type: #FASTPyTypeAliasStatement opposite: #left',
@@ -64,6 +66,30 @@ FASTPyType >> expressionGroup [
 	^ MooseSpecializedGroup with: self expression
 ]
 
+{ #category : 'accessing' }
+FASTPyType >> parentAssignment [
+	"Relation named: #parentAssignment type: #FASTPyAssignment opposite: #type"
+
+	<generated>
+	<container>
+	<derived>
+	^ parentAssignment
+]
+
+{ #category : 'accessing' }
+FASTPyType >> parentAssignment: anObject [
+
+	<generated>
+	parentAssignment := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyType >> parentAssignmentGroup [
+	<generated>
+	<navigation: 'ParentAssignment'>
+	^ MooseSpecializedGroup with: self parentAssignment
+]
+
 { #category : 'accessing' }
 FASTPyType >> parentFunctionDefinition [
 	"Relation named: #parentFunctionDefinition type: #FASTPyFunctionDefinition opposite: #returnType"

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

@@ -2447,6 +2447,59 @@ FASTPythonImporterTest >> testAssignmentToUnaryOperator [
 		self assert: self topEntity operator equals: '-'
 ]
 
+{ #category : 'tests - assignments' }
+FASTPythonImporterTest >> testAssignmentType [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testAssignmentType 	"
+
+	self parse: 'int: x = 1'.
+
+	self assert: (fast allWithType: FASTPyAssignment) size equals: 1.
+	self assert: (fast allWithType: FASTPyIdentifier) size equals: 1.
+	self assert: (fast allWithType: FASTPyInteger) size equals: 1.
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyType) size equals: 1.
+	self assert: (fast allWithType: FASTPyVariable) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'int: x = 1'.
+	self assert: (self topEntity isOfType: FASTPyAssignment).
+	
+	"Testing value of monovalue relation left"
+	self assert: self topEntity left isNotNil.
+
+		stack push: self topEntity left.
+		self assert: self topEntity sourceCode equals: 'int'.
+		self assert: (self topEntity isOfType: FASTPyVariable).
+		self assert: (self topEntity isOfType: FASTTVariableEntity).
+		stack pop.
+	
+	"Testing value of monovalue relation right"
+	self assert: self topEntity right isNotNil.
+
+		stack push: self topEntity right.
+		self assert: self topEntity sourceCode equals: '1'.
+		self assert: (self topEntity isOfType: FASTPyInteger).
+		self assert: (self topEntity isOfType: FASTTLiteral).
+		self assert: (self topEntity isOfType: FASTTNumericalLiteral).
+		stack pop.
+	
+	"Testing value of monovalue relation type"
+	self assert: self topEntity type isNotNil.
+
+		stack push: self topEntity type.
+		self assert: self topEntity sourceCode equals: 'x'.
+		self assert: (self topEntity isOfType: FASTPyType).
+		
+		"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 - accesses' }
 FASTPythonImporterTest >> testAttributeAccess [
 	<generated>