===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/lex/flex.skl	2001/01/05 18:26:23	1.6
--- src/usr.bin/lex/flex.skl	2004/02/03 21:20:17	1.7
***************
*** 1,9 ****
! /*	$OpenBSD: flex.skl,v 1.6 2001/01/05 18:26:23 millert Exp $	*/
  
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
!  * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.6 2001/01/05 18:26:23 millert Exp $
   */
  
  #define FLEX_SCANNER
--- 1,9 ----
! /*	$OpenBSD: flex.skl,v 1.7 2004/02/03 21:20:17 espie Exp $	*/
  
  /* A lexical scanner generated by flex */
  
  /* Scanner skeleton version:
!  * $Header: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/flex.skl,v 1.7 2004/02/03 21:20:17 espie Exp $
   */
  
  #define FLEX_SCANNER
***************
*** 28,34 ****
  
  #include <stdlib.h>
  %+
! class istream;
  %*
  #include <unistd.h>
  
--- 28,34 ----
  
  #include <stdlib.h>
  %+
! #include <iosfwd>
  %*
  #include <unistd.h>
  
***************
*** 156,162 ****
  %-
  	FILE *yy_input_file;
  %+
! 	istream* yy_input_file;
  %*
  
  	char *yy_ch_buf;		/* input buffer */
--- 156,162 ----
  %-
  	FILE *yy_input_file;
  %+
! 	std::istream* yy_input_file;
  %*
  
  	char *yy_ch_buf;		/* input buffer */
***************
*** 472,485 ****
  %-
  			yyin = stdin;
  %+
! 			yyin = &cin;
  %*
  
  		if ( ! yyout )
  %-
  			yyout = stdout;
  %+
! 			yyout = &cout;
  %*
  
  		if ( ! yy_current_buffer )
--- 472,485 ----
  %-
  			yyin = stdin;
  %+
! 			yyin = &std::cin;
  %*
  
  		if ( ! yyout )
  %-
  			yyout = stdout;
  %+
! 			yyout = &std::cout;
  %*
  
  		if ( ! yy_current_buffer )
***************
*** 649,655 ****
  	} /* end of yylex */
  
  %+
! yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
  	{
  	yyin = arg_yyin;
  	yyout = arg_yyout;
--- 649,655 ----
  	} /* end of yylex */
  
  %+
! yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )
  	{
  	yyin = arg_yyin;
  	yyout = arg_yyout;
***************
*** 684,690 ****
  	yy_delete_buffer( yy_current_buffer );
  	}
  
! void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
  	{
  	if ( new_in )
  		{
--- 684,690 ----
  	yy_delete_buffer( yy_current_buffer );
  	}
  
! void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )
  	{
  	if ( new_in )
  		{
***************
*** 1058,1064 ****
  FILE *input_file;
  #endif
  %+
! void yyFlexLexer::yyrestart( istream* input_file )
  %*
  	{
  	if ( ! yy_current_buffer )
--- 1058,1064 ----
  FILE *input_file;
  #endif
  %+
! void yyFlexLexer::yyrestart( std::istream* input_file )
  %*
  	{
  	if ( ! yy_current_buffer )
***************
*** 1129,1135 ****
  int size;
  #endif
  %+
! YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
  %*
  	{
  	YY_BUFFER_STATE b;
--- 1129,1135 ----
  int size;
  #endif
  %+
! YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )
  %*
  	{
  	YY_BUFFER_STATE b;
***************
*** 1182,1188 ****
  %-
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! extern int isatty YY_PROTO(( int ));
  #endif
  #endif
  
--- 1182,1188 ----
  %-
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! #include <unistd.h>
  #endif
  #endif
  
***************
*** 1196,1202 ****
  
  %+
  extern "C" int isatty YY_PROTO(( int ));
! void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
  %*
  
  	{
--- 1196,1202 ----
  
  %+
  extern "C" int isatty YY_PROTO(( int ));
! void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )
  %*
  
  	{
***************
*** 1443,1449 ****
  
  void yyFlexLexer::LexerError( yyconst char msg[] )
  	{
! 	cerr << msg << '\n';
  	exit( YY_EXIT_FAILURE );
  	}
  %*
--- 1443,1449 ----
  
  void yyFlexLexer::LexerError( yyconst char msg[] )
  	{
! 	std::cerr << msg << '\n';
  	exit( YY_EXIT_FAILURE );
  	}
  %*