[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-254-ge939f8b
Daniel Pfeifer
daniel at pfeifer-mail.de
Fri Feb 17 16:51:07 EST 2017
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 e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad (commit)
via 89541d043d1d53b1a6c1082a9e9574b16165562d (commit)
via a3ff237a5c221be52bbd2cf7b526fd19b5202a35 (commit)
from b7af957834c120064057a0180487a56fc12ec7e1 (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=e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad
commit e939f8b18003e9b3fd2e2f398d3a2a0f8e5a46ad
Merge: b7af957 89541d0
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Feb 17 16:51:06 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 17 16:51:06 2017 -0500
Merge topic 'iwyu' into next
89541d04 fixup! cmFortranParser: include what you use
a3ff237a ParserHelper: Move macros to bottom of files
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89541d043d1d53b1a6c1082a9e9574b16165562d
commit 89541d043d1d53b1a6c1082a9e9574b16165562d
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Feb 17 22:49:24 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Feb 17 22:49:24 2017 +0100
fixup! cmFortranParser: include what you use
diff --git a/Source/cmFortranParser.cxx b/Source/cmFortranParser.cxx
index 45d9639..c67227f 100644
--- a/Source/cmFortranParser.cxx
+++ b/Source/cmFortranParser.cxx
@@ -97,7 +97,7 @@ Modify cmFortranParser.cxx:
- "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"]
*/
-#include <cmConfigure.h>
+#include <cmConfigure.h> // IWYU pragma: keep
#include <cmsys/String.h>
#include <stdlib.h>
diff --git a/Source/cmFortranParser.y b/Source/cmFortranParser.y
index be4959c..3d68134 100644
--- a/Source/cmFortranParser.y
+++ b/Source/cmFortranParser.y
@@ -26,7 +26,7 @@ Modify cmFortranParser.cxx:
- "#if 0" out yyerrorlab block in range ["goto yyerrlab1", "yyerrlab1:"]
*/
-#include <cmConfigure.h>
+#include <cmConfigure.h> // IWYU pragma: keep
#include <cmsys/String.h>
#include <stdlib.h>
diff --git a/Source/cmFortranParserTokens.h b/Source/cmFortranParserTokens.h
index 18b9e0a..8d6a5fe 100644
--- a/Source/cmFortranParserTokens.h
+++ b/Source/cmFortranParserTokens.h
@@ -130,7 +130,7 @@ extern int cmFortran_yydebug;
union YYSTYPE
{
-#line 75 "cmFortranParser.y" /* yacc.c:1909 */
+#line 70 "cmFortranParser.y" /* yacc.c:1909 */
char* string;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3ff237a5c221be52bbd2cf7b526fd19b5202a35
commit a3ff237a5c221be52bbd2cf7b526fd19b5202a35
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Feb 17 22:43:43 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Feb 17 22:43:43 2017 +0100
ParserHelper: Move macros to bottom of files
Since the class name is used in the macros, the iwyu tool gets confused
wheter it needs a forward declaration or not.
While editing the files, make sure structs have no typedef. Also,
remove confusing comments about Java.
diff --git a/Source/cmCommandArgumentParserHelper.h b/Source/cmCommandArgumentParserHelper.h
index 95bf0ad..5bfb236 100644
--- a/Source/cmCommandArgumentParserHelper.h
+++ b/Source/cmCommandArgumentParserHelper.h
@@ -8,27 +8,15 @@
#include <string>
#include <vector>
-#define YYSTYPE cmCommandArgumentParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmCommandArgumentParserHelper*
-#define YY_DECL \
- int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
-/** \class cmCommandArgumentParserHelper
- * \brief Helper class for parsing java source files
- *
- * Finds dependencies for java file and list of outputs
- */
-
class cmMakefile;
class cmCommandArgumentParserHelper
{
public:
- typedef struct
+ struct ParserType
{
char* str;
- } ParserType;
+ };
cmCommandArgumentParserHelper();
~cmCommandArgumentParserHelper();
@@ -100,4 +88,10 @@ private:
bool RemoveEmpty;
};
+#define YYSTYPE cmCommandArgumentParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmCommandArgumentParserHelper*
+#define YY_DECL \
+ int cmCommandArgument_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
#endif
diff --git a/Source/cmDependsJavaParserHelper.h b/Source/cmDependsJavaParserHelper.h
index 71b939c..5f28f70 100644
--- a/Source/cmDependsJavaParserHelper.h
+++ b/Source/cmDependsJavaParserHelper.h
@@ -8,26 +8,18 @@
#include <string>
#include <vector>
-class cmDependsJavaParserHelper;
-
-#define YYSTYPE cmDependsJavaParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmDependsJavaParserHelper*
-#define YY_DECL int cmDependsJava_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
/** \class cmDependsJavaParserHelper
* \brief Helper class for parsing java source files
*
* Finds dependencies for java file and list of outputs
*/
-
class cmDependsJavaParserHelper
{
public:
- typedef struct
+ struct ParserType
{
char* str;
- } ParserType;
+ };
cmDependsJavaParserHelper();
~cmDependsJavaParserHelper();
@@ -96,4 +88,9 @@ private:
void CleanupParser();
};
+#define YYSTYPE cmDependsJavaParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmDependsJavaParserHelper*
+#define YY_DECL int cmDependsJava_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
#endif
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index 8f00f1d..df365fc 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -8,23 +8,13 @@
#include <string>
#include <vector>
-#define YYSTYPE cmExprParserHelper::ParserType
-#define YYSTYPE_IS_DECLARED
-#define YY_EXTRA_TYPE cmExprParserHelper*
-#define YY_DECL int cmExpr_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
-
-/** \class cmExprParserHelper
- * \brief Helper class for parsing java source files
- *
- * Finds dependencies for java file and list of outputs
- */
class cmExprParserHelper
{
public:
- typedef struct
+ struct ParserType
{
int Number;
- } ParserType;
+ };
cmExprParserHelper();
~cmExprParserHelper();
@@ -57,4 +47,9 @@ private:
std::string ErrorString;
};
+#define YYSTYPE cmExprParserHelper::ParserType
+#define YYSTYPE_IS_DECLARED
+#define YY_EXTRA_TYPE cmExprParserHelper*
+#define YY_DECL int cmExpr_yylex(YYSTYPE* yylvalp, yyscan_t yyscanner)
+
#endif
-----------------------------------------------------------------------
Summary of changes:
Source/cmCommandArgumentParserHelper.h | 22 ++++++++--------------
Source/cmDependsJavaParserHelper.h | 17 +++++++----------
Source/cmExprParserHelper.h | 19 +++++++------------
Source/cmFortranParser.cxx | 2 +-
Source/cmFortranParser.y | 2 +-
Source/cmFortranParserTokens.h | 2 +-
6 files changed, 25 insertions(+), 39 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list