From f8caab461315c1588412047eab965d3972f52efb Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 3 Oct 2007 15:41:39 -0400 Subject: [PATCH] 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. --- Source/cmDependsFortran.cxx | 33 +- Source/cmDependsFortranLexer.cxx | 742 ++++++------- Source/cmDependsFortranLexer.h | 43 +- Source/cmDependsFortranLexer.in.l | 62 +- Source/cmDependsFortranParser.cxx | 1471 +++++++++++++++---------- Source/cmDependsFortranParser.h | 21 +- Source/cmDependsFortranParser.y | 108 +- Source/cmDependsFortranParserTokens.h | 150 +-- 8 files changed, 1522 insertions(+), 1108 deletions(-) diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 434ead3ae..5bee74ded 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -47,6 +47,7 @@ struct cmDependsFortranFile YY_BUFFER_STATE Buffer; std::string Directory; }; + struct cmDependsFortranParser_s { cmDependsFortranParser_s(cmDependsFortran* self); @@ -65,7 +66,12 @@ struct cmDependsFortranParser_s std::string TokenString; // Flag for whether lexer is reading from inside an interface. - int InInterface; + bool InInterface; + + int OldStartcond; + bool InPPFalseBranch; + std::vector SkipToEnd; + int StepI; // Set of provided and required modules. std::set Provides; @@ -347,7 +353,7 @@ cmDependsFortranParser_s::~cmDependsFortranParser_s() } //---------------------------------------------------------------------------- -int cmDependsFortranParser_FilePush(cmDependsFortranParser* parser, +bool cmDependsFortranParser_FilePush(cmDependsFortranParser* parser, const char* fname) { // Open the new file and push it onto the stack. Save the old @@ -371,7 +377,7 @@ int cmDependsFortranParser_FilePush(cmDependsFortranParser* parser, } //---------------------------------------------------------------------------- -int cmDependsFortranParser_FilePop(cmDependsFortranParser* parser) +bool cmDependsFortranParser_FilePop(cmDependsFortranParser* parser) { // Pop one file off the stack and close it. Switch the lexer back // to the next one on the stack. @@ -426,17 +432,30 @@ void cmDependsFortranParser_StringAppend(cmDependsFortranParser* parser, //---------------------------------------------------------------------------- void cmDependsFortranParser_SetInInterface(cmDependsFortranParser* parser, - int in) + bool in) { parser->InInterface = in; } //---------------------------------------------------------------------------- -int cmDependsFortranParser_GetInInterface(cmDependsFortranParser* parser) +bool cmDependsFortranParser_GetInInterface(cmDependsFortranParser* parser) { return parser->InInterface; } +//---------------------------------------------------------------------------- +void cmDependsFortranParser_SetOldStartcond(cmDependsFortranParser* parser, + int arg) +{ + parser->OldStartcond = arg; +} + +//---------------------------------------------------------------------------- +int cmDependsFortranParser_GetOldStartcond(cmDependsFortranParser* parser) +{ + return parser->OldStartcond; +} + //---------------------------------------------------------------------------- void cmDependsFortranParser_Error(cmDependsFortranParser*, const char*) { @@ -449,7 +468,7 @@ void cmDependsFortranParser_Error(cmDependsFortranParser*, const char*) void cmDependsFortranParser_RuleUse(cmDependsFortranParser* parser, const char* name) { - parser->Requires.insert(name); + parser->Requires.insert(cmSystemTools::LowerCase(name) ); } //---------------------------------------------------------------------------- @@ -482,7 +501,7 @@ void cmDependsFortranParser_RuleInclude(cmDependsFortranParser* parser, void cmDependsFortranParser_RuleModule(cmDependsFortranParser* parser, const char* name) { - parser->Provides.insert(name); + parser->Provides.insert(cmSystemTools::LowerCase(name) ); } //---------------------------------------------------------------------------- diff --git a/Source/cmDependsFortranLexer.cxx b/Source/cmDependsFortranLexer.cxx index 318443e51..4f426c245 100644 --- a/Source/cmDependsFortranLexer.cxx +++ b/Source/cmDependsFortranLexer.cxx @@ -9,7 +9,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -31,7 +31,15 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + #include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -43,7 +51,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; #endif /* ! C99 */ @@ -154,6 +162,10 @@ int cmDependsFortran_yylex_init (yyscan_t* scanner); #define YY_BUF_SIZE 16384 #endif +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + #ifndef YY_TYPEDEF_YY_BUFFER_STATE #define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; @@ -164,9 +176,8 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. - */ + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ @@ -175,8 +186,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; YY_LESS_LINENO(yyless_macro_arg);\ *yy_cp = yyg->yy_hold_char; \ YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p \ - = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) @@ -233,7 +243,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -250,8 +260,8 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via cmDependsFortran_yyrestart()), so that the user can continue - * scanning by just pointing yyin at a new input file. + * (via cmDependsFortran_yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -345,8 +355,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 43 -#define YY_END_OF_BUFFER 44 +#define YY_NUM_RULES 41 +#define YY_END_OF_BUFFER 42 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -354,37 +364,25 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[270] = +static yyconst flex_int16_t yy_accept[155] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 39, 41, 40, 42, 1, 39, 39, 39, 2, - 40, 39, 39, 39, 39, 39, 40, 39, 9, 8, - 9, 4, 3, 39, 0, 10, 0, 39, 39, 39, - 39, 0, 39, 39, 39, 39, 0, 37, 39, 39, - 39, 39, 39, 0, 39, 0, 11, 0, 5, 0, - 0, 0, 0, 39, 39, 39, 27, 39, 39, 0, - 0, 0, 0, 39, 39, 39, 33, 39, 39, 0, - 38, 0, 39, 39, 39, 39, 39, 16, 0, 0, - 6, 0, 0, 0, 27, 0, 0, 39, 39, 39, + 42, 36, 38, 37, 40, 1, 36, 36, 31, 2, + 37, 34, 36, 35, 36, 35, 37, 36, 35, 9, + 8, 9, 4, 3, 36, 0, 10, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 31, 31, 32, + 34, 36, 35, 0, 39, 35, 0, 36, 0, 11, + 35, 0, 0, 5, 0, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 27, 0, 31, 31, 31, 31, + 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 39, 39, 39, 39, 39, 0, 0, 0, 33, 0, - 0, 39, 39, 39, 39, 39, 39, 39, 39, 0, - 39, 0, 39, 39, 39, 39, 39, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 39, 28, 29, 39, - 39, 39, 39, 39, 0, 0, 0, 0, 0, 0, - 0, 0, 39, 34, 35, 39, 39, 39, 39, 39, - 0, 39, 0, 0, 39, 39, 39, 39, 39, 0, - 0, 28, 29, 0, 0, 0, 0, 0, 39, 30, - 25, 39, 39, 23, 0, 34, 35, 0, 0, 0, - 0, 0, 39, 36, 31, 39, 39, 24, 0, 39, - - 0, 0, 39, 39, 39, 39, 20, 0, 0, 30, - 25, 0, 0, 23, 21, 26, 39, 0, 36, 31, - 0, 0, 24, 22, 32, 39, 0, 39, 0, 0, - 39, 39, 15, 39, 7, 21, 26, 0, 12, 22, - 32, 0, 13, 0, 39, 0, 0, 39, 39, 39, - 12, 13, 0, 14, 0, 0, 39, 19, 18, 14, - 0, 19, 39, 0, 39, 0, 17, 17, 0 + 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, + 0, 0, 0, 0, 0, 28, 29, 0, 0, 0, + 0, 0, 0, 0, 0, 24, 19, 0, 0, 17, + 0, 18, 30, 25, 0, 0, 0, 0, 0, 15, + 20, 0, 16, 26, 0, 0, 7, 33, 7, 12, + 13, 0, 14, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -393,16 +391,16 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 9, 1, 10, 11, 1, - 1, 12, 1, 4, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 13, 1, - 1, 1, 14, 1, 15, 1, 16, 17, 18, 19, - 1, 1, 20, 1, 1, 21, 22, 23, 24, 1, - 1, 25, 26, 27, 28, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 15, 1, 16, 17, + 1, 12, 1, 4, 1, 1, 1, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 1, 14, 1, + 15, 16, 17, 1, 18, 18, 19, 20, 21, 22, + 18, 18, 23, 18, 18, 18, 18, 24, 18, 18, + 18, 18, 18, 18, 25, 18, 18, 18, 18, 18, + 1, 26, 1, 1, 27, 1, 18, 18, 28, 29, - 18, 19, 1, 1, 20, 1, 1, 21, 22, 23, - 24, 1, 1, 25, 26, 27, 28, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 30, 31, 18, 18, 32, 18, 18, 33, 18, 34, + 18, 18, 18, 18, 35, 18, 36, 18, 18, 18, + 18, 18, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -419,167 +417,152 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[29] = +static yyconst flex_int32_t yy_meta[37] = { 0, - 1, 2, 2, 3, 2, 3, 3, 1, 1, 1, - 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1 + 1, 2, 2, 3, 4, 3, 3, 1, 1, 3, + 3, 1, 5, 3, 3, 1, 1, 6, 6, 6, + 6, 6, 6, 6, 6, 1, 5, 6, 6, 6, + 6, 6, 6, 6, 6, 6 } ; -static yyconst flex_int16_t yy_base[276] = +static yyconst flex_int16_t yy_base[163] = { 0, - 0, 0, 0, 0, 332, 26, 29, 34, 43, 44, - 334, 0, 336, 336, 330, 336, 53, 80, 28, 336, - 336, 318, 308, 307, 305, 302, 322, 107, 336, 321, - 54, 336, 336, 0, 322, 336, 119, 306, 13, 29, - 300, 146, 304, 39, 42, 298, 61, 67, 73, 303, - 52, 302, 300, 312, 173, 313, 336, 81, 85, 297, - 53, 69, 291, 294, 15, 295, 79, 295, 293, 291, - 68, 80, 285, 288, 81, 289, 99, 289, 287, 121, - 336, 123, 280, 110, 281, 283, 272, 0, 294, 136, - 336, 279, 107, 280, 112, 280, 278, 274, 274, 274, + 0, 0, 0, 0, 276, 34, 37, 39, 48, 49, + 277, 0, 356, 356, 273, 356, 62, 97, 63, 356, + 356, 259, 257, 0, 36, 129, 267, 156, 183, 356, + 266, 69, 356, 356, 0, 267, 356, 218, 239, 10, + 26, 234, 253, 246, 242, 42, 46, 76, 98, 356, + 356, 82, 0, 104, 356, 0, 260, 285, 261, 356, + 0, 258, 108, 83, 231, 80, 232, 61, 232, 230, + 235, 236, 84, 224, 89, 224, 129, 148, 219, 225, + 131, 217, 244, 241, 138, 356, 213, 213, 213, 210, + 211, 211, 206, 208, 214, 215, 203, 203, 200, 196, - 271, 272, 272, 267, 269, 267, 114, 268, 127, 268, - 266, 262, 262, 262, 259, 260, 260, 255, 257, 251, - 257, 137, 249, 247, 242, 244, 247, 262, 246, 246, - 246, 243, 244, 244, 239, 241, 235, 0, 0, 238, - 237, 237, 226, 234, 232, 232, 232, 229, 230, 230, - 225, 227, 221, 0, 0, 224, 223, 223, 212, 220, - 222, 216, 213, 211, 207, 216, 215, 212, 212, 224, - 205, 336, 336, 208, 207, 207, 196, 204, 204, 0, - 0, 202, 203, 0, 196, 336, 336, 199, 198, 198, - 187, 195, 195, 0, 0, 193, 194, 0, 189, 181, - - 181, 190, 188, 177, 186, 188, 0, 0, 184, 336, - 336, 181, 168, 336, 0, 0, 165, 164, 336, 336, - 162, 156, 336, 0, 0, 154, 143, 153, 151, 140, - 142, 144, 0, 146, 336, 336, 336, 143, 0, 336, - 336, 142, 0, 141, 138, 130, 133, 134, 134, 131, - 336, 336, 127, 0, 100, 99, 91, 0, 0, 336, - 90, 336, 88, 78, 62, 49, 0, 336, 336, 186, - 48, 189, 192, 195, 198 + 152, 147, 151, 173, 172, 142, 356, 356, 144, 143, + 141, 134, 136, 142, 140, 356, 356, 130, 129, 122, + 113, 114, 139, 123, 96, 356, 356, 94, 95, 356, + 100, 356, 356, 356, 89, 76, 53, 94, 0, 356, + 356, 53, 356, 356, 40, 32, 356, 356, 356, 356, + 356, 15, 356, 356, 312, 318, 323, 325, 331, 337, + 343, 349 } ; -static yyconst flex_int16_t yy_def[276] = +static yyconst flex_int16_t yy_def[163] = { 0, - 269, 1, 1, 1, 1, 1, 270, 270, 270, 270, - 269, 271, 269, 269, 272, 269, 271, 271, 271, 269, - 269, 271, 271, 271, 271, 271, 269, 273, 269, 269, - 269, 269, 269, 271, 272, 269, 269, 271, 271, 271, - 271, 269, 271, 271, 271, 271, 269, 269, 271, 271, - 271, 271, 271, 269, 273, 274, 269, 269, 269, 269, - 269, 269, 269, 271, 271, 271, 271, 271, 271, 269, - 269, 269, 269, 271, 271, 271, 271, 271, 271, 269, - 269, 269, 271, 271, 271, 271, 271, 271, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 271, 271, 271, + 154, 1, 1, 1, 1, 1, 155, 155, 155, 155, + 154, 156, 154, 154, 157, 154, 156, 156, 154, 154, + 154, 154, 156, 158, 156, 158, 154, 159, 154, 154, + 154, 154, 154, 154, 156, 157, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 160, 154, + 154, 156, 158, 154, 154, 26, 154, 159, 159, 154, + 29, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 160, 160, 160, 160, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 271, 271, 271, 271, 271, 269, 269, 269, 269, 269, - 269, 271, 271, 271, 271, 271, 271, 271, 271, 269, - 271, 269, 271, 271, 271, 271, 271, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 271, 271, 271, 271, - 271, 271, 271, 271, 269, 269, 269, 269, 269, 269, - 269, 269, 271, 271, 271, 271, 271, 271, 271, 271, - 269, 271, 269, 269, 271, 271, 271, 271, 271, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 271, 271, - 271, 271, 271, 271, 269, 269, 269, 269, 269, 269, - 269, 269, 271, 271, 271, 271, 271, 271, 269, 271, - - 269, 269, 271, 271, 271, 271, 271, 275, 269, 269, - 269, 269, 269, 269, 271, 271, 271, 269, 269, 269, - 269, 269, 269, 271, 271, 271, 269, 271, 269, 269, - 271, 271, 271, 271, 269, 269, 269, 269, 271, 269, - 269, 269, 271, 269, 271, 269, 269, 271, 271, 271, - 269, 269, 269, 271, 269, 269, 271, 271, 271, 269, - 269, 269, 271, 269, 271, 269, 271, 269, 0, 269, - 269, 269, 269, 269, 269 + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 161, 162, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 0, 154, 154, 154, 154, 154, 154, + 154, 154 } ; -static yyconst flex_int16_t yy_nxt[365] = +static yyconst flex_int16_t yy_nxt[393] = { 0, 12, 13, 14, 13, 13, 15, 16, 17, 18, 19, - 20, 12, 21, 22, 12, 12, 12, 23, 12, 24, - 12, 25, 12, 12, 12, 12, 12, 26, 27, 47, - 48, 30, 47, 65, 99, 66, 30, 28, 31, 32, - 100, 28, 28, 31, 32, 30, 30, 67, 34, 33, - 33, 68, 31, 31, 37, 58, 59, 37, 58, 75, - 77, 76, 47, 48, 78, 47, 268, 85, 80, 38, - 39, 80, 40, 93, 82, 94, 81, 82, 86, 267, - 41, 42, 58, 59, 42, 58, 90, 95, 107, 90, - 108, 96, 83, 266, 91, 102, 43, 44, 109, 45, + 20, 12, 12, 21, 22, 12, 23, 24, 24, 24, + 24, 24, 24, 24, 24, 25, 26, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 27, 54, 55, 31, + 54, 31, 66, 67, 153, 28, 32, 33, 32, 33, + 31, 31, 29, 29, 34, 34, 68, 32, 32, 69, + 152, 29, 29, 38, 48, 48, 38, 48, 49, 151, + 63, 64, 50, 63, 73, 74, 75, 48, 48, 76, + 48, 49, 150, 81, 85, 50, 81, 85, 146, 91, + 39, 40, 86, 41, 92, 148, 148, 42, 43, 78, - 113, 103, 110, 265, 264, 263, 114, 46, 56, 57, - 56, 56, 56, 56, 122, 116, 262, 56, 261, 56, - 37, 117, 80, 37, 82, 80, 130, 82, 133, 123, - 81, 124, 131, 146, 134, 60, 61, 90, 62, 147, - 90, 122, 120, 149, 260, 91, 63, 42, 259, 150, - 42, 258, 257, 256, 255, 254, 163, 253, 164, 252, - 251, 250, 70, 71, 249, 72, 248, 247, 246, 245, - 244, 243, 242, 73, 56, 57, 56, 56, 56, 56, - 241, 240, 239, 56, 238, 56, 29, 29, 29, 35, - 35, 35, 55, 55, 55, 56, 56, 56, 235, 237, + 48, 43, 78, 79, 145, 54, 55, 80, 54, 63, + 64, 88, 63, 82, 89, 97, 44, 100, 98, 144, + 143, 45, 101, 142, 141, 140, 46, 139, 47, 35, + 78, 48, 81, 78, 79, 81, 35, 35, 80, 85, + 35, 56, 85, 138, 35, 35, 137, 86, 136, 78, + 48, 135, 78, 79, 35, 56, 58, 80, 60, 134, + 133, 132, 82, 58, 58, 131, 130, 58, 58, 129, + 128, 58, 58, 127, 126, 125, 124, 123, 122, 121, + 120, 58, 58, 59, 59, 60, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 61, 59, 59, 59, 59, - 235, 236, 234, 233, 232, 231, 230, 229, 228, 227, - 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, - 216, 215, 214, 213, 212, 211, 210, 209, 208, 207, - 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, - 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, - 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, - 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, - 166, 165, 162, 161, 160, 159, 158, 157, 156, 155, - 154, 153, 152, 151, 148, 145, 144, 143, 142, 141, - 140, 139, 138, 137, 136, 135, 132, 129, 128, 127, + 61, 61, 61, 61, 61, 61, 61, 61, 59, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 38, + 78, 48, 38, 78, 79, 119, 78, 48, 80, 78, + 79, 118, 117, 116, 80, 115, 114, 113, 112, 111, + 110, 109, 108, 107, 106, 105, 39, 40, 104, 41, + 103, 102, 99, 42, 43, 96, 95, 43, 94, 93, + 90, 87, 84, 60, 83, 72, 71, 70, 65, 37, + 62, 57, 44, 52, 51, 37, 154, 45, 27, 154, + 154, 154, 46, 154, 47, 58, 154, 60, 154, 154, + 154, 154, 58, 58, 154, 154, 58, 58, 154, 154, + + 58, 58, 154, 154, 154, 154, 154, 154, 154, 154, + 58, 58, 30, 30, 30, 30, 30, 30, 35, 154, + 154, 154, 35, 36, 36, 36, 36, 36, 36, 53, + 53, 59, 59, 59, 59, 59, 59, 77, 77, 77, + 77, 77, 77, 147, 147, 147, 154, 147, 147, 149, + 154, 149, 154, 149, 149, 11, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154 - 126, 125, 121, 119, 118, 115, 112, 111, 106, 105, - 104, 101, 98, 97, 92, 57, 89, 88, 87, 84, - 79, 74, 69, 64, 36, 54, 54, 53, 52, 51, - 50, 49, 36, 269, 27, 11, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269 } ; -static yyconst flex_int16_t yy_chk[365] = +static yyconst flex_int16_t yy_chk[393] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 6, 19, - 19, 7, 19, 39, 65, 39, 8, 6, 7, 7, - 65, 6, 6, 8, 8, 9, 10, 40, 271, 9, - 10, 40, 9, 10, 17, 31, 31, 17, 31, 44, - 45, 44, 47, 47, 45, 47, 266, 51, 48, 17, - 17, 48, 17, 61, 49, 61, 48, 49, 51, 265, - 17, 18, 58, 58, 18, 58, 59, 62, 71, 59, - 71, 62, 49, 264, 59, 67, 18, 18, 72, 18, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 6, 25, 25, 7, + 25, 8, 40, 40, 152, 6, 7, 7, 8, 8, + 9, 10, 6, 6, 9, 10, 41, 9, 10, 41, + 146, 6, 6, 17, 19, 19, 17, 19, 19, 145, + 32, 32, 19, 32, 46, 46, 47, 48, 48, 47, + 48, 48, 142, 52, 64, 48, 52, 64, 137, 68, + 17, 17, 64, 17, 68, 138, 138, 17, 18, 49, - 75, 67, 72, 263, 261, 257, 75, 18, 28, 28, - 28, 28, 28, 28, 84, 77, 256, 28, 255, 28, - 37, 77, 80, 37, 82, 80, 93, 82, 95, 84, - 80, 84, 93, 107, 95, 37, 37, 90, 37, 107, - 90, 122, 82, 109, 253, 90, 37, 42, 250, 109, - 42, 249, 248, 247, 246, 245, 122, 244, 122, 242, - 238, 234, 42, 42, 232, 42, 231, 230, 229, 228, - 227, 226, 222, 42, 55, 55, 55, 55, 55, 55, - 221, 218, 217, 55, 213, 55, 270, 270, 270, 272, - 272, 272, 273, 273, 273, 274, 274, 274, 275, 212, + 49, 18, 49, 49, 136, 54, 54, 49, 54, 63, + 63, 66, 63, 52, 66, 73, 18, 75, 73, 135, + 131, 18, 75, 129, 128, 125, 18, 124, 18, 26, + 77, 77, 81, 77, 77, 81, 26, 26, 77, 85, + 26, 26, 85, 123, 26, 26, 122, 85, 121, 78, + 78, 120, 78, 78, 26, 26, 28, 78, 28, 119, + 118, 115, 81, 28, 28, 114, 113, 28, 28, 112, + 111, 28, 28, 110, 109, 106, 105, 104, 103, 102, + 101, 28, 28, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 275, 209, 206, 205, 204, 203, 202, 201, 200, 199, - 197, 196, 193, 192, 191, 190, 189, 188, 185, 183, - 182, 179, 178, 177, 176, 175, 174, 171, 170, 169, - 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, - 158, 157, 156, 153, 152, 151, 150, 149, 148, 147, - 146, 145, 144, 143, 142, 141, 140, 137, 136, 135, - 134, 133, 132, 131, 130, 129, 128, 127, 126, 125, - 124, 123, 121, 120, 119, 118, 117, 116, 115, 114, - 113, 112, 111, 110, 108, 106, 105, 104, 103, 102, - 101, 100, 99, 98, 97, 96, 94, 92, 89, 87, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 38, + 79, 79, 38, 79, 79, 100, 80, 80, 79, 80, + 80, 99, 98, 97, 80, 96, 95, 94, 93, 92, + 91, 90, 89, 88, 87, 84, 38, 38, 83, 38, + 82, 76, 74, 38, 43, 72, 71, 43, 70, 69, + 67, 65, 62, 59, 57, 45, 44, 42, 39, 36, + 31, 27, 43, 23, 22, 15, 11, 43, 5, 0, + 0, 0, 43, 0, 43, 58, 0, 58, 0, 0, + 0, 0, 58, 58, 0, 0, 58, 58, 0, 0, + + 58, 58, 0, 0, 0, 0, 0, 0, 0, 0, + 58, 58, 155, 155, 155, 155, 155, 155, 156, 0, + 0, 0, 156, 157, 157, 157, 157, 157, 157, 158, + 158, 159, 159, 159, 159, 159, 159, 160, 160, 160, + 160, 160, 160, 161, 161, 161, 0, 161, 161, 162, + 0, 162, 0, 162, 162, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154 - 86, 85, 83, 79, 78, 76, 74, 73, 70, 69, - 68, 66, 64, 63, 60, 56, 54, 53, 52, 50, - 46, 43, 41, 38, 35, 30, 27, 26, 25, 24, - 23, 22, 15, 11, 5, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269 } ; /* The intent behind this definition is that it'll catch @@ -608,7 +591,7 @@ static yyconst flex_int16_t yy_chk[365] = =========================================================================*/ /*------------------------------------------------------------------------- - Portions of this source have been derived from makefdep90 version 2.6.2, + Portions of this source have been derived from makefdep90 version 2.8.8, Copyright (C) 2000,2001 Erik Edelmann . @@ -656,7 +639,7 @@ Modify cmDependsFortranLexer.h: /*--------------------------------------------------------------------------*/ -#line 682 "cmDependsFortranLexer.cxx" +#line 643 "cmDependsFortranLexer.cxx" #define INITIAL 0 #define free_fmt 1 @@ -710,6 +693,8 @@ struct yyguts_t }; /* end struct yyguts_t */ +static int yy_init_globals (yyscan_t yyscanner ); + /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ @@ -752,7 +737,7 @@ extern int cmDependsFortran_yywrap (yyscan_t yyscanner ); #endif static void yyunput (int c,char *buf_ptr ,yyscan_t yyscanner); - + #ifndef yytext_ptr static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); #endif @@ -878,14 +863,14 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 98 "cmDependsFortranLexer.in.l" +#line 75 "cmDependsFortranLexer.in.l" -#line 907 "cmDependsFortranLexer.cxx" +#line 870 "cmDependsFortranLexer.cxx" - if ( yyg->yy_init ) + if ( !yyg->yy_init ) { - yyg->yy_init = 0; + yyg->yy_init = 1; #ifdef YY_USER_INIT YY_USER_INIT; @@ -935,13 +920,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 270 ) + if ( yy_current_state >= 155 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 336 ); + while ( yy_base[yy_current_state] != 356 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -967,48 +952,58 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 100 "cmDependsFortranLexer.in.l" +#line 77 "cmDependsFortranLexer.in.l" { cmDependsFortranParser_StringStart(yyextra); + cmDependsFortranParser_SetOldStartcond(yyextra, YY_START); BEGIN(str_dq); } YY_BREAK case 2: YY_RULE_SETUP -#line 105 "cmDependsFortranLexer.in.l" +#line 83 "cmDependsFortranLexer.in.l" { cmDependsFortranParser_StringStart(yyextra); + cmDependsFortranParser_SetOldStartcond(yyextra, YY_START); BEGIN(str_sq); } YY_BREAK case 3: -#line 111 "cmDependsFortranLexer.in.l" +#line 90 "cmDependsFortranLexer.in.l" case 4: YY_RULE_SETUP -#line 111 "cmDependsFortranLexer.in.l" +#line 90 "cmDependsFortranLexer.in.l" { + BEGIN(cmDependsFortranParser_GetOldStartcond(yyextra) ); yylvalp->string = strdup(cmDependsFortranParser_StringEnd(yyextra)); return STRING; } case 5: /* rule 5 can match eol */ -#line 117 "cmDependsFortranLexer.in.l" +#line 97 "cmDependsFortranLexer.in.l" case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 117 "cmDependsFortranLexer.in.l" +#line 97 "cmDependsFortranLexer.in.l" /* Ignore (continued strings, free fmt) */ YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 119 "cmDependsFortranLexer.in.l" -/*Ignore (cont. strings, fixed fmt) */ +#line 99 "cmDependsFortranLexer.in.l" +{ + if (cmDependsFortranParser_GetOldStartcond(yyextra) == fixed_fmt) + ; /* Ignore (cont. strings, fixed fmt) */ + else + { + unput(yytext[strlen(yytext)-1]); + } +} YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 121 "cmDependsFortranLexer.in.l" +#line 109 "cmDependsFortranLexer.in.l" { unput ('\n'); BEGIN(INITIAL); @@ -1016,7 +1011,7 @@ YY_RULE_SETUP } case 9: YY_RULE_SETUP -#line 127 "cmDependsFortranLexer.in.l" +#line 115 "cmDependsFortranLexer.in.l" { cmDependsFortranParser_StringAppend(yyextra, yytext[0]); } @@ -1024,172 +1019,161 @@ YY_RULE_SETUP case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 131 "cmDependsFortranLexer.in.l" +#line 119 "cmDependsFortranLexer.in.l" { return EOSTMT; } /* Treat comments like */ case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 132 "cmDependsFortranLexer.in.l" +#line 120 "cmDependsFortranLexer.in.l" { return EOSTMT; } /* empty lines */ case 12: YY_RULE_SETUP -#line 134 "cmDependsFortranLexer.in.l" +#line 122 "cmDependsFortranLexer.in.l" { return CPP_INCLUDE; } case 13: YY_RULE_SETUP -#line 135 "cmDependsFortranLexer.in.l" +#line 123 "cmDependsFortranLexer.in.l" { return F90PPR_INCLUDE; } case 14: YY_RULE_SETUP -#line 136 "cmDependsFortranLexer.in.l" +#line 124 "cmDependsFortranLexer.in.l" { return COCO_INCLUDE; } case 15: YY_RULE_SETUP -#line 137 "cmDependsFortranLexer.in.l" -{ return F_INCLUDE; } +#line 126 "cmDependsFortranLexer.in.l" +{ return CPP_DEFINE; } case 16: YY_RULE_SETUP -#line 138 "cmDependsFortranLexer.in.l" -{ return USE; } +#line 127 "cmDependsFortranLexer.in.l" +{ return F90PPR_DEFINE; } case 17: YY_RULE_SETUP -#line 140 "cmDependsFortranLexer.in.l" -{ - cmDependsFortranParser_SetInInterface(yyextra, 0); -} - YY_BREAK +#line 129 "cmDependsFortranLexer.in.l" +{ return CPP_UNDEF; } case 18: YY_RULE_SETUP -#line 143 "cmDependsFortranLexer.in.l" -{ - cmDependsFortranParser_SetInInterface(yyextra, 1); -} - YY_BREAK +#line 130 "cmDependsFortranLexer.in.l" +{ return F90PPR_UNDEF; } case 19: YY_RULE_SETUP -#line 147 "cmDependsFortranLexer.in.l" -/* Ignore */ - YY_BREAK +#line 132 "cmDependsFortranLexer.in.l" +{ return CPP_IFDEF; } case 20: YY_RULE_SETUP -#line 148 "cmDependsFortranLexer.in.l" -{ - if(!cmDependsFortranParser_GetInInterface(yyextra)) - { - return MODULE; - } -} - YY_BREAK +#line 133 "cmDependsFortranLexer.in.l" +{ return CPP_IFNDEF; } case 21: YY_RULE_SETUP -#line 155 "cmDependsFortranLexer.in.l" -{ return CPP_DEFINE; } +#line 134 "cmDependsFortranLexer.in.l" +{ return CPP_IF; } case 22: YY_RULE_SETUP -#line 156 "cmDependsFortranLexer.in.l" -{ return F90PPR_DEFINE; } +#line 135 "cmDependsFortranLexer.in.l" +{ return CPP_ELIF; } case 23: YY_RULE_SETUP -#line 158 "cmDependsFortranLexer.in.l" -{ return CPP_UNDEF; } +#line 136 "cmDependsFortranLexer.in.l" +{ return CPP_ELSE; } case 24: YY_RULE_SETUP -#line 159 "cmDependsFortranLexer.in.l" -{ return F90PPR_UNDEF; } +#line 137 "cmDependsFortranLexer.in.l" +{ return CPP_ENDIF; } case 25: YY_RULE_SETUP -#line 161 "cmDependsFortranLexer.in.l" -{ return CPP_IFDEF; } +#line 139 "cmDependsFortranLexer.in.l" +{ return F90PPR_IFDEF; } case 26: YY_RULE_SETUP -#line 162 "cmDependsFortranLexer.in.l" -{ return CPP_IFNDEF; } +#line 140 "cmDependsFortranLexer.in.l" +{ return F90PPR_IFNDEF; } case 27: YY_RULE_SETUP -#line 163 "cmDependsFortranLexer.in.l" -{ return CPP_IF; } +#line 141 "cmDependsFortranLexer.in.l" +{ return F90PPR_IF; } case 28: YY_RULE_SETUP -#line 164 "cmDependsFortranLexer.in.l" -{ return CPP_ELIF; } +#line 142 "cmDependsFortranLexer.in.l" +{ return F90PPR_ELIF; } case 29: YY_RULE_SETUP -#line 165 "cmDependsFortranLexer.in.l" -{ return CPP_ELSE; } +#line 143 "cmDependsFortranLexer.in.l" +{ return F90PPR_ELSE; } case 30: YY_RULE_SETUP -#line 166 "cmDependsFortranLexer.in.l" -{ return CPP_ENDIF; } +#line 144 "cmDependsFortranLexer.in.l" +{ return F90PPR_ENDIF; } +/* Line continuations, possible involving comments. */ case 31: +/* rule 31 can match eol */ YY_RULE_SETUP -#line 168 "cmDependsFortranLexer.in.l" -{ return F90PPR_IFDEF; } +#line 147 "cmDependsFortranLexer.in.l" + + YY_BREAK case 32: +/* rule 32 can match eol */ YY_RULE_SETUP -#line 169 "cmDependsFortranLexer.in.l" -{ return F90PPR_IFNDEF; } +#line 148 "cmDependsFortranLexer.in.l" + + YY_BREAK case 33: +/* rule 33 can match eol */ YY_RULE_SETUP -#line 170 "cmDependsFortranLexer.in.l" -{ return F90PPR_IF; } +#line 150 "cmDependsFortranLexer.in.l" +{ return GARBAGE; } case 34: YY_RULE_SETUP -#line 171 "cmDependsFortranLexer.in.l" -{ return F90PPR_ELIF; } +#line 152 "cmDependsFortranLexer.in.l" +{ return ASSIGNMENT_OP; } case 35: YY_RULE_SETUP -#line 172 "cmDependsFortranLexer.in.l" -{ return F90PPR_ELSE; } +#line 154 "cmDependsFortranLexer.in.l" +{ + yylvalp->string = strdup(yytext); + return WORD; +} case 36: YY_RULE_SETUP -#line 173 "cmDependsFortranLexer.in.l" -{ return F90PPR_ENDIF; } +#line 159 "cmDependsFortranLexer.in.l" +{ return GARBAGE; } case 37: /* rule 37 can match eol */ -#line 176 "cmDependsFortranLexer.in.l" -case 38: -/* rule 38 can match eol */ YY_RULE_SETUP -#line 176 "cmDependsFortranLexer.in.l" +#line 161 "cmDependsFortranLexer.in.l" +{ return EOSTMT; } +case 38: +YY_RULE_SETUP +#line 164 "cmDependsFortranLexer.in.l" /* Ignore */ YY_BREAK case 39: +/* rule 39 can match eol */ YY_RULE_SETUP -#line 179 "cmDependsFortranLexer.in.l" -{ yylvalp->string = strdup(yytext); return WORD; } -case 40: -/* rule 40 can match eol */ -YY_RULE_SETUP -#line 181 "cmDependsFortranLexer.in.l" -{ return EOSTMT; } -case 41: -YY_RULE_SETUP -#line 183 "cmDependsFortranLexer.in.l" -/* Ignore */ +#line 165 "cmDependsFortranLexer.in.l" +/* Ignore line-endings preceeded by \ */ YY_BREAK -case 42: +case 40: YY_RULE_SETUP -#line 185 "cmDependsFortranLexer.in.l" +#line 167 "cmDependsFortranLexer.in.l" { return *yytext; } case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(free_fmt): case YY_STATE_EOF(fixed_fmt): case YY_STATE_EOF(str_sq): case YY_STATE_EOF(str_dq): -#line 187 "cmDependsFortranLexer.in.l" +#line 169 "cmDependsFortranLexer.in.l" { - if(!cmDependsFortranParser_FilePop(yyextra)) - { - return YY_NULL; - } + if(!cmDependsFortranParser_FilePop(yyextra) ) + { + return YY_NULL; + } } YY_BREAK -case 43: +case 41: YY_RULE_SETUP -#line 194 "cmDependsFortranLexer.in.l" +#line 176 "cmDependsFortranLexer.in.l" ECHO; YY_BREAK -#line 1243 "cmDependsFortranLexer.cxx" +#line 1206 "cmDependsFortranLexer.cxx" case YY_END_OF_BUFFER: { @@ -1374,10 +1358,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { - size_t nuto_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - while ( nuto_read <= 0 ) + while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ @@ -1409,17 +1393,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - nuto_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; } - if ( nuto_read > YY_READ_BUF_SIZE ) - nuto_read = YY_READ_BUF_SIZE; + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, nuto_read ); + yyg->yy_n_chars, (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; } @@ -1474,7 +1458,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 270 ) + if ( yy_current_state >= 155 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1491,7 +1475,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) { register int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ register char *yy_cp = yyg->yy_c_buf_p; register YY_CHAR yy_c = 1; @@ -1503,11 +1487,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 270 ) + if ( yy_current_state >= 155 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 269); + yy_is_jam = (yy_current_state == 154); return yy_is_jam ? 0 : yy_current_state; } @@ -1700,7 +1684,7 @@ static void cmDependsFortran_yy_load_buffer_state (yyscan_t yyscanner) YY_BUFFER_STATE cmDependsFortran_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) cmDependsFortran_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in cmDependsFortran_yy_create_buffer()" ); @@ -1744,7 +1728,7 @@ static void cmDependsFortran_yy_load_buffer_state (yyscan_t yyscanner) #ifndef __cplusplus extern int isatty (int ); #endif /* __cplusplus */ - + /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a cmDependsFortran_yyrestart() or at EOF. @@ -1770,7 +1754,7 @@ extern int isatty (int ); } b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - + errno = oerrno; } @@ -1861,7 +1845,7 @@ void cmDependsFortran_yypop_buffer_state (yyscan_t yyscanner) */ static void cmDependsFortran_yyensure_buffer_stack (yyscan_t yyscanner) { - int nuto_alloc; + int num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!yyg->yy_buffer_stack) { @@ -1870,15 +1854,14 @@ static void cmDependsFortran_yyensure_buffer_stack (yyscan_t yyscanner) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - nuto_alloc = 1; + num_to_alloc = 1; yyg->yy_buffer_stack = (struct yy_buffer_state**)cmDependsFortran_yyalloc - (nuto_alloc * sizeof(struct yy_buffer_state*) + (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); - memset(yyg->yy_buffer_stack, 0, - nuto_alloc * sizeof(struct yy_buffer_state*)); + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = nuto_alloc; + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; } @@ -1888,15 +1871,15 @@ static void cmDependsFortran_yyensure_buffer_stack (yyscan_t yyscanner) /* Increase the buffer to prepare for a possible push. */ int grow_size = 8 /* arbitrary grow size */; - nuto_alloc = yyg->yy_buffer_stack_max + grow_size; + num_to_alloc = yyg->yy_buffer_stack_max + grow_size; yyg->yy_buffer_stack = (struct yy_buffer_state**)cmDependsFortran_yyrealloc (yyg->yy_buffer_stack, - nuto_alloc * sizeof(struct yy_buffer_state*) + num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = nuto_alloc; + yyg->yy_buffer_stack_max = num_to_alloc; } } @@ -1904,12 +1887,12 @@ static void cmDependsFortran_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE cmDependsFortran_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -1937,16 +1920,16 @@ YY_BUFFER_STATE cmDependsFortran_yy_scan_buffer (char * base, yy_size_t size , /** Setup the input buffer state to scan a string. The next call to cmDependsFortran_yylex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use * cmDependsFortran_yy_scan_bytes() instead. */ -YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char * yy_str , yyscan_t yyscanner) +YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) { - - return cmDependsFortran_yy_scan_bytes(yy_str,strlen(yy_str) ,yyscanner); + + return cmDependsFortran_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); } /** Setup the input buffer state to scan the given bytes. The next call to cmDependsFortran_yylex() will @@ -1956,23 +1939,23 @@ YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char * yy_str , yyscan_ * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE cmDependsFortran_yy_scan_bytes (yyconst char * bytes, int len , yyscan_t yyscanner) +YY_BUFFER_STATE cmDependsFortran_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; + n = _yybytes_len + 2; buf = (char *) cmDependsFortran_yyalloc(n ,yyscanner ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in cmDependsFortran_yy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; b = cmDependsFortran_yy_scan_buffer(buf,n ,yyscanner); if ( ! b ) @@ -2030,10 +2013,10 @@ YY_EXTRA_TYPE cmDependsFortran_yyget_extra (yyscan_t yyscanner) int cmDependsFortran_yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yylineno; } @@ -2043,10 +2026,10 @@ int cmDependsFortran_yyget_lineno (yyscan_t yyscanner) int cmDependsFortran_yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yycolumn; } @@ -2107,8 +2090,8 @@ void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner) /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "cmDependsFortran_yyset_lineno called with no buffer" , yyscanner); - + yy_fatal_error( "cmDependsFortran_yyset_lineno called with no buffer" , yyscanner); + yylineno = line_number; } @@ -2122,8 +2105,8 @@ void cmDependsFortran_yyset_column (int column_no , yyscan_t yyscanner) /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "cmDependsFortran_yyset_column called with no buffer" , yyscanner); - + yy_fatal_error( "cmDependsFortran_yyset_column called with no buffer" , yyscanner); + yycolumn = column_no; } @@ -2159,37 +2142,6 @@ void cmDependsFortran_yyset_debug (int bdebug , yyscan_t yyscanner) /* Accessor methods for yylval and yylloc */ -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - This function is called once per scanner lifetime. */ - - yyg->yy_buffer_stack = 0; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; - yyg->yy_init = 1; - yyg->yy_start = 0; - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = (int *) 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * cmDependsFortran_yylex_init() - */ - return 0; -} - /* User-visible API */ /* cmDependsFortran_yylex_init is special because it creates the scanner itself, so it is @@ -2212,11 +2164,45 @@ int cmDependsFortran_yylex_init(yyscan_t* ptr_yy_globals) return 1; } - memset(*ptr_yy_globals,0,sizeof(struct yyguts_t)); + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); return yy_init_globals ( *ptr_yy_globals ); } +static int yy_init_globals (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from cmDependsFortran_yylex_destroy(), so don't allocate here. + */ + + yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack_top = 0; + yyg->yy_buffer_stack_max = 0; + yyg->yy_c_buf_p = (char *) 0; + yyg->yy_init = 0; + yyg->yy_start = 0; + + yyg->yy_start_stack_ptr = 0; + yyg->yy_start_stack_depth = 0; + yyg->yy_start_stack = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * cmDependsFortran_yylex_init() + */ + return 0; +} + /* cmDependsFortran_yylex_destroy is for both reentrant and non-reentrant scanners. */ int cmDependsFortran_yylex_destroy (yyscan_t yyscanner) { @@ -2237,8 +2223,13 @@ int cmDependsFortran_yylex_destroy (yyscan_t yyscanner) cmDependsFortran_yyfree(yyg->yy_start_stack ,yyscanner ); yyg->yy_start_stack = NULL; + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * cmDependsFortran_yylex() is called, initialization will occur. */ + yy_init_globals( yyscanner); + /* Destroy the main struct (reentrant only). */ cmDependsFortran_yyfree ( yyscanner , yyscanner ); + yyscanner = NULL; return 0; } @@ -2250,7 +2241,6 @@ int cmDependsFortran_yylex_destroy (yyscan_t yyscanner) static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) { register int i; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2260,7 +2250,6 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yysca static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) { register int n; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; for ( n = 0; s[n]; ++n ) ; @@ -2292,19 +2281,7 @@ void cmDependsFortran_yyfree (void * ptr , yyscan_t) #define YYTABLES_NAME "yytables" -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef yytext_ptr -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif -#line 194 "cmDependsFortranLexer.in.l" +#line 176 "cmDependsFortranLexer.in.l" @@ -2315,3 +2292,4 @@ YY_BUFFER_STATE cmDependsFortranLexer_GetCurrentBuffer(yyscan_t yyscanner) struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return YY_CURRENT_BUFFER; } + diff --git a/Source/cmDependsFortranLexer.h b/Source/cmDependsFortranLexer.h index f1628cfb6..f73f946eb 100644 --- a/Source/cmDependsFortranLexer.h +++ b/Source/cmDependsFortranLexer.h @@ -25,7 +25,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 31 +#define YY_FLEX_SUBMINOR_VERSION 33 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -47,7 +47,15 @@ /* C99 systems have . Non-C99 systems may or may not. */ -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#if __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + #include typedef int8_t flex_int8_t; typedef uint8_t flex_uint8_t; @@ -201,24 +209,16 @@ struct yy_buffer_state #endif /* !YY_STRUCT_YY_BUFFER_STATE */ void cmDependsFortran_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void cmDependsFortran_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , - yyscan_t yyscanner ); -YY_BUFFER_STATE cmDependsFortran_yy_create_buffer (FILE *file,int size , - yyscan_t yyscanner ); -void cmDependsFortran_yy_delete_buffer (YY_BUFFER_STATE b , - yyscan_t yyscanner ); -void cmDependsFortran_yy_flush_buffer (YY_BUFFER_STATE b , - yyscan_t yyscanner ); -void cmDependsFortran_yypush_buffer_state (YY_BUFFER_STATE new_buffer , - yyscan_t yyscanner ); +void cmDependsFortran_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE cmDependsFortran_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void cmDependsFortran_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void cmDependsFortran_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void cmDependsFortran_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); void cmDependsFortran_yypop_buffer_state (yyscan_t yyscanner ); -YY_BUFFER_STATE cmDependsFortran_yy_scan_buffer (char *base,yy_size_t size , - yyscan_t yyscanner ); -YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char *yy_str , - yyscan_t yyscanner ); -YY_BUFFER_STATE cmDependsFortran_yy_scan_bytes (yyconst char *bytes,int len , - yyscan_t yyscanner ); +YY_BUFFER_STATE cmDependsFortran_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE cmDependsFortran_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); void *cmDependsFortran_yyalloc (yy_size_t ,yyscan_t yyscanner ); void *cmDependsFortran_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); @@ -255,8 +255,7 @@ void cmDependsFortran_yyset_debug (int debug_flag ,yyscan_t yyscanner ); YY_EXTRA_TYPE cmDependsFortran_yyget_extra (yyscan_t yyscanner ); -void cmDependsFortran_yyset_extra (YY_EXTRA_TYPE user_defined , - yyscan_t yyscanner ); +void cmDependsFortran_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); FILE *cmDependsFortran_yyget_in (yyscan_t yyscanner ); @@ -319,15 +318,13 @@ extern int cmDependsFortran_yylex (yyscan_t yyscanner); #define YY_DECL int cmDependsFortran_yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ -/* yy_get_previous_state - get the state just before the EOB char was reached - */ +/* yy_get_previous_state - get the state just before the EOB char was reached */ #undef YY_NEW_FILE #undef YY_FLUSH_BUFFER #undef yy_set_bol #undef yy_new_buffer #undef yy_set_interactive -#undef yytext_ptr #undef YY_DO_BEFORE_ACTION #ifdef YY_DECL_IS_OURS diff --git a/Source/cmDependsFortranLexer.in.l b/Source/cmDependsFortranLexer.in.l index 8326eaeaa..05210eb4a 100644 --- a/Source/cmDependsFortranLexer.in.l +++ b/Source/cmDependsFortranLexer.in.l @@ -16,7 +16,7 @@ =========================================================================*/ /*------------------------------------------------------------------------- - Portions of this source have been derived from makefdep90 version 2.6.2, + Portions of this source have been derived from makefdep90 version 2.8.8, Copyright (C) 2000,2001 Erik Edelmann . @@ -64,6 +64,7 @@ Modify cmDependsFortranLexer.h: /*--------------------------------------------------------------------------*/ %} + %option reentrant %option noyywrap %pointer @@ -75,16 +76,19 @@ Modify cmDependsFortranLexer.h: \" { cmDependsFortranParser_StringStart(yyextra); + cmDependsFortranParser_SetOldStartcond(yyextra, YY_START); BEGIN(str_dq); } ' { cmDependsFortranParser_StringStart(yyextra); + cmDependsFortranParser_SetOldStartcond(yyextra, YY_START); BEGIN(str_sq); } \" | ' { + BEGIN(cmDependsFortranParser_GetOldStartcond(yyextra) ); yylvalp->string = strdup(cmDependsFortranParser_StringEnd(yyextra)); return STRING; } @@ -92,7 +96,15 @@ Modify cmDependsFortranLexer.h: &[ \t]*\n | &[ \t]*\n[ \t]*& /* Ignore (continued strings, free fmt) */ -\n[ ]{5}[^ \t\n] /*Ignore (cont. strings, fixed fmt) */ +\n[ ]{5}[^ \t\n] { + if (cmDependsFortranParser_GetOldStartcond(yyextra) == fixed_fmt) + ; /* Ignore (cont. strings, fixed fmt) */ + else + { + unput(yytext[strlen(yytext)-1]); + } +} + \n { unput ('\n'); @@ -110,23 +122,6 @@ Modify cmDependsFortranLexer.h: #[ \t]*include { return CPP_INCLUDE; } \$[ \t]*include { return F90PPR_INCLUDE; } \?\?[ \t]*include { return COCO_INCLUDE; } -INCLUDE { return F_INCLUDE; } -USE { return USE; } - -END" "*INTERFACE { - cmDependsFortranParser_SetInInterface(yyextra, 0); -} -INTERFACE { - cmDependsFortranParser_SetInInterface(yyextra, 1); -} - -END" "*MODULE /* Ignore */ -MODULE { - if(!cmDependsFortranParser_GetInInterface(yyextra)) - { - return MODULE; - } -} #[ \t]*define { return CPP_DEFINE; } \$[ \t]*DEFINE { return F90PPR_DEFINE; } @@ -148,23 +143,34 @@ $[ \t]*elif { return F90PPR_ELIF; } $[ \t]*else { return F90PPR_ELSE; } $[ \t]*endif { return F90PPR_ENDIF; } -&[ \t]*\n | -&[ \t]*\n[ \t]*& /* Ignore */ + /* Line continuations, possible involving comments. */ +&([ \t\n]*|!.*)* +&([ \t\n]*|!.*)*& +\n[ ]{5}[^ ] { return GARBAGE; } -[^ \t\n\r;,!'""']+ { yylvalp->string = strdup(yytext); return WORD; } +=|=> { return ASSIGNMENT_OP; } + +[a-zA-Z_][a-zA-Z_0-9]* { + yylvalp->string = strdup(yytext); + return WORD; +} + +[^ \t\n\r;,!'"a-zA-Z=&]+ { return GARBAGE; } + +;|\n { return EOSTMT; } -;|\n { return EOSTMT; } [ \t\r,] /* Ignore */ +\\[ \t]*\n /* Ignore line-endings preceeded by \ */ -. { return *yytext; } +. { return *yytext; } <> { - if(!cmDependsFortranParser_FilePop(yyextra)) - { - return YY_NULL; - } + if(!cmDependsFortranParser_FilePop(yyextra) ) + { + return YY_NULL; + } } %% diff --git a/Source/cmDependsFortranParser.cxx b/Source/cmDependsFortranParser.cxx index b5d33cf4a..ce95c8db1 100644 --- a/Source/cmDependsFortranParser.cxx +++ b/Source/cmDependsFortranParser.cxx @@ -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 implementation 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,16 +17,24 @@ 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, 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. */ +/* 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. -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -33,15 +43,12 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* turn off some warning as this is generated code */ -#if defined(_MSC_VER) -# pragma warning ( disable : 4244 ) /* loss of precision */ -# pragma warning ( disable : 4702 ) /* unreachable code */ -#endif - /* Identify Bison output. */ #define YYBISON 1 +/* Bison version. */ +#define YYBISON_VERSION "2.3" + /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -51,8 +58,7 @@ /* Using locations. */ #define YYLSP_NEEDED 0 -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ +/* Substitute the variable and function names. */ #define yyparse cmDependsFortran_yyparse #define yylex cmDependsFortran_yylex #define yyerror cmDependsFortran_yyerror @@ -68,62 +74,61 @@ /* 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 @@ -163,12 +168,12 @@ This file must be translated to C and modified to build everywhere. Run bison like this: - bison --yacc --name-prefix=cmDependsFortran_yy - --defines=cmDependsFortranParserTokens.h -ocmDependsFortranParser.cxx - cmDependsFortranParser.y + bison --yacc --name-prefix=cmDependsFortran_yy --defines=cmDependsFortranParserTokens.h -ocmDependsFortranParser.cxx cmDependsFortranParser.y Modify cmDependsFortranParser.cxx: - remove TABs + - add __HP_aCC to the #if test for yyerrorlab warning suppression + - add __INTEL_COMPILER to the #if test for yyerrorlab warning suppression */ @@ -220,13 +225,20 @@ static void cmDependsFortranError(yyscan_t yyscanner, const char* message) # define YYERROR_VERBOSE 0 #endif -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 75 "cmDependsFortranParser.y" -typedef union YYSTYPE { +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 81 "cmDependsFortranParser.y" +{ char* string; -} YYSTYPE; -/* Line 191 of yacc.c. */ -#line 218 "cmDependsFortranParser.cxx" +} +/* Line 187 of yacc.c. */ +#line 241 "cmDependsFortranParser.cxx" + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -237,56 +249,171 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 230 "cmDependsFortranParser.cxx" +/* Line 216 of yacc.c. */ +#line 254 "cmDependsFortranParser.cxx" -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#ifdef short +# undef short +#endif -# ifndef YYFREE -# define YYFREE free +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int # endif -# ifndef YYMALLOC -# define YYMALLOC malloc +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif # endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif +# else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif # endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short int yyss; + yytype_int16 yyss; YYSTYPE yyvs; }; @@ -296,24 +423,24 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined (__GNUC__) && 1 < __GNUC__ +# if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif @@ -331,39 +458,33 @@ union yyalloc yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (0) + while (YYID (0)) #endif -#if defined (__STDC__) || defined (__cplusplus) - typedef signed char yysigned_char; -#else - typedef short int yysigned_char; -#endif - -/* YYFINAL -- State number of the termination state. */ +/* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 67 +#define YYLAST 139 -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 30 -/* YYNNTS -- Number of nonterminals. */ +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 29 +/* YYNNTS -- Number of nonterminals. */ #define YYNNTS 15 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 43 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 73 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 45 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 79 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 284 +#define YYMAXUTOK 283 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = +static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -393,138 +514,140 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29 + 25, 26, 27, 28 }; #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned char yyprhs[] = +static const yytype_uint8 yyprhs[] = { - 0, 0, 3, 4, 7, 12, 17, 22, 26, 31, - 36, 41, 46, 50, 54, 58, 62, 65, 66, 68, - 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, - 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, - 109, 112, 114, 116 + 0, 0, 3, 4, 7, 9, 11, 16, 19, 24, + 29, 34, 39, 44, 49, 54, 58, 62, 66, 70, + 75, 79, 81, 83, 85, 87, 89, 91, 93, 95, + 97, 99, 101, 103, 105, 107, 109, 111, 113, 115, + 116, 119, 121, 123, 125, 127 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yysigned_char yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = { - 31, 0, -1, -1, 31, 32, -1, 3, 29, 43, - 33, -1, 34, 28, 43, 33, -1, 7, 29, 43, - 33, -1, 5, 29, 33, -1, 35, 29, 43, 33, - -1, 36, 29, 43, 33, -1, 37, 29, 43, 33, - -1, 38, 29, 43, 33, -1, 39, 43, 33, -1, - 40, 43, 33, -1, 41, 43, 33, -1, 42, 43, - 33, -1, 43, 33, -1, -1, 6, -1, 4, -1, - 7, -1, 8, -1, 9, -1, 11, -1, 10, -1, - 13, -1, 12, -1, 14, -1, 20, -1, 15, -1, - 21, -1, 16, -1, 22, -1, 18, -1, 24, -1, - 17, -1, 23, -1, 19, -1, 25, -1, -1, 43, - 44, -1, 29, -1, 28, -1, 26, -1 + 30, 0, -1, -1, 30, 31, -1, 33, -1, 32, + -1, 28, 4, 42, 3, -1, 28, 3, -1, 28, + 28, 42, 3, -1, 28, 27, 42, 3, -1, 6, + 28, 42, 3, -1, 34, 28, 42, 3, -1, 35, + 28, 42, 3, -1, 36, 28, 42, 3, -1, 37, + 28, 42, 3, -1, 38, 42, 3, -1, 39, 42, + 3, -1, 40, 42, 3, -1, 41, 42, 3, -1, + 28, 5, 42, 3, -1, 5, 42, 3, -1, 3, + -1, 1, -1, 10, -1, 9, -1, 12, -1, 11, + -1, 13, -1, 19, -1, 14, -1, 20, -1, 15, + -1, 21, -1, 17, -1, 23, -1, 16, -1, 22, + -1, 18, -1, 24, -1, -1, 42, 43, -1, 28, + -1, 27, -1, 5, -1, 4, -1, 26, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned char yyrline[] = +static const yytype_uint8 yyrline[] = { - 0, 93, 93, 93, 96, 102, 108, 109, 115, 121, - 127, 133, 139, 144, 149, 154, 159, 162, 162, 163, - 163, 163, 163, 164, 164, 165, 165, 166, 166, 167, - 167, 168, 168, 169, 169, 170, 170, 171, 171, 172, - 172, 175, 176, 177 + 0, 100, 100, 100, 102, 102, 104, 107, 116, 144, + 154, 155, 161, 167, 173, 179, 184, 189, 194, 199, + 200, 201, 202, 208, 208, 209, 209, 210, 210, 211, + 211, 212, 212, 213, 213, 214, 214, 215, 215, 216, + 216, 219, 220, 221, 222, 223 }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "USE", "F_INCLUDE", "MODULE", "EOSTMT", + "$end", "error", "$undefined", "EOSTMT", "ASSIGNMENT_OP", "GARBAGE", "CPP_INCLUDE", "F90PPR_INCLUDE", "COCO_INCLUDE", "F90PPR_DEFINE", "CPP_DEFINE", "F90PPR_UNDEF", "CPP_UNDEF", "CPP_IFDEF", "CPP_IFNDEF", "CPP_IF", "CPP_ELSE", "CPP_ELIF", "CPP_ENDIF", "F90PPR_IFDEF", "F90PPR_IFNDEF", "F90PPR_IF", "F90PPR_ELSE", "F90PPR_ELIF", - "F90PPR_ENDIF", "UNTERMINATED_STRING", "CPP_TOENDL", "STRING", "WORD", - "$accept", "code", "stmt", "eostmt", "include", "define", "undef", - "ifdef", "ifndef", "if", "elif", "else", "endif", "other", "misc_code", 0 + "F90PPR_ENDIF", "CPP_TOENDL", "UNTERMINATED_STRING", "STRING", "WORD", + "$accept", "code", "stmt", "assignment_stmt", "keyword_stmt", "define", + "undef", "ifdef", "ifndef", "if", "elif", "else", "endif", "other", + "misc_code", 0 }; #endif # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284 + 275, 276, 277, 278, 279, 280, 281, 282, 283 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const unsigned char yyr1[] = +static const yytype_uint8 yyr1[] = { - 0, 30, 31, 31, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, - 34, 34, 34, 35, 35, 36, 36, 37, 37, 38, - 38, 39, 39, 40, 40, 41, 41, 42, 42, 43, - 43, 44, 44, 44 + 0, 29, 30, 30, 31, 31, 32, 33, 33, 33, + 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, + 33, 33, 33, 34, 34, 35, 35, 36, 36, 37, + 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, + 42, 43, 43, 43, 43, 43 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const unsigned char yyr2[] = +static const yytype_uint8 yyr2[] = { - 0, 2, 0, 2, 4, 4, 4, 3, 4, 4, - 4, 4, 3, 3, 3, 3, 2, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 2, 0, 2, 1, 1, 4, 2, 4, 4, + 4, 4, 4, 4, 4, 3, 3, 3, 3, 4, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 2, 1, 1, 1 + 2, 1, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const unsigned char yydefact[] = +static const yytype_uint8 yydefact[] = { - 2, 39, 1, 0, 19, 0, 20, 21, 22, 24, - 23, 26, 25, 27, 29, 31, 35, 33, 37, 28, - 30, 32, 36, 34, 38, 3, 0, 0, 0, 0, - 0, 39, 39, 39, 39, 17, 39, 17, 39, 39, - 39, 39, 39, 39, 17, 17, 17, 17, 18, 43, - 42, 41, 16, 40, 17, 7, 17, 17, 17, 17, - 17, 17, 12, 13, 14, 15, 4, 6, 5, 8, - 9, 10, 11 + 2, 0, 1, 22, 21, 39, 0, 24, 23, 26, + 25, 27, 29, 31, 35, 33, 37, 28, 30, 32, + 36, 34, 38, 0, 3, 5, 4, 0, 0, 0, + 0, 39, 39, 39, 39, 0, 39, 7, 39, 39, + 39, 39, 39, 39, 39, 39, 0, 0, 0, 0, + 20, 44, 43, 45, 42, 41, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 15, 16, 17, 18, + 10, 6, 19, 9, 8, 11, 12, 13, 14 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const yysigned_char yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = { - -1, 1, 25, 52, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 53 + -1, 1, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 56 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -29 -static const yysigned_char yypact[] = +#define YYPACT_NINF -27 +static const yytype_int8 yypact[] = { - -29, 0, -29, -28, -29, -27, -23, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29, -29, -29, -29, -1, 1, 3, 8, - 9, -29, -29, -29, -29, 25, -29, 22, -29, -29, - -29, -29, -29, -29, 25, 25, 25, 25, -29, -29, - -29, -29, -29, -29, 25, -29, 25, 25, 25, 25, - 25, 25, -29, -29, -29, -29, -29, -29, -29, -29, - -29, -29, -29 + -27, 0, -27, -27, -27, -27, -26, -27, -27, -27, + -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, + -27, -27, -27, 111, -27, -27, -27, -24, -21, -20, + 19, -27, -27, -27, -27, 22, -27, -27, -27, -27, + -27, -27, -27, -27, -27, -27, 26, 29, 32, 35, + -27, -27, -27, -27, -27, -27, -27, 38, 41, 67, + 70, 73, 76, 79, 82, 85, -27, -27, -27, -27, + -27, -27, -27, -27, -27, -27, -27, -27, -27 }; /* YYPGOTO[NTERM-NUM]. */ -static const yysigned_char yypgoto[] = +static const yytype_int8 yypgoto[] = { - -29, -29, -29, -11, -29, -29, -29, -29, -29, -29, - -29, -29, -29, 24, -29 + -27, -27, -27, -27, -27, -27, -27, -27, -27, -27, + -27, -27, -27, 86, -27 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -532,58 +655,56 @@ static const yysigned_char yypgoto[] = number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 -static const unsigned char yytable[] = +static const yytype_uint8 yytable[] = { - 2, 36, 37, 3, 4, 5, 38, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 55, 39, 48, 0, - 40, 48, 41, 62, 63, 64, 65, 42, 43, 0, - 0, 0, 0, 66, 0, 67, 68, 69, 70, 71, - 72, 49, 0, 50, 51, 44, 45, 46, 47, 0, - 54, 0, 56, 57, 58, 59, 60, 61 + 2, 3, 36, 4, 42, 5, 6, 43, 44, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 50, 51, 52, 23, 66, + 51, 52, 67, 51, 52, 68, 51, 52, 69, 51, + 52, 70, 51, 52, 71, 51, 52, 45, 53, 54, + 55, 0, 53, 54, 55, 53, 54, 55, 53, 54, + 55, 53, 54, 55, 53, 54, 55, 53, 54, 55, + 72, 51, 52, 73, 51, 52, 74, 51, 52, 75, + 51, 52, 76, 51, 52, 77, 51, 52, 78, 51, + 52, 0, 0, 53, 54, 55, 53, 54, 55, 53, + 54, 55, 53, 54, 55, 53, 54, 55, 53, 54, + 55, 53, 54, 55, 37, 38, 39, 46, 47, 48, + 49, 0, 57, 0, 58, 59, 60, 61, 62, 63, + 64, 65, 0, 0, 0, 0, 0, 0, 40, 41 }; -static const yysigned_char yycheck[] = +static const yytype_int8 yycheck[] = { - 0, 29, 29, 3, 4, 5, 29, 7, 8, 9, + 0, 1, 28, 3, 28, 5, 6, 28, 28, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 37, 28, 6, -1, - 29, 6, 29, 44, 45, 46, 47, 29, 29, -1, - -1, -1, -1, 54, -1, 56, 57, 58, 59, 60, - 61, 26, -1, 28, 29, 31, 32, 33, 34, -1, - 36, -1, 38, 39, 40, 41, 42, 43 + 20, 21, 22, 23, 24, 3, 4, 5, 28, 3, + 4, 5, 3, 4, 5, 3, 4, 5, 3, 4, + 5, 3, 4, 5, 3, 4, 5, 28, 26, 27, + 28, -1, 26, 27, 28, 26, 27, 28, 26, 27, + 28, 26, 27, 28, 26, 27, 28, 26, 27, 28, + 3, 4, 5, 3, 4, 5, 3, 4, 5, 3, + 4, 5, 3, 4, 5, 3, 4, 5, 3, 4, + 5, -1, -1, 26, 27, 28, 26, 27, 28, 26, + 27, 28, 26, 27, 28, 26, 27, 28, 26, 27, + 28, 26, 27, 28, 3, 4, 5, 31, 32, 33, + 34, -1, 36, -1, 38, 39, 40, 41, 42, 43, + 44, 45, -1, -1, -1, -1, -1, -1, 27, 28 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const unsigned char yystos[] = +static const yytype_uint8 yystos[] = { - 0, 31, 0, 3, 4, 5, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 32, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 29, 29, 29, 28, - 29, 29, 29, 29, 43, 43, 43, 43, 6, 26, - 28, 29, 33, 44, 43, 33, 43, 43, 43, 43, - 43, 43, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33 + 0, 30, 0, 1, 3, 5, 6, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 28, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 28, 3, 4, 5, + 27, 28, 28, 28, 28, 28, 42, 42, 42, 42, + 3, 4, 5, 26, 27, 28, 43, 42, 42, 42, + 42, 42, 42, 42, 42, 42, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -609,30 +730,63 @@ do \ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ { \ - yyerror ("syntax error: cannot back up");\ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (0) +while (YYID (0)) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) #endif + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -653,42 +807,96 @@ while (0) do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (0) +} while (YYID (0)) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) -# define YYDSYMPRINTF(Title, Token, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Token, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (/* Nothing. */; bottom <= top; ++bottom) + for (; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -697,45 +905,52 @@ yy_stack_print (bottom, top) do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (0) +} while (YYID (0)) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) #else static void -yy_reduce_print (yyrule) +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; int yyrule; #endif { + int yynrhs = yyr2[yyrule]; int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", yyrule - 1, yylno); - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (Rule); \ -} while (0) + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -750,13 +965,9 @@ int yydebug; if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -766,45 +977,47 @@ int yydebug; #if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - register const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -814,64 +1027,186 @@ yystpcpy (yydest, yysrc) # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ -#if YYDEBUG -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if defined (__STDC__) || defined (__cplusplus) -static void -yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) -#else -static void -yysymprint (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE *yyvaluep; -#endif -{ - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; - - if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - switch (yytype) - { - default: - break; - } - YYFPRINTF (yyoutput, ")"); -} - -#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yydestruct (int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; #endif { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + YYUSE (yyvaluep); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); switch (yytype) { @@ -885,13 +1220,13 @@ yydestruct (yytype, yyvaluep) /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); -# else +#else int yyparse (); -# endif +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void); #else int yyparse (); @@ -908,14 +1243,18 @@ int yyparse (); `----------*/ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -int yyparse (void *YYPARSE_PARAM) -# else -int yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -# endif +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int yyparse (void) #else @@ -925,22 +1264,28 @@ yyparse () #endif #endif { - /* The lookahead symbol. */ + /* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ int yynerrs; - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -951,18 +1296,18 @@ int yynerrs; to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - register short int *yyssp; + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; -#define YYPOPSTACK (yyvsp--, yyssp--) +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) YYSIZE_T yystacksize = YYINITDEPTH; @@ -971,9 +1316,9 @@ int yynerrs; YYSTYPE yyval; - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); @@ -990,7 +1335,6 @@ int yynerrs; yyssp = yyss; yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -998,8 +1342,7 @@ int yynerrs; `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: @@ -1012,18 +1355,18 @@ int yynerrs; #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; /* Each stack pointer address is followed by the size of the data in use in that stack, in bytes. This used to be a conditional around just the two extra args, but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -1034,21 +1377,21 @@ int yynerrs; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -1079,19 +1422,17 @@ int yynerrs; `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1106,7 +1447,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1126,22 +1467,21 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; - - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + yystate = yyn; + *++yyvsp = yylval; + goto yynewstate; @@ -1176,95 +1516,124 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 4: -#line 97 "cmDependsFortranParser.y" + case 7: +#line 108 "cmDependsFortranParser.y" { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleUse(parser, yyvsp[-2].string); - free(yyvsp[-2].string); - } - break; - - case 5: -#line 103 "cmDependsFortranParser.y" - { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleInclude(parser, yyvsp[-2].string); - free(yyvsp[-2].string); - } - break; - - case 7: -#line 110 "cmDependsFortranParser.y" - { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleModule(parser, yyvsp[-1].string); - free(yyvsp[-1].string); + if (strcasecmp((yyvsp[(1) - (2)].string), "interface") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, true); + } + free((yyvsp[(1) - (2)].string)); } break; case 8: -#line 116 "cmDependsFortranParser.y" +#line 117 "cmDependsFortranParser.y" { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleDefine(parser, yyvsp[-2].string); - free(yyvsp[-2].string); + if (strcasecmp((yyvsp[(1) - (4)].string), "use") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleUse(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); + } + else if (strcasecmp((yyvsp[(1) - (4)].string), "module") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleModule(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); + } + else if (strcasecmp((yyvsp[(1) - (4)].string), "interface") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, true); + free((yyvsp[(2) - (4)].string)); + } + else if (strcasecmp((yyvsp[(2) - (4)].string), "interface") == 0 && strcasecmp((yyvsp[(1) - (4)].string), "end") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, false); + free((yyvsp[(2) - (4)].string)); + } + free((yyvsp[(1) - (4)].string)); } break; case 9: -#line 122 "cmDependsFortranParser.y" +#line 145 "cmDependsFortranParser.y" { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleUndef(parser, yyvsp[-2].string); - free(yyvsp[-2].string); - } - break; - - case 10: -#line 128 "cmDependsFortranParser.y" - { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleIfdef(parser, yyvsp[-2].string); - free(yyvsp[-2].string); + if (strcasecmp((yyvsp[(1) - (4)].string), "include") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleInclude(parser, (yyvsp[(2) - (4)].string)); + } + free((yyvsp[(1) - (4)].string)); + free((yyvsp[(2) - (4)].string)); } break; case 11: -#line 134 "cmDependsFortranParser.y" +#line 156 "cmDependsFortranParser.y" { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleIfndef(parser, yyvsp[-2].string); - free(yyvsp[-2].string); + cmDependsFortranParser_RuleDefine(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); } break; case 12: -#line 140 "cmDependsFortranParser.y" +#line 162 "cmDependsFortranParser.y" + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleUndef(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); + } + break; + + case 13: +#line 168 "cmDependsFortranParser.y" + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleIfdef(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); + } + break; + + case 14: +#line 174 "cmDependsFortranParser.y" + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleIfndef(parser, (yyvsp[(2) - (4)].string)); + free((yyvsp[(2) - (4)].string)); + } + break; + + case 15: +#line 180 "cmDependsFortranParser.y" { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleIf(parser); } break; - case 13: -#line 145 "cmDependsFortranParser.y" + case 16: +#line 185 "cmDependsFortranParser.y" { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleElif(parser); } break; - case 14: -#line 150 "cmDependsFortranParser.y" + case 17: +#line 190 "cmDependsFortranParser.y" { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleElse(parser); } break; - case 15: -#line 155 "cmDependsFortranParser.y" + case 18: +#line 195 "cmDependsFortranParser.y" { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleEndif(parser); @@ -1272,25 +1641,24 @@ yyreduce: break; case 41: -#line 175 "cmDependsFortranParser.y" - { free (yyvsp[0].string); } +#line 219 "cmDependsFortranParser.y" + { free ((yyvsp[(1) - (1)].string)); } break; case 42: -#line 176 "cmDependsFortranParser.y" - { free (yyvsp[0].string); } +#line 220 "cmDependsFortranParser.y" + { free ((yyvsp[(1) - (1)].string)); } break; +/* Line 1267 of yacc.c. */ +#line 1656 "cmDependsFortranParser.cxx" + default: break; } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); -/* Line 1010 of yacc.c. */ -#line 1277 "cmDependsFortranParser.cxx" - - yyvsp -= yylen; - yyssp -= yylen; - - + YYPOPSTACK (yylen); + yylen = 0; YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -1319,100 +1687,65 @@ yyerrlab: if (!yyerrstatus) { ++yynerrs; -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (YYPACT_NINF < yyn && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; - int yyx; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; - - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) - { - yysize = 0; - break; - } - } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); - - if (yycount < 5) - { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } - } - yyerror (yymsg); +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); - } - else - yyerror ("syntax error; also virtual memory exhausted"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + /* Return failure if at end of input. */ if (yychar == YYEOF) - for (;;) - { - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], - yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - } + YYABORT; } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); + yydestruct ("Error: discarding", + yytoken, &yylval); yychar = YYEMPTY; - } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -1422,15 +1755,17 @@ yyerrlab: `---------------------------------------------------*/ yyerrorlab: -#if defined(__GNUC__) || defined(__HP_aCC) || defined(__INTEL_COMPILER) - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ - if (0) + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) goto yyerrorlab; -#endif - yyvsp -= yylen; - yyssp -= yylen; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); yystate = *yyssp; goto yyerrlab1; @@ -1459,9 +1794,10 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); - YYPOPSTACK; + + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -1469,11 +1805,12 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -1493,25 +1830,43 @@ yyabortlab: goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } -#line 180 "cmDependsFortranParser.y" +#line 226 "cmDependsFortranParser.y" /* End of grammar */ diff --git a/Source/cmDependsFortranParser.h b/Source/cmDependsFortranParser.h index 362c5d8c1..6b397755b 100644 --- a/Source/cmDependsFortranParser.h +++ b/Source/cmDependsFortranParser.h @@ -23,20 +23,33 @@ typedef struct cmDependsFortranParser_s cmDependsFortranParser; /* Functions to enter/exit #include'd files in order. */ -int cmDependsFortranParser_FilePush(cmDependsFortranParser* parser, +bool cmDependsFortranParser_FilePush(cmDependsFortranParser* parser, const char* fname); -int cmDependsFortranParser_FilePop(cmDependsFortranParser* parser); +bool cmDependsFortranParser_FilePop(cmDependsFortranParser* parser); /* Callbacks for lexer. */ int cmDependsFortranParser_Input(cmDependsFortranParser* parser, char* buffer, size_t bufferSize); + + void cmDependsFortranParser_StringStart(cmDependsFortranParser* parser); const char* cmDependsFortranParser_StringEnd(cmDependsFortranParser* parser); void cmDependsFortranParser_StringAppend(cmDependsFortranParser* parser, char c); + void cmDependsFortranParser_SetInInterface(cmDependsFortranParser* parser, - int in); -int cmDependsFortranParser_GetInInterface(cmDependsFortranParser* parser); + bool is_in); +bool cmDependsFortranParser_GetInInterface(cmDependsFortranParser* parser); + + +void cmDependsFortranParser_SetInPPFalseBranch(cmDependsFortranParser* parser, + bool is_in); +bool cmDependsFortranParser_GetInPPFalseBranch(cmDependsFortranParser* parser); + + +void cmDependsFortranParser_SetOldStartcond(cmDependsFortranParser* parser, + int arg); +int cmDependsFortranParser_GetOldStartcond(cmDependsFortranParser* parser); /* Callbacks for parser. */ void cmDependsFortranParser_Error(cmDependsFortranParser* parser, diff --git a/Source/cmDependsFortranParser.y b/Source/cmDependsFortranParser.y index aec8e216f..863f52abd 100644 --- a/Source/cmDependsFortranParser.y +++ b/Source/cmDependsFortranParser.y @@ -76,7 +76,7 @@ static void cmDependsFortranError(yyscan_t yyscanner, const char* message) %} /* Generate a reentrant parser object. */ -%pure_parser +%pure-parser %union { char* string; @@ -84,90 +84,128 @@ static void cmDependsFortranError(yyscan_t yyscanner, const char* message) /*-------------------------------------------------------------------------*/ /* Tokens */ -%token USE F_INCLUDE MODULE EOSTMT +%token EOSTMT ASSIGNMENT_OP GARBAGE %token CPP_INCLUDE F90PPR_INCLUDE COCO_INCLUDE %token F90PPR_DEFINE CPP_DEFINE F90PPR_UNDEF CPP_UNDEF %token CPP_IFDEF CPP_IFNDEF CPP_IF CPP_ELSE CPP_ELIF CPP_ENDIF %token F90PPR_IFDEF F90PPR_IFNDEF F90PPR_IF F90PPR_ELSE F90PPR_ELIF F90PPR_ENDIF -%token UNTERMINATED_STRING -%token CPP_TOENDL STRING WORD +%token CPP_TOENDL +%token UNTERMINATED_STRING +%token STRING WORD /*-------------------------------------------------------------------------*/ /* grammar */ %% -code: /* empty */ | code stmt ; +code: /* empty */ | code stmt; -stmt: - USE WORD other eostmt +stmt: keyword_stmt | assignment_stmt; + +assignment_stmt: WORD ASSIGNMENT_OP other EOSTMT /* Ignore */ + +keyword_stmt: + WORD EOSTMT { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleUse(parser, $2); + if (strcasecmp($1, "interface") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, true); + } + free($1); + } +| WORD WORD other EOSTMT + { + if (strcasecmp($1, "use") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleUse(parser, $2); + free($2); + } + else if (strcasecmp($1, "module") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleModule(parser, $2); + free($2); + } + else if (strcasecmp($1, "interface") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, true); + free($2); + } + else if (strcasecmp($2, "interface") == 0 && strcasecmp($1, "end") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_SetInInterface(parser, false); + free($2); + } + free($1); + } +| WORD STRING other EOSTMT + { + if (strcasecmp($1, "include") == 0) + { + cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); + cmDependsFortranParser_RuleInclude(parser, $2); + } + free($1); free($2); } -| include STRING other eostmt - { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleInclude(parser, $2); - free($2); - } -| CPP_INCLUDE WORD other eostmt /* Ignore */ -| MODULE WORD eostmt - { - cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); - cmDependsFortranParser_RuleModule(parser, $2); - free($2); - } -| define WORD other eostmt +| CPP_INCLUDE WORD other EOSTMT /* Ignore */ +| define WORD other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleDefine(parser, $2); free($2); } -| undef WORD other eostmt +| undef WORD other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleUndef(parser, $2); free($2); } -| ifdef WORD other eostmt +| ifdef WORD other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleIfdef(parser, $2); free($2); } -| ifndef WORD other eostmt +| ifndef WORD other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleIfndef(parser, $2); free($2); } -| if other eostmt +| if other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleIf(parser); } -| elif other eostmt +| elif other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleElif(parser); } -| else other eostmt +| else other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleElse(parser); } -| endif other eostmt +| endif other EOSTMT { cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner); cmDependsFortranParser_RuleEndif(parser); } -| other eostmt /* Ignore */ +| WORD GARBAGE other EOSTMT /* Ignore */ +| GARBAGE other EOSTMT +| EOSTMT +| error ; -eostmt: /* empty */ | EOSTMT ; -include: F_INCLUDE | CPP_INCLUDE | F90PPR_INCLUDE | COCO_INCLUDE ; -define: CPP_DEFINE | F90PPR_DEFINE ; + + +include: CPP_INCLUDE | F90PPR_INCLUDE | COCO_INCLUDE ; +define: CPP_DEFINE | F90PPR_DEFINE; undef: CPP_UNDEF | F90PPR_UNDEF ; ifdef: CPP_IFDEF | F90PPR_IFDEF ; ifndef: CPP_IFNDEF | F90PPR_IFNDEF ; @@ -180,6 +218,8 @@ other: /* empty */ | other misc_code ; misc_code: WORD { free ($1); } | STRING { free ($1); } +| GARBAGE +| ASSIGNMENT_OP | UNTERMINATED_STRING ; diff --git a/Source/cmDependsFortranParserTokens.h b/Source/cmDependsFortranParserTokens.h index 055be925c..97f48a61e 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, 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. */ +/* 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. + + 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 - - - - -