Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/flex Merge our changes; the directory structure...
details: https://anonhg.NetBSD.org/src/rev/cdb5075ed543
branches: trunk
changeset: 342800:cdb5075ed543
user: christos <christos%NetBSD.org@localhost>
date: Sat Jan 09 17:38:56 2016 +0000
description:
Merge our changes; the directory structure got changed.
Changes are too large for here, see changelog.
diffstat:
external/bsd/flex/Makefile.inc | 6 +-
external/bsd/flex/dist/FlexLexer.h | 208 -
external/bsd/flex/dist/Makefile | 1321 ---
external/bsd/flex/dist/buf.c | 277 -
external/bsd/flex/dist/ccl.c | 311 -
external/bsd/flex/dist/compile | 343 -
external/bsd/flex/dist/conf.in | 221 -
external/bsd/flex/dist/config.guess | 1530 ----
external/bsd/flex/dist/config.rpath | 672 --
external/bsd/flex/dist/config.sub | 1782 -----
external/bsd/flex/dist/depcomp | 708 --
external/bsd/flex/dist/dfa.c | 1097 ---
external/bsd/flex/dist/ecs.c | 218 -
external/bsd/flex/dist/filter.c | 443 -
external/bsd/flex/dist/flex.skl | 3461 ----------
external/bsd/flex/dist/flexdef.h | 1236 ---
external/bsd/flex/dist/flexint.h | 65 -
external/bsd/flex/dist/gen.c | 2195 ------
external/bsd/flex/dist/gettext.h | 61 -
external/bsd/flex/dist/initparse.c | 1768 -----
external/bsd/flex/dist/initparse.h | 45 -
external/bsd/flex/dist/initscan.c | 4919 --------------
external/bsd/flex/dist/install-sh | 527 -
external/bsd/flex/dist/libmain.c | 39 -
external/bsd/flex/dist/libtool | 10243 -------------------------------
external/bsd/flex/dist/libyywrap.c | 35 -
external/bsd/flex/dist/ltmain.sh | 9661 -----------------------------
external/bsd/flex/dist/main.c | 1862 -----
external/bsd/flex/dist/misc.c | 1031 ---
external/bsd/flex/dist/missing | 331 -
external/bsd/flex/dist/mkskel.sh | 37 -
external/bsd/flex/dist/nfa.c | 722 --
external/bsd/flex/dist/options.c | 284 -
external/bsd/flex/dist/options.h | 136 -
external/bsd/flex/dist/parse.y | 1092 ---
external/bsd/flex/dist/regex.c | 173 -
external/bsd/flex/dist/scan.l | 1032 ---
external/bsd/flex/dist/scanflags.c | 71 -
external/bsd/flex/dist/scanopt.c | 872 --
external/bsd/flex/dist/scanopt.h | 134 -
external/bsd/flex/dist/src/FlexLexer.h | 2 +
external/bsd/flex/dist/src/buf.c | 5 +-
external/bsd/flex/dist/src/ccl.c | 3 +-
external/bsd/flex/dist/src/dfa.c | 3 +-
external/bsd/flex/dist/src/ecs.c | 3 +-
external/bsd/flex/dist/src/filter.c | 5 +-
external/bsd/flex/dist/src/flex.skl | 6 +
external/bsd/flex/dist/src/flexdef.h | 6 +-
external/bsd/flex/dist/src/flexint.h | 2 +
external/bsd/flex/dist/src/gen.c | 12 +-
external/bsd/flex/dist/src/gettext.h | 2 +
external/bsd/flex/dist/src/libmain.c | 6 +
external/bsd/flex/dist/src/libyywrap.c | 6 +
external/bsd/flex/dist/src/main.c | 7 +-
external/bsd/flex/dist/src/misc.c | 8 +-
external/bsd/flex/dist/src/nfa.c | 5 +-
external/bsd/flex/dist/src/options.c | 4 +
external/bsd/flex/dist/src/options.h | 2 +
external/bsd/flex/dist/src/parse.c | 2953 --------
external/bsd/flex/dist/src/parse.h | 154 -
external/bsd/flex/dist/src/parse.y | 23 +-
external/bsd/flex/dist/src/regex.c | 5 +-
external/bsd/flex/dist/src/scan.l | 1029 ---
external/bsd/flex/dist/src/scanflags.c | 4 +-
external/bsd/flex/dist/src/scanopt.c | 5 +-
external/bsd/flex/dist/src/scanopt.h | 2 +
external/bsd/flex/dist/src/skel.c | 8 +
external/bsd/flex/dist/src/sym.c | 5 +-
external/bsd/flex/dist/src/tables.c | 5 +-
external/bsd/flex/dist/src/tables.h | 2 +
external/bsd/flex/dist/src/tblcmp.c | 5 +-
external/bsd/flex/dist/src/yylex.c | 4 +
external/bsd/flex/dist/stamp-h1 | 1 -
external/bsd/flex/dist/sym.c | 275 -
external/bsd/flex/dist/tables.c | 505 -
external/bsd/flex/dist/tables.h | 87 -
external/bsd/flex/dist/tables_shared.c | 70 -
external/bsd/flex/dist/tables_shared.h | 144 -
external/bsd/flex/dist/tblcmp.c | 856 --
external/bsd/flex/dist/version.h | 1 -
external/bsd/flex/dist/ylwrap | 226 -
external/bsd/flex/dist/yylex.c | 214 -
external/bsd/flex/flex2netbsd | 8 +-
external/bsd/flex/include/config.h | 20 +-
external/bsd/flex/man/Makefile | 4 +-
85 files changed, 140 insertions(+), 57731 deletions(-)
diffs (truncated from 58644 to 300 lines):
diff -r 89872f83db18 -r cdb5075ed543 external/bsd/flex/Makefile.inc
--- a/external/bsd/flex/Makefile.inc Sat Jan 09 15:43:18 2016 +0000
+++ b/external/bsd/flex/Makefile.inc Sat Jan 09 17:38:56 2016 +0000
@@ -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\"
diff -r 89872f83db18 -r cdb5075ed543 external/bsd/flex/dist/FlexLexer.h
--- a/external/bsd/flex/dist/FlexLexer.h Sat Jan 09 15:43:18 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,208 +0,0 @@
-/* $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
-
-// Copyright (c) 1993 The Regents of the University of California.
-// All rights reserved.
-//
-// This code is derived from software contributed to Berkeley by
-// Kent Williams and Tom Epperly.
-//
-// 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.
-
-// This file defines FlexLexer, an abstract class which specifies the
-// external interface provided to flex C++ lexer objects, and yyFlexLexer,
-// which defines a particular lexer class.
-//
-// If you want to create multiple lexer classes, you use the -P flag
-// to rename each yyFlexLexer to some other xxFlexLexer. You then
-// include <FlexLexer.h> in your other sources once per lexer class:
-//
-// #undef yyFlexLexer
-// #define yyFlexLexer xxFlexLexer
-// #include <FlexLexer.h>
-//
-// #undef yyFlexLexer
-// #define yyFlexLexer zzFlexLexer
-// #include <FlexLexer.h>
-// ...
-
-#ifndef __FLEX_LEXER_H
-// Never included before - need to define base class.
-#define __FLEX_LEXER_H
-
-#include <iostream>
-# ifndef FLEX_STD
-# define FLEX_STD std::
-# endif
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer {
-public:
- virtual ~FlexLexer() { }
-
- const char* YYText() const { return yytext; }
- int YYLeng() const { return yyleng; }
-
- virtual void
- yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
- virtual struct yy_buffer_state*
- yy_create_buffer( FLEX_STD istream* s, int size ) = 0;
- virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
- virtual void yyrestart( FLEX_STD istream* s ) = 0;
-
- virtual int yylex() = 0;
-
- // Call yylex with new input/output sources.
- int yylex( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 )
- {
- switch_streams( new_in, new_out );
- return yylex();
- }
-
- // Switch to new input/output streams. A nil stream pointer
- // indicates "keep the current one".
- virtual void switch_streams( FLEX_STD istream* new_in = 0,
- FLEX_STD ostream* new_out = 0 ) = 0;
-
- int lineno() const { return yylineno; }
-
- int debug() const { return yy_flex_debug; }
- void set_debug( int flag ) { yy_flex_debug = flag; }
-
-protected:
- char* yytext;
- int yyleng;
- int yylineno; // only maintained if you use %option yylineno
- int yy_flex_debug; // only has effect with -d or "%option debug"
-};
-
-}
-#endif // FLEXLEXER_H
-
-#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
-// Either this is the first time through (yyFlexLexerOnce not defined),
-// or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex manual.
-#define yyFlexLexerOnce
-
-extern "C++" {
-
-class yyFlexLexer : public FlexLexer {
-public:
- // arg_yyin and arg_yyout default to the cin and cout, but we
- // only make that assignment when initializing in yylex().
- yyFlexLexer( FLEX_STD istream* arg_yyin = 0, FLEX_STD ostream* arg_yyout = 0 );
-
- virtual ~yyFlexLexer();
-
- void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
- struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size );
- void yy_delete_buffer( struct yy_buffer_state* b );
- void yyrestart( FLEX_STD istream* s );
-
- void yypush_buffer_state( struct yy_buffer_state* new_buffer );
- void yypop_buffer_state();
-
- virtual int yylex();
- virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 );
- virtual int yywrap();
-
-protected:
- virtual int LexerInput( char* buf, int max_size );
- virtual void LexerOutput( const char* buf, int size );
- virtual void LexerError( const char* msg );
-
- void yyunput( int c, char* buf_ptr );
- int yyinput();
-
- void yy_load_buffer_state();
- void yy_init_buffer( struct yy_buffer_state* b, FLEX_STD istream* s );
- void yy_flush_buffer( struct yy_buffer_state* b );
-
- int yy_start_stack_ptr;
- int yy_start_stack_depth;
- int* yy_start_stack;
-
- void yy_push_state( int new_state );
- void yy_pop_state();
- int yy_top_state();
-
- yy_state_type yy_get_previous_state();
- yy_state_type yy_try_NUL_trans( yy_state_type current_state );
- int yy_get_next_buffer();
-
- FLEX_STD istream* yyin; // input source for default LexerInput
- FLEX_STD ostream* yyout; // output sink for default LexerOutput
-
- // yy_hold_char holds the character lost when yytext is formed.
- char yy_hold_char;
-
- // Number of characters read into yy_ch_buf.
- int yy_n_chars;
-
- // Points to current character in buffer.
- char* yy_c_buf_p;
-
- int yy_init; // whether we need to initialize
- int yy_start; // start state number
-
- // Flag which is used to allow yywrap()'s to do buffer switches
- // instead of setting up a fresh yyin. A bit of a hack ...
- int yy_did_buffer_switch_on_eof;
-
-
- size_t yy_buffer_stack_top; /**< index of top of stack. */
- size_t yy_buffer_stack_max; /**< capacity of stack. */
- struct yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
- void yyensure_buffer_stack(void);
-
- // The following are not always needed, but may be depending
- // on use of certain flex features (like REJECT or yymore()).
-
- yy_state_type yy_last_accepting_state;
- char* yy_last_accepting_cpos;
-
- yy_state_type* yy_state_buf;
- yy_state_type* yy_state_ptr;
-
- char* yy_full_match;
- int* yy_full_state;
- int yy_full_lp;
-
- int yy_lp;
- int yy_looking_for_trail_begin;
-
- int yy_more_flag;
- int yy_more_len;
- int yy_more_offset;
- int yy_prev_more_offset;
-};
-
-}
-
-#endif // yyFlexLexer || ! yyFlexLexerOnce
-
diff -r 89872f83db18 -r cdb5075ed543 external/bsd/flex/dist/Makefile
--- a/external/bsd/flex/dist/Makefile Sat Jan 09 15:43:18 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1321 +0,0 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
-# Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# 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.
-
-# Notes on building:
-
-# Possible values for DEFS:
-#
-# By default, flex generates 8-bit scanners when using table compression,
-# and 7-bit scanners when using uncompressed tables (-f or -F options).
-# For flex to always generate 8-bit scanners, add "-DDEFAULT_CSIZE=256"
-# to DEFS.
-#
-# For Vax/VMS, add "-DVMS" to DEFS.
-#
-# For MS-DOS, add "-DMS_DOS" to DEFS. See the directory MISC/MSDOS for
-# additional info.
-
-
-
-
-
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
Home |
Main Index |
Thread Index |
Old Index