|
|
e2eeac2 |
--- flex-2.5.4/skel.c.gcc31 Wed Feb 20 12:15:18 2002
|
|
|
e2eeac2 |
+++ flex-2.5.4/skel.c Wed Feb 20 12:15:18 2002
|
|
|
e2eeac2 |
@@ -31,7 +31,8 @@
|
|
|
e2eeac2 |
"",
|
|
|
e2eeac2 |
"#include <stdlib.h>",
|
|
|
e2eeac2 |
"%+",
|
|
|
e2eeac2 |
- "#include <iostream.h>",
|
|
|
e2eeac2 |
+ "#include <iostream>",
|
|
|
e2eeac2 |
+ "using namespace std;",
|
|
|
e2eeac2 |
"%*",
|
|
|
e2eeac2 |
"",
|
|
|
e2eeac2 |
"/* Use prototypes in function declarations. */",
|
|
|
e2eeac2 |
--- flex-2.5.4/FlexLexer.h.gcc31 Sun Jul 27 04:41:38 1997
|
|
|
e2eeac2 |
+++ flex-2.5.4/FlexLexer.h Fri Mar 1 20:38:04 2002
|
|
|
e2eeac2 |
@@ -44,7 +44,7 @@
|
|
|
e2eeac2 |
#ifndef __FLEX_LEXER_H
|
|
|
e2eeac2 |
// Never included before - need to define base class.
|
|
|
e2eeac2 |
#define __FLEX_LEXER_H
|
|
|
e2eeac2 |
-#include <iostream.h>
|
|
|
e2eeac2 |
+#include <iostream>
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
extern "C++" {
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
@@ -61,14 +61,14 @@
|
|
|
e2eeac2 |
virtual void
|
|
|
e2eeac2 |
yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
|
|
|
e2eeac2 |
virtual struct yy_buffer_state*
|
|
|
e2eeac2 |
- yy_create_buffer( istream* s, int size ) = 0;
|
|
|
e2eeac2 |
+ yy_create_buffer( std::istream* s, int size ) = 0;
|
|
|
e2eeac2 |
virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
|
|
|
e2eeac2 |
- virtual void yyrestart( istream* s ) = 0;
|
|
|
e2eeac2 |
+ virtual void yyrestart( std::istream* s ) = 0;
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
virtual int yylex() = 0;
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
// Call yylex with new input/output sources.
|
|
|
e2eeac2 |
- int yylex( istream* new_in, ostream* new_out = 0 )
|
|
|
e2eeac2 |
+ int yylex( std::istream* new_in, std::ostream* new_out = 0 )
|
|
|
e2eeac2 |
{
|
|
|
e2eeac2 |
switch_streams( new_in, new_out );
|
|
|
e2eeac2 |
return yylex();
|
|
|
e2eeac2 |
@@ -76,8 +76,8 @@
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
// Switch to new input/output streams. A nil stream pointer
|
|
|
e2eeac2 |
// indicates "keep the current one".
|
|
|
e2eeac2 |
- virtual void switch_streams( istream* new_in = 0,
|
|
|
e2eeac2 |
- ostream* new_out = 0 ) = 0;
|
|
|
e2eeac2 |
+ virtual void switch_streams( std::istream* new_in = 0,
|
|
|
e2eeac2 |
+ std::ostream* new_out = 0 ) = 0;
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
int lineno() const { return yylineno; }
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
@@ -104,17 +104,17 @@
|
|
|
e2eeac2 |
public:
|
|
|
e2eeac2 |
// arg_yyin and arg_yyout default to the cin and cout, but we
|
|
|
e2eeac2 |
// only make that assignment when initializing in yylex().
|
|
|
e2eeac2 |
- yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
|
|
|
e2eeac2 |
+ yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
virtual ~yyFlexLexer();
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
|
|
|
e2eeac2 |
- struct yy_buffer_state* yy_create_buffer( istream* s, int size );
|
|
|
e2eeac2 |
+ struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
|
|
|
e2eeac2 |
void yy_delete_buffer( struct yy_buffer_state* b );
|
|
|
e2eeac2 |
- void yyrestart( istream* s );
|
|
|
e2eeac2 |
+ void yyrestart( std::istream* s );
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
virtual int yylex();
|
|
|
e2eeac2 |
- virtual void switch_streams( istream* new_in, ostream* new_out );
|
|
|
e2eeac2 |
+ virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
protected:
|
|
|
e2eeac2 |
virtual int LexerInput( char* buf, int max_size );
|
|
|
e2eeac2 |
@@ -125,7 +125,7 @@
|
|
|
e2eeac2 |
int yyinput();
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
void yy_load_buffer_state();
|
|
|
e2eeac2 |
- void yy_init_buffer( struct yy_buffer_state* b, istream* s );
|
|
|
e2eeac2 |
+ void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
|
|
|
e2eeac2 |
void yy_flush_buffer( struct yy_buffer_state* b );
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
int yy_start_stack_ptr;
|
|
|
e2eeac2 |
@@ -140,8 +140,8 @@
|
|
|
e2eeac2 |
yy_state_type yy_try_NUL_trans( yy_state_type current_state );
|
|
|
e2eeac2 |
int yy_get_next_buffer();
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
- istream* yyin; // input source for default LexerInput
|
|
|
e2eeac2 |
- ostream* yyout; // output sink for default LexerOutput
|
|
|
e2eeac2 |
+ std::istream* yyin; // input source for default LexerInput
|
|
|
e2eeac2 |
+ std::ostream* yyout; // output sink for default LexerOutput
|
|
|
e2eeac2 |
|
|
|
e2eeac2 |
struct yy_buffer_state* yy_current_buffer;
|
|
|
e2eeac2 |
|