Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Pull up following revision(s) (requested by tron in ticke...
details: https://anonhg.NetBSD.org/src/rev/41de84159df9
branches: netbsd-6
changeset: 773795:41de84159df9
user: riz <riz%NetBSD.org@localhost>
date: Thu Feb 23 02:11:49 2012 +0000
description:
Pull up following revision(s) (requested by tron in ticket #19):
usr.bin/lex/version.h: file removal
usr.bin/lex/main.c: file removal
usr.bin/lex/libmain.c: file removal
usr.bin/lex/COPYING: file removal
usr.bin/lex/misc.c: file removal
usr.bin/lex/Makefile: file removal
usr.bin/lex/dfa.c: file removal
tools/compat/Makefile: revision 1.56
external/bsd/flex/dist/libmain.c: revision 1.2
usr.bin/lex/flexdef.h: file removal
usr.bin/lex/flex.1: file removal
usr.bin/lex/ecs.c: file removal
usr.bin/lex/FlexLexer.h: file removal
usr.bin/lex/libyywrap.c: file removal
usr.bin/lex/config.h: file removal
usr.bin/lex/ccl.c: file removal
usr.bin/lex/NEWS: file removal
usr.bin/lex/flex.skl: file removal
usr.bin/lex/scan.l: file removal
usr.bin/lex/gen.c: file removal
usr.bin/lex/yylex.c: file removal
usr.bin/lex/VERSION: file removal
usr.bin/lex/initscan.c: file removal
usr.bin/lex/sym.c: file removal
usr.bin/lex/tblcmp.c: file removal
usr.bin/lex/nfa.c: file removal
usr.bin/lex/mkskel.sh: file removal
external/bsd/flex/dist/libyywrap.c: revision 1.2
usr.bin/lex/parse.y: file removal
this has not been used for ages.
Adjust libyywrap.c location.
fix prototypes
diffstat:
external/bsd/flex/dist/libmain.c | 14 +-
external/bsd/flex/dist/libyywrap.c | 6 +-
tools/compat/Makefile | 4 +-
usr.bin/lex/COPYING | 38 -
usr.bin/lex/FlexLexer.h | 185 -
usr.bin/lex/Makefile | 44 -
usr.bin/lex/NEWS | 1233 ----------
usr.bin/lex/VERSION | 2 -
usr.bin/lex/ccl.c | 149 -
usr.bin/lex/config.h | 29 -
usr.bin/lex/dfa.c | 1095 ---------
usr.bin/lex/ecs.c | 225 -
usr.bin/lex/flex.1 | 4251 ------------------------------------
usr.bin/lex/flex.skl | 1572 -------------
usr.bin/lex/flexdef.h | 1054 --------
usr.bin/lex/gen.c | 1624 -------------
usr.bin/lex/initscan.c | 3708 -------------------------------
usr.bin/lex/libmain.c | 21 -
usr.bin/lex/libyywrap.c | 17 -
usr.bin/lex/main.c | 1178 ---------
usr.bin/lex/misc.c | 888 -------
usr.bin/lex/mkskel.sh | 19 -
usr.bin/lex/nfa.c | 710 ------
usr.bin/lex/parse.y | 913 -------
usr.bin/lex/scan.l | 709 ------
usr.bin/lex/sym.c | 253 --
usr.bin/lex/tblcmp.c | 887 -------
usr.bin/lex/version.h | 3 -
usr.bin/lex/yylex.c | 216 -
29 files changed, 13 insertions(+), 21034 deletions(-)
diffs (truncated from 21194 to 300 lines):
diff -r 3d59f54eb7cc -r 41de84159df9 external/bsd/flex/dist/libmain.c
--- a/external/bsd/flex/dist/libmain.c Thu Feb 23 02:08:59 2012 +0000
+++ b/external/bsd/flex/dist/libmain.c Thu Feb 23 02:11:49 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libmain.c,v 1.1.1.1 2009/10/26 00:26:24 christos Exp $ */
+/* $NetBSD: libmain.c,v 1.1.1.1.8.1 2012/02/23 02:11:51 riz Exp $ */
/* libmain - flex run-time support library "main" function */
@@ -23,13 +23,13 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-extern int yylex ();
+extern int yylex(void);
-int main (argc, argv)
- int argc;
- char *argv[];
+int
+/*ARGSUSED*/
+main(int argc, char *argv[])
{
- while (yylex () != 0) ;
-
+ while (yylex() != 0)
+ continue;
return 0;
}
diff -r 3d59f54eb7cc -r 41de84159df9 external/bsd/flex/dist/libyywrap.c
--- a/external/bsd/flex/dist/libyywrap.c Thu Feb 23 02:08:59 2012 +0000
+++ b/external/bsd/flex/dist/libyywrap.c Thu Feb 23 02:11:49 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: libyywrap.c,v 1.1.1.1 2009/10/26 00:26:24 christos Exp $ */
+/* $NetBSD: libyywrap.c,v 1.1.1.1.8.1 2012/02/23 02:11:51 riz Exp $ */
/* libyywrap - flex run-time support library "yywrap" function */
@@ -23,7 +23,9 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
-int yywrap (void)
+int yywrap(void);
+int
+yywrap(void)
{
return 1;
}
diff -r 3d59f54eb7cc -r 41de84159df9 tools/compat/Makefile
--- a/tools/compat/Makefile Thu Feb 23 02:08:59 2012 +0000
+++ b/tools/compat/Makefile Thu Feb 23 02:11:49 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2011/11/03 19:30:05 joerg Exp $
+# $NetBSD: Makefile,v 1.55.2.1 2012/02/23 02:11:50 riz Exp $
HOSTLIB= nbcompat
@@ -49,7 +49,7 @@
${.CURDIR}/../../common/lib/libc/hash/sha2 \
${.CURDIR}/../../common/lib/libc/md \
${.CURDIR}/../../common/lib/libc/stdlib \
- ${.CURDIR}/../../usr.bin/lex
+ ${.CURDIR}/../../external/bsd/flex/dist
DPSRCS+= defs.mk
CLEANFILES+= config.log config.status configure.lineno *.stamp
diff -r 3d59f54eb7cc -r 41de84159df9 usr.bin/lex/COPYING
--- a/usr.bin/lex/COPYING Thu Feb 23 02:08:59 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-Flex carries the copyright used for BSD software, slightly modified
-because it originated at the Lawrence Berkeley (not Livermore!) Laboratory,
-which operates under a contract with the Department of Energy:
-
- 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.
-
- Redistribution and use in source and binary forms are permitted
- provided that: (1) source distributions retain this entire
- copyright notice and comment, and (2) distributions including
- binaries display the following acknowledgement: ``This product
- includes software developed by the University of California,
- Berkeley and its contributors'' in the documentation or other
- materials provided with the distribution and in all advertising
- materials mentioning features or use of this software. 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 basically says "do whatever you please with this software except
-remove this notice or take advantage of the University's (or the flex
-authors') name".
-
-Note that the "flex.skl" scanner skeleton carries no copyright notice.
-You are free to do whatever you please with scanners generated using flex;
-for them, you are not even bound by the above copyright.
diff -r 3d59f54eb7cc -r 41de84159df9 usr.bin/lex/FlexLexer.h
--- a/usr.bin/lex/FlexLexer.h Thu Feb 23 02:08:59 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-// $NetBSD: FlexLexer.h,v 1.9 2003/11/18 21:37:39 christos Exp $
-
-// 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 are permitted provided
-// that: (1) source distributions retain this entire copyright notice and
-// comment, and (2) distributions including binaries display the following
-// acknowledgement: ``This product includes software developed by the
-// University of California, Berkeley and its contributors'' in the
-// documentation or other materials provided with the distribution and in
-// all advertising materials mentioning features or use of this software.
-// 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>
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer {
-public:
- virtual ~FlexLexer() { }
-
- const char* YYText() { return yytext; }
- int YYLeng() { return yyleng; }
-
- virtual void
- yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
- virtual struct yy_buffer_state*
- yy_create_buffer( std::istream* s, int size ) = 0;
- virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
- virtual void yyrestart( std::istream* s ) = 0;
-
- virtual int yylex() = 0;
-
- // Call yylex with new input/output sources.
- int yylex( std::istream* new_in, 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( std::istream* new_in = 0,
- 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
-
-#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 man page.
-#define yyFlexLexerOnce
-
-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( std::istream* arg_yyin = 0, 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( std::istream* s, int size );
- void yy_delete_buffer( struct yy_buffer_state* b );
- void yyrestart( std::istream* s );
-
- virtual int yylex();
- virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
-
-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, 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();
-
- std::istream* yyin; // input source for default LexerInput
- std::ostream* yyout; // output sink for default LexerOutput
-
- struct yy_buffer_state* yy_current_buffer;
-
- // 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;
-
- // 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
diff -r 3d59f54eb7cc -r 41de84159df9 usr.bin/lex/Makefile
--- a/usr.bin/lex/Makefile Thu Feb 23 02:08:59 2012 +0000
Home |
Main Index |
Thread Index |
Old Index