Added RCS Ids to the flex/bison files

2 files changed, 50 insertions, 78 deletions

diff --git a/etc/Svc_Conf_l.cpp.diff b/etc/Svc_Conf_l.cpp.diff
index 20d4b4013b0..b100d93e054 100644
--- a/etc/Svc_Conf_l.cpp.diff
+++ b/etc/Svc_Conf_l.cpp.diff
@@ -1,8 +1,6 @@
 --- Svc_Conf_l.cpp.orig	Tue May  5 12:04:05 1998
 +++ Svc_Conf_l.cpp	Tue May  5 12:04:51 1998
-@@ -1,7 +1,10 @@
-+// $Id: Svc_Conf_l.cpp,v 4.20 1998/05/05 07:33:23 nanbor Exp $
-+
+@@ -1,7 +1,8 @@
 +#define ACE_BUILD_DLL
  /* A lexical scanner generated by flex */
  
@@ -12,7 +10,7 @@
   */
  
  #define FLEX_SCANNER
-@@ -134,7 +137,9 @@
+@@ -134,7 +135,9 @@
  		} \
  	while ( 0 )
  
@@ -22,7 +20,7 @@
  
  
  struct ace_yy_buffer_state
-@@ -209,7 +214,9 @@
+@@ -209,7 +212,9 @@
   */
  static int ace_yy_did_buffer_switch_on_eof;
  
@@ -32,7 +30,7 @@
  void ace_yyrestart ACE_YY_PROTO(( FILE *input_file ));
  void ace_yy_switch_to_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE new_buffer ));
  void ace_yy_load_buffer_state ACE_YY_PROTO(( void ));
-@@ -217,12 +224,14 @@
+@@ -217,12 +222,14 @@
  void ace_yy_delete_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b ));
  void ace_yy_init_buffer ACE_YY_PROTO(( ACE_YY_BUFFER_STATE b, FILE *file ));
  
@@ -47,135 +45,126 @@
  
  static void *ace_yy_flex_alloc ACE_YY_PROTO(( unsigned int ));
  static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, unsigned int ));
-@@ -487,7 +496,7 @@
- #include "ace/Svc_Conf.h"
- #include "ace/Svc_Conf_Tokens.h"
- 
--// Keeps track of the current line for debugging output. 
-+// Keeps track of the current line for debugging output.
- int ace_yylineno = 1;
- 
- // Keeps track of the number of errors encountered so far.
-@@ -682,112 +691,112 @@
+@@ -689,112 +696,112 @@
  ACE_YY_USER_ACTION
- # line 39 "Svc_Conf.l"
+ # line 42 "Svc_Conf.l"
  { return token (ACE_DYNAMIC); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 3:
  ACE_YY_USER_ACTION
- # line 40 "Svc_Conf.l"
+ # line 43 "Svc_Conf.l"
  { return token (ACE_STATIC); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 4:
  ACE_YY_USER_ACTION
- # line 41 "Svc_Conf.l"
+ # line 44 "Svc_Conf.l"
  { return token (ACE_SUSPEND); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 5:
  ACE_YY_USER_ACTION
- # line 42 "Svc_Conf.l"
+ # line 45 "Svc_Conf.l"
  { return token (ACE_RESUME); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 6:
  ACE_YY_USER_ACTION
- # line 43 "Svc_Conf.l"
+ # line 46 "Svc_Conf.l"
  { return token (ACE_REMOVE); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 7:
  ACE_YY_USER_ACTION
- # line 44 "Svc_Conf.l"
+ # line 47 "Svc_Conf.l"
  { return token (ACE_USTREAM); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 8:
  ACE_YY_USER_ACTION
- # line 45 "Svc_Conf.l"
+ # line 48 "Svc_Conf.l"
  { return token (ACE_MODULE_T); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 9:
  ACE_YY_USER_ACTION
- # line 46 "Svc_Conf.l"
+ # line 49 "Svc_Conf.l"
  { return token (ACE_SVC_OBJ_T); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 10:
  ACE_YY_USER_ACTION
- # line 47 "Svc_Conf.l"
+ # line 50 "Svc_Conf.l"
  { return token (ACE_STREAM_T); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 11:
  ACE_YY_USER_ACTION
- # line 48 "Svc_Conf.l"
+ # line 51 "Svc_Conf.l"
  { return token (ACE_ACTIVE); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 12:
  ACE_YY_USER_ACTION
- # line 49 "Svc_Conf.l"
+ # line 52 "Svc_Conf.l"
  { return token (ACE_INACTIVE); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 13:
  ACE_YY_USER_ACTION
- # line 50 "Svc_Conf.l"
+ # line 53 "Svc_Conf.l"
  { return token (ACE_COLON); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 14:
  ACE_YY_USER_ACTION
- # line 51 "Svc_Conf.l"
+ # line 54 "Svc_Conf.l"
  { return token (ACE_STAR); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 15:
  ACE_YY_USER_ACTION
- # line 52 "Svc_Conf.l"
+ # line 55 "Svc_Conf.l"
  { return token (ACE_LPAREN); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 16:
  ACE_YY_USER_ACTION
- # line 53 "Svc_Conf.l"
+ # line 56 "Svc_Conf.l"
  { return token (ACE_RPAREN); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 17:
  ACE_YY_USER_ACTION
- # line 54 "Svc_Conf.l"
+ # line 57 "Svc_Conf.l"
  { return token (ACE_LBRACE); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 18:
  ACE_YY_USER_ACTION
- # line 55 "Svc_Conf.l"
+ # line 58 "Svc_Conf.l"
  { return token (ACE_RBRACE); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 19:
  ACE_YY_USER_ACTION
- # line 56 "Svc_Conf.l"
+ # line 59 "Svc_Conf.l"
  { // Eliminate the opening and closing double quotes
 -		        *strrchr (ace_yytext, '"') = '\0';
 +		        *ACE_OS::strrchr (ace_yytext, '"') = '\0';
  			ace_yyleng -= 1;
--                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng); 
+-                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
 +                        ace_yylval.ident_ = ace_obstack->copy (ace_yytext + 1, ace_yyleng);
  			return token (ACE_STRING); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 20:
  ACE_YY_USER_ACTION
- # line 61 "Svc_Conf.l"
--{ 
--		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
--			return token (ACE_IDENT); 
+ # line 64 "Svc_Conf.l"
+-{
+-		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+-			return token (ACE_IDENT);
 +{
 +		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 +			return token (ACE_IDENT);
@@ -184,10 +173,10 @@
 +	/* ACE_YY_BREAK */
  case 21:
  ACE_YY_USER_ACTION
- # line 65 "Svc_Conf.l"
--{ 
--		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); 
--			return token (ACE_PATHNAME); 
+ # line 68 "Svc_Conf.l"
+-{
+-		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
+-			return token (ACE_PATHNAME);
 +{
 +		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 +			return token (ACE_PATHNAME);
@@ -196,11 +185,11 @@
 +	/* ACE_YY_BREAK */
  case 22:
  ACE_YY_USER_ACTION
- # line 69 "Svc_Conf.l"
-@@ -801,14 +810,15 @@
+ # line 72 "Svc_Conf.l"
+@@ -808,14 +811,15 @@
  case 24:
  ACE_YY_USER_ACTION
- # line 71 "Svc_Conf.l"
+ # line 74 "Svc_Conf.l"
 -{ ACE_ERROR ((LM_ERROR, "unknown char = %d\n", *ace_yytext)); }
 +{ ACE_ERROR ((LM_ERROR, ASYS_TEXT ("unknown char = %d\n"),
 +              *ace_yytext)); }
@@ -208,14 +197,14 @@
  case ACE_YY_STATE_EOF(INITIAL):
  case ACE_YY_STATE_EOF(PARAMETERS):
  case ACE_YY_STATE_EOF(NORMAL):
- # line 72 "Svc_Conf.l"
+ # line 75 "Svc_Conf.l"
  { ACE_YY_NEW_FILE; ace_yyterminate(); }
 -	ACE_YY_BREAK
 +	/* ACE_YY_BREAK */
  case 25:
  ACE_YY_USER_ACTION
- # line 73 "Svc_Conf.l"
-@@ -1141,6 +1151,7 @@
+ # line 76 "Svc_Conf.l"
+@@ -1148,6 +1152,7 @@
  	}
  
  
@@ -223,7 +212,7 @@
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yyunput( int c, register char *ace_yy_bp )
  #else
-@@ -1185,7 +1196,7 @@
+@@ -1192,7 +1197,7 @@
  	 */
  	ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
  	}
@@ -232,7 +221,7 @@
  
  #ifdef __cplusplus
  static int ace_yyinput()
-@@ -1393,6 +1404,7 @@
+@@ -1400,6 +1405,7 @@
  	}
  
  
@@ -240,7 +229,7 @@
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_push_state( int new_state )
  #else
-@@ -1438,7 +1450,7 @@
+@@ -1445,7 +1451,7 @@
  	{
  	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
  	}
@@ -249,11 +238,3 @@
  
  #ifdef ACE_YY_USE_PROTOS
  static void ace_yy_fatal_error( const char msg[] )
-@@ -1525,6 +1537,6 @@
- {
-   ::fflush (ace_yyin);
-   ace_yytext[0] = '#';
--  ace_yyleng = 0;    
-+  ace_yyleng = 0;
-   return 1;
- }
diff --git a/etc/Svc_Conf_y.cpp.diff b/etc/Svc_Conf_y.cpp.diff
index 4df26a881da..d0ec392dd63 100644
--- a/etc/Svc_Conf_y.cpp.diff
+++ b/etc/Svc_Conf_y.cpp.diff
@@ -1,15 +1,6 @@
 --- Svc_Conf_y.cpp.orig	Fri May 15 09:08:06 1998
 +++ Svc_Conf_y.cpp	Fri May 15 09:08:42 1998
-@@ -3,7 +3,7 @@
-  Modified 5/2/90 by J. Roskind to support graphic debugging modes";
- #endif
- #line 2 "Svc_Conf.y"
--/* $Id: Svc_Conf.y,v 4.19 1998/05/15 03:31:04 schmidt Exp $*/
-+/* $Id: Svc_Conf_y.cpp,v 4.31 1998/05/15 03:31:04 schmidt Exp $*/
- #define ACE_BUILD_DLL
- #include "ace/ARGV.h"
- #include "ace/Svc_Conf.h"
-@@ -408,7 +408,7 @@
+@@ -410,7 +410,7 @@
  #endif /* ACE_YYDEBUG_INDENT */
  #ifndef ACE_YYDEBUG_REDUCE
  #ifdef __cplusplus
@@ -18,7 +9,7 @@
  #else
  ACE_YYDEBUG_REDUCE(ace_yynew_state, ace_yyrule_num, ace_yyrule_string, ace_yynew_indent, ace_yyrhs_count)
  int ace_yynew_state;
-@@ -438,7 +438,7 @@
+@@ -440,7 +440,7 @@
  #endif /* ACE_YYDEBUG_REDUCE */
  #ifndef ACE_YYDEBUG_SHIFT_LEXEME
  #ifdef __cplusplus
@@ -27,7 +18,7 @@
  #else
  ACE_YYDEBUG_SHIFT_LEXEME(ace_yyold_state, ace_yynew_state, ace_yytoken_string, ace_yynew_indent)
  int ace_yyold_state;
-@@ -453,7 +453,7 @@
+@@ -455,7 +455,7 @@
  #endif /*  ACE_YYDEBUG_SHIFT_LEXEME */
  #ifndef ACE_YYDEBUG_LOOK_AHEAD
  #ifdef __cplusplus
@@ -36,7 +27,7 @@
  #else
  ACE_YYDEBUG_LOOK_AHEAD(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
-@@ -470,7 +470,7 @@
+@@ -472,7 +472,7 @@
  #endif /* ACE_YYDEBUG_LOOK_AHEAD */
  #ifndef ACE_YYDEBUG_DISCARD_STATE
  #ifdef __cplusplus
@@ -45,7 +36,7 @@
  #else
  ACE_YYDEBUG_DISCARD_STATE(ace_yynew_state, ace_yyindent)
  int ace_yynew_state;
-@@ -498,7 +498,7 @@
+@@ -500,7 +500,7 @@
  #endif /* ACE_YYDEBUG_DISCARD_STATE */
  #ifndef ACE_YYDEBUG_DISCARD_TOKEN
  #ifdef __cplusplus
@@ -54,7 +45,7 @@
  #else
  ACE_YYDEBUG_DISCARD_TOKEN(ace_yynew_state, ace_yytoken_num, ace_yytoken_string, ace_yyindent)
  int ace_yynew_state;
-@@ -513,7 +513,7 @@
+@@ -515,7 +515,7 @@
  #endif /* ACE_YYDEBUG_DISCARD_TOKEN */
  #ifndef ACE_YYDEBUG_SHIFT_ERROR_LEXEME
  #ifdef __cplusplus
@@ -63,7 +54,7 @@
  #else
  ACE_YYDEBUG_SHIFT_ERROR_LEXEME(ace_yyold_state, ace_yynew_state, ace_yyindent)
  int ace_yyold_state;
-@@ -539,7 +539,7 @@
+@@ -541,7 +541,7 @@
      extern char *ace_foo();
  #endif
  
@@ -72,7 +63,7 @@
      {
          ace_yyn = *ace_yys;
          if (ace_yyn >= '0' && ace_yyn <= '9')
-@@ -556,7 +556,7 @@
+@@ -558,7 +558,7 @@
      *ace_yyssp = ace_yystate = 0;
  
  ace_yyloop:
@@ -81,7 +72,7 @@
      if (ace_yychar < 0)
      {
          if ((ace_yychar = ace_yylex()) < 0) ace_yychar = 0;
-@@ -666,7 +666,7 @@
+@@ -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);