Module Name: src
Committed By: christos
Date: Wed Oct 29 18:28:36 UTC 2014
Modified Files:
src/external/bsd/flex: flex2netbsd
src/external/bsd/flex/dist: FlexLexer.h buf.c ccl.c dfa.c ecs.c
filter.c flex.skl flexdef.h flexint.h gen.c gettext.h initparse.c
libmain.c libyywrap.c main.c misc.c nfa.c options.c options.h
parse.y regex.c scan.l scanflags.c scanopt.c scanopt.h sym.c
tables.c tables.h tblcmp.c yylex.c
src/external/bsd/flex/include: config.h
Removed Files:
src/external/bsd/flex/dist: README-alpha README.cvs configure.in
mkinstalldirs
src/external/bsd/flex/dist/tools: Makefile.am Makefile.in git2cl
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/flex2netbsd
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/flex/dist/FlexLexer.h \
src/external/bsd/flex/dist/ccl.c src/external/bsd/flex/dist/ecs.c \
src/external/bsd/flex/dist/gettext.h src/external/bsd/flex/dist/nfa.c \
src/external/bsd/flex/dist/options.c src/external/bsd/flex/dist/options.h \
src/external/bsd/flex/dist/scanopt.h src/external/bsd/flex/dist/sym.c \
src/external/bsd/flex/dist/tables.h src/external/bsd/flex/dist/tblcmp.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/README-alpha \
src/external/bsd/flex/dist/mkinstalldirs
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/flex/dist/README.cvs \
src/external/bsd/flex/dist/configure.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/buf.c \
src/external/bsd/flex/dist/libmain.c \
src/external/bsd/flex/dist/libyywrap.c src/external/bsd/flex/dist/yylex.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/flex/dist/dfa.c \
src/external/bsd/flex/dist/flexint.h src/external/bsd/flex/dist/regex.c \
src/external/bsd/flex/dist/scanflags.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/filter.c \
src/external/bsd/flex/dist/initparse.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.9 -r1.10 src/external/bsd/flex/dist/flex.skl
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/flexdef.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/dist/gen.c
cvs rdiff -u -r1.4 -r1.5 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.2 -r0 src/external/bsd/flex/dist/tools/Makefile.am \
src/external/bsd/flex/dist/tools/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/tools/git2cl
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/flex/include/config.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/flex2netbsd
diff -u src/external/bsd/flex/flex2netbsd:1.2 src/external/bsd/flex/flex2netbsd:1.3
--- src/external/bsd/flex/flex2netbsd:1.2 Sat Oct 8 15:28:39 2011
+++ src/external/bsd/flex/flex2netbsd Wed Oct 29 14:28:36 2014
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: flex2netbsd,v 1.2 2011/10/08 19:28:39 christos Exp $
+# $NetBSD: flex2netbsd,v 1.3 2014/10/29 18:28:36 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,28 +34,18 @@
#
# $ cd /some/where/temporary
# $ tar xpfz /new/flex/release/tar/file
-# $ sh /usr/src/external/bsd/flex/dist/flex2netbsd flex-2.5.x `pwd`
-# $ cd src/external/bsd/flex/dist
+# $ 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
-# $ cd ../../../../../flex-9.x.y
# $ run ./configure
# $ run make
# check the config file and copy it to /usr/src/external/bsd/flex/include
# check the manual page against our copy if there are new options and
# update
-if [ $# -ne 2 ]; then echo "flex2netbsd src dest"; exit 1; fi
+if [ $# -ne 1 ]; then echo "flex2netbsd src"; exit 1; fi
r=$1
-d=$2/src/external/bsd/flex/dist
-
-case "$d" in
- /*)
- ;;
- *)
- d=`/bin/pwd`/$d
- ;;
-esac
case "$r" in
/*)
@@ -65,60 +55,9 @@ case "$r" in
;;
esac
-echo preparing directory $d
-rm -rf $d
-mkdir -p $d
-
-### Copy the files and directories
-echo copying $r to $d
-cd $r
-pax -rw * $d
+cd "$r"
### Remove the $'s around RCS tags
-cleantags $d
-
-### Add our NetBSD RCS Id
-find $d -type f -name '*.[chly]' -print | while read c; do
- sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/* \$NetBSD\$ */" >/tmp/flex3n$$
-echo "" >>/tmp/flex3n$$
-cat $c >> /tmp/flex3n$$
-mv /tmp/flex3n$$ $c && echo added NetBSD RCS tag to $c
- )
-done
-
-find $d -type f -name '*.[0-9]' -print | while read m; do
- sed 1q < $m | grep -q '\$NetBSD' || (
-echo ".\\\" \$NetBSD\$" >/tmp/flex2m$$
-echo ".\\\"" >>/tmp/flex2m$$
-cat $m >> /tmp/flex2m$$
-mv /tmp/flex2m$$ $m && echo added NetBSD RCS tag to $m
- )
-done
-
-find $d -type f -name '*.texi' -print | while read t; do
- sed "2 s/^/@c \$NetBSD\$\\
-/" < $t > /tmp/flex4t$$
- mv /tmp/flex4t$$ $t && echo added NetBSD RCS tag to $t
-done
-
-echo done
-
-### Clean up any CVS directories that might be around.
-echo "cleaning up CVS residue."
-(
- cd $d
- find . -type d -name "CVS" -print | xargs rm -r
-)
-echo done
-
-### Fixing file and directory permissions.
-echo "Fixing file/directory permissions."
-(
- cd $d
- find . -type f -print | xargs chmod u+rw,go+r
- find . -type d -print | xargs chmod u+rwx,go+rx
-)
-echo done
+cleantags .
exit 0
Index: src/external/bsd/flex/dist/FlexLexer.h
diff -u src/external/bsd/flex/dist/FlexLexer.h:1.1.1.2 src/external/bsd/flex/dist/FlexLexer.h:1.2
--- src/external/bsd/flex/dist/FlexLexer.h:1.1.1.2 Wed Oct 29 14:22:45 2014
+++ src/external/bsd/flex/dist/FlexLexer.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: FlexLexer.h,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
// -*-C++-*-
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
Index: src/external/bsd/flex/dist/ccl.c
diff -u src/external/bsd/flex/dist/ccl.c:1.1.1.2 src/external/bsd/flex/dist/ccl.c:1.2
--- src/external/bsd/flex/dist/ccl.c:1.1.1.2 Wed Oct 29 14:22:46 2014
+++ src/external/bsd/flex/dist/ccl.c Wed Oct 29 14:28:36 2014
@@ -30,6 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: ccl.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/ecs.c
diff -u src/external/bsd/flex/dist/ecs.c:1.1.1.2 src/external/bsd/flex/dist/ecs.c:1.2
--- src/external/bsd/flex/dist/ecs.c:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/ecs.c Wed Oct 29 14:28:36 2014
@@ -30,6 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: ecs.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/gettext.h
diff -u src/external/bsd/flex/dist/gettext.h:1.1.1.2 src/external/bsd/flex/dist/gettext.h:1.2
--- src/external/bsd/flex/dist/gettext.h:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/gettext.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: gettext.h,v 1.2 2014/10/29 18:28:36 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/nfa.c
diff -u src/external/bsd/flex/dist/nfa.c:1.1.1.2 src/external/bsd/flex/dist/nfa.c:1.2
--- src/external/bsd/flex/dist/nfa.c:1.1.1.2 Wed Oct 29 14:22:45 2014
+++ src/external/bsd/flex/dist/nfa.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: nfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* nfa - NFA construction routines */
/* 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 <sys/cdefs.h>
+__RCSID("$NetBSD: nfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/options.c
diff -u src/external/bsd/flex/dist/options.c:1.1.1.2 src/external/bsd/flex/dist/options.c:1.2
--- src/external/bsd/flex/dist/options.c:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/options.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: options.c,v 1.2 2014/10/29 18:28:36 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 <sys/cdefs.h>
+__RCSID("$NetBSD: options.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "options.h"
Index: src/external/bsd/flex/dist/options.h
diff -u src/external/bsd/flex/dist/options.h:1.1.1.2 src/external/bsd/flex/dist/options.h:1.2
--- src/external/bsd/flex/dist/options.h:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/options.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: options.h,v 1.2 2014/10/29 18:28:36 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/scanopt.h
diff -u src/external/bsd/flex/dist/scanopt.h:1.1.1.2 src/external/bsd/flex/dist/scanopt.h:1.2
--- src/external/bsd/flex/dist/scanopt.h:1.1.1.2 Wed Oct 29 14:22:45 2014
+++ src/external/bsd/flex/dist/scanopt.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: scanopt.h,v 1.2 2014/10/29 18:28:36 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/sym.c
diff -u src/external/bsd/flex/dist/sym.c:1.1.1.2 src/external/bsd/flex/dist/sym.c:1.2
--- src/external/bsd/flex/dist/sym.c:1.1.1.2 Wed Oct 29 14:22:45 2014
+++ src/external/bsd/flex/dist/sym.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: sym.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* sym - symbol table routines */
/* 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 <sys/cdefs.h>
+__RCSID("$NetBSD: sym.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/tables.h
diff -u src/external/bsd/flex/dist/tables.h:1.1.1.2 src/external/bsd/flex/dist/tables.h:1.2
--- src/external/bsd/flex/dist/tables.h:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/tables.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: tables.h,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* tables.h - tables serialization code
*
* Copyright (c) 1990 The Regents of the University of California.
Index: src/external/bsd/flex/dist/tblcmp.c
diff -u src/external/bsd/flex/dist/tblcmp.c:1.1.1.2 src/external/bsd/flex/dist/tblcmp.c:1.2
--- src/external/bsd/flex/dist/tblcmp.c:1.1.1.2 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/tblcmp.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: tblcmp.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* tblcmp - table compression routines */
/* 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 <sys/cdefs.h>
+__RCSID("$NetBSD: tblcmp.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/buf.c
diff -u src/external/bsd/flex/dist/buf.c:1.2 src/external/bsd/flex/dist/buf.c:1.3
--- src/external/bsd/flex/dist/buf.c:1.2 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/buf.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.2 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/libmain.c
diff -u src/external/bsd/flex/dist/libmain.c:1.2 src/external/bsd/flex/dist/libmain.c:1.3
--- src/external/bsd/flex/dist/libmain.c:1.2 Sat Feb 18 14:17:54 2012
+++ src/external/bsd/flex/dist/libmain.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libmain.c,v 1.2 2012/02/18 19:17:54 christos Exp $ */
+/* $NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
/* libmain - flex run-time support library "main" function */
@@ -22,6 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: libmain.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
extern int yylex(void);
Index: src/external/bsd/flex/dist/libyywrap.c
diff -u src/external/bsd/flex/dist/libyywrap.c:1.2 src/external/bsd/flex/dist/libyywrap.c:1.3
--- src/external/bsd/flex/dist/libyywrap.c:1.2 Sat Feb 18 14:17:54 2012
+++ src/external/bsd/flex/dist/libyywrap.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libyywrap.c,v 1.2 2012/02/18 19:17:54 christos Exp $ */
+/* $NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
/* libyywrap - flex run-time support library "yywrap" function */
@@ -22,6 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: libyywrap.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
int yywrap(void);
int
Index: src/external/bsd/flex/dist/yylex.c
diff -u src/external/bsd/flex/dist/yylex.c:1.2 src/external/bsd/flex/dist/yylex.c:1.3
--- src/external/bsd/flex/dist/yylex.c:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/yylex.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: yylex.c,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: yylex.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
/* yylex - scanner front-end for flex */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: yylex.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
#include <ctype.h>
#include "flexdef.h"
Index: src/external/bsd/flex/dist/dfa.c
diff -u src/external/bsd/flex/dist/dfa.c:1.1.1.3 src/external/bsd/flex/dist/dfa.c:1.2
--- src/external/bsd/flex/dist/dfa.c:1.1.1.3 Wed Oct 29 14:22:47 2014
+++ src/external/bsd/flex/dist/dfa.c Wed Oct 29 14:28:36 2014
@@ -28,6 +28,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "tables.h"
Index: src/external/bsd/flex/dist/flexint.h
diff -u src/external/bsd/flex/dist/flexint.h:1.1.1.3 src/external/bsd/flex/dist/flexint.h:1.2
--- src/external/bsd/flex/dist/flexint.h:1.1.1.3 Wed Oct 29 14:22:45 2014
+++ src/external/bsd/flex/dist/flexint.h Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: flexint.h,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* flex integer type definitions */
#ifndef FLEXINT_H
Index: src/external/bsd/flex/dist/regex.c
diff -u src/external/bsd/flex/dist/regex.c:1.1.1.3 src/external/bsd/flex/dist/regex.c:1.2
--- src/external/bsd/flex/dist/regex.c:1.1.1.3 Wed Oct 29 14:22:46 2014
+++ src/external/bsd/flex/dist/regex.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: regex.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/** regex - regular expression functions related to POSIX regex lib. */
/* This file is part of flex. */
@@ -20,6 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: regex.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/scanflags.c
diff -u src/external/bsd/flex/dist/scanflags.c:1.1.1.3 src/external/bsd/flex/dist/scanflags.c:1.2
--- src/external/bsd/flex/dist/scanflags.c:1.1.1.3 Wed Oct 29 14:22:48 2014
+++ src/external/bsd/flex/dist/scanflags.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,5 @@
+/* $NetBSD: scanflags.c,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
/* scanflags - flags used by scanning. */
/* 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 <sys/cdefs.h>
+__RCSID("$NetBSD: scanflags.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/filter.c
diff -u src/external/bsd/flex/dist/filter.c:1.3 src/external/bsd/flex/dist/filter.c:1.4
--- src/external/bsd/flex/dist/filter.c:1.3 Sat Oct 19 23:13:44 2013
+++ src/external/bsd/flex/dist/filter.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.3 2013/10/20 03:13:44 christos Exp $ */
+/* $NetBSD: filter.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
/* filter - postprocessing of flex output through filters */
@@ -22,6 +22,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: filter.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
static const char * check_4_gnu_m4 =
Index: src/external/bsd/flex/dist/initparse.c
diff -u src/external/bsd/flex/dist/initparse.c:1.3 src/external/bsd/flex/dist/initparse.c:1.4
--- src/external/bsd/flex/dist/initparse.c:1.3 Sat Apr 6 11:27:26 2013
+++ src/external/bsd/flex/dist/initparse.c Wed Oct 29 14:28:36 2014
@@ -1,3 +1,8 @@
+/* $NetBSD: initparse.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: initparse.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
+
#ifndef lint
static const char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93";
#endif
Index: src/external/bsd/flex/dist/misc.c
diff -u src/external/bsd/flex/dist/misc.c:1.3 src/external/bsd/flex/dist/misc.c:1.4
--- src/external/bsd/flex/dist/misc.c:1.3 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/misc.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: misc.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
/* misc - miscellaneous flex routines */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: misc.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "tables.h"
Index: src/external/bsd/flex/dist/parse.y
diff -u src/external/bsd/flex/dist/parse.y:1.3 src/external/bsd/flex/dist/parse.y:1.4
--- src/external/bsd/flex/dist/parse.y:1.3 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/parse.y Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.3 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: parse.y,v 1.4 2014/10/29 18:28:36 christos Exp $ */
/* parse.y - parser for flex input */
@@ -64,6 +64,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: parse.y,v 1.4 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "tables.h"
Index: src/external/bsd/flex/dist/tables.c
diff -u src/external/bsd/flex/dist/tables.c:1.3 src/external/bsd/flex/dist/tables.c:1.4
--- src/external/bsd/flex/dist/tables.c:1.3 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/tables.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tables.c,v 1.3 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: tables.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
/* tables.c - tables serialization code
*
@@ -33,6 +33,8 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: tables.c,v 1.4 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
Index: src/external/bsd/flex/dist/flex.skl
diff -u src/external/bsd/flex/dist/flex.skl:1.9 src/external/bsd/flex/dist/flex.skl:1.10
--- src/external/bsd/flex/dist/flex.skl:1.9 Sat Apr 6 16:05:40 2013
+++ src/external/bsd/flex/dist/flex.skl Wed Oct 29 14:28:36 2014
@@ -509,9 +509,17 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]],
if ( yytext[yyl] == '\n' )\
--yylineno;\
}while(0)
+ #define YY_LINENO_REWIND_TO(dst) \
+ do {\
+ const char *p;\
+ for ( p = yy_cp-1; p >= (dst); --p)\
+ if ( *p == '\n' )\
+ --yylineno;\
+ }while(0)
]],
[[
#define YY_LESS_LINENO(n)
+ #define YY_LINENO_REWIND_TO(ptr)
]])
]])
@@ -733,6 +741,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]],
@@ -1283,8 +1296,6 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
]])
]])
-%% [7.0] user's declarations go here
-
m4_ifdef( [[M4_YY_BISON_LVAL]],
[[
yylval = yylval_param;
@@ -1340,6 +1351,9 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
}
+ {
+%% [7.0] user's declarations go here
+
while (/*CONSTCOND*/ 1 ) /* loops until end-of-file is reached */
{
%% [8.0] yymore()-related code goes here
@@ -1497,6 +1511,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
@@ -2372,7 +2387,8 @@ YY_BUFFER_STATE yy_scan_bytes YYFARGS2(
{
YY_BUFFER_STATE b;
char *buf;
- yy_size_t i, n;
+ yy_size_t n;
+ yy_size_t i;
m4_dnl M4_YY_DECL_GUTS_VAR();
/* Get memory for full buffer, including space for trailing EOB's. */
Index: src/external/bsd/flex/dist/flexdef.h
diff -u src/external/bsd/flex/dist/flexdef.h:1.5 src/external/bsd/flex/dist/flexdef.h:1.6
--- src/external/bsd/flex/dist/flexdef.h:1.5 Tue Apr 9 11:19:45 2013
+++ src/external/bsd/flex/dist/flexdef.h Wed Oct 29 14:28:36 2014
@@ -1,5 +1,4 @@
-/* $NetBSD: flexdef.h,v 1.5 2013/04/09 15:19:45 christos Exp $ */
-
+/* $NetBSD: flexdef.h,v 1.6 2014/10/29 18:28:36 christos Exp $ */
/* flexdef - definitions file for flex */
@@ -910,6 +909,13 @@ 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
+#ifdef __printflike
+__printflike(1, 2)
+#endif
+void lerrsf_fatal (const char *msg, ...);
+
/* Spit out a "#line" statement. */
extern void line_directive_out PROTO ((FILE *, int));
@@ -1221,12 +1227,4 @@ extern void sf_init(void);
extern void sf_push(void);
extern void sf_pop(void);
-/*
- * From "misc.c"
- */
-#ifdef __printflike
-__printflike(1, 2)
-#endif
-void lerrsf_fatal (const char *msg, ...);
-
#endif /* not defined FLEXDEF_H */
Index: src/external/bsd/flex/dist/gen.c
diff -u src/external/bsd/flex/dist/gen.c:1.8 src/external/bsd/flex/dist/gen.c:1.9
--- src/external/bsd/flex/dist/gen.c:1.8 Sat Apr 6 16:05:40 2013
+++ src/external/bsd/flex/dist/gen.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.8 2013/04/06 20:05:40 christos Exp $ */
+/* $NetBSD: gen.c,v 1.9 2014/10/29 18:28:36 christos Exp $ */
/* gen - actual generation (writing) of flex scanners */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: gen.c,v 1.9 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "tables.h"
@@ -879,7 +881,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) {
Index: src/external/bsd/flex/dist/main.c
diff -u src/external/bsd/flex/dist/main.c:1.4 src/external/bsd/flex/dist/main.c:1.5
--- src/external/bsd/flex/dist/main.c:1.4 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/main.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.4 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: main.c,v 1.5 2014/10/29 18:28:36 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: main.c,v 1.5 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
@@ -184,6 +186,8 @@ int flex_main (argc, argv)
readin ();
+ skelout ();
+ /* %% [1.5] DFA */
ntod ();
for (i = 1; i <= num_rules; ++i)
@@ -242,11 +246,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;
Index: src/external/bsd/flex/dist/scan.l
diff -u src/external/bsd/flex/dist/scan.l:1.4 src/external/bsd/flex/dist/scan.l:1.5
--- src/external/bsd/flex/dist/scan.l:1.4 Sat Apr 6 10:27:52 2013
+++ src/external/bsd/flex/dist/scan.l Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scan.l,v 1.4 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: scan.l,v 1.5 2014/10/29 18:28:36 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
@@ -33,6 +33,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: scan.l,v 1.5 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "parse.h"
Index: src/external/bsd/flex/dist/scanopt.c
diff -u src/external/bsd/flex/dist/scanopt.c:1.4 src/external/bsd/flex/dist/scanopt.c:1.5
--- src/external/bsd/flex/dist/scanopt.c:1.4 Sat Oct 19 23:13:44 2013
+++ src/external/bsd/flex/dist/scanopt.c Wed Oct 29 14:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scanopt.c,v 1.4 2013/10/20 03:13:44 christos Exp $ */
+/* $NetBSD: scanopt.c,v 1.5 2014/10/29 18:28:36 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: scanopt.c,v 1.5 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "scanopt.h"
Index: src/external/bsd/flex/include/config.h
diff -u src/external/bsd/flex/include/config.h:1.4 src/external/bsd/flex/include/config.h:1.5
--- src/external/bsd/flex/include/config.h:1.4 Sat Apr 6 11:25:51 2013
+++ src/external/bsd/flex/include/config.h Wed Oct 29 14:28:36 2014
@@ -1,5 +1,5 @@
/* config.h. Generated from conf.in by configure. */
-/* conf.in. Generated from configure.in by autoheader. */
+/* conf.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,10 +20,21 @@
*/
/* #undef HAVE_ALLOCA_H */
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
/* #undef HAVE_DCGETTEXT */
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
/* Define to 1 if you have the `dup2' function. */
#define HAVE_DUP2 1
@@ -33,7 +44,7 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
/* #undef HAVE_GETTEXT */
-/* Define if you have the iconv() function. */
+/* Define if you have the iconv() function and it works. */
#define HAVE_ICONV 1
/* Define to 1 if you have the <inttypes.h> header file. */
@@ -143,6 +154,10 @@
/* 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.
+ */
+#undef LT_OBJDIR
+
/* Define to the m4 executable name. */
#ifndef M4
#define M4 "/usr/bin/m4"
@@ -161,7 +176,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.37"
+#define PACKAGE_STRING "the fast lexical analyser generator 2.5.39"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "flex"
@@ -170,7 +185,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.37"
+#define PACKAGE_VERSION "2.5.39"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
@@ -184,7 +199,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "2.5.37"
+#define VERSION "2.5.39"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
