Merge pull request #213 from moosetechnology/comment-branch

Comment branch

Author: uNouss

src/EsopeImporter-Tests/IASTToFamixVisitorTest.class.st

@@ -202,7 +202,7 @@ IASTToFamixVisitorTest >> testComment [
 	programFile body: { IASTMainProgram new
 			 entityName: 'main';
 			 body: { IASTComment new
-		           text: 'a normal comment';
+		           text: 'a normal comment' ;
 		           yourself. };
 			 yourself }.
 
@@ -213,7 +213,7 @@ IASTToFamixVisitorTest >> testComment [
 
 	comment := entity programUnits first comments first.
 	self assert: comment class equals: FamixF77Comment.
-	self assert: comment content equals: 'a normal comment'.
+	self assert: comment sourceText equals: 'a normal comment'.
 	self deny: comment isEsope.
 
 	self assert: comment commentedEntity equals: entity programUnits first.

src/EsopeImporter/IASTToFamixFortranVisitor.class.st

@@ -114,9 +114,8 @@ IASTToFamixFortranVisitor >> visitIASTBlockData: aBlockData [
 IASTToFamixFortranVisitor >> visitIASTComment: aComment [
 
 	^(self newEntity: FamixF77Comment)
-		content: aComment text ;
 		commentedEntity: stack top ;
-		sourceAnchor: (self visitIndexedFileAnchor: aComment sourceAnchor) ;
+		sourceAnchor: (FamixF77SourceTextAnchor new source: aComment text) ;
 		isEsope: aComment isEsope ;
 		yourself
 ]
@@ -256,11 +255,11 @@ IASTToFamixFortranVisitor >> visitIASTProgramFile: aProgramFile [
 
 	stack push: progFile.
 
-	aProgramFile body do: [ :child || famixComment |
-		famixComment := child accept: self.
+	aProgramFile body do: [ :child || famixEntity |
+		famixEntity := child accept: self.
 		child isComment
-		ifTrue: [ famixComment commentedEntity: progFile ]
-		ifFalse: [ progFile addProgramUnit: famixComment ]
+		ifTrue: [ famixEntity commentedEntity: progFile ]
+		ifFalse: [ progFile addProgramUnit: famixEntity ]
 	].
 
 	stack pop.