Merge pull request #215 from moosetechnology/quick-fix

Managing the resolution of a procedure's parameter pointers

Author: uNouss

src/EsopeImporter-Tests/FamixEsopeResolverTest.class.st

@@ -1292,6 +1292,38 @@ FamixEsopeResolverTest >> testResolveInvocationsWrongArgumentNumber [
 	self assert: invocation candidates size equals: 0
 ]
 
+{ #category : 'tests' }
+FamixEsopeResolverTest >> testResolvePointeurParameter [
+
+	| sub entity var |
+	"
+       subroutine relbk(lib)
+       pointeur lib.PSTR
+       end
+	"
+	var := self newEntity: FamixF77Variable named: 'p'.
+	var segment: 'point'.
+	var isEsope: true.
+
+	sub := (self newPU: 'relbk')
+		addParameter: (self defaultParameter: 'p');
+		addLocalVariable: var;
+		yourself.
+
+	resolver resolve.
+
+	self assert: sub localVariables size equals: 0.
+	self assert: (resolver model allWithType: FamixF77Variable) isEmpty.
+
+	self assert: sub parameters size equals: 1.
+
+	entity := sub parameters anyOne.
+	self assert: entity declaredType class equals: FamixEsopeSegment.
+	self assert: entity declaredType name equals: 'point'.
+	self assert: entity declaredType isStub
+		
+]
+
 { #category : 'test - resolveAccess' }
 FamixEsopeResolverTest >> testResolvePointeurWithDeclaredSegmentAccessingField [
 

src/EsopeImporter/FamixEsopeResolver.class.st

@@ -202,6 +202,9 @@ FamixEsopeResolver >> requalifyParameterDeclaration: param [
 		do: [ :varDeclaration |
 			(varDeclaration = param)
 			ifFalse: [
+				varDeclaration declaredType 
+					ifNil: [ self resolveDeclaredTypeOfPointers ]. 
+
 				param declaredType: varDeclaration declaredType.
 				self mergeVariable: varDeclaration into: param
 			]
@@ -295,7 +298,7 @@ FamixEsopeResolver >> resolveAsImplicitAttribute: variableName in: anAccessor [
 FamixEsopeResolver >> resolveAsLocalVariable: variableName in: anAccessor [
 
 	^anAccessor allLocalVariables
-		select: [ :entity | entity name = variableName ]
+		select: [ :entity | entity name asLowercase = variableName asLowercase ]
 ]
 
 { #category : 'symbols resolution' }