From 4a9f33ae999c06a6d64a620c8925a931d1e10b0f Mon Sep 17 00:00:00 2001 From: Ulya Trofimovich Date: Mon, 1 Jun 2015 11:42:23 +0100 Subject: [PATCH] Removed remnants of CVS ("# $Id$" in the beginning of some files) --- re2c/Makefile.am | 2 - re2c/bootstrap/parser.cc | 124 +++++++++++++++++++------------------- re2c/bootstrap/y.tab.h | 2 +- re2c/src/dfa/actions.cc | 1 - re2c/src/dfa/ins.h | 1 - re2c/src/dfa/re.h | 1 - re2c/src/globals.h | 1 - re2c/src/main.cc | 2 - re2c/src/mbo_getopt.cc | 2 - re2c/src/mbo_getopt.h | 2 - re2c/src/parse/parser.ypp | 2 - re2c/src/parse/scanner.h | 1 - 12 files changed, 62 insertions(+), 79 deletions(-) diff --git a/re2c/Makefile.am b/re2c/Makefile.am index 3b6a89ed..7609fa34 100644 --- a/re2c/Makefile.am +++ b/re2c/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - AM_CXXFLAGS = -W -Wall -Wextra -Weffc++ -pedantic -Wredundant-decls -O2 AM_YFLAGS = -y -d --no-lines RE2CFLAGS = -bi diff --git a/re2c/bootstrap/parser.cc b/re2c/bootstrap/parser.cc index 08b94e03..23802d24 100644 --- a/re2c/bootstrap/parser.cc +++ b/re2c/bootstrap/parser.cc @@ -70,8 +70,6 @@ #line 1 "../src/parse/parser.ypp" -/* $Id$ */ - #include #include #include @@ -216,7 +214,7 @@ void default_rule(CondList *clist, Token *code) /* Line 189 of yacc.c */ -#line 220 "./parser.cc" +#line 218 "./parser.cc" /* Enabling traces. */ #ifndef YYDEBUG @@ -266,7 +264,7 @@ typedef union YYSTYPE { /* Line 214 of yacc.c */ -#line 150 "../src/parse/parser.ypp" +#line 148 "../src/parse/parser.ypp" re2c::RegExp *regexp; re2c::Token *token; @@ -279,7 +277,7 @@ typedef union YYSTYPE /* Line 214 of yacc.c */ -#line 283 "./parser.cc" +#line 281 "./parser.cc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -291,7 +289,7 @@ typedef union YYSTYPE /* Line 264 of yacc.c */ -#line 295 "./parser.cc" +#line 293 "./parser.cc" #ifdef short # undef short @@ -598,12 +596,12 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 177, 177, 179, 183, 187, 196, 205, 209, 213, - 219, 227, 236, 245, 249, 254, 259, 265, 269, 277, - 285, 290, 296, 302, 314, 326, 332, 340, 343, 350, - 356, 366, 369, 377, 380, 387, 391, 398, 402, 413, - 417, 424, 428, 443, 450, 454, 458, 462, 469, 479, - 483, 487 + 0, 175, 175, 177, 181, 185, 194, 203, 207, 211, + 217, 225, 234, 243, 247, 252, 257, 263, 267, 275, + 283, 288, 294, 300, 312, 324, 330, 338, 341, 348, + 354, 364, 367, 375, 378, 385, 389, 396, 400, 411, + 415, 422, 426, 441, 448, 452, 456, 460, 467, 477, + 481, 485 }; #endif @@ -1572,7 +1570,7 @@ yyreduce: case 2: /* Line 1464 of yacc.c */ -#line 177 "../src/parse/parser.ypp" +#line 175 "../src/parse/parser.ypp" { ;} break; @@ -1580,7 +1578,7 @@ yyreduce: case 3: /* Line 1464 of yacc.c */ -#line 180 "../src/parse/parser.ypp" +#line 178 "../src/parse/parser.ypp" { foundRules = true; ;} @@ -1589,7 +1587,7 @@ yyreduce: case 5: /* Line 1464 of yacc.c */ -#line 188 "../src/parse/parser.ypp" +#line 186 "../src/parse/parser.ypp" { if (!symbol_table.insert (std::make_pair (* (yyvsp[(1) - (4)].str), (yyvsp[(3) - (4)].regexp))).second) { @@ -1603,7 +1601,7 @@ yyreduce: case 6: /* Line 1464 of yacc.c */ -#line 197 "../src/parse/parser.ypp" +#line 195 "../src/parse/parser.ypp" { if (!symbol_table.insert (std::make_pair (* (yyvsp[(1) - (2)].str), (yyvsp[(2) - (2)].regexp))).second) { @@ -1617,7 +1615,7 @@ yyreduce: case 7: /* Line 1464 of yacc.c */ -#line 206 "../src/parse/parser.ypp" +#line 204 "../src/parse/parser.ypp" { in->fatal("trailing contexts are not allowed in named definitions"); ;} @@ -1626,7 +1624,7 @@ yyreduce: case 8: /* Line 1464 of yacc.c */ -#line 210 "../src/parse/parser.ypp" +#line 208 "../src/parse/parser.ypp" { in->fatal("trailing contexts are not allowed in named definitions"); ;} @@ -1635,7 +1633,7 @@ yyreduce: case 9: /* Line 1464 of yacc.c */ -#line 214 "../src/parse/parser.ypp" +#line 212 "../src/parse/parser.ypp" { in->config (* (yyvsp[(1) - (4)].str), * (yyvsp[(3) - (4)].str)); delete (yyvsp[(1) - (4)].str); @@ -1646,7 +1644,7 @@ yyreduce: case 10: /* Line 1464 of yacc.c */ -#line 220 "../src/parse/parser.ypp" +#line 218 "../src/parse/parser.ypp" { in->config (* (yyvsp[(1) - (4)].str), (yyvsp[(3) - (4)].number)); delete (yyvsp[(1) - (4)].str); @@ -1656,7 +1654,7 @@ yyreduce: case 11: /* Line 1464 of yacc.c */ -#line 228 "../src/parse/parser.ypp" +#line 226 "../src/parse/parser.ypp" { if (cFlag) { @@ -1670,7 +1668,7 @@ yyreduce: case 12: /* Line 1464 of yacc.c */ -#line 237 "../src/parse/parser.ypp" +#line 235 "../src/parse/parser.ypp" { if (cFlag) in->fatal("condition or '<*>' required when using -c switch"); @@ -1684,7 +1682,7 @@ yyreduce: case 13: /* Line 1464 of yacc.c */ -#line 246 "../src/parse/parser.ypp" +#line 244 "../src/parse/parser.ypp" { context_rule((yyvsp[(2) - (7)].clist), (yyvsp[(4) - (7)].regexp), (yyvsp[(5) - (7)].regexp), (yyvsp[(6) - (7)].str), (yyvsp[(7) - (7)].token)); ;} @@ -1693,7 +1691,7 @@ yyreduce: case 14: /* Line 1464 of yacc.c */ -#line 250 "../src/parse/parser.ypp" +#line 248 "../src/parse/parser.ypp" { assert((yyvsp[(7) - (7)].str)); context_rule((yyvsp[(2) - (7)].clist), (yyvsp[(4) - (7)].regexp), (yyvsp[(5) - (7)].regexp), (yyvsp[(7) - (7)].str), NULL); @@ -1703,7 +1701,7 @@ yyreduce: case 15: /* Line 1464 of yacc.c */ -#line 255 "../src/parse/parser.ypp" +#line 253 "../src/parse/parser.ypp" { context_none((yyvsp[(2) - (6)].clist)); delete (yyvsp[(5) - (6)].str); @@ -1713,7 +1711,7 @@ yyreduce: case 16: /* Line 1464 of yacc.c */ -#line 260 "../src/parse/parser.ypp" +#line 258 "../src/parse/parser.ypp" { assert((yyvsp[(6) - (6)].str)); context_none((yyvsp[(2) - (6)].clist)); @@ -1724,7 +1722,7 @@ yyreduce: case 17: /* Line 1464 of yacc.c */ -#line 266 "../src/parse/parser.ypp" +#line 264 "../src/parse/parser.ypp" { default_rule((yyvsp[(2) - (5)].clist), (yyvsp[(5) - (5)].token)); ;} @@ -1733,7 +1731,7 @@ yyreduce: case 18: /* Line 1464 of yacc.c */ -#line 270 "../src/parse/parser.ypp" +#line 268 "../src/parse/parser.ypp" { context_check(NULL); Token *token = new Token((yyvsp[(7) - (7)].token), (yyvsp[(7) - (7)].token)->source, (yyvsp[(7) - (7)].token)->line, (yyvsp[(6) - (7)].str)); @@ -1746,7 +1744,7 @@ yyreduce: case 19: /* Line 1464 of yacc.c */ -#line 278 "../src/parse/parser.ypp" +#line 276 "../src/parse/parser.ypp" { assert((yyvsp[(7) - (7)].str)); context_check(NULL); @@ -1759,7 +1757,7 @@ yyreduce: case 20: /* Line 1464 of yacc.c */ -#line 286 "../src/parse/parser.ypp" +#line 284 "../src/parse/parser.ypp" { context_none(NULL); delete (yyvsp[(5) - (6)].str); @@ -1769,7 +1767,7 @@ yyreduce: case 21: /* Line 1464 of yacc.c */ -#line 291 "../src/parse/parser.ypp" +#line 289 "../src/parse/parser.ypp" { assert((yyvsp[(6) - (6)].str)); context_none(NULL); @@ -1780,7 +1778,7 @@ yyreduce: case 22: /* Line 1464 of yacc.c */ -#line 297 "../src/parse/parser.ypp" +#line 295 "../src/parse/parser.ypp" { CondList *clist = new CondList(); clist->insert("*"); @@ -1791,7 +1789,7 @@ yyreduce: case 23: /* Line 1464 of yacc.c */ -#line 303 "../src/parse/parser.ypp" +#line 301 "../src/parse/parser.ypp" { context_check(NULL); if (specNone) @@ -1808,7 +1806,7 @@ yyreduce: case 24: /* Line 1464 of yacc.c */ -#line 315 "../src/parse/parser.ypp" +#line 313 "../src/parse/parser.ypp" { assert((yyvsp[(3) - (3)].str)); context_check(NULL); @@ -1825,7 +1823,7 @@ yyreduce: case 25: /* Line 1464 of yacc.c */ -#line 327 "../src/parse/parser.ypp" +#line 325 "../src/parse/parser.ypp" { CondList *clist = new CondList(); clist->insert("*"); @@ -1836,7 +1834,7 @@ yyreduce: case 26: /* Line 1464 of yacc.c */ -#line 333 "../src/parse/parser.ypp" +#line 331 "../src/parse/parser.ypp" { setup_rule((yyvsp[(2) - (4)].clist), (yyvsp[(4) - (4)].token)); ;} @@ -1845,7 +1843,7 @@ yyreduce: case 27: /* Line 1464 of yacc.c */ -#line 340 "../src/parse/parser.ypp" +#line 338 "../src/parse/parser.ypp" { in->fatal("unnamed condition not supported"); ;} @@ -1854,7 +1852,7 @@ yyreduce: case 28: /* Line 1464 of yacc.c */ -#line 344 "../src/parse/parser.ypp" +#line 342 "../src/parse/parser.ypp" { (yyval.clist) = (yyvsp[(1) - (1)].clist); ;} @@ -1863,7 +1861,7 @@ yyreduce: case 29: /* Line 1464 of yacc.c */ -#line 351 "../src/parse/parser.ypp" +#line 349 "../src/parse/parser.ypp" { (yyval.clist) = new CondList(); (yyval.clist)->insert(* (yyvsp[(1) - (1)].str)); @@ -1874,7 +1872,7 @@ yyreduce: case 30: /* Line 1464 of yacc.c */ -#line 357 "../src/parse/parser.ypp" +#line 355 "../src/parse/parser.ypp" { (yyvsp[(1) - (3)].clist)->insert(* (yyvsp[(3) - (3)].str)); delete (yyvsp[(3) - (3)].str); @@ -1885,7 +1883,7 @@ yyreduce: case 31: /* Line 1464 of yacc.c */ -#line 366 "../src/parse/parser.ypp" +#line 364 "../src/parse/parser.ypp" { (yyval.str) = NULL; ;} @@ -1894,7 +1892,7 @@ yyreduce: case 32: /* Line 1464 of yacc.c */ -#line 370 "../src/parse/parser.ypp" +#line 368 "../src/parse/parser.ypp" { (yyval.str) = (yyvsp[(3) - (3)].str); ;} @@ -1903,7 +1901,7 @@ yyreduce: case 33: /* Line 1464 of yacc.c */ -#line 377 "../src/parse/parser.ypp" +#line 375 "../src/parse/parser.ypp" { (yyval.regexp) = new NullOp; ;} @@ -1912,7 +1910,7 @@ yyreduce: case 34: /* Line 1464 of yacc.c */ -#line 381 "../src/parse/parser.ypp" +#line 379 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(2) - (2)].regexp); ;} @@ -1921,7 +1919,7 @@ yyreduce: case 35: /* Line 1464 of yacc.c */ -#line 388 "../src/parse/parser.ypp" +#line 386 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -1930,7 +1928,7 @@ yyreduce: case 36: /* Line 1464 of yacc.c */ -#line 392 "../src/parse/parser.ypp" +#line 390 "../src/parse/parser.ypp" { (yyval.regexp) = mkAlt((yyvsp[(1) - (3)].regexp), (yyvsp[(3) - (3)].regexp)); ;} @@ -1939,7 +1937,7 @@ yyreduce: case 37: /* Line 1464 of yacc.c */ -#line 399 "../src/parse/parser.ypp" +#line 397 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -1948,7 +1946,7 @@ yyreduce: case 38: /* Line 1464 of yacc.c */ -#line 403 "../src/parse/parser.ypp" +#line 401 "../src/parse/parser.ypp" { (yyval.regexp) = mkDiff((yyvsp[(1) - (3)].regexp), (yyvsp[(3) - (3)].regexp)); if(!(yyval.regexp)) @@ -1961,7 +1959,7 @@ yyreduce: case 39: /* Line 1464 of yacc.c */ -#line 414 "../src/parse/parser.ypp" +#line 412 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -1970,7 +1968,7 @@ yyreduce: case 40: /* Line 1464 of yacc.c */ -#line 418 "../src/parse/parser.ypp" +#line 416 "../src/parse/parser.ypp" { (yyval.regexp) = new CatOp((yyvsp[(1) - (2)].regexp), (yyvsp[(2) - (2)].regexp)); ;} @@ -1979,7 +1977,7 @@ yyreduce: case 41: /* Line 1464 of yacc.c */ -#line 425 "../src/parse/parser.ypp" +#line 423 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -1988,7 +1986,7 @@ yyreduce: case 42: /* Line 1464 of yacc.c */ -#line 429 "../src/parse/parser.ypp" +#line 427 "../src/parse/parser.ypp" { switch((yyvsp[(2) - (2)].op)) { @@ -2008,7 +2006,7 @@ yyreduce: case 43: /* Line 1464 of yacc.c */ -#line 444 "../src/parse/parser.ypp" +#line 442 "../src/parse/parser.ypp" { (yyval.regexp) = new CloseVOp((yyvsp[(1) - (2)].regexp), (yyvsp[(2) - (2)].extop).minsize, (yyvsp[(2) - (2)].extop).maxsize); ;} @@ -2017,7 +2015,7 @@ yyreduce: case 44: /* Line 1464 of yacc.c */ -#line 451 "../src/parse/parser.ypp" +#line 449 "../src/parse/parser.ypp" { (yyval.op) = (yyvsp[(1) - (1)].op); ;} @@ -2026,7 +2024,7 @@ yyreduce: case 45: /* Line 1464 of yacc.c */ -#line 455 "../src/parse/parser.ypp" +#line 453 "../src/parse/parser.ypp" { (yyval.op) = (yyvsp[(1) - (1)].op); ;} @@ -2035,7 +2033,7 @@ yyreduce: case 46: /* Line 1464 of yacc.c */ -#line 459 "../src/parse/parser.ypp" +#line 457 "../src/parse/parser.ypp" { (yyval.op) = ((yyvsp[(1) - (2)].op) == (yyvsp[(2) - (2)].op)) ? (yyvsp[(1) - (2)].op) : '*'; ;} @@ -2044,7 +2042,7 @@ yyreduce: case 47: /* Line 1464 of yacc.c */ -#line 463 "../src/parse/parser.ypp" +#line 461 "../src/parse/parser.ypp" { (yyval.op) = ((yyvsp[(1) - (2)].op) == (yyvsp[(2) - (2)].op)) ? (yyvsp[(1) - (2)].op) : '*'; ;} @@ -2053,7 +2051,7 @@ yyreduce: case 48: /* Line 1464 of yacc.c */ -#line 470 "../src/parse/parser.ypp" +#line 468 "../src/parse/parser.ypp" { symbol_table_t::iterator i = symbol_table.find (* (yyvsp[(1) - (1)].str)); delete (yyvsp[(1) - (1)].str); @@ -2068,7 +2066,7 @@ yyreduce: case 49: /* Line 1464 of yacc.c */ -#line 480 "../src/parse/parser.ypp" +#line 478 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -2077,7 +2075,7 @@ yyreduce: case 50: /* Line 1464 of yacc.c */ -#line 484 "../src/parse/parser.ypp" +#line 482 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(1) - (1)].regexp); ;} @@ -2086,7 +2084,7 @@ yyreduce: case 51: /* Line 1464 of yacc.c */ -#line 488 "../src/parse/parser.ypp" +#line 486 "../src/parse/parser.ypp" { (yyval.regexp) = (yyvsp[(2) - (3)].regexp); ;} @@ -2095,7 +2093,7 @@ yyreduce: /* Line 1464 of yacc.c */ -#line 2099 "./parser.cc" +#line 2097 "./parser.cc" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2307,7 +2305,7 @@ yyreturn: /* Line 1684 of yacc.c */ -#line 493 "../src/parse/parser.ypp" +#line 491 "../src/parse/parser.ypp" extern "C" { diff --git a/re2c/bootstrap/y.tab.h b/re2c/bootstrap/y.tab.h index 7a383c09..4b104395 100644 --- a/re2c/bootstrap/y.tab.h +++ b/re2c/bootstrap/y.tab.h @@ -61,7 +61,7 @@ typedef union YYSTYPE { /* Line 1685 of yacc.c */ -#line 150 "../src/parse/parser.ypp" +#line 148 "../src/parse/parser.ypp" re2c::RegExp *regexp; re2c::Token *token; diff --git a/re2c/src/dfa/actions.cc b/re2c/src/dfa/actions.cc index b6ae6e2e..0bc9ce54 100644 --- a/re2c/src/dfa/actions.cc +++ b/re2c/src/dfa/actions.cc @@ -1,4 +1,3 @@ -/* $Id$ */ #include #include #include diff --git a/re2c/src/dfa/ins.h b/re2c/src/dfa/ins.h index b2d9bb93..6c935ae7 100644 --- a/re2c/src/dfa/ins.h +++ b/re2c/src/dfa/ins.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _ins_h #define _ins_h diff --git a/re2c/src/dfa/re.h b/re2c/src/dfa/re.h index 3b0b2790..483f1d02 100644 --- a/re2c/src/dfa/re.h +++ b/re2c/src/dfa/re.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _re_h #define _re_h diff --git a/re2c/src/globals.h b/re2c/src/globals.h index 34cab73b..77053224 100644 --- a/re2c/src/globals.h +++ b/re2c/src/globals.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _globals_h #define _globals_h diff --git a/re2c/src/main.cc b/re2c/src/main.cc index 3dd18245..d14975bf 100644 --- a/re2c/src/main.cc +++ b/re2c/src/main.cc @@ -1,5 +1,3 @@ -/* $Id$ */ - #include #include #include diff --git a/re2c/src/mbo_getopt.cc b/re2c/src/mbo_getopt.cc index 161f3b3f..51a3d76f 100644 --- a/re2c/src/mbo_getopt.cc +++ b/re2c/src/mbo_getopt.cc @@ -2,8 +2,6 @@ Author: Marcus Boerger */ -/* $Id$ */ - #include #include #include diff --git a/re2c/src/mbo_getopt.h b/re2c/src/mbo_getopt.h index 3b013cb2..915fdcc0 100644 --- a/re2c/src/mbo_getopt.h +++ b/re2c/src/mbo_getopt.h @@ -2,8 +2,6 @@ Author: Marcus Boerger */ -/* $Id$ */ - /* Define structure for one recognized option (both single char and long name). * If short_open is '-' this is the last option. */ diff --git a/re2c/src/parse/parser.ypp b/re2c/src/parse/parser.ypp index 08f4f9af..5e09281a 100644 --- a/re2c/src/parse/parser.ypp +++ b/re2c/src/parse/parser.ypp @@ -1,7 +1,5 @@ %{ -/* $Id$ */ - #include #include #include diff --git a/re2c/src/parse/scanner.h b/re2c/src/parse/scanner.h index 88e81d90..bdf342c3 100644 --- a/re2c/src/parse/scanner.h +++ b/re2c/src/parse/scanner.h @@ -1,4 +1,3 @@ -/* $Id$ */ #ifndef _scanner_h #define _scanner_h -- 2.40.0