Merge pull request #200 from moosetechnology/fix-nonesopevariables

Fix nonesopevariables

Author: uNouss

src/EsopeImporter-Tests/FamixEsopeResolverTest.class.st

@@ -1251,7 +1251,7 @@ FamixEsopeResolverTest >> testResolveSegmentWithAttributes [
       ENDSEGMENT
       end
 	"
-		segment := self defaultSegment: 'PSTR' with: { 
+	segment := self defaultSegment: 'PSTR' with: { 
 			           (#NOMCOD -> #character).
 			           (#DATE -> #character) }.
 

src/EsopeImporter/FamixEsopeResolver.class.st

@@ -315,7 +315,7 @@ FamixEsopeResolver >> resolveAttributeAccess: anAccess forPointer: aPointerVaria
 FamixEsopeResolver >> resolveDeclaredTypeOfPointers [
 	"sets the declaredType of pointers"
 
-	(self model allWithSubTypesOf: FamixF77Variable) 
+	(self model allWithType: FamixF77Variable) 
 		do: [ :var | 
 			var isEsope ifTrue: [ self resolveEsopeVariable: var ]
 		].
@@ -342,11 +342,13 @@ FamixEsopeResolver >> resolveEsopeVariable: aFamixVariable [
 		ifNotNil: [ :declaredSegmentName | declaredSegmentName ].
 
 	segment := allSegments
-		detect: [ :seg | seg name = segmentName ]
-		ifNone: [ self model newSegment
-			name: segmentName ;
-			isStub: true ;
-			yourself
+		detect: [ :seg | seg name asLowercase = segmentName asLowercase ]
+		ifNone: [ 
+			self flag: 'WARGNING: If any segment with this found in the model, we create stub one'.
+			self model newSegment
+				name: segmentName ;
+				isStub: true ;
+				yourself
 		].
 
 	aFamixVariable declaredType: segment.

src/EsopeImporter/IASTToFamixEsopeVisitor.class.st

@@ -24,6 +24,13 @@ IASTToFamixEsopeVisitor >> checkForModSuffix: aFamixEsopeCommand [
 	]
 ]
 
+{ #category : 'visiting' }
+IASTToFamixEsopeVisitor >> isAFortranIntrinsicType: typeName [
+
+	^ (#( character integer logical complex real 'double precision' )
+		   includes: typeName) not
+]
+
 { #category : 'private-creation' }
 IASTToFamixEsopeVisitor >> newType: typeName sourceAnchor: sourceAnchor [
 
@@ -36,8 +43,8 @@ IASTToFamixEsopeVisitor >> newType: typeName sourceAnchor: sourceAnchor [
 IASTToFamixEsopeVisitor >> visitIASTEsopePointer: aPointerVar [
 
 	| varsNames pointer |
-	varsNames := aPointerVar entityName substrings: '.'.
-	
+	varsNames := $. split: aPointerVar entityName.
+
 	pointer := (self model newVariableNamed: varsNames first)
 		sourceAnchor: (self visitIndexedFileAnchor: aPointerVar sourceAnchor);
 		isEsope: true;
@@ -70,6 +77,11 @@ IASTToFamixEsopeVisitor >> visitIASTEsopeSegCommand: aSegmentCommand [
 IASTToFamixEsopeVisitor >> visitIASTEsopeSegment: aSegment [
 
 	| segment |
+	
+	self flag: '#TODO: if we have accesses in the segment, we have to deal with them
+		see visitIASTVariable:
+	'.
+	
 	segment := self model newSegment
 		           sourceAnchor:
 			           (self visitIndexedFileAnchor: aSegment sourceAnchor) ;
@@ -78,7 +90,7 @@ IASTToFamixEsopeVisitor >> visitIASTEsopeSegment: aSegment [
 	stack push: segment.
 	self createSymbolTableFor: segment.
 	segment attributes: (aSegment declarations collect: [ :variable |
-			variable isEsope: true.
+			variable isEsope: (self isAFortranIntrinsicType: variable typeSpec entityName).
 			variable accept: (self spawn: IASTToFamixFortranVisitor) ]).
 
 	^ stack pop

src/EsopeImporter/IASTToFamixFortranVisitor.class.st

@@ -336,6 +336,11 @@ IASTToFamixFortranVisitor >> visitIASTVarEsoSl: aVarEso [
 IASTToFamixFortranVisitor >> visitIASTVariable: aVariable [
 
 	| var |
+	self flag: '#TODO: we need to visit aVariable dimensions if any
+		- In case of segment: add it as parameter (subclass of access)
+		- For ProgramUnit add it as access
+	'.
+
 	var := (self newEntity: stack top localVariableClass)
 		       sourceAnchor:
 			       (self visitIndexedFileAnchor: aVariable sourceAnchor);