[Cmake-commits] CMake branch, next, updated. v3.7.1-1675-g09752e9
Daniel Pfeifer
daniel at pfeifer-mail.de
Sat Dec 10 05:43:15 EST 2016
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 09752e9d1a58132bf439eb5e82df125ad8d60c0e (commit)
via 471e3ff8ee3854dc6f2b507cb09f9dc7f088284e (commit)
from 6573bc3cfb0a24e091c9fc544a43d51064bb78b1 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09752e9d1a58132bf439eb5e82df125ad8d60c0e
commit 09752e9d1a58132bf439eb5e82df125ad8d60c0e
Merge: 6573bc3 471e3ff
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Dec 10 05:43:12 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Dec 10 05:43:12 2016 -0500
Merge topic 'rebuild-lexers' into next
471e3ff8 fixup! Regenerate lexer source code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=471e3ff8ee3854dc6f2b507cb09f9dc7f088284e
commit 471e3ff8ee3854dc6f2b507cb09f9dc7f088284e
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Dec 10 10:54:26 2016 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Sat Dec 10 11:39:26 2016 +0100
fixup! Regenerate lexer source code
diff --git a/Source/cmCommandArgumentLexer.cxx b/Source/cmCommandArgumentLexer.cxx
index 22ddb90..12dce37 100644
--- a/Source/cmCommandArgumentLexer.cxx
+++ b/Source/cmCommandArgumentLexer.cxx
@@ -462,9 +462,12 @@ Modify cmCommandArgumentLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in cmCommandArgument_yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#include "cmCommandArgumentParserHelper.h"
/* Replace the lexer input function. */
@@ -478,7 +481,7 @@ Modify cmCommandArgumentLexer.cxx:
/*--------------------------------------------------------------------------*/
-#line 481 "cmCommandArgumentLexer.cxx"
+#line 484 "cmCommandArgumentLexer.cxx"
#define INITIAL 0
#define ESCAPES 1
@@ -731,10 +734,10 @@ YY_DECL
}
{
-#line 39 "cmCommandArgumentLexer.in.l"
+#line 42 "cmCommandArgumentLexer.in.l"
-#line 737 "cmCommandArgumentLexer.cxx"
+#line 740 "cmCommandArgumentLexer.cxx"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -793,7 +796,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 41 "cmCommandArgumentLexer.in.l"
+#line 44 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -802,7 +805,7 @@ YY_RULE_SETUP
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 47 "cmCommandArgumentLexer.in.l"
+#line 50 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -811,7 +814,7 @@ YY_RULE_SETUP
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 53 "cmCommandArgumentLexer.in.l"
+#line 56 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext+1, strlen(yytext)-2);
@@ -820,7 +823,7 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 59 "cmCommandArgumentLexer.in.l"
+#line 62 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -830,7 +833,7 @@ YY_RULE_SETUP
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 66 "cmCommandArgumentLexer.in.l"
+#line 69 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -840,7 +843,7 @@ YY_RULE_SETUP
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 73 "cmCommandArgumentLexer.in.l"
+#line 76 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -850,7 +853,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 80 "cmCommandArgumentLexer.in.l"
+#line 83 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -859,7 +862,7 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 86 "cmCommandArgumentLexer.in.l"
+#line 89 "cmCommandArgumentLexer.in.l"
{
if ( !yyextra->HandleEscapeSymbol(yylvalp, *(yytext+1)) )
{
@@ -871,7 +874,7 @@ YY_RULE_SETUP
case 9:
/* rule 9 can match eol */
YY_RULE_SETUP
-#line 94 "cmCommandArgumentLexer.in.l"
+#line 97 "cmCommandArgumentLexer.in.l"
{
//std::cerr << __LINE__ << " here: [" << yytext << "]" << std::endl;
yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
@@ -880,7 +883,7 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 100 "cmCommandArgumentLexer.in.l"
+#line 103 "cmCommandArgumentLexer.in.l"
{
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
yylvalp->str = yyextra->DOLLARVariable;
@@ -889,7 +892,7 @@ YY_RULE_SETUP
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 106 "cmCommandArgumentLexer.in.l"
+#line 109 "cmCommandArgumentLexer.in.l"
{
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
yylvalp->str = yyextra->LCURLYVariable;
@@ -898,7 +901,7 @@ YY_RULE_SETUP
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 112 "cmCommandArgumentLexer.in.l"
+#line 115 "cmCommandArgumentLexer.in.l"
{
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
yylvalp->str = yyextra->BSLASHVariable;
@@ -907,7 +910,7 @@ YY_RULE_SETUP
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 118 "cmCommandArgumentLexer.in.l"
+#line 121 "cmCommandArgumentLexer.in.l"
{
//yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
yylvalp->str = yyextra->BSLASHVariable;
@@ -916,10 +919,10 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 124 "cmCommandArgumentLexer.in.l"
+#line 127 "cmCommandArgumentLexer.in.l"
ECHO;
YY_BREAK
-#line 922 "cmCommandArgumentLexer.cxx"
+#line 925 "cmCommandArgumentLexer.cxx"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(ESCAPES):
case YY_STATE_EOF(NOESCAPES):
@@ -1675,7 +1678,7 @@ YY_BUFFER_STATE cmCommandArgument_yy_scan_bytes (yyconst char * yybytes, int _
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in cmCommandArgument_yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < (size_t)_yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@@ -2052,7 +2055,7 @@ void cmCommandArgument_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 124 "cmCommandArgumentLexer.in.l"
+#line 127 "cmCommandArgumentLexer.in.l"
diff --git a/Source/cmCommandArgumentLexer.h b/Source/cmCommandArgumentLexer.h
index 1dc0671..82e87b5 100644
--- a/Source/cmCommandArgumentLexer.h
+++ b/Source/cmCommandArgumentLexer.h
@@ -328,7 +328,7 @@ extern int cmCommandArgument_yylex (yyscan_t yyscanner);
#undef YY_DECL
#endif
-#line 124 "cmCommandArgumentLexer.in.l"
+#line 127 "cmCommandArgumentLexer.in.l"
#line 335 "cmCommandArgumentLexer.h"
diff --git a/Source/cmCommandArgumentLexer.in.l b/Source/cmCommandArgumentLexer.in.l
index 0dc7e89..e3a8094 100644
--- a/Source/cmCommandArgumentLexer.in.l
+++ b/Source/cmCommandArgumentLexer.in.l
@@ -13,9 +13,12 @@ Modify cmCommandArgumentLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmCommandArgumentLexer.h cmCommandArgumentLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#include "cmCommandArgumentParserHelper.h"
/* Replace the lexer input function. */
diff --git a/Source/cmDependsJavaLexer.cxx b/Source/cmDependsJavaLexer.cxx
index 6c01a55..8159f47 100644
--- a/Source/cmDependsJavaLexer.cxx
+++ b/Source/cmDependsJavaLexer.cxx
@@ -658,13 +658,16 @@ Modify cmDependsJavaLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmDependsJavaLexer.h cmDependsJavaLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in cmDependsJava_yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
-#include "cmDependsJavaParserHelper.h"
+/* IWYU pragma: no_forward_declare yyguts_t */
#include <iostream>
+#include "cmDependsJavaParserHelper.h"
+
/* Replace the lexer input function. */
#undef YY_INPUT
#define YY_INPUT(buf, result, max_size) \
@@ -680,7 +683,7 @@ Modify cmDependsJavaLexer.cxx:
/*--------------------------------------------------------------------------*/
-#line 683 "cmDependsJavaLexer.cxx"
+#line 686 "cmDependsJavaLexer.cxx"
#define INITIAL 0
#define comment 1
@@ -935,9 +938,9 @@ YY_DECL
}
{
-#line 45 "cmDependsJavaLexer.in.l"
+#line 48 "cmDependsJavaLexer.in.l"
-#line 940 "cmDependsJavaLexer.cxx"
+#line 943 "cmDependsJavaLexer.cxx"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -996,539 +999,539 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 46 "cmDependsJavaLexer.in.l"
+#line 49 "cmDependsJavaLexer.in.l"
{ BEGIN(comment); }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 47 "cmDependsJavaLexer.in.l"
+#line 50 "cmDependsJavaLexer.in.l"
{ BEGIN(INITIAL); }
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 48 "cmDependsJavaLexer.in.l"
+#line 51 "cmDependsJavaLexer.in.l"
{}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 50 "cmDependsJavaLexer.in.l"
+#line 53 "cmDependsJavaLexer.in.l"
{ BEGIN(string); }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 51 "cmDependsJavaLexer.in.l"
+#line 54 "cmDependsJavaLexer.in.l"
{ BEGIN(INITIAL); return jp_STRINGLITERAL; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 52 "cmDependsJavaLexer.in.l"
+#line 55 "cmDependsJavaLexer.in.l"
{}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 54 "cmDependsJavaLexer.in.l"
+#line 57 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_ABSTRACT; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 55 "cmDependsJavaLexer.in.l"
+#line 58 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_ASSERT; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 56 "cmDependsJavaLexer.in.l"
+#line 59 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_BOOLEAN_TYPE; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 57 "cmDependsJavaLexer.in.l"
+#line 60 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_BREAK; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 58 "cmDependsJavaLexer.in.l"
+#line 61 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_BYTE_TYPE; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 59 "cmDependsJavaLexer.in.l"
+#line 62 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_CASE; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 60 "cmDependsJavaLexer.in.l"
+#line 63 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_CATCH; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 61 "cmDependsJavaLexer.in.l"
+#line 64 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_CHAR_TYPE; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 62 "cmDependsJavaLexer.in.l"
+#line 65 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_CLASS; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 63 "cmDependsJavaLexer.in.l"
+#line 66 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_CONTINUE; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 64 "cmDependsJavaLexer.in.l"
+#line 67 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_DEFAULT; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 65 "cmDependsJavaLexer.in.l"
+#line 68 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_DO; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 66 "cmDependsJavaLexer.in.l"
+#line 69 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_DOUBLE_TYPE; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 67 "cmDependsJavaLexer.in.l"
+#line 70 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_ELSE; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 68 "cmDependsJavaLexer.in.l"
+#line 71 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_EXTENDS; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 69 "cmDependsJavaLexer.in.l"
+#line 72 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_FINAL; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 70 "cmDependsJavaLexer.in.l"
+#line 73 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_FINALLY; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 71 "cmDependsJavaLexer.in.l"
+#line 74 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_FLOAT_TYPE; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 72 "cmDependsJavaLexer.in.l"
+#line 75 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_FOR; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 73 "cmDependsJavaLexer.in.l"
+#line 76 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_IF; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 74 "cmDependsJavaLexer.in.l"
+#line 77 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_IMPLEMENTS; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 75 "cmDependsJavaLexer.in.l"
+#line 78 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_IMPORT; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 76 "cmDependsJavaLexer.in.l"
+#line 79 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_INSTANCEOF; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 77 "cmDependsJavaLexer.in.l"
+#line 80 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_INT_TYPE; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 78 "cmDependsJavaLexer.in.l"
+#line 81 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_INTERFACE; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 79 "cmDependsJavaLexer.in.l"
+#line 82 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_LONG_TYPE; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 80 "cmDependsJavaLexer.in.l"
+#line 83 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_NATIVE; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 81 "cmDependsJavaLexer.in.l"
+#line 84 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_NEW; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 82 "cmDependsJavaLexer.in.l"
+#line 85 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_PACKAGE; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 83 "cmDependsJavaLexer.in.l"
+#line 86 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_PRIVATE; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 84 "cmDependsJavaLexer.in.l"
+#line 87 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_PROTECTED; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 85 "cmDependsJavaLexer.in.l"
+#line 88 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_PUBLIC; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 86 "cmDependsJavaLexer.in.l"
+#line 89 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_RETURN; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 87 "cmDependsJavaLexer.in.l"
+#line 90 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_SHORT_TYPE; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 88 "cmDependsJavaLexer.in.l"
+#line 91 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_STATIC; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 89 "cmDependsJavaLexer.in.l"
+#line 92 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_STRICTFP; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 90 "cmDependsJavaLexer.in.l"
+#line 93 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_SUPER; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 91 "cmDependsJavaLexer.in.l"
+#line 94 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_SWITCH; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 92 "cmDependsJavaLexer.in.l"
+#line 95 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_SYNCHRONIZED; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 93 "cmDependsJavaLexer.in.l"
+#line 96 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_THIS; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 94 "cmDependsJavaLexer.in.l"
+#line 97 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_THROW; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 95 "cmDependsJavaLexer.in.l"
+#line 98 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_THROWS; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 96 "cmDependsJavaLexer.in.l"
+#line 99 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_TRANSIENT; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 97 "cmDependsJavaLexer.in.l"
+#line 100 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_TRY; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 98 "cmDependsJavaLexer.in.l"
+#line 101 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_VOID; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 99 "cmDependsJavaLexer.in.l"
+#line 102 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_VOLATILE; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 100 "cmDependsJavaLexer.in.l"
+#line 103 "cmDependsJavaLexer.in.l"
{ KEYWORD; return jp_WHILE; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 102 "cmDependsJavaLexer.in.l"
+#line 105 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_BOOLEANLITERAL; }
YY_BREAK
case 55:
/* rule 55 can match eol */
YY_RULE_SETUP
-#line 103 "cmDependsJavaLexer.in.l"
+#line 106 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_CHARACTERLITERAL; }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 104 "cmDependsJavaLexer.in.l"
+#line 107 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_DECIMALINTEGERLITERAL; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 105 "cmDependsJavaLexer.in.l"
+#line 108 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_FLOATINGPOINTLITERAL; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 106 "cmDependsJavaLexer.in.l"
+#line 109 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_HEXINTEGERLITERAL; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 107 "cmDependsJavaLexer.in.l"
+#line 110 "cmDependsJavaLexer.in.l"
{ PRIMITIVE; return jp_NULLLITERAL; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 109 "cmDependsJavaLexer.in.l"
+#line 112 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_AND; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 110 "cmDependsJavaLexer.in.l"
+#line 113 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_ANDAND; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 111 "cmDependsJavaLexer.in.l"
+#line 114 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_ANDEQUALS; }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 112 "cmDependsJavaLexer.in.l"
+#line 115 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_BRACKETEND; }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 113 "cmDependsJavaLexer.in.l"
+#line 116 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_BRACKETSTART; }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 114 "cmDependsJavaLexer.in.l"
+#line 117 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_CARROT; }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 115 "cmDependsJavaLexer.in.l"
+#line 118 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_CARROTEQUALS; }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 116 "cmDependsJavaLexer.in.l"
+#line 119 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_COLON; }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 117 "cmDependsJavaLexer.in.l"
+#line 120 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_COMMA; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 118 "cmDependsJavaLexer.in.l"
+#line 121 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_CURLYEND; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 119 "cmDependsJavaLexer.in.l"
+#line 122 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_CURLYSTART; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 120 "cmDependsJavaLexer.in.l"
+#line 123 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_DIVIDE; }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 121 "cmDependsJavaLexer.in.l"
+#line 124 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_DIVIDEEQUALS; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 122 "cmDependsJavaLexer.in.l"
+#line 125 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_DOLLAR; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 123 "cmDependsJavaLexer.in.l"
+#line 126 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_DOT; }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 124 "cmDependsJavaLexer.in.l"
+#line 127 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_EQUALS; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 125 "cmDependsJavaLexer.in.l"
+#line 128 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_EQUALSEQUALS; }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 126 "cmDependsJavaLexer.in.l"
+#line 129 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_EXCLAMATION; }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 127 "cmDependsJavaLexer.in.l"
+#line 130 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_EXCLAMATIONEQUALS; }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 128 "cmDependsJavaLexer.in.l"
+#line 131 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GREATER; }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 129 "cmDependsJavaLexer.in.l"
+#line 132 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GTEQUALS; }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 130 "cmDependsJavaLexer.in.l"
+#line 133 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GTGT; }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 131 "cmDependsJavaLexer.in.l"
+#line 134 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GTGTEQUALS; }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 132 "cmDependsJavaLexer.in.l"
+#line 135 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GTGTGT; }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 133 "cmDependsJavaLexer.in.l"
+#line 136 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_GTGTGTEQUALS; }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 134 "cmDependsJavaLexer.in.l"
+#line 137 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_LESLESEQUALS; }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 135 "cmDependsJavaLexer.in.l"
+#line 138 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_LESSTHAN; }
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 136 "cmDependsJavaLexer.in.l"
+#line 139 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_LTEQUALS; }
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 137 "cmDependsJavaLexer.in.l"
+#line 140 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_LTLT; }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 138 "cmDependsJavaLexer.in.l"
+#line 141 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_MINUS; }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 139 "cmDependsJavaLexer.in.l"
+#line 142 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_MINUSEQUALS; }
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 140 "cmDependsJavaLexer.in.l"
+#line 143 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_MINUSMINUS; }
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 141 "cmDependsJavaLexer.in.l"
+#line 144 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PAREEND; }
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 142 "cmDependsJavaLexer.in.l"
+#line 145 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PARESTART; }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 143 "cmDependsJavaLexer.in.l"
+#line 146 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PERCENT; }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 144 "cmDependsJavaLexer.in.l"
+#line 147 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PERCENTEQUALS; }
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 145 "cmDependsJavaLexer.in.l"
+#line 148 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PIPE; }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 146 "cmDependsJavaLexer.in.l"
+#line 149 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PIPEEQUALS; }
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 147 "cmDependsJavaLexer.in.l"
+#line 150 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PIPEPIPE; }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 148 "cmDependsJavaLexer.in.l"
+#line 151 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PLUS; }
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 149 "cmDependsJavaLexer.in.l"
+#line 152 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PLUSEQUALS; }
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 150 "cmDependsJavaLexer.in.l"
+#line 153 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_PLUSPLUS; }
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 151 "cmDependsJavaLexer.in.l"
+#line 154 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_QUESTION; }
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 152 "cmDependsJavaLexer.in.l"
+#line 155 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_SEMICOL; }
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 153 "cmDependsJavaLexer.in.l"
+#line 156 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_TILDE; }
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 154 "cmDependsJavaLexer.in.l"
+#line 157 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_TIMES; }
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 155 "cmDependsJavaLexer.in.l"
+#line 158 "cmDependsJavaLexer.in.l"
{ SYMBOL; return jp_TIMESEQUALS; }
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 157 "cmDependsJavaLexer.in.l"
+#line 160 "cmDependsJavaLexer.in.l"
{
yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext));
return jp_NAME;
@@ -1537,18 +1540,18 @@ YY_RULE_SETUP
case 108:
/* rule 108 can match eol */
YY_RULE_SETUP
-#line 162 "cmDependsJavaLexer.in.l"
+#line 165 "cmDependsJavaLexer.in.l"
{ }
YY_BREAK
case 109:
/* rule 109 can match eol */
YY_RULE_SETUP
-#line 163 "cmDependsJavaLexer.in.l"
+#line 166 "cmDependsJavaLexer.in.l"
{ }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 164 "cmDependsJavaLexer.in.l"
+#line 167 "cmDependsJavaLexer.in.l"
{
std::cerr << "Unknown character: " << yytext[0]
<< " (" << (int)yytext[0] << ")" << std::endl;
@@ -1558,10 +1561,10 @@ YY_RULE_SETUP
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 171 "cmDependsJavaLexer.in.l"
+#line 174 "cmDependsJavaLexer.in.l"
ECHO;
YY_BREAK
-#line 1564 "cmDependsJavaLexer.cxx"
+#line 1567 "cmDependsJavaLexer.cxx"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(comment):
case YY_STATE_EOF(string):
@@ -2355,7 +2358,7 @@ YY_BUFFER_STATE cmDependsJava_yy_scan_bytes (yyconst char * yybytes, int _yyby
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in cmDependsJava_yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < (size_t)_yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@@ -2732,4 +2735,4 @@ void cmDependsJava_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 171 "cmDependsJavaLexer.in.l"
+#line 174 "cmDependsJavaLexer.in.l"
diff --git a/Source/cmDependsJavaLexer.h b/Source/cmDependsJavaLexer.h
index f287aa1..ccadd70 100644
--- a/Source/cmDependsJavaLexer.h
+++ b/Source/cmDependsJavaLexer.h
@@ -328,7 +328,7 @@ extern int cmDependsJava_yylex (yyscan_t yyscanner);
#undef YY_DECL
#endif
-#line 171 "cmDependsJavaLexer.in.l"
+#line 174 "cmDependsJavaLexer.in.l"
#line 335 "cmDependsJavaLexer.h"
diff --git a/Source/cmDependsJavaLexer.in.l b/Source/cmDependsJavaLexer.in.l
index aa63c3f..8cb42b1 100644
--- a/Source/cmDependsJavaLexer.in.l
+++ b/Source/cmDependsJavaLexer.in.l
@@ -13,13 +13,16 @@ Modify cmDependsJavaLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmDependsJavaLexer.h cmDependsJavaLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
-#include "cmDependsJavaParserHelper.h"
+/* IWYU pragma: no_forward_declare yyguts_t */
#include <iostream>
+#include "cmDependsJavaParserHelper.h"
+
/* Replace the lexer input function. */
#undef YY_INPUT
#define YY_INPUT(buf, result, max_size) \
diff --git a/Source/cmExprLexer.cxx b/Source/cmExprLexer.cxx
index b589d63..fb6f0db 100644
--- a/Source/cmExprLexer.cxx
+++ b/Source/cmExprLexer.cxx
@@ -456,9 +456,12 @@ Modify cmExprLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmExprLexer.h cmExprLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in cmExpr_yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#include "cmExprParserHelper.h"
/* Replace the lexer input function. */
@@ -470,7 +473,7 @@ Modify cmExprLexer.cxx:
#include "cmExprParserTokens.h"
/*--------------------------------------------------------------------------*/
-#line 473 "cmExprLexer.cxx"
+#line 476 "cmExprLexer.cxx"
#define INITIAL 0
@@ -723,10 +726,10 @@ YY_DECL
}
{
-#line 36 "cmExprLexer.in.l"
+#line 39 "cmExprLexer.in.l"
-#line 729 "cmExprLexer.cxx"
+#line 732 "cmExprLexer.cxx"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -785,80 +788,80 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 38 "cmExprLexer.in.l"
+#line 41 "cmExprLexer.in.l"
{ yylvalp->Number = atoi(yytext); return exp_NUMBER; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 40 "cmExprLexer.in.l"
+#line 43 "cmExprLexer.in.l"
{ return exp_PLUS; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 41 "cmExprLexer.in.l"
+#line 44 "cmExprLexer.in.l"
{ return exp_MINUS; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 42 "cmExprLexer.in.l"
+#line 45 "cmExprLexer.in.l"
{ return exp_TIMES; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 43 "cmExprLexer.in.l"
+#line 46 "cmExprLexer.in.l"
{ return exp_DIVIDE; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 44 "cmExprLexer.in.l"
+#line 47 "cmExprLexer.in.l"
{ return exp_MOD; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 45 "cmExprLexer.in.l"
+#line 48 "cmExprLexer.in.l"
{ return exp_OR; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 46 "cmExprLexer.in.l"
+#line 49 "cmExprLexer.in.l"
{ return exp_AND; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 47 "cmExprLexer.in.l"
+#line 50 "cmExprLexer.in.l"
{ return exp_XOR; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 48 "cmExprLexer.in.l"
+#line 51 "cmExprLexer.in.l"
{ return exp_NOT; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 49 "cmExprLexer.in.l"
+#line 52 "cmExprLexer.in.l"
{ return exp_SHIFTLEFT; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 50 "cmExprLexer.in.l"
+#line 53 "cmExprLexer.in.l"
{ return exp_SHIFTRIGHT; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 51 "cmExprLexer.in.l"
+#line 54 "cmExprLexer.in.l"
{ return exp_OPENPARENT; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 52 "cmExprLexer.in.l"
+#line 55 "cmExprLexer.in.l"
{ return exp_CLOSEPARENT; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 54 "cmExprLexer.in.l"
+#line 57 "cmExprLexer.in.l"
ECHO;
YY_BREAK
-#line 861 "cmExprLexer.cxx"
+#line 864 "cmExprLexer.cxx"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1650,7 +1653,7 @@ YY_BUFFER_STATE cmExpr_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in cmExpr_yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < (size_t)_yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@@ -2027,4 +2030,4 @@ void cmExpr_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 54 "cmExprLexer.in.l"
+#line 57 "cmExprLexer.in.l"
diff --git a/Source/cmExprLexer.h b/Source/cmExprLexer.h
index c9f7fd8..835a7a3 100644
--- a/Source/cmExprLexer.h
+++ b/Source/cmExprLexer.h
@@ -326,7 +326,7 @@ extern int cmExpr_yylex (yyscan_t yyscanner);
#undef YY_DECL
#endif
-#line 54 "cmExprLexer.in.l"
+#line 57 "cmExprLexer.in.l"
#line 333 "cmExprLexer.h"
diff --git a/Source/cmExprLexer.in.l b/Source/cmExprLexer.in.l
index af328c0..25ddba4 100644
--- a/Source/cmExprLexer.in.l
+++ b/Source/cmExprLexer.in.l
@@ -13,9 +13,12 @@ Modify cmExprLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmExprLexer.h cmExprLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#include "cmExprParserHelper.h"
/* Replace the lexer input function. */
diff --git a/Source/cmFortranLexer.cxx b/Source/cmFortranLexer.cxx
index e53ad11..01c09ac 100644
--- a/Source/cmFortranLexer.cxx
+++ b/Source/cmFortranLexer.cxx
@@ -663,9 +663,12 @@ Modify cmFortranLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmFortranLexer.h cmFortranLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in cmFortran_yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#undef YY_NO_UNPUT
#define cmFortranLexer_cxx
@@ -682,7 +685,7 @@ Modify cmFortranLexer.cxx:
/*--------------------------------------------------------------------------*/
-#line 685 "cmFortranLexer.cxx"
+#line 688 "cmFortranLexer.cxx"
#define INITIAL 0
#define free_fmt 1
@@ -942,10 +945,10 @@ YY_DECL
}
{
-#line 53 "cmFortranLexer.in.l"
+#line 56 "cmFortranLexer.in.l"
-#line 948 "cmFortranLexer.cxx"
+#line 951 "cmFortranLexer.cxx"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -1005,7 +1008,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 55 "cmFortranLexer.in.l"
+#line 58 "cmFortranLexer.in.l"
{
cmFortranParser_StringStart(yyextra);
cmFortranParser_SetOldStartcond(yyextra, YY_START);
@@ -1014,7 +1017,7 @@ YY_RULE_SETUP
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 61 "cmFortranLexer.in.l"
+#line 64 "cmFortranLexer.in.l"
{
cmFortranParser_StringStart(yyextra);
cmFortranParser_SetOldStartcond(yyextra, YY_START);
@@ -1022,10 +1025,10 @@ YY_RULE_SETUP
}
YY_BREAK
case 3:
-#line 68 "cmFortranLexer.in.l"
+#line 71 "cmFortranLexer.in.l"
case 4:
YY_RULE_SETUP
-#line 68 "cmFortranLexer.in.l"
+#line 71 "cmFortranLexer.in.l"
{
BEGIN(cmFortranParser_GetOldStartcond(yyextra) );
yylvalp->string = strdup(cmFortranParser_StringEnd(yyextra));
@@ -1034,17 +1037,17 @@ YY_RULE_SETUP
YY_BREAK
case 5:
/* rule 5 can match eol */
-#line 75 "cmFortranLexer.in.l"
+#line 78 "cmFortranLexer.in.l"
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 75 "cmFortranLexer.in.l"
+#line 78 "cmFortranLexer.in.l"
/* Ignore (continued strings, free fmt) */
YY_BREAK
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 77 "cmFortranLexer.in.l"
+#line 80 "cmFortranLexer.in.l"
{
if (cmFortranParser_GetOldStartcond(yyextra) == fixed_fmt)
; /* Ignore (cont. strings, fixed fmt) */
@@ -1057,7 +1060,7 @@ YY_RULE_SETUP
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 87 "cmFortranLexer.in.l"
+#line 90 "cmFortranLexer.in.l"
{
unput ('\n');
BEGIN(INITIAL);
@@ -1066,7 +1069,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 93 "cmFortranLexer.in.l"
+#line 96 "cmFortranLexer.in.l"
{
cmFortranParser_StringAppend(yyextra, yytext[0]);
}
@@ -1074,24 +1077,24 @@ YY_RULE_SETUP
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 97 "cmFortranLexer.in.l"
+#line 100 "cmFortranLexer.in.l"
{ return EOSTMT; } /* Treat comments like */
YY_BREAK
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 98 "cmFortranLexer.in.l"
+#line 101 "cmFortranLexer.in.l"
{ return EOSTMT; } /* empty lines */
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 100 "cmFortranLexer.in.l"
+#line 103 "cmFortranLexer.in.l"
{ return CPP_LINE_DIRECTIVE; }
YY_BREAK
case 13:
/* rule 13 can match eol */
YY_RULE_SETUP
-#line 101 "cmFortranLexer.in.l"
+#line 104 "cmFortranLexer.in.l"
{
yytext[yyleng-1] = 0;
yylvalp->string = strdup(strchr(yytext, '<')+1);
@@ -1100,171 +1103,171 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 106 "cmFortranLexer.in.l"
+#line 109 "cmFortranLexer.in.l"
{ return CPP_INCLUDE; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 107 "cmFortranLexer.in.l"
+#line 110 "cmFortranLexer.in.l"
{ return F90PPR_INCLUDE; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 108 "cmFortranLexer.in.l"
+#line 111 "cmFortranLexer.in.l"
{ return COCO_INCLUDE; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 110 "cmFortranLexer.in.l"
+#line 113 "cmFortranLexer.in.l"
{ return CPP_DEFINE; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 111 "cmFortranLexer.in.l"
+#line 114 "cmFortranLexer.in.l"
{ return F90PPR_DEFINE; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 113 "cmFortranLexer.in.l"
+#line 116 "cmFortranLexer.in.l"
{ return CPP_UNDEF; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 114 "cmFortranLexer.in.l"
+#line 117 "cmFortranLexer.in.l"
{ return F90PPR_UNDEF; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 116 "cmFortranLexer.in.l"
+#line 119 "cmFortranLexer.in.l"
{ return CPP_IFDEF; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 117 "cmFortranLexer.in.l"
+#line 120 "cmFortranLexer.in.l"
{ return CPP_IFNDEF; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 118 "cmFortranLexer.in.l"
+#line 121 "cmFortranLexer.in.l"
{ return CPP_IF; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 119 "cmFortranLexer.in.l"
+#line 122 "cmFortranLexer.in.l"
{ return CPP_ELIF; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 120 "cmFortranLexer.in.l"
+#line 123 "cmFortranLexer.in.l"
{ return CPP_ELSE; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 121 "cmFortranLexer.in.l"
+#line 124 "cmFortranLexer.in.l"
{ return CPP_ENDIF; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 123 "cmFortranLexer.in.l"
+#line 126 "cmFortranLexer.in.l"
{ return F90PPR_IFDEF; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 124 "cmFortranLexer.in.l"
+#line 127 "cmFortranLexer.in.l"
{ return F90PPR_IFNDEF; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 125 "cmFortranLexer.in.l"
+#line 128 "cmFortranLexer.in.l"
{ return F90PPR_IF; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 126 "cmFortranLexer.in.l"
+#line 129 "cmFortranLexer.in.l"
{ return F90PPR_ELIF; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 127 "cmFortranLexer.in.l"
+#line 130 "cmFortranLexer.in.l"
{ return F90PPR_ELSE; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 128 "cmFortranLexer.in.l"
+#line 131 "cmFortranLexer.in.l"
{ return F90PPR_ENDIF; }
YY_BREAK
/* Line continuations, possible involving comments. */
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 131 "cmFortranLexer.in.l"
+#line 134 "cmFortranLexer.in.l"
YY_BREAK
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 132 "cmFortranLexer.in.l"
+#line 135 "cmFortranLexer.in.l"
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 134 "cmFortranLexer.in.l"
+#line 137 "cmFortranLexer.in.l"
{ return COMMA; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 136 "cmFortranLexer.in.l"
+#line 139 "cmFortranLexer.in.l"
{ return DCOLON; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 137 "cmFortranLexer.in.l"
+#line 140 "cmFortranLexer.in.l"
{ return COLON; }
YY_BREAK
case 38:
/* rule 38 can match eol */
YY_RULE_SETUP
-#line 139 "cmFortranLexer.in.l"
+#line 142 "cmFortranLexer.in.l"
{ return GARBAGE; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 141 "cmFortranLexer.in.l"
+#line 144 "cmFortranLexer.in.l"
{ return ASSIGNMENT_OP; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 143 "cmFortranLexer.in.l"
+#line 146 "cmFortranLexer.in.l"
{ return END; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 144 "cmFortranLexer.in.l"
+#line 147 "cmFortranLexer.in.l"
{ return INCLUDE; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 145 "cmFortranLexer.in.l"
+#line 148 "cmFortranLexer.in.l"
{ return INTERFACE; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 146 "cmFortranLexer.in.l"
+#line 149 "cmFortranLexer.in.l"
{ return MODULE; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 147 "cmFortranLexer.in.l"
+#line 150 "cmFortranLexer.in.l"
{ return SUBMODULE; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 148 "cmFortranLexer.in.l"
+#line 151 "cmFortranLexer.in.l"
{ return USE; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 150 "cmFortranLexer.in.l"
+#line 153 "cmFortranLexer.in.l"
{
yylvalp->string = strdup(yytext);
return WORD;
@@ -1272,39 +1275,39 @@ YY_RULE_SETUP
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 155 "cmFortranLexer.in.l"
+#line 158 "cmFortranLexer.in.l"
{ return LPAREN; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 156 "cmFortranLexer.in.l"
+#line 159 "cmFortranLexer.in.l"
{ return RPAREN; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 158 "cmFortranLexer.in.l"
+#line 161 "cmFortranLexer.in.l"
{ return GARBAGE; }
YY_BREAK
case 50:
/* rule 50 can match eol */
YY_RULE_SETUP
-#line 160 "cmFortranLexer.in.l"
+#line 163 "cmFortranLexer.in.l"
{ return EOSTMT; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 163 "cmFortranLexer.in.l"
+#line 166 "cmFortranLexer.in.l"
/* Ignore */
YY_BREAK
case 52:
/* rule 52 can match eol */
YY_RULE_SETUP
-#line 164 "cmFortranLexer.in.l"
+#line 167 "cmFortranLexer.in.l"
/* Ignore line-endings preceded by \ */
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 166 "cmFortranLexer.in.l"
+#line 169 "cmFortranLexer.in.l"
{ return *yytext; }
YY_BREAK
case YY_STATE_EOF(INITIAL):
@@ -1312,7 +1315,7 @@ 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 168 "cmFortranLexer.in.l"
+#line 171 "cmFortranLexer.in.l"
{
if(!cmFortranParser_FilePop(yyextra) )
{
@@ -1322,10 +1325,10 @@ case YY_STATE_EOF(str_dq):
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 175 "cmFortranLexer.in.l"
+#line 178 "cmFortranLexer.in.l"
ECHO;
YY_BREAK
-#line 1328 "cmFortranLexer.cxx"
+#line 1331 "cmFortranLexer.cxx"
case YY_END_OF_BUFFER:
{
@@ -2118,7 +2121,7 @@ YY_BUFFER_STATE cmFortran_yy_scan_bytes (yyconst char * yybytes, int _yybytes_
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in cmFortran_yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < (size_t)_yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@@ -2495,7 +2498,7 @@ void cmFortran_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 175 "cmFortranLexer.in.l"
+#line 178 "cmFortranLexer.in.l"
diff --git a/Source/cmFortranLexer.h b/Source/cmFortranLexer.h
index 47e82b3..ddda919 100644
--- a/Source/cmFortranLexer.h
+++ b/Source/cmFortranLexer.h
@@ -330,7 +330,7 @@ extern int cmFortran_yylex (yyscan_t yyscanner);
#undef YY_DECL
#endif
-#line 175 "cmFortranLexer.in.l"
+#line 178 "cmFortranLexer.in.l"
#line 337 "cmFortranLexer.h"
diff --git a/Source/cmFortranLexer.in.l b/Source/cmFortranLexer.in.l
index 309d27f..1121210 100644
--- a/Source/cmFortranLexer.in.l
+++ b/Source/cmFortranLexer.in.l
@@ -23,9 +23,12 @@ Modify cmFortranLexer.cxx:
- remove trailing whitespace: sed -i 's/\s*$//' cmFortranLexer.h cmFortranLexer.cxx
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#undef YY_NO_UNPUT
#define cmFortranLexer_cxx
diff --git a/Source/cmListFileLexer.c b/Source/cmListFileLexer.c
index 3db59ed..ba1e2a3 100644
--- a/Source/cmListFileLexer.c
+++ b/Source/cmListFileLexer.c
@@ -550,9 +550,12 @@ Modify cmListFileLexer.c:
- remove trailing whitespace: sed -i 's/\s*$//' cmListFileLexer.c
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in cmListFileLexer_yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#ifdef WIN32
#include <cmsys/Encoding.h>
#endif
@@ -599,7 +602,7 @@ static void cmListFileLexerDestroy(cmListFileLexer* lexer);
-#line 602 "cmListFileLexer.c"
+#line 605 "cmListFileLexer.c"
#define INITIAL 0
#define STRING 1
@@ -856,10 +859,10 @@ YY_DECL
}
{
-#line 76 "cmListFileLexer.in.l"
+#line 79 "cmListFileLexer.in.l"
-#line 862 "cmListFileLexer.c"
+#line 865 "cmListFileLexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -931,7 +934,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 78 "cmListFileLexer.in.l"
+#line 81 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_Newline;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -944,7 +947,7 @@ YY_RULE_SETUP
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 87 "cmListFileLexer.in.l"
+#line 90 "cmListFileLexer.in.l"
{
const char* bracket = yytext;
lexer->comment = yytext[0] == '#';
@@ -967,7 +970,7 @@ YY_RULE_SETUP
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 107 "cmListFileLexer.in.l"
+#line 110 "cmListFileLexer.in.l"
{
lexer->column += yyleng;
BEGIN(COMMENT);
@@ -975,14 +978,14 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 112 "cmListFileLexer.in.l"
+#line 115 "cmListFileLexer.in.l"
{
lexer->column += yyleng;
}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 116 "cmListFileLexer.in.l"
+#line 119 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ParenLeft;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -992,7 +995,7 @@ YY_RULE_SETUP
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 123 "cmListFileLexer.in.l"
+#line 126 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ParenRight;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1002,7 +1005,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 130 "cmListFileLexer.in.l"
+#line 133 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_Identifier;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1012,7 +1015,7 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 137 "cmListFileLexer.in.l"
+#line 140 "cmListFileLexer.in.l"
{
/* Handle ]]====]=======]*/
cmListFileLexerAppend(lexer, yytext, yyleng);
@@ -1024,7 +1027,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 146 "cmListFileLexer.in.l"
+#line 149 "cmListFileLexer.in.l"
{
lexer->column += yyleng;
/* Erase the partial bracket from the token. */
@@ -1036,7 +1039,7 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 155 "cmListFileLexer.in.l"
+#line 158 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
@@ -1045,7 +1048,7 @@ YY_RULE_SETUP
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 160 "cmListFileLexer.in.l"
+#line 163 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
++lexer->line;
@@ -1055,7 +1058,7 @@ YY_RULE_SETUP
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 167 "cmListFileLexer.in.l"
+#line 170 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
@@ -1064,7 +1067,7 @@ YY_RULE_SETUP
YY_BREAK
case YY_STATE_EOF(BRACKET):
case YY_STATE_EOF(BRACKETEND):
-#line 173 "cmListFileLexer.in.l"
+#line 176 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_BadBracket;
BEGIN(INITIAL);
@@ -1073,7 +1076,7 @@ case YY_STATE_EOF(BRACKETEND):
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 179 "cmListFileLexer.in.l"
+#line 182 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ArgumentUnquoted;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1083,7 +1086,7 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 186 "cmListFileLexer.in.l"
+#line 189 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ArgumentUnquoted;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1093,7 +1096,7 @@ YY_RULE_SETUP
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 193 "cmListFileLexer.in.l"
+#line 196 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ArgumentUnquoted;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1103,7 +1106,7 @@ YY_RULE_SETUP
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 200 "cmListFileLexer.in.l"
+#line 203 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_ArgumentQuoted;
cmListFileLexerSetToken(lexer, "", 0);
@@ -1113,7 +1116,7 @@ YY_RULE_SETUP
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 207 "cmListFileLexer.in.l"
+#line 210 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
@@ -1122,7 +1125,7 @@ YY_RULE_SETUP
case 18:
/* rule 18 can match eol */
YY_RULE_SETUP
-#line 212 "cmListFileLexer.in.l"
+#line 215 "cmListFileLexer.in.l"
{
/* Continuation: text is not part of string */
++lexer->line;
@@ -1132,7 +1135,7 @@ YY_RULE_SETUP
case 19:
/* rule 19 can match eol */
YY_RULE_SETUP
-#line 218 "cmListFileLexer.in.l"
+#line 221 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
++lexer->line;
@@ -1141,7 +1144,7 @@ YY_RULE_SETUP
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 224 "cmListFileLexer.in.l"
+#line 227 "cmListFileLexer.in.l"
{
lexer->column += yyleng;
BEGIN(INITIAL);
@@ -1150,14 +1153,14 @@ YY_RULE_SETUP
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 230 "cmListFileLexer.in.l"
+#line 233 "cmListFileLexer.in.l"
{
cmListFileLexerAppend(lexer, yytext, yyleng);
lexer->column += yyleng;
}
YY_BREAK
case YY_STATE_EOF(STRING):
-#line 235 "cmListFileLexer.in.l"
+#line 238 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_BadString;
BEGIN(INITIAL);
@@ -1166,7 +1169,7 @@ case YY_STATE_EOF(STRING):
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 241 "cmListFileLexer.in.l"
+#line 244 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_Space;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1176,7 +1179,7 @@ YY_RULE_SETUP
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 248 "cmListFileLexer.in.l"
+#line 251 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_BadCharacter;
cmListFileLexerSetToken(lexer, yytext, yyleng);
@@ -1186,7 +1189,7 @@ YY_RULE_SETUP
YY_BREAK
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(COMMENT):
-#line 255 "cmListFileLexer.in.l"
+#line 258 "cmListFileLexer.in.l"
{
lexer->token.type = cmListFileLexer_Token_None;
cmListFileLexerSetToken(lexer, 0, 0);
@@ -1195,10 +1198,10 @@ case YY_STATE_EOF(COMMENT):
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 261 "cmListFileLexer.in.l"
+#line 264 "cmListFileLexer.in.l"
ECHO;
YY_BREAK
-#line 1201 "cmListFileLexer.c"
+#line 1204 "cmListFileLexer.c"
case YY_END_OF_BUFFER:
{
@@ -1999,7 +2002,7 @@ YY_BUFFER_STATE cmListFileLexer_yy_scan_bytes (yyconst char * yybytes, int _yy
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in cmListFileLexer_yy_scan_bytes()" );
- for ( i = 0; i < _yybytes_len; ++i )
+ for ( i = 0; i < (size_t)_yybytes_len; ++i )
buf[i] = yybytes[i];
buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
@@ -2376,7 +2379,7 @@ void cmListFileLexer_yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 261 "cmListFileLexer.in.l"
+#line 264 "cmListFileLexer.in.l"
diff --git a/Source/cmListFileLexer.in.l b/Source/cmListFileLexer.in.l
index 70bdcfe..994652b 100644
--- a/Source/cmListFileLexer.in.l
+++ b/Source/cmListFileLexer.in.l
@@ -13,9 +13,12 @@ Modify cmListFileLexer.c:
- remove trailing whitespace: sed -i 's/\s*$//' cmListFileLexer.c
- remove blank lines at end of file
- #include "cmStandardLexer.h" at the top
+ - add cast in yy_scan_bytes for loop condition of _yybytes_len to size_t
*/
+/* IWYU pragma: no_forward_declare yyguts_t */
+
#ifdef WIN32
#include <cmsys/Encoding.h>
#endif
diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h
index affb29f..e0bee61 100644
--- a/Source/cmStandardLexer.h
+++ b/Source/cmStandardLexer.h
@@ -7,6 +7,7 @@
/* Disable some warnings. */
#if defined(_MSC_VER)
+#pragma warning(disable : 4018)
#pragma warning(disable : 4127)
#pragma warning(disable : 4131)
#pragma warning(disable : 4244)
-----------------------------------------------------------------------
Summary of changes:
Source/cmCommandArgumentLexer.cxx | 43 ++++---
Source/cmCommandArgumentLexer.h | 2 +-
Source/cmCommandArgumentLexer.in.l | 3 +
Source/cmDependsJavaLexer.cxx | 239 ++++++++++++++++++------------------
Source/cmDependsJavaLexer.h | 2 +-
Source/cmDependsJavaLexer.in.l | 5 +-
Source/cmExprLexer.cxx | 45 +++----
Source/cmExprLexer.h | 2 +-
Source/cmExprLexer.in.l | 3 +
Source/cmFortranLexer.cxx | 125 ++++++++++---------
Source/cmFortranLexer.h | 2 +-
Source/cmFortranLexer.in.l | 3 +
Source/cmListFileLexer.c | 69 ++++++-----
Source/cmListFileLexer.in.l | 3 +
Source/cmStandardLexer.h | 1 +
15 files changed, 289 insertions(+), 258 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list