Merge pull request #285 from moosetechnology/import-close-stmt

refactoring export of IOStatements + import of Close stmt + test

Author: NicolasAnquetil

src/FAST-Fortran-Visitors-Tests/FortranToFASTTests.class.st

@@ -803,6 +803,40 @@ FortranToFASTTests >> testCallSubroutine [
 
 ]
 
+{ #category : 'tests-statement' }
+FortranToFASTTests >> testCloseStatement [
+
+	| stmt result |
+	fortranCode := '      PROGRAM main
+      CLOSE(8, FILE=''projectA/data.test'', ERR=99)
+      end
+'.
+	jsonCode := '{"meta":{"miVersion":"fortran77","miFilename":"tmpFASTSource.f"},"program_units":[{"anno":[],"blocks":[{"anno":[],"label":null,"span":"(2:7)-(2:48)","statement":{"anno":[],"span":"(2:7)-(2:48)","specification":{"anno":[],"list":[{"anno":[],"expr":{"anno":[],"span":"(2:12)-(2:12)","tag":"value","value":{"contents":["8",null],"tag":"integer"}},"name":null,"span":"(2:12)-(2:12)"},{"anno":[],"expr":{"anno":[],"span":"(2:20)-(2:39)","tag":"value","value":{"contents":"projectA/data.test","tag":"string"}},"name":"file","span":"(2:15)-(2:39)"},{"anno":[],"expr":{"anno":[],"span":"(2:46)-(2:47)","tag":"value","value":{"contents":["99",null],"tag":"integer"}},"name":"err","span":"(2:42)-(2:47)"}],"span":"(2:11)-(2:48)"},"tag":"close"},"tag":"statement"}],"name":"main","span":"(1:7)-(3:9)","subprograms":null,"tag":"main"}]}'.
+
+	result := self visitJsonCode.
+
+	stmt := result first statementBlock statements first.
+	self assert: stmt class equals: FASTFortranCloseStatement.
+	self assert: stmt startPos equals: 26.
+	self assert: stmt endPos equals: 67.
+
+	self assert: stmt ioParameters size equals: 3.
+
+	self assert: stmt ioParameters first class equals: FASTFortranIntegerLiteral.
+	self assert: stmt ioParameters first startPos equals: 31.
+	self assert: stmt ioParameters first primitiveValue equals: '8'.
+
+	self assert: stmt ioParameters second class equals: FASTFortranIOParameter.
+	self assert: stmt ioParameters second startPos equals: 34.
+	self assert: stmt ioParameters second name equals: 'file'.
+	self assert: stmt ioParameters second expression class equals: FASTFortranCharacterLiteral.
+	self assert: stmt ioParameters second expression primitiveValue equals: 'projectA/data.test'.
+
+	self assert: stmt ioParameters third class equals: FASTFortranIOParameter.
+	self assert: stmt ioParameters third startPos equals: 61.
+	self assert: stmt ioParameters third name equals: 'err'.
+]
+
 { #category : 'tests' }
 FortranToFASTTests >> testComment [
 

src/FAST-Fortran-Visitors/FASTFortranExporterVisitor.class.st

@@ -179,9 +179,7 @@ FASTFortranExporterVisitor >> visitFASTFortranAbstractIOStatement: aFASTFortranI
 	self
 		visitFASTFortranAbstractStatement: aFASTFortranIOStatement ;
 		<< aString ;
-		visitFASTFortranTWithIOParameters: aFASTFortranIOStatement ;
-		visitFASTFortranTWithArguments: aFASTFortranIOStatement ;
-		newLine
+		visitFASTFortranTWithIOParameters: aFASTFortranIOStatement
 ]
 
 { #category : 'visiting - statements' }
@@ -278,6 +276,14 @@ FASTFortranExporterVisitor >> visitFASTFortranCharacterType: aFASTFortranType [
 	self visitFASTFortranType: aFASTFortranType
 ]
 
+{ #category : 'visiting - statements' }
+FASTFortranExporterVisitor >> visitFASTFortranCloseStatement: aFASTFortranCloseStatement [
+
+	self
+		visitFASTFortranAbstractIOStatement: aFASTFortranCloseStatement named: 'close' ;
+		newLine
+]
+
 { #category : 'visiting' }
 FASTFortranExporterVisitor >> visitFASTFortranCommonGroup: aFASTFortranCommonGroup [
 
@@ -675,13 +681,9 @@ FASTFortranExporterVisitor >> visitFASTFortranImpliedDoExpression: aFASTFortranI
 { #category : 'visiting - statements' }
 FASTFortranExporterVisitor >> visitFASTFortranInquireStatement: aFASTFortranInquireStatement [
 
+	
 	self
-		visitFASTFortranAbstractStatement: aFASTFortranInquireStatement;
-		<< 'inquire ';
-		outputExpression: [
-			self visitNodeListSeparatedByCommas:
-					aFASTFortranInquireStatement ioParameters ]
-		inParentheses: true;
+		visitFASTFortranAbstractIOStatement: aFASTFortranInquireStatement named: 'inquire' ;
 		newLine
 ]
 
@@ -733,13 +735,9 @@ FASTFortranExporterVisitor >> visitFASTFortranLoopControlExpression: aFASTFortra
 { #category : 'visiting - statements' }
 FASTFortranExporterVisitor >> visitFASTFortranOpenStatement: aFASTFortranOpenStatement [
 
+	
 	self
-		visitFASTFortranAbstractStatement: aFASTFortranOpenStatement;
-		<< 'open ';
-		outputExpression: [
-			self visitNodeListSeparatedByCommas:
-					aFASTFortranOpenStatement ioParameters ]
-		inParentheses: true;
+		visitFASTFortranAbstractIOStatement: aFASTFortranOpenStatement named: 'open' ;
 		newLine
 ]
 
@@ -794,8 +792,10 @@ FASTFortranExporterVisitor >> visitFASTFortranProgramMain: aFASTFortranProgramMa
 FASTFortranExporterVisitor >> visitFASTFortranReadStatement: aFASTFortranReadStatement [
 
 	self
-		visitFASTFortranAbstractIOStatement: aFASTFortranReadStatement
-		named: 'read'
+		visitFASTFortranAbstractIOStatement: aFASTFortranReadStatement named: 'read' ;
+		space;
+		visitFASTFortranTWithArguments: aFASTFortranReadStatement ;
+		newLine
 ]
 
 { #category : 'visiting' }
@@ -820,12 +820,7 @@ FASTFortranExporterVisitor >> visitFASTFortranReturnStatement: aFASTFortranTRetu
 FASTFortranExporterVisitor >> visitFASTFortranRewindStatement: aFASTFortranRewindStatement [
 
 	self
-		visitFASTFortranAbstractStatement: aFASTFortranRewindStatement;
-		<< 'rewind ';
-		outputExpression: [
-			self visitNodeListSeparatedByCommas:
-					aFASTFortranRewindStatement ioParameters ]
-		inParentheses: true;
+		visitFASTFortranAbstractIOStatement: aFASTFortranRewindStatement named: 'rewind' ;
 		newLine
 ]
 
@@ -928,8 +923,7 @@ FASTFortranExporterVisitor >> visitFASTFortranTWithIOParameters: aFASTFortranTWi
 		space;
 		outputExpression: [
 			self visitNodeListSeparatedByCommas: aFASTFortranTWithIOParameters ioParameters ]
-		inParentheses: true;
-		space
+		inParentheses: true
 ]
 
 { #category : 'visiting - traits' }
@@ -1000,8 +994,10 @@ FASTFortranExporterVisitor >> visitFASTFortranVariableDeclarator: aFASTFortranVa
 FASTFortranExporterVisitor >> visitFASTFortranWriteStatement: aFASTFortranWriteStatement [
 
 	self
-		visitFASTFortranAbstractIOStatement: aFASTFortranWriteStatement
-		named: 'write'
+		visitFASTFortranAbstractIOStatement: aFASTFortranWriteStatement named: 'write' ;
+		space;
+		visitFASTFortranTWithArguments: aFASTFortranWriteStatement ;
+		newLine
 ]
 
 { #category : 'visiting' }

src/FAST-Fortran-Visitors/FASTFortranJsonVisitor.class.st

@@ -348,8 +348,9 @@ FASTFortranJsonVisitor >> visitCloseStatement: aCloseNode [
 	| data |
 	data := super visitCloseStatement: aCloseNode.
 
-	^self newEntity: FASTFortranCloseStatement atPosition: data first
-
+	^(self newEntity: FASTFortranCloseStatement atPosition: data first)
+		ioParameters: data second ;
+		yourself
 ]
 
 { #category : 'visiting' }