summaryrefslogtreecommitdiff
path: root/etc/Svc_Conf_l.cpp.diff
blob: 0d9d4a2ea5c12866a89eb80ef42f050a7035fcd0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
--- Svc_Conf_l.cpp.orig	Thu Oct  8 15:14:45 1998
+++ Svc_Conf_l.cpp	Thu Oct  8 15:16:27 1998
@@ -1,7 +1,8 @@
+#define ACE_BUILD_DLL
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
+ * Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp
  */
 
 #define FLEX_SCANNER
@@ -134,7 +135,9 @@
 		} \
 	while ( 0 )
 
+#if 0
 #define unput(c) ace_yyunput( c, ace_yytext_ptr )
+#endif /* 0 */
 
 
 struct ace_yy_buffer_state
@@ -209,7 +212,9 @@
  */
 static int ace_yy_did_buffer_switch_on_eof;
 
+#if 0
 static void ace_yyunput ACE_YY_PROTO(( int c, char *buf_ptr ));
+#endif /* 0 */
 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 +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 ));
 
+#if 0
 static int ace_yy_start_stack_ptr = 0;
 static int ace_yy_start_stack_depth = 0;
 static int *ace_yy_start_stack = 0;
 static void ace_yy_push_state ACE_YY_PROTO(( int new_state ));
 static void ace_yy_pop_state ACE_YY_PROTO(( void ));
 static int ace_yy_top_state ACE_YY_PROTO(( void ));
+#endif /* 0 */
 
 static void *ace_yy_flex_alloc ACE_YY_PROTO(( unsigned int ));
 static void *ace_yy_flex_realloc ACE_YY_PROTO(( void *, unsigned int ));
@@ -480,7 +487,7 @@
 char *ace_yytext;
 # line 1 "Svc_Conf.l"
 # line 2 "Svc_Conf.l"
-// $Id: Svc_Conf.l,v 4.5 1998/07/18 16:42:01 gonzo Exp $
+// $Id$
 // Sample lexical analysis for regular expression subset.  Must be
 // compiled with FLEX and an ANSI C++ compiler.
 
@@ -488,7 +495,7 @@
 #include "ace/Svc_Conf.h"
 #include "ace/Svc_Conf_Tokens.h"
 
-ACE_RCSID(ace, Svc_Conf_l, "$Id: Svc_Conf.l,v 4.5 1998/07/18 16:42:01 gonzo Exp $")
+ACE_RCSID(ace, Svc_Conf_l, "$Id$")
 
 // Keeps track of the current line for debugging output.
 int ace_yylineno = 1;
@@ -591,7 +598,7 @@
 ACE_YY_DECL
 	{
 	register ace_yy_state_type ace_yy_current_state;
-	register char *ace_yy_cp, *ace_yy_bp;
+	register char *ace_yy_cp = 0, *ace_yy_bp = 0;
 	register int ace_yy_act;
 
 # line 39 "Svc_Conf.l"
@@ -689,96 +696,96 @@
 ACE_YY_USER_ACTION
 # line 42 "Svc_Conf.l"
 { return token (ACE_DYNAMIC); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 3:
 ACE_YY_USER_ACTION
 # line 43 "Svc_Conf.l"
 { return token (ACE_STATIC); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 4:
 ACE_YY_USER_ACTION
 # line 44 "Svc_Conf.l"
 { return token (ACE_SUSPEND); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 5:
 ACE_YY_USER_ACTION
 # line 45 "Svc_Conf.l"
 { return token (ACE_RESUME); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 6:
 ACE_YY_USER_ACTION
 # line 46 "Svc_Conf.l"
 { return token (ACE_REMOVE); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 7:
 ACE_YY_USER_ACTION
 # line 47 "Svc_Conf.l"
 { return token (ACE_USTREAM); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 8:
 ACE_YY_USER_ACTION
 # line 48 "Svc_Conf.l"
 { return token (ACE_MODULE_T); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 9:
 ACE_YY_USER_ACTION
 # line 49 "Svc_Conf.l"
 { return token (ACE_SVC_OBJ_T); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 10:
 ACE_YY_USER_ACTION
 # line 50 "Svc_Conf.l"
 { return token (ACE_STREAM_T); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 11:
 ACE_YY_USER_ACTION
 # line 51 "Svc_Conf.l"
 { return token (ACE_ACTIVE); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 12:
 ACE_YY_USER_ACTION
 # line 52 "Svc_Conf.l"
 { return token (ACE_INACTIVE); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 13:
 ACE_YY_USER_ACTION
 # line 53 "Svc_Conf.l"
 { return token (ACE_COLON); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 14:
 ACE_YY_USER_ACTION
 # line 54 "Svc_Conf.l"
 { return token (ACE_STAR); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 15:
 ACE_YY_USER_ACTION
 # line 55 "Svc_Conf.l"
 { return token (ACE_LPAREN); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 16:
 ACE_YY_USER_ACTION
 # line 56 "Svc_Conf.l"
 { return token (ACE_RPAREN); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 17:
 ACE_YY_USER_ACTION
 # line 57 "Svc_Conf.l"
 { return token (ACE_LBRACE); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 18:
 ACE_YY_USER_ACTION
 # line 58 "Svc_Conf.l"
 { return token (ACE_RBRACE); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 19:
 ACE_YY_USER_ACTION
 # 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);
 			return token (ACE_STRING); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 20:
 ACE_YY_USER_ACTION
 # line 64 "Svc_Conf.l"
@@ -786,7 +793,7 @@
 		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 			return token (ACE_IDENT);
 		      }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 21:
 ACE_YY_USER_ACTION
 # line 68 "Svc_Conf.l"
@@ -794,7 +801,7 @@
 		        ace_yylval.ident_ = ace_obstack->copy (ace_yytext, ace_yyleng);
 			return token (ACE_PATHNAME);
 		      }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 22:
 ACE_YY_USER_ACTION
 # line 72 "Svc_Conf.l"
@@ -808,14 +815,15 @@
 case 24:
 ACE_YY_USER_ACTION
 # 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)); }
 	ACE_YY_BREAK
 case ACE_YY_STATE_EOF(INITIAL):
 case ACE_YY_STATE_EOF(PARAMETERS):
 case ACE_YY_STATE_EOF(NORMAL):
 # line 75 "Svc_Conf.l"
 { ACE_YY_NEW_FILE; ace_yyterminate(); }
-	ACE_YY_BREAK
+	/* ACE_YY_BREAK */
 case 25:
 ACE_YY_USER_ACTION
 # line 76 "Svc_Conf.l"
@@ -1148,6 +1156,7 @@
 	}
 
 
+#if 0
 #ifdef ACE_YY_USE_PROTOS
 static void ace_yyunput( int c, register char *ace_yy_bp )
 #else
@@ -1192,7 +1201,7 @@
 	 */
 	ACE_YY_DO_BEFORE_ACTION; /* set up ace_yytext again */
 	}
-
+#endif /* 0 */
 
 #ifdef __cplusplus
 static int ace_yyinput()
@@ -1400,6 +1409,7 @@
 	}
 
 
+#if 0
 #ifdef ACE_YY_USE_PROTOS
 static void ace_yy_push_state( int new_state )
 #else
@@ -1445,7 +1455,7 @@
 	{
 	return ace_yy_start_stack[ace_yy_start_stack_ptr - 1];
 	}
-
+#endif /* 0 */
 
 #ifdef ACE_YY_USE_PROTOS
 static void ace_yy_fatal_error( const char msg[] )