Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/flex/dist/src Regen without #line directives.



details:   https://anonhg.NetBSD.org/src/rev/4d37671fa8e6
branches:  trunk
changeset: 814377:4d37671fa8e6
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Thu Mar 17 15:28:00 2016 +0000

description:
Regen without #line directives.
- nbyacc -l -d -o initparse.c parse.y
- nblex -L -t -p scan.l > initscan.c

diffstat:

 external/bsd/flex/dist/src/initparse.c |   93 +---------
 external/bsd/flex/dist/src/initscan.c  |  306 +--------------------------------
 2 files changed, 4 insertions(+), 395 deletions(-)

diffs (truncated from 2192 to 300 lines):

diff -r 4d4531fadaf1 -r 4d37671fa8e6 external/bsd/flex/dist/src/initparse.c
--- a/external/bsd/flex/dist/src/initparse.c    Thu Mar 17 15:25:46 2016 +0000
+++ b/external/bsd/flex/dist/src/initparse.c    Thu Mar 17 15:28:00 2016 +0000
@@ -19,7 +19,6 @@
 
 #define YYPURE 0
 
-#line 37 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
 /*  Copyright (c) 1990 The Regents of the University of California. */
 /*  All rights reserved. */
 
@@ -51,7 +50,7 @@
 /*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
 /*  PURPOSE. */
 #include "flexdef.h"
-__RCSID("$NetBSD: initparse.c,v 1.1 2016/01/09 17:39:52 christos Exp $");
+__RCSID("$NetBSD: initparse.c,v 1.2 2016/03/17 15:28:00 nakayama Exp $");
 
 #include "tables.h"
 
@@ -101,7 +100,6 @@
  */
 #define YYSTYPE int
 
-#line 105 "parse.c"
 
 #if ! defined(YYSTYPE) && ! defined(YYSTYPE_IS_DECLARED)
 /* Default: YYSTYPE is the semantic value type. */
@@ -606,7 +604,6 @@
 } YYSTACKDATA;
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
-#line 951 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
 
 
 /* build_eof_action - build the "<<EOF>>" action for the active start
@@ -750,7 +747,6 @@
        {
                (void)msg;
        }
-#line 754 "parse.c"
 
 #if YYDEBUG
 #include <stdio.h>             /* needed for printf */
@@ -953,7 +949,6 @@
     switch (yyn)
     {
 case 1:
-#line 122 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { /* add default rule */
                        int def_rule;
 
@@ -982,7 +977,6 @@
                        }
 break;
 case 2:
-#line 151 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { /* initialize for processing rules */
 
                        /* Create default DFA start condition. */
@@ -990,11 +984,9 @@
                        }
 break;
 case 6:
-#line 162 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { synerr( _("unknown error processing section 1") ); }
 break;
 case 7:
-#line 166 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        check_options();
                        scon_stk = allocate_integer_array( lastsc + 1 );
@@ -1002,62 +994,48 @@
                        }
 break;
 case 8:
-#line 174 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { xcluflg = false; }
 break;
 case 9:
-#line 177 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { xcluflg = true; }
 break;
 case 10:
-#line 181 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { scinstal( nmstr, xcluflg ); }
 break;
 case 11:
-#line 184 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { scinstal( nmstr, xcluflg ); }
 break;
 case 12:
-#line 187 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { synerr( _("bad start condition list") ); }
 break;
 case 16:
-#line 198 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        outfilename = copy_string( nmstr );
                        did_outfilename = 1;
                        }
 break;
 case 17:
-#line 203 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { extra_type = copy_string( nmstr ); }
 break;
 case 18:
-#line 205 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { prefix = copy_string( nmstr ); }
 break;
 case 19:
-#line 207 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyclass = copy_string( nmstr ); }
 break;
 case 20:
-#line 209 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { headerfilename = copy_string( nmstr ); }
 break;
 case 21:
-#line 211 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { tablesext = true; tablesfilename = copy_string( nmstr ); }
 break;
 case 22:
-#line 215 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { scon_stk_ptr = yystack.l_mark[-3]; }
 break;
 case 23:
-#line 217 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { scon_stk_ptr = yystack.l_mark[-3]; }
 break;
 case 25:
-#line 222 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        /* Initialize for a parse of one rule. */
                        trlcontxt = variable_trail_rule = varlength = false;
@@ -1070,7 +1048,6 @@
                        }
 break;
 case 26:
-#line 235 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        pat = yystack.l_mark[0];
                        finish_rule( pat, variable_trail_rule,
@@ -1107,7 +1084,6 @@
                        }
 break;
 case 27:
-#line 271 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        pat = yystack.l_mark[0];
                        finish_rule( pat, variable_trail_rule,
@@ -1132,7 +1108,6 @@
                        }
 break;
 case 28:
-#line 295 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        if ( scon_stk_ptr > 0 )
                                build_eof_action();
@@ -1156,19 +1131,15 @@
                        }
 break;
 case 29:
-#line 318 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { synerr( _("unrecognized rule") ); }
 break;
 case 30:
-#line 322 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyval = scon_stk_ptr; }
 break;
 case 31:
-#line 326 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyval = yystack.l_mark[-2]; }
 break;
 case 32:
-#line 329 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        yyval = scon_stk_ptr;
 
@@ -1186,15 +1157,12 @@
                        }
 break;
 case 33:
-#line 346 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyval = scon_stk_ptr; }
 break;
 case 36:
-#line 354 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { synerr( _("bad start condition list") ); }
 break;
 case 37:
-#line 358 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        if ( (scnum = sclookup( nmstr )) == 0 )
                                format_pinpoint_message(
@@ -1217,7 +1185,6 @@
                        }
 break;
 case 38:
-#line 381 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        if ( transchar[lastst[yystack.l_mark[0]]] != SYM_EPSILON )
                                /* Provide final transition \now/ so it
@@ -1274,11 +1241,9 @@
                        }
 break;
 case 39:
-#line 437 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { synerr( _("trailing context used twice") ); }
 break;
 case 40:
-#line 440 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        headcnt = 0;
                        trailcnt = 1;
@@ -1322,7 +1287,6 @@
                        }
 break;
 case 41:
-#line 483 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        yyval = yystack.l_mark[0];
 
@@ -1339,18 +1303,15 @@
                        }
 break;
 case 42:
-#line 501 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;
                        yyval = mkor( yystack.l_mark[-2], yystack.l_mark[0] );
                        }
 break;
 case 43:
-#line 507 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyval = yystack.l_mark[0]; }
 break;
 case 44:
-#line 512 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        /* This rule is written separately so the
                         * reduction will occur before the trailing
@@ -1377,7 +1338,6 @@
                        }
 break;
 case 45:
-#line 539 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        /* This is where concatenation of adjacent patterns
                         * gets done.
@@ -1386,11 +1346,9 @@
                        }
 break;
 case 46:
-#line 547 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        { yyval = yystack.l_mark[0]; }
 break;
 case 47:
-#line 550 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;
 
@@ -1419,7 +1377,6 @@
                        }
 break;
 case 48:
-#line 578 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;
 
@@ -1434,7 +1391,6 @@
                        }
 break;
 case 49:
-#line 592 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        /* The series could be something like "(foo)",
                         * in which case we have no idea what its length
@@ -1455,7 +1411,6 @@
                        }
 break;
 case 50:
-#line 614 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;
 
@@ -1463,21 +1418,18 @@
                        }
 break;
 case 51:
-#line 621 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;
                        yyval = mkposcl( yystack.l_mark[-1] );
                        }
 break;
 case 52:
-#line 627 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y"
        {
                        varlength = true;



Home | Main Index | Thread Index | Old Index