Module Name: src
Committed By: christos
Date: Sat Jan 9 17:38:57 UTC 2016
Modified Files:
src/external/bsd/flex: Makefile.inc flex2netbsd
src/external/bsd/flex/dist/src: FlexLexer.h buf.c ccl.c dfa.c ecs.c
filter.c flex.skl flexdef.h flexint.h gen.c gettext.h libmain.c
libyywrap.c main.c misc.c nfa.c options.c options.h parse.y regex.c
scanflags.c scanopt.c scanopt.h skel.c sym.c tables.c tables.h
tblcmp.c yylex.c
src/external/bsd/flex/include: config.h
src/external/bsd/flex/man: Makefile
Removed Files:
src/external/bsd/flex/dist: FlexLexer.h Makefile buf.c ccl.c compile
conf.in config.guess config.rpath config.sub depcomp dfa.c ecs.c
filter.c flex.skl flexdef.h flexint.h gen.c gettext.h initparse.c
initparse.h initscan.c install-sh libmain.c libtool libyywrap.c
ltmain.sh main.c misc.c missing mkskel.sh nfa.c options.c options.h
parse.y regex.c scan.l scanflags.c scanopt.c scanopt.h stamp-h1
sym.c tables.c tables.h tables_shared.c tables_shared.h tblcmp.c
version.h ylwrap yylex.c
src/external/bsd/flex/dist/src: parse.c parse.h scan.l
Log Message:
Merge our changes; the directory structure got changed.
Changes are too large for here, see changelog.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/flex2netbsd
cvs rdiff -u -r1.2 -r0 src/external/bsd/flex/dist/FlexLexer.h \
src/external/bsd/flex/dist/flexint.h src/external/bsd/flex/dist/gettext.h \
src/external/bsd/flex/dist/options.h src/external/bsd/flex/dist/scanopt.h \
src/external/bsd/flex/dist/tables.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/Makefile \
src/external/bsd/flex/dist/libtool src/external/bsd/flex/dist/ltmain.sh \
src/external/bsd/flex/dist/mkskel.sh src/external/bsd/flex/dist/stamp-h1
cvs rdiff -u -r1.4 -r0 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/yylex.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/flex/dist/ccl.c \
src/external/bsd/flex/dist/dfa.c src/external/bsd/flex/dist/ecs.c \
src/external/bsd/flex/dist/nfa.c src/external/bsd/flex/dist/options.c \
src/external/bsd/flex/dist/regex.c src/external/bsd/flex/dist/scanflags.c \
src/external/bsd/flex/dist/sym.c src/external/bsd/flex/dist/tblcmp.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/flex/dist/compile \
src/external/bsd/flex/dist/conf.in \
src/external/bsd/flex/dist/config.guess \
src/external/bsd/flex/dist/config.sub src/external/bsd/flex/dist/depcomp \
src/external/bsd/flex/dist/install-sh src/external/bsd/flex/dist/missing
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/config.rpath \
src/external/bsd/flex/dist/tables_shared.c \
src/external/bsd/flex/dist/tables_shared.h \
src/external/bsd/flex/dist/version.h src/external/bsd/flex/dist/ylwrap
cvs rdiff -u -r1.5 -r0 src/external/bsd/flex/dist/filter.c \
src/external/bsd/flex/dist/initparse.c \
src/external/bsd/flex/dist/initscan.c \
src/external/bsd/flex/dist/libmain.c \
src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/misc.c \
src/external/bsd/flex/dist/parse.y src/external/bsd/flex/dist/tables.c
cvs rdiff -u -r1.11 -r0 src/external/bsd/flex/dist/flex.skl \
src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.7 -r0 src/external/bsd/flex/dist/flexdef.h
cvs rdiff -u -r1.1 -r0 src/external/bsd/flex/dist/initparse.h
cvs rdiff -u -r1.6 -r0 src/external/bsd/flex/dist/main.c \
src/external/bsd/flex/dist/scan.l src/external/bsd/flex/dist/scanopt.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/flex/dist/src/FlexLexer.h \
src/external/bsd/flex/dist/src/buf.c src/external/bsd/flex/dist/src/ccl.c \
src/external/bsd/flex/dist/src/dfa.c src/external/bsd/flex/dist/src/ecs.c \
src/external/bsd/flex/dist/src/filter.c \
src/external/bsd/flex/dist/src/flex.skl \
src/external/bsd/flex/dist/src/flexdef.h \
src/external/bsd/flex/dist/src/flexint.h \
src/external/bsd/flex/dist/src/gen.c \
src/external/bsd/flex/dist/src/gettext.h \
src/external/bsd/flex/dist/src/libmain.c \
src/external/bsd/flex/dist/src/libyywrap.c \
src/external/bsd/flex/dist/src/main.c \
src/external/bsd/flex/dist/src/misc.c \
src/external/bsd/flex/dist/src/nfa.c \
src/external/bsd/flex/dist/src/options.c \
src/external/bsd/flex/dist/src/options.h \
src/external/bsd/flex/dist/src/parse.y \
src/external/bsd/flex/dist/src/regex.c \
src/external/bsd/flex/dist/src/scanflags.c \
src/external/bsd/flex/dist/src/scanopt.c \
src/external/bsd/flex/dist/src/scanopt.h \
src/external/bsd/flex/dist/src/skel.c \
src/external/bsd/flex/dist/src/sym.c \
src/external/bsd/flex/dist/src/tables.c \
src/external/bsd/flex/dist/src/tables.h \
src/external/bsd/flex/dist/src/tblcmp.c \
src/external/bsd/flex/dist/src/yylex.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/src/parse.c \
src/external/bsd/flex/dist/src/parse.h \
src/external/bsd/flex/dist/src/scan.l
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/include/config.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/flex/man/Makefile
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/Makefile.inc
diff -u src/external/bsd/flex/Makefile.inc:1.2 src/external/bsd/flex/Makefile.inc:1.3
--- src/external/bsd/flex/Makefile.inc:1.2 Mon Oct 26 07:17:16 2009
+++ src/external/bsd/flex/Makefile.inc Sat Jan 9 12:38:56 2016
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/10/26 11:17:16 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2016/01/09 17:38:56 christos Exp $
WARNS?= 1
.include <bsd.own.mk>
-VERSION=2.5.35
+VERSION=2.6.0
BINDIR?= /usr/bin
-IDIST= ${NETBSDSRCDIR}/external/bsd/flex/dist
+IDIST= ${NETBSDSRCDIR}/external/bsd/flex/dist/src
CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../include -I${IDIST} \
-DLOCALEDIR=\"/usr/share/locale\"
Index: src/external/bsd/flex/flex2netbsd
diff -u src/external/bsd/flex/flex2netbsd:1.3 src/external/bsd/flex/flex2netbsd:1.4
--- src/external/bsd/flex/flex2netbsd:1.3 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/flex2netbsd Sat Jan 9 12:38:56 2016
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: flex2netbsd,v 1.3 2014/10/29 18:28:36 christos Exp $
+# $NetBSD: flex2netbsd,v 1.4 2016/01/09 17:38:56 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,9 +34,9 @@
#
# $ cd /some/where/temporary
# $ tar xpfz /new/flex/release/tar/file
-# $ sh /usr/src/external/bsd/flex/dist/flex2netbsd flex-2.5.x
-# $ cd flex-2.5.x
-# $ cvs import -m "Import flex 2.5.x" src/external/bsd/flex/dist FLEX flex-2-5-x
+# $ sh /usr/src/external/bsd/flex/dist/flex2netbsd flex-2.6.x
+# $ cd flex-2.6.x
+# $ cvs import -m "Import flex 2.6.x" src/external/bsd/flex/dist FLEX flex-2-6-x
# $ run ./configure
# $ run make
# check the config file and copy it to /usr/src/external/bsd/flex/include
Index: src/external/bsd/flex/dist/src/FlexLexer.h
diff -u src/external/bsd/flex/dist/src/FlexLexer.h:1.1.1.1 src/external/bsd/flex/dist/src/FlexLexer.h:1.2
--- src/external/bsd/flex/dist/src/FlexLexer.h:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/FlexLexer.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: FlexLexer.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
// -*-C++-*-
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
Index: src/external/bsd/flex/dist/src/buf.c
diff -u src/external/bsd/flex/dist/src/buf.c:1.1.1.1 src/external/bsd/flex/dist/src/buf.c:1.2
--- src/external/bsd/flex/dist/src/buf.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/buf.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: buf.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: buf.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
/* Take note: The buffer object is sometimes used as a String buffer (one
* continuous string), and sometimes used as a list of strings, usually line by
Index: src/external/bsd/flex/dist/src/ccl.c
diff -u src/external/bsd/flex/dist/src/ccl.c:1.1.1.1 src/external/bsd/flex/dist/src/ccl.c:1.2
--- src/external/bsd/flex/dist/src/ccl.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/ccl.c Sat Jan 9 12:38:57 2016
@@ -30,8 +30,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: ccl.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
/* return true if the chr is in the ccl. Takes negation into account. */
static bool
Index: src/external/bsd/flex/dist/src/dfa.c
diff -u src/external/bsd/flex/dist/src/dfa.c:1.1.1.1 src/external/bsd/flex/dist/src/dfa.c:1.2
--- src/external/bsd/flex/dist/src/dfa.c:1.1.1.1 Sat Jan 9 10:43:36 2016
+++ src/external/bsd/flex/dist/src/dfa.c Sat Jan 9 12:38:57 2016
@@ -28,8 +28,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: dfa.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
#include "tables.h"
/* declare functions that have forward references */
Index: src/external/bsd/flex/dist/src/ecs.c
diff -u src/external/bsd/flex/dist/src/ecs.c:1.1.1.1 src/external/bsd/flex/dist/src/ecs.c:1.2
--- src/external/bsd/flex/dist/src/ecs.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/ecs.c Sat Jan 9 12:38:57 2016
@@ -30,9 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
-
#include "flexdef.h"
+__RCSID("$NetBSD: ecs.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
/* ccl2ecl - convert character classes to set of equivalence classes */
Index: src/external/bsd/flex/dist/src/filter.c
diff -u src/external/bsd/flex/dist/src/filter.c:1.1.1.1 src/external/bsd/flex/dist/src/filter.c:1.2
--- src/external/bsd/flex/dist/src/filter.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/filter.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: filter.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* filter - postprocessing of flex output through filters */
/* This file is part of flex. */
@@ -20,8 +22,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: filter.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
static const char * check_4_gnu_m4 =
"m4_dnl ifdef(`__gnu__', ,"
"`errprint(Flex requires GNU M4. Set the PATH or set the M4 environment variable to its path name.)"
Index: src/external/bsd/flex/dist/src/flex.skl
diff -u src/external/bsd/flex/dist/src/flex.skl:1.1.1.1 src/external/bsd/flex/dist/src/flex.skl:1.2
--- src/external/bsd/flex/dist/src/flex.skl:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/flex.skl Sat Jan 9 12:38:57 2016
@@ -197,6 +197,9 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],
/* begin standard C headers. */
%if-c-only
+#ifdef _LIBC
+#include "namespace.h"
+#endif
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -215,6 +218,9 @@ m4preproc_include(`flexint.h')
%if-c++-only
/* begin standard C++ headers. */
+#ifdef _LIBC
+#include "namespace.h"
+#endif
#include <iostream>
#include <errno.h>
#include <cstdlib>
Index: src/external/bsd/flex/dist/src/flexdef.h
diff -u src/external/bsd/flex/dist/src/flexdef.h:1.1.1.1 src/external/bsd/flex/dist/src/flexdef.h:1.2
--- src/external/bsd/flex/dist/src/flexdef.h:1.1.1.1 Sat Jan 9 10:43:35 2016
+++ src/external/bsd/flex/dist/src/flexdef.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,4 @@
+/* $NetBSD: flexdef.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
/* flexdef - definitions file for flex */
@@ -1036,7 +1037,7 @@ extern void line_pinpoint PROTO ((const
extern void format_synerr PROTO ((const char *, const char *));
extern void synerr PROTO ((const char *)); /* report a syntax error */
extern void format_warn PROTO ((const char *, const char *));
-extern void warn PROTO ((const char *)); /* report a warning */
+extern void lwarn PROTO ((const char *)); /* report a warning */
extern void yyerror PROTO ((const char *)); /* report a parse error */
extern int yyparse PROTO ((void)); /* the YACC parser */
@@ -1228,5 +1229,8 @@ extern void sf_init(void);
extern void sf_push(void);
extern void sf_pop(void);
+#ifndef __RCSID
+#define __RCSID(a)
+#endif
#endif /* not defined FLEXDEF_H */
Index: src/external/bsd/flex/dist/src/flexint.h
diff -u src/external/bsd/flex/dist/src/flexint.h:1.1.1.1 src/external/bsd/flex/dist/src/flexint.h:1.2
--- src/external/bsd/flex/dist/src/flexint.h:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/flexint.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: flexint.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex integer type definitions */
#ifndef FLEXINT_H
Index: src/external/bsd/flex/dist/src/gen.c
diff -u src/external/bsd/flex/dist/src/gen.c:1.1.1.1 src/external/bsd/flex/dist/src/gen.c:1.2
--- src/external/bsd/flex/dist/src/gen.c:1.1.1.1 Sat Jan 9 10:43:36 2016
+++ src/external/bsd/flex/dist/src/gen.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: gen.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* gen - actual generation (writing) of flex scanners */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: gen.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
#include "tables.h"
@@ -451,8 +454,7 @@ void genctbl (void)
/* mkecstbl - Make equivalence-class tables. */
-
-struct yytbl_data *mkecstbl (void)
+static struct yytbl_data *mkecstbl (void)
{
int i;
struct yytbl_data *tbl = 0;
@@ -528,8 +530,12 @@ void gen_find_action (void)
indent_puts ("yy_current_state = *--YY_G(yy_state_ptr);");
indent_puts ("YY_G(yy_lp) = yy_accept[yy_current_state];");
+ if (!variable_trailing_context_rules)
+ outn ("m4_ifdef( [[M4_YY_USES_REJECT]],\n[[");
if(reject_really_used)
outn ("find_rule: /* we branch to this label when backing up */");
+ if (!variable_trailing_context_rules)
+ outn ("]])\n");
indent_puts
("for ( ; ; ) /* until we find what rule we matched */");
Index: src/external/bsd/flex/dist/src/gettext.h
diff -u src/external/bsd/flex/dist/src/gettext.h:1.1.1.1 src/external/bsd/flex/dist/src/gettext.h:1.2
--- src/external/bsd/flex/dist/src/gettext.h:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/gettext.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: gettext.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* Convenience header for conditional use of GNU <libintl.h>.
Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
Index: src/external/bsd/flex/dist/src/libmain.c
diff -u src/external/bsd/flex/dist/src/libmain.c:1.1.1.1 src/external/bsd/flex/dist/src/libmain.c:1.2
--- src/external/bsd/flex/dist/src/libmain.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/libmain.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: libmain.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* libmain - flex run-time support library "main" function */
/* This file is part of flex. */
@@ -20,6 +22,10 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+#ifdef __RCSID
+__RCSID("$NetBSD: libmain.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+#endif
extern int yylex (void);
Index: src/external/bsd/flex/dist/src/libyywrap.c
diff -u src/external/bsd/flex/dist/src/libyywrap.c:1.1.1.1 src/external/bsd/flex/dist/src/libyywrap.c:1.2
--- src/external/bsd/flex/dist/src/libyywrap.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/libyywrap.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* libyywrap - flex run-time support library "yywrap" function */
/* This file is part of flex. */
@@ -20,6 +22,10 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+#ifdef __RCSID
+__RCSID("$NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+#endif
int yywrap (void);
Index: src/external/bsd/flex/dist/src/main.c
diff -u src/external/bsd/flex/dist/src/main.c:1.1.1.1 src/external/bsd/flex/dist/src/main.c:1.2
--- src/external/bsd/flex/dist/src/main.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/main.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: main.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,9 +32,10 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include "flexdef.h"
+__RCSID("$NetBSD: main.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
-#include "flexdef.h"
#include "version.h"
#include "options.h"
#include "tables.h"
@@ -292,7 +295,7 @@ void check_options ()
flexerror (_("Can't use -+ with -CF option"));
if (C_plus_plus && yytext_is_array) {
- warn (_("%array incompatible with -+ option"));
+ lwarn (_("%array incompatible with -+ option"));
yytext_is_array = false;
}
Index: src/external/bsd/flex/dist/src/misc.c
diff -u src/external/bsd/flex/dist/src/misc.c:1.1.1.1 src/external/bsd/flex/dist/src/misc.c:1.2
--- src/external/bsd/flex/dist/src/misc.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/misc.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: misc.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* misc - miscellaneous flex routines */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,9 +32,11 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: misc.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
#include "tables.h"
+#include <stdarg.h>
#define CMD_IF_TABLES_SER "%if-tables-serialization"
#define CMD_TABLES_YYDMAP "%tables-yydmap"
@@ -420,7 +424,7 @@ void line_directive_out (output_file, do
{
char directive[MAXLINE], filename[MAXLINE];
char *s1, *s2, *s3;
- static const char *line_fmt = "#line %d \"%s\"\n";
+ static const char line_fmt[] = "#line %d \"%s\"\n";
if (!gen_line_dirs)
return;
Index: src/external/bsd/flex/dist/src/nfa.c
diff -u src/external/bsd/flex/dist/src/nfa.c:1.1.1.1 src/external/bsd/flex/dist/src/nfa.c:1.2
--- src/external/bsd/flex/dist/src/nfa.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/nfa.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: nfa.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* nfa - NFA construction routines */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: nfa.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
/* declare functions that have forward references */
Index: src/external/bsd/flex/dist/src/options.c
diff -u src/external/bsd/flex/dist/src/options.c:1.1.1.1 src/external/bsd/flex/dist/src/options.c:1.2
--- src/external/bsd/flex/dist/src/options.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/options.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: options.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include "flexdef.h"
+__RCSID("$NetBSD: options.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
#include "options.h"
Index: src/external/bsd/flex/dist/src/options.h
diff -u src/external/bsd/flex/dist/src/options.h:1.1.1.1 src/external/bsd/flex/dist/src/options.h:1.2
--- src/external/bsd/flex/dist/src/options.h:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/options.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: options.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
Index: src/external/bsd/flex/dist/src/parse.y
diff -u src/external/bsd/flex/dist/src/parse.y:1.1.1.1 src/external/bsd/flex/dist/src/parse.y:1.2
--- src/external/bsd/flex/dist/src/parse.y:1.1.1.1 Sat Jan 9 10:43:35 2016
+++ src/external/bsd/flex/dist/src/parse.y Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: parse.y,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* parse.y - parser for flex input */
%token CHAR NUMBER SECTEND SCDECL XSCDECL NAME PREVCCL EOF_OP
@@ -62,8 +64,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: parse.y,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
#include "tables.h"
int pat, scnum, eps, headcnt, trailcnt, lastchar, i, rulelen;
@@ -80,7 +83,7 @@ int previous_continued_action; /* whethe
do{ \
char fw3_msg[MAXLINE];\
snprintf( fw3_msg, MAXLINE,(fmt), (a1), (a2) );\
- warn( fw3_msg );\
+ lwarn( fw3_msg );\
}while(0)
/* Expand a POSIX character class expression. */
@@ -303,7 +306,7 @@ flexrule : '^' rule
scon_stk[++scon_stk_ptr] = i;
if ( scon_stk_ptr == 0 )
- warn(
+ lwarn(
"all start conditions already have <<EOF>> rules" );
else
@@ -398,7 +401,7 @@ rule : re2 re
* erroneously.
*/
if ( ! varlength || headcnt != 0 )
- warn(
+ lwarn(
"trailing context made variable due to preceding '|' action" );
/* Mark as variable. */
@@ -453,7 +456,7 @@ rule : re2 re
/* See the comment in the rule for "re2 re"
* above.
*/
- warn(
+ lwarn(
"trailing context made variable due to preceding '|' action" );
varlength = true;
@@ -913,13 +916,13 @@ ccl_expr:
| CCE_NEG_XDIGIT { CCL_NEG_EXPR(isxdigit); }
| CCE_NEG_LOWER {
if ( sf_case_ins() )
- warn(_("[:^lower:] is ambiguous in case insensitive scanner"));
+ lwarn(_("[:^lower:] is ambiguous in case insensitive scanner"));
else
CCL_NEG_EXPR(islower);
}
| CCE_NEG_UPPER {
if ( sf_case_ins() )
- warn(_("[:^upper:] ambiguous in case insensitive scanner"));
+ lwarn(_("[:^upper:] ambiguous in case insensitive scanner"));
else
CCL_NEG_EXPR(isupper);
}
@@ -1018,13 +1021,13 @@ const char *msg, arg[];
char warn_msg[MAXLINE];
snprintf( warn_msg, sizeof(warn_msg), msg, arg );
- warn( warn_msg );
+ lwarn( warn_msg );
}
-/* warn - report a warning, unless -w was given */
+/* lwarn - report a warning, unless -w was given */
-void warn( str )
+void lwarn( str )
const char *str;
{
line_warning( str, linenum );
Index: src/external/bsd/flex/dist/src/regex.c
diff -u src/external/bsd/flex/dist/src/regex.c:1.1.1.1 src/external/bsd/flex/dist/src/regex.c:1.2
--- src/external/bsd/flex/dist/src/regex.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/regex.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: regex.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/** regex - regular expression functions related to POSIX regex lib. */
/* This file is part of flex. */
@@ -20,9 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
-
+__RCSID("$NetBSD: regex.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
static const char* REGEXP_LINEDIR = "^#line ([[:digit:]]+) \"(.*)\"";
static const char* REGEXP_BLANK_LINE = "^[[:space:]]*$";
Index: src/external/bsd/flex/dist/src/scanflags.c
diff -u src/external/bsd/flex/dist/src/scanflags.c:1.1.1.1 src/external/bsd/flex/dist/src/scanflags.c:1.2
--- src/external/bsd/flex/dist/src/scanflags.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/scanflags.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: scanflags.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* scanflags - flags used by scanning. */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: scanflags.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
scanflags_t* _sf_stk = NULL;
size_t _sf_top_ix=0, _sf_max=0;
Index: src/external/bsd/flex/dist/src/scanopt.c
diff -u src/external/bsd/flex/dist/src/scanopt.c:1.1.1.1 src/external/bsd/flex/dist/src/scanopt.c:1.2
--- src/external/bsd/flex/dist/src/scanopt.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/scanopt.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: scanopt.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: scanopt.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
#include "scanopt.h"
Index: src/external/bsd/flex/dist/src/scanopt.h
diff -u src/external/bsd/flex/dist/src/scanopt.h:1.1.1.1 src/external/bsd/flex/dist/src/scanopt.h:1.2
--- src/external/bsd/flex/dist/src/scanopt.h:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/scanopt.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: scanopt.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* flex - tool to generate fast lexical analyzers */
/* Copyright (c) 1990 The Regents of the University of California. */
Index: src/external/bsd/flex/dist/src/skel.c
diff -u src/external/bsd/flex/dist/src/skel.c:1.1.1.1 src/external/bsd/flex/dist/src/skel.c:1.2
--- src/external/bsd/flex/dist/src/skel.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/skel.c Sat Jan 9 12:38:57 2016
@@ -201,6 +201,9 @@ const char *skel[] = {
"",
"/* begin standard C headers. */",
"%if-c-only",
+ "#ifdef _LIBC",
+ "#include \"namespace.h\"",
+ "#endif",
"#include <stdio.h>",
"#include <string.h>",
"#include <errno.h>",
@@ -214,6 +217,8 @@ const char *skel[] = {
"/* end standard C headers. */",
"",
"%if-c-or-c++",
+ "/* $NetBSD: skel.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */",
+ "",
"/* flex integer type definitions */",
"",
"#ifndef FLEXINT_H",
@@ -282,6 +287,9 @@ const char *skel[] = {
"",
"%if-c++-only",
"/* begin standard C++ headers. */",
+ "#ifdef _LIBC",
+ "#include \"namespace.h\"",
+ "#endif",
"#include <iostream> ",
"#include <errno.h>",
"#include <cstdlib>",
Index: src/external/bsd/flex/dist/src/sym.c
diff -u src/external/bsd/flex/dist/src/sym.c:1.1.1.1 src/external/bsd/flex/dist/src/sym.c:1.2
--- src/external/bsd/flex/dist/src/sym.c:1.1.1.1 Sat Jan 9 10:43:36 2016
+++ src/external/bsd/flex/dist/src/sym.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: sym.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* sym - symbol table routines */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: sym.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
/* Variables for symbol tables:
* sctbl - start-condition symbol table
Index: src/external/bsd/flex/dist/src/tables.c
diff -u src/external/bsd/flex/dist/src/tables.c:1.1.1.1 src/external/bsd/flex/dist/src/tables.c:1.2
--- src/external/bsd/flex/dist/src/tables.c:1.1.1.1 Sat Jan 9 10:43:36 2016
+++ src/external/bsd/flex/dist/src/tables.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: tables.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* tables.c - tables serialization code
*
* Copyright (c) 1990 The Regents of the University of California.
@@ -31,9 +33,10 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE.
*/
+#include "flexdef.h"
+__RCSID("$NetBSD: tables.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
-#include "flexdef.h"
#include "tables.h"
/** Convert size_t to t_flag.
Index: src/external/bsd/flex/dist/src/tables.h
diff -u src/external/bsd/flex/dist/src/tables.h:1.1.1.1 src/external/bsd/flex/dist/src/tables.h:1.2
--- src/external/bsd/flex/dist/src/tables.h:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/tables.h Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: tables.h,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* tables.h - tables serialization code
*
* Copyright (c) 1990 The Regents of the University of California.
Index: src/external/bsd/flex/dist/src/tblcmp.c
diff -u src/external/bsd/flex/dist/src/tblcmp.c:1.1.1.1 src/external/bsd/flex/dist/src/tblcmp.c:1.2
--- src/external/bsd/flex/dist/src/tblcmp.c:1.1.1.1 Sat Jan 9 10:43:34 2016
+++ src/external/bsd/flex/dist/src/tblcmp.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: tblcmp.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* tblcmp - table compression routines */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,8 +32,9 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-
#include "flexdef.h"
+__RCSID("$NetBSD: tblcmp.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
+
/* declarations for functions that have forward references */
Index: src/external/bsd/flex/dist/src/yylex.c
diff -u src/external/bsd/flex/dist/src/yylex.c:1.1.1.1 src/external/bsd/flex/dist/src/yylex.c:1.2
--- src/external/bsd/flex/dist/src/yylex.c:1.1.1.1 Sat Jan 9 10:43:33 2016
+++ src/external/bsd/flex/dist/src/yylex.c Sat Jan 9 12:38:57 2016
@@ -1,3 +1,5 @@
+/* $NetBSD: yylex.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */
+
/* yylex - scanner front-end for flex */
/* Copyright (c) 1990 The Regents of the University of California. */
@@ -30,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include "flexdef.h"
+__RCSID("$NetBSD: yylex.c,v 1.2 2016/01/09 17:38:57 christos Exp $");
#include <ctype.h>
#include "flexdef.h"
Index: src/external/bsd/flex/include/config.h
diff -u src/external/bsd/flex/include/config.h:1.5 src/external/bsd/flex/include/config.h:1.6
--- src/external/bsd/flex/include/config.h:1.5 Wed Oct 29 14:28:36 2014
+++ src/external/bsd/flex/include/config.h Sat Jan 9 12:38:57 2016
@@ -1,5 +1,5 @@
-/* config.h. Generated from conf.in by configure. */
-/* conf.in. Generated from configure.ac by autoheader. */
+/* src/config.h. Generated from config.h.in by configure. */
+/* src/config.h.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
@@ -20,11 +20,11 @@
*/
/* #undef HAVE_ALLOCA_H */
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
@@ -154,8 +154,7 @@
/* Define to 1 if the system has the type `_Bool'. */
#define HAVE__BOOL 1
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Define to the m4 executable name. */
@@ -163,9 +162,6 @@
#define M4 "/usr/bin/m4"
#endif
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
/* Name of package */
#define PACKAGE "flex"
@@ -176,7 +172,7 @@
#define PACKAGE_NAME "the fast lexical analyser generator"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "the fast lexical analyser generator 2.5.39"
+#define PACKAGE_STRING "the fast lexical analyser generator 2.6.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "flex"
@@ -185,7 +181,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.39"
+#define PACKAGE_VERSION "2.6.0"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
@@ -199,7 +195,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "2.5.39"
+#define VERSION "2.6.0"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
Index: src/external/bsd/flex/man/Makefile
diff -u src/external/bsd/flex/man/Makefile:1.1 src/external/bsd/flex/man/Makefile:1.2
--- src/external/bsd/flex/man/Makefile:1.1 Sun Oct 25 21:39:45 2009
+++ src/external/bsd/flex/man/Makefile Sat Jan 9 12:38:57 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/10/26 01:39:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/09 17:38:57 christos Exp $
.include <bsd.own.mk>
.include "${.CURDIR}/../Makefile.inc"
-DIST= ${IDIST}/doc
+DIST= ${IDIST}/../doc
.PATH: ${DIST}
TEXINFO= flex.texi
