Merge pull request #217 from moosetechnology/included-file

Included file

Author: uNouss

src/EsopeImporter-Tests/FamixEsopeResolverTest.class.st

@@ -14,6 +14,7 @@ FamixEsopeResolverTest >> setUp [
 
 	super setUp.
 
+	mooseModel setIntrinsicTypes.
 	resolver := FamixEsopeResolver on: mooseModel.
 ]
 

src/EsopeImporter-Tests/IASTToFamixVisitorTest.class.st

@@ -192,6 +192,7 @@ IASTToFamixVisitorTest >> setUp [
 
 	programFile := IASTProgramFile new filename: 'fortran77.f' ; yourself.
 	visitor := IASTToFamixFortranVisitor new.
+	visitor model setIntrinsicTypes 
 ]
 
 { #category : 'tests-fortran' }

src/EsopeImporter/FamixEsopeModel.extension.st

@@ -4,9 +4,7 @@ Extension { #name : 'FamixEsopeModel' }
 FamixEsopeModel >> initialize [
 
 	super initialize.
-	self name: 'EsopeMooseModel'.
-	self attributeAt: #instrinsicTypes put: self intrinsicTypes.
-	self attributeAt: #unknownType put: [ self newTypeUnknown ]
+	self name: 'EsopeMooseModel'
 ]
 
 { #category : '*EsopeImporter' }
@@ -20,3 +18,10 @@ FamixEsopeModel >> intrinsicTypes [
 		  (#character -> (self newTypeIntrinsic name: #character)) }
 		  asDictionary
 ]
+
+{ #category : '*EsopeImporter' }
+FamixEsopeModel >> setIntrinsicTypes [
+
+	self attributeAt: #instrinsicTypes put: self intrinsicTypes.
+	self attributeAt: #unknownType put: [ self newTypeUnknown ]
+]

src/EsopeImporter/FamixF77Model.extension.st

@@ -19,3 +19,10 @@ FamixF77Model >> intrinsicTypes [
 		  (#character -> (self newTypeIntrinsic name: #character)) 
 	} asDictionary
 ]
+
+{ #category : '*EsopeImporter' }
+FamixF77Model >> setIntrinsicTypes [
+
+	self attributeAt: #instrinsicTypes put: self intrinsicTypes.
+	self attributeAt: #unknownType put: [ self newTypeUnknown ]
+]

src/EsopeImporter/IASTAbstractFamixVisitor.class.st

@@ -72,7 +72,7 @@ IASTAbstractFamixVisitor >> model [
 IASTAbstractFamixVisitor >> model: anObject [
 
 	model := anObject.
-	self setIntrinsicTypes
+	model setIntrinsicTypes
 ]
 
 { #category : 'private-creation' }
@@ -99,13 +99,6 @@ IASTAbstractFamixVisitor >> retrieveTypeFrom: aName [
 	 ) at: aName ifAbsent: typeNotFoundBlock.
 ]
 
-{ #category : 'private - helpers' }
-IASTAbstractFamixVisitor >> setIntrinsicTypes [
-
-	model attributeAt: #instrinsicTypes put: model intrinsicTypes.
-	model attributeAt: #unknownType put: [ model newTypeUnknown ]
-]
-
 { #category : 'spawn' }
 IASTAbstractFamixVisitor >> spawn: aVisitorClass [
 	^aVisitorClass new

src/EsopeImporter/IASTToFamixFortranVisitor.class.st

@@ -210,9 +210,9 @@ IASTToFamixFortranVisitor >> visitIASTIncludedFile: anIncludedFile [
 	'.
 
 	anIncludedFile sourceAnchor
-		startLine: anIncludedFile sourceAnchor startLine + 1;
-		startColumn: 1;
-		endLine: anIncludedFile sourceAnchor endLine - 1;
+		startLine: anIncludedFile sourceAnchor startLine + 1 ;
+		startColumn: 1 ;
+		endLine: anIncludedFile sourceAnchor endLine ;
 		endColumn: 1.
 
 	^ self