BUG: Fix for bug#5809. Applied patch supplied in the bug report. Updated pre-generated lexer and parser sources. This updates the makedepf90 version to 2.8.8. The parser actions have been updated to ignore "use" in comments properly.

1 files changed, 78 insertions, 72 deletions

diff --git a/Source/cmDependsFortranParserTokens.h b/Source/cmDependsFortranParserTokens.h
index 055be925c3..97f48a61eb 100644
--- a/Source/cmDependsFortranParserTokens.h
+++ b/Source/cmDependsFortranParserTokens.h
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984,
-   1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +17,21 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -29,79 +39,75 @@
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    enum yytokentype {
-     USE = 258,
-     F_INCLUDE = 259,
-     MODULE = 260,
-     EOSTMT = 261,
-     CPP_INCLUDE = 262,
-     F90PPR_INCLUDE = 263,
-     COCO_INCLUDE = 264,
-     F90PPR_DEFINE = 265,
-     CPP_DEFINE = 266,
-     F90PPR_UNDEF = 267,
-     CPP_UNDEF = 268,
-     CPP_IFDEF = 269,
-     CPP_IFNDEF = 270,
-     CPP_IF = 271,
-     CPP_ELSE = 272,
-     CPP_ELIF = 273,
-     CPP_ENDIF = 274,
-     F90PPR_IFDEF = 275,
-     F90PPR_IFNDEF = 276,
-     F90PPR_IF = 277,
-     F90PPR_ELSE = 278,
-     F90PPR_ELIF = 279,
-     F90PPR_ENDIF = 280,
+     EOSTMT = 258,
+     ASSIGNMENT_OP = 259,
+     GARBAGE = 260,
+     CPP_INCLUDE = 261,
+     F90PPR_INCLUDE = 262,
+     COCO_INCLUDE = 263,
+     F90PPR_DEFINE = 264,
+     CPP_DEFINE = 265,
+     F90PPR_UNDEF = 266,
+     CPP_UNDEF = 267,
+     CPP_IFDEF = 268,
+     CPP_IFNDEF = 269,
+     CPP_IF = 270,
+     CPP_ELSE = 271,
+     CPP_ELIF = 272,
+     CPP_ENDIF = 273,
+     F90PPR_IFDEF = 274,
+     F90PPR_IFNDEF = 275,
+     F90PPR_IF = 276,
+     F90PPR_ELSE = 277,
+     F90PPR_ELIF = 278,
+     F90PPR_ENDIF = 279,
+     CPP_TOENDL = 280,
      UNTERMINATED_STRING = 281,
-     CPP_TOENDL = 282,
-     STRING = 283,
-     WORD = 284
+     STRING = 282,
+     WORD = 283
    };
 #endif
-#define USE 258
-#define F_INCLUDE 259
-#define MODULE 260
-#define EOSTMT 261
-#define CPP_INCLUDE 262
-#define F90PPR_INCLUDE 263
-#define COCO_INCLUDE 264
-#define F90PPR_DEFINE 265
-#define CPP_DEFINE 266
-#define F90PPR_UNDEF 267
-#define CPP_UNDEF 268
-#define CPP_IFDEF 269
-#define CPP_IFNDEF 270
-#define CPP_IF 271
-#define CPP_ELSE 272
-#define CPP_ELIF 273
-#define CPP_ENDIF 274
-#define F90PPR_IFDEF 275
-#define F90PPR_IFNDEF 276
-#define F90PPR_IF 277
-#define F90PPR_ELSE 278
-#define F90PPR_ELIF 279
-#define F90PPR_ENDIF 280
+/* Tokens.  */
+#define EOSTMT 258
+#define ASSIGNMENT_OP 259
+#define GARBAGE 260
+#define CPP_INCLUDE 261
+#define F90PPR_INCLUDE 262
+#define COCO_INCLUDE 263
+#define F90PPR_DEFINE 264
+#define CPP_DEFINE 265
+#define F90PPR_UNDEF 266
+#define CPP_UNDEF 267
+#define CPP_IFDEF 268
+#define CPP_IFNDEF 269
+#define CPP_IF 270
+#define CPP_ELSE 271
+#define CPP_ELIF 272
+#define CPP_ENDIF 273
+#define F90PPR_IFDEF 274
+#define F90PPR_IFNDEF 275
+#define F90PPR_IF 276
+#define F90PPR_ELSE 277
+#define F90PPR_ELIF 278
+#define F90PPR_ENDIF 279
+#define CPP_TOENDL 280
 #define UNTERMINATED_STRING 281
-#define CPP_TOENDL 282
-#define STRING 283
-#define WORD 284
+#define STRING 282
+#define WORD 283
 
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 75 "cmDependsFortranParser.y"
-typedef union YYSTYPE {
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 81 "cmDependsFortranParser.y"
+{
   char* string;
-} YYSTYPE;
-/* Line 1285 of yacc.c.  */
-#line 99 "cmDependsFortranParserTokens.h"
+}
+/* Line 1489 of yacc.c.  */
+#line 109 "cmDependsFortranParserTokens.h"
+        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-
-
-
-
-