1 --- flex-2.5.4.orig/FlexLexer.h Sun Jul 27 11:41:38 1997
2 +++ flex-2.5.4/FlexLexer.h Wed Apr 17 09:57:22 2002
5 // Never included before - need to define base class.
14 yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
15 virtual struct yy_buffer_state*
16 - yy_create_buffer( istream* s, int size ) = 0;
17 + yy_create_buffer( std::istream* s, int size ) = 0;
18 virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
19 - virtual void yyrestart( istream* s ) = 0;
20 + virtual void yyrestart( std::istream* s ) = 0;
22 virtual int yylex() = 0;
24 // Call yylex with new input/output sources.
25 - int yylex( istream* new_in, ostream* new_out = 0 )
26 + int yylex( std::istream* new_in, std::ostream* new_out = 0 )
28 switch_streams( new_in, new_out );
32 // Switch to new input/output streams. A nil stream pointer
33 // indicates "keep the current one".
34 - virtual void switch_streams( istream* new_in = 0,
35 - ostream* new_out = 0 ) = 0;
36 + virtual void switch_streams( std::istream* new_in = 0,
37 + std::ostream* new_out = 0 ) = 0;
39 int lineno() const { return yylineno; }
43 // arg_yyin and arg_yyout default to the cin and cout, but we
44 // only make that assignment when initializing in yylex().
45 - yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
46 + yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
48 virtual ~yyFlexLexer();
50 void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
51 - struct yy_buffer_state* yy_create_buffer( istream* s, int size );
52 + struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
53 void yy_delete_buffer( struct yy_buffer_state* b );
54 - void yyrestart( istream* s );
55 + void yyrestart( std::istream* s );
58 - virtual void switch_streams( istream* new_in, ostream* new_out );
59 + virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
62 virtual int LexerInput( char* buf, int max_size );
66 void yy_load_buffer_state();
67 - void yy_init_buffer( struct yy_buffer_state* b, istream* s );
68 + void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
69 void yy_flush_buffer( struct yy_buffer_state* b );
71 int yy_start_stack_ptr;
73 yy_state_type yy_try_NUL_trans( yy_state_type current_state );
74 int yy_get_next_buffer();
76 - istream* yyin; // input source for default LexerInput
77 - ostream* yyout; // output sink for default LexerOutput
78 + std::istream* yyin; // input source for default LexerInput
79 + std::ostream* yyout; // output sink for default LexerOutput
81 struct yy_buffer_state* yy_current_buffer;
83 --- flex-2.5.4.orig/skel.c Wed Apr 17 09:54:49 2002
84 +++ flex-2.5.4/skel.c Wed Apr 17 09:56:01 2002
87 "#include <stdlib.h>",
89 - "#include <iostream.h>",
90 + "#include <iostream>",
91 + "using namespace std;",
94 "/* Use prototypes in function declarations. */",