diff --git a/src/basic/vx_config/config.tab.cc b/src/basic/vx_config/config.tab.cc index 5b67009f59..9adec0b08e 100644 --- a/src/basic/vx_config/config.tab.cc +++ b/src/basic/vx_config/config.tab.cc @@ -128,16 +128,13 @@ extern void yyerror(const char *); extern "C" int configwrap(); - - // // definitions that have external linkage // -char * configtext; - -FILE * configin; +char * configtext; +FILE * configin; int LineNumber = 1; @@ -265,7 +262,7 @@ static void do_user_function_def(); -#line 269 "config.tab.cc" /* yacc.c:337 */ +#line 266 "config.tab.cc" /* yacc.c:337 */ # ifndef YY_NULLPTR # if defined __cplusplus # if 201103L <= __cplusplus @@ -346,7 +343,7 @@ extern int configdebug; union YYSTYPE { -#line 195 "config.tab.yy" /* yacc.c:352 */ +#line 192 "config.tab.yy" /* yacc.c:352 */ char text[max_id_length + 1]; @@ -366,7 +363,7 @@ union YYSTYPE PC_info pc_info; -#line 370 "config.tab.cc" /* yacc.c:352 */ +#line 367 "config.tab.cc" /* yacc.c:352 */ }; typedef union YYSTYPE YYSTYPE; @@ -671,14 +668,14 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 259, 259, 260, 263, 264, 265, 269, 270, 274, - 279, 280, 281, 282, 284, 285, 286, 288, 289, 290, - 291, 292, 293, 295, 301, 302, 306, 310, 314, 314, - 318, 322, 323, 327, 328, 332, 333, 336, 337, 341, - 342, 343, 344, 345, 349, 350, 351, 352, 356, 357, - 361, 362, 366, 367, 371, 372, 376, 377, 378, 379, - 380, 381, 382, 383, 384, 385, 385, 386, 386, 391, - 392, 396, 400, 401, 405 + 0, 256, 256, 257, 260, 261, 262, 266, 267, 271, + 276, 277, 278, 279, 281, 282, 283, 285, 286, 287, + 288, 289, 290, 292, 298, 299, 303, 307, 311, 311, + 315, 319, 320, 324, 325, 329, 330, 333, 334, 338, + 339, 340, 341, 342, 346, 347, 348, 349, 353, 354, + 358, 359, 363, 364, 368, 369, 373, 374, 375, 376, + 377, 378, 379, 380, 381, 382, 382, 383, 383, 388, + 389, 393, 397, 398, 402 }; #endif @@ -1576,397 +1573,397 @@ yyparse (void) switch (yyn) { case 2: -#line 259 "config.tab.yy" /* yacc.c:1652 */ +#line 256 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = true; } -#line 1582 "config.tab.cc" /* yacc.c:1652 */ +#line 1579 "config.tab.cc" /* yacc.c:1652 */ break; case 3: -#line 260 "config.tab.yy" /* yacc.c:1652 */ +#line 257 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = true; } -#line 1588 "config.tab.cc" /* yacc.c:1652 */ +#line 1585 "config.tab.cc" /* yacc.c:1652 */ break; case 4: -#line 263 "config.tab.yy" /* yacc.c:1652 */ +#line 260 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = true; } -#line 1594 "config.tab.cc" /* yacc.c:1652 */ +#line 1591 "config.tab.cc" /* yacc.c:1652 */ break; case 5: -#line 264 "config.tab.yy" /* yacc.c:1652 */ +#line 261 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = true; } -#line 1600 "config.tab.cc" /* yacc.c:1652 */ +#line 1597 "config.tab.cc" /* yacc.c:1652 */ break; case 6: -#line 265 "config.tab.yy" /* yacc.c:1652 */ +#line 262 "config.tab.yy" /* yacc.c:1652 */ { } -#line 1606 "config.tab.cc" /* yacc.c:1652 */ +#line 1603 "config.tab.cc" /* yacc.c:1652 */ break; case 7: -#line 269 "config.tab.yy" /* yacc.c:1652 */ +#line 266 "config.tab.yy" /* yacc.c:1652 */ { do_print( 0); } -#line 1612 "config.tab.cc" /* yacc.c:1652 */ +#line 1609 "config.tab.cc" /* yacc.c:1652 */ break; case 8: -#line 270 "config.tab.yy" /* yacc.c:1652 */ +#line 267 "config.tab.yy" /* yacc.c:1652 */ { do_print((yyvsp[-3].text)); } -#line 1618 "config.tab.cc" /* yacc.c:1652 */ +#line 1615 "config.tab.cc" /* yacc.c:1652 */ break; case 9: -#line 274 "config.tab.yy" /* yacc.c:1652 */ +#line 271 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = false; } -#line 1624 "config.tab.cc" /* yacc.c:1652 */ +#line 1621 "config.tab.cc" /* yacc.c:1652 */ break; case 10: -#line 279 "config.tab.yy" /* yacc.c:1652 */ +#line 276 "config.tab.yy" /* yacc.c:1652 */ { do_assign_boolean ((yyvsp[-2].text), (yyvsp[-1].bval)); } -#line 1630 "config.tab.cc" /* yacc.c:1652 */ +#line 1627 "config.tab.cc" /* yacc.c:1652 */ break; case 11: -#line 280 "config.tab.yy" /* yacc.c:1652 */ +#line 277 "config.tab.yy" /* yacc.c:1652 */ { do_assign_exp ((yyvsp[-2].text)); } -#line 1636 "config.tab.cc" /* yacc.c:1652 */ +#line 1633 "config.tab.cc" /* yacc.c:1652 */ break; case 12: -#line 281 "config.tab.yy" /* yacc.c:1652 */ +#line 278 "config.tab.yy" /* yacc.c:1652 */ { do_assign_id ((yyvsp[-2].text), (yyvsp[-1].text)); } -#line 1642 "config.tab.cc" /* yacc.c:1652 */ +#line 1639 "config.tab.cc" /* yacc.c:1652 */ break; case 13: -#line 282 "config.tab.yy" /* yacc.c:1652 */ +#line 279 "config.tab.yy" /* yacc.c:1652 */ { do_pwl ((yyvsp[-2].text)); } -#line 1648 "config.tab.cc" /* yacc.c:1652 */ +#line 1645 "config.tab.cc" /* yacc.c:1652 */ break; case 14: -#line 284 "config.tab.yy" /* yacc.c:1652 */ +#line 281 "config.tab.yy" /* yacc.c:1652 */ { do_assign_threshold ((yyvsp[-2].text)); } -#line 1654 "config.tab.cc" /* yacc.c:1652 */ +#line 1651 "config.tab.cc" /* yacc.c:1652 */ break; case 15: -#line 285 "config.tab.yy" /* yacc.c:1652 */ +#line 282 "config.tab.yy" /* yacc.c:1652 */ { do_assign_string ((yyvsp[-2].text), (yyvsp[-1].text)); } -#line 1660 "config.tab.cc" /* yacc.c:1652 */ +#line 1657 "config.tab.cc" /* yacc.c:1652 */ break; case 16: -#line 286 "config.tab.yy" /* yacc.c:1652 */ +#line 283 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict ((yyvsp[-1].text)); } -#line 1666 "config.tab.cc" /* yacc.c:1652 */ +#line 1663 "config.tab.cc" /* yacc.c:1652 */ break; case 17: -#line 288 "config.tab.yy" /* yacc.c:1652 */ +#line 285 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict((yyvsp[-3].text)); } -#line 1672 "config.tab.cc" /* yacc.c:1652 */ +#line 1669 "config.tab.cc" /* yacc.c:1652 */ break; case 18: -#line 289 "config.tab.yy" /* yacc.c:1652 */ +#line 286 "config.tab.yy" /* yacc.c:1652 */ { do_assign_exp_array((yyvsp[-3].text)); } -#line 1678 "config.tab.cc" /* yacc.c:1652 */ +#line 1675 "config.tab.cc" /* yacc.c:1652 */ break; case 19: -#line 290 "config.tab.yy" /* yacc.c:1652 */ +#line 287 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict((yyvsp[-3].text)); } -#line 1684 "config.tab.cc" /* yacc.c:1652 */ +#line 1681 "config.tab.cc" /* yacc.c:1652 */ break; case 20: -#line 291 "config.tab.yy" /* yacc.c:1652 */ +#line 288 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict((yyvsp[-3].text)); } -#line 1690 "config.tab.cc" /* yacc.c:1652 */ +#line 1687 "config.tab.cc" /* yacc.c:1652 */ break; case 21: -#line 292 "config.tab.yy" /* yacc.c:1652 */ +#line 289 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict((yyvsp[-3].text)); } -#line 1696 "config.tab.cc" /* yacc.c:1652 */ +#line 1693 "config.tab.cc" /* yacc.c:1652 */ break; case 22: -#line 293 "config.tab.yy" /* yacc.c:1652 */ +#line 290 "config.tab.yy" /* yacc.c:1652 */ { do_assign_dict((yyvsp[-2].text)); } -#line 1702 "config.tab.cc" /* yacc.c:1652 */ +#line 1699 "config.tab.cc" /* yacc.c:1652 */ break; case 23: -#line 295 "config.tab.yy" /* yacc.c:1652 */ +#line 292 "config.tab.yy" /* yacc.c:1652 */ { do_user_function_def(); } -#line 1708 "config.tab.cc" /* yacc.c:1652 */ +#line 1705 "config.tab.cc" /* yacc.c:1652 */ break; case 24: -#line 301 "config.tab.yy" /* yacc.c:1652 */ +#line 298 "config.tab.yy" /* yacc.c:1652 */ { ida.add((yyvsp[0].text)); } -#line 1714 "config.tab.cc" /* yacc.c:1652 */ +#line 1711 "config.tab.cc" /* yacc.c:1652 */ break; case 25: -#line 302 "config.tab.yy" /* yacc.c:1652 */ +#line 299 "config.tab.yy" /* yacc.c:1652 */ { ida.add((yyvsp[0].text)); } -#line 1720 "config.tab.cc" /* yacc.c:1652 */ +#line 1717 "config.tab.cc" /* yacc.c:1652 */ break; case 26: -#line 306 "config.tab.yy" /* yacc.c:1652 */ +#line 303 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = false; function_name = (yyvsp[-4].text); is_function_def = true; } -#line 1726 "config.tab.cc" /* yacc.c:1652 */ +#line 1723 "config.tab.cc" /* yacc.c:1652 */ break; case 27: -#line 310 "config.tab.yy" /* yacc.c:1652 */ +#line 307 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = false; strcpy((yyval.text), (yyvsp[-1].text)); } -#line 1732 "config.tab.cc" /* yacc.c:1652 */ +#line 1729 "config.tab.cc" /* yacc.c:1652 */ break; case 28: -#line 314 "config.tab.yy" /* yacc.c:1652 */ +#line 311 "config.tab.yy" /* yacc.c:1652 */ { mark(apm); } -#line 1738 "config.tab.cc" /* yacc.c:1652 */ +#line 1735 "config.tab.cc" /* yacc.c:1652 */ break; case 29: -#line 314 "config.tab.yy" /* yacc.c:1652 */ +#line 311 "config.tab.yy" /* yacc.c:1652 */ { is_lhs = false; strcpy((yyval.text), (yyvsp[-2].text)); } -#line 1744 "config.tab.cc" /* yacc.c:1652 */ +#line 1741 "config.tab.cc" /* yacc.c:1652 */ break; case 30: -#line 318 "config.tab.yy" /* yacc.c:1652 */ +#line 315 "config.tab.yy" /* yacc.c:1652 */ { do_dict(); } -#line 1750 "config.tab.cc" /* yacc.c:1652 */ +#line 1747 "config.tab.cc" /* yacc.c:1652 */ break; case 33: -#line 327 "config.tab.yy" /* yacc.c:1652 */ +#line 324 "config.tab.yy" /* yacc.c:1652 */ { do_string((yyvsp[0].text)); } -#line 1756 "config.tab.cc" /* yacc.c:1652 */ +#line 1753 "config.tab.cc" /* yacc.c:1652 */ break; case 34: -#line 328 "config.tab.yy" /* yacc.c:1652 */ +#line 325 "config.tab.yy" /* yacc.c:1652 */ { do_string((yyvsp[0].text)); } -#line 1762 "config.tab.cc" /* yacc.c:1652 */ +#line 1759 "config.tab.cc" /* yacc.c:1652 */ break; case 37: -#line 336 "config.tab.yy" /* yacc.c:1652 */ +#line 333 "config.tab.yy" /* yacc.c:1652 */ { do_thresh ((yyvsp[0].node)); } -#line 1768 "config.tab.cc" /* yacc.c:1652 */ +#line 1765 "config.tab.cc" /* yacc.c:1652 */ break; case 38: -#line 337 "config.tab.yy" /* yacc.c:1652 */ +#line 334 "config.tab.yy" /* yacc.c:1652 */ { do_na_thresh (); } -#line 1774 "config.tab.cc" /* yacc.c:1652 */ +#line 1771 "config.tab.cc" /* yacc.c:1652 */ break; case 39: -#line 341 "config.tab.yy" /* yacc.c:1652 */ +#line 338 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = (yyvsp[0].node); } -#line 1780 "config.tab.cc" /* yacc.c:1652 */ +#line 1777 "config.tab.cc" /* yacc.c:1652 */ break; case 40: -#line 342 "config.tab.yy" /* yacc.c:1652 */ +#line 339 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_and_thresh ((yyvsp[-2].node), (yyvsp[0].node)); } -#line 1786 "config.tab.cc" /* yacc.c:1652 */ +#line 1783 "config.tab.cc" /* yacc.c:1652 */ break; case 41: -#line 343 "config.tab.yy" /* yacc.c:1652 */ +#line 340 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_or_thresh ((yyvsp[-2].node), (yyvsp[0].node)); } -#line 1792 "config.tab.cc" /* yacc.c:1652 */ +#line 1789 "config.tab.cc" /* yacc.c:1652 */ break; case 42: -#line 344 "config.tab.yy" /* yacc.c:1652 */ +#line 341 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_not_thresh ((yyvsp[0].node)); } -#line 1798 "config.tab.cc" /* yacc.c:1652 */ +#line 1795 "config.tab.cc" /* yacc.c:1652 */ break; case 43: -#line 345 "config.tab.yy" /* yacc.c:1652 */ +#line 342 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_paren_thresh ((yyvsp[-1].node)); } -#line 1804 "config.tab.cc" /* yacc.c:1652 */ +#line 1801 "config.tab.cc" /* yacc.c:1652 */ break; case 44: -#line 349 "config.tab.yy" /* yacc.c:1652 */ +#line 346 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_simple_thresh((yyvsp[-1].cval), (yyvsp[0].nval)); } -#line 1810 "config.tab.cc" /* yacc.c:1652 */ +#line 1807 "config.tab.cc" /* yacc.c:1652 */ break; case 45: -#line 350 "config.tab.yy" /* yacc.c:1652 */ +#line 347 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_simple_perc_thresh((yyvsp[-1].cval), (yyvsp[0].pc_info)); } -#line 1816 "config.tab.cc" /* yacc.c:1652 */ +#line 1813 "config.tab.cc" /* yacc.c:1652 */ break; case 46: -#line 351 "config.tab.yy" /* yacc.c:1652 */ +#line 348 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_compound_perc_thresh((yyvsp[-4].cval), (yyvsp[-3].pc_info), (yyvsp[-1].nval)); } -#line 1822 "config.tab.cc" /* yacc.c:1652 */ +#line 1819 "config.tab.cc" /* yacc.c:1652 */ break; case 47: -#line 352 "config.tab.yy" /* yacc.c:1652 */ +#line 349 "config.tab.yy" /* yacc.c:1652 */ { (yyval.node) = do_fortran_thresh((yyvsp[0].text)); } -#line 1828 "config.tab.cc" /* yacc.c:1652 */ +#line 1825 "config.tab.cc" /* yacc.c:1652 */ break; case 48: -#line 356 "config.tab.yy" /* yacc.c:1652 */ +#line 353 "config.tab.yy" /* yacc.c:1652 */ { set_number_string(); } -#line 1834 "config.tab.cc" /* yacc.c:1652 */ +#line 1831 "config.tab.cc" /* yacc.c:1652 */ break; case 49: -#line 357 "config.tab.yy" /* yacc.c:1652 */ +#line 354 "config.tab.yy" /* yacc.c:1652 */ { set_number_string(); } -#line 1840 "config.tab.cc" /* yacc.c:1652 */ +#line 1837 "config.tab.cc" /* yacc.c:1652 */ break; case 50: -#line 361 "config.tab.yy" /* yacc.c:1652 */ +#line 358 "config.tab.yy" /* yacc.c:1652 */ { do_boolean((yyvsp[0].bval)); } -#line 1846 "config.tab.cc" /* yacc.c:1652 */ +#line 1843 "config.tab.cc" /* yacc.c:1652 */ break; case 51: -#line 362 "config.tab.yy" /* yacc.c:1652 */ +#line 359 "config.tab.yy" /* yacc.c:1652 */ { do_boolean((yyvsp[0].bval)); } -#line 1852 "config.tab.cc" /* yacc.c:1652 */ +#line 1849 "config.tab.cc" /* yacc.c:1652 */ break; case 56: -#line 376 "config.tab.yy" /* yacc.c:1652 */ +#line 373 "config.tab.yy" /* yacc.c:1652 */ { do_number((yyvsp[0].nval)); } -#line 1858 "config.tab.cc" /* yacc.c:1652 */ +#line 1855 "config.tab.cc" /* yacc.c:1652 */ break; case 57: -#line 377 "config.tab.yy" /* yacc.c:1652 */ +#line 374 "config.tab.yy" /* yacc.c:1652 */ { do_local_var((yyvsp[0].index)); } -#line 1864 "config.tab.cc" /* yacc.c:1652 */ +#line 1861 "config.tab.cc" /* yacc.c:1652 */ break; case 58: -#line 378 "config.tab.yy" /* yacc.c:1652 */ +#line 375 "config.tab.yy" /* yacc.c:1652 */ { do_op('+'); } -#line 1870 "config.tab.cc" /* yacc.c:1652 */ +#line 1867 "config.tab.cc" /* yacc.c:1652 */ break; case 59: -#line 379 "config.tab.yy" /* yacc.c:1652 */ +#line 376 "config.tab.yy" /* yacc.c:1652 */ { do_op('-'); } -#line 1876 "config.tab.cc" /* yacc.c:1652 */ +#line 1873 "config.tab.cc" /* yacc.c:1652 */ break; case 60: -#line 380 "config.tab.yy" /* yacc.c:1652 */ +#line 377 "config.tab.yy" /* yacc.c:1652 */ { do_op('*'); } -#line 1882 "config.tab.cc" /* yacc.c:1652 */ +#line 1879 "config.tab.cc" /* yacc.c:1652 */ break; case 61: -#line 381 "config.tab.yy" /* yacc.c:1652 */ +#line 378 "config.tab.yy" /* yacc.c:1652 */ { do_op('/'); } -#line 1888 "config.tab.cc" /* yacc.c:1652 */ +#line 1885 "config.tab.cc" /* yacc.c:1652 */ break; case 62: -#line 382 "config.tab.yy" /* yacc.c:1652 */ +#line 379 "config.tab.yy" /* yacc.c:1652 */ { do_op('^'); } -#line 1894 "config.tab.cc" /* yacc.c:1652 */ +#line 1891 "config.tab.cc" /* yacc.c:1652 */ break; case 63: -#line 383 "config.tab.yy" /* yacc.c:1652 */ +#line 380 "config.tab.yy" /* yacc.c:1652 */ { do_negate(); } -#line 1900 "config.tab.cc" /* yacc.c:1652 */ +#line 1897 "config.tab.cc" /* yacc.c:1652 */ break; case 64: -#line 384 "config.tab.yy" /* yacc.c:1652 */ +#line 381 "config.tab.yy" /* yacc.c:1652 */ { do_paren_exp(); } -#line 1906 "config.tab.cc" /* yacc.c:1652 */ +#line 1903 "config.tab.cc" /* yacc.c:1652 */ break; case 65: -#line 385 "config.tab.yy" /* yacc.c:1652 */ +#line 382 "config.tab.yy" /* yacc.c:1652 */ { mark(fcm); } -#line 1912 "config.tab.cc" /* yacc.c:1652 */ +#line 1909 "config.tab.cc" /* yacc.c:1652 */ break; case 66: -#line 385 "config.tab.yy" /* yacc.c:1652 */ +#line 382 "config.tab.yy" /* yacc.c:1652 */ { do_builtin_call((yyvsp[-4].index)); } -#line 1918 "config.tab.cc" /* yacc.c:1652 */ +#line 1915 "config.tab.cc" /* yacc.c:1652 */ break; case 67: -#line 386 "config.tab.yy" /* yacc.c:1652 */ +#line 383 "config.tab.yy" /* yacc.c:1652 */ { mark(fcm); } -#line 1924 "config.tab.cc" /* yacc.c:1652 */ +#line 1921 "config.tab.cc" /* yacc.c:1652 */ break; case 68: -#line 386 "config.tab.yy" /* yacc.c:1652 */ +#line 383 "config.tab.yy" /* yacc.c:1652 */ { do_user_function_call((yyvsp[-4].entry)); } -#line 1930 "config.tab.cc" /* yacc.c:1652 */ +#line 1927 "config.tab.cc" /* yacc.c:1652 */ break; case 69: -#line 391 "config.tab.yy" /* yacc.c:1652 */ +#line 388 "config.tab.yy" /* yacc.c:1652 */ { store_exp(); } -#line 1936 "config.tab.cc" /* yacc.c:1652 */ +#line 1933 "config.tab.cc" /* yacc.c:1652 */ break; case 70: -#line 392 "config.tab.yy" /* yacc.c:1652 */ +#line 389 "config.tab.yy" /* yacc.c:1652 */ { store_exp(); } -#line 1942 "config.tab.cc" /* yacc.c:1652 */ +#line 1939 "config.tab.cc" /* yacc.c:1652 */ break; case 71: -#line 396 "config.tab.yy" /* yacc.c:1652 */ +#line 393 "config.tab.yy" /* yacc.c:1652 */ { } -#line 1948 "config.tab.cc" /* yacc.c:1652 */ +#line 1945 "config.tab.cc" /* yacc.c:1652 */ break; case 72: -#line 400 "config.tab.yy" /* yacc.c:1652 */ +#line 397 "config.tab.yy" /* yacc.c:1652 */ { } -#line 1954 "config.tab.cc" /* yacc.c:1652 */ +#line 1951 "config.tab.cc" /* yacc.c:1652 */ break; case 73: -#line 401 "config.tab.yy" /* yacc.c:1652 */ +#line 398 "config.tab.yy" /* yacc.c:1652 */ { } -#line 1960 "config.tab.cc" /* yacc.c:1652 */ +#line 1957 "config.tab.cc" /* yacc.c:1652 */ break; case 74: -#line 405 "config.tab.yy" /* yacc.c:1652 */ +#line 402 "config.tab.yy" /* yacc.c:1652 */ { add_point(); } -#line 1966 "config.tab.cc" /* yacc.c:1652 */ +#line 1963 "config.tab.cc" /* yacc.c:1652 */ break; -#line 1970 "config.tab.cc" /* yacc.c:1652 */ +#line 1967 "config.tab.cc" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2197,7 +2194,7 @@ yyparse (void) #endif return yyresult; } -#line 409 "config.tab.yy" /* yacc.c:1918 */ +#line 406 "config.tab.yy" /* yacc.c:1918 */ diff --git a/src/basic/vx_config/config.tab.h b/src/basic/vx_config/config.tab.h index 8ed626a152..2e861d07cf 100644 --- a/src/basic/vx_config/config.tab.h +++ b/src/basic/vx_config/config.tab.h @@ -92,7 +92,7 @@ extern int configdebug; union YYSTYPE { -#line 195 "config.tab.yy" /* yacc.c:1921 */ +#line 192 "config.tab.yy" /* yacc.c:1921 */ char text[max_id_length + 1]; diff --git a/src/basic/vx_config/config.tab.yy b/src/basic/vx_config/config.tab.yy index a89d87c6e8..2a533128cf 100644 --- a/src/basic/vx_config/config.tab.yy +++ b/src/basic/vx_config/config.tab.yy @@ -53,16 +53,13 @@ extern void yyerror(const char *); extern "C" int configwrap(); - - // // definitions that have external linkage // -char * configtext; - -FILE * configin; +char * configtext; +FILE * configin; int LineNumber = 1;