Rename FromImportModule into FromModule + factorize code of future import and importFrom

Author: jecisc

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

@@ -138,7 +138,7 @@ Class {
 		'structuralEntity',
 		'import',
 		'importedEntity',
-		'fromImportModule'
+		'fromModule'
 	],
 	#category : 'FAST-Python-Model-Generator',
 	#package : 'FAST-Python-Model-Generator'
@@ -219,7 +219,7 @@ FASTPythonMetamodelGenerator >> defineClasses [
 	forStatement := builder ensureClassNamed: #ForStatement."Todo"
 	formatExpression := builder ensureClassNamed: #FormatExpression."Todo"
 	formatSpecifier := builder ensureClassNamed: #FormatSpecifier."Todo"
-	fromImportModule := builder ensureClassNamed: #FromImportModule.
+	fromModule := builder ensureClassNamed: #FromModule.
 	functionDefinition := builder ensureClassNamed: #FunctionDefinition."ToReview"
 	generatorExpression := builder ensureClassNamed: #GeneratorExpression."Todo"
 	genericType := builder ensureClassNamed: #GenericType."Todo"
@@ -372,7 +372,7 @@ FASTPythonMetamodelGenerator >> defineProperties [
 		multivalued: true;
 		comment: 'The comparators applied in order. Possible operators:  <, <=, ==, !=, >=, >, <>, in, not in, is, is not'.
 
-	(fromImportModule property: #segments type: #String)
+	(fromModule property: #segments type: #String)
 		multivalued: true;
 		comment:
 			'The segments of the module path. For example if you declare `xml.etree.ElementTree` as module, the segments will be { ''xml'' . ''etree'' . ''ElementTree''}.'.
@@ -401,8 +401,8 @@ FASTPythonMetamodelGenerator >> defineRelations [
 	((import property: #importedEntities) comment: 'List of the imported entities.')
 	<>-* ((importedEntity property: #import) comment: 'Import declaring me as imported entity.').
 
-	((importFromStatement property: #fromImportModule) comment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..')
-	<>- ((fromImportModule property: #import) comment: 'Import declaring me as from import module.').
+	((importFromStatement property: #fromModule) comment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..')
+	<>- ((fromModule property: #import) comment: 'Import declaring me as from import module.').
 
 	((tUnaryOperator property: #argument) comment: 'Expression influanced by the unary operator..')
 	<>- ((tExpression property: #parentUnaryOperator) comment: 'Parent unary operator in which I am.')

…on-Model/FASTPyFromImportModule.class.st …T-Python-Model/FASTPyFromModule.class.stsrc/FAST-Python-Model/FASTPyFromImportModule.class.st renamed to src/FAST-Python-Model/FASTPyFromModule.class.st src/FAST-Python-Model/FASTPyFromImportModule.class.st renamed to src/FAST-Python-Model/FASTPyFromModule.class.st

@@ -5,7 +5,7 @@
 ### Parents
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `import` | `FASTPyFromImportModule` | `fromImportModule` | `FASTPyImportFromStatement` | Import declaring me as from import module.|
+| `import` | `FASTPyFromModule` | `fromModule` | `FASTPyImportFromStatement` | Import declaring me as from import module.|
 
 
 ## Properties
@@ -17,35 +17,35 @@
 
 "
 Class {
-	#name : 'FASTPyFromImportModule',
+	#name : 'FASTPyFromModule',
 	#superclass : 'FASTPyEntity',
 	#instVars : [
-		'#import => FMOne type: #FASTPyImportFromStatement opposite: #fromImportModule',
-		'#segments => FMProperty'
+		'#segments => FMProperty',
+		'#import => FMOne type: #FASTPyImportFromStatement opposite: #fromModule'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
 	#tag : 'Entities'
 }
 
 { #category : 'meta' }
-FASTPyFromImportModule class >> annotation [
+FASTPyFromModule class >> annotation [
 
-	<FMClass: #FromImportModule super: #FASTPyEntity>
+	<FMClass: #FromModule super: #FASTPyEntity>
 	<package: #'FAST-Python-Model'>
 	<generated>
 	^ self
 ]
 
 { #category : 'adding' }
-FASTPyFromImportModule >> addSegments: aCollection [
+FASTPyFromModule >> addSegments: aCollection [
 
 	segments := segments , aCollection
 ]
 
 { #category : 'accessing' }
-FASTPyFromImportModule >> import [
-	"Relation named: #import type: #FASTPyImportFromStatement opposite: #fromImportModule"
+FASTPyFromModule >> import [
+	"Relation named: #import type: #FASTPyImportFromStatement opposite: #fromModule"
 
 	<generated>
 	<FMComment: 'Import declaring me as from import module.'>
@@ -55,21 +55,21 @@ FASTPyFromImportModule >> import [
 ]
 
 { #category : 'accessing' }
-FASTPyFromImportModule >> import: anObject [
+FASTPyFromModule >> import: anObject [
 
 	<generated>
 	import := anObject
 ]
 
 { #category : 'navigation' }
-FASTPyFromImportModule >> importGroup [
+FASTPyFromModule >> importGroup [
 	<generated>
 	<navigation: 'Import'>
 	^ MooseSpecializedGroup with: self import
 ]
 
 { #category : 'accessing' }
-FASTPyFromImportModule >> segments [
+FASTPyFromModule >> segments [
 
 	<FMProperty: #segments type: #String>
 	<generated>
@@ -79,7 +79,7 @@ FASTPyFromImportModule >> segments [
 ]
 
 { #category : 'accessing' }
-FASTPyFromImportModule >> segments: anObject [
+FASTPyFromModule >> segments: anObject [
 	<generated>
 	segments := anObject
 ]

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

@@ -5,7 +5,7 @@
 ### Children
 | Relation | Origin | Opposite | Type | Comment |
 |---|
-| `fromImportModule` | `FASTPyImportFromStatement` | `import` | `FASTPyFromImportModule` | Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..|
+| `fromModule` | `FASTPyImportFromStatement` | `import` | `FASTPyFromModule` | Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..|
 
 
 
@@ -14,7 +14,7 @@ Class {
 	#name : 'FASTPyImportFromStatement',
 	#superclass : 'FASTPyImport',
 	#instVars : [
-		'#fromImportModule => FMOne type: #FASTPyFromImportModule opposite: #import'
+		'#fromModule => FMOne type: #FASTPyFromModule opposite: #import'
 	],
 	#category : 'FAST-Python-Model-Entities',
 	#package : 'FAST-Python-Model',
@@ -31,24 +31,24 @@ FASTPyImportFromStatement class >> annotation [
 ]
 
 { #category : 'accessing' }
-FASTPyImportFromStatement >> fromImportModule [
-	"Relation named: #fromImportModule type: #FASTPyFromImportModule opposite: #import"
+FASTPyImportFromStatement >> fromModule [
+	"Relation named: #fromModule type: #FASTPyFromModule opposite: #import"
 
 	<generated>
 	<FMComment: 'Module in which the imported entities should be looked for. `from datetime import date` has `datetime` as fromModule..'>
-	^ fromImportModule
+	^ fromModule
 ]
 
 { #category : 'accessing' }
-FASTPyImportFromStatement >> fromImportModule: anObject [
+FASTPyImportFromStatement >> fromModule: anObject [
 
 	<generated>
-	fromImportModule := anObject
+	fromModule := anObject
 ]
 
 { #category : 'navigation' }
-FASTPyImportFromStatement >> fromImportModuleGroup [
+FASTPyImportFromStatement >> fromModuleGroup [
 	<generated>
-	<navigation: 'FromImportModule'>
-	^ MooseSpecializedGroup with: self fromImportModule
+	<navigation: 'FromModule'>
+	^ MooseSpecializedGroup with: self fromModule
 ]

src/FAST-Python-Model/FASTPyTEntityCreator.trait.st

@@ -385,10 +385,10 @@ FASTPyTEntityCreator >> newFormatSpecifier [
 ]
 
 { #category : 'entity creation' }
-FASTPyTEntityCreator >> newFromImportModule [
+FASTPyTEntityCreator >> newFromModule [
 
 	<generated>
-	^ self add: FASTPyFromImportModule new
+	^ self add: FASTPyFromModule new
 ]
 
 { #category : 'entity creation' }