Allow any kind of expressions in slices because too many lib extend the syntax

Author: jecisc

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

@@ -153,8 +153,7 @@ Class {
 		'tWithParameters',
 		'tDefinition',
 		'tDecoratorExpression',
-		'tWithElseClause',
-		'tSliceContent'
+		'tWithElseClause'
 	],
 	#category : 'FAST-Python-Model-Generator',
 	#package : 'FAST-Python-Model-Generator'
@@ -326,7 +325,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	attribute --|> expression.
 	attribute --|> tDecoratorExpression.
-	attribute --|> tSliceContent.
 
 	await --|> tStatement.
 
@@ -340,14 +338,12 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	boolean --|> literal.
 	boolean --|> tBooleanLiteral.
-	boolean --|> tSliceContent.
 
 	breakStatement --|> statement.
 
 	call --|> expression.
 	call --|> tInvocation.
 	call --|> tDecoratorExpression.
-	call --|> tSliceContent.
 
 	classDefinition --|> tNamedBehaviouralEntity.
 	classDefinition --|> tDefinition.
@@ -365,7 +361,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	conditionalExpression --|> expression.
 	conditionalExpression --|> tWithCondition.
-	conditionalExpression --|> tSliceContent.
 
 	continueStatement --|> statement.
 
@@ -407,7 +402,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	identifier --|> expression.
 	identifier --|> tDecoratorExpression.
-	identifier --|> tSliceContent.
 
 	ifClause --|> expression. "This is wrong! I am just here temporarily until we rework the relation to the for in clause (I need to be able to be a clause of a list comprehension)"
 
@@ -421,7 +415,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	integer --|> literal.
 	integer --|> tNumericalLiteral.
-	integer --|> tSliceContent. "Only integer can be slice content in the literals.Not even complex."
 
 	keywordArgument --|> expression.
 	keywordArgument --|> tNamedEntity.
@@ -447,15 +440,13 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 	module --|> #THasImmediateSource.
 
 	none --|> literal.
-	none --|> tSliceContent.
 
 	nonlocalStatement --|> statement.
 
 	notOperator --|> operator.
 	notOperator --|> tUnaryOperator.
 
 	operator --|> expression.
-	operator --|> tSliceContent.
 
 	pair --|> expression.
 
@@ -482,7 +473,6 @@ FASTPythonMetamodelGenerator >> defineHierarchy [
 
 	subscript --|> expression.
 	subscript --|> tDecoratorExpression.
-	subscript --|> tSliceContent.
 
 	thenClause --|> block.
 
@@ -615,7 +605,7 @@ FASTPythonMetamodelGenerator >> defineRelations [
 	(patternList property: #elements) <>-* (expression property: #patternListOwner).
 
 	((slice property: #components) comment: 'The components are the expressions between the `:` of a slice.')
-	<>-* ((tSliceContent property: #sliceOwner) comment: 'Slice in which I am a component (start, end or step) (If it''s the case)''').
+	<>-* ((expression property: #sliceOwner) comment: 'Slice in which I am a component (start, end or step) (If it''s the case)'''). "Originally, I created a trait for Slice content because the python syntax does not allow all expressions. But multiple libraries are changing the syntax to accept other objects such as float, list or even string. So now I point FASTPyExpression to not fail on all those cases."
 
 	(string property: #interpolations) <>-* (interpolation property: #parentString).
 
@@ -651,7 +641,6 @@ FASTPythonMetamodelGenerator >> defineTraits [
 	tComprehension := builder newTraitNamed: #TComprehension.
 	tDefinition := builder newTraitNamed: #TDefinition.
 	(tDecoratorExpression := builder newTraitNamed: #TDecoratorExpression) comment: 'I represent an entity that *can* be the expression of a decorator.'.
-	(tSliceContent := builder newTraitNamed: #TSliceContent) comment: 'I represent an entity that can be one of the component of a slice.'.
 	tUnaryOperator := builder newTraitNamed: #TUnaryOperator.
 	tWithElseClause := builder newTraitNamed: #TWithElseClause.
 

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

@@ -6,7 +6,6 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `parentDeclarator` | `FASTPyTDecoratorExpression` | `expression` | `FASTPyDecorator` | |
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
@@ -20,8 +19,8 @@
 Class {
 	#name : 'FASTPyAttributeAccess',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTDecoratorExpression + FASTPyTSliceContent',
-	#classTraits : 'FASTPyTDecoratorExpression classTrait + FASTPyTSliceContent classTrait',
+	#traits : 'FASTPyTDecoratorExpression',
+	#classTraits : 'FASTPyTDecoratorExpression classTrait',
 	#instVars : [
 		'#attribute => FMOne type: #FASTPyVariable opposite: #attributeOwner',
 		'#object => FMOne type: #FASTPyExpression opposite: #attributeObjectOwner'

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

@@ -15,7 +15,6 @@
 | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
 | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 
 
 ## Properties
@@ -31,8 +30,8 @@
 Class {
 	#name : 'FASTPyBoolean',
 	#superclass : 'FASTPyLiteral',
-	#traits : 'FASTPyTSliceContent + FASTTBooleanLiteral',
-	#classTraits : 'FASTPyTSliceContent classTrait + FASTTBooleanLiteral classTrait',
+	#traits : 'FASTTBooleanLiteral',
+	#classTraits : 'FASTTBooleanLiteral classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -16,7 +16,6 @@
 | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
 | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
@@ -38,8 +37,8 @@
 Class {
 	#name : 'FASTPyCall',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTDecoratorExpression + FASTPyTSliceContent + FASTTInvocation',
-	#classTraits : 'FASTPyTDecoratorExpression classTrait + FASTPyTSliceContent classTrait + FASTTInvocation classTrait',
+	#traits : 'FASTPyTDecoratorExpression + FASTTInvocation',
+	#classTraits : 'FASTPyTDecoratorExpression classTrait + FASTTInvocation classTrait',
 	#instVars : [
 		'#callee => FMOne type: #FASTPyExpression opposite: #caller'
 	],

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

@@ -2,11 +2,6 @@
 ## Relations
 ======================
 
-### Parents
-| Relation | Origin | Opposite | Type | Comment |
-|---|
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
-
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
@@ -20,8 +15,8 @@
 Class {
 	#name : 'FASTPyConditionalExpression',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTSliceContent + FASTTWithCondition',
-	#classTraits : 'FASTPyTSliceContent classTrait + FASTTWithCondition classTrait',
+	#traits : 'FASTTWithCondition',
+	#classTraits : 'FASTTWithCondition classTrait',
 	#instVars : [
 		'#elseExpression => FMOne type: #FASTPyExpression opposite: #conditionalExpressionElseOwner',
 		'#thenExpression => FMOne type: #FASTPyExpression opposite: #conditionalExpressionThenOwner'

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

@@ -38,6 +38,7 @@
 | `parentUnaryOperator` | `FASTPyExpression` | `argument` | `FASTPyTUnaryOperator` | Parent unary operator in which I am.|
 | `patternListOwner` | `FASTPyExpression` | `elements` | `FASTPyPatternList` | |
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
+| `sliceOwner` | `FASTPyExpression` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 | `subscriptIndiceOwner` | `FASTPyExpression` | `indices` | `FASTPySubscript` | My parent if I am defining an index to select of a subscript (if it's the case)|
 | `subscriptValueOwner` | `FASTPyExpression` | `value` | `FASTPySubscript` | My parent if I define the receiver of a subscript (if it's the case).|
 | `tuplePatternOwner` | `FASTPyExpression` | `patterns` | `FASTPyTuplePattern` | |
@@ -81,6 +82,7 @@ Class {
 		'#parentInterpolation => FMOne type: #FASTPyInterpolation opposite: #expression',
 		'#parentUnaryOperator => FMOne type: #FASTPyTUnaryOperator opposite: #argument',
 		'#patternListOwner => FMOne type: #FASTPyPatternList opposite: #elements',
+		'#sliceOwner => FMOne type: #FASTPySlice opposite: #components',
 		'#subscriptIndiceOwner => FMOne type: #FASTPySubscript opposite: #indices',
 		'#subscriptValueOwner => FMOne type: #FASTPySubscript opposite: #value',
 		'#tuplePatternOwner => FMOne type: #FASTPyTuplePattern opposite: #patterns'
@@ -656,6 +658,30 @@ FASTPyExpression >> patternListOwnerGroup [
 	^ MooseSpecializedGroup with: self patternListOwner
 ]
 
+{ #category : 'accessing' }
+FASTPyExpression >> sliceOwner [
+	"Relation named: #sliceOwner type: #FASTPySlice opposite: #components"
+
+	<generated>
+	<FMComment: 'Slice in which I am a component (start, end or step) (If it''s the case)'''>
+	<container>
+	^ sliceOwner
+]
+
+{ #category : 'accessing' }
+FASTPyExpression >> sliceOwner: anObject [
+
+	<generated>
+	sliceOwner := anObject
+]
+
+{ #category : 'navigation' }
+FASTPyExpression >> sliceOwnerGroup [
+	<generated>
+	<navigation: 'SliceOwner'>
+	^ MooseSpecializedGroup with: self sliceOwner
+]
+
 { #category : 'accessing' }
 FASTPyExpression >> subscriptIndiceOwner [
 	"Relation named: #subscriptIndiceOwner type: #FASTPySubscript opposite: #indices"

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

@@ -6,16 +6,15 @@
 | Relation | Origin | Opposite | Type | Comment |
 |---|
 | `parentDeclarator` | `FASTPyTDecoratorExpression` | `expression` | `FASTPyDecorator` | |
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 
 
 
 "
 Class {
 	#name : 'FASTPyIdentifier',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTDecoratorExpression + FASTPyTSliceContent',
-	#classTraits : 'FASTPyTDecoratorExpression classTrait + FASTPyTSliceContent classTrait',
+	#traits : 'FASTPyTDecoratorExpression',
+	#classTraits : 'FASTPyTDecoratorExpression classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -15,7 +15,6 @@
 | `parentExpressionLeft` | `FASTTExpression` | `leftOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am left side|
 | `parentExpressionRight` | `FASTTExpression` | `rightOperand` | `FASTTBinaryExpression` | Parent (binary) expression of which I am right side|
 | `returnOwner` | `FASTTExpression` | `expression` | `FASTTReturnStatement` | The return statement that own the expression (if it's the case)|
-| `sliceOwner` | `FASTPyTSliceContent` | `components` | `FASTPySlice` | Slice in which I am a component (start, end or step) (If it's the case)'|
 
 
 ## Properties
@@ -31,8 +30,8 @@
 Class {
 	#name : 'FASTPyInteger',
 	#superclass : 'FASTPyLiteral',
-	#traits : 'FASTPyTSliceContent + FASTTNumericalLiteral',
-	#classTraits : 'FASTPyTSliceContent classTrait + FASTTNumericalLiteral classTrait',
+	#traits : 'FASTTNumericalLiteral',
+	#classTraits : 'FASTTNumericalLiteral classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -13,8 +13,6 @@
 Class {
 	#name : 'FASTPyNone',
 	#superclass : 'FASTPyLiteral',
-	#traits : 'FASTPyTSliceContent',
-	#classTraits : 'FASTPyTSliceContent classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'

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

@@ -13,8 +13,6 @@
 Class {
 	#name : 'FASTPyOperator',
 	#superclass : 'FASTPyExpression',
-	#traits : 'FASTPyTSliceContent',
-	#classTraits : 'FASTPyTSliceContent classTrait',
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'