From owner-svn-src-all@FreeBSD.ORG Wed May 1 00:04:30 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 46DB6CE4; Wed, 1 May 2013 00:04:30 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 391A91FF1; Wed, 1 May 2013 00:04:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4104U8O067687; Wed, 1 May 2013 00:04:30 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4104TmY067682; Wed, 1 May 2013 00:04:29 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201305010004.r4104TmY067682@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 1 May 2013 00:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r250128 - vendor/flex/dist X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 May 2013 00:04:30 -0000 Author: jkim Date: Wed May 1 00:04:29 2013 New Revision: 250128 URL: http://svnweb.freebsd.org/changeset/base/250128 Log: Merge some important post-2.5.37 changes from upstream. http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=c53fd2db8c78fef5afd284c3e64da51bc71cf6c3 http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=899b2163bbde1a70b3be8b91cbbabd8007341205 http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=7642bd98aebb62260df923f57b794138dab6f1e7 http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=11b7c6cea340c2fca9b49ec635a45bd34361afe9 http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=ec2fdb85e0bac6e8aeca405094506e4cf8bfc0b6 Modified: vendor/flex/dist/flex.skl vendor/flex/dist/flexdef.h vendor/flex/dist/gen.c vendor/flex/dist/main.c Modified: vendor/flex/dist/flex.skl ============================================================================== --- vendor/flex/dist/flex.skl Tue Apr 30 23:51:11 2013 (r250127) +++ vendor/flex/dist/flex.skl Wed May 1 00:04:29 2013 (r250128) @@ -727,6 +727,11 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here +m4_ifdef( [[M4_YY_NOT_IN_HEADER]], +[[ +%% [1.5] DFA +]]) + %if-c-only Standard (non-C++) definition m4_ifdef( [[M4_YY_NOT_IN_HEADER]], @@ -1272,8 +1277,6 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], ]]) ]]) -%% [7.0] user's declarations go here - m4_ifdef( [[M4_YY_BISON_LVAL]], [[ yylval = yylval_param; @@ -1329,6 +1332,9 @@ m4_ifdef( [[M4_YY_USES_REJECT]], yy_load_buffer_state( M4_YY_CALL_ONLY_ARG ); } + { +%% [7.0] user's declarations go here + while ( 1 ) /* loops until end-of-file is reached */ { %% [8.0] yymore()-related code goes here @@ -1486,6 +1492,7 @@ do_action: /* This label is used only to "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ %ok-for-header @@ -2360,7 +2367,7 @@ YY_BUFFER_STATE yy_scan_bytes YYFARGS2( YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; m4_dnl M4_YY_DECL_GUTS_VAR(); /* Get memory for full buffer, including space for trailing EOB's. */ Modified: vendor/flex/dist/flexdef.h ============================================================================== --- vendor/flex/dist/flexdef.h Tue Apr 30 23:51:11 2013 (r250127) +++ vendor/flex/dist/flexdef.h Wed May 1 00:04:29 2013 (r250128) @@ -908,6 +908,9 @@ extern void lerrif PROTO ((const char *, /* Report an error message formatted with one string argument. */ extern void lerrsf PROTO ((const char *, const char *)); +/* Like lerrsf, but also exit after displaying message. */ +extern void lerrsf_fatal PROTO ((const char *, const char *)); + /* Spit out a "#line" statement. */ extern void line_directive_out PROTO ((FILE *, int)); Modified: vendor/flex/dist/gen.c ============================================================================== --- vendor/flex/dist/gen.c Tue Apr 30 23:51:11 2013 (r250127) +++ vendor/flex/dist/gen.c Wed May 1 00:04:29 2013 (r250128) @@ -874,7 +874,7 @@ void gen_next_state (worry_about_NULs) else strcpy (char_map, useecs ? - "yy_ec[YY_SC_TO_UI(*yy_cp)]" : + "yy_ec[YY_SC_TO_UI(*yy_cp)] " : "YY_SC_TO_UI(*yy_cp)"); if (worry_about_NULs && nultrans) { @@ -1972,7 +1972,7 @@ void make_tables () ("if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )"); indent_up (); indent_puts ("{"); - indent_puts ("int yyl;"); + indent_puts ("yy_size_t yyl;"); do_indent (); out_str ("for ( yyl = %s; yyl < yyleng; ++yyl )\n", yymore_used ? (yytext_is_array ? "YY_G(yy_prev_more_offset)" : Modified: vendor/flex/dist/main.c ============================================================================== --- vendor/flex/dist/main.c Tue Apr 30 23:51:11 2013 (r250127) +++ vendor/flex/dist/main.c Wed May 1 00:04:29 2013 (r250128) @@ -182,6 +182,8 @@ int flex_main (argc, argv) readin (); + skelout (); + /* %% [1.5] DFA */ ntod (); for (i = 1; i <= num_rules; ++i) @@ -240,11 +242,6 @@ void check_options () flexerror (_ ("Can't use --reentrant or --bison-bridge with -l option")); - /* Don't rely on detecting use of yymore() and REJECT, - * just assume they'll be used. - */ - yymore_really_used = reject_really_used = true; - yytext_is_array = true; do_yylineno = true; use_read = false;