Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

LexerParser: Do not leak Fortran parser tokens discarded due to errors

Browse Source
This commit is contained in:
Brad King
2021-06-07 19:48:42 -04:00
parent acb25d50d9
commit fda060f030
2 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
Source/LexerParser/cmFortranParser.cxx
View File

@@ -599,13 +599,13 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] = static const yytype_uint8 yyrline[] =
{ {
0, 99, 99, 99, 102, 106, 111, 120, 126, 133, 0, 101, 101, 101, 104, 108, 113, 122, 128, 135,
138, 142, 147, 155, 160, 165, 170, 175, 180, 185, 140, 144, 149, 157, 162, 167, 172, 177, 182, 187,
190, 195, 199, 203, 207, 211, 212, 217, 217, 217, 192, 197, 201, 205, 209, 213, 214, 219, 219, 219,
218, 218, 219, 219, 220, 220, 221, 221, 222, 222, 220, 220, 221, 221, 222, 222, 223, 223, 224, 224,
223, 223, 224, 224, 225, 225, 226, 226, 229, 230, 225, 225, 226, 226, 227, 227, 228, 228, 231, 232,
231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
241, 242, 243, 244, 245 243, 244, 245, 246, 247
}; };
#endif #endif
@@ -1364,7 +1364,29 @@ yydestruct (const char *yymsg,
YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp);
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YY_USE (yykind); switch (yykind)
{
case YYSYMBOL_STRING: /* STRING */
#line 95 "cmFortranParser.y"
{ free(((*yyvaluep).string)); }
#line 1373 "cmFortranParser.cxx"
break;
case YYSYMBOL_WORD: /* WORD */
#line 95 "cmFortranParser.y"
{ free(((*yyvaluep).string)); }
#line 1379 "cmFortranParser.cxx"
break;
case YYSYMBOL_CPP_INCLUDE_ANGLE: /* CPP_INCLUDE_ANGLE */
#line 95 "cmFortranParser.y"
{ free(((*yyvaluep).string)); }
#line 1385 "cmFortranParser.cxx"
break;
default:
break;
}
YY_IGNORE_MAYBE_UNINITIALIZED_END YY_IGNORE_MAYBE_UNINITIALIZED_END
} }
@@ -1634,26 +1656,26 @@ yyreduce:
switch (yyn) switch (yyn)
{ {
case 4: /* stmt: INTERFACE EOSTMT */ case 4: /* stmt: INTERFACE EOSTMT */
#line 102 "cmFortranParser.y" #line 104 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true); cmFortranParser_SetInInterface(parser, true);
} }
#line 1643 "cmFortranParser.cxx" #line 1665 "cmFortranParser.cxx"
break; break;
case 5: /* stmt: USE WORD other EOSTMT */ case 5: /* stmt: USE WORD other EOSTMT */
#line 106 "cmFortranParser.y" #line 108 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string)); cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1653 "cmFortranParser.cxx" #line 1675 "cmFortranParser.cxx"
break; break;
case 6: /* stmt: MODULE WORD other EOSTMT */ case 6: /* stmt: MODULE WORD other EOSTMT */
#line 111 "cmFortranParser.y" #line 113 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
if (cmsysString_strcasecmp((yyvsp[-2].string), "function") != 0 && if (cmsysString_strcasecmp((yyvsp[-2].string), "function") != 0 &&
@@ -1663,22 +1685,22 @@ yyreduce:
} }
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1667 "cmFortranParser.cxx" #line 1689 "cmFortranParser.cxx"
break; break;
case 7: /* stmt: SUBMODULE LPAREN WORD RPAREN WORD other EOSTMT */ case 7: /* stmt: SUBMODULE LPAREN WORD RPAREN WORD other EOSTMT */
#line 120 "cmFortranParser.y" #line 122 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmodule(parser, (yyvsp[-4].string), (yyvsp[-2].string)); cmFortranParser_RuleSubmodule(parser, (yyvsp[-4].string), (yyvsp[-2].string));
free((yyvsp[-4].string)); free((yyvsp[-4].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1678 "cmFortranParser.cxx" #line 1700 "cmFortranParser.cxx"
break; break;
case 8: /* stmt: SUBMODULE LPAREN WORD COLON WORD RPAREN WORD other EOSTMT */ case 8: /* stmt: SUBMODULE LPAREN WORD COLON WORD RPAREN WORD other EOSTMT */
#line 126 "cmFortranParser.y" #line 128 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleSubmoduleNested(parser, (yyvsp[-6].string), (yyvsp[-4].string), (yyvsp[-2].string)); cmFortranParser_RuleSubmoduleNested(parser, (yyvsp[-6].string), (yyvsp[-4].string), (yyvsp[-2].string));
@@ -1686,40 +1708,40 @@ yyreduce:
free((yyvsp[-4].string)); free((yyvsp[-4].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1690 "cmFortranParser.cxx" #line 1712 "cmFortranParser.cxx"
break; break;
case 9: /* stmt: INTERFACE WORD other EOSTMT */ case 9: /* stmt: INTERFACE WORD other EOSTMT */
#line 133 "cmFortranParser.y" #line 135 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, true); cmFortranParser_SetInInterface(parser, true);
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1700 "cmFortranParser.cxx" #line 1722 "cmFortranParser.cxx"
break; break;
case 10: /* stmt: END INTERFACE other EOSTMT */ case 10: /* stmt: END INTERFACE other EOSTMT */
#line 138 "cmFortranParser.y" #line 140 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_SetInInterface(parser, false); cmFortranParser_SetInInterface(parser, false);
} }
#line 1709 "cmFortranParser.cxx" #line 1731 "cmFortranParser.cxx"
break; break;
case 11: /* stmt: USE DCOLON WORD other EOSTMT */ case 11: /* stmt: USE DCOLON WORD other EOSTMT */
#line 142 "cmFortranParser.y" #line 144 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUse(parser, (yyvsp[-2].string)); cmFortranParser_RuleUse(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1719 "cmFortranParser.cxx" #line 1741 "cmFortranParser.cxx"
break; break;
case 12: /* stmt: USE COMMA WORD DCOLON WORD other EOSTMT */ case 12: /* stmt: USE COMMA WORD DCOLON WORD other EOSTMT */
#line 147 "cmFortranParser.y" #line 149 "cmFortranParser.y"
{ {
if (cmsysString_strcasecmp((yyvsp[-4].string), "non_intrinsic") == 0) { if (cmsysString_strcasecmp((yyvsp[-4].string), "non_intrinsic") == 0) {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
@@ -1728,139 +1750,139 @@ yyreduce:
free((yyvsp[-4].string)); free((yyvsp[-4].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1732 "cmFortranParser.cxx" #line 1754 "cmFortranParser.cxx"
break; break;
case 13: /* stmt: INCLUDE STRING other EOSTMT */ case 13: /* stmt: INCLUDE STRING other EOSTMT */
#line 155 "cmFortranParser.y" #line 157 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string)); cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1742 "cmFortranParser.cxx" #line 1764 "cmFortranParser.cxx"
break; break;
case 14: /* stmt: CPP_LINE_DIRECTIVE STRING other EOSTMT */ case 14: /* stmt: CPP_LINE_DIRECTIVE STRING other EOSTMT */
#line 160 "cmFortranParser.y" #line 162 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleLineDirective(parser, (yyvsp[-2].string)); cmFortranParser_RuleLineDirective(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1752 "cmFortranParser.cxx" #line 1774 "cmFortranParser.cxx"
break; break;
case 15: /* stmt: CPP_INCLUDE_ANGLE other EOSTMT */ case 15: /* stmt: CPP_INCLUDE_ANGLE other EOSTMT */
#line 165 "cmFortranParser.y" #line 167 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string)); cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1762 "cmFortranParser.cxx" #line 1784 "cmFortranParser.cxx"
break; break;
case 16: /* stmt: include STRING other EOSTMT */ case 16: /* stmt: include STRING other EOSTMT */
#line 170 "cmFortranParser.y" #line 172 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleInclude(parser, (yyvsp[-2].string)); cmFortranParser_RuleInclude(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1772 "cmFortranParser.cxx" #line 1794 "cmFortranParser.cxx"
break; break;
case 17: /* stmt: define WORD other EOSTMT */ case 17: /* stmt: define WORD other EOSTMT */
#line 175 "cmFortranParser.y" #line 177 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleDefine(parser, (yyvsp[-2].string)); cmFortranParser_RuleDefine(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1782 "cmFortranParser.cxx" #line 1804 "cmFortranParser.cxx"
break; break;
case 18: /* stmt: undef WORD other EOSTMT */ case 18: /* stmt: undef WORD other EOSTMT */
#line 180 "cmFortranParser.y" #line 182 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleUndef(parser, (yyvsp[-2].string)); cmFortranParser_RuleUndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1792 "cmFortranParser.cxx" #line 1814 "cmFortranParser.cxx"
break; break;
case 19: /* stmt: ifdef WORD other EOSTMT */ case 19: /* stmt: ifdef WORD other EOSTMT */
#line 185 "cmFortranParser.y" #line 187 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfdef(parser, (yyvsp[-2].string)); cmFortranParser_RuleIfdef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1802 "cmFortranParser.cxx" #line 1824 "cmFortranParser.cxx"
break; break;
case 20: /* stmt: ifndef WORD other EOSTMT */ case 20: /* stmt: ifndef WORD other EOSTMT */
#line 190 "cmFortranParser.y" #line 192 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIfndef(parser, (yyvsp[-2].string)); cmFortranParser_RuleIfndef(parser, (yyvsp[-2].string));
free((yyvsp[-2].string)); free((yyvsp[-2].string));
} }
#line 1812 "cmFortranParser.cxx" #line 1834 "cmFortranParser.cxx"
break; break;
case 21: /* stmt: if other EOSTMT */ case 21: /* stmt: if other EOSTMT */
#line 195 "cmFortranParser.y" #line 197 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleIf(parser); cmFortranParser_RuleIf(parser);
} }
#line 1821 "cmFortranParser.cxx" #line 1843 "cmFortranParser.cxx"
break; break;
case 22: /* stmt: elif other EOSTMT */ case 22: /* stmt: elif other EOSTMT */
#line 199 "cmFortranParser.y" #line 201 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleElif(parser); cmFortranParser_RuleElif(parser);
} }
#line 1830 "cmFortranParser.cxx" #line 1852 "cmFortranParser.cxx"
break; break;
case 23: /* stmt: else other EOSTMT */ case 23: /* stmt: else other EOSTMT */
#line 203 "cmFortranParser.y" #line 205 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleElse(parser); cmFortranParser_RuleElse(parser);
} }
#line 1839 "cmFortranParser.cxx" #line 1861 "cmFortranParser.cxx"
break; break;
case 24: /* stmt: endif other EOSTMT */ case 24: /* stmt: endif other EOSTMT */
#line 207 "cmFortranParser.y" #line 209 "cmFortranParser.y"
{ {
cmFortranParser* parser = cmFortran_yyget_extra(yyscanner); cmFortranParser* parser = cmFortran_yyget_extra(yyscanner);
cmFortranParser_RuleEndif(parser); cmFortranParser_RuleEndif(parser);
} }
#line 1848 "cmFortranParser.cxx" #line 1870 "cmFortranParser.cxx"
break; break;
case 48: /* misc_code: WORD */ case 48: /* misc_code: WORD */
#line 229 "cmFortranParser.y" #line 231 "cmFortranParser.y"
{ free ((yyvsp[0].string)); } { free ((yyvsp[0].string)); }
#line 1854 "cmFortranParser.cxx" #line 1876 "cmFortranParser.cxx"
break; break;
case 55: /* misc_code: STRING */ case 55: /* misc_code: STRING */
#line 236 "cmFortranParser.y" #line 238 "cmFortranParser.y"
{ free ((yyvsp[0].string)); } { free ((yyvsp[0].string)); }
#line 1860 "cmFortranParser.cxx" #line 1882 "cmFortranParser.cxx"
break; break;
#line 1864 "cmFortranParser.cxx" #line 1886 "cmFortranParser.cxx"
default: break; default: break;
} }
@@ -2085,6 +2107,6 @@ yyreturn:
return yyresult; return yyresult;
} }
#line 248 "cmFortranParser.y" #line 250 "cmFortranParser.y"
/* End of grammar */ /* End of grammar */

2
Source/LexerParser/cmFortranParser.y
View File

@@ -92,6 +92,8 @@ static void cmFortran_yyerror(yyscan_t yyscanner, const char* message)
%token SUBMODULE %token SUBMODULE
%token USE %token USE
%destructor { free($$); } WORD STRING CPP_INCLUDE_ANGLE
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
/* grammar */ /* grammar */
%% %%