Merge topic 'fortran-depend-cleanup'

d28da906 cmFortranParser: Inject a newline at end-of-file when missing
8c65a501 cmFortranParser: Revise indentation style to match rest of CMake
f70c71c5 cmFortranLexer: Update to flex 2.6
e11cd31f Fortran: Warn when dependency scanning fails to parse a source file

1 files changed, 6 insertions, 0 deletions

diff --git a/Source/cmFortranParser.h b/Source/cmFortranParser.h
index 5f1c7ac..2b58375 100644
--- a/Source/cmFortranParser.h
+++ b/Source/cmFortranParser.h
@@ -73,6 +73,7 @@ union cmFortran_yystype_u
 #define YYSTYPE cmFortran_yystype
 #define YYSTYPE_IS_DECLARED 1
 #if !defined(cmFortranLexer_cxx)
+#define YY_NO_UNISTD_H
 #include "cmFortranLexer.h"
 #endif
 #if !defined(cmFortranLexer_cxx)
@@ -117,11 +118,13 @@ struct cmFortranFile
     : File(file)
     , Buffer(buffer)
     , Directory(dir)
+    , LastCharWasNewline(false)
   {
   }
   FILE* File;
   YY_BUFFER_STATE Buffer;
   std::string Directory;
+  bool LastCharWasNewline;
 };
 
 struct cmFortranParser_s
@@ -146,6 +149,9 @@ struct cmFortranParser_s
   // Buffer for string literals.
   std::string TokenString;
 
+  // Error message text if a parser error occurs.
+  std::string Error;
+
   // Flag for whether lexer is reading from inside an interface.
   bool InInterface;