From 63f0120419cc471c1629ad19e1f3166d13bbc48b Mon Sep 17 00:00:00 2001 From: kitty Date: Sun, 11 Nov 2001 04:27:31 +0000 Subject: ChangeLogTag: Sat Nov 10 22:13:54 2001 Krishnakumar B --- ChangeLog | 31 ++++++ ChangeLogs/ChangeLog-02a | 31 ++++++ ChangeLogs/ChangeLog-03a | 31 ++++++ ace/Makefile | 5 +- ace/Svc_Conf_Tokens.h | 1 + ace/Svc_Conf_l.cpp | 141 +++++++++--------------- ace/Svc_Conf_y.cpp | 75 ++++--------- etc/Svc_Conf_l.cpp.diff | 278 ++++++++++++++++++----------------------------- etc/Svc_Conf_y.cpp.diff | 83 -------------- 9 files changed, 279 insertions(+), 397 deletions(-) delete mode 100644 etc/Svc_Conf_y.cpp.diff diff --git a/ChangeLog b/ChangeLog index f08f565fdb0..7d74e01e511 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +Sat Nov 10 22:13:54 2001 Krishnakumar B + + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Conf_Tokens.h: + + Regenerated the files after fixing the warnings that showed up + under Sun CC Forte Update. They were caused because Sun CC's + preprocessor doesn't like the #line statements generated by flex + and bison. Since these files are not modified on a daily basis, + people debugging the lexer can turn it on by removing the flags + '-l' and '-L' to bison and flex respectively in the Makefile. + For now, this removes a lot of noise. + + * ace/Makefile: + + Added flags '-l' to bison and '-L' to flex. + + * etc/Svc_Conf_l.cpp.diff: + + Regenerated the diff to match the current version. + + * etc/Svc_Conf_y.cpp.diff: + + This file held the stuff which have been obsoleted by the move + to use bison. So removed this file to avoid causing confusion in + the future. Thanks to Ossama for pointing this out. + + Let's see some green :-) + + Sat Nov 10 19:27:36 2001 Ossama Othman * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index f08f565fdb0..7d74e01e511 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,34 @@ +Sat Nov 10 22:13:54 2001 Krishnakumar B + + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Conf_Tokens.h: + + Regenerated the files after fixing the warnings that showed up + under Sun CC Forte Update. They were caused because Sun CC's + preprocessor doesn't like the #line statements generated by flex + and bison. Since these files are not modified on a daily basis, + people debugging the lexer can turn it on by removing the flags + '-l' and '-L' to bison and flex respectively in the Makefile. + For now, this removes a lot of noise. + + * ace/Makefile: + + Added flags '-l' to bison and '-L' to flex. + + * etc/Svc_Conf_l.cpp.diff: + + Regenerated the diff to match the current version. + + * etc/Svc_Conf_y.cpp.diff: + + This file held the stuff which have been obsoleted by the move + to use bison. So removed this file to avoid causing confusion in + the future. Thanks to Ossama for pointing this out. + + Let's see some green :-) + + Sat Nov 10 19:27:36 2001 Ossama Othman * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index f08f565fdb0..7d74e01e511 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,34 @@ +Sat Nov 10 22:13:54 2001 Krishnakumar B + + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + * ace/Svc_Conf_Tokens.h: + + Regenerated the files after fixing the warnings that showed up + under Sun CC Forte Update. They were caused because Sun CC's + preprocessor doesn't like the #line statements generated by flex + and bison. Since these files are not modified on a daily basis, + people debugging the lexer can turn it on by removing the flags + '-l' and '-L' to bison and flex respectively in the Makefile. + For now, this removes a lot of noise. + + * ace/Makefile: + + Added flags '-l' to bison and '-L' to flex. + + * etc/Svc_Conf_l.cpp.diff: + + Regenerated the diff to match the current version. + + * etc/Svc_Conf_y.cpp.diff: + + This file held the stuff which have been obsoleted by the move + to use bison. So removed this file to avoid causing confusion in + the future. Thanks to Ossama for pointing this out. + + Let's see some green :-) + + Sat Nov 10 19:27:36 2001 Ossama Othman * ace/SSL/SSL_Accept_Handler.cpp (ssl_accept): diff --git a/ace/Makefile b/ace/Makefile index 5d884782cf6..2e80ce799cf 100644 --- a/ace/Makefile +++ b/ace/Makefile @@ -531,10 +531,11 @@ all.nested: all.local Svc_Conf_y.cpp: Svc_Conf.y if [ -f /pkg/gnu/bin/bison ]; then \ - /pkg/gnu/bin/bison -d Svc_Conf.y; \ + /pkg/gnu/bin/bison -l -d Svc_Conf.y; \ sed -e "s/char \*getenv/char *ace_foo/g" \ -e "s/= getenv/= ACE_OS::getenv/g" \ -e "s/yy/ace_yy/g" \ + -e "s/->ace_yyerrno/->yyerrno/g" \ -e "s/YY/ACE_YY/g" \ -e "s/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g" < Svc_Conf.tab.c > /tmp/$@; \ cp /tmp/$@ $@; \ @@ -547,7 +548,7 @@ Svc_Conf_y.cpp: Svc_Conf.y Svc_Conf_l.cpp: Svc_Conf.l if [ -f /pkg/gnu/bin/flex ]; then \ - /pkg/gnu/bin/flex -t -I Svc_Conf.l > $@; \ + /pkg/gnu/bin/flex -L -t -I Svc_Conf.l > $@; \ sed -e "s/unistd/stdio/g" \ -e "s/yy/ace_yy/g" \ -e "s/YY/ACE_YY/g" \ diff --git a/ace/Svc_Conf_Tokens.h b/ace/Svc_Conf_Tokens.h index 31761135610..14a41622c1d 100644 --- a/ace/Svc_Conf_Tokens.h +++ b/ace/Svc_Conf_Tokens.h @@ -13,3 +13,4 @@ #define ACE_PATHNAME 268 #define ACE_IDENT 269 #define ACE_STRING 270 + diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index 067f86211a4..770986e809a 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -9,7 +9,6 @@ #define ACE_YY_FLEX_MAJOR_VERSION 2 #define ACE_YY_FLEX_MINOR_VERSION 5 - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus #ifndef __cplusplus @@ -146,8 +145,8 @@ struct ace_yy_buffer_state { FILE *ace_yy_input_file; - ACE_TCHAR *ace_yy_ch_buf; /* input buffer */ - ACE_TCHAR *ace_yy_buf_pos; /* current position in input buffer */ + ACE_TCHAR *ace_yy_ch_buf; /* input buffer */ + ACE_TCHAR *ace_yy_buf_pos; /* current position in input buffer */ /* Size of input buffer in bytes, not including room for EOB * characters. @@ -217,7 +216,7 @@ static int ace_yy_n_chars; /* number of characters read into ace_yy_ch_buf */ int ace_yyleng; /* Points to current character in buffer. */ -static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0; +static ACE_TCHAR *ace_yy_c_buf_p = (char *) 0; static int ace_yy_init = 1; /* whether we need to initialize */ static int ace_yy_start = 0; /* start state number */ @@ -501,9 +500,7 @@ static ACE_TCHAR *ace_yy_last_accepting_cpos; #define ACE_YY_MORE_ADJ 0 #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET ACE_TCHAR *ace_yytext; -#line 1 "Svc_Conf.l" #define INITIAL 0 -#line 2 "Svc_Conf.l" // $Id$ // Sample lexical analysis for regular expression subset. Must be // compiled with FLEX and an ANSI C++ compiler. @@ -621,12 +618,12 @@ ACE_YY_MALLOC_DECL if ( c == '\n' ) \ buf[n++] = (ACE_TCHAR) c; \ if ( c == EOF && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed")); \ + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "input in flex scanner failed") ); \ result = n; \ } \ else if ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \ && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT("input in flex scanner failed") ); #endif /* No semi-colon after return; correct usage is to write "ace_yyterminate();" - @@ -674,7 +671,6 @@ ACE_YY_MALLOC_DECL ACE_YY_DECL { - ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, *ACE_Static_Object_Lock::instance (), @@ -683,10 +679,9 @@ ACE_YY_DECL ACE_Svc_Conf_Lexer_Guard ace_lexer_guard (ACE_SVC_CONF_PARAM); register ace_yy_state_type ace_yy_current_state; - register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0; + register ACE_TCHAR *ace_yy_cp, *ace_yy_bp; register int ace_yy_act; -#line 35 "Svc_Conf.l" @@ -777,100 +772,81 @@ case 1: ace_yy_c_buf_p = ace_yy_cp -= 1; ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ ACE_YY_RULE_SETUP -#line 37 "Svc_Conf.l" ; /* EMPTY */ ACE_YY_BREAK case 2: ACE_YY_RULE_SETUP -#line 38 "Svc_Conf.l" { return token (ACE_DYNAMIC); } - // ACE_YY_BREAK + // ACE_YY_BREAK case 3: ACE_YY_RULE_SETUP -#line 39 "Svc_Conf.l" { return token (ACE_STATIC); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 4: ACE_YY_RULE_SETUP -#line 40 "Svc_Conf.l" { return token (ACE_SUSPEND); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 5: ACE_YY_RULE_SETUP -#line 41 "Svc_Conf.l" { return token (ACE_RESUME); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 6: ACE_YY_RULE_SETUP -#line 42 "Svc_Conf.l" { return token (ACE_REMOVE); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 7: ACE_YY_RULE_SETUP -#line 43 "Svc_Conf.l" { return token (ACE_USTREAM); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 8: ACE_YY_RULE_SETUP -#line 44 "Svc_Conf.l" { return token (ACE_MODULE_T); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 9: ACE_YY_RULE_SETUP -#line 45 "Svc_Conf.l" { return token (ACE_SVC_OBJ_T); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 10: ACE_YY_RULE_SETUP -#line 46 "Svc_Conf.l" { return token (ACE_STREAM_T); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 11: ACE_YY_RULE_SETUP -#line 47 "Svc_Conf.l" { return token (ACE_ACTIVE); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 12: ACE_YY_RULE_SETUP -#line 48 "Svc_Conf.l" { return token (ACE_INACTIVE); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 13: ACE_YY_RULE_SETUP -#line 49 "Svc_Conf.l" { return token (':'); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 14: ACE_YY_RULE_SETUP -#line 50 "Svc_Conf.l" { return token ('*'); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 15: ACE_YY_RULE_SETUP -#line 51 "Svc_Conf.l" { return token ('('); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 16: ACE_YY_RULE_SETUP -#line 52 "Svc_Conf.l" { return token (')'); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 17: ACE_YY_RULE_SETUP -#line 53 "Svc_Conf.l" { return token ('{'); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 18: ACE_YY_RULE_SETUP -#line 54 "Svc_Conf.l" { return token ('}'); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 19: ACE_YY_RULE_SETUP -#line 55 "Svc_Conf.l" { // Check for first type of string, i.e., - // "double quotes" delimited. + // "double quotes" delimited. ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"'); if (s == 0) // Check for second type of string, i.e., @@ -884,40 +860,35 @@ ACE_YY_RULE_SETUP ace_yyleng -= 1; ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng); return token (ACE_STRING); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 20: ACE_YY_RULE_SETUP -#line 71 "Svc_Conf.l" { ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); return token (ACE_IDENT); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 21: ACE_YY_RULE_SETUP -#line 75 "Svc_Conf.l" { ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); return token (ACE_PATHNAME); } -// ACE_YY_BREAK + // ACE_YY_BREAK case 22: ACE_YY_RULE_SETUP -#line 79 "Svc_Conf.l" ; /* EMPTY */ ACE_YY_BREAK case 23: ACE_YY_RULE_SETUP -#line 80 "Svc_Conf.l" { ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; } ACE_YY_BREAK case 24: ACE_YY_RULE_SETUP -#line 81 "Svc_Conf.l" { - ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown character = (%d"), - *ace_yytext)); + ACE_ERROR ((LM_ERROR, + ACE_LIB_TEXT ("unknown character = (%d"), + *ace_yytext)); if (ACE_OS::ace_isprint (*ace_yytext)) ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext)); ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); @@ -926,12 +897,10 @@ ACE_YY_RULE_SETUP case ACE_YY_STATE_EOF(INITIAL): case ACE_YY_STATE_EOF(PARAMETERS): case ACE_YY_STATE_EOF(NORMAL): -#line 89 "Svc_Conf.l" { ace_yyterminate(); } -// ACE_YY_BREAK +// ACE_YY_BREAK case 25: ACE_YY_RULE_SETUP -#line 90 "Svc_Conf.l" ACE_SVC_CONF_ECHO; ACE_YY_BREAK @@ -1059,7 +1028,7 @@ ACE_SVC_CONF_ECHO; default: ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT ("fatal flex scanner internal error--no action found")); + ACE_LIB_TEXT("fatal flex scanner internal error--no action found") ); } /* end of action switch */ } /* end of scanning one token */ } /* end of ace_yylex */ @@ -1082,7 +1051,7 @@ static int ace_yy_get_next_buffer() if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] ) ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT ("fatal flex scanner internal error--end of buffer missed")); + ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") ); if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ @@ -1125,8 +1094,8 @@ static int ace_yy_get_next_buffer() while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ #ifdef ACE_YY_USES_REJECT - ACE_YY_FATAL_ERROR( -ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses REJECT")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT") ); #else /* just a shorter name for the current buffer */ @@ -1145,18 +1114,17 @@ ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses b->ace_yy_buf_size *= 2; b->ace_yy_ch_buf = (ACE_TCHAR *) - /* Include room in for 2 EOB chars. */ - ace_yy_flex_realloc( - (void *) b->ace_yy_ch_buf, - (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) ); + /* Include room in for 2 EOB chars. */ + ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf, + (b->ace_yy_buf_size + 2)*sizeof(ACE_TCHAR)); } else /* Can't grow it, we don't own it. */ b->ace_yy_ch_buf = 0; if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT ("fatal error - scanner input buffer overflow")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( + "fatal error - scanner input buffer overflow") ); ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset]; @@ -1166,7 +1134,7 @@ ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses } if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE ) - num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR); + num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR); /* Read in more data. */ ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]), @@ -1302,7 +1270,7 @@ register ACE_TCHAR *ace_yy_bp; ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size; if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("flex scanner push-back overflow")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") ); } *--ace_yy_cp = (ACE_TCHAR) c; @@ -1379,7 +1347,7 @@ static int input() } } - c = *(unsigned char *) ace_yy_c_buf_p; /* cast for 8-bit char's */ + c = *(unsigned char *) ace_yy_c_buf_p; /* cast for 8-bit char's */ *ace_yy_c_buf_p = '\0'; /* preserve ace_yytext */ ace_yy_hold_char = *++ace_yy_c_buf_p; @@ -1459,16 +1427,16 @@ int size; b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_buf_size = size; /* ace_yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) ); + b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR)); if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_is_our_buffer = 1; @@ -1580,7 +1548,7 @@ ace_yy_size_t size; b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR(ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_buffer()")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" )); b->ace_yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->ace_yy_buf_pos = b->ace_yy_ch_buf = base; @@ -1632,9 +1600,9 @@ int len; /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR) ); + buf = (ACE_TCHAR *) ace_yy_flex_alloc( n ); if ( ! buf ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_bytes()")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" )); for ( i = 0; i < len; ++i ) buf[i] = bytes[i]; @@ -1643,7 +1611,7 @@ int len; b = ace_yy_scan_buffer( buf, n ); if ( ! b ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("bad buffer in ace_yy_scan_bytes()")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -1678,8 +1646,8 @@ int new_state; (void *) ace_yy_start_stack, new_size ); if ( ! ace_yy_start_stack ) - ACE_YY_FATAL_ERROR( - ACE_LIB_TEXT ("out of memory expanding start-condition stack")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( + "out of memory expanding start-condition stack" )); } ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START; @@ -1693,7 +1661,7 @@ int new_state; static void ace_yy_pop_state() { if ( --ace_yy_start_stack_ptr < 0 ) - ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("start-condition stack underflow")); + ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" )); BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]); } @@ -1718,7 +1686,7 @@ static void ace_yy_fatal_error( msg ) ACE_TCHAR msg[]; #endif { - (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT ("%s\n"), msg ); + (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg ); exit( ACE_YY_EXIT_FAILURE ); } @@ -1820,7 +1788,6 @@ int main() return 0; } #endif -#line 90 "Svc_Conf.l" int ace_yywrap (void) diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 0c80ec99dc3..19acdbb9140 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -19,7 +19,6 @@ #define ACE_IDENT 269 #define ACE_STRING 270 -#line 1 "Svc_Conf.y" // $Id$ @@ -120,11 +119,11 @@ static const short ace_yyrhs[] = { 23, #if ACE_YYDEBUG != 0 static const short ace_yyrline[] = { 0, - 52, 60, 64, 68, 69, 70, 71, 72, 73, 77, - 87, 94, 101, 108, 115, 119, 120, 126, 129, 135, - 140, 144, 148, 156, 160, 186, 197, 204, 211, 234, - 268, 272, 276, 283, 287, 291, 298, 302, 306, 313, - 314, 318, 319, 320 + 49, 57, 61, 65, 66, 67, 68, 69, 70, 74, + 84, 91, 98, 105, 112, 116, 117, 123, 126, 132, + 137, 141, 145, 153, 157, 183, 194, 201, 208, 231, + 265, 269, 273, 280, 284, 288, 295, 299, 303, 310, + 311, 315, 316, 317 }; #endif @@ -213,7 +212,7 @@ static const short ace_yycheck[] = { 8, #define ACE_YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison/bison.simple" + /* This file comes from bison-1.28. */ /* Skeleton output parser for bison, @@ -427,7 +426,7 @@ __ace_yy_memcpy (char *to, char *from, unsigned int count) #endif #endif -#line 217 "/usr/share/bison/bison.simple" + /* The user can define ACE_YYPARSE_PARAM as the name of an argument to be passed into ace_yyparse. The argument should have type void *. @@ -569,7 +568,7 @@ ace_yynewstate: /* Extend the stack our own way. */ if (ace_yystacksize >= ACE_YYMAXDEPTH) { - ace_yyerror(ACE_LIB_TEXT ("parser stack overflow")); + ace_yyerror("parser stack overflow"); if (ace_yyfree_stacks) { free (ace_yyss); @@ -756,7 +755,6 @@ ace_yyreduce: switch (ace_yyn) { case 1: -#line 53 "Svc_Conf.y" { if (ace_yyvsp[0].parse_node_ != 0) { @@ -766,13 +764,11 @@ case 1: ; break;} case 2: -#line 61 "Svc_Conf.y" { ACE_SVC_CONF_PARAM->obstack.release (); ; break;} case 10: -#line 78 "Svc_Conf.y" { if (ace_yyvsp[-1].svc_record_ != 0) ace_yyval.parse_node_ = new ACE_Dynamic_Node (ace_yyvsp[-1].svc_record_, ace_yyvsp[0].ident_); @@ -781,74 +777,61 @@ case 10: ; break;} case 11: -#line 88 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_); ; break;} case 12: -#line 95 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_); ; break;} case 13: -#line 102 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_); ; break;} case 14: -#line 109 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_); ; break;} case 15: -#line 116 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Stream_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_); ; break;} case 16: -#line 119 "Svc_Conf.y" { ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); ; break;} case 17: -#line 120 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Dummy_Node (ace_yyvsp[-1].static_node_, ace_yyvsp[0].parse_node_); ; break;} case 18: -#line 127 "Svc_Conf.y" { ; break;} case 19: -#line 130 "Svc_Conf.y" { ; break;} case 20: -#line 136 "Svc_Conf.y" { // Initialize left context... ace_yyval.static_node_ = ace_yyvsp[-1].static_node_; ; break;} case 21: -#line 141 "Svc_Conf.y" { ace_yyval.parse_node_ = ace_yyvsp[-1].parse_node_; ; break;} case 22: -#line 144 "Svc_Conf.y" { ace_yyval.parse_node_ = 0; ; break;} case 23: -#line 149 "Svc_Conf.y" { if (ace_yyvsp[0].parse_node_ != 0) { @@ -858,11 +841,9 @@ case 23: ; break;} case 24: -#line 156 "Svc_Conf.y" { ace_yyval.parse_node_ = 0; ; break;} case 25: -#line 161 "Svc_Conf.y" { ACE_Static_Node *svc_type = ace_yyvsp[0].static_node_; @@ -890,7 +871,6 @@ case 25: ; break;} case 26: -#line 187 "Svc_Conf.y" { ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); @@ -903,7 +883,6 @@ case 26: ; break;} case 27: -#line 198 "Svc_Conf.y" { ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); @@ -912,7 +891,6 @@ case 27: ; break;} case 28: -#line 205 "Svc_Conf.y" { ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); @@ -921,7 +899,6 @@ case 28: ; break;} case 29: -#line 212 "Svc_Conf.y" { ACE_Static_Node *stream = ace_yyvsp[-2].static_node_; ACE_Static_Node *module = ace_yyvsp[0].static_node_; @@ -943,7 +920,6 @@ case 29: ; break;} case 30: -#line 235 "Svc_Conf.y" { u_int flags = ACE_Service_Type::DELETE_THIS @@ -976,66 +952,56 @@ case 30: ; break;} case 31: -#line 269 "Svc_Conf.y" { ace_yyval.type_ = 1; ; break;} case 32: -#line 273 "Svc_Conf.y" { ace_yyval.type_ = 0; ; break;} case 33: -#line 277 "Svc_Conf.y" { ace_yyval.type_ = 1; ; break;} case 34: -#line 284 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_); ; break;} case 35: -#line 288 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_); ; break;} case 36: -#line 292 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_); ; break;} case 37: -#line 299 "Svc_Conf.y" { ace_yyval.type_ = ACE_MODULE_T; ; break;} case 38: -#line 303 "Svc_Conf.y" { ace_yyval.type_ = ACE_SVC_OBJ_T; ; break;} case 39: -#line 307 "Svc_Conf.y" { ace_yyval.type_ = ACE_STREAM_T; ; break;} case 41: -#line 314 "Svc_Conf.y" { ace_yyval.ident_ = 0; ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "/usr/share/bison/bison.simple" + ace_yyvsp -= ace_yylen; ace_yyssp -= ace_yylen; @@ -1101,7 +1067,7 @@ ace_yyerrlab: /* here on detecting error */ if (ace_yyn > ACE_YYFLAG && ace_yyn < ACE_YYLAST) { int size = 0; - ACE_TCHAR *msg; + char *msg; int x, count; count = 0; @@ -1109,11 +1075,11 @@ ace_yyerrlab: /* here on detecting error */ for (x = (ace_yyn < 0 ? -ace_yyn : 0); x < (sizeof(ace_yytname) / sizeof(char *)); x++) if (ace_yycheck[x + ace_yyn] == x) - size += ACE_OS::strlen(ace_yytname[x]) + 15, count++; - msg = new ACE_TCHAR[size + 15]; + size += strlen(ace_yytname[x]) + 15, count++; + msg = (char *) malloc(size + 15); if (msg != 0) { - ACE_OS::strcpy(msg, ACE_LIB_TEXT ("parse error")); + strcpy(msg, "parse error"); if (count < 5) { @@ -1122,21 +1088,21 @@ ace_yyerrlab: /* here on detecting error */ x < (sizeof(ace_yytname) / sizeof(char *)); x++) if (ace_yycheck[x + ace_yyn] == x) { - ACE_OS::strcat (msg, count == 0 ? ACE_LIB_TEXT (", expecting `") : ACE_LIB_TEXT (" or `")); - ACE_OS::strcat (msg, ACE_TEXT_CHAR_TO_TCHAR (ace_yytname[x])); - ACE_OS::strcat (msg, ACE_LIB_TEXT ("'")); + strcat(msg, count == 0 ? ", expecting `" : " or `"); + strcat(msg, ace_yytname[x]); + strcat(msg, "'"); count++; } } - ace_yyerror (msg); - delete [] msg; + ace_yyerror(msg); + free(msg); } else - ace_yyerror (ACE_LIB_TEXT ("parse error; also virtual memory exceeded")); + ace_yyerror ("parse error; also virtual memory exceeded"); } else #endif /* ACE_YYERROR_VERBOSE */ - ace_yyerror(ACE_LIB_TEXT ("parse error")); + ace_yyerror("parse error"); } goto ace_yyerrlab1; @@ -1255,7 +1221,6 @@ ace_yyerrhandle: } return 1; } -#line 323 "Svc_Conf.y" // Prints the error string to standard output. Cleans up the error // messages. diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff index e48b92352e9..bea9aec1be4 100644 --- a/etc/Svc_Conf_l.cpp.diff +++ b/etc/Svc_Conf_l.cpp.diff @@ -1,24 +1,21 @@ ---- Svc_Conf_l.cpp.old Tue Oct 30 22:27:20 2001 -+++ Svc_Conf_l.cpp Tue Oct 30 22:43:02 2001 -@@ -1,15 +1,14 @@ +--- Svc_Conf_l.cpp.orig Sat Nov 10 01:16:38 2001 ++++ Svc_Conf_l.cpp Sat Nov 10 01:11:39 2001 +@@ -1,3 +1,4 @@ +#define ACE_YY_NO_UNPUT /* A lexical scanner generated by flex */ /* Scanner skeleton version: -- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ -+ * $Header: /project/cvs-repository/ACE_wrappers-repository/ace/Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $ - */ - - #define FLEX_SCANNER +@@ -8,9 +9,6 @@ #define ACE_YY_FLEX_MAJOR_VERSION 2 #define ACE_YY_FLEX_MINOR_VERSION 5 -#include "ace/OS.h" - - +- /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus -@@ -21,8 +20,8 @@ + #ifndef __cplusplus +@@ -21,8 +19,8 @@ #ifdef __cplusplus @@ -28,7 +25,7 @@ /* Use prototypes in function declarations. */ #define ACE_YY_USE_PROTOS -@@ -132,7 +131,9 @@ +@@ -132,7 +130,9 @@ } \ while ( 0 ) @@ -38,18 +35,18 @@ /* The following is because we cannot portably get our hands on size_t * (without autoconf's help, which isn't available because we want -@@ -145,8 +146,8 @@ +@@ -145,8 +145,8 @@ { FILE *ace_yy_input_file; - char *ace_yy_ch_buf; /* input buffer */ - char *ace_yy_buf_pos; /* current position in input buffer */ -+ ACE_TCHAR *ace_yy_ch_buf; /* input buffer */ -+ ACE_TCHAR *ace_yy_buf_pos; /* current position in input buffer */ ++ ACE_TCHAR *ace_yy_ch_buf; /* input buffer */ ++ ACE_TCHAR *ace_yy_buf_pos; /* current position in input buffer */ /* Size of input buffer in bytes, not including room for EOB * characters. -@@ -208,7 +209,7 @@ +@@ -208,7 +208,7 @@ /* ace_yy_hold_char holds the character lost when ace_yytext is formed. */ @@ -58,16 +55,16 @@ static int ace_yy_n_chars; /* number of characters read into ace_yy_ch_buf */ -@@ -216,7 +217,7 @@ +@@ -216,7 +216,7 @@ int ace_yyleng; /* Points to current character in buffer. */ -static char *ace_yy_c_buf_p = (char *) 0; -+static ACE_TCHAR *ace_yy_c_buf_p = (ACE_TCHAR *) 0; ++static ACE_TCHAR *ace_yy_c_buf_p = (char *) 0; static int ace_yy_init = 1; /* whether we need to initialize */ static int ace_yy_start = 0; /* start state number */ -@@ -235,9 +236,9 @@ +@@ -235,9 +235,9 @@ void ace_yy_flush_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b )); #define ACE_YY_FLUSH_BUFFER ace_yy_flush_buffer( ace_yy_current_buffer ) @@ -80,7 +77,7 @@ static void *ace_yy_flex_alloc ACE_YY_PROTO(( ace_yy_size_t )); static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, ace_yy_size_t )); -@@ -261,16 +262,16 @@ +@@ -261,16 +261,16 @@ #define ACE_YY_AT_BOL() (ace_yy_current_buffer->ace_yy_at_bol) @@ -100,7 +97,7 @@ /* Done after the current pattern has been matched and before the * corresponding action - sets up ace_yytext. -@@ -490,7 +491,7 @@ +@@ -490,7 +490,7 @@ } ; static ace_yy_state_type ace_yy_last_accepting_state; @@ -109,30 +106,16 @@ /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. -@@ -499,11 +500,11 @@ +@@ -499,7 +499,7 @@ #define ace_yymore() ace_yymore_used_but_not_detected #define ACE_YY_MORE_ADJ 0 #define ACE_YY_RESTORE_ACE_YY_MORE_OFFSET -char *ace_yytext; +ACE_TCHAR *ace_yytext; - #line 1 "Svc_Conf.l" #define INITIAL 0 - #line 2 "Svc_Conf.l" --// $Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $ -+// $Id: Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $ + // $Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $ // Sample lexical analysis for regular expression subset. Must be - // compiled with FLEX and an ANSI C++ compiler. - -@@ -514,7 +515,7 @@ - - ACE_RCSID (ace, - Svc_Conf_l, -- "$Id: Svc_Conf.l,v 4.17 2001/10/17 06:14:08 othman Exp $") -+ "$Id: Svc_Conf_l.cpp,v 4.52 2001/10/22 21:59:31 crodrigu Exp $") - - // Keeps track of the current line for debugging output. - int ace_yylineno = 1; -@@ -538,15 +539,15 @@ +@@ -536,15 +536,15 @@ #endif #ifndef ACE_YY_NO_UNPUT @@ -151,7 +134,7 @@ #endif #ifndef ACE_YY_NO_INPUT -@@ -616,16 +617,16 @@ +@@ -614,16 +614,16 @@ int c = '*', n; \ for ( n = 0; n < max_size && \ (c = getc( ace_yyin )) != EOF && c != '\n'; ++n ) \ @@ -162,22 +145,21 @@ + buf[n++] = (ACE_TCHAR) c; \ if ( c == EOF && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); \ -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed")); \ ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "input in flex scanner failed") ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, ace_yyin )) == 0) \ + else if ( ((result = fread( buf, sizeof (ACE_TCHAR), max_size, ace_yyin )) == 0) \ && ferror( ace_yyin ) ) \ - ACE_YY_FATAL_ERROR( "input in flex scanner failed" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("input in flex scanner failed")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT("input in flex scanner failed") ); #endif /* No semi-colon after return; correct usage is to write "ace_yyterminate();" - -@@ -673,8 +674,16 @@ +@@ -671,8 +671,15 @@ ACE_YY_DECL { -+ + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, + ace_mon, + *ACE_Static_Object_Lock::instance (), @@ -187,179 +169,142 @@ + register ace_yy_state_type ace_yy_current_state; - register char *ace_yy_cp, *ace_yy_bp; -+ register ACE_TCHAR *ace_yy_cp = 0, *ace_yy_bp = 0; ++ register ACE_TCHAR *ace_yy_cp, *ace_yy_bp; register int ace_yy_act; - #line 35 "Svc_Conf.l" -@@ -775,93 +784,93 @@ + +@@ -770,71 +777,71 @@ + case 2: ACE_YY_RULE_SETUP - #line 38 "Svc_Conf.l" { return token (ACE_DYNAMIC); } - ACE_YY_BREAK -+ // ACE_YY_BREAK ++ // ACE_YY_BREAK case 3: ACE_YY_RULE_SETUP - #line 39 "Svc_Conf.l" { return token (ACE_STATIC); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 4: ACE_YY_RULE_SETUP - #line 40 "Svc_Conf.l" { return token (ACE_SUSPEND); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 5: ACE_YY_RULE_SETUP - #line 41 "Svc_Conf.l" { return token (ACE_RESUME); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 6: ACE_YY_RULE_SETUP - #line 42 "Svc_Conf.l" { return token (ACE_REMOVE); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 7: ACE_YY_RULE_SETUP - #line 43 "Svc_Conf.l" { return token (ACE_USTREAM); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 8: ACE_YY_RULE_SETUP - #line 44 "Svc_Conf.l" { return token (ACE_MODULE_T); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 9: ACE_YY_RULE_SETUP - #line 45 "Svc_Conf.l" { return token (ACE_SVC_OBJ_T); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 10: ACE_YY_RULE_SETUP - #line 46 "Svc_Conf.l" { return token (ACE_STREAM_T); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 11: ACE_YY_RULE_SETUP - #line 47 "Svc_Conf.l" { return token (ACE_ACTIVE); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 12: ACE_YY_RULE_SETUP - #line 48 "Svc_Conf.l" { return token (ACE_INACTIVE); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 13: ACE_YY_RULE_SETUP - #line 49 "Svc_Conf.l" { return token (':'); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 14: ACE_YY_RULE_SETUP - #line 50 "Svc_Conf.l" { return token ('*'); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 15: ACE_YY_RULE_SETUP - #line 51 "Svc_Conf.l" { return token ('('); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 16: ACE_YY_RULE_SETUP - #line 52 "Svc_Conf.l" { return token (')'); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 17: ACE_YY_RULE_SETUP - #line 53 "Svc_Conf.l" { return token ('{'); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 18: ACE_YY_RULE_SETUP - #line 54 "Svc_Conf.l" { return token ('}'); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 19: ACE_YY_RULE_SETUP - #line 55 "Svc_Conf.l" { - // Check for first type of string, i.e., -- // "double quotes" delimited. -+ // "double quotes" delimited. - ACE_TCHAR *s = ACE_OS::strrchr (ace_yytext, '"'); - if (s == 0) - // Check for second type of string, i.e., -@@ -875,7 +884,7 @@ +@@ -853,28 +860,28 @@ ace_yyleng -= 1; ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext + 1, ace_yyleng); return token (ACE_STRING); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 20: ACE_YY_RULE_SETUP - #line 71 "Svc_Conf.l" -@@ -883,7 +892,7 @@ + { ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); return token (ACE_IDENT); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 21: ACE_YY_RULE_SETUP - #line 75 "Svc_Conf.l" -@@ -891,7 +900,7 @@ + { ace_yylval->ident_ = ACE_SVC_CONF_PARAM->obstack.copy (ace_yytext, ace_yyleng); return token (ACE_PATHNAME); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++ // ACE_YY_BREAK case 22: ACE_YY_RULE_SETUP - #line 79 "Svc_Conf.l" -@@ -900,15 +909,15 @@ + ; /* EMPTY */ + ACE_YY_BREAK case 23: ACE_YY_RULE_SETUP - #line 80 "Svc_Conf.l" -{ ACE_SVC_CONF_PARAM->ace_yylineno++; ace_ace_yylineno++; } +{ ACE_SVC_CONF_PARAM->yylineno++; ace_yylineno++; } ACE_YY_BREAK case 24: ACE_YY_RULE_SETUP - #line 81 "Svc_Conf.l" - { -- ACE_ERROR ((LM_ERROR, -- ACE_LIB_TEXT ("unknown character = (%d"), -- *ace_yytext)); -+ ACE_ERROR ((LM_ERROR, -+ ACE_LIB_TEXT ("unknown character = (%d"), -+ *ace_yytext)); - if (ACE_OS::ace_isprint (*ace_yytext)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("|%c"), *ace_yytext)); - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT (")\n"))); -@@ -919,7 +928,7 @@ +@@ -891,7 +898,7 @@ + case ACE_YY_STATE_EOF(PARAMETERS): case ACE_YY_STATE_EOF(NORMAL): - #line 89 "Svc_Conf.l" { ace_yyterminate(); } - ACE_YY_BREAK -+// ACE_YY_BREAK ++// ACE_YY_BREAK case 25: ACE_YY_RULE_SETUP - #line 90 "Svc_Conf.l" -@@ -928,7 +937,7 @@ + ACE_SVC_CONF_ECHO; +@@ -899,7 +906,7 @@ case ACE_YY_END_OF_BUFFER: { @@ -368,16 +313,16 @@ int ace_yy_amount_of_matched_text = (int) (ace_yy_cp - ace_yytext_ptr) - 1; /* Undo the effects of ACE_YY_DO_BEFORE_ACTION. */ -@@ -1050,7 +1059,7 @@ +@@ -1021,7 +1028,7 @@ default: ACE_YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); -+ ACE_LIB_TEXT ("fatal flex scanner internal error--no action found")); ++ ACE_LIB_TEXT("fatal flex scanner internal error--no action found") ); } /* end of action switch */ } /* end of scanning one token */ } /* end of ace_yylex */ -@@ -1066,14 +1075,14 @@ +@@ -1037,14 +1044,14 @@ static int ace_yy_get_next_buffer() { @@ -391,56 +336,56 @@ if ( ace_yy_c_buf_p > &ace_yy_current_buffer->ace_yy_ch_buf[ace_yy_n_chars + 1] ) ACE_YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); -+ ACE_LIB_TEXT ("fatal flex scanner internal error--end of buffer missed")); ++ ACE_LIB_TEXT("fatal flex scanner internal error--end of buffer missed") ); if ( ace_yy_current_buffer->ace_yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ -@@ -1117,7 +1126,7 @@ +@@ -1087,8 +1094,8 @@ + while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ #ifdef ACE_YY_USES_REJECT - ACE_YY_FATAL_ERROR( +- ACE_YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -+ACE_LIB_TEXT ("input buffer overflow, can't enlarge buffer because scanner uses REJECT")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( ++"input buffer overflow, can't enlarge buffer because scanner uses REJECT") ); #else /* just a shorter name for the current buffer */ -@@ -1135,10 +1144,11 @@ +@@ -1106,18 +1113,18 @@ else b->ace_yy_buf_size *= 2; - b->ace_yy_ch_buf = (char *) -- /* Include room in for 2 EOB chars. */ -- ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf, -- b->ace_yy_buf_size + 2 ); + b->ace_yy_ch_buf = (ACE_TCHAR *) -+ /* Include room in for 2 EOB chars. */ -+ ace_yy_flex_realloc( -+ (void *) b->ace_yy_ch_buf, -+ (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) ); + /* Include room in for 2 EOB chars. */ + ace_yy_flex_realloc( (void *) b->ace_yy_ch_buf, +- b->ace_yy_buf_size + 2 ); ++ (b->ace_yy_buf_size + 2)*sizeof(ACE_TCHAR)); } else /* Can't grow it, we don't own it. */ -@@ -1146,7 +1156,7 @@ + b->ace_yy_ch_buf = 0; if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR( +- ACE_YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); -+ ACE_LIB_TEXT ("fatal error - scanner input buffer overflow")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( ++ "fatal error - scanner input buffer overflow") ); ace_yy_c_buf_p = &b->ace_yy_ch_buf[ace_yy_c_buf_p_offset]; -@@ -1155,8 +1165,8 @@ +@@ -1126,8 +1133,8 @@ #endif } - if ( num_to_read > ACE_YY_READ_BUF_SIZE ) - num_to_read = ACE_YY_READ_BUF_SIZE; + if ( num_to_read * sizeof (ACE_TCHAR) > ACE_YY_READ_BUF_SIZE ) -+ num_to_read = ACE_YY_READ_BUF_SIZE / sizeof (ACE_TCHAR); ++ num_to_read = ACE_YY_READ_BUF_SIZE/sizeof (ACE_TCHAR); /* Read in more data. */ ACE_YY_INPUT( (&ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]), -@@ -1194,12 +1204,12 @@ +@@ -1165,12 +1172,12 @@ } @@ -455,7 +400,7 @@ ace_yy_current_state = ace_yy_start; ace_yy_current_state += ACE_YY_AT_BOL(); -@@ -1239,7 +1249,7 @@ +@@ -1210,7 +1217,7 @@ #endif { register int ace_yy_is_jam; @@ -464,7 +409,7 @@ register ACE_YY_CHAR ace_yy_c = 1; if ( ace_yy_accept[ace_yy_current_state] ) -@@ -1262,14 +1272,14 @@ +@@ -1233,14 +1240,14 @@ #ifndef ACE_YY_NO_UNPUT #ifdef ACE_YY_USE_PROTOS @@ -482,7 +427,7 @@ /* undo effects of setting up ace_yytext */ *ace_yy_cp = ace_yy_hold_char; -@@ -1278,9 +1288,9 @@ +@@ -1249,9 +1256,9 @@ { /* need to shift things up to make room */ /* +2 for EOB chars. */ register int number_to_move = ace_yy_n_chars + 2; @@ -494,12 +439,12 @@ &ace_yy_current_buffer->ace_yy_ch_buf[number_to_move]; while ( source > ace_yy_current_buffer->ace_yy_ch_buf ) -@@ -1292,10 +1302,10 @@ +@@ -1263,10 +1270,10 @@ ace_yy_n_chars = ace_yy_current_buffer->ace_yy_buf_size; if ( ace_yy_cp < ace_yy_current_buffer->ace_yy_ch_buf + 2 ) - ACE_YY_FATAL_ERROR( "flex scanner push-back overflow" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("flex scanner push-back overflow")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "flex scanner push-back overflow") ); } - *--ace_yy_cp = (char) c; @@ -507,21 +452,12 @@ ace_yytext_ptr = ace_yy_bp; -@@ -1369,7 +1379,7 @@ - } - } - -- c = *(unsigned char *) ace_yy_c_buf_p; /* cast for 8-bit char's */ -+ c = *(unsigned char *) ace_yy_c_buf_p; /* cast for 8-bit char's */ - *ace_yy_c_buf_p = '\0'; /* preserve ace_yytext */ - ace_yy_hold_char = *++ace_yy_c_buf_p; - -@@ -1449,16 +1459,16 @@ +@@ -1420,16 +1427,16 @@ b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_buf_size = size; @@ -529,14 +465,14 @@ * we need to put in 2 end-of-buffer characters. */ - b->ace_yy_ch_buf = (char *) ace_yy_flex_alloc( b->ace_yy_buf_size + 2 ); -+ b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2) * sizeof (ACE_TCHAR) ); ++ b->ace_yy_ch_buf = (ACE_TCHAR *) ace_yy_flex_alloc( (b->ace_yy_buf_size + 2 ) * sizeof (ACE_TCHAR)); if ( ! b->ace_yy_ch_buf ) - ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_create_buffer()" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_create_buffer()")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_create_buffer()") ); b->ace_yy_is_our_buffer = 1; -@@ -1553,10 +1563,10 @@ +@@ -1524,10 +1531,10 @@ #ifndef ACE_YY_NO_SCAN_BUFFER #ifdef ACE_YY_USE_PROTOS @@ -549,16 +485,16 @@ ace_yy_size_t size; #endif { -@@ -1570,7 +1580,7 @@ +@@ -1541,7 +1548,7 @@ b = (ACE_YY_BUFFER_STATE) ace_yy_flex_alloc( sizeof( struct ace_yy_buffer_state ) ); if ( ! b ) - ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_buffer()" ); -+ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_buffer()")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_buffer()" )); b->ace_yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->ace_yy_buf_pos = b->ace_yy_ch_buf = base; -@@ -1591,10 +1601,10 @@ +@@ -1562,10 +1569,10 @@ #ifndef ACE_YY_NO_SCAN_STRING #ifdef ACE_YY_USE_PROTOS @@ -571,7 +507,7 @@ #endif { int len; -@@ -1608,23 +1618,23 @@ +@@ -1579,23 +1586,23 @@ #ifndef ACE_YY_NO_SCAN_BYTES #ifdef ACE_YY_USE_PROTOS @@ -593,41 +529,43 @@ /* Get memory for full buffer, including space for trailing EOB's. */ n = len + 2; - buf = (char *) ace_yy_flex_alloc( n ); -+ buf = (ACE_TCHAR *) ace_yy_flex_alloc( n * sizeof (ACE_TCHAR) ); ++ buf = (ACE_TCHAR *) ace_yy_flex_alloc( n ); if ( ! buf ) - ACE_YY_FATAL_ERROR( "out of dynamic memory in ace_yy_scan_bytes()" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("out of dynamic memory in ace_yy_scan_bytes()")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "out of dynamic memory in ace_yy_scan_bytes()" )); for ( i = 0; i < len; ++i ) buf[i] = bytes[i]; -@@ -1633,7 +1643,7 @@ +@@ -1604,7 +1611,7 @@ b = ace_yy_scan_buffer( buf, n ); if ( ! b ) - ACE_YY_FATAL_ERROR( "bad buffer in ace_yy_scan_bytes()" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("bad buffer in ace_yy_scan_bytes()")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "bad buffer in ace_yy_scan_bytes()") ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. -@@ -1669,7 +1679,7 @@ +@@ -1639,8 +1646,8 @@ + (void *) ace_yy_start_stack, new_size ); if ( ! ace_yy_start_stack ) - ACE_YY_FATAL_ERROR( +- ACE_YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); -+ ACE_LIB_TEXT ("out of memory expanding start-condition stack")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( ++ "out of memory expanding start-condition stack" )); } ace_yy_start_stack[ace_yy_start_stack_ptr++] = ACE_YY_START; -@@ -1683,7 +1693,7 @@ +@@ -1654,7 +1661,7 @@ static void ace_yy_pop_state() { if ( --ace_yy_start_stack_ptr < 0 ) - ACE_YY_FATAL_ERROR( "start-condition stack underflow" ); -+ ACE_YY_FATAL_ERROR (ACE_LIB_TEXT ("start-condition stack underflow")); ++ ACE_YY_FATAL_ERROR(ACE_LIB_TEXT( "start-condition stack underflow" )); BEGIN(ace_yy_start_stack[ace_yy_start_stack_ptr]); } -@@ -1702,13 +1712,13 @@ +@@ -1673,13 +1680,13 @@ #endif #ifdef ACE_YY_USE_PROTOS @@ -640,11 +578,11 @@ #endif { - (void) fprintf( stderr, "%s\n", msg ); -+ (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT ("%s\n"), msg ); ++ (void) ACE_OS::fprintf( stderr, ACE_LIB_TEXT("%s\n"), msg ); exit( ACE_YY_EXIT_FAILURE ); } -@@ -1734,11 +1744,11 @@ +@@ -1705,11 +1712,11 @@ #ifndef ace_yytext_ptr #ifdef ACE_YY_USE_PROTOS @@ -659,7 +597,7 @@ int n; #endif { -@@ -1750,10 +1760,10 @@ +@@ -1721,10 +1728,10 @@ #ifdef ACE_YY_NEED_STRLEN #ifdef ACE_YY_USE_PROTOS diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff deleted file mode 100644 index b8310e87bb3..00000000000 --- a/etc/Svc_Conf_y.cpp.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- Svc_Conf_y.cpp.orig Fri May 15 09:08:06 1998 -+++ Svc_Conf_y.cpp Fri May 15 09:08:42 1998 -@@ -410,7 +410,7 @@ - #endif /* ACE_YYDEBUG_INDENT */ - #ifndef ACE_YYDEBUG_REDUCE - #ifdef __cplusplus --void ACE_YYDEBUG_REDUCE(int ace_yynew_state, int ace_yyrule_num, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count) -+void ACE_YYDEBUG_REDUCE(int /* ace_yynew_state */, int /* ace_yyrule_num */, const char *ace_yyrule_string, int ace_yynew_indent, int ace_yyrhs_count) - #else - ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count) - int ace_yynew_state; -@@ -440,7 +440,7 @@ - #endif /* ACE_YYDEBUG_REDUCE */ - #ifndef ACE_YYDEBUG_SHIFT_LEXEME - #ifdef __cplusplus --void ACE_YYDEBUG_SHIFT_LEXEME(int ace_yyold_state, int ace_yynew_state, const char *ace_yytoken_string, int ace_yynew_indent) -+void ACE_YYDEBUG_SHIFT_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state*/, const char *ace_yytoken_string, int ace_yynew_indent) - #else - ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent) - int ace_yyold_state; -@@ -455,7 +455,7 @@ - #endif /* ACE_YYDEBUG_SHIFT_LEXEME */ - #ifndef ACE_YYDEBUG_LOOK_AHEAD - #ifdef __cplusplus --void ACE_YYDEBUG_LOOK_AHEAD(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent) -+void ACE_YYDEBUG_LOOK_AHEAD(int /* ace_yynew_state */, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent) - #else - ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent) - int ace_yynew_state; -@@ -472,7 +472,7 @@ - #endif /* ACE_YYDEBUG_LOOK_AHEAD */ - #ifndef ACE_YYDEBUG_DISCARD_STATE - #ifdef __cplusplus --void ACE_YYDEBUG_DISCARD_STATE(int ace_yynew_state, int ace_yyindent) -+void ACE_YYDEBUG_DISCARD_STATE(int /* ace_yynew_state */, int ace_yyindent) - #else - ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent) - int ace_yynew_state; -@@ -500,7 +500,7 @@ - #endif /* ACE_YYDEBUG_DISCARD_STATE */ - #ifndef ACE_YYDEBUG_DISCARD_TOKEN - #ifdef __cplusplus --void ACE_YYDEBUG_DISCARD_TOKEN(int ace_yynew_state, int ace_yytoken_num, const char *ace_yytoken_string, int ace_yyindent) -+void ACE_YYDEBUG_DISCARD_TOKEN(int /* ace_yynew_state */, int /* ace_yytoken_num */, const char *ace_yytoken_string, int ace_yyindent) - #else - ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent) - int ace_yynew_state; -@@ -515,7 +515,7 @@ - #endif /* ACE_YYDEBUG_DISCARD_TOKEN */ - #ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME - #ifdef __cplusplus --void ACE_YYDEBUG_SHIFT_ERROR_LEXEME(int ace_yyold_state, int ace_yynew_state, int ace_yyindent) -+void ACE_YYDEBUG_SHIFT_ERROR_LEXEME(int /* ace_yyold_state */, int /* ace_yynew_state */, int ace_yyindent) - #else - ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent) - int ace_yyold_state; -@@ -541,7 +541,7 @@ - extern char *ace_foo(); - #endif - -- if (ace_yys = ACE_OS::getenv("ACE_YYDEBUG")) -+ if ((ace_yys = ACE_OS::getenv("ACE_YYDEBUG"))) - { - ace_yyn = *ace_yys; - if (ace_yyn >= '0' && ace_yyn <= '9') -@@ -558,7 +558,7 @@ - *ace_yyssp = ace_yystate = 0; - - ace_yyloop: -- if (ace_yyn = ace_yydefred[ace_yystate]) goto ace_yyreduce; -+ if ((ace_yyn = ace_yydefred[ace_yystate])) goto ace_yyreduce; - if (ace_yychar < 0) - { - if ((ace_yychar = ace_yylex()) < 0) ace_yychar = 0; -@@ -668,7 +668,7 @@ - if (5 < ace_yydebug) - printf("ace_yydebug: state %d, error recovery discards token %d (%s)\n", - ace_yystate, ace_yychar, ace_yys); -- else -+ else - ACE_YYDEBUG_DISCARD_TOKEN(ace_yystate, ace_yychar, ace_yys, ace_yyssp-ace_yyss); - } - #endif -- cgit v1.2.1