Commit 6f64300a authored by Christoph Grüninger's avatar Christoph Grüninger Committed by Brad King
Browse files

LexerParser: Clean up includes following include-what-you-use

parent 699d50e3
......@@ -97,6 +97,7 @@ Run bison like this:
# include <malloc.h>
#endif
#include <stdint.h>
/* Make sure the parser uses standard memory allocation. The default
generated parser malloc/free declarations do not work on all
platforms. */
......@@ -107,7 +108,6 @@ Run bison like this:
/*-------------------------------------------------------------------------*/
#include "cmCommandArgumentParserHelper.h" /* Interface to parser object. */
#include "cmCommandArgumentLexer.h" /* Interface to lexer object. */
#include "cmCommandArgumentParserTokens.h" /* Need YYSTYPE for YY_DECL. */
/* Forward declare the lexer entry point. */
YY_DECL;
......
......@@ -22,6 +22,7 @@ Run bison like this:
# include <malloc.h>
#endif
#include <stdint.h>
/* Make sure the parser uses standard memory allocation. The default
generated parser malloc/free declarations do not work on all
platforms. */
......@@ -32,7 +33,6 @@ Run bison like this:
/*-------------------------------------------------------------------------*/
#include "cmCommandArgumentParserHelper.h" /* Interface to parser object. */
#include "cmCommandArgumentLexer.h" /* Interface to lexer object. */
#include "cmCommandArgumentParserTokens.h" /* Need YYSTYPE for YY_DECL. */
/* Forward declare the lexer entry point. */
YY_DECL;
......
......@@ -88,6 +88,7 @@ Run bison like this:
#include "cmConfigure.h" // IWYU pragma: keep
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <string>
......@@ -97,7 +98,6 @@ Run bison like this:
/*-------------------------------------------------------------------------*/
#include "cmDependsJavaParserHelper.h" /* Interface to parser object. */
#include "cmDependsJavaLexer.h" /* Interface to lexer object. */
#include "cmDependsJavaParserTokens.h" /* Need YYSTYPE for YY_DECL. */
/* Forward declare the lexer entry point. */
YY_DECL;
......
......@@ -13,6 +13,7 @@ Run bison like this:
#include "cmConfigure.h" // IWYU pragma: keep
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <string>
......@@ -22,7 +23,6 @@ Run bison like this:
/*-------------------------------------------------------------------------*/
#include "cmDependsJavaParserHelper.h" /* Interface to parser object. */
#include "cmDependsJavaLexer.h" /* Interface to lexer object. */
#include "cmDependsJavaParserTokens.h" /* Need YYSTYPE for YY_DECL. */
/* Forward declare the lexer entry point. */
YY_DECL;
......
......@@ -88,6 +88,7 @@ Run bison like this:
#include "cmConfigure.h" // IWYU pragma: keep
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdexcept>
......@@ -113,7 +114,7 @@ static void cmExpr_yyerror(yyscan_t yyscanner, const char* message);
# pragma GCC diagnostic ignored "-Wconversion"
#endif
#line 117 "cmExprParser.cxx"
#line 118 "cmExprParser.cxx"
# ifndef YY_CAST
# ifdef __cplusplus
......@@ -537,9 +538,9 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 74, 74, 79, 82, 87, 90, 95, 98, 103,
106, 109, 114, 117, 120, 125, 128, 131, 137, 142,
145, 148, 151, 156, 159
0, 75, 75, 80, 83, 88, 91, 96, 99, 104,
107, 110, 115, 118, 121, 126, 129, 132, 138, 143,
146, 149, 152, 157, 160
};
#endif
......@@ -1414,194 +1415,194 @@ yyreduce:
switch (yyn)
{
case 2: /* start: exp */
#line 74 "cmExprParser.y"
#line 75 "cmExprParser.y"
{
cmExpr_yyget_extra(yyscanner)->SetResult((yyvsp[0].Number));
}
#line 1422 "cmExprParser.cxx"
#line 1423 "cmExprParser.cxx"
break;
case 3: /* exp: bitwiseor */
#line 79 "cmExprParser.y"
#line 80 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1430 "cmExprParser.cxx"
#line 1431 "cmExprParser.cxx"
break;
case 4: /* exp: exp exp_OR bitwiseor */
#line 82 "cmExprParser.y"
#line 83 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) | (yyvsp[0].Number);
}
#line 1438 "cmExprParser.cxx"
#line 1439 "cmExprParser.cxx"
break;
case 5: /* bitwiseor: bitwisexor */
#line 87 "cmExprParser.y"
#line 88 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1446 "cmExprParser.cxx"
#line 1447 "cmExprParser.cxx"
break;
case 6: /* bitwiseor: bitwiseor exp_XOR bitwisexor */
#line 90 "cmExprParser.y"
#line 91 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) ^ (yyvsp[0].Number);
}
#line 1454 "cmExprParser.cxx"
#line 1455 "cmExprParser.cxx"
break;
case 7: /* bitwisexor: bitwiseand */
#line 95 "cmExprParser.y"
#line 96 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1462 "cmExprParser.cxx"
#line 1463 "cmExprParser.cxx"
break;
case 8: /* bitwisexor: bitwisexor exp_AND bitwiseand */
#line 98 "cmExprParser.y"
#line 99 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) & (yyvsp[0].Number);
}
#line 1470 "cmExprParser.cxx"
#line 1471 "cmExprParser.cxx"
break;
case 9: /* bitwiseand: shift */
#line 103 "cmExprParser.y"
#line 104 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1478 "cmExprParser.cxx"
#line 1479 "cmExprParser.cxx"
break;
case 10: /* bitwiseand: bitwiseand exp_SHIFTLEFT shift */
#line 106 "cmExprParser.y"
#line 107 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) << (yyvsp[0].Number);
}
#line 1486 "cmExprParser.cxx"
#line 1487 "cmExprParser.cxx"
break;
case 11: /* bitwiseand: bitwiseand exp_SHIFTRIGHT shift */
#line 109 "cmExprParser.y"
#line 110 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) >> (yyvsp[0].Number);
}
#line 1494 "cmExprParser.cxx"
#line 1495 "cmExprParser.cxx"
break;
case 12: /* shift: term */
#line 114 "cmExprParser.y"
#line 115 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1502 "cmExprParser.cxx"
#line 1503 "cmExprParser.cxx"
break;
case 13: /* shift: shift exp_PLUS term */
#line 117 "cmExprParser.y"
#line 118 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) + (yyvsp[0].Number);
}
#line 1510 "cmExprParser.cxx"
#line 1511 "cmExprParser.cxx"
break;
case 14: /* shift: shift exp_MINUS term */
#line 120 "cmExprParser.y"
#line 121 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) - (yyvsp[0].Number);
}
#line 1518 "cmExprParser.cxx"
#line 1519 "cmExprParser.cxx"
break;
case 15: /* term: unary */
#line 125 "cmExprParser.y"
#line 126 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1526 "cmExprParser.cxx"
#line 1527 "cmExprParser.cxx"
break;
case 16: /* term: term exp_TIMES unary */
#line 128 "cmExprParser.y"
#line 129 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) * (yyvsp[0].Number);
}
#line 1534 "cmExprParser.cxx"
#line 1535 "cmExprParser.cxx"
break;
case 17: /* term: term exp_DIVIDE unary */
#line 131 "cmExprParser.y"
#line 132 "cmExprParser.y"
{
if (yyvsp[0].Number == 0) {
throw std::overflow_error("divide by zero");
}
(yyval.Number) = (yyvsp[-2].Number) / (yyvsp[0].Number);
}
#line 1545 "cmExprParser.cxx"
#line 1546 "cmExprParser.cxx"
break;
case 18: /* term: term exp_MOD unary */
#line 137 "cmExprParser.y"
#line 138 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-2].Number) % (yyvsp[0].Number);
}
#line 1553 "cmExprParser.cxx"
#line 1554 "cmExprParser.cxx"
break;
case 19: /* unary: factor */
#line 142 "cmExprParser.y"
#line 143 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1561 "cmExprParser.cxx"
#line 1562 "cmExprParser.cxx"
break;
case 20: /* unary: exp_PLUS unary */
#line 145 "cmExprParser.y"
#line 146 "cmExprParser.y"
{
(yyval.Number) = + (yyvsp[0].Number);
}
#line 1569 "cmExprParser.cxx"
#line 1570 "cmExprParser.cxx"
break;
case 21: /* unary: exp_MINUS unary */
#line 148 "cmExprParser.y"
#line 149 "cmExprParser.y"
{
(yyval.Number) = - (yyvsp[0].Number);
}
#line 1577 "cmExprParser.cxx"
#line 1578 "cmExprParser.cxx"
break;
case 22: /* unary: exp_NOT unary */
#line 151 "cmExprParser.y"
#line 152 "cmExprParser.y"
{
(yyval.Number) = ~ (yyvsp[0].Number);
}
#line 1585 "cmExprParser.cxx"
#line 1586 "cmExprParser.cxx"
break;
case 23: /* factor: exp_NUMBER */
#line 156 "cmExprParser.y"
#line 157 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[0].Number);
}
#line 1593 "cmExprParser.cxx"
#line 1594 "cmExprParser.cxx"
break;
case 24: /* factor: exp_OPENPARENT exp exp_CLOSEPARENT */
#line 159 "cmExprParser.y"
#line 160 "cmExprParser.y"
{
(yyval.Number) = (yyvsp[-1].Number);
}
#line 1601 "cmExprParser.cxx"
#line 1602 "cmExprParser.cxx"
break;
#line 1605 "cmExprParser.cxx"
#line 1606 "cmExprParser.cxx"
default: break;
}
......@@ -1826,7 +1827,7 @@ yyreturn:
return yyresult;
}
#line 164 "cmExprParser.y"
#line 165 "cmExprParser.y"
/* End of grammar */
......
......@@ -13,6 +13,7 @@ Run bison like this:
#include "cmConfigure.h" // IWYU pragma: keep
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdexcept>
......
......@@ -108,7 +108,6 @@ Run bison like this:
/*-------------------------------------------------------------------------*/
#define cmFortranParser_cxx
#include "cmFortranParser.h" /* Interface to parser object. */
#include "cmFortranParserTokens.h" /* Need YYSTYPE for YY_DECL. */
/* Forward declare the lexer entry point. */
YY_DECL;
......@@ -133,7 +132,7 @@ static void cmFortran_yyerror(yyscan_t yyscanner, const char* message)
# pragma GCC diagnostic ignored "-Wconversion"
#endif
#line 137 "cmFortranParser.cxx"
#line 136 "cmFortranParser.cxx"
# ifndef YY_CAST
# ifdef __cplusplus
......@@ -587,13 +586,13 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 99, 99, 99, 102, 106, 111, 120, 126, 133,
138, 142, 147, 155, 160, 165, 170, 175, 180, 185,
190, 195, 199, 203, 207, 211, 212, 217, 217, 217,
218, 218, 219, 219, 220, 220, 221, 221, 222, 222,
223, 223, 224, 224, 225, 225, 226, 226, 229, 230,
231, 232, 233, 234, 235, 236, 237, 238, 239, 240,
241, 242, 243, 244, 245
0, 98, 98, 98, 101, 105, 110, 119, 125, 132,
137, 141, 146, 154, 159, 164, 169, 174, 179, 184,
189, 194, 198, 202, 206, 210, 211, 216, 216, 216,
217, 217, 218, 218, 219, 219, 220, 220, 221, 221,
222, 222, 223, 223, 224, 224, 225, 225, 228, 229,
230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
240, 241, 242, 243, 244
};
#endif
......@@ -1622,26 +1621,26 @@ yyreduce:
switch (yyn)
{
case 4: /* stmt: INTERFACE EOSTMT */
#line 102 "cmFortranParser.y"
#line 101 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true);
}
#line 1631 "cmFortranParser.cxx"
#line 1630 "cmFortranParser.cxx"
break;
case 5: /* stmt: USE WORD other EOSTMT */
#line 106 "cmFortranParser.y"
#line 105 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1641 "cmFortranParser.cxx"
#line 1640 "cmFortranParser.cxx"
break;
case 6: /* stmt: MODULE WORD other EOSTMT */
#line 111 "cmFortranParser.y"
#line 110 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
if (cmsysString_strcasecmp((yyvsp[-2].string), "function") != 0 &&
......@@ -1651,22 +1650,22 @@ yyreduce:
}
free((yyvsp[-2].string));
}
#line 1655 "cmFortranParser.cxx"
#line 1654 "cmFortranParser.cxx"
break;
case 7: /* stmt: SUBMODULE LPAREN WORD RPAREN WORD other EOSTMT */
#line 120 "cmFortranParser.y"
#line 119 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmodule(parser, (yyvsp[-4].string), (yyvsp[-2].string));
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
#line 1666 "cmFortranParser.cxx"
#line 1665 "cmFortranParser.cxx"
break;
case 8: /* stmt: SUBMODULE LPAREN WORD COLON WORD RPAREN WORD other EOSTMT */
#line 126 "cmFortranParser.y"
#line 125 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmoduleNested(parser, (yyvsp[-6].string), (yyvsp[-4].string), (yyvsp[-2].string));
......@@ -1674,40 +1673,40 @@ yyreduce:
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
#line 1678 "cmFortranParser.cxx"
#line 1677 "cmFortranParser.cxx"
break;
case 9: /* stmt: INTERFACE WORD other EOSTMT */
#line 133 "cmFortranParser.y"
#line 132 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true);
free((yyvsp[-2].string));
}
#line 1688 "cmFortranParser.cxx"
#line 1687 "cmFortranParser.cxx"
break;
case 10: /* stmt: END INTERFACE other EOSTMT */
#line 138 "cmFortranParser.y"
#line 137 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, false);
}
#line 1697 "cmFortranParser.cxx"
#line 1696 "cmFortranParser.cxx"
break;
case 11: /* stmt: USE DCOLON WORD other EOSTMT */
#line 142 "cmFortranParser.y"
#line 141 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1707 "cmFortranParser.cxx"
#line 1706 "cmFortranParser.cxx"
break;
case 12: /* stmt: USE COMMA WORD DCOLON WORD other EOSTMT */
#line 147 "cmFortranParser.y"
#line 146 "cmFortranParser.y"
{
if (cmsysString_strcasecmp((yyvsp[-4].string), "non_intrinsic") == 0) {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
......@@ -1716,139 +1715,139 @@ yyreduce:
free((yyvsp[-4].string));
free((yyvsp[-2].string));
}
#line 1720 "cmFortranParser.cxx"
#line 1719 "cmFortranParser.cxx"
break;
case 13: /* stmt: INCLUDE STRING other EOSTMT */
#line 155 "cmFortranParser.y"
#line 154 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1730 "cmFortranParser.cxx"
#line 1729 "cmFortranParser.cxx"
break;
case 14: /* stmt: CPP_LINE_DIRECTIVE STRING other EOSTMT */
#line 160 "cmFortranParser.y"
#line 159 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleLineDirective(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1740 "cmFortranParser.cxx"
#line 1739 "cmFortranParser.cxx"
break;
case 15: /* stmt: CPP_INCLUDE_ANGLE other EOSTMT */
#line 165 "cmFortranParser.y"
#line 164 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1750 "cmFortranParser.cxx"
#line 1749 "cmFortranParser.cxx"
break;
case 16: /* stmt: include STRING other EOSTMT */
#line 170 "cmFortranParser.y"
#line 169 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1760 "cmFortranParser.cxx"
#line 1759 "cmFortranParser.cxx"
break;
case 17: /* stmt: define WORD other EOSTMT */
#line 175 "cmFortranParser.y"
#line 174 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleDefine(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1770 "cmFortranParser.cxx"
#line 1769 "cmFortranParser.cxx"
break;
case 18: /* stmt: undef WORD other EOSTMT */
#line 180 "cmFortranParser.y"
#line 179 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1780 "cmFortranParser.cxx"
#line 1779 "cmFortranParser.cxx"
break;
case 19: /* stmt: ifdef WORD other EOSTMT */
#line 185 "cmFortranParser.y"
#line 184 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfdef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1790 "cmFortranParser.cxx"
#line 1789 "cmFortranParser.cxx"
break;
case 20: /* stmt: ifndef WORD other EOSTMT */
#line 190 "cmFortranParser.y"
#line 189 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string));
}
#line 1800 "cmFortranParser.cxx"
#line 1799 "cmFortranParser.cxx"
break;
case 21: /* stmt: if other EOSTMT */
#line 195 "cmFortranParser.y"
#line 194 "cmFortranParser.y"
{
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIf(parser);
}
#line 1809 "cmFortranParser.cxx"
#line 1808 "cmFortranParser.cxx"
break;
case 22: /* stmt: elif other EOSTMT */