Merge pull request #3526 from masatake/fortran--reset-newline-state-for-new-input

Fortran: reset "newline" state when processing a new input file

Author: masatake

Units/parser-fortran.r/reset-newline-state.d/args.ctags

@@ -0,0 +1 @@
+--sort=no

Units/parser-fortran.r/reset-newline-state.d/expected.tags

@@ -0,0 +1,4 @@
+mod1	input-1.f90	/^  MODULE mod1$/;"	m
+var1	input-1.f90	/^     integer :: var1$/;"	v	module:mod1
+mod2	input-2.f90	/^  MODULE mod2$/;"	m
+var2	input-2.f90	/^     integer :: var2$/;"	v	module:mod2

Units/parser-fortran.r/reset-newline-state.d/input-1.f90

@@ -0,0 +1,6 @@
+#include "in.fpp"
+
+  MODULE mod1
+     implicit none
+     integer :: var1
+  END MODULE mod1

Units/parser-fortran.r/reset-newline-state.d/input-2.f90

@@ -0,0 +1,6 @@
+#include "in.fpp"
+
+  MODULE mod2
+     implicit none
+     integer :: var2
+  END MODULE

Units/parser-fortran.r/reset-newline-state.d/input.f90

@@ -0,0 +1 @@
+  ! Dummy file

parsers/fortran.c

@@ -224,6 +224,7 @@ static unsigned int Column;
 static bool FreeSourceForm;
 static bool FreeSourceFormFound = false;
 static bool ParsingString;
+static bool Newline;
 
 /* indexed by tagType */
 static kindDefinition FortranKinds [] = {
@@ -781,7 +782,6 @@ static int skipToNextLine (void)
 
 static int getFreeFormChar (void)
 {
-	static bool newline = true;
 	bool advanceLine = false;
 	int c = getcFromInputFile ();
 
@@ -796,7 +796,7 @@ static int getFreeFormChar (void)
 		while (isspace (c)  &&  c != '\n');
 		if (c == '\n')
 		{
-			newline = true;
+			Newline = true;
 			advanceLine = true;
 		}
 		else if (c == '!')
@@ -807,24 +807,24 @@ static int getFreeFormChar (void)
 			c = '&';
 		}
 	}
-	else if (newline && (c == '!' || c == '#'))
+	else if (Newline && (c == '!' || c == '#'))
 		advanceLine = true;
 	while (advanceLine)
 	{
 		while (isspace (c))
 			c = getcFromInputFile ();
-		if (c == '!' || (newline && c == '#'))
+		if (c == '!' || (Newline && c == '#'))
 		{
 			c = skipToNextLine ();
-			newline = true;
+			Newline = true;
 			continue;
 		}
 		if (c == '&')
 			c = getcFromInputFile ();
 		else
 			advanceLine = false;
 	}
-	newline = (bool) (c == '\n');
+	Newline = (bool) (c == '\n');
 	return c;
 }
 
@@ -2653,6 +2653,7 @@ static rescanReason findFortranTags (const unsigned int passCount)
 	token = newToken ();
 
 	FreeSourceForm = (bool) (passCount > 1);
+	Newline = (passCount == 1)? true: Newline;
 	Column = 0;
 	parseProgramUnit (token);
 	if (FreeSourceFormFound  &&  ! FreeSourceForm)