Progress on Interpolations

Author: jecisc

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

@@ -590,6 +590,8 @@ FASTPythonMetamodelGenerator >> defineProperties [
 	(importedEntity property: #alias type: #String) comment: 'If the imported entity has an alias, I contain it.'.
 
 	(interpolation property: #formatSpecifier type: #String) comment: 'If specified, the format of the interpolation.'.
+	
+	(interpolation property: #typeConversion type: #String) comment: 'If specified, the type conversion of the interpolation.'.
 
 	unaryOperator property: #operator type: #String
 ]

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

@@ -19,6 +19,7 @@
 | Name | Type | Default value | Comment |
 |---|
 | `formatSpecifier` | `String` | nil | If specified, the format of the interpolation.|
+| `typeConversion` | `String` | nil | If specified, the type conversion of the interpolation.|
 
 "
 Class {
@@ -27,7 +28,8 @@ Class {
 	#instVars : [
 		'#expression => FMOne type: #FASTPyExpression opposite: #parentInterpolation',
 		'#formatSpecifier => FMProperty',
-		'#parentString => FMOne type: #FASTPyString opposite: #interpolations'
+		'#parentString => FMOne type: #FASTPyString opposite: #interpolations',
+		'#typeConversion => FMProperty'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
@@ -102,3 +104,18 @@ FASTPyInterpolation >> parentStringGroup [
 	<navigation: 'ParentString'>
 	^ MooseSpecializedGroup with: self parentString
 ]
+
+{ #category : 'accessing' }
+FASTPyInterpolation >> typeConversion [
+
+	<FMProperty: #typeConversion type: #String>
+	<generated>
+	<FMComment: 'If specified, the type conversion of the interpolation.'>
+	^ typeConversion
+]
+
+{ #category : 'accessing' }
+FASTPyInterpolation >> typeConversion: anObject [
+	<generated>
+	typeConversion := anObject
+]

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

@@ -146,7 +146,7 @@ FASTPyImporterTestGenerator >> generateMethod: aString inProtocol: protocol [
 
 	self testCase
 		compiledMethodAt: aString lines first asSymbol
-		ifPresent: [ :method | method sourceCode = aString ifTrue: [ ^ self "No need to recompile here." ] ].
+		ifPresent: [ :method |(method protocolName = protocol and: [ method sourceCode = aString ]) ifTrue: [ ^ self "No need to recompile here." ] ].
 
 	self testCase compile: stream contents classified: protocol
 ]

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

@@ -7529,6 +7529,42 @@ FASTPythonImporterTest >> testInterpolationWithSubscript [
 				self assert: (self topEntity isOfType: FASTPyIdentifier)
 ]
 
+{ #category : 'tests - interpolations' }
+FASTPythonImporterTest >> testInterpolationWithTypeConversion [
+	<generated>
+	"Generated as regression test by FASTPyImporterTestGenerator>>#generateTestNamed:fromCode:protocol:
+	Regenerate executing: 	self regenerateTest: #testInterpolationWithTypeConversion 	"
+
+	self parse: 'f"{text!r}" '.
+
+	self assert: (fast allWithType: FASTPyIdentifier) size equals: 1.
+	self assert: (fast allWithType: FASTPyInterpolation) size equals: 1.
+	self assert: (fast allWithType: FASTPyModule) size equals: 1.
+	self assert: (fast allWithType: FASTPyString) size equals: 1.
+
+	stack push: fast rootEntities anyOne containedEntities first.
+	self assert: self topEntity sourceCode equals: 'f"{text!r}"'.
+	self assert: (self topEntity isOfType: FASTPyString).
+	self assert: (self topEntity isOfType: FASTTLiteral).
+	self assert: (self topEntity isOfType: FASTTStringLiteral).
+	
+	"Testing value of multivalued relation interpolations"
+	self assert: self topEntity interpolations size equals: 1.
+	
+		stack push: (stack top interpolations at: 1).
+		self assert: self topEntity sourceCode equals: '{text!r}'.
+		self assert: (self topEntity isOfType: FASTPyInterpolation).
+		
+		"Testing value of monovalue relation expression"
+		self assert: self topEntity expression isNotNil.
+
+			stack push: self topEntity expression.
+			self assert: self topEntity sourceCode equals: 'text'.
+			self assert: (self topEntity isOfType: FASTPyIdentifier).
+			stack pop.
+		self assert: self topEntity typeConversion equals: 'r'
+]
+
 { #category : 'tests - function definitions' }
 FASTPythonImporterTest >> testKeywordSeparator [
 	<generated>

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

@@ -848,6 +848,12 @@ TSFASTPythonImporter >> visitType: aTSNode [
 	^ self handleNode: aTSNode kind: FASTPyType
 ]
 
+{ #category : 'visiting' }
+TSFASTPythonImporter >> visitTypeConversion: aTSNode [
+
+	^ self topFastEntity typeConversion: (self sourceCodeOf: aTSNode) allButFirst "We skip the $! character"
+]
+
 { #category : 'visiting' }
 TSFASTPythonImporter >> visitTypedDefaultParameter: aTSNode [