CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: joerg Date: Sat Apr 25 18:56:26 UTC 2020 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: Fix misindentations in the flex skeleton triggered by dtrace's dt_lex.l. Upstream committed as a631f5da8d4fd60fbde7b06bcf43bc9a155c27d5 To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.13 src/external/bsd/flex/dist/src/flex.skl:1.14 --- src/external/bsd/flex/dist/src/flex.skl:1.13 Sun Dec 23 22:14:29 2018 +++ src/external/bsd/flex/dist/src/flex.skl Sat Apr 25 18:56:26 2020 @@ -1216,11 +1216,11 @@ m4_ifdef( [[]], m4_ifdef( [[M4_YY_USES_REJECT]], [[ -/* Create the reject buffer large enough to save one state per allowed character. */ -if ( ! YY_G(yy_state_buf) ) -YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG); -if ( ! YY_G(yy_state_buf) ) -YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); + /* Create the reject buffer large enough to save one state per allowed character. */ + if ( ! YY_G(yy_state_buf) ) + YY_G(yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE M4_YY_CALL_LAST_ARG); + if ( ! YY_G(yy_state_buf) ) + YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); ]]) if ( ! YY_G(yy_start) ) @@ -1749,7 +1749,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], %% [17.0] code to find the next state, and perhaps do backing up, goes here M4_YY_NOOP_GUTS_VAR(); - return yy_is_jam ? 0 : yy_current_state; +return yy_is_jam ? 0 : yy_current_state; }
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sun Mar 11 18:32:10 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: libmain.c libyywrap.c Log Message: don't need sys/cdefs.h if tool. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/libmain.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/src/libyywrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/libmain.c diff -u src/external/bsd/flex/dist/src/libmain.c:1.3 src/external/bsd/flex/dist/src/libmain.c:1.4 --- src/external/bsd/flex/dist/src/libmain.c:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/libmain.c Sun Mar 11 14:32:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */ +/* $NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $ */ /* libmain - flex run-time support library "main" function */ @@ -22,9 +22,11 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ +#ifndef HAVE_NBTOOL_CONFIG_H #include #ifdef __RCSID -__RCSID("$NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $"); +__RCSID("$NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $"); +#endif #endif #include Index: src/external/bsd/flex/dist/src/libyywrap.c diff -u src/external/bsd/flex/dist/src/libyywrap.c:1.2 src/external/bsd/flex/dist/src/libyywrap.c:1.3 --- src/external/bsd/flex/dist/src/libyywrap.c:1.2 Sat Jan 9 12:38:57 2016 +++ src/external/bsd/flex/dist/src/libyywrap.c Sun Mar 11 14:32:10 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */ +/* $NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $ */ /* libyywrap - flex run-time support library "yywrap" function */ @@ -22,9 +22,11 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ +#ifndef HAVE_NBTOOL_CONFIG_H #include #ifdef __RCSID -__RCSID("$NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $"); +__RCSID("$NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $"); +#endif #endif int yywrap (void);
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: alnsn Date: Sun Jan 27 03:01:48 UTC 2019 Modified Files: src/external/bsd/flex/dist/src: libyywrap.c Log Message: Remove extra #endif. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/libyywrap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/libyywrap.c diff -u src/external/bsd/flex/dist/src/libyywrap.c:1.4 src/external/bsd/flex/dist/src/libyywrap.c:1.5 --- src/external/bsd/flex/dist/src/libyywrap.c:1.4 Sun Jan 27 02:08:34 2019 +++ src/external/bsd/flex/dist/src/libyywrap.c Sun Jan 27 03:01:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: libyywrap.c,v 1.4 2019/01/27 02:08:34 pgoyette Exp $ */ +/* $NetBSD: libyywrap.c,v 1.5 2019/01/27 03:01:48 alnsn Exp $ */ /* libyywrap - flex run-time support library "yywrap" function */ @@ -25,8 +25,7 @@ #ifndef HAVE_NBTOOL_CONFIG_H #include #ifdef __RCSID -__RCSID("$NetBSD: libyywrap.c,v 1.4 2019/01/27 02:08:34 pgoyette Exp $"); -#endif +__RCSID("$NetBSD: libyywrap.c,v 1.5 2019/01/27 03:01:48 alnsn Exp $"); #endif #endif
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: oster Date: Sun Jan 27 03:19:42 UTC 2019 Modified Files: src/external/bsd/flex/dist/src: libmain.c Log Message: Remove extra #endif. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/libmain.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/libmain.c diff -u src/external/bsd/flex/dist/src/libmain.c:1.5 src/external/bsd/flex/dist/src/libmain.c:1.6 --- src/external/bsd/flex/dist/src/libmain.c:1.5 Sun Jan 27 02:08:34 2019 +++ src/external/bsd/flex/dist/src/libmain.c Sun Jan 27 03:19:42 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: libmain.c,v 1.5 2019/01/27 02:08:34 pgoyette Exp $ */ +/* $NetBSD: libmain.c,v 1.6 2019/01/27 03:19:42 oster Exp $ */ /* libmain - flex run-time support library "main" function */ @@ -25,8 +25,7 @@ #ifndef HAVE_NBTOOL_CONFIG_H #include #ifdef __RCSID -__RCSID("$NetBSD: libmain.c,v 1.5 2019/01/27 02:08:34 pgoyette Exp $"); -#endif +__RCSID("$NetBSD: libmain.c,v 1.6 2019/01/27 03:19:42 oster Exp $"); #endif #endif
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sun Dec 23 22:14:29 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: fix incorrect cast. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.12 src/external/bsd/flex/dist/src/flex.skl:1.13 --- src/external/bsd/flex/dist/src/flex.skl:1.12 Sun Dec 23 11:27:17 2018 +++ src/external/bsd/flex/dist/src/flex.skl Sun Dec 23 17:14:29 2018 @@ -1694,7 +1694,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (yy_size_t) (new_size - 2); } YY_G(yy_n_chars) += number_to_move;
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sat Jan 9 18:28:41 UTC 2016 Added Files: src/external/bsd/flex/dist/src: scan.l Log Message: Re-add. To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/flex/dist/src/scan.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/flex/dist/src/scan.l diff -u /dev/null src/external/bsd/flex/dist/src/scan.l:1.3 --- /dev/null Sat Jan 9 13:28:41 2016 +++ src/external/bsd/flex/dist/src/scan.l Sat Jan 9 13:28:41 2016 @@ -0,0 +1,1029 @@ +/* scan.l - scanner for flex input -*-C-*- */ + +%{ +/* Copyright (c) 1990 The Regents of the University of California. */ +/* All rights reserved. */ + +/* This code is derived from software contributed to Berkeley by */ +/* Vern Paxson. */ + +/* The United States Government has rights in this work pursuant */ +/* to contract no. DE-AC03-76SF00098 between the United States */ +/* Department of Energy and the University of California. */ + +/* This file is part of flex. */ + +/* Redistribution and use in source and binary forms, with or without */ +/* modification, are permitted provided that the following conditions */ +/* are met: */ + +/* 1. Redistributions of source code must retain the above copyright */ +/* notice, this list of conditions and the following disclaimer. */ +/* 2. Redistributions in binary form must reproduce the above copyright */ +/* notice, this list of conditions and the following disclaimer in the */ +/* documentation and/or other materials provided with the distribution. */ + +/* Neither the name of the University nor the names of its contributors */ +/* may be used to endorse or promote products derived from this software */ +/* without specific prior written permission. */ + +/* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */ +/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ +/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ +/* PURPOSE. */ + +#include "flexdef.h" +#include "parse.h" +extern bool tablesverify, tablesext; +extern int trlcontxt; /* Set in parse.y for each rule. */ +extern const char *escaped_qstart, *escaped_qend; + +#define ACTION_ECHO add_action( yytext ) +#define ACTION_IFDEF(def, should_define) \ + { \ + if ( should_define ) \ + action_define( def, 1 ); \ + } + +#define ACTION_ECHO_QSTART add_action (escaped_qstart) +#define ACTION_ECHO_QEND add_action (escaped_qend) + +#define ACTION_M4_IFDEF(def, should_define) \ +do{ \ +if ( should_define ) \ +buf_m4_define( &m4defs_buf, def, NULL);\ +else \ +buf_m4_undefine( &m4defs_buf, def);\ +} while(0) + +#define MARK_END_OF_PROLOG mark_prolog(); + +#define YY_DECL \ + int flexscan() + +#define RETURNCHAR \ + yylval = (unsigned char) yytext[0]; \ + return CHAR; + +#define RETURNNAME \ + if(yyleng < MAXLINE) \ + { \ + strcpy( nmstr, yytext ); \ + } \ + else \ + { \ + synerr(_("Input line too long\n")); \ + FLEX_EXIT(EXIT_FAILURE); \ + } \ + return NAME; + +#define PUT_BACK_STRING(str, start) \ + for ( i = strlen( str ) - 1; i >= start; --i ) \ + unput((str)[i]) + +#define CHECK_REJECT(str) \ + if ( all_upper( str ) ) \ + reject = true; + +#define CHECK_YYMORE(str) \ + if ( all_lower( str ) ) \ + yymore_used = true; + +#define YY_USER_INIT \ + if ( getenv("POSIXLY_CORRECT") ) \ + posix_compat = true; + +%} + +%option caseless nodefault noreject stack noyy_top_state +%option nostdinit + +%x SECT2 SECT2PROLOG SECT3 CODEBLOCK PICKUPDEF SC CARETISBOL NUM QUOTE +%x FIRSTCCL CCL ACTION RECOVER COMMENT ACTION_STRING PERCENT_BRACE_ACTION +%x OPTION LINEDIR CODEBLOCK_MATCH_BRACE +%x GROUP_WITH_PARAMS +%x GROUP_MINUS_PARAMS +%x EXTENDED_COMMENT +%x COMMENT_DISCARD + +WS [[:blank:]]+ +OPTWS [[:blank:]]* +NOT_WS [^[:blank:]\r\n] + +NL \r?\n + +NAME ([[:alpha:]_][[:alnum:]_-]*) +NOT_NAME [^[:alpha:]_*\n]+ + +SCNAME {NAME} + +ESCSEQ (\\([^\n]|[0-7]{1,3}|x[[:xdigit:]]{1,2})) + +FIRST_CCL_CHAR ([^\\\n]|{ESCSEQ}) +CCL_CHAR ([^\\\n\]]|{ESCSEQ}) +CCL_EXPR ("[:"^?[[:alpha:]]+":]") + +LEXOPT [aceknopr] + +M4QSTART"[[" +M4QEND "]]" + +%% + static int bracelevel, didadef, indented_code; + static int doing_rule_action = false; + static int option_sense; + + int doing_codeblock = false; + int i, brace_depth=0, brace_start_line=0; + Char nmdef[MAXLINE]; + + +{ + ^{WS} indented_code = true; BEGIN(CODEBLOCK); + ^"/*" ACTION_ECHO; yy_push_state( COMMENT ); + ^#{OPTWS}line{WS} yy_push_state( LINEDIR ); + ^"%s"{NAME}? return SCDECL; + ^"%x"{NAME}? return XSCDECL; + ^"%{".*{NL} { + ++linenum; + line_directive_out( (FILE *) 0, 1 ); + indented_code = false; + BEGIN(CODEBLOCK); + } +^"%top"[[:blank:]]*"{"[[:blank:]]*{NL}{ +brace_start_line = linenum; +++linenum; +buf_linedir( &top_buf, infilename?i
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sat Jan 9 18:29:13 UTC 2016 Removed Files: src/external/bsd/flex/dist/src: scan.c Log Message: delete the generated file. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/src/scan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Aug 20 08:51:57 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: flexdef.h Log Message: PR/53511: Palle Lyckegaard: Fix compiling flex on a Solaris 11 host system To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/flexdef.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flexdef.h diff -u src/external/bsd/flex/dist/src/flexdef.h:1.3 src/external/bsd/flex/dist/src/flexdef.h:1.4 --- src/external/bsd/flex/dist/src/flexdef.h:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/flexdef.h Mon Aug 20 04:51:56 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: flexdef.h,v 1.3 2017/01/02 17:45:27 christos Exp $ */ +/* $NetBSD: flexdef.h,v 1.4 2018/08/20 08:51:56 christos Exp $ */ /* flexdef - definitions file for flex */ @@ -36,6 +36,10 @@ #ifndef FLEXDEF_H #define FLEXDEF_H 1 +#if HAVE_NBTOOL_CONFIG_H +#include "nbtool_config.h" +#endif + #ifdef HAVE_CONFIG_H #include #endif
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: kre Date: Mon Aug 20 10:24:17 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: flexdef.h Log Message: PR toolchain/53511 _NETBSD_SOURCE and nbtool_config.h don't play well together... (unbreak tools build on netbsd host) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/flexdef.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flexdef.h diff -u src/external/bsd/flex/dist/src/flexdef.h:1.4 src/external/bsd/flex/dist/src/flexdef.h:1.5 --- src/external/bsd/flex/dist/src/flexdef.h:1.4 Mon Aug 20 08:51:56 2018 +++ src/external/bsd/flex/dist/src/flexdef.h Mon Aug 20 10:24:17 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: flexdef.h,v 1.4 2018/08/20 08:51:56 christos Exp $ */ +/* $NetBSD: flexdef.h,v 1.5 2018/08/20 10:24:17 kre Exp $ */ /* flexdef - definitions file for flex */ @@ -36,7 +36,7 @@ #ifndef FLEXDEF_H #define FLEXDEF_H 1 -#if HAVE_NBTOOL_CONFIG_H +#if !defined(_NETBSD_SOURCE) && HAVE_NBTOOL_CONFIG_H #include "nbtool_config.h" #endif
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Aug 20 10:26:59 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: flexdef.h Log Message: avoid redefinition of the package macros. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/flexdef.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flexdef.h diff -u src/external/bsd/flex/dist/src/flexdef.h:1.5 src/external/bsd/flex/dist/src/flexdef.h:1.6 --- src/external/bsd/flex/dist/src/flexdef.h:1.5 Mon Aug 20 06:24:17 2018 +++ src/external/bsd/flex/dist/src/flexdef.h Mon Aug 20 06:26:58 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: flexdef.h,v 1.5 2018/08/20 10:24:17 kre Exp $ */ +/* $NetBSD: flexdef.h,v 1.6 2018/08/20 10:26:58 christos Exp $ */ /* flexdef - definitions file for flex */ @@ -36,8 +36,14 @@ #ifndef FLEXDEF_H #define FLEXDEF_H 1 -#if !defined(_NETBSD_SOURCE) && HAVE_NBTOOL_CONFIG_H +#if HAVE_NBTOOL_CONFIG_H #include "nbtool_config.h" +#undef PACKAGE_BUGREPORT +#undef PACKAGE_NAME +#undef PACKAGE_STRING +#undef PACKAGE_TARNAME +#undef PACKAGE_URL +#undef PACKAGE_VERSION #endif #ifdef HAVE_CONFIG_H
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 18:41:18 UTC 2017 Removed Files: src/external/bsd/flex/dist/src: skel.c Log Message: delete the generated skeleton, we generate it all the time. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/bsd/flex/dist/src/skel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 19:24:40 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: main.c Log Message: avoid yywrap redefinition To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/main.c diff -u src/external/bsd/flex/dist/src/main.c:1.3 src/external/bsd/flex/dist/src/main.c:1.4 --- src/external/bsd/flex/dist/src/main.c:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 14:24:39 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */ +/* $NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -33,7 +33,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: main.c,v 1.3 2017/01/02 17:45:27 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $"); #include "version.h" @@ -1589,6 +1589,7 @@ void readin (void) if (!do_yywrap) { if (!C_plus_plus) { + outn ("\n#undef yywrap"); if (reentrant) outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)"); else
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 20:53:11 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl initscan.c Log Message: deal with our int -> size_t changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/flex.skl cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.3 src/external/bsd/flex/dist/src/flex.skl:1.4 --- src/external/bsd/flex/dist/src/flex.skl:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 15:53:11 2017 @@ -384,9 +384,13 @@ typedef struct yy_buffer_state *YY_BUFFE #define YY_TYPEDEF_YY_SIZE_T typedef size_t yy_size_t; #endif +#ifndef YY_TYPEDEF_YY_SSIZE_T +#define YY_TYPEDEF_YY_SSIZE_T +typedef ssize_t yy_ssize_t; +#endif %if-not-reentrant -extern int yyleng; +extern yy_size_t yyleng; %endif %if-c-only @@ -463,12 +467,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -553,8 +557,8 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], %not-for-header /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = NULL; @@ -586,7 +590,7 @@ static void yy_init_buffer ( YY_BUFFER_S YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size M4_YY_PROTO_LAST_ARG ); YY_BUFFER_STATE yy_scan_string ( const char *yy_str M4_YY_PROTO_LAST_ARG ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len M4_YY_PROTO_LAST_ARG ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len M4_YY_PROTO_LAST_ARG ); %endif @@ -701,8 +705,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; -int yy_n_chars; -int yyleng_r; +yy_size_t yy_n_chars; +yy_size_t yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -839,7 +843,7 @@ void yyset_out ( FILE * _out_str M4_YY_ m4_ifdef( [[M4_YY_NO_GET_LENG]],, [[ - int yyget_leng ( M4_YY_PROTO_ONLY_ARG ); + yy_size_t yyget_leng ( M4_YY_PROTO_ONLY_ARG ); ]]) m4_ifdef( [[M4_YY_NO_GET_TEXT]],, @@ -1546,7 +1550,7 @@ int yyFlexLexer::yy_get_next_buffer() M4_YY_DECL_GUTS_VAR(); char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; char *source = YY_G(yytext_ptr); - int number_to_move, i; + yy_size_t number_to_move, i; int ret_val; if ( YY_G(yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_G(yy_n_chars) + 1] ) @@ -1575,7 +1579,7 @@ int yyFlexLexer::yy_get_next_buffer() /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - 1); + number_to_move = (yy_size_t) (YY_G(yy_c_buf_p) - YY_G(yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1588,7 +1592,7 @@ int yyFlexLexer::yy_get_next_buffer() else { - int num_to_read = + yy_ssize_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1607,7 +1611,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], if ( b->yy_is_our_buffer ) { -int new_size = b->yy_buf_size * 2; +yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1749,7 +1753,7 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],, if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - int number_to_move = YY_G(yy_n_chars) + 2; + yy_size_t number_to_move = YY_G(yy_n_chars) + 2; char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; char *source = @@ -1761,7 +1765,7 @@ m4_ifdef( [[M4_YY_NO_UNPUT]],, yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - YY_G(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + YY_G(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -1816,7 +1820,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 21:06:10 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: another int to yy_size_t To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.4 src/external/bsd/flex/dist/src/flex.skl:1.5 --- src/external/bsd/flex/dist/src/flex.skl:1.4 Mon Jan 2 15:53:11 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 16:06:10 2017 @@ -415,7 +415,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], */ #define YY_LESS_LINENO(n) \ do { \ -int yyl;\ +yy_size_t yyl;\ for ( yyl = n; yyl < yyleng; ++yyl )\ if ( yytext[yyl] == '\n' )\ --yylineno;\
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 21:20:00 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: gen.c initscan.c Log Message: another int -> size_t To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/gen.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/gen.c diff -u src/external/bsd/flex/dist/src/gen.c:1.3 src/external/bsd/flex/dist/src/gen.c:1.4 --- src/external/bsd/flex/dist/src/gen.c:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/gen.c Mon Jan 2 16:20:00 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gen.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */ +/* $NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $ */ /* gen - actual generation (writing) of flex scanners */ @@ -33,7 +33,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: gen.c,v 1.3 2017/01/02 17:45:27 christos Exp $"); +__RCSID("$NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $"); #include "tables.h" @@ -1966,7 +1966,7 @@ void make_tables (void) ("if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )"); ++indent_level; 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)" : Index: src/external/bsd/flex/dist/src/initscan.c diff -u src/external/bsd/flex/dist/src/initscan.c:1.5 src/external/bsd/flex/dist/src/initscan.c:1.6 --- src/external/bsd/flex/dist/src/initscan.c:1.5 Mon Jan 2 15:53:11 2017 +++ src/external/bsd/flex/dist/src/initscan.c Mon Jan 2 16:20:00 2017 @@ -104,7 +104,7 @@ /* end standard C headers. */ -/* $NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $ */ +/* $NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $ */ /* flex integer type definitions */ @@ -232,8 +232,12 @@ typedef struct yy_buffer_state *YY_BUFFE #define YY_TYPEDEF_YY_SIZE_T typedef size_t yy_size_t; #endif +#ifndef YY_TYPEDEF_YY_SSIZE_T +#define YY_TYPEDEF_YY_SSIZE_T +typedef ssize_t yy_ssize_t; +#endif -extern int yyleng; +extern yy_size_t yyleng; extern FILE *yyin, *yyout; @@ -271,12 +275,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -345,8 +349,8 @@ static YY_BUFFER_STATE * yy_buffer_stack /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = NULL; @@ -373,7 +377,7 @@ static void yy_init_buffer ( YY_BUFFER_S YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len ); void *yyalloc ( yy_size_t ); void *yyrealloc ( void *, yy_size_t ); @@ -1921,10 +1925,10 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/scan.l" -/* $NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $ */ +#line 1 "/usr/src/external/bsd/flex/dist/src/scan.l" +/* $NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $ */ /* scan.l - scanner for flex input -*-C-*- */ -#line 6 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/scan.l" +#line 6 "/usr/src/external/bsd/flex/dist/src/scan.l" /* Copyright (c) 1990 The Regents of the University of California. */ /* All rights reserved. */ @@ -1956,7 +1960,7 @@ char *yytext; /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: initscan.c,v 1.5 2017/01/02 20:53:11 christos Exp $"); +__RCSID("$NetBSD: initscan.c,v 1.6 2017/01/02 21:20:00 christos Exp $"); #include "parse.h" extern bool tablesverify, tablesext; @@ -2044,9 +2048,9 @@ extern int yylval; /* XXX: for bootstrap if (!indented_code) line_directive_out(NULL, 0);\ } while (0) -#line 2047 "" +#line 2051 "" -#line 2049 "" +#line 2053 "" #define INITIAL 0 #define SECT2 1 @@ -2111,7 +2115,7 @@ FILE *yyget_out ( void ); void yyset_out ( FILE *
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 2 23:21:14 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl gen.c initscan.c Log Message: more yy_size_t <-> int fixes To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/flex.skl cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/gen.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.5 src/external/bsd/flex/dist/src/flex.skl:1.6 --- src/external/bsd/flex/dist/src/flex.skl:1.5 Mon Jan 2 16:06:10 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 18:21:14 2017 @@ -384,10 +384,6 @@ typedef struct yy_buffer_state *YY_BUFFE #define YY_TYPEDEF_YY_SIZE_T typedef size_t yy_size_t; #endif -#ifndef YY_TYPEDEF_YY_SSIZE_T -#define YY_TYPEDEF_YY_SSIZE_T -typedef ssize_t yy_ssize_t; -#endif %if-not-reentrant extern yy_size_t yyleng; @@ -574,7 +570,7 @@ static int yy_did_buffer_switch_on_eof; void yyrestart ( FILE *input_file M4_YY_PROTO_LAST_ARG ); void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size M4_YY_PROTO_LAST_ARG ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, yy_size_t size M4_YY_PROTO_LAST_ARG ); void yy_delete_buffer ( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG ); void yy_flush_buffer ( YY_BUFFER_STATE b M4_YY_PROTO_LAST_ARG ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer M4_YY_PROTO_LAST_ARG ); @@ -1495,9 +1491,9 @@ void yyFlexLexer::switch_streams( std::i } #ifdef YY_INTERACTIVE -int yyFlexLexer::LexerInput( char* buf, int /* max_size */ ) +int yyFlexLexer::LexerInput( char* buf, yy_size_t /* max_size */ ) #else -int yyFlexLexer::LexerInput( char* buf, int max_size ) +int yyFlexLexer::LexerInput( char* buf, yy_size_t max_size ) #endif { if ( yyin.eof() || yyin.fail() ) @@ -1592,7 +1588,7 @@ int yyFlexLexer::yy_get_next_buffer() else { - yy_ssize_t num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -1669,7 +1665,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], if ((YY_G(yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - int new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1); + yy_size_t new_size = YY_G(yy_n_chars) + number_to_move + (YY_G(yy_n_chars) >> 1); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size M4_YY_CALL_LAST_ARG ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -1978,10 +1974,10 @@ static void yy_load_buffer_state (M4_YY * @return the allocated buffer state. */ %if-c-only -YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, int ,size) +YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, yy_size_t ,size) %endif %if-c++-only -YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, int size ) +YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, yy_size_t size ) %endif { YY_BUFFER_STATE b; @@ -2014,7 +2010,7 @@ static void yy_load_buffer_state (M4_YY * M4_YY_DOC_PARAM * @return the allocated buffer state. */ - YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) + YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, yy_size_t size ) { return yy_create_buffer( *file, size ); } @@ -2286,7 +2282,7 @@ YY_BUFFER_STATE yy_scan_buffer YYFARGS2 if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ + b->yy_buf_size = (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; b->yy_input_file = NULL; Index: src/external/bsd/flex/dist/src/gen.c diff -u src/external/bsd/flex/dist/src/gen.c:1.4 src/external/bsd/flex/dist/src/gen.c:1.5 --- src/external/bsd/flex/dist/src/gen.c:1.4 Mon Jan 2 16:20:00 2017 +++ src/external/bsd/flex/dist/src/gen.c Mon Jan 2 18:21:14 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $ */ +/* $NetBSD: gen.c,v 1.5 2017/01/02 23:21:14 christos Exp $ */ /* gen - actual generation (writing) of flex scanners */ @@ -33,7 +33,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: gen.c,v 1.4 2017/01/02 21:20:00 christos Exp $"); +__RCSID("$NetBSD: gen.c,v 1.5 2017/01/02 23:21:14 christos Exp $"); #include "tables.h" @@ -1509,11 +1509,11 @@ void make_tables (void) if (yymore_used && !yytext_is_array) { indent_puts ("YY_G(yy
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 00:22:56 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl main.c Log Message: don't #define yywrap yywrap (that is if the prefix is yy, don't #define macros for the same name). Breaks compatibility for things like: #ifndef yywrap int yywrap(void) { return 1; } #endif To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/flex.skl cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/dist/src/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.6 src/external/bsd/flex/dist/src/flex.skl:1.7 --- src/external/bsd/flex/dist/src/flex.skl:1.6 Mon Jan 2 18:21:14 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 19:22:56 2017 @@ -120,6 +120,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]] %endif %if-c-only +m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') M4_GEN_PREFIX(`_scan_buffer') @@ -155,6 +156,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]] M4_GEN_PREFIX(`set_column') ]]) M4_GEN_PREFIX(`wrap') +) %endif m4_ifdef( [[M4_YY_BISON_LVAL]], @@ -170,11 +172,14 @@ m4_ifdef( [[]], ]]) +m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`alloc') M4_GEN_PREFIX(`realloc') M4_GEN_PREFIX(`free') +) %if-c-only +m4_ifelse(M4_YY_PREFIX,yy,, m4_ifdef( [[M4_YY_NOT_REENTRANT]], [[ M4_GEN_PREFIX(`text') @@ -184,6 +189,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], M4_GEN_PREFIX(`_flex_debug') M4_GEN_PREFIX(`lineno') ]]) +) %endif Index: src/external/bsd/flex/dist/src/main.c diff -u src/external/bsd/flex/dist/src/main.c:1.4 src/external/bsd/flex/dist/src/main.c:1.5 --- src/external/bsd/flex/dist/src/main.c:1.4 Mon Jan 2 14:24:39 2017 +++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 19:22:56 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $ */ +/* $NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -33,7 +33,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: main.c,v 1.4 2017/01/02 19:24:39 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $"); #include "version.h" @@ -1589,7 +1589,6 @@ void readin (void) if (!do_yywrap) { if (!C_plus_plus) { - outn ("\n#undef yywrap"); if (reentrant) outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)"); else
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 00:50:11 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: Add missing macros to the non-recursive prefixed-parser. Disable macros for the recursive parser. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.7 src/external/bsd/flex/dist/src/flex.skl:1.8 --- src/external/bsd/flex/dist/src/flex.skl:1.7 Mon Jan 2 19:22:56 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 19:50:11 2017 @@ -61,11 +61,17 @@ m4_changequote([[, ]]) m4_ifelse(M4_YY_PREFIX,yy,, #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] -#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] +#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] +#define yy_scan_string M4_YY_PREFIX[[_scan_string]] +#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] +#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] +#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] +#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] +#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] #define yyin M4_YY_PREFIX[[in]] #define yyleng M4_YY_PREFIX[[leng]] #define yylex M4_YY_PREFIX[[lex]] @@ -120,7 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]] %endif %if-c-only -m4_ifelse(M4_YY_PREFIX,yy,, +m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') M4_GEN_PREFIX(`_scan_buffer')
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 01:56:04 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl main.c Log Message: fix the re-entrant prefixed case. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/dist/src/flex.skl cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.8 src/external/bsd/flex/dist/src/flex.skl:1.9 --- src/external/bsd/flex/dist/src/flex.skl:1.8 Mon Jan 2 19:50:11 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 20:56:03 2017 @@ -113,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define m4preproc_define(`M4_GEN_PREFIX', ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] -m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') +%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') %if-c++-only /* The c++ scanner is a mess. The FlexLexer.h header file relies on the @@ -126,7 +126,8 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]] %endif %if-c-only -m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,, +%if-reentrant +m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') M4_GEN_PREFIX(`_scan_buffer') @@ -164,6 +165,7 @@ m4_ifelse(M4_YY_PREFIX,M4_YY_PREFIX,, M4_GEN_PREFIX(`wrap') ) %endif +%endif m4_ifdef( [[M4_YY_BISON_LVAL]], [[ Index: src/external/bsd/flex/dist/src/main.c diff -u src/external/bsd/flex/dist/src/main.c:1.5 src/external/bsd/flex/dist/src/main.c:1.6 --- src/external/bsd/flex/dist/src/main.c:1.5 Mon Jan 2 19:22:56 2017 +++ src/external/bsd/flex/dist/src/main.c Mon Jan 2 20:56:03 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $ */ +/* $NetBSD: main.c,v 1.6 2017/01/03 01:56:03 christos Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -33,7 +33,7 @@ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ #include "flexdef.h" -__RCSID("$NetBSD: main.c,v 1.5 2017/01/03 00:22:56 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.6 2017/01/03 01:56:03 christos Exp $"); #include "version.h" @@ -1590,9 +1590,9 @@ void readin (void) if (!do_yywrap) { if (!C_plus_plus) { if (reentrant) -outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)"); +out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix); else -outn ("\n#define yywrap() (/*CONSTCOND*/1)"); +out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix); } outn ("#define YY_SKIP_YYWRAP"); }
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Tue Jan 3 02:51:56 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: always define all the renames. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.9 src/external/bsd/flex/dist/src/flex.skl:1.10 --- src/external/bsd/flex/dist/src/flex.skl:1.9 Mon Jan 2 20:56:03 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 2 21:51:56 2017 @@ -126,7 +126,6 @@ m4preproc_define(`M4_GEN_PREFIX', %endif %if-c-only -%if-reentrant m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') @@ -165,7 +164,6 @@ m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`wrap') ) %endif -%endif m4_ifdef( [[M4_YY_BISON_LVAL]], [[
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sat Jan 7 15:43:27 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: initparse.c initscan.c Log Message: Regen without #line directives - nbyacc -l -d -o initparse.c parse.y - nblex -L -t -p scan.l > initscan.c To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/initparse.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/dist/src/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/initparse.c diff -u src/external/bsd/flex/dist/src/initparse.c:1.3 src/external/bsd/flex/dist/src/initparse.c:1.4 --- src/external/bsd/flex/dist/src/initparse.c:1.3 Mon Jan 2 12:45:27 2017 +++ src/external/bsd/flex/dist/src/initparse.c Sat Jan 7 10:43:27 2017 @@ -19,7 +19,6 @@ #define YYPURE 0 -#line 37 "/usr/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.3 2017/01/02 17:45:27 christos Exp $"); +__RCSID("$NetBSD: initparse.c,v 1.4 2017/01/07 15:43:27 christos Exp $"); #include "tables.h" @@ -101,7 +100,6 @@ int previous_continued_action; /* whethe */ #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 @@ typedef struct { } YYSTACKDATA; /* variables for the parser stack */ static YYSTACKDATA yystack; -#line 953 "/usr/src/external/bsd/flex/dist/src/parse.y" /* build_eof_action - build the "<>" action for the active start @@ -740,7 +737,6 @@ void yyerror( const char *msg ) { (void)msg; } -#line 744 "parse.c" #if YYDEBUG #include /* needed for printf */ @@ -943,7 +939,6 @@ yyreduce: switch (yyn) { case 1: -#line 122 "/usr/src/external/bsd/flex/dist/src/parse.y" { /* add default rule */ int def_rule; @@ -972,7 +967,6 @@ case 1: } break; case 2: -#line 151 "/usr/src/external/bsd/flex/dist/src/parse.y" { /* initialize for processing rules */ /* Create default DFA start condition. */ @@ -980,11 +974,9 @@ case 2: } break; case 6: -#line 162 "/usr/src/external/bsd/flex/dist/src/parse.y" { synerr( _("unknown error processing section 1") ); } break; case 7: -#line 166 "/usr/src/external/bsd/flex/dist/src/parse.y" { check_options(); scon_stk = allocate_integer_array( lastsc + 1 ); @@ -992,64 +984,50 @@ case 7: } break; case 8: -#line 174 "/usr/src/external/bsd/flex/dist/src/parse.y" { xcluflg = false; } break; case 9: -#line 177 "/usr/src/external/bsd/flex/dist/src/parse.y" { xcluflg = true; } break; case 10: -#line 181 "/usr/src/external/bsd/flex/dist/src/parse.y" { scinstal( nmstr, xcluflg ); } break; case 11: -#line 184 "/usr/src/external/bsd/flex/dist/src/parse.y" { scinstal( nmstr, xcluflg ); } break; case 12: -#line 187 "/usr/src/external/bsd/flex/dist/src/parse.y" { synerr( _("bad start condition list") ); } break; case 16: -#line 198 "/usr/src/external/bsd/flex/dist/src/parse.y" { outfilename = xstrdup(nmstr); did_outfilename = 1; } break; case 17: -#line 203 "/usr/src/external/bsd/flex/dist/src/parse.y" { extra_type = xstrdup(nmstr); } break; case 18: -#line 205 "/usr/src/external/bsd/flex/dist/src/parse.y" { prefix = xstrdup(nmstr); if (strchr(prefix, '[') || strchr(prefix, ']')) flexerror(_("Prefix must not contain [ or ]")); } break; case 19: -#line 209 "/usr/src/external/bsd/flex/dist/src/parse.y" { yyclass = xstrdup(nmstr); } break; case 20: -#line 211 "/usr/src/external/bsd/flex/dist/src/parse.y" { headerfilename = xstrdup(nmstr); } break; case 21: -#line 213 "/usr/src/external/bsd/flex/dist/src/parse.y" { tablesext = true; tablesfilename = xstrdup(nmstr); } break; case 22: -#line 217 "/usr/src/external/bsd/flex/dist/src/parse.y" { scon_stk_ptr = yystack.l_mark[-3]; } break; case 23: -#line 219 "/usr/src/external/bsd/flex/dist/src/parse.y" { scon_stk_ptr = yystack.l_mark[-3]; } break; case 25: -#line 224 "/usr/src/external/bsd/flex/dist/src/parse.y" { /* Initialize for a parse of one rule. */ trlcontxt = variable_trail_rule = varlength = false; @@ -1062,7 +1040,6 @@ case 25: } break; case 26: -#line 237 "/usr/src/external/bsd/flex/dist/src/parse.y" { pat = yystack.l_mark[0]; finish_rule( pat, variable_trail_rule, @@ -1099,7 +1076,6 @@ case 26: } break; case 27: -#line 273 "/usr/src/external/bsd/flex/dist/src/parse.y" { pat = yystack.l_mark[0]; finish_rule( pat, variable_trail_rule, @@ -1124,7 +1100,6 @@ case 27: } break; case 28: -#line 297 "/usr/src/external
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Mon Jan 9 15:14:41 UTC 2017 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: revert the c++ yy_size_t changes to maintain existing ABI. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.10 src/external/bsd/flex/dist/src/flex.skl:1.11 --- src/external/bsd/flex/dist/src/flex.skl:1.10 Mon Jan 2 21:51:56 2017 +++ src/external/bsd/flex/dist/src/flex.skl Mon Jan 9 10:14:41 2017 @@ -1503,9 +1503,9 @@ void yyFlexLexer::switch_streams( std::i } #ifdef YY_INTERACTIVE -int yyFlexLexer::LexerInput( char* buf, yy_size_t /* max_size */ ) +int yyFlexLexer::LexerInput( char* buf, int /* max_size */ ) #else -int yyFlexLexer::LexerInput( char* buf, yy_size_t max_size ) +int yyFlexLexer::LexerInput( char* buf, int max_size ) #endif { if ( yyin.eof() || yyin.fail() ) @@ -1989,7 +1989,7 @@ static void yy_load_buffer_state (M4_YY YY_BUFFER_STATE yy_create_buffer YYFARGS2( FILE *,file, yy_size_t ,size) %endif %if-c++-only -YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, yy_size_t size ) +YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream& file, int size ) %endif { YY_BUFFER_STATE b; @@ -2022,7 +2022,7 @@ static void yy_load_buffer_state (M4_YY * M4_YY_DOC_PARAM * @return the allocated buffer state. */ - YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, yy_size_t size ) + YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) { return yy_create_buffer( *file, size ); }
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: nakayama Date: Thu Mar 17 15:23:21 UTC 2016 Modified Files: src/external/bsd/flex/dist/src: scan.l Log Message: Apply our changes dropped in previous merge. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/scan.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/scan.l diff -u src/external/bsd/flex/dist/src/scan.l:1.3 src/external/bsd/flex/dist/src/scan.l:1.4 --- src/external/bsd/flex/dist/src/scan.l:1.3 Sat Jan 9 18:28:41 2016 +++ src/external/bsd/flex/dist/src/scan.l Thu Mar 17 15:23:21 2016 @@ -1,3 +1,5 @@ +/* $NetBSD: scan.l,v 1.4 2016/03/17 15:23:21 nakayama Exp $ */ + /* scan.l - scanner for flex input -*-C-*- */ %{ @@ -31,8 +33,9 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ - #include "flexdef.h" +__RCSID("$NetBSD: scan.l,v 1.4 2016/03/17 15:23:21 nakayama Exp $"); + #include "parse.h" extern bool tablesverify, tablesext; extern int trlcontxt; /* Set in parse.y for each rule. */ @@ -68,7 +71,7 @@ extern const char *escaped_qstart, *esca #define RETURNNAME \ if(yyleng < MAXLINE) \ { \ - strcpy( nmstr, yytext ); \ + strlcpy( nmstr, yytext, sizeof(nmstr) ); \ } \ else \ { \ @@ -81,9 +84,9 @@ extern const char *escaped_qstart, *esca for ( i = strlen( str ) - 1; i >= start; --i ) \ unput((str)[i]) -#define CHECK_REJECT(str) \ +#define CHECK_RE_JECT(str) \ if ( all_upper( str ) ) \ - reject = true; + reject = true #define CHECK_YYMORE(str) \ if ( all_lower( str ) ) \ @@ -185,7 +188,7 @@ M4QEND "]]" ^{NAME} { if(yyleng < MAXLINE) { - strcpy( nmstr, yytext ); + strlcpy( nmstr, yytext, sizeof(nmstr) ); } else { @@ -293,7 +296,7 @@ M4QEND "]]" {NOT_WS}[^\r\n]* { if(yyleng < MAXLINE) { - strcpy( (char *) nmdef, yytext ); + strlcpy( (char *) nmdef, yytext, sizeof(nmdef) ); } else { @@ -436,7 +439,7 @@ M4QEND "]]" \"[^"\n]*\" { if(yyleng-1 < MAXLINE) { - strcpy( nmstr, yytext + 1 ); + strlcpy( nmstr, yytext + 1, sizeof(nmstr) ); } else { @@ -611,7 +614,7 @@ M4QEND "]]" if(yyleng < MAXLINE) { - strcpy( nmstr, yytext ); + strlcpy( nmstr, yytext, sizeof(nmstr) ); } else { @@ -669,7 +672,7 @@ M4QEND "]]" if(yyleng-1 < MAXLINE) { - strcpy( nmstr, yytext + 1 ); + strlcpy( nmstr, yytext + 1, sizeof(nmstr) ); } else { @@ -875,7 +878,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; / { "reject" { ACTION_ECHO; - CHECK_REJECT(yytext); + CHECK_RE_JECT(yytext); } "yymore" { ACTION_ECHO;
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: nakayama Date: Thu Mar 17 15:28:00 UTC 2016 Modified Files: src/external/bsd/flex/dist/src: initparse.c initscan.c Log Message: Regen without #line directives. - nbyacc -l -d -o initparse.c parse.y - nblex -L -t -p scan.l > initscan.c To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/dist/src/initparse.c \ src/external/bsd/flex/dist/src/initscan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/initparse.c diff -u src/external/bsd/flex/dist/src/initparse.c:1.1 src/external/bsd/flex/dist/src/initparse.c:1.2 --- src/external/bsd/flex/dist/src/initparse.c:1.1 Sat Jan 9 17:39:52 2016 +++ src/external/bsd/flex/dist/src/initparse.c Thu Mar 17 15:28:00 2016 @@ -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 @@ int previous_continued_action; /* whethe */ #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 @@ typedef struct { } 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 "<>" action for the active start @@ -750,7 +747,6 @@ const char *msg; { (void)msg; } -#line 754 "parse.c" #if YYDEBUG #include /* needed for printf */ @@ -953,7 +949,6 @@ yyreduce: 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 @@ case 1: } 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 @@ case 2: } 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 @@ case 7: } 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 @@ case 25: } 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 @@ case 26: } break; case 27: -#line 271 "/p/netbsd/cvsroot/src/external/bsd/flex/dist/src/parse.y" { pat = yystack.l_