Merge pull request #194 from moosetechnology/sourceAnchor

Source anchor

Author: uNouss

src/EsopeImporter-Tests/FamixEsopeResolverTest.class.st

@@ -690,6 +690,63 @@ FamixEsopeResolverTest >> testResolveDeclaredTypeOfPointersStubSegment [
 
 ]
 
+{ #category : 'test - resolveAccess' }
+FamixEsopeResolverTest >> testResolveExternalFunction [
+	"subroutine sub
+	 integer n
+	 external fct
+	 integer fct
+	 end
+	"
+
+	| subroutine  |
+
+	subroutine := (self defaultSubroutine: 'main')
+		addLocalVariable: (self defaultVariable: 'aVar' withType: #integer) ;
+		addExternalDeclaration: (self externalDeclaration: 'fct') ;
+		addLocalVariable: (self defaultVariable: 'fct' withType: #integer) ;
+		yourself.
+
+	self assert: subroutine localVariables size equals: 2.
+	self assert: subroutine externalDeclarations size equals: 1.
+
+ 	resolver resolve.
+
+	self assert: subroutine localVariables size equals: 1.
+	self assert: (resolver model allWithType: FamixF77Variable) size equals: 1.
+	self assert: subroutine localVariables anyOne name equals: 'aVar'.
+
+	self assert: subroutine externalDeclarations size equals: 1.
+	self assert: (resolver model allWithType: FamixF77ExternalDeclaration) size equals: 1.
+	self assert: (resolver model allWithType: FamixF77ExternalDeclaration) anyOne name equals: 'fct'.
+]
+
+{ #category : 'test - resolveAccess' }
+FamixEsopeResolverTest >> testResolveExternalFunctionWithoutVariableDeclaration [
+	"subroutine sub
+	 external fct
+	 end
+	"
+
+	| subroutine  |
+
+	subroutine := (self defaultSubroutine: 'main')
+		addExternalDeclaration: (self externalDeclaration: 'fct') ;
+		yourself.
+
+	self assert: subroutine localVariables size equals: 0.
+	self assert: subroutine externalDeclarations size equals: 1.
+
+ 	resolver resolve.
+
+	self assert: subroutine localVariables size equals: 0.
+	self assert: (resolver model allWithType: FamixF77Variable) size equals: 0.
+
+	self assert: subroutine externalDeclarations size equals: 1.
+	self assert: (resolver model allWithType: FamixF77ExternalDeclaration) size equals: 1.
+	self assert: (resolver model allWithType: FamixF77ExternalDeclaration) anyOne name equals: 'fct'.
+]
+
 { #category : 'test - implicit' }
 FamixEsopeResolverTest >> testResolveFunctionNameAsNonLocalVariable [
 

src/EsopeImporter-Tests/IASTToFamixVisitorTest.class.st

@@ -679,6 +679,38 @@ c  ptr.attr(/1)
 		equals: 'ptr'
 ]
 
+{ #category : 'tests-fortran' }
+IASTToFamixVisitorTest >> testFamixExternalDeclaration [
+
+	| entity external iastVar |
+	
+	iastVar := self defaultVarAccess: 'fct' isWrite: false.
+	iastVar annotations: 'external'.
+
+	programFile body: { IASTSubroutine new
+		entityName: 'sub';
+		body: { iastVar } ;
+		yourself
+	}.
+
+	entity := programFile accept: visitor.
+
+	self assert: entity programUnits size equals: 1.
+
+	entity := entity programUnits first.
+	self assert: entity class equals: FamixF77PUSubroutine.
+	self assert: entity name equals: 'sub'.
+	self assert: entity programFile isNotNil.
+
+	self assert: entity accesses size equals: 0.
+	self assert: entity externalDeclarations size equals: 1.
+	
+	external := entity externalDeclarations anyOne.
+	self assert: external class equals: FamixF77ExternalDeclaration.
+	self assert: external name equals: 'fct'.
+	self assert: external programUnit equals: entity.
+]
+
 { #category : 'tests-fortran' }
 IASTToFamixVisitorTest >> testFamixFortran77 [
 

src/EsopeImporter-Tests/JsonToIASTVisitorTest.class.st

@@ -854,6 +854,32 @@ c@_   IF (N.GT.0) SEGINI P
 	self assert: seg sourceAnchor endColumn equals: 29
 ]
 
+{ #category : 'tests-progUnit' }
+JsonToIASTVisitorTest >> testExternalStatement [
+	"external fct"
+	| programFile stmt |
+	programFile :=  self visitJsonCode: '{"meta":{"miVersion":"fortran77","miFilename":"./fortran77.f"},"program_units":[{"anno":[],"blocks":[{"anno":[],"label":null,"span":"(2:7)-(2:18)","statement":{"anno":[],"span":"(2:7)-(2:18)","tag":"external","vars":{"anno":[],"list":[{"anno":[],"span":"(2:16)-(2:18)","tag":"value","value":{"contents":"fct","tag":"variable"}}],"span":"(2:16)-(2:18)"}},"tag":"statement"}],"name":"main","span":"(1:7)-(3:9)","subprograms":null,"tag":"main"}]}'.
+
+	self assert: programFile body size equals: 1.
+	stmt := programFile body first.
+	self assert: stmt class equals: IASTMainProgram.
+	self assert: stmt body size equals: 1.
+	stmt := stmt body anyOne first.
+	
+	self assert: stmt class equals: IASTVarAccess.
+	self assert: stmt entityName equals: 'fct'.
+	self assert: stmt annotations equals: 'external'.
+
+	self assert: stmt sourceAnchor notNil.
+	self assert: stmt sourceAnchor class equals: IASTIndexedFileAnchor.
+	self assert: stmt sourceAnchor fileName equals: './fortran77.f'.
+	self assert: stmt sourceAnchor startLine equals: 2.
+	self assert: stmt sourceAnchor startColumn equals: 16.
+	self assert: stmt sourceAnchor endLine equals: 2.
+	self assert: stmt sourceAnchor endColumn equals: 19.
+
+]
+
 { #category : 'tests-statement' }
 JsonToIASTVisitorTest >> testFunctionWithFunctionInvocation [
 "      integer function efunc()

src/EsopeImporter/IASTToFamixFortranVisitor.class.st

@@ -206,6 +206,8 @@ IASTToFamixFortranVisitor >> visitIASTInclude: anInclude [
 { #category : 'visiting' }
 IASTToFamixFortranVisitor >> visitIASTIncludedFile: anIncludedFile [
 
+	self flag: '#FIXME: error with sourceAnchor'.
+
 	anIncludedFile sourceAnchor
 		startLine: anIncludedFile sourceAnchor startLine + 1;
 		endLine: anIncludedFile sourceAnchor endLine - 1.