diff options
| -rw-r--r-- | ChangeLog-98b | 24 | ||||
| -rw-r--r-- | ace/Svc_Conf.l | 21 | ||||
| -rw-r--r-- | ace/Svc_Conf.y | 2 | ||||
| -rw-r--r-- | ace/Svc_Conf_l.cpp | 61 | ||||
| -rw-r--r-- | ace/Svc_Conf_y.cpp | 76 | ||||
| -rw-r--r-- | etc/Svc_Conf_l.cpp.diff | 101 | ||||
| -rw-r--r-- | etc/Svc_Conf_y.cpp.diff | 27 |
7 files changed, 158 insertions, 154 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 0cc77b8784e..b311b3d13af 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,27 @@ +Sat Jul 18 10:52:49 1998 Gonzalo Diethelm <gonzo@tango.cs.wustl.edu> + + * ace/Svc_Conf_l.cpp: + * ace/Svc_Conf_y.cpp: + Move the Id and added ACE_RCSID. + The #line commands changed their line numbers. + + * ace/Svc_Conf_Tokens.h: + Got rid of the Id (maintenance problem). + + * ace/Svc_Conf.l: + * ace/Svc_Conf.y: + Added an ACE_RCSID, and erased a few white spaces at the end. + + * etc/Svc_Conf_l.cpp.diff: + * etc/Svc_Conf_y.cpp.diff: + Got rid of a couple of RCS Ids that were being "replaced" by the + patches. These were probably a maintenance problem and didn't + really add much. I also cleaned up the patches: there were a + couple of useless replacements (lines with white spaces at the + ends, etc.), and some of the line offsets were wrong (but patch + could still catch them with its fuzz factors). Now the patches + apply cleanly. + Sat Jul 18 9:00:00 1998 Douglas C. Schmidt <schmidt@mambo.cs.wustl.edu> * DCS: Born 36 years ago, at this moment. Yow, I've now become diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l index adf174f3da0..9ac99604cb8 100644 --- a/ace/Svc_Conf.l +++ b/ace/Svc_Conf.l @@ -1,4 +1,5 @@ %{ +// $Id$ // Sample lexical analysis for regular expression subset. Must be // compiled with FLEX and an ANSI C++ compiler. @@ -6,7 +7,9 @@ #include "ace/Svc_Conf.h" #include "ace/Svc_Conf_Tokens.h" -// Keeps track of the current line for debugging output. +ACE_RCSID(ace, Svc_Conf_l, "$Id$") + +// Keeps track of the current line for debugging output. int yylineno = 1; // Keeps track of the number of errors encountered so far. @@ -56,15 +59,15 @@ inactive { return token (ACE_INACTIVE); } {string} { // Eliminate the opening and closing double quotes *strrchr (yytext, '"') = '\0'; yyleng -= 1; - yylval.ident_ = ace_obstack->copy (yytext + 1, yyleng); + yylval.ident_ = ace_obstack->copy (yytext + 1, yyleng); return token (ACE_STRING); } -{ident} { - yylval.ident_ = ace_obstack->copy (yytext, yyleng); - return token (ACE_IDENT); +{ident} { + yylval.ident_ = ace_obstack->copy (yytext, yyleng); + return token (ACE_IDENT); } -{pathname} { - yylval.ident_ = ace_obstack->copy (yytext, yyleng); - return token (ACE_PATHNAME); +{pathname} { + yylval.ident_ = ace_obstack->copy (yytext, yyleng); + return token (ACE_PATHNAME); } {white_space}+ ; /* EMPTY */ {newline} { yylineno++; } @@ -76,7 +79,7 @@ yywrap (void) { ::fflush (yyin); yytext[0] = '#'; - yyleng = 0; + yyleng = 0; // This needs to be freed to prevent a memory leak. yy_delete_buffer (yy_current_buffer); diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index ab78ac99d8a..74a59471cec 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -6,6 +6,8 @@ #include "ace/Module.h" #include "ace/Stream.h" +ACE_RCSID(ace, Svc_Conf_y, "$Id$") + // Prototypes. static ACE_Module_Type *get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type); diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp index b90ffe4ec28..d7b9faf8346 100644 --- a/ace/Svc_Conf_l.cpp +++ b/ace/Svc_Conf_l.cpp @@ -1,5 +1,3 @@ -// $Id$ - #define ACE_BUILD_DLL /* A lexical scanner generated by flex */ @@ -489,6 +487,7 @@ static char *ace_yy_last_accepting_cpos; char *ace_yytext; # line 1 "Svc_Conf.l" # line 2 "Svc_Conf.l" +// $Id$ // Sample lexical analysis for regular expression subset. Must be // compiled with FLEX and an ANSI C++ compiler. @@ -496,6 +495,8 @@ char *ace_yytext; #include "ace/Svc_Conf.h" #include "ace/Svc_Conf_Tokens.h" +ACE_RCSID(ace, Svc_Conf_l, "$Id$") + // Keeps track of the current line for debugging output. int ace_yylineno = 1; @@ -600,7 +601,7 @@ ACE_YY_DECL register char *ace_yy_cp, *ace_yy_bp; register int ace_yy_act; -# line 36 "Svc_Conf.l" +# line 39 "Svc_Conf.l" @@ -688,97 +689,97 @@ case 1: ace_yy_c_buf_p = ace_yy_cp -= 1; ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */ ACE_YY_USER_ACTION -# line 38 "Svc_Conf.l" +# line 41 "Svc_Conf.l" ; /* EMPTY */ ACE_YY_BREAK case 2: ACE_YY_USER_ACTION -# line 39 "Svc_Conf.l" +# line 42 "Svc_Conf.l" { return token (ACE_DYNAMIC); } /* 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 */ case 4: ACE_YY_USER_ACTION -# line 41 "Svc_Conf.l" +# line 44 "Svc_Conf.l" { return token (ACE_SUSPEND); } /* 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 */ case 6: ACE_YY_USER_ACTION -# line 43 "Svc_Conf.l" +# line 46 "Svc_Conf.l" { return token (ACE_REMOVE); } /* 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 */ case 8: ACE_YY_USER_ACTION -# line 45 "Svc_Conf.l" +# line 48 "Svc_Conf.l" { return token (ACE_MODULE_T); } /* 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 */ case 10: ACE_YY_USER_ACTION -# line 47 "Svc_Conf.l" +# line 50 "Svc_Conf.l" { return token (ACE_STREAM_T); } /* 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 */ case 12: ACE_YY_USER_ACTION -# line 49 "Svc_Conf.l" +# line 52 "Svc_Conf.l" { return token (ACE_INACTIVE); } /* 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 */ case 14: ACE_YY_USER_ACTION -# line 51 "Svc_Conf.l" +# line 54 "Svc_Conf.l" { return token (ACE_STAR); } /* 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 */ case 16: ACE_YY_USER_ACTION -# line 53 "Svc_Conf.l" +# line 56 "Svc_Conf.l" { return token (ACE_RPAREN); } /* 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 */ case 18: ACE_YY_USER_ACTION -# line 55 "Svc_Conf.l" +# line 58 "Svc_Conf.l" { return token (ACE_RBRACE); } /* 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 *ACE_OS::strrchr (ace_yytext, '"') = '\0'; ace_yyleng -= 1; @@ -787,7 +788,7 @@ ACE_YY_USER_ACTION /* ACE_YY_BREAK */ case 20: ACE_YY_USER_ACTION -# line 61 "Svc_Conf.l" +# line 64 "Svc_Conf.l" { ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); return token (ACE_IDENT); @@ -795,7 +796,7 @@ ACE_YY_USER_ACTION /* ACE_YY_BREAK */ case 21: ACE_YY_USER_ACTION -# line 65 "Svc_Conf.l" +# line 68 "Svc_Conf.l" { ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng); return token (ACE_PATHNAME); @@ -803,29 +804,29 @@ ACE_YY_USER_ACTION /* ACE_YY_BREAK */ case 22: ACE_YY_USER_ACTION -# line 69 "Svc_Conf.l" +# line 72 "Svc_Conf.l" ; /* EMPTY */ ACE_YY_BREAK case 23: ACE_YY_USER_ACTION -# line 70 "Svc_Conf.l" +# line 73 "Svc_Conf.l" { ace_yylineno++; } ACE_YY_BREAK case 24: ACE_YY_USER_ACTION -# line 71 "Svc_Conf.l" +# line 74 "Svc_Conf.l" { ACE_ERROR ((LM_ERROR, ASYS_TEXT ("unknown char = %d\n"), *ace_yytext)); } ACE_YY_BREAK 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 */ case 25: ACE_YY_USER_ACTION -# line 73 "Svc_Conf.l" +# line 76 "Svc_Conf.l" ACE_SVC_CONF_ECHO; ACE_YY_BREAK @@ -1534,7 +1535,7 @@ void *ptr; { free( ACE_MALLOC_T (ptr) ); } -# line 73 "Svc_Conf.l" +# line 76 "Svc_Conf.l" int ace_yywrap (void) diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 8199a368276..3779f639279 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -10,6 +10,8 @@ char ace_yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90 \n\ #include "ace/Module.h" #include "ace/Stream.h" +ACE_RCSID(ace, Svc_Conf_y, "$Id$") + /* Prototypes.*/ static ACE_Module_Type *get_module (ACE_Static_Node *str_rec, ACE_Static_Node *svc_type); @@ -23,7 +25,7 @@ static ACE_Module_Type *get_module (ACE_Static_Node *str_rec, /* Efficient memory allocation technique.*/ ACE_Obstack *ace_obstack; -#line 27 "Svc_Conf_y.cpp" +#line 29 "Svc_Conf_y.cpp" #define ACE_DYNAMIC 257 #define ACE_STATIC 258 #define ACE_SUSPEND 259 @@ -247,7 +249,7 @@ ACE_YYSTYPE ace_yylval; #define ace_yystacksize ACE_YYSTACKSIZE short ace_yyss[ACE_YYSTACKSIZE]; ACE_YYSTYPE ace_yyvs[ACE_YYSTACKSIZE]; -#line 278 "Svc_Conf.y" +#line 280 "Svc_Conf.y" // Prints the error string to standard output. Cleans up the error // messages. @@ -380,7 +382,7 @@ main (int argc, char *argv[]) return ace_yyparse (); } #endif /* DEBUGGING */ -#line 384 "Svc_Conf_y.cpp" +#line 386 "Svc_Conf_y.cpp" #define ACE_YYABORT goto ace_yyabort #define ACE_YYACCEPT goto ace_yyaccept #define ACE_YYERROR goto ace_yyerrlab @@ -687,7 +689,7 @@ ace_yyreduce: switch (ace_yyn) { case 1: -#line 42 "Svc_Conf.y" +#line 44 "Svc_Conf.y" { if (ace_yyvsp[0].parse_node_ != 0) { @@ -697,13 +699,13 @@ case 1: } break; case 2: -#line 50 "Svc_Conf.y" +#line 52 "Svc_Conf.y" { ace_obstack->release (); } break; case 10: -#line 67 "Svc_Conf.y" +#line 69 "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_); @@ -712,74 +714,74 @@ case 10: } break; case 11: -#line 77 "Svc_Conf.y" +#line 79 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Static_Node (ace_yyvsp[-1].ident_, ace_yyvsp[0].ident_); } break; case 12: -#line 84 "Svc_Conf.y" +#line 86 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Suspend_Node (ace_yyvsp[0].ident_); } break; case 13: -#line 91 "Svc_Conf.y" +#line 93 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Resume_Node (ace_yyvsp[0].ident_); } break; case 14: -#line 98 "Svc_Conf.y" +#line 100 "Svc_Conf.y" { ace_yyval.parse_node_ = new ACE_Remove_Node (ace_yyvsp[0].ident_); } break; case 15: -#line 105 "Svc_Conf.y" +#line 107 "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 108 "Svc_Conf.y" +#line 110 "Svc_Conf.y" { ace_yyval.static_node_ = new ACE_Static_Node (ace_yyvsp[0].ident_); } break; case 17: -#line 109 "Svc_Conf.y" +#line 111 "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 116 "Svc_Conf.y" +#line 118 "Svc_Conf.y" { } break; case 19: -#line 119 "Svc_Conf.y" +#line 121 "Svc_Conf.y" { } break; case 20: -#line 125 "Svc_Conf.y" +#line 127 "Svc_Conf.y" { /* Initialize left context...*/ ace_yyval.static_node_ = ace_yyvsp[-1].static_node_; } break; case 21: -#line 130 "Svc_Conf.y" +#line 132 "Svc_Conf.y" { ace_yyval.parse_node_ = ace_yyvsp[-1].parse_node_; } break; case 22: -#line 133 "Svc_Conf.y" +#line 135 "Svc_Conf.y" { ace_yyval.parse_node_ = 0; } break; case 23: -#line 138 "Svc_Conf.y" +#line 140 "Svc_Conf.y" { if (ace_yyvsp[0].parse_node_ != 0) { @@ -789,11 +791,11 @@ case 23: } break; case 24: -#line 145 "Svc_Conf.y" +#line 147 "Svc_Conf.y" { ace_yyval.parse_node_ = 0; } break; case 25: -#line 150 "Svc_Conf.y" +#line 152 "Svc_Conf.y" { if (ace_yyvsp[0].static_node_ != 0) { @@ -811,7 +813,7 @@ case 25: } break; case 26: -#line 166 "Svc_Conf.y" +#line 168 "Svc_Conf.y" { ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); @@ -820,7 +822,7 @@ case 26: } break; case 27: -#line 173 "Svc_Conf.y" +#line 175 "Svc_Conf.y" { ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); if (mt != 0) @@ -828,7 +830,7 @@ case 27: } break; case 28: -#line 179 "Svc_Conf.y" +#line 181 "Svc_Conf.y" { ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); if (mt != 0) @@ -836,7 +838,7 @@ case 28: } break; case 29: -#line 185 "Svc_Conf.y" +#line 187 "Svc_Conf.y" { ACE_Module_Type *mt = get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ()); if (mt != 0 @@ -850,7 +852,7 @@ case 29: } break; case 30: -#line 200 "Svc_Conf.y" +#line 202 "Svc_Conf.y" { u_int flags = ACE_Service_Type::DELETE_THIS @@ -873,64 +875,64 @@ case 30: } break; case 31: -#line 224 "Svc_Conf.y" +#line 226 "Svc_Conf.y" { ace_yyval.type_ = 1; } break; case 32: -#line 228 "Svc_Conf.y" +#line 230 "Svc_Conf.y" { ace_yyval.type_ = 0; } break; case 33: -#line 232 "Svc_Conf.y" +#line 234 "Svc_Conf.y" { ace_yyval.type_ = 1; } break; case 34: -#line 239 "Svc_Conf.y" +#line 241 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_); } break; case 35: -#line 243 "Svc_Conf.y" +#line 245 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_); } break; case 36: -#line 247 "Svc_Conf.y" +#line 249 "Svc_Conf.y" { ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_); } break; case 37: -#line 254 "Svc_Conf.y" +#line 256 "Svc_Conf.y" { ace_yyval.type_ = ACE_MODULE_T; } break; case 38: -#line 258 "Svc_Conf.y" +#line 260 "Svc_Conf.y" { ace_yyval.type_ = ACE_SVC_OBJ_T; } break; case 39: -#line 262 "Svc_Conf.y" +#line 264 "Svc_Conf.y" { ace_yyval.type_ = ACE_STREAM_T; } break; case 41: -#line 269 "Svc_Conf.y" +#line 271 "Svc_Conf.y" { ace_yyval.ident_ = 0; } break; -#line 933 "Svc_Conf_y.cpp" +#line 935 "Svc_Conf_y.cpp" } ace_yyssp -= ace_yym; ace_yystate = *ace_yyssp; 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); |