[Cmake-commits] CMake branch, next, updated. v2.8.8-2911-g7cc164f
Brad King
brad.king at kitware.com
Tue May 22 14:13:19 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7cc164f4e23b0391b43af686b4c3be17bd7bf6be (commit)
via ad2107903a28e8e41b3170ee6089f7c080c49614 (commit)
via f2656e4ccb7b05cb1bef17ccf61dc9af7ed3f5fc (commit)
from c3352f94791c11a47050ef26515e4d7374d2bfb8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cc164f4e23b0391b43af686b4c3be17bd7bf6be
commit 7cc164f4e23b0391b43af686b4c3be17bd7bf6be
Merge: c3352f9 ad21079
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 22 14:13:16 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 22 14:13:16 2012 -0400
Merge topic 'fortran-include-angle' into next
ad21079 Fortran: Follow <>-style includes (#13239)
f2656e4 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad2107903a28e8e41b3170ee6089f7c080c49614
commit ad2107903a28e8e41b3170ee6089f7c080c49614
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 22 14:07:24 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue May 22 14:07:24 2012 -0400
Fortran: Follow <>-style includes (#13239)
Fortran sources that pass through the C preprocessor may use
#include "header"
syntax or
#include <header>
syntax. CMake already follows the former. Teach it to follow the
latter.
diff --git a/Source/cmDependsFortranLexer.cxx b/Source/cmDependsFortranLexer.cxx
index 438af2d..b0d9a74 100644
--- a/Source/cmDependsFortranLexer.cxx
+++ b/Source/cmDependsFortranLexer.cxx
@@ -20,7 +20,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 34
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -65,7 +65,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -96,6 +95,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -169,7 +170,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -203,13 +212,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- * Given that the standard has decreed that size_t exists since 1989,
- * I guess we can afford to depend on it. Manoj.
- */
-
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
@@ -367,8 +369,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 44
+#define YY_END_OF_BUFFER 45
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -376,25 +378,26 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[161] =
+static yyconst flex_int16_t yy_accept[165] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 44, 38, 40, 39, 42, 1, 38, 31, 2, 33,
- 38, 39, 36, 38, 37, 38, 37, 40, 38, 39,
- 38, 37, 9, 8, 9, 4, 3, 38, 0, 10,
- 0, 0, 0, 0, 0, 31, 31, 32, 34, 36,
- 38, 37, 0, 41, 37, 0, 0, 0, 0, 0,
- 0, 0, 0, 38, 0, 11, 37, 0, 0, 5,
- 0, 0, 0, 27, 0, 0, 31, 31, 31, 31,
- 0, 0, 0, 0, 0, 21, 0, 0, 0, 0,
+ 45, 39, 41, 40, 43, 1, 39, 32, 2, 34,
+ 39, 40, 37, 39, 38, 39, 38, 41, 39, 40,
+ 39, 38, 9, 8, 9, 4, 3, 39, 0, 10,
+ 0, 0, 0, 0, 0, 32, 32, 33, 35, 37,
+ 39, 38, 0, 42, 38, 0, 0, 0, 0, 0,
+ 0, 0, 0, 39, 0, 11, 38, 0, 0, 5,
+ 0, 0, 0, 28, 0, 0, 32, 32, 32, 32,
+ 0, 0, 0, 0, 0, 22, 0, 0, 0, 0,
0, 6, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 28, 29, 0, 0, 0, 0, 0, 0,
- 0, 22, 23, 0, 0, 0, 0, 0, 0, 0,
- 0, 30, 25, 0, 0, 18, 0, 0, 24, 19,
- 0, 0, 17, 0, 0, 16, 26, 0, 0, 15,
- 20, 0, 7, 35, 7, 13, 0, 12, 14, 0
+ 0, 0, 29, 30, 0, 0, 0, 0, 0, 0,
+ 0, 23, 24, 0, 0, 0, 0, 0, 0, 0,
+ 0, 31, 26, 0, 0, 19, 0, 0, 25, 20,
+ 0, 0, 18, 0, 0, 17, 27, 0, 0, 16,
+ 21, 0, 7, 36, 7, 14, 0, 13, 15, 0,
+ 0, 0, 12, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -404,15 +407,15 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 5, 6, 7, 8, 9, 1, 10, 11, 1,
1, 12, 1, 13, 1, 1, 1, 14, 14, 14,
- 14, 14, 14, 14, 14, 14, 14, 15, 16, 1,
- 17, 18, 19, 1, 20, 20, 21, 22, 23, 24,
- 20, 20, 25, 20, 20, 26, 20, 27, 20, 20,
- 20, 20, 28, 20, 29, 20, 20, 20, 20, 20,
- 1, 30, 1, 1, 31, 1, 20, 20, 32, 33,
-
- 34, 35, 20, 20, 36, 20, 20, 37, 20, 38,
- 20, 20, 20, 20, 39, 20, 40, 20, 20, 20,
- 20, 20, 1, 1, 1, 1, 1, 1, 1, 1,
+ 14, 14, 14, 14, 14, 14, 14, 15, 16, 17,
+ 18, 19, 20, 1, 21, 21, 22, 23, 24, 25,
+ 21, 21, 26, 21, 21, 27, 21, 28, 21, 21,
+ 21, 21, 29, 21, 30, 21, 21, 21, 21, 21,
+ 1, 31, 1, 1, 32, 1, 21, 21, 33, 34,
+
+ 35, 36, 21, 21, 37, 21, 21, 38, 21, 39,
+ 21, 21, 21, 21, 40, 21, 41, 21, 21, 21,
+ 21, 21, 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,
@@ -429,178 +432,187 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[41] =
+static yyconst flex_int32_t yy_meta[42] =
{ 0,
1, 2, 2, 3, 4, 3, 3, 1, 1, 3,
- 3, 1, 3, 5, 1, 3, 3, 1, 1, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 1,
- 5, 6, 6, 6, 6, 6, 6, 6, 6, 6
+ 3, 1, 3, 5, 1, 3, 1, 3, 6, 1,
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+ 1, 5, 7, 7, 7, 7, 7, 7, 7, 7,
+ 7
} ;
-static yyconst flex_int16_t yy_base[169] =
+static yyconst flex_int16_t yy_base[174] =
{ 0,
- 0, 39, 0, 40, 184, 47, 43, 53, 55, 63,
- 186, 0, 476, 476, 164, 476, 79, 72, 476, 476,
- 143, 476, 130, 126, 0, 83, 119, 85, 149, 139,
- 189, 220, 476, 131, 89, 476, 476, 0, 132, 476,
- 259, 37, 69, 76, 34, 119, 137, 476, 0, 476,
- 121, 0, 150, 476, 0, 154, 298, 0, 75, 138,
- 142, 72, 127, 338, 94, 476, 0, 84, 158, 186,
- 81, 145, 108, 172, 147, 173, 260, 266, 284, 299,
- 272, 173, 178, 286, 245, 258, 285, 285, 78, 71,
- 207, 476, 288, 291, 296, 304, 310, 315, 317, 326,
-
- 330, 330, 335, 338, 338, 341, 343, 341, 348, 62,
- 52, 346, 476, 476, 353, 355, 357, 352, 359, 359,
- 359, 476, 476, 363, 365, 370, 366, 375, 46, 38,
- 378, 476, 476, 378, 381, 476, 376, 384, 476, 476,
- 384, 387, 476, 115, 0, 476, 476, 388, 393, 476,
- 476, 394, 476, 476, 476, 476, 398, 476, 476, 476,
- 432, 438, 443, 445, 451, 457, 463, 469
+ 0, 40, 0, 41, 188, 48, 44, 54, 56, 65,
+ 186, 0, 505, 505, 171, 505, 81, 74, 505, 505,
+ 158, 505, 151, 137, 0, 85, 122, 87, 153, 145,
+ 194, 226, 505, 143, 91, 505, 505, 0, 142, 505,
+ 266, 34, 70, 74, 34, 122, 141, 505, 0, 505,
+ 112, 0, 98, 505, 0, 154, 306, 0, 43, 133,
+ 139, 46, 130, 347, 130, 505, 0, 121, 163, 179,
+ 104, 156, 129, 176, 147, 178, 214, 267, 273, 292,
+ 279, 179, 249, 280, 257, 265, 288, 289, 116, 107,
+ 317, 505, 287, 289, 291, 302, 307, 310, 307, 311,
+
+ 316, 326, 329, 333, 332, 336, 347, 345, 349, 101,
+ 86, 346, 505, 505, 350, 351, 353, 350, 357, 362,
+ 362, 505, 505, 367, 369, 371, 366, 372, 56, 47,
+ 374, 505, 505, 374, 379, 505, 374, 387, 505, 505,
+ 387, 391, 505, 117, 0, 505, 505, 392, 394, 505,
+ 505, 394, 505, 505, 505, 505, 395, 419, 505, 429,
+ 0, 25, 505, 505, 446, 453, 459, 462, 469, 476,
+ 483, 490, 497
} ;
-static yyconst flex_int16_t yy_def[169] =
+static yyconst flex_int16_t yy_def[174] =
{ 0,
- 160, 1, 1, 1, 1, 1, 161, 161, 161, 161,
- 160, 162, 160, 160, 163, 160, 162, 160, 160, 160,
- 162, 160, 160, 162, 164, 162, 164, 160, 162, 160,
- 165, 160, 160, 160, 160, 160, 160, 162, 163, 160,
- 160, 160, 160, 160, 160, 160, 166, 160, 162, 160,
- 162, 164, 160, 160, 27, 160, 160, 57, 160, 160,
- 160, 160, 160, 165, 165, 160, 32, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 166, 166, 166, 166,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 167, 168, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 0,
- 160, 160, 160, 160, 160, 160, 160, 160
+ 164, 1, 1, 1, 1, 1, 165, 165, 165, 165,
+ 164, 166, 164, 164, 167, 164, 166, 164, 164, 164,
+ 166, 164, 164, 166, 168, 166, 168, 164, 166, 164,
+ 169, 164, 164, 164, 164, 164, 164, 166, 167, 164,
+ 164, 164, 164, 164, 164, 164, 170, 164, 166, 164,
+ 166, 168, 164, 164, 27, 164, 164, 57, 164, 164,
+ 164, 164, 164, 169, 169, 164, 32, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 170, 170, 170, 170,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 171, 172, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 173, 173, 164, 0, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164
} ;
-static yyconst flex_int16_t yy_nxt[517] =
+static yyconst flex_int16_t yy_nxt[547] =
{ 0,
12, 13, 14, 13, 13, 15, 16, 12, 17, 18,
- 19, 12, 20, 12, 21, 22, 23, 12, 24, 25,
- 25, 25, 25, 25, 25, 25, 25, 25, 25, 26,
- 27, 25, 25, 25, 25, 25, 25, 25, 25, 25,
- 28, 28, 145, 28, 28, 34, 29, 29, 28, 30,
- 144, 28, 35, 36, 29, 34, 130, 34, 31, 71,
- 76, 37, 35, 36, 35, 34, 129, 32, 32, 37,
- 71, 76, 35, 46, 46, 111, 46, 47, 32, 32,
- 41, 48, 110, 41, 53, 54, 56, 53, 90, 56,
- 69, 70, 57, 69, 72, 73, 66, 83, 88, 74,
-
- 42, 43, 75, 44, 93, 72, 73, 45, 83, 88,
- 74, 42, 43, 75, 44, 93, 154, 154, 45, 38,
- 46, 46, 81, 46, 47, 81, 38, 38, 48, 96,
- 38, 89, 55, 38, 40, 68, 38, 38, 78, 46,
- 96, 78, 79, 63, 51, 82, 80, 50, 38, 55,
- 58, 53, 54, 58, 53, 56, 82, 49, 56, 69,
- 70, 57, 69, 84, 85, 86, 40, 99, 87, 94,
- 59, 60, 95, 61, 84, 85, 86, 62, 99, 87,
- 94, 59, 60, 95, 61, 160, 30, 91, 62, 64,
- 91, 66, 160, 97, 100, 92, 64, 64, 98, 101,
-
- 64, 102, 64, 64, 97, 100, 64, 64, 91, 98,
- 101, 91, 102, 160, 160, 160, 92, 160, 64, 64,
- 65, 65, 66, 65, 65, 65, 65, 65, 65, 65,
- 65, 65, 65, 67, 65, 65, 65, 65, 65, 67,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 65,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
- 41, 78, 46, 41, 78, 79, 105, 78, 46, 80,
- 78, 79, 160, 81, 160, 80, 81, 105, 160, 106,
- 42, 43, 160, 44, 107, 78, 46, 45, 78, 79,
- 106, 42, 43, 80, 44, 107, 82, 160, 45, 58,
-
- 78, 46, 58, 78, 79, 108, 109, 82, 80, 160,
- 103, 160, 112, 104, 113, 160, 108, 109, 114, 59,
- 60, 103, 61, 112, 104, 113, 62, 160, 115, 114,
- 59, 60, 116, 61, 160, 160, 117, 62, 64, 115,
- 66, 160, 118, 116, 160, 64, 64, 117, 119, 64,
- 120, 64, 64, 118, 121, 64, 64, 160, 122, 119,
- 123, 120, 124, 125, 126, 121, 127, 64, 64, 122,
- 128, 123, 131, 124, 125, 126, 132, 127, 133, 134,
- 135, 128, 136, 131, 137, 138, 139, 132, 140, 133,
- 134, 135, 141, 136, 142, 137, 138, 139, 143, 140,
-
- 146, 147, 148, 141, 149, 142, 150, 151, 152, 143,
- 156, 146, 147, 148, 157, 149, 158, 150, 151, 152,
- 159, 156, 160, 160, 160, 157, 160, 158, 160, 160,
- 160, 159, 33, 33, 33, 33, 33, 33, 38, 160,
- 160, 160, 38, 39, 39, 39, 39, 39, 39, 52,
- 52, 65, 65, 65, 65, 65, 65, 77, 77, 77,
- 77, 77, 77, 153, 153, 153, 160, 153, 153, 155,
- 160, 155, 160, 155, 155, 11, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160
+ 19, 12, 20, 12, 21, 22, 12, 23, 12, 24,
+ 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+ 26, 27, 25, 25, 25, 25, 25, 25, 25, 25,
+ 25, 28, 28, 163, 28, 28, 34, 29, 29, 28,
+ 30, 145, 28, 35, 36, 29, 34, 71, 34, 31,
+ 144, 76, 37, 35, 36, 35, 83, 34, 71, 32,
+ 32, 37, 76, 88, 35, 46, 46, 83, 46, 47,
+ 32, 32, 41, 48, 88, 41, 53, 54, 56, 53,
+ 130, 56, 69, 70, 57, 69, 72, 73, 74, 53,
+
+ 54, 75, 53, 42, 43, 129, 44, 72, 73, 74,
+ 45, 111, 75, 81, 42, 43, 81, 44, 154, 154,
+ 110, 45, 38, 46, 46, 90, 46, 47, 93, 38,
+ 38, 48, 66, 38, 89, 55, 38, 82, 38, 93,
+ 38, 38, 78, 46, 40, 78, 79, 68, 82, 63,
+ 80, 96, 38, 55, 58, 56, 51, 58, 56, 84,
+ 85, 57, 96, 86, 69, 70, 87, 69, 99, 50,
+ 84, 85, 49, 40, 86, 59, 60, 87, 61, 99,
+ 91, 94, 62, 91, 95, 164, 59, 60, 92, 61,
+ 30, 164, 94, 62, 64, 95, 66, 164, 97, 164,
+
+ 100, 64, 64, 98, 164, 64, 101, 64, 64, 97,
+ 64, 100, 64, 64, 98, 78, 46, 101, 78, 79,
+ 164, 164, 164, 80, 64, 64, 65, 65, 66, 65,
+ 65, 65, 65, 65, 65, 65, 65, 65, 65, 67,
+ 65, 65, 65, 65, 65, 65, 67, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 65, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 67, 41, 78, 46,
+ 41, 78, 79, 102, 78, 46, 80, 78, 79, 105,
+ 81, 164, 80, 81, 102, 164, 164, 106, 42, 43,
+ 105, 44, 107, 78, 46, 45, 78, 79, 106, 42,
+
+ 43, 80, 44, 107, 82, 103, 45, 58, 104, 108,
+ 58, 109, 112, 113, 114, 82, 103, 164, 91, 104,
+ 108, 91, 109, 112, 113, 114, 92, 115, 59, 60,
+ 116, 61, 117, 118, 119, 62, 164, 120, 115, 59,
+ 60, 116, 61, 117, 118, 119, 62, 64, 120, 66,
+ 164, 121, 164, 122, 64, 64, 123, 124, 64, 125,
+ 64, 64, 121, 64, 122, 64, 64, 123, 124, 126,
+ 125, 127, 128, 131, 132, 133, 134, 64, 64, 135,
+ 126, 136, 127, 128, 131, 132, 133, 134, 137, 138,
+ 135, 139, 136, 140, 141, 142, 143, 146, 147, 137,
+
+ 138, 148, 139, 149, 140, 141, 142, 143, 146, 147,
+ 150, 151, 148, 152, 149, 156, 157, 158, 159, 164,
+ 160, 150, 151, 160, 152, 164, 156, 157, 158, 159,
+ 160, 164, 164, 160, 164, 161, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 161, 33, 33, 33, 33,
+ 33, 33, 33, 38, 164, 164, 164, 38, 38, 39,
+ 39, 39, 39, 39, 39, 39, 52, 164, 52, 65,
+ 65, 65, 65, 65, 65, 65, 77, 77, 77, 77,
+ 77, 77, 77, 153, 153, 153, 164, 153, 153, 153,
+ 155, 164, 155, 164, 155, 155, 155, 162, 162, 162,
+
+ 162, 162, 164, 162, 11, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164
} ;
-static yyconst flex_int16_t yy_chk[517] =
+static yyconst flex_int16_t yy_chk[547] =
{ 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, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 4, 130, 2, 4, 7, 2, 4, 6, 6,
- 129, 6, 7, 7, 6, 8, 111, 9, 6, 42,
- 45, 9, 8, 8, 9, 10, 110, 6, 6, 10,
- 42, 45, 10, 18, 18, 90, 18, 18, 6, 6,
- 17, 18, 89, 17, 26, 26, 28, 26, 68, 28,
- 35, 35, 28, 35, 43, 43, 65, 59, 62, 44,
-
- 17, 17, 44, 17, 71, 43, 43, 17, 59, 62,
- 44, 17, 17, 44, 17, 71, 144, 144, 17, 27,
- 46, 46, 51, 46, 46, 51, 27, 27, 46, 73,
- 27, 63, 27, 27, 39, 34, 27, 27, 47, 47,
- 73, 47, 47, 30, 24, 51, 47, 23, 27, 27,
- 29, 53, 53, 29, 53, 56, 51, 21, 56, 69,
- 69, 56, 69, 60, 60, 61, 15, 75, 61, 72,
- 29, 29, 72, 29, 60, 60, 61, 29, 75, 61,
- 72, 29, 29, 72, 29, 11, 5, 70, 29, 31,
- 70, 31, 0, 74, 76, 70, 31, 31, 74, 82,
-
- 31, 83, 31, 31, 74, 76, 31, 31, 91, 74,
- 82, 91, 83, 0, 0, 0, 91, 0, 31, 31,
- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+ 1, 2, 4, 162, 2, 4, 7, 2, 4, 6,
+ 6, 130, 6, 7, 7, 6, 8, 42, 9, 6,
+ 129, 45, 9, 8, 8, 9, 59, 10, 42, 6,
+ 6, 10, 45, 62, 10, 18, 18, 59, 18, 18,
+ 6, 6, 17, 18, 62, 17, 26, 26, 28, 26,
+ 111, 28, 35, 35, 28, 35, 43, 43, 44, 53,
+
+ 53, 44, 53, 17, 17, 110, 17, 43, 43, 44,
+ 17, 90, 44, 51, 17, 17, 51, 17, 144, 144,
+ 89, 17, 27, 46, 46, 68, 46, 46, 71, 27,
+ 27, 46, 65, 27, 63, 27, 27, 51, 27, 71,
+ 27, 27, 47, 47, 39, 47, 47, 34, 51, 30,
+ 47, 73, 27, 27, 29, 56, 24, 29, 56, 60,
+ 60, 56, 73, 61, 69, 69, 61, 69, 75, 23,
+ 60, 60, 21, 15, 61, 29, 29, 61, 29, 75,
+ 70, 72, 29, 70, 72, 11, 29, 29, 70, 29,
+ 5, 0, 72, 29, 31, 72, 31, 0, 74, 0,
+
+ 76, 31, 31, 74, 0, 31, 82, 31, 31, 74,
+ 31, 76, 31, 31, 74, 77, 77, 82, 77, 77,
+ 0, 0, 0, 77, 31, 31, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
- 41, 77, 77, 41, 77, 77, 85, 78, 78, 77,
- 78, 78, 0, 81, 0, 78, 81, 85, 0, 86,
- 41, 41, 0, 41, 86, 79, 79, 41, 79, 79,
- 86, 41, 41, 79, 41, 86, 81, 0, 41, 57,
-
- 80, 80, 57, 80, 80, 87, 88, 81, 80, 0,
- 84, 0, 93, 84, 94, 0, 87, 88, 95, 57,
- 57, 84, 57, 93, 84, 94, 57, 0, 96, 95,
- 57, 57, 97, 57, 0, 0, 98, 57, 64, 96,
- 64, 0, 99, 97, 0, 64, 64, 98, 100, 64,
- 101, 64, 64, 99, 102, 64, 64, 0, 103, 100,
- 104, 101, 105, 106, 107, 102, 108, 64, 64, 103,
- 109, 104, 112, 105, 106, 107, 115, 108, 116, 117,
- 118, 109, 119, 112, 120, 121, 124, 115, 125, 116,
- 117, 118, 126, 119, 127, 120, 121, 124, 128, 125,
-
- 131, 134, 135, 126, 137, 127, 138, 141, 142, 128,
- 148, 131, 134, 135, 149, 137, 152, 138, 141, 142,
- 157, 148, 0, 0, 0, 149, 0, 152, 0, 0,
- 0, 157, 161, 161, 161, 161, 161, 161, 162, 0,
- 0, 0, 162, 163, 163, 163, 163, 163, 163, 164,
- 164, 165, 165, 165, 165, 165, 165, 166, 166, 166,
- 166, 166, 166, 167, 167, 167, 0, 167, 167, 168,
- 0, 168, 0, 168, 168, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160
+ 32, 32, 32, 32, 32, 32, 32, 41, 78, 78,
+ 41, 78, 78, 83, 79, 79, 78, 79, 79, 85,
+ 81, 0, 79, 81, 83, 0, 0, 86, 41, 41,
+ 85, 41, 86, 80, 80, 41, 80, 80, 86, 41,
+
+ 41, 80, 41, 86, 81, 84, 41, 57, 84, 87,
+ 57, 88, 93, 94, 95, 81, 84, 0, 91, 84,
+ 87, 91, 88, 93, 94, 95, 91, 96, 57, 57,
+ 97, 57, 98, 99, 100, 57, 0, 101, 96, 57,
+ 57, 97, 57, 98, 99, 100, 57, 64, 101, 64,
+ 0, 102, 0, 103, 64, 64, 104, 105, 64, 106,
+ 64, 64, 102, 64, 103, 64, 64, 104, 105, 107,
+ 106, 108, 109, 112, 115, 116, 117, 64, 64, 118,
+ 107, 119, 108, 109, 112, 115, 116, 117, 120, 121,
+ 118, 124, 119, 125, 126, 127, 128, 131, 134, 120,
+
+ 121, 135, 124, 137, 125, 126, 127, 128, 131, 134,
+ 138, 141, 135, 142, 137, 148, 149, 152, 157, 0,
+ 158, 138, 141, 158, 142, 0, 148, 149, 152, 157,
+ 160, 0, 0, 160, 0, 158, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 160, 165, 165, 165, 165,
+ 165, 165, 165, 166, 0, 0, 0, 166, 166, 167,
+ 167, 167, 167, 167, 167, 167, 168, 0, 168, 169,
+ 169, 169, 169, 169, 169, 169, 170, 170, 170, 170,
+ 170, 170, 170, 171, 171, 171, 0, 171, 171, 171,
+ 172, 0, 172, 0, 172, 172, 172, 173, 173, 173,
+
+ 173, 173, 0, 173, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 164, 164, 164, 164
} ;
/* The intent behind this definition is that it'll catch
@@ -673,7 +685,7 @@ Modify cmDependsFortranLexer.h:
/*--------------------------------------------------------------------------*/
-#line 670 "cmDependsFortranLexer.cxx"
+#line 678 "cmDependsFortranLexer.cxx"
#define INITIAL 0
#define free_fmt 1
@@ -796,7 +808,12 @@ static int input (yyscan_t yyscanner );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -804,7 +821,7 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -815,7 +832,7 @@ static int input (yyscan_t yyscanner );
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- int n; \
+ size_t n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -901,10 +918,10 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 75 "cmDependsFortranLexer.in.l"
+#line 71 "cmDependsFortranLexer.in.l"
-#line 901 "cmDependsFortranLexer.cxx"
+#line 914 "cmDependsFortranLexer.cxx"
if ( !yyg->yy_init )
{
@@ -958,13 +975,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 >= 161 )
+ if ( yy_current_state >= 165 )
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] != 476 );
+ while ( yy_base[yy_current_state] != 505 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -990,7 +1007,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 77 "cmDependsFortranLexer.in.l"
+#line 73 "cmDependsFortranLexer.in.l"
{
cmDependsFortranParser_StringStart(yyextra);
cmDependsFortranParser_SetOldStartcond(yyextra, YY_START);
@@ -999,7 +1016,7 @@ YY_RULE_SETUP
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 83 "cmDependsFortranLexer.in.l"
+#line 79 "cmDependsFortranLexer.in.l"
{
cmDependsFortranParser_StringStart(yyextra);
cmDependsFortranParser_SetOldStartcond(yyextra, YY_START);
@@ -1007,10 +1024,10 @@ YY_RULE_SETUP
}
YY_BREAK
case 3:
-#line 90 "cmDependsFortranLexer.in.l"
+#line 86 "cmDependsFortranLexer.in.l"
case 4:
YY_RULE_SETUP
-#line 90 "cmDependsFortranLexer.in.l"
+#line 86 "cmDependsFortranLexer.in.l"
{
BEGIN(cmDependsFortranParser_GetOldStartcond(yyextra) );
yylvalp->string = strdup(cmDependsFortranParser_StringEnd(yyextra));
@@ -1018,17 +1035,17 @@ YY_RULE_SETUP
}
case 5:
/* rule 5 can match eol */
-#line 97 "cmDependsFortranLexer.in.l"
+#line 93 "cmDependsFortranLexer.in.l"
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 97 "cmDependsFortranLexer.in.l"
+#line 93 "cmDependsFortranLexer.in.l"
/* Ignore (continued strings, free fmt) */
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 99 "cmDependsFortranLexer.in.l"
+#line 95 "cmDependsFortranLexer.in.l"
{
if (cmDependsFortranParser_GetOldStartcond(yyextra) == fixed_fmt)
; /* Ignore (cont. strings, fixed fmt) */
@@ -1041,7 +1058,7 @@ YY_RULE_SETUP
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 109 "cmDependsFortranLexer.in.l"
+#line 105 "cmDependsFortranLexer.in.l"
{
unput ('\n');
BEGIN(INITIAL);
@@ -1049,7 +1066,7 @@ YY_RULE_SETUP
}
case 9:
YY_RULE_SETUP
-#line 115 "cmDependsFortranLexer.in.l"
+#line 111 "cmDependsFortranLexer.in.l"
{
cmDependsFortranParser_StringAppend(yyextra, yytext[0]);
}
@@ -1057,96 +1074,99 @@ YY_RULE_SETUP
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 119 "cmDependsFortranLexer.in.l"
+#line 115 "cmDependsFortranLexer.in.l"
{ return EOSTMT; } /* Treat comments like */
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 120 "cmDependsFortranLexer.in.l"
+#line 116 "cmDependsFortranLexer.in.l"
{ return EOSTMT; } /* empty lines */
case 12:
+/* rule 12 can match eol */
YY_RULE_SETUP
-#line 122 "cmDependsFortranLexer.in.l"
-{ return CPP_INCLUDE; }
+#line 118 "cmDependsFortranLexer.in.l"
+{
+ yytext[yyleng-1] = 0;
+ yylvalp->string = strdup(strchr(yytext, '<')+1);
+ return CPP_INCLUDE_ANGLE;
+}
case 13:
YY_RULE_SETUP
#line 123 "cmDependsFortranLexer.in.l"
-{ return F90PPR_INCLUDE; }
+{ return CPP_INCLUDE; }
case 14:
YY_RULE_SETUP
#line 124 "cmDependsFortranLexer.in.l"
-{ return COCO_INCLUDE; }
+{ return F90PPR_INCLUDE; }
case 15:
YY_RULE_SETUP
-#line 126 "cmDependsFortranLexer.in.l"
-{ return CPP_DEFINE; }
+#line 125 "cmDependsFortranLexer.in.l"
+{ return COCO_INCLUDE; }
case 16:
YY_RULE_SETUP
#line 127 "cmDependsFortranLexer.in.l"
-{ return F90PPR_DEFINE; }
+{ return CPP_DEFINE; }
case 17:
YY_RULE_SETUP
-#line 129 "cmDependsFortranLexer.in.l"
-{ return CPP_UNDEF; }
+#line 128 "cmDependsFortranLexer.in.l"
+{ return F90PPR_DEFINE; }
case 18:
YY_RULE_SETUP
#line 130 "cmDependsFortranLexer.in.l"
-{ return F90PPR_UNDEF; }
+{ return CPP_UNDEF; }
case 19:
YY_RULE_SETUP
-#line 132 "cmDependsFortranLexer.in.l"
-{ return CPP_IFDEF; }
+#line 131 "cmDependsFortranLexer.in.l"
+{ return F90PPR_UNDEF; }
case 20:
YY_RULE_SETUP
#line 133 "cmDependsFortranLexer.in.l"
-{ return CPP_IFNDEF; }
+{ return CPP_IFDEF; }
case 21:
YY_RULE_SETUP
#line 134 "cmDependsFortranLexer.in.l"
-{ return CPP_IF; }
+{ return CPP_IFNDEF; }
case 22:
YY_RULE_SETUP
#line 135 "cmDependsFortranLexer.in.l"
-{ return CPP_ELIF; }
+{ return CPP_IF; }
case 23:
YY_RULE_SETUP
#line 136 "cmDependsFortranLexer.in.l"
-{ return CPP_ELSE; }
+{ return CPP_ELIF; }
case 24:
YY_RULE_SETUP
#line 137 "cmDependsFortranLexer.in.l"
-{ return CPP_ENDIF; }
+{ return CPP_ELSE; }
case 25:
YY_RULE_SETUP
-#line 139 "cmDependsFortranLexer.in.l"
-{ return F90PPR_IFDEF; }
+#line 138 "cmDependsFortranLexer.in.l"
+{ return CPP_ENDIF; }
case 26:
YY_RULE_SETUP
#line 140 "cmDependsFortranLexer.in.l"
-{ return F90PPR_IFNDEF; }
+{ return F90PPR_IFDEF; }
case 27:
YY_RULE_SETUP
#line 141 "cmDependsFortranLexer.in.l"
-{ return F90PPR_IF; }
+{ return F90PPR_IFNDEF; }
case 28:
YY_RULE_SETUP
#line 142 "cmDependsFortranLexer.in.l"
-{ return F90PPR_ELIF; }
+{ return F90PPR_IF; }
case 29:
YY_RULE_SETUP
#line 143 "cmDependsFortranLexer.in.l"
-{ return F90PPR_ELSE; }
+{ return F90PPR_ELIF; }
case 30:
YY_RULE_SETUP
#line 144 "cmDependsFortranLexer.in.l"
-{ return F90PPR_ENDIF; }
-/* Line continuations, possible involving comments. */
+{ return F90PPR_ELSE; }
case 31:
-/* rule 31 can match eol */
YY_RULE_SETUP
-#line 147 "cmDependsFortranLexer.in.l"
-
- YY_BREAK
+#line 145 "cmDependsFortranLexer.in.l"
+{ return F90PPR_ENDIF; }
+/* Line continuations, possible involving comments. */
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
@@ -1154,59 +1174,65 @@ YY_RULE_SETUP
YY_BREAK
case 33:
+/* rule 33 can match eol */
YY_RULE_SETUP
-#line 150 "cmDependsFortranLexer.in.l"
-{ return COMMA; }
+#line 149 "cmDependsFortranLexer.in.l"
+
+ YY_BREAK
case 34:
YY_RULE_SETUP
-#line 152 "cmDependsFortranLexer.in.l"
-{ return DCOLON; }
+#line 151 "cmDependsFortranLexer.in.l"
+{ return COMMA; }
case 35:
-/* rule 35 can match eol */
YY_RULE_SETUP
-#line 154 "cmDependsFortranLexer.in.l"
-{ return GARBAGE; }
+#line 153 "cmDependsFortranLexer.in.l"
+{ return DCOLON; }
case 36:
+/* rule 36 can match eol */
YY_RULE_SETUP
-#line 156 "cmDependsFortranLexer.in.l"
-{ return ASSIGNMENT_OP; }
+#line 155 "cmDependsFortranLexer.in.l"
+{ return GARBAGE; }
case 37:
YY_RULE_SETUP
-#line 158 "cmDependsFortranLexer.in.l"
+#line 157 "cmDependsFortranLexer.in.l"
+{ return ASSIGNMENT_OP; }
+case 38:
+YY_RULE_SETUP
+#line 159 "cmDependsFortranLexer.in.l"
{
yylvalp->string = strdup(yytext);
return WORD;
}
-case 38:
+case 39:
YY_RULE_SETUP
-#line 163 "cmDependsFortranLexer.in.l"
+#line 164 "cmDependsFortranLexer.in.l"
{ return GARBAGE; }
-case 39:
-/* rule 39 can match eol */
+case 40:
+/* rule 40 can match eol */
YY_RULE_SETUP
-#line 165 "cmDependsFortranLexer.in.l"
+#line 166 "cmDependsFortranLexer.in.l"
{ return EOSTMT; }
-case 40:
+case 41:
YY_RULE_SETUP
-#line 168 "cmDependsFortranLexer.in.l"
+#line 169 "cmDependsFortranLexer.in.l"
/* Ignore */
YY_BREAK
-case 41:
-/* rule 41 can match eol */
+case 42:
+/* rule 42 can match eol */
YY_RULE_SETUP
-#line 169 "cmDependsFortranLexer.in.l"
+#line 170 "cmDependsFortranLexer.in.l"
/* Ignore line-endings preceeded by \ */
YY_BREAK
-case 42:
+case 43:
YY_RULE_SETUP
-#line 171 "cmDependsFortranLexer.in.l"
+#line 172 "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 173 "cmDependsFortranLexer.in.l"
+#line 174 "cmDependsFortranLexer.in.l"
{
if(!cmDependsFortranParser_FilePop(yyextra) )
{
@@ -1214,12 +1240,12 @@ case YY_STATE_EOF(str_dq):
}
}
YY_BREAK
-case 43:
+case 44:
YY_RULE_SETUP
-#line 180 "cmDependsFortranLexer.in.l"
+#line 181 "cmDependsFortranLexer.in.l"
ECHO;
YY_BREAK
-#line 1247 "cmDependsFortranLexer.cxx"
+#line 1270 "cmDependsFortranLexer.cxx"
case YY_END_OF_BUFFER:
{
@@ -1512,7 +1538,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 >= 161 )
+ if ( yy_current_state >= 165 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1541,11 +1567,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 >= 161 )
+ if ( yy_current_state >= 165 )
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 == 160);
+ yy_is_jam = (yy_current_state == 164);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1991,7 +2017,7 @@ YY_BUFFER_STATE cmDependsFortran_yy_scan_string (yyconst char * yystr , yyscan_t
}
/** Setup the input buffer state to scan the given bytes. The next call to cmDependsFortran_yylex() will
- * scan from a @e copy of @a yybytes.
+ * scan from a @e copy of @a bytes.
* @param yybytes the byte buffer to scan
* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
* @param yyscanner The scanner object.
@@ -2154,7 +2180,7 @@ void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
}
/** Set the current column.
- * @param column_no
+ * @param line_number
* @param yyscanner The scanner object.
*/
void cmDependsFortran_yyset_column (int column_no , yyscan_t yyscanner)
@@ -2374,7 +2400,7 @@ void cmDependsFortran_yyfree (void * ptr , yyscan_t)
#define YYTABLES_NAME "yytables"
-#line 180 "cmDependsFortranLexer.in.l"
+#line 181 "cmDependsFortranLexer.in.l"
diff --git a/Source/cmDependsFortranLexer.h b/Source/cmDependsFortranLexer.h
index 85e861d..8e24cfd 100644
--- a/Source/cmDependsFortranLexer.h
+++ b/Source/cmDependsFortranLexer.h
@@ -20,7 +20,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 34
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -65,7 +65,6 @@ typedef int flex_int32_t;
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -96,6 +95,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -138,7 +139,15 @@ typedef void* yyscan_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
#ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -146,13 +155,6 @@ typedef void* yyscan_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- * Given that the standard has decreed that size_t exists since 1989,
- * I guess we can afford to depend on it. Manoj.
- */
-
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
@@ -304,7 +306,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Number of entries by which start-condition stack grows. */
diff --git a/Source/cmDependsFortranLexer.in.l b/Source/cmDependsFortranLexer.in.l
index af8e37d..40e80b7 100644
--- a/Source/cmDependsFortranLexer.in.l
+++ b/Source/cmDependsFortranLexer.in.l
@@ -115,6 +115,11 @@ Modify cmDependsFortranLexer.h:
!.*\n { return EOSTMT; } /* Treat comments like */
<fixed_fmt>^[cC*dD].*\n { return EOSTMT; } /* empty lines */
+^[ \t]*#[ \t]*include[ \t]*<[^>]+> {
+ yytext[yyleng-1] = 0;
+ yylvalp->string = strdup(strchr(yytext, '<')+1);
+ return CPP_INCLUDE_ANGLE;
+}
^[ \t]*#[ \t]*include { return CPP_INCLUDE; }
\$[ \t]*include { return F90PPR_INCLUDE; }
\?\?[ \t]*include { return COCO_INCLUDE; }
diff --git a/Source/cmDependsFortranParser.cxx b/Source/cmDependsFortranParser.cxx
index ea31d3a..7b49a9c 100644
--- a/Source/cmDependsFortranParser.cxx
+++ b/Source/cmDependsFortranParser.cxx
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -45,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -74,7 +73,7 @@
/* Copy the first part of user declarations. */
-/* Line 189 of yacc.c */
+/* Line 268 of yacc.c */
#line 1 "cmDependsFortranParser.y"
/*============================================================================
@@ -161,8 +160,8 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
#endif
-/* Line 189 of yacc.c */
-#line 172 "cmDependsFortranParser.cxx"
+/* Line 268 of yacc.c */
+#line 165 "cmDependsFortranParser.cxx"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -216,7 +215,8 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
CPP_TOENDL = 282,
UNTERMINATED_STRING = 283,
STRING = 284,
- WORD = 285
+ WORD = 285,
+ CPP_INCLUDE_ANGLE = 286
};
#endif
/* Tokens. */
@@ -248,6 +248,7 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
#define UNTERMINATED_STRING 283
#define STRING 284
#define WORD 285
+#define CPP_INCLUDE_ANGLE 286
@@ -256,15 +257,15 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
typedef union YYSTYPE
{
-/* Line 214 of yacc.c */
-#line 94 "cmDependsFortranParser.y"
+/* Line 293 of yacc.c */
+#line 89 "cmDependsFortranParser.y"
char* string;
-/* Line 214 of yacc.c */
-#line 274 "cmDependsFortranParser.cxx"
+/* Line 293 of yacc.c */
+#line 269 "cmDependsFortranParser.cxx"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -275,8 +276,8 @@ typedef union YYSTYPE
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 286 "cmDependsFortranParser.cxx"
+/* Line 343 of yacc.c */
+#line 281 "cmDependsFortranParser.cxx"
#ifdef short
# undef short
@@ -326,7 +327,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -379,11 +380,11 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -406,24 +407,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined malloc && ! defined EXIT_SUCCESS && (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__ \
+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
@@ -452,23 +453,7 @@ union yyalloc
((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__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -488,23 +473,43 @@ union yyalloc
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 271
+#define YYLAST 276
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 31
+#define YYNTOKENS 32
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 16
/* YYNRULES -- Number of rules. */
-#define YYNRULES 52
+#define YYNRULES 53
/* YYNRULES -- Number of states. */
-#define YYNSTATES 94
+#define YYNSTATES 97
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 285
+#define YYMAXUTOK 286
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -540,7 +545,7 @@ static const yytype_uint8 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, 30
+ 25, 26, 27, 28, 29, 30, 31
};
#if YYDEBUG
@@ -549,43 +554,43 @@ static const yytype_uint8 yytranslate[] =
static const yytype_uint8 yyprhs[] =
{
0, 0, 3, 4, 7, 9, 11, 16, 19, 24,
- 30, 38, 43, 48, 53, 58, 63, 68, 72, 76,
- 80, 84, 89, 93, 95, 97, 99, 101, 103, 105,
- 107, 109, 111, 113, 115, 117, 119, 121, 123, 125,
- 127, 129, 131, 133, 135, 136, 139, 141, 143, 145,
- 147, 149, 151
+ 30, 38, 43, 47, 52, 57, 62, 67, 72, 76,
+ 80, 84, 88, 93, 97, 99, 101, 103, 105, 107,
+ 109, 111, 113, 115, 117, 119, 121, 123, 125, 127,
+ 129, 131, 133, 135, 137, 139, 140, 143, 145, 147,
+ 149, 151, 153, 155
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 32, 0, -1, -1, 32, 33, -1, 35, -1, 34,
- -1, 30, 4, 45, 3, -1, 30, 3, -1, 30,
- 30, 45, 3, -1, 30, 26, 30, 45, 3, -1,
- 30, 25, 30, 26, 30, 45, 3, -1, 30, 29,
- 45, 3, -1, 36, 29, 45, 3, -1, 37, 30,
- 45, 3, -1, 38, 30, 45, 3, -1, 39, 30,
- 45, 3, -1, 40, 30, 45, 3, -1, 41, 45,
- 3, -1, 42, 45, 3, -1, 43, 45, 3, -1,
- 44, 45, 3, -1, 30, 5, 45, 3, -1, 5,
- 45, 3, -1, 3, -1, 1, -1, 6, -1, 7,
- -1, 8, -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, 45, 46, -1, 30,
- -1, 29, -1, 5, -1, 4, -1, 26, -1, 25,
- -1, 28, -1
+ 33, 0, -1, -1, 33, 34, -1, 36, -1, 35,
+ -1, 30, 4, 46, 3, -1, 30, 3, -1, 30,
+ 30, 46, 3, -1, 30, 26, 30, 46, 3, -1,
+ 30, 25, 30, 26, 30, 46, 3, -1, 30, 29,
+ 46, 3, -1, 31, 46, 3, -1, 37, 29, 46,
+ 3, -1, 38, 30, 46, 3, -1, 39, 30, 46,
+ 3, -1, 40, 30, 46, 3, -1, 41, 30, 46,
+ 3, -1, 42, 46, 3, -1, 43, 46, 3, -1,
+ 44, 46, 3, -1, 45, 46, 3, -1, 30, 5,
+ 46, 3, -1, 5, 46, 3, -1, 3, -1, 1,
+ -1, 6, -1, 7, -1, 8, -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,
+ 46, 47, -1, 30, -1, 29, -1, 5, -1, 4,
+ -1, 26, -1, 25, -1, 28, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 115, 115, 115, 117, 117, 119, 125, 135, 165,
- 176, 189, 200, 207, 213, 219, 225, 231, 236, 241,
- 246, 251, 255, 256, 257, 262, 262, 262, 263, 263,
- 264, 264, 265, 265, 266, 266, 267, 267, 268, 268,
- 269, 269, 270, 270, 271, 271, 274, 275, 276, 277,
- 278, 279, 280
+ 0, 111, 111, 111, 113, 113, 115, 121, 131, 161,
+ 172, 185, 196, 203, 210, 216, 222, 228, 234, 239,
+ 244, 249, 254, 258, 259, 260, 265, 265, 265, 266,
+ 266, 267, 267, 268, 268, 269, 269, 270, 270, 271,
+ 271, 272, 272, 273, 273, 274, 274, 277, 278, 279,
+ 280, 281, 282, 283
};
#endif
@@ -600,9 +605,9 @@ static const char *const yytname[] =
"CPP_IF", "CPP_ELSE", "CPP_ELIF", "CPP_ENDIF", "F90PPR_IFDEF",
"F90PPR_IFNDEF", "F90PPR_IF", "F90PPR_ELSE", "F90PPR_ELIF",
"F90PPR_ENDIF", "COMMA", "DCOLON", "CPP_TOENDL", "UNTERMINATED_STRING",
- "STRING", "WORD", "$accept", "code", "stmt", "assignment_stmt",
- "keyword_stmt", "include", "define", "undef", "ifdef", "ifndef", "if",
- "elif", "else", "endif", "other", "misc_code", 0
+ "STRING", "WORD", "CPP_INCLUDE_ANGLE", "$accept", "code", "stmt",
+ "assignment_stmt", "keyword_stmt", "include", "define", "undef", "ifdef",
+ "ifndef", "if", "elif", "else", "endif", "other", "misc_code", 0
};
#endif
@@ -614,163 +619,168 @@ 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,
- 285
+ 285, 286
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 31, 32, 32, 33, 33, 34, 35, 35, 35,
- 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
- 35, 35, 35, 35, 35, 36, 36, 36, 37, 37,
- 38, 38, 39, 39, 40, 40, 41, 41, 42, 42,
- 43, 43, 44, 44, 45, 45, 46, 46, 46, 46,
- 46, 46, 46
+ 0, 32, 33, 33, 34, 34, 35, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+ 36, 36, 36, 36, 36, 36, 37, 37, 37, 38,
+ 38, 39, 39, 40, 40, 41, 41, 42, 42, 43,
+ 43, 44, 44, 45, 45, 46, 46, 47, 47, 47,
+ 47, 47, 47, 47
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
0, 2, 0, 2, 1, 1, 4, 2, 4, 5,
- 7, 4, 4, 4, 4, 4, 4, 3, 3, 3,
- 3, 4, 3, 1, 1, 1, 1, 1, 1, 1,
+ 7, 4, 3, 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, 1, 1, 0, 2, 1, 1, 1, 1,
- 1, 1, 1
+ 1, 1, 1, 1, 1, 0, 2, 1, 1, 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
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 2, 0, 1, 24, 23, 44, 25, 26, 27, 29,
- 28, 31, 30, 32, 34, 36, 40, 38, 42, 33,
- 35, 37, 41, 39, 43, 0, 3, 5, 4, 0,
- 0, 0, 0, 0, 44, 44, 44, 44, 0, 7,
- 44, 44, 0, 0, 44, 44, 44, 44, 44, 44,
- 44, 0, 0, 0, 0, 22, 49, 48, 51, 50,
- 52, 47, 46, 45, 0, 0, 0, 44, 0, 0,
- 0, 0, 0, 0, 0, 17, 18, 19, 20, 6,
- 21, 0, 0, 11, 8, 12, 13, 14, 15, 16,
- 44, 9, 0, 10
+ 2, 0, 1, 25, 24, 45, 26, 27, 28, 30,
+ 29, 32, 31, 33, 35, 37, 41, 39, 43, 34,
+ 36, 38, 42, 40, 44, 0, 45, 3, 5, 4,
+ 0, 0, 0, 0, 0, 45, 45, 45, 45, 0,
+ 7, 45, 45, 0, 0, 45, 45, 0, 45, 45,
+ 45, 45, 45, 0, 0, 0, 0, 23, 50, 49,
+ 52, 51, 53, 48, 47, 46, 0, 0, 0, 45,
+ 0, 0, 12, 0, 0, 0, 0, 0, 18, 19,
+ 20, 21, 6, 22, 0, 0, 11, 8, 13, 14,
+ 15, 16, 17, 45, 9, 0, 10
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
- -1, 1, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 63
+ -1, 1, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 38, 39, 65
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -35
+#define YYPACT_NINF -29
static const yytype_int16 yypact[] =
{
- -35, 29, -35, -35, -35, -35, -35, -35, -35, -35,
- -35, -35, -35, -35, -35, -35, -35, -35, -35, -35,
- -35, -35, -35, -35, -35, 241, -35, -35, -35, -25,
- -22, -21, -13, -12, -35, -35, -35, -35, 57, -35,
- -35, -35, -11, -10, -35, -35, -35, -35, -35, -35,
- -35, 63, 69, 75, 103, -35, -35, -35, -35, -35,
- -35, -35, -35, -35, 109, 115, -5, -35, 121, 149,
- 155, 161, 167, 195, 201, -35, -35, -35, -35, -35,
- -35, -8, 207, -35, -35, -35, -35, -35, -35, -35,
- -35, -35, 213, -35
+ -29, 39, -29, -29, -29, -29, -29, -29, -29, -29,
+ -29, -29, -29, -29, -29, -29, -29, -29, -29, -29,
+ -29, -29, -29, -29, -29, 246, -29, -29, -29, -29,
+ -28, -27, -22, -17, -16, -29, -29, -29, -29, 2,
+ -29, -29, -29, -13, -12, -29, -29, 61, -29, -29,
+ -29, -29, -29, 68, 74, 80, 108, -29, -29, -29,
+ -29, -29, -29, -29, -29, -29, 114, 120, -24, -29,
+ 126, 154, -29, 160, 166, 172, 200, 206, -29, -29,
+ -29, -29, -29, -29, -9, 212, -29, -29, -29, -29,
+ -29, -29, -29, -29, -29, 218, -29
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -35, -35, -35, -35, -35, -35, -35, -35, -35, -35,
- -35, -35, -35, -35, -34, -35
+ -29, -29, -29, -29, -29, -29, -29, -29, -29, -29,
+ -29, -29, -29, -29, -26, -29
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
+ number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
- 51, 52, 53, 54, 46, 0, 64, 65, 47, 48,
- 68, 69, 70, 71, 72, 73, 74, 49, 50, 66,
- 67, 81, 90, 0, 0, 0, 0, 0, 0, 2,
- 3, 0, 4, 82, 5, 6, 7, 8, 9, 10,
+ 47, 48, 84, 49, 0, 57, 58, 59, 50, 53,
+ 54, 55, 56, 51, 52, 66, 67, 68, 69, 70,
+ 71, 93, 73, 74, 75, 76, 77, 60, 61, 0,
+ 62, 63, 64, 0, 0, 0, 0, 0, 0, 2,
+ 3, 0, 4, 85, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 0, 0, 92, 0, 0, 25,
- 55, 56, 57, 0, 0, 0, 75, 56, 57, 0,
- 0, 0, 76, 56, 57, 0, 0, 0, 77, 56,
- 57, 0, 58, 59, 0, 60, 61, 62, 58, 59,
- 0, 60, 61, 62, 58, 59, 0, 60, 61, 62,
- 58, 59, 0, 60, 61, 62, 78, 56, 57, 0,
- 0, 0, 79, 56, 57, 0, 0, 0, 80, 56,
- 57, 0, 0, 0, 83, 56, 57, 0, 58, 59,
- 0, 60, 61, 62, 58, 59, 0, 60, 61, 62,
- 58, 59, 0, 60, 61, 62, 58, 59, 0, 60,
- 61, 62, 84, 56, 57, 0, 0, 0, 85, 56,
- 57, 0, 0, 0, 86, 56, 57, 0, 0, 0,
- 87, 56, 57, 0, 58, 59, 0, 60, 61, 62,
- 58, 59, 0, 60, 61, 62, 58, 59, 0, 60,
- 61, 62, 58, 59, 0, 60, 61, 62, 88, 56,
- 57, 0, 0, 0, 89, 56, 57, 0, 0, 0,
- 91, 56, 57, 0, 0, 0, 93, 56, 57, 0,
- 58, 59, 0, 60, 61, 62, 58, 59, 0, 60,
- 61, 62, 58, 59, 0, 60, 61, 62, 58, 59,
- 0, 60, 61, 62, 39, 40, 41, 0, 0, 0,
+ 21, 22, 23, 24, 72, 58, 59, 95, 0, 25,
+ 26, 78, 58, 59, 0, 0, 0, 79, 58, 59,
+ 0, 0, 0, 80, 58, 59, 60, 61, 0, 62,
+ 63, 64, 0, 60, 61, 0, 62, 63, 64, 60,
+ 61, 0, 62, 63, 64, 60, 61, 0, 62, 63,
+ 64, 81, 58, 59, 0, 0, 0, 82, 58, 59,
+ 0, 0, 0, 83, 58, 59, 0, 0, 0, 86,
+ 58, 59, 0, 60, 61, 0, 62, 63, 64, 60,
+ 61, 0, 62, 63, 64, 60, 61, 0, 62, 63,
+ 64, 60, 61, 0, 62, 63, 64, 87, 58, 59,
+ 0, 0, 0, 88, 58, 59, 0, 0, 0, 89,
+ 58, 59, 0, 0, 0, 90, 58, 59, 0, 60,
+ 61, 0, 62, 63, 64, 60, 61, 0, 62, 63,
+ 64, 60, 61, 0, 62, 63, 64, 60, 61, 0,
+ 62, 63, 64, 91, 58, 59, 0, 0, 0, 92,
+ 58, 59, 0, 0, 0, 94, 58, 59, 0, 0,
+ 0, 96, 58, 59, 0, 60, 61, 0, 62, 63,
+ 64, 60, 61, 0, 62, 63, 64, 60, 61, 0,
+ 62, 63, 64, 60, 61, 0, 62, 63, 64, 40,
+ 41, 42, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 42, 43, 0, 0,
- 44, 45
+ 0, 43, 44, 0, 0, 45, 46
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-29))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_int8 yycheck[] =
{
- 34, 35, 36, 37, 29, -1, 40, 41, 30, 30,
- 44, 45, 46, 47, 48, 49, 50, 30, 30, 30,
- 30, 26, 30, -1, -1, -1, -1, -1, -1, 0,
- 1, -1, 3, 67, 5, 6, 7, 8, 9, 10,
+ 26, 29, 26, 30, -1, 3, 4, 5, 30, 35,
+ 36, 37, 38, 30, 30, 41, 42, 30, 30, 45,
+ 46, 30, 48, 49, 50, 51, 52, 25, 26, -1,
+ 28, 29, 30, -1, -1, -1, -1, -1, -1, 0,
+ 1, -1, 3, 69, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, -1, -1, 90, -1, -1, 30,
- 3, 4, 5, -1, -1, -1, 3, 4, 5, -1,
- -1, -1, 3, 4, 5, -1, -1, -1, 3, 4,
- 5, -1, 25, 26, -1, 28, 29, 30, 25, 26,
- -1, 28, 29, 30, 25, 26, -1, 28, 29, 30,
- 25, 26, -1, 28, 29, 30, 3, 4, 5, -1,
- -1, -1, 3, 4, 5, -1, -1, -1, 3, 4,
- 5, -1, -1, -1, 3, 4, 5, -1, 25, 26,
- -1, 28, 29, 30, 25, 26, -1, 28, 29, 30,
- 25, 26, -1, 28, 29, 30, 25, 26, -1, 28,
- 29, 30, 3, 4, 5, -1, -1, -1, 3, 4,
- 5, -1, -1, -1, 3, 4, 5, -1, -1, -1,
- 3, 4, 5, -1, 25, 26, -1, 28, 29, 30,
- 25, 26, -1, 28, 29, 30, 25, 26, -1, 28,
- 29, 30, 25, 26, -1, 28, 29, 30, 3, 4,
- 5, -1, -1, -1, 3, 4, 5, -1, -1, -1,
- 3, 4, 5, -1, -1, -1, 3, 4, 5, -1,
- 25, 26, -1, 28, 29, 30, 25, 26, -1, 28,
- 29, 30, 25, 26, -1, 28, 29, 30, 25, 26,
- -1, 28, 29, 30, 3, 4, 5, -1, -1, -1,
+ 21, 22, 23, 24, 3, 4, 5, 93, -1, 30,
+ 31, 3, 4, 5, -1, -1, -1, 3, 4, 5,
+ -1, -1, -1, 3, 4, 5, 25, 26, -1, 28,
+ 29, 30, -1, 25, 26, -1, 28, 29, 30, 25,
+ 26, -1, 28, 29, 30, 25, 26, -1, 28, 29,
+ 30, 3, 4, 5, -1, -1, -1, 3, 4, 5,
+ -1, -1, -1, 3, 4, 5, -1, -1, -1, 3,
+ 4, 5, -1, 25, 26, -1, 28, 29, 30, 25,
+ 26, -1, 28, 29, 30, 25, 26, -1, 28, 29,
+ 30, 25, 26, -1, 28, 29, 30, 3, 4, 5,
+ -1, -1, -1, 3, 4, 5, -1, -1, -1, 3,
+ 4, 5, -1, -1, -1, 3, 4, 5, -1, 25,
+ 26, -1, 28, 29, 30, 25, 26, -1, 28, 29,
+ 30, 25, 26, -1, 28, 29, 30, 25, 26, -1,
+ 28, 29, 30, 3, 4, 5, -1, -1, -1, 3,
+ 4, 5, -1, -1, -1, 3, 4, 5, -1, -1,
+ -1, 3, 4, 5, -1, 25, 26, -1, 28, 29,
+ 30, 25, 26, -1, 28, 29, 30, 25, 26, -1,
+ 28, 29, 30, 25, 26, -1, 28, 29, 30, 3,
+ 4, 5, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 25, 26, -1, -1,
- 29, 30
+ -1, 25, 26, -1, -1, 29, 30
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 32, 0, 1, 3, 5, 6, 7, 8, 9,
+ 0, 33, 0, 1, 3, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 30, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 3,
- 4, 5, 25, 26, 29, 30, 29, 30, 30, 30,
- 30, 45, 45, 45, 45, 3, 4, 5, 25, 26,
- 28, 29, 30, 46, 45, 45, 30, 30, 45, 45,
- 45, 45, 45, 45, 45, 3, 3, 3, 3, 3,
- 3, 26, 45, 3, 3, 3, 3, 3, 3, 3,
- 30, 3, 45, 3
+ 20, 21, 22, 23, 24, 30, 31, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 3, 4, 5, 25, 26, 29, 30, 46, 29, 30,
+ 30, 30, 30, 46, 46, 46, 46, 3, 4, 5,
+ 25, 26, 28, 29, 30, 47, 46, 46, 30, 30,
+ 46, 46, 3, 46, 46, 46, 46, 46, 3, 3,
+ 3, 3, 3, 3, 26, 46, 3, 3, 3, 3,
+ 3, 3, 3, 30, 3, 46, 3
};
#define yyerrok (yyerrstatus = 0)
@@ -785,9 +795,18 @@ static const yytype_uint8 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -797,7 +816,6 @@ do \
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
@@ -839,19 +857,10 @@ 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. */
+/* This macro is provided for backward compatibility. */
#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
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
@@ -1043,7 +1052,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -1146,115 +1154,142 @@ yytnamerr (char *yyres, const char *yystr)
}
# 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];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ for details. YYERROR is fine as it does not invoke this
+ function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
{
- 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)
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ 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 yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
{
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
}
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ }
+ }
+
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
+ }
- 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 = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
{
- /* 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++;
- }
- }
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
}
- return yysize;
- }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
@@ -1287,6 +1322,7 @@ yydestruct (yymsg, yytype, yyvaluep)
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
@@ -1303,12 +1339,9 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1495,7 +1528,7 @@ yybackup:
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -1526,7 +1559,7 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
+ if (yytable_value_is_error (yyn))
goto yyerrlab;
yyn = -yyn;
goto yyreduce;
@@ -1582,8 +1615,8 @@ yyreduce:
{
case 6:
-/* Line 1455 of yacc.c */
-#line 120 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 116 "cmDependsFortranParser.y"
{
free((yyvsp[(1) - (4)].string));
}
@@ -1591,8 +1624,8 @@ yyreduce:
case 7:
-/* Line 1455 of yacc.c */
-#line 126 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 122 "cmDependsFortranParser.y"
{
if (cmDependsFortranParserIsKeyword((yyvsp[(1) - (2)].string), "interface"))
{
@@ -1606,8 +1639,8 @@ yyreduce:
case 8:
-/* Line 1455 of yacc.c */
-#line 136 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 132 "cmDependsFortranParser.y"
{
if (cmDependsFortranParserIsKeyword((yyvsp[(1) - (4)].string), "use"))
{
@@ -1641,8 +1674,8 @@ yyreduce:
case 9:
-/* Line 1455 of yacc.c */
-#line 166 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 162 "cmDependsFortranParser.y"
{
if (cmDependsFortranParserIsKeyword((yyvsp[(1) - (5)].string), "use"))
{
@@ -1657,8 +1690,8 @@ yyreduce:
case 10:
-/* Line 1455 of yacc.c */
-#line 177 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 173 "cmDependsFortranParser.y"
{
if (cmDependsFortranParserIsKeyword((yyvsp[(1) - (7)].string), "use") &&
cmDependsFortranParserIsKeyword((yyvsp[(3) - (7)].string), "non_intrinsic") )
@@ -1675,8 +1708,8 @@ yyreduce:
case 11:
-/* Line 1455 of yacc.c */
-#line 190 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 186 "cmDependsFortranParser.y"
{
if (cmDependsFortranParserIsKeyword((yyvsp[(1) - (4)].string), "include"))
{
@@ -1691,8 +1724,20 @@ yyreduce:
case 12:
-/* Line 1455 of yacc.c */
-#line 201 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 197 "cmDependsFortranParser.y"
+ {
+ cmDependsFortranParser* parser =
+ cmDependsFortran_yyget_extra(yyscanner);
+ cmDependsFortranParser_RuleInclude(parser, (yyvsp[(1) - (3)].string));
+ free((yyvsp[(1) - (3)].string));
+ }
+ break;
+
+ case 13:
+
+/* Line 1806 of yacc.c */
+#line 204 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser =
cmDependsFortran_yyget_extra(yyscanner);
@@ -1701,10 +1746,10 @@ yyreduce:
}
break;
- case 13:
+ case 14:
-/* Line 1455 of yacc.c */
-#line 208 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 211 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleDefine(parser, (yyvsp[(2) - (4)].string));
@@ -1712,10 +1757,10 @@ yyreduce:
}
break;
- case 14:
+ case 15:
-/* Line 1455 of yacc.c */
-#line 214 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 217 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleUndef(parser, (yyvsp[(2) - (4)].string));
@@ -1723,10 +1768,10 @@ yyreduce:
}
break;
- case 15:
+ case 16:
-/* Line 1455 of yacc.c */
-#line 220 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 223 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleIfdef(parser, (yyvsp[(2) - (4)].string));
@@ -1734,10 +1779,10 @@ yyreduce:
}
break;
- case 16:
+ case 17:
-/* Line 1455 of yacc.c */
-#line 226 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 229 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleIfndef(parser, (yyvsp[(2) - (4)].string));
@@ -1745,75 +1790,86 @@ yyreduce:
}
break;
- case 17:
+ case 18:
-/* Line 1455 of yacc.c */
-#line 232 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 235 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleIf(parser);
}
break;
- case 18:
+ case 19:
-/* Line 1455 of yacc.c */
-#line 237 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 240 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleElif(parser);
}
break;
- case 19:
+ case 20:
-/* Line 1455 of yacc.c */
-#line 242 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 245 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleElse(parser);
}
break;
- case 20:
+ case 21:
-/* Line 1455 of yacc.c */
-#line 247 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 250 "cmDependsFortranParser.y"
{
cmDependsFortranParser* parser = cmDependsFortran_yyget_extra(yyscanner);
cmDependsFortranParser_RuleEndif(parser);
}
break;
- case 21:
+ case 22:
-/* Line 1455 of yacc.c */
-#line 252 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 255 "cmDependsFortranParser.y"
{
free((yyvsp[(1) - (4)].string));
}
break;
- case 46:
+ case 47:
-/* Line 1455 of yacc.c */
-#line 274 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 277 "cmDependsFortranParser.y"
{ free ((yyvsp[(1) - (1)].string)); }
break;
- case 47:
+ case 48:
-/* Line 1455 of yacc.c */
-#line 275 "cmDependsFortranParser.y"
+/* Line 1806 of yacc.c */
+#line 278 "cmDependsFortranParser.y"
{ free ((yyvsp[(1) - (1)].string)); }
break;
-/* Line 1455 of yacc.c */
-#line 1821 "cmDependsFortranParser.cxx"
+/* Line 1806 of yacc.c */
+#line 1860 "cmDependsFortranParser.cxx"
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -1841,6 +1897,10 @@ yyreduce:
| yyerrlab -- here on detecting error |
`------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
@@ -1848,37 +1908,36 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
{
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (!yymsg)
{
yymsg = yymsgbuf;
yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
}
}
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ yyerror (yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
@@ -1939,7 +1998,7 @@ yyerrlab1:
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
+ if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -1998,8 +2057,13 @@ yyexhaustedlab:
yyreturn:
if (yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval);
+ }
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
@@ -2024,7 +2088,7 @@ yyreturn:
-/* Line 1675 of yacc.c */
-#line 283 "cmDependsFortranParser.y"
+/* Line 2067 of yacc.c */
+#line 286 "cmDependsFortranParser.y"
/* End of grammar */
diff --git a/Source/cmDependsFortranParser.y b/Source/cmDependsFortranParser.y
index 00d3327..5681d69 100644
--- a/Source/cmDependsFortranParser.y
+++ b/Source/cmDependsFortranParser.y
@@ -102,6 +102,7 @@ static bool cmDependsFortranParserIsKeyword(const char* word,
%token <string> CPP_TOENDL
%token <number> UNTERMINATED_STRING
%token <string> STRING WORD
+%token <string> CPP_INCLUDE_ANGLE
/*-------------------------------------------------------------------------*/
/* grammar */
@@ -192,6 +193,13 @@ keyword_stmt:
free($1);
free($2);
}
+| CPP_INCLUDE_ANGLE other EOSTMT
+ {
+ cmDependsFortranParser* parser =
+ cmDependsFortran_yyget_extra(yyscanner);
+ cmDependsFortranParser_RuleInclude(parser, $1);
+ free($1);
+ }
| include STRING other EOSTMT
{
cmDependsFortranParser* parser =
diff --git a/Source/cmDependsFortranParserTokens.h b/Source/cmDependsFortranParserTokens.h
index 0bbcaae..941eda0 100644
--- a/Source/cmDependsFortranParserTokens.h
+++ b/Source/cmDependsFortranParserTokens.h
@@ -1,9 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 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
@@ -31,6 +30,7 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -64,7 +64,8 @@
CPP_TOENDL = 282,
UNTERMINATED_STRING = 283,
STRING = 284,
- WORD = 285
+ WORD = 285,
+ CPP_INCLUDE_ANGLE = 286
};
#endif
/* Tokens. */
@@ -96,6 +97,7 @@
#define UNTERMINATED_STRING 283
#define STRING 284
#define WORD 285
+#define CPP_INCLUDE_ANGLE 286
@@ -104,12 +106,14 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
-#line 94 "cmDependsFortranParser.y"
+/* Line 2068 of yacc.c */
+#line 89 "cmDependsFortranParser.y"
char* string;
-/* Line 1676 of yacc.c */
+
+
+/* Line 2068 of yacc.c */
#line 118 "cmDependsFortranParserTokens.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmDependsFortranLexer.cxx | 552 ++++++++++++-----------
Source/cmDependsFortranLexer.h | 25 +-
Source/cmDependsFortranLexer.in.l | 5 +
Source/cmDependsFortranParser.cxx | 810 ++++++++++++++++++---------------
Source/cmDependsFortranParser.y | 8 +
Source/cmDependsFortranParserTokens.h | 20 +-
7 files changed, 768 insertions(+), 654 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list