diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-08 13:36:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-08 13:36:57 (GMT) |
| commit | f506489d1ed222761f9ce752144a458290020e55 (patch) | |
| tree | 5aed76c45f567cd5bc312953ce6344edb9b73823 /Source/cmFortranParserTokens.h | |
| parent | 988b3806b6ad2f28ebd6b582ce18928407d0b011 (diff) | |
| parent | d28da906fed16ab7f45440db65c8c84e15b53996 (diff) | |
| download | CMake-f506489d1ed222761f9ce752144a458290020e55.zip CMake-f506489d1ed222761f9ce752144a458290020e55.tar.gz CMake-f506489d1ed222761f9ce752144a458290020e55.tar.bz2 | |
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
Diffstat (limited to 'Source/cmFortranParserTokens.h')
| -rw-r--r-- | Source/cmFortranParserTokens.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmFortranParserTokens.h b/Source/cmFortranParserTokens.h index ac49840..176f6fe 100644 --- a/Source/cmFortranParserTokens.h +++ b/Source/cmFortranParserTokens.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015 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 @@ -70,11 +70,10 @@ extern int cmFortran_yydebug; F90PPR_ENDIF = 280, COMMA = 281, DCOLON = 282, - CPP_TOENDL = 283, - UNTERMINATED_STRING = 284, - STRING = 285, - WORD = 286, - CPP_INCLUDE_ANGLE = 287 + UNTERMINATED_STRING = 283, + STRING = 284, + WORD = 285, + CPP_INCLUDE_ANGLE = 286 }; #endif /* Tokens. */ @@ -103,23 +102,24 @@ extern int cmFortran_yydebug; #define F90PPR_ENDIF 280 #define COMMA 281 #define DCOLON 282 -#define CPP_TOENDL 283 -#define UNTERMINATED_STRING 284 -#define STRING 285 -#define WORD 286 -#define CPP_INCLUDE_ANGLE 287 +#define UNTERMINATED_STRING 283 +#define STRING 284 +#define WORD 285 +#define CPP_INCLUDE_ANGLE 286 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE YYSTYPE; + union YYSTYPE { #line 81 "cmFortranParser.y" /* yacc.c:1909 */ char* string; -#line 122 "cmFortranParserTokens.h" /* yacc.c:1909 */ +#line 120 "cmFortranParserTokens.h" /* yacc.c:1909 */ }; + +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 #endif |