ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/conf_parser.c
(Generate patch)

Comparing:
ircd-hybrid-8/src/ircd_parser.c (file contents), Revision 1216 by michael, Tue Sep 13 18:22:31 2011 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (file contents), Revision 4499 by michael, Sat Aug 16 18:29:23 2014 UTC

# Line 1 | Line 1
1 < /* A Bison parser, made by GNU Bison 2.5.  */
1 > /* A Bison parser, made by GNU Bison 3.0.2.  */
2  
3   /* Bison implementation for Yacc-like parsers in C
4 <  
5 <      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
6 <  
4 >
5 >   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
6 >
7     This program is free software: you can redistribute it and/or modify
8     it under the terms of the GNU General Public License as published by
9     the Free Software Foundation, either version 3 of the License, or
10     (at your option) any later version.
11 <  
11 >
12     This program is distributed in the hope that it will be useful,
13     but WITHOUT ANY WARRANTY; without even the implied warranty of
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     GNU General Public License for more details.
16 <  
16 >
17     You should have received a copy of the GNU General Public License
18     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
19  
# Line 26 | Line 26
26     special exception, which will cause the skeleton and the resulting
27     Bison output files to be licensed under the GNU General Public
28     License without this special exception.
29 <  
29 >
30     This special exception was added by the Free Software Foundation in
31     version 2.2 of Bison.  */
32  
# Line 44 | Line 44
44   #define YYBISON 1
45  
46   /* Bison version.  */
47 < #define YYBISON_VERSION "2.5"
47 > #define YYBISON_VERSION "3.0.2"
48  
49   /* Skeleton name.  */
50   #define YYSKELETON_NAME "yacc.c"
# Line 58 | Line 58
58   /* Pull parsers.  */
59   #define YYPULL 1
60  
61 /* Using locations.  */
62 #define YYLSP_NEEDED 0
61  
62  
63  
64   /* Copy the first part of user declarations.  */
65 <
68 < /* Line 268 of yacc.c  */
69 < #line 25 "ircd_parser.y"
65 > #line 28 "conf_parser.y" /* yacc.c:339  */
66  
67  
68   #define YY_NO_UNPUT
# Line 77 | Line 73
73   #include "stdinc.h"
74   #include "ircd.h"
75   #include "list.h"
76 < #include "s_conf.h"
76 > #include "conf.h"
77 > #include "conf_class.h"
78   #include "event.h"
79 < #include "s_log.h"
79 > #include "log.h"
80   #include "client.h"     /* for UMODE_ALL only */
81   #include "irc_string.h"
85 #include "sprintf_irc.h"
82   #include "memory.h"
83   #include "modules.h"
84 < #include "s_serv.h"
84 > #include "server.h"
85   #include "hostmask.h"
86   #include "send.h"
87   #include "listener.h"
88   #include "resv.h"
89   #include "numeric.h"
90 < #include "s_user.h"
90 > #include "user.h"
91 > #include "motd.h"
92  
93   #ifdef HAVE_LIBCRYPTO
94   #include <openssl/rsa.h>
95   #include <openssl/bio.h>
96   #include <openssl/pem.h>
97 + #include <openssl/dh.h>
98   #endif
99  
100 < static char *class_name = NULL;
103 < static struct ConfItem *yy_conf = NULL;
104 < static struct AccessItem *yy_aconf = NULL;
105 < static struct MatchItem *yy_match_item = NULL;
106 < static struct ClassItem *yy_class = NULL;
107 < static char *yy_class_name = NULL;
108 <
109 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
110 < static dlink_list hub_conf_list  = { NULL, NULL, 0 };
111 < static dlink_list leaf_conf_list = { NULL, NULL, 0 };
112 < static unsigned int listener_flags = 0;
113 < static unsigned int regex_ban = 0;
114 < static char userbuf[IRCD_BUFSIZE];
115 < static char hostbuf[IRCD_BUFSIZE];
116 < static char reasonbuf[REASONLEN + 1];
117 < static char gecos_name[REALLEN * 4];
118 <
119 < static char *resv_reason = NULL;
120 < static char *listener_address = NULL;
121 < static int not_atom = 0;
100 > #include "rsa.h"
101  
102 < struct CollectItem
124 < {
125 <  dlink_node node;
126 <  char *name;
127 <  char *user;
128 <  char *host;
129 <  char *passwd;
130 <  int  port;
131 <  int  flags;
132 < #ifdef HAVE_LIBCRYPTO
133 <  char *rsa_public_key_file;
134 <  RSA *rsa_public_key;
135 < #endif
136 < };
102 > int yylex(void);
103  
104 < static void
139 < free_collect_item(struct CollectItem *item)
104 > static struct
105   {
106 <  MyFree(item->name);
107 <  MyFree(item->user);
108 <  MyFree(item->host);
109 <  MyFree(item->passwd);
110 < #ifdef HAVE_LIBCRYPTO
111 <  MyFree(item->rsa_public_key_file);
112 < #endif
113 <  MyFree(item);
114 < }
106 >  struct
107 >  {
108 >    dlink_list list;
109 >  } mask,
110 >    leaf,
111 >    hub;
112 >
113 >  struct
114 >  {
115 >    char buf[IRCD_BUFSIZE];
116 >  } name,
117 >    user,
118 >    host,
119 >    addr,
120 >    bind,
121 >    file,
122 >    ciph,
123 >    cert,
124 >    rpass,
125 >    spass,
126 >    class;
127 >
128 >  struct
129 >  {
130 >    unsigned int value;
131 >  } flags,
132 >    modes,
133 >    size,
134 >    type,
135 >    port,
136 >    aftype,
137 >    ping_freq,
138 >    max_perip,
139 >    con_freq,
140 >    min_idle,
141 >    max_idle,
142 >    max_total,
143 >    max_global,
144 >    max_local,
145 >    max_ident,
146 >    max_sendq,
147 >    max_recvq,
148 >    max_channels,
149 >    cidr_bitlen_ipv4,
150 >    cidr_bitlen_ipv6,
151 >    number_per_cidr;
152 > } block_state;
153  
154   static void
155 < unhook_hub_leaf_confs(void)
155 > reset_block_state(void)
156   {
157 <  dlink_node *ptr;
155 <  dlink_node *next_ptr;
156 <  struct CollectItem *yy_hconf;
157 <  struct CollectItem *yy_lconf;
157 >  dlink_node *ptr = NULL, *ptr_next = NULL;
158  
159 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
159 >  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.mask.list.head)
160    {
161 <    yy_hconf = ptr->data;
162 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
163 <    free_collect_item(yy_hconf);
161 >    MyFree(ptr->data);
162 >    dlinkDelete(ptr, &block_state.mask.list);
163 >    free_dlink_node(ptr);
164    }
165  
166 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
166 >  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.leaf.list.head)
167    {
168 <    yy_lconf = ptr->data;
169 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
170 <    free_collect_item(yy_lconf);
168 >    MyFree(ptr->data);
169 >    dlinkDelete(ptr, &block_state.leaf.list);
170 >    free_dlink_node(ptr);
171    }
172 }
172  
173 +  DLINK_FOREACH_SAFE(ptr, ptr_next, block_state.hub.list.head)
174 +  {
175 +    MyFree(ptr->data);
176 +    dlinkDelete(ptr, &block_state.hub.list);
177 +    free_dlink_node(ptr);
178 +  }
179  
180 +  memset(&block_state, 0, sizeof(block_state));
181 + }
182  
176 /* Line 268 of yacc.c  */
177 #line 178 "ircd_parser.c"
183  
184 < /* Enabling traces.  */
185 < #ifndef YYDEBUG
186 < # define YYDEBUG 0
187 < #endif
184 > #line 185 "conf_parser.c" /* yacc.c:339  */
185 >
186 > # ifndef YY_NULLPTR
187 > #  if defined __cplusplus && 201103L <= __cplusplus
188 > #   define YY_NULLPTR nullptr
189 > #  else
190 > #   define YY_NULLPTR 0
191 > #  endif
192 > # endif
193  
194   /* Enabling verbose error messages.  */
195   #ifdef YYERROR_VERBOSE
# Line 189 | Line 199 | unhook_hub_leaf_confs(void)
199   # define YYERROR_VERBOSE 0
200   #endif
201  
202 < /* Enabling the token table.  */
203 < #ifndef YYTOKEN_TABLE
204 < # define YYTOKEN_TABLE 0
202 > /* In a future release of Bison, this section will be replaced
203 >   by #include "y.tab.h".  */
204 > #ifndef YY_YY_CONF_PARSER_H_INCLUDED
205 > # define YY_YY_CONF_PARSER_H_INCLUDED
206 > /* Debug traces.  */
207 > #ifndef YYDEBUG
208 > # define YYDEBUG 0
209 > #endif
210 > #if YYDEBUG
211 > extern int yydebug;
212   #endif
213  
214 <
198 < /* Tokens.  */
214 > /* Token type.  */
215   #ifndef YYTOKENTYPE
216   # define YYTOKENTYPE
217 <   /* Put the tokens into the symbol table, so that GDB and other debuggers
218 <      know about them.  */
219 <   enum yytokentype {
220 <     ACCEPT_PASSWORD = 258,
221 <     ACTION = 259,
222 <     ADMIN = 260,
223 <     AFTYPE = 261,
224 <     T_ALLOW = 262,
225 <     ANTI_NICK_FLOOD = 263,
226 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
227 <     AUTOCONN = 265,
228 <     T_BLOCK = 266,
229 <     BURST_AWAY = 267,
230 <     BURST_TOPICWHO = 268,
231 <     BYTES = 269,
232 <     KBYTES = 270,
233 <     MBYTES = 271,
234 <     GBYTES = 272,
235 <     TBYTES = 273,
236 <     CALLER_ID_WAIT = 274,
237 <     CAN_FLOOD = 275,
238 <     CHANNEL = 276,
239 <     CIDR_BITLEN_IPV4 = 277,
240 <     CIDR_BITLEN_IPV6 = 278,
241 <     CIPHER_PREFERENCE = 279,
242 <     CLASS = 280,
243 <     COMPRESSED = 281,
244 <     COMPRESSION_LEVEL = 282,
245 <     CONNECT = 283,
246 <     CONNECTFREQ = 284,
247 <     CRYPTLINK = 285,
248 <     DEFAULT_CIPHER_PREFERENCE = 286,
249 <     DEFAULT_FLOODCOUNT = 287,
250 <     DEFAULT_SPLIT_SERVER_COUNT = 288,
251 <     DEFAULT_SPLIT_USER_COUNT = 289,
252 <     DENY = 290,
253 <     DESCRIPTION = 291,
254 <     DIE = 292,
255 <     DISABLE_AUTH = 293,
256 <     DISABLE_FAKE_CHANNELS = 294,
257 <     DISABLE_HIDDEN = 295,
258 <     DISABLE_LOCAL_CHANNELS = 296,
259 <     DISABLE_REMOTE_COMMANDS = 297,
260 <     DOTS_IN_IDENT = 298,
261 <     DURATION = 299,
262 <     EGDPOOL_PATH = 300,
263 <     EMAIL = 301,
264 <     ENABLE = 302,
265 <     ENCRYPTED = 303,
266 <     EXCEED_LIMIT = 304,
267 <     EXEMPT = 305,
268 <     FAILED_OPER_NOTICE = 306,
269 <     IRCD_FLAGS = 307,
270 <     FLATTEN_LINKS = 308,
271 <     FFAILED_OPERLOG = 309,
272 <     FKILLLOG = 310,
273 <     FKLINELOG = 311,
274 <     FGLINELOG = 312,
275 <     FIOERRLOG = 313,
276 <     FOPERLOG = 314,
277 <     FOPERSPYLOG = 315,
278 <     FUSERLOG = 316,
279 <     GECOS = 317,
280 <     GENERAL = 318,
281 <     GLINE = 319,
282 <     GLINES = 320,
283 <     GLINE_EXEMPT = 321,
284 <     GLINE_LOG = 322,
285 <     GLINE_TIME = 323,
286 <     GLINE_MIN_CIDR = 324,
287 <     GLINE_MIN_CIDR6 = 325,
288 <     GLOBAL_KILL = 326,
289 <     IRCD_AUTH = 327,
290 <     NEED_IDENT = 328,
291 <     HAVENT_READ_CONF = 329,
292 <     HIDDEN = 330,
293 <     HIDDEN_ADMIN = 331,
294 <     HIDDEN_NAME = 332,
295 <     HIDDEN_OPER = 333,
296 <     HIDE_SERVER_IPS = 334,
297 <     HIDE_SERVERS = 335,
298 <     HIDE_SPOOF_IPS = 336,
299 <     HOST = 337,
300 <     HUB = 338,
301 <     HUB_MASK = 339,
302 <     IGNORE_BOGUS_TS = 340,
303 <     INVISIBLE_ON_CONNECT = 341,
304 <     IP = 342,
305 <     KILL = 343,
306 <     KILL_CHASE_TIME_LIMIT = 344,
307 <     KLINE = 345,
308 <     KLINE_EXEMPT = 346,
309 <     KLINE_REASON = 347,
310 <     KLINE_WITH_REASON = 348,
311 <     KNOCK_DELAY = 349,
312 <     KNOCK_DELAY_CHANNEL = 350,
313 <     LEAF_MASK = 351,
314 <     LINKS_DELAY = 352,
315 <     LISTEN = 353,
316 <     T_LOG = 354,
317 <     LOGGING = 355,
318 <     LOG_LEVEL = 356,
319 <     MAX_ACCEPT = 357,
320 <     MAX_BANS = 358,
321 <     MAX_CHANS_PER_USER = 359,
322 <     MAX_GLOBAL = 360,
323 <     MAX_IDENT = 361,
324 <     MAX_LOCAL = 362,
325 <     MAX_NICK_CHANGES = 363,
326 <     MAX_NICK_TIME = 364,
327 <     MAX_NUMBER = 365,
328 <     MAX_TARGETS = 366,
329 <     MAX_WATCH = 367,
330 <     MESSAGE_LOCALE = 368,
331 <     MIN_NONWILDCARD = 369,
332 <     MIN_NONWILDCARD_SIMPLE = 370,
333 <     MODULE = 371,
334 <     MODULES = 372,
335 <     NAME = 373,
336 <     NEED_PASSWORD = 374,
337 <     NETWORK_DESC = 375,
338 <     NETWORK_NAME = 376,
339 <     NICK = 377,
340 <     NICK_CHANGES = 378,
341 <     NO_CREATE_ON_SPLIT = 379,
342 <     NO_JOIN_ON_SPLIT = 380,
343 <     NO_OPER_FLOOD = 381,
344 <     NO_TILDE = 382,
345 <     NOT = 383,
346 <     NUMBER = 384,
347 <     NUMBER_PER_IDENT = 385,
348 <     NUMBER_PER_CIDR = 386,
349 <     NUMBER_PER_IP = 387,
350 <     NUMBER_PER_IP_GLOBAL = 388,
351 <     OPERATOR = 389,
352 <     OPERS_BYPASS_CALLERID = 390,
353 <     OPER_LOG = 391,
354 <     OPER_ONLY_UMODES = 392,
355 <     OPER_PASS_RESV = 393,
356 <     OPER_SPY_T = 394,
357 <     OPER_UMODES = 395,
358 <     JOIN_FLOOD_COUNT = 396,
359 <     JOIN_FLOOD_TIME = 397,
360 <     PACE_WAIT = 398,
361 <     PACE_WAIT_SIMPLE = 399,
362 <     PASSWORD = 400,
363 <     PATH = 401,
364 <     PING_COOKIE = 402,
365 <     PING_TIME = 403,
366 <     PING_WARNING = 404,
367 <     PORT = 405,
368 <     QSTRING = 406,
369 <     QUIET_ON_BAN = 407,
370 <     REASON = 408,
371 <     REDIRPORT = 409,
372 <     REDIRSERV = 410,
373 <     REGEX_T = 411,
374 <     REHASH = 412,
375 <     TREJECT_HOLD_TIME = 413,
376 <     REMOTE = 414,
377 <     REMOTEBAN = 415,
378 <     RESTRICT_CHANNELS = 416,
379 <     RESTRICTED = 417,
380 <     RSA_PRIVATE_KEY_FILE = 418,
381 <     RSA_PUBLIC_KEY_FILE = 419,
382 <     SSL_CERTIFICATE_FILE = 420,
383 <     T_SSL_CONNECTION_METHOD = 421,
384 <     T_SSLV3 = 422,
385 <     T_TLSV1 = 423,
386 <     RESV = 424,
387 <     RESV_EXEMPT = 425,
388 <     SECONDS = 426,
389 <     MINUTES = 427,
390 <     HOURS = 428,
391 <     DAYS = 429,
392 <     WEEKS = 430,
393 <     SENDQ = 431,
394 <     SEND_PASSWORD = 432,
395 <     SERVERHIDE = 433,
396 <     SERVERINFO = 434,
397 <     SERVLINK_PATH = 435,
398 <     IRCD_SID = 436,
399 <     TKLINE_EXPIRE_NOTICES = 437,
400 <     T_SHARED = 438,
401 <     T_CLUSTER = 439,
402 <     TYPE = 440,
403 <     SHORT_MOTD = 441,
404 <     SILENT = 442,
405 <     SPOOF = 443,
406 <     SPOOF_NOTICE = 444,
407 <     STATS_E_DISABLED = 445,
408 <     STATS_I_OPER_ONLY = 446,
409 <     STATS_K_OPER_ONLY = 447,
410 <     STATS_O_OPER_ONLY = 448,
411 <     STATS_P_OPER_ONLY = 449,
412 <     TBOOL = 450,
413 <     TMASKED = 451,
414 <     T_REJECT = 452,
415 <     TS_MAX_DELTA = 453,
416 <     TS_WARN_DELTA = 454,
417 <     TWODOTS = 455,
418 <     T_ALL = 456,
419 <     T_BOTS = 457,
420 <     T_SOFTCALLERID = 458,
421 <     T_CALLERID = 459,
422 <     T_CCONN = 460,
423 <     T_CCONN_FULL = 461,
424 <     T_CLIENT_FLOOD = 462,
425 <     T_DEAF = 463,
426 <     T_DEBUG = 464,
427 <     T_DRONE = 465,
428 <     T_EXTERNAL = 466,
429 <     T_FULL = 467,
430 <     T_INVISIBLE = 468,
431 <     T_IPV4 = 469,
432 <     T_IPV6 = 470,
433 <     T_LOCOPS = 471,
434 <     T_LOGPATH = 472,
435 <     T_L_CRIT = 473,
436 <     T_L_DEBUG = 474,
437 <     T_L_ERROR = 475,
438 <     T_L_INFO = 476,
439 <     T_L_NOTICE = 477,
440 <     T_L_TRACE = 478,
441 <     T_L_WARN = 479,
442 <     T_MAX_CLIENTS = 480,
443 <     T_NCHANGE = 481,
444 <     T_OPERWALL = 482,
445 <     T_REJ = 483,
446 <     T_SERVER = 484,
447 <     T_SERVNOTICE = 485,
432 <     T_SKILL = 486,
433 <     T_SPY = 487,
434 <     T_SSL = 488,
435 <     T_UMODES = 489,
436 <     T_UNAUTH = 490,
437 <     T_UNRESV = 491,
438 <     T_UNXLINE = 492,
439 <     T_GLOBOPS = 493,
440 <     T_WALLOP = 494,
441 <     T_SERVICE = 495,
442 <     T_SERVICES_NAME = 496,
443 <     THROTTLE_TIME = 497,
444 <     TOPICBURST = 498,
445 <     TRUE_NO_OPER_FLOOD = 499,
446 <     TKLINE = 500,
447 <     TXLINE = 501,
448 <     TRESV = 502,
449 <     UNKLINE = 503,
450 <     USER = 504,
451 <     USE_EGD = 505,
452 <     USE_EXCEPT = 506,
453 <     USE_INVEX = 507,
454 <     USE_KNOCK = 508,
455 <     USE_LOGGING = 509,
456 <     USE_WHOIS_ACTUALLY = 510,
457 <     VHOST = 511,
458 <     VHOST6 = 512,
459 <     XLINE = 513,
460 <     WARN = 514,
461 <     WARN_NO_NLINE = 515
462 <   };
217 >  enum yytokentype
218 >  {
219 >    ACCEPT_PASSWORD = 258,
220 >    ADMIN = 259,
221 >    AFTYPE = 260,
222 >    ANTI_NICK_FLOOD = 261,
223 >    ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
224 >    AUTOCONN = 263,
225 >    AWAY_COUNT = 264,
226 >    AWAY_TIME = 265,
227 >    BYTES = 266,
228 >    KBYTES = 267,
229 >    MBYTES = 268,
230 >    CALLER_ID_WAIT = 269,
231 >    CAN_FLOOD = 270,
232 >    CHANNEL = 271,
233 >    CIDR_BITLEN_IPV4 = 272,
234 >    CIDR_BITLEN_IPV6 = 273,
235 >    CLASS = 274,
236 >    CONNECT = 275,
237 >    CONNECTFREQ = 276,
238 >    CYCLE_ON_HOST_CHANGE = 277,
239 >    DEFAULT_FLOODCOUNT = 278,
240 >    DEFAULT_SPLIT_SERVER_COUNT = 279,
241 >    DEFAULT_SPLIT_USER_COUNT = 280,
242 >    DENY = 281,
243 >    DESCRIPTION = 282,
244 >    DIE = 283,
245 >    DISABLE_AUTH = 284,
246 >    DISABLE_FAKE_CHANNELS = 285,
247 >    DISABLE_REMOTE_COMMANDS = 286,
248 >    DOTS_IN_IDENT = 287,
249 >    EGDPOOL_PATH = 288,
250 >    EMAIL = 289,
251 >    ENCRYPTED = 290,
252 >    EXCEED_LIMIT = 291,
253 >    EXEMPT = 292,
254 >    FAILED_OPER_NOTICE = 293,
255 >    FLATTEN_LINKS = 294,
256 >    GECOS = 295,
257 >    GENERAL = 296,
258 >    GLINE = 297,
259 >    GLINE_DURATION = 298,
260 >    GLINE_ENABLE = 299,
261 >    GLINE_EXEMPT = 300,
262 >    GLINE_MIN_CIDR = 301,
263 >    GLINE_MIN_CIDR6 = 302,
264 >    GLINE_REQUEST_DURATION = 303,
265 >    GLOBAL_KILL = 304,
266 >    HAVENT_READ_CONF = 305,
267 >    HIDDEN = 306,
268 >    HIDDEN_NAME = 307,
269 >    HIDE_CHANS = 308,
270 >    HIDE_IDLE = 309,
271 >    HIDE_IDLE_FROM_OPERS = 310,
272 >    HIDE_SERVER_IPS = 311,
273 >    HIDE_SERVERS = 312,
274 >    HIDE_SERVICES = 313,
275 >    HIDE_SPOOF_IPS = 314,
276 >    HOST = 315,
277 >    HUB = 316,
278 >    HUB_MASK = 317,
279 >    IGNORE_BOGUS_TS = 318,
280 >    INVISIBLE_ON_CONNECT = 319,
281 >    INVITE_CLIENT_COUNT = 320,
282 >    INVITE_CLIENT_TIME = 321,
283 >    IP = 322,
284 >    IRCD_AUTH = 323,
285 >    IRCD_FLAGS = 324,
286 >    IRCD_SID = 325,
287 >    JOIN_FLOOD_COUNT = 326,
288 >    JOIN_FLOOD_TIME = 327,
289 >    KILL = 328,
290 >    KILL_CHASE_TIME_LIMIT = 329,
291 >    KLINE = 330,
292 >    KLINE_EXEMPT = 331,
293 >    KNOCK_CLIENT_COUNT = 332,
294 >    KNOCK_CLIENT_TIME = 333,
295 >    KNOCK_DELAY_CHANNEL = 334,
296 >    LEAF_MASK = 335,
297 >    LINKS_DELAY = 336,
298 >    LISTEN = 337,
299 >    MASK = 338,
300 >    MAX_ACCEPT = 339,
301 >    MAX_BANS = 340,
302 >    MAX_CHANNELS = 341,
303 >    MAX_GLOBAL = 342,
304 >    MAX_IDENT = 343,
305 >    MAX_IDLE = 344,
306 >    MAX_LOCAL = 345,
307 >    MAX_NICK_CHANGES = 346,
308 >    MAX_NICK_LENGTH = 347,
309 >    MAX_NICK_TIME = 348,
310 >    MAX_NUMBER = 349,
311 >    MAX_TARGETS = 350,
312 >    MAX_TOPIC_LENGTH = 351,
313 >    MAX_WATCH = 352,
314 >    MIN_IDLE = 353,
315 >    MIN_NONWILDCARD = 354,
316 >    MIN_NONWILDCARD_SIMPLE = 355,
317 >    MODULE = 356,
318 >    MODULES = 357,
319 >    MOTD = 358,
320 >    NAME = 359,
321 >    NEED_IDENT = 360,
322 >    NEED_PASSWORD = 361,
323 >    NETWORK_DESC = 362,
324 >    NETWORK_NAME = 363,
325 >    NICK = 364,
326 >    NO_CREATE_ON_SPLIT = 365,
327 >    NO_JOIN_ON_SPLIT = 366,
328 >    NO_OPER_FLOOD = 367,
329 >    NO_TILDE = 368,
330 >    NUMBER = 369,
331 >    NUMBER_PER_CIDR = 370,
332 >    NUMBER_PER_IP = 371,
333 >    OPER_ONLY_UMODES = 372,
334 >    OPER_PASS_RESV = 373,
335 >    OPER_UMODES = 374,
336 >    OPERATOR = 375,
337 >    OPERS_BYPASS_CALLERID = 376,
338 >    PACE_WAIT = 377,
339 >    PACE_WAIT_SIMPLE = 378,
340 >    PASSWORD = 379,
341 >    PATH = 380,
342 >    PING_COOKIE = 381,
343 >    PING_TIME = 382,
344 >    PORT = 383,
345 >    QSTRING = 384,
346 >    RANDOM_IDLE = 385,
347 >    REASON = 386,
348 >    REDIRPORT = 387,
349 >    REDIRSERV = 388,
350 >    REHASH = 389,
351 >    REMOTE = 390,
352 >    REMOTEBAN = 391,
353 >    RESV = 392,
354 >    RESV_EXEMPT = 393,
355 >    RSA_PRIVATE_KEY_FILE = 394,
356 >    RSA_PUBLIC_KEY_FILE = 395,
357 >    SECONDS = 396,
358 >    MINUTES = 397,
359 >    HOURS = 398,
360 >    DAYS = 399,
361 >    WEEKS = 400,
362 >    MONTHS = 401,
363 >    YEARS = 402,
364 >    SEND_PASSWORD = 403,
365 >    SENDQ = 404,
366 >    SERVERHIDE = 405,
367 >    SERVERINFO = 406,
368 >    SHORT_MOTD = 407,
369 >    SPOOF = 408,
370 >    SPOOF_NOTICE = 409,
371 >    SQUIT = 410,
372 >    SSL_CERTIFICATE_FILE = 411,
373 >    SSL_CERTIFICATE_FINGERPRINT = 412,
374 >    SSL_CONNECTION_REQUIRED = 413,
375 >    SSL_DH_ELLIPTIC_CURVE = 414,
376 >    SSL_DH_PARAM_FILE = 415,
377 >    SSL_MESSAGE_DIGEST_ALGORITHM = 416,
378 >    STATS_E_DISABLED = 417,
379 >    STATS_I_OPER_ONLY = 418,
380 >    STATS_K_OPER_ONLY = 419,
381 >    STATS_O_OPER_ONLY = 420,
382 >    STATS_P_OPER_ONLY = 421,
383 >    STATS_U_OPER_ONLY = 422,
384 >    T_ALL = 423,
385 >    T_BOTS = 424,
386 >    T_CALLERID = 425,
387 >    T_CCONN = 426,
388 >    T_CLUSTER = 427,
389 >    T_DEAF = 428,
390 >    T_DEBUG = 429,
391 >    T_DLINE = 430,
392 >    T_EXTERNAL = 431,
393 >    T_FARCONNECT = 432,
394 >    T_FILE = 433,
395 >    T_FULL = 434,
396 >    T_GLOBOPS = 435,
397 >    T_INVISIBLE = 436,
398 >    T_IPV4 = 437,
399 >    T_IPV6 = 438,
400 >    T_LOCOPS = 439,
401 >    T_LOG = 440,
402 >    T_MAX_CLIENTS = 441,
403 >    T_NCHANGE = 442,
404 >    T_NONONREG = 443,
405 >    T_RECVQ = 444,
406 >    T_REJ = 445,
407 >    T_RESTART = 446,
408 >    T_SERVER = 447,
409 >    T_SERVICE = 448,
410 >    T_SERVICES_NAME = 449,
411 >    T_SERVNOTICE = 450,
412 >    T_SET = 451,
413 >    T_SHARED = 452,
414 >    T_SIZE = 453,
415 >    T_SKILL = 454,
416 >    T_SOFTCALLERID = 455,
417 >    T_SPY = 456,
418 >    T_SSL = 457,
419 >    T_SSL_CIPHER_LIST = 458,
420 >    T_UMODES = 459,
421 >    T_UNAUTH = 460,
422 >    T_UNDLINE = 461,
423 >    T_UNLIMITED = 462,
424 >    T_UNRESV = 463,
425 >    T_UNXLINE = 464,
426 >    T_WALLOP = 465,
427 >    T_WALLOPS = 466,
428 >    T_WEBIRC = 467,
429 >    TBOOL = 468,
430 >    THROTTLE_COUNT = 469,
431 >    THROTTLE_TIME = 470,
432 >    TKLINE_EXPIRE_NOTICES = 471,
433 >    TMASKED = 472,
434 >    TRUE_NO_OPER_FLOOD = 473,
435 >    TS_MAX_DELTA = 474,
436 >    TS_WARN_DELTA = 475,
437 >    TWODOTS = 476,
438 >    TYPE = 477,
439 >    UNKLINE = 478,
440 >    USE_EGD = 479,
441 >    USE_LOGGING = 480,
442 >    USER = 481,
443 >    VHOST = 482,
444 >    VHOST6 = 483,
445 >    WARN_NO_CONNECT_BLOCK = 484,
446 >    XLINE = 485
447 >  };
448   #endif
449   /* Tokens.  */
450   #define ACCEPT_PASSWORD 258
451 < #define ACTION 259
452 < #define ADMIN 260
453 < #define AFTYPE 261
454 < #define T_ALLOW 262
455 < #define ANTI_NICK_FLOOD 263
456 < #define ANTI_SPAM_EXIT_MESSAGE_TIME 264
457 < #define AUTOCONN 265
458 < #define T_BLOCK 266
459 < #define BURST_AWAY 267
460 < #define BURST_TOPICWHO 268
461 < #define BYTES 269
462 < #define KBYTES 270
463 < #define MBYTES 271
464 < #define GBYTES 272
465 < #define TBYTES 273
466 < #define CALLER_ID_WAIT 274
467 < #define CAN_FLOOD 275
468 < #define CHANNEL 276
469 < #define CIDR_BITLEN_IPV4 277
470 < #define CIDR_BITLEN_IPV6 278
471 < #define CIPHER_PREFERENCE 279
472 < #define CLASS 280
473 < #define COMPRESSED 281
474 < #define COMPRESSION_LEVEL 282
475 < #define CONNECT 283
476 < #define CONNECTFREQ 284
477 < #define CRYPTLINK 285
478 < #define DEFAULT_CIPHER_PREFERENCE 286
479 < #define DEFAULT_FLOODCOUNT 287
480 < #define DEFAULT_SPLIT_SERVER_COUNT 288
481 < #define DEFAULT_SPLIT_USER_COUNT 289
482 < #define DENY 290
483 < #define DESCRIPTION 291
484 < #define DIE 292
485 < #define DISABLE_AUTH 293
486 < #define DISABLE_FAKE_CHANNELS 294
487 < #define DISABLE_HIDDEN 295
488 < #define DISABLE_LOCAL_CHANNELS 296
489 < #define DISABLE_REMOTE_COMMANDS 297
490 < #define DOTS_IN_IDENT 298
491 < #define DURATION 299
492 < #define EGDPOOL_PATH 300
493 < #define EMAIL 301
494 < #define ENABLE 302
495 < #define ENCRYPTED 303
496 < #define EXCEED_LIMIT 304
497 < #define EXEMPT 305
498 < #define FAILED_OPER_NOTICE 306
499 < #define IRCD_FLAGS 307
500 < #define FLATTEN_LINKS 308
501 < #define FFAILED_OPERLOG 309
502 < #define FKILLLOG 310
503 < #define FKLINELOG 311
504 < #define FGLINELOG 312
505 < #define FIOERRLOG 313
506 < #define FOPERLOG 314
507 < #define FOPERSPYLOG 315
508 < #define FUSERLOG 316
509 < #define GECOS 317
510 < #define GENERAL 318
511 < #define GLINE 319
512 < #define GLINES 320
513 < #define GLINE_EXEMPT 321
514 < #define GLINE_LOG 322
515 < #define GLINE_TIME 323
516 < #define GLINE_MIN_CIDR 324
517 < #define GLINE_MIN_CIDR6 325
518 < #define GLOBAL_KILL 326
519 < #define IRCD_AUTH 327
520 < #define NEED_IDENT 328
521 < #define HAVENT_READ_CONF 329
522 < #define HIDDEN 330
523 < #define HIDDEN_ADMIN 331
524 < #define HIDDEN_NAME 332
525 < #define HIDDEN_OPER 333
526 < #define HIDE_SERVER_IPS 334
527 < #define HIDE_SERVERS 335
528 < #define HIDE_SPOOF_IPS 336
529 < #define HOST 337
530 < #define HUB 338
531 < #define HUB_MASK 339
532 < #define IGNORE_BOGUS_TS 340
533 < #define INVISIBLE_ON_CONNECT 341
534 < #define IP 342
535 < #define KILL 343
536 < #define KILL_CHASE_TIME_LIMIT 344
537 < #define KLINE 345
538 < #define KLINE_EXEMPT 346
539 < #define KLINE_REASON 347
540 < #define KLINE_WITH_REASON 348
541 < #define KNOCK_DELAY 349
542 < #define KNOCK_DELAY_CHANNEL 350
543 < #define LEAF_MASK 351
544 < #define LINKS_DELAY 352
545 < #define LISTEN 353
546 < #define T_LOG 354
547 < #define LOGGING 355
548 < #define LOG_LEVEL 356
549 < #define MAX_ACCEPT 357
550 < #define MAX_BANS 358
551 < #define MAX_CHANS_PER_USER 359
552 < #define MAX_GLOBAL 360
553 < #define MAX_IDENT 361
554 < #define MAX_LOCAL 362
555 < #define MAX_NICK_CHANGES 363
556 < #define MAX_NICK_TIME 364
557 < #define MAX_NUMBER 365
558 < #define MAX_TARGETS 366
559 < #define MAX_WATCH 367
560 < #define MESSAGE_LOCALE 368
561 < #define MIN_NONWILDCARD 369
562 < #define MIN_NONWILDCARD_SIMPLE 370
563 < #define MODULE 371
564 < #define MODULES 372
565 < #define NAME 373
566 < #define NEED_PASSWORD 374
567 < #define NETWORK_DESC 375
568 < #define NETWORK_NAME 376
569 < #define NICK 377
570 < #define NICK_CHANGES 378
571 < #define NO_CREATE_ON_SPLIT 379
572 < #define NO_JOIN_ON_SPLIT 380
573 < #define NO_OPER_FLOOD 381
574 < #define NO_TILDE 382
575 < #define NOT 383
576 < #define NUMBER 384
577 < #define NUMBER_PER_IDENT 385
578 < #define NUMBER_PER_CIDR 386
579 < #define NUMBER_PER_IP 387
580 < #define NUMBER_PER_IP_GLOBAL 388
581 < #define OPERATOR 389
582 < #define OPERS_BYPASS_CALLERID 390
583 < #define OPER_LOG 391
584 < #define OPER_ONLY_UMODES 392
585 < #define OPER_PASS_RESV 393
586 < #define OPER_SPY_T 394
587 < #define OPER_UMODES 395
588 < #define JOIN_FLOOD_COUNT 396
589 < #define JOIN_FLOOD_TIME 397
590 < #define PACE_WAIT 398
591 < #define PACE_WAIT_SIMPLE 399
592 < #define PASSWORD 400
593 < #define PATH 401
594 < #define PING_COOKIE 402
595 < #define PING_TIME 403
596 < #define PING_WARNING 404
597 < #define PORT 405
598 < #define QSTRING 406
599 < #define QUIET_ON_BAN 407
600 < #define REASON 408
601 < #define REDIRPORT 409
602 < #define REDIRSERV 410
603 < #define REGEX_T 411
604 < #define REHASH 412
605 < #define TREJECT_HOLD_TIME 413
606 < #define REMOTE 414
607 < #define REMOTEBAN 415
608 < #define RESTRICT_CHANNELS 416
609 < #define RESTRICTED 417
610 < #define RSA_PRIVATE_KEY_FILE 418
611 < #define RSA_PUBLIC_KEY_FILE 419
612 < #define SSL_CERTIFICATE_FILE 420
613 < #define T_SSL_CONNECTION_METHOD 421
614 < #define T_SSLV3 422
615 < #define T_TLSV1 423
616 < #define RESV 424
617 < #define RESV_EXEMPT 425
618 < #define SECONDS 426
619 < #define MINUTES 427
620 < #define HOURS 428
621 < #define DAYS 429
622 < #define WEEKS 430
623 < #define SENDQ 431
624 < #define SEND_PASSWORD 432
625 < #define SERVERHIDE 433
626 < #define SERVERINFO 434
627 < #define SERVLINK_PATH 435
628 < #define IRCD_SID 436
629 < #define TKLINE_EXPIRE_NOTICES 437
630 < #define T_SHARED 438
631 < #define T_CLUSTER 439
632 < #define TYPE 440
633 < #define SHORT_MOTD 441
634 < #define SILENT 442
635 < #define SPOOF 443
636 < #define SPOOF_NOTICE 444
637 < #define STATS_E_DISABLED 445
638 < #define STATS_I_OPER_ONLY 446
639 < #define STATS_K_OPER_ONLY 447
640 < #define STATS_O_OPER_ONLY 448
641 < #define STATS_P_OPER_ONLY 449
642 < #define TBOOL 450
643 < #define TMASKED 451
644 < #define T_REJECT 452
645 < #define TS_MAX_DELTA 453
646 < #define TS_WARN_DELTA 454
647 < #define TWODOTS 455
648 < #define T_ALL 456
649 < #define T_BOTS 457
650 < #define T_SOFTCALLERID 458
651 < #define T_CALLERID 459
652 < #define T_CCONN 460
653 < #define T_CCONN_FULL 461
654 < #define T_CLIENT_FLOOD 462
655 < #define T_DEAF 463
656 < #define T_DEBUG 464
657 < #define T_DRONE 465
658 < #define T_EXTERNAL 466
659 < #define T_FULL 467
660 < #define T_INVISIBLE 468
661 < #define T_IPV4 469
662 < #define T_IPV6 470
663 < #define T_LOCOPS 471
664 < #define T_LOGPATH 472
665 < #define T_L_CRIT 473
666 < #define T_L_DEBUG 474
667 < #define T_L_ERROR 475
668 < #define T_L_INFO 476
669 < #define T_L_NOTICE 477
670 < #define T_L_TRACE 478
671 < #define T_L_WARN 479
672 < #define T_MAX_CLIENTS 480
673 < #define T_NCHANGE 481
674 < #define T_OPERWALL 482
675 < #define T_REJ 483
676 < #define T_SERVER 484
677 < #define T_SERVNOTICE 485
693 < #define T_SKILL 486
694 < #define T_SPY 487
695 < #define T_SSL 488
696 < #define T_UMODES 489
697 < #define T_UNAUTH 490
698 < #define T_UNRESV 491
699 < #define T_UNXLINE 492
700 < #define T_GLOBOPS 493
701 < #define T_WALLOP 494
702 < #define T_SERVICE 495
703 < #define T_SERVICES_NAME 496
704 < #define THROTTLE_TIME 497
705 < #define TOPICBURST 498
706 < #define TRUE_NO_OPER_FLOOD 499
707 < #define TKLINE 500
708 < #define TXLINE 501
709 < #define TRESV 502
710 < #define UNKLINE 503
711 < #define USER 504
712 < #define USE_EGD 505
713 < #define USE_EXCEPT 506
714 < #define USE_INVEX 507
715 < #define USE_KNOCK 508
716 < #define USE_LOGGING 509
717 < #define USE_WHOIS_ACTUALLY 510
718 < #define VHOST 511
719 < #define VHOST6 512
720 < #define XLINE 513
721 < #define WARN 514
722 < #define WARN_NO_NLINE 515
723 <
724 <
725 <
451 > #define ADMIN 259
452 > #define AFTYPE 260
453 > #define ANTI_NICK_FLOOD 261
454 > #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
455 > #define AUTOCONN 263
456 > #define AWAY_COUNT 264
457 > #define AWAY_TIME 265
458 > #define BYTES 266
459 > #define KBYTES 267
460 > #define MBYTES 268
461 > #define CALLER_ID_WAIT 269
462 > #define CAN_FLOOD 270
463 > #define CHANNEL 271
464 > #define CIDR_BITLEN_IPV4 272
465 > #define CIDR_BITLEN_IPV6 273
466 > #define CLASS 274
467 > #define CONNECT 275
468 > #define CONNECTFREQ 276
469 > #define CYCLE_ON_HOST_CHANGE 277
470 > #define DEFAULT_FLOODCOUNT 278
471 > #define DEFAULT_SPLIT_SERVER_COUNT 279
472 > #define DEFAULT_SPLIT_USER_COUNT 280
473 > #define DENY 281
474 > #define DESCRIPTION 282
475 > #define DIE 283
476 > #define DISABLE_AUTH 284
477 > #define DISABLE_FAKE_CHANNELS 285
478 > #define DISABLE_REMOTE_COMMANDS 286
479 > #define DOTS_IN_IDENT 287
480 > #define EGDPOOL_PATH 288
481 > #define EMAIL 289
482 > #define ENCRYPTED 290
483 > #define EXCEED_LIMIT 291
484 > #define EXEMPT 292
485 > #define FAILED_OPER_NOTICE 293
486 > #define FLATTEN_LINKS 294
487 > #define GECOS 295
488 > #define GENERAL 296
489 > #define GLINE 297
490 > #define GLINE_DURATION 298
491 > #define GLINE_ENABLE 299
492 > #define GLINE_EXEMPT 300
493 > #define GLINE_MIN_CIDR 301
494 > #define GLINE_MIN_CIDR6 302
495 > #define GLINE_REQUEST_DURATION 303
496 > #define GLOBAL_KILL 304
497 > #define HAVENT_READ_CONF 305
498 > #define HIDDEN 306
499 > #define HIDDEN_NAME 307
500 > #define HIDE_CHANS 308
501 > #define HIDE_IDLE 309
502 > #define HIDE_IDLE_FROM_OPERS 310
503 > #define HIDE_SERVER_IPS 311
504 > #define HIDE_SERVERS 312
505 > #define HIDE_SERVICES 313
506 > #define HIDE_SPOOF_IPS 314
507 > #define HOST 315
508 > #define HUB 316
509 > #define HUB_MASK 317
510 > #define IGNORE_BOGUS_TS 318
511 > #define INVISIBLE_ON_CONNECT 319
512 > #define INVITE_CLIENT_COUNT 320
513 > #define INVITE_CLIENT_TIME 321
514 > #define IP 322
515 > #define IRCD_AUTH 323
516 > #define IRCD_FLAGS 324
517 > #define IRCD_SID 325
518 > #define JOIN_FLOOD_COUNT 326
519 > #define JOIN_FLOOD_TIME 327
520 > #define KILL 328
521 > #define KILL_CHASE_TIME_LIMIT 329
522 > #define KLINE 330
523 > #define KLINE_EXEMPT 331
524 > #define KNOCK_CLIENT_COUNT 332
525 > #define KNOCK_CLIENT_TIME 333
526 > #define KNOCK_DELAY_CHANNEL 334
527 > #define LEAF_MASK 335
528 > #define LINKS_DELAY 336
529 > #define LISTEN 337
530 > #define MASK 338
531 > #define MAX_ACCEPT 339
532 > #define MAX_BANS 340
533 > #define MAX_CHANNELS 341
534 > #define MAX_GLOBAL 342
535 > #define MAX_IDENT 343
536 > #define MAX_IDLE 344
537 > #define MAX_LOCAL 345
538 > #define MAX_NICK_CHANGES 346
539 > #define MAX_NICK_LENGTH 347
540 > #define MAX_NICK_TIME 348
541 > #define MAX_NUMBER 349
542 > #define MAX_TARGETS 350
543 > #define MAX_TOPIC_LENGTH 351
544 > #define MAX_WATCH 352
545 > #define MIN_IDLE 353
546 > #define MIN_NONWILDCARD 354
547 > #define MIN_NONWILDCARD_SIMPLE 355
548 > #define MODULE 356
549 > #define MODULES 357
550 > #define MOTD 358
551 > #define NAME 359
552 > #define NEED_IDENT 360
553 > #define NEED_PASSWORD 361
554 > #define NETWORK_DESC 362
555 > #define NETWORK_NAME 363
556 > #define NICK 364
557 > #define NO_CREATE_ON_SPLIT 365
558 > #define NO_JOIN_ON_SPLIT 366
559 > #define NO_OPER_FLOOD 367
560 > #define NO_TILDE 368
561 > #define NUMBER 369
562 > #define NUMBER_PER_CIDR 370
563 > #define NUMBER_PER_IP 371
564 > #define OPER_ONLY_UMODES 372
565 > #define OPER_PASS_RESV 373
566 > #define OPER_UMODES 374
567 > #define OPERATOR 375
568 > #define OPERS_BYPASS_CALLERID 376
569 > #define PACE_WAIT 377
570 > #define PACE_WAIT_SIMPLE 378
571 > #define PASSWORD 379
572 > #define PATH 380
573 > #define PING_COOKIE 381
574 > #define PING_TIME 382
575 > #define PORT 383
576 > #define QSTRING 384
577 > #define RANDOM_IDLE 385
578 > #define REASON 386
579 > #define REDIRPORT 387
580 > #define REDIRSERV 388
581 > #define REHASH 389
582 > #define REMOTE 390
583 > #define REMOTEBAN 391
584 > #define RESV 392
585 > #define RESV_EXEMPT 393
586 > #define RSA_PRIVATE_KEY_FILE 394
587 > #define RSA_PUBLIC_KEY_FILE 395
588 > #define SECONDS 396
589 > #define MINUTES 397
590 > #define HOURS 398
591 > #define DAYS 399
592 > #define WEEKS 400
593 > #define MONTHS 401
594 > #define YEARS 402
595 > #define SEND_PASSWORD 403
596 > #define SENDQ 404
597 > #define SERVERHIDE 405
598 > #define SERVERINFO 406
599 > #define SHORT_MOTD 407
600 > #define SPOOF 408
601 > #define SPOOF_NOTICE 409
602 > #define SQUIT 410
603 > #define SSL_CERTIFICATE_FILE 411
604 > #define SSL_CERTIFICATE_FINGERPRINT 412
605 > #define SSL_CONNECTION_REQUIRED 413
606 > #define SSL_DH_ELLIPTIC_CURVE 414
607 > #define SSL_DH_PARAM_FILE 415
608 > #define SSL_MESSAGE_DIGEST_ALGORITHM 416
609 > #define STATS_E_DISABLED 417
610 > #define STATS_I_OPER_ONLY 418
611 > #define STATS_K_OPER_ONLY 419
612 > #define STATS_O_OPER_ONLY 420
613 > #define STATS_P_OPER_ONLY 421
614 > #define STATS_U_OPER_ONLY 422
615 > #define T_ALL 423
616 > #define T_BOTS 424
617 > #define T_CALLERID 425
618 > #define T_CCONN 426
619 > #define T_CLUSTER 427
620 > #define T_DEAF 428
621 > #define T_DEBUG 429
622 > #define T_DLINE 430
623 > #define T_EXTERNAL 431
624 > #define T_FARCONNECT 432
625 > #define T_FILE 433
626 > #define T_FULL 434
627 > #define T_GLOBOPS 435
628 > #define T_INVISIBLE 436
629 > #define T_IPV4 437
630 > #define T_IPV6 438
631 > #define T_LOCOPS 439
632 > #define T_LOG 440
633 > #define T_MAX_CLIENTS 441
634 > #define T_NCHANGE 442
635 > #define T_NONONREG 443
636 > #define T_RECVQ 444
637 > #define T_REJ 445
638 > #define T_RESTART 446
639 > #define T_SERVER 447
640 > #define T_SERVICE 448
641 > #define T_SERVICES_NAME 449
642 > #define T_SERVNOTICE 450
643 > #define T_SET 451
644 > #define T_SHARED 452
645 > #define T_SIZE 453
646 > #define T_SKILL 454
647 > #define T_SOFTCALLERID 455
648 > #define T_SPY 456
649 > #define T_SSL 457
650 > #define T_SSL_CIPHER_LIST 458
651 > #define T_UMODES 459
652 > #define T_UNAUTH 460
653 > #define T_UNDLINE 461
654 > #define T_UNLIMITED 462
655 > #define T_UNRESV 463
656 > #define T_UNXLINE 464
657 > #define T_WALLOP 465
658 > #define T_WALLOPS 466
659 > #define T_WEBIRC 467
660 > #define TBOOL 468
661 > #define THROTTLE_COUNT 469
662 > #define THROTTLE_TIME 470
663 > #define TKLINE_EXPIRE_NOTICES 471
664 > #define TMASKED 472
665 > #define TRUE_NO_OPER_FLOOD 473
666 > #define TS_MAX_DELTA 474
667 > #define TS_WARN_DELTA 475
668 > #define TWODOTS 476
669 > #define TYPE 477
670 > #define UNKLINE 478
671 > #define USE_EGD 479
672 > #define USE_LOGGING 480
673 > #define USER 481
674 > #define VHOST 482
675 > #define VHOST6 483
676 > #define WARN_NO_CONNECT_BLOCK 484
677 > #define XLINE 485
678  
679 + /* Value type.  */
680   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
681 < typedef union YYSTYPE
681 > typedef union YYSTYPE YYSTYPE;
682 > union YYSTYPE
683   {
684 <
731 < /* Line 293 of yacc.c  */
732 < #line 131 "ircd_parser.y"
684 > #line 147 "conf_parser.y" /* yacc.c:355  */
685  
686    int number;
687    char *string;
688  
689 <
690 <
739 < /* Line 293 of yacc.c  */
740 < #line 741 "ircd_parser.c"
741 < } YYSTYPE;
689 > #line 690 "conf_parser.c" /* yacc.c:355  */
690 > };
691   # define YYSTYPE_IS_TRIVIAL 1
743 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
692   # define YYSTYPE_IS_DECLARED 1
693   #endif
694  
695  
696 < /* Copy the second part of user declarations.  */
696 > extern YYSTYPE yylval;
697  
698 + int yyparse (void);
699  
700 < /* Line 343 of yacc.c  */
701 < #line 753 "ircd_parser.c"
700 > #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
701 >
702 > /* Copy the second part of user declarations.  */
703 >
704 > #line 705 "conf_parser.c" /* yacc.c:358  */
705  
706   #ifdef short
707   # undef short
# Line 763 | Line 715 | typedef unsigned char yytype_uint8;
715  
716   #ifdef YYTYPE_INT8
717   typedef YYTYPE_INT8 yytype_int8;
766 #elif (defined __STDC__ || defined __C99__FUNC__ \
767     || defined __cplusplus || defined _MSC_VER)
768 typedef signed char yytype_int8;
718   #else
719 < typedef short int yytype_int8;
719 > typedef signed char yytype_int8;
720   #endif
721  
722   #ifdef YYTYPE_UINT16
# Line 787 | Line 736 | typedef short int yytype_int16;
736   #  define YYSIZE_T __SIZE_TYPE__
737   # elif defined size_t
738   #  define YYSIZE_T size_t
739 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
791 <     || defined __cplusplus || defined _MSC_VER)
739 > # elif ! defined YYSIZE_T
740   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
741   #  define YYSIZE_T size_t
742   # else
# Line 802 | Line 750 | typedef short int yytype_int16;
750   # if defined YYENABLE_NLS && YYENABLE_NLS
751   #  if ENABLE_NLS
752   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
753 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
753 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
754   #  endif
755   # endif
756   # ifndef YY_
757 < #  define YY_(msgid) msgid
757 > #  define YY_(Msgid) Msgid
758 > # endif
759 > #endif
760 >
761 > #ifndef YY_ATTRIBUTE
762 > # if (defined __GNUC__                                               \
763 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
764 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
765 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
766 > # else
767 > #  define YY_ATTRIBUTE(Spec) /* empty */
768 > # endif
769 > #endif
770 >
771 > #ifndef YY_ATTRIBUTE_PURE
772 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
773 > #endif
774 >
775 > #ifndef YY_ATTRIBUTE_UNUSED
776 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
777 > #endif
778 >
779 > #if !defined _Noreturn \
780 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
781 > # if defined _MSC_VER && 1200 <= _MSC_VER
782 > #  define _Noreturn __declspec (noreturn)
783 > # else
784 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
785   # endif
786   #endif
787  
788   /* Suppress unused-variable warnings by "using" E.  */
789   #if ! defined lint || defined __GNUC__
790 < # define YYUSE(e) ((void) (e))
790 > # define YYUSE(E) ((void) (E))
791   #else
792 < # define YYUSE(e) /* empty */
792 > # define YYUSE(E) /* empty */
793   #endif
794  
795 < /* Identity function, used to suppress warnings about constant conditions.  */
796 < #ifndef lint
797 < # define YYID(n) (n)
795 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
796 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
797 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
798 >    _Pragma ("GCC diagnostic push") \
799 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
800 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
801 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
802 >    _Pragma ("GCC diagnostic pop")
803   #else
804 < #if (defined __STDC__ || defined __C99__FUNC__ \
825 <     || defined __cplusplus || defined _MSC_VER)
826 < static int
827 < YYID (int yyi)
828 < #else
829 < static int
830 < YYID (yyi)
831 <    int yyi;
804 > # define YY_INITIAL_VALUE(Value) Value
805   #endif
806 < {
807 <  return yyi;
808 < }
806 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
807 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
808 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
809   #endif
810 + #ifndef YY_INITIAL_VALUE
811 + # define YY_INITIAL_VALUE(Value) /* Nothing. */
812 + #endif
813 +
814  
815   #if ! defined yyoverflow || YYERROR_VERBOSE
816  
# Line 852 | Line 829 | YYID (yyi)
829   #    define alloca _alloca
830   #   else
831   #    define YYSTACK_ALLOC alloca
832 < #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
856 <     || defined __cplusplus || defined _MSC_VER)
832 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
833   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
834 +      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
835   #     ifndef EXIT_SUCCESS
836   #      define EXIT_SUCCESS 0
837   #     endif
# Line 864 | Line 841 | YYID (yyi)
841   # endif
842  
843   # ifdef YYSTACK_ALLOC
844 <   /* Pacify GCC's `empty if-body' warning.  */
845 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
844 >   /* Pacify GCC's 'empty if-body' warning.  */
845 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
846   #  ifndef YYSTACK_ALLOC_MAXIMUM
847      /* The OS might guarantee only one guard page at the bottom of the stack,
848         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 881 | Line 858 | YYID (yyi)
858   #  endif
859   #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
860         && ! ((defined YYMALLOC || defined malloc) \
861 <             && (defined YYFREE || defined free)))
861 >             && (defined YYFREE || defined free)))
862   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
863   #   ifndef EXIT_SUCCESS
864   #    define EXIT_SUCCESS 0
# Line 889 | Line 866 | YYID (yyi)
866   #  endif
867   #  ifndef YYMALLOC
868   #   define YYMALLOC malloc
869 < #   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
893 <     || defined __cplusplus || defined _MSC_VER)
869 > #   if ! defined malloc && ! defined EXIT_SUCCESS
870   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
871   #   endif
872   #  endif
873   #  ifndef YYFREE
874   #   define YYFREE free
875 < #   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
900 <     || defined __cplusplus || defined _MSC_VER)
875 > #   if ! defined free && ! defined EXIT_SUCCESS
876   void free (void *); /* INFRINGES ON USER NAME SPACE */
877   #   endif
878   #  endif
# Line 907 | Line 882 | void free (void *); /* INFRINGES ON USER
882  
883   #if (! defined yyoverflow \
884       && (! defined __cplusplus \
885 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
885 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
886  
887   /* A type that is properly aligned for any stack member.  */
888   union yyalloc
# Line 932 | Line 907 | union yyalloc
907     elements in the stack, and YYPTR gives the new location of the
908     stack.  Advance YYPTR to a properly aligned location for the next
909     stack.  */
910 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
911 <    do                                                                  \
912 <      {                                                                 \
913 <        YYSIZE_T yynewbytes;                                            \
914 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
915 <        Stack = &yyptr->Stack_alloc;                                    \
916 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
917 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
918 <      }                                                                 \
919 <    while (YYID (0))
910 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
911 >    do                                                                  \
912 >      {                                                                 \
913 >        YYSIZE_T yynewbytes;                                            \
914 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
915 >        Stack = &yyptr->Stack_alloc;                                    \
916 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
917 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
918 >      }                                                                 \
919 >    while (0)
920  
921   #endif
922  
923   #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
924 < /* Copy COUNT objects from FROM to TO.  The source and destination do
924 > /* Copy COUNT objects from SRC to DST.  The source and destination do
925     not overlap.  */
926   # ifndef YYCOPY
927   #  if defined __GNUC__ && 1 < __GNUC__
928 < #   define YYCOPY(To, From, Count) \
929 <      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
928 > #   define YYCOPY(Dst, Src, Count) \
929 >      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
930   #  else
931 < #   define YYCOPY(To, From, Count)              \
932 <      do                                        \
933 <        {                                       \
934 <          YYSIZE_T yyi;                         \
935 <          for (yyi = 0; yyi < (Count); yyi++)   \
936 <            (To)[yyi] = (From)[yyi];            \
937 <        }                                       \
938 <      while (YYID (0))
931 > #   define YYCOPY(Dst, Src, Count)              \
932 >      do                                        \
933 >        {                                       \
934 >          YYSIZE_T yyi;                         \
935 >          for (yyi = 0; yyi < (Count); yyi++)   \
936 >            (Dst)[yyi] = (Src)[yyi];            \
937 >        }                                       \
938 >      while (0)
939   #  endif
940   # endif
941   #endif /* !YYCOPY_NEEDED */
# Line 968 | Line 943 | union yyalloc
943   /* YYFINAL -- State number of the termination state.  */
944   #define YYFINAL  2
945   /* YYLAST -- Last index in YYTABLE.  */
946 < #define YYLAST   1270
946 > #define YYLAST   1371
947  
948   /* YYNTOKENS -- Number of terminals.  */
949 < #define YYNTOKENS  266
949 > #define YYNTOKENS  237
950   /* YYNNTS -- Number of nonterminals.  */
951 < #define YYNNTS  322
951 > #define YYNNTS  291
952   /* YYNRULES -- Number of rules.  */
953 < #define YYNRULES  694
954 < /* YYNRULES -- Number of states.  */
955 < #define YYNSTATES  1368
953 > #define YYNRULES  657
954 > /* YYNSTATES -- Number of states.  */
955 > #define YYNSTATES  1298
956  
957 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
957 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
958 >   by yylex, with out-of-bounds checking.  */
959   #define YYUNDEFTOK  2
960 < #define YYMAXUTOK   515
960 > #define YYMAXUTOK   485
961  
962 < #define YYTRANSLATE(YYX)                                                \
962 > #define YYTRANSLATE(YYX)                                                \
963    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
964  
965 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
966 < static const yytype_uint16 yytranslate[] =
965 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
966 >   as returned by yylex, without out-of-bounds checking.  */
967 > static const yytype_uint8 yytranslate[] =
968   {
969         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
970         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
971         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
972         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
973 <       2,     2,     2,     2,   265,     2,     2,     2,     2,     2,
974 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   261,
975 <       2,   264,     2,     2,     2,     2,     2,     2,     2,     2,
973 >       2,     2,     2,     2,   235,     2,     2,     2,     2,     2,
974 >       2,     2,     2,     2,     2,     2,     2,     2,   236,   231,
975 >       2,   234,     2,     2,     2,     2,     2,     2,     2,     2,
976         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
977         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
978         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
979         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
980         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
981 <       2,     2,     2,   263,     2,   262,     2,     2,     2,     2,
981 >       2,     2,     2,   233,     2,   232,     2,     2,     2,     2,
982         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
983         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
984         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 1037 | Line 1014 | static const yytype_uint16 yytranslate[]
1014       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1015       205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1016       215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1017 <     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
1041 <     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
1042 <     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
1043 <     255,   256,   257,   258,   259,   260
1017 >     225,   226,   227,   228,   229,   230
1018   };
1019  
1020   #if YYDEBUG
1021 < /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
1048 <   YYRHS.  */
1049 < static const yytype_uint16 yyprhs[] =
1050 < {
1051 <       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
1052 <      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
1053 <      39,    41,    43,    45,    47,    49,    52,    55,    56,    58,
1054 <      61,    65,    69,    73,    77,    81,    82,    84,    87,    91,
1055 <      95,    99,   105,   108,   110,   112,   114,   117,   122,   127,
1056 <     133,   136,   138,   140,   142,   144,   146,   148,   150,   152,
1057 <     154,   156,   158,   160,   162,   165,   166,   172,   176,   178,
1058 <     180,   182,   187,   192,   197,   202,   207,   212,   217,   222,
1059 <     227,   232,   237,   243,   246,   248,   250,   252,   254,   257,
1060 <     262,   267,   272,   278,   281,   283,   285,   287,   289,   291,
1061 <     293,   295,   297,   299,   301,   303,   305,   307,   310,   315,
1062 <     320,   325,   330,   335,   340,   345,   350,   355,   360,   365,
1063 <     370,   375,   380,   385,   390,   395,   400,   401,   409,   410,
1064 <     412,   415,   417,   419,   421,   423,   425,   427,   429,   431,
1065 <     433,   436,   441,   443,   448,   453,   458,   463,   468,   469,
1066 <     475,   479,   481,   483,   485,   487,   489,   491,   493,   495,
1067 <     497,   499,   501,   503,   505,   507,   509,   511,   513,   515,
1068 <     517,   519,   520,   526,   530,   532,   533,   537,   538,   541,
1069 <     543,   545,   547,   549,   551,   553,   555,   557,   559,   561,
1070 <     563,   565,   567,   569,   571,   573,   575,   576,   584,   585,
1071 <     587,   590,   592,   594,   596,   598,   600,   602,   604,   606,
1072 <     608,   610,   612,   614,   616,   618,   621,   626,   628,   633,
1073 <     638,   643,   648,   653,   658,   663,   668,   673,   678,   683,
1074 <     688,   689,   696,   697,   703,   707,   709,   711,   713,   715,
1075 <     718,   720,   722,   724,   726,   728,   731,   732,   738,   742,
1076 <     744,   746,   750,   755,   760,   761,   768,   771,   773,   775,
1077 <     777,   779,   781,   783,   785,   787,   789,   792,   797,   802,
1078 <     807,   812,   813,   819,   823,   825,   826,   830,   831,   834,
1079 <     836,   838,   840,   842,   844,   846,   848,   850,   852,   857,
1080 <     862,   867,   868,   875,   878,   880,   882,   884,   886,   889,
1081 <     894,   899,   904,   910,   913,   915,   917,   919,   924,   925,
1082 <     932,   935,   937,   939,   941,   943,   946,   951,   956,   957,
1083 <     963,   967,   969,   971,   973,   975,   977,   979,   981,   983,
1084 <     985,   987,   989,   991,   992,   999,  1002,  1004,  1006,  1008,
1085 <    1011,  1016,  1017,  1023,  1027,  1029,  1031,  1033,  1035,  1037,
1086 <    1039,  1041,  1043,  1045,  1047,  1049,  1051,  1052,  1060,  1061,
1087 <    1063,  1066,  1068,  1070,  1072,  1074,  1076,  1078,  1080,  1082,
1088 <    1084,  1086,  1088,  1090,  1092,  1094,  1096,  1099,  1104,  1106,
1089 <    1111,  1116,  1121,  1126,  1131,  1136,  1141,  1142,  1148,  1152,
1090 <    1154,  1155,  1159,  1160,  1163,  1165,  1167,  1169,  1171,  1173,
1091 <    1178,  1183,  1188,  1193,  1198,  1203,  1204,  1211,  1212,  1218,
1092 <    1222,  1224,  1226,  1229,  1231,  1233,  1235,  1237,  1239,  1244,
1093 <    1249,  1250,  1257,  1260,  1262,  1264,  1266,  1268,  1273,  1278,
1094 <    1284,  1287,  1289,  1291,  1293,  1298,  1299,  1306,  1307,  1313,
1095 <    1317,  1319,  1321,  1324,  1326,  1328,  1330,  1332,  1334,  1339,
1096 <    1344,  1350,  1353,  1355,  1357,  1359,  1361,  1363,  1365,  1367,
1097 <    1369,  1371,  1373,  1375,  1377,  1379,  1381,  1383,  1385,  1387,
1098 <    1389,  1391,  1393,  1395,  1397,  1399,  1401,  1403,  1405,  1407,
1099 <    1409,  1411,  1413,  1415,  1417,  1419,  1421,  1423,  1425,  1427,
1100 <    1429,  1431,  1433,  1435,  1437,  1439,  1441,  1443,  1445,  1447,
1101 <    1449,  1451,  1453,  1455,  1457,  1459,  1461,  1463,  1465,  1467,
1102 <    1472,  1477,  1482,  1487,  1492,  1497,  1502,  1507,  1512,  1517,
1103 <    1522,  1527,  1532,  1537,  1542,  1547,  1552,  1557,  1562,  1567,
1104 <    1572,  1577,  1582,  1587,  1592,  1597,  1602,  1607,  1612,  1617,
1105 <    1622,  1627,  1632,  1637,  1642,  1647,  1652,  1657,  1662,  1667,
1106 <    1672,  1677,  1682,  1687,  1692,  1697,  1702,  1707,  1712,  1717,
1107 <    1722,  1723,  1729,  1733,  1735,  1737,  1739,  1741,  1743,  1745,
1108 <    1747,  1749,  1751,  1753,  1755,  1757,  1759,  1761,  1763,  1765,
1109 <    1767,  1769,  1771,  1773,  1774,  1780,  1784,  1786,  1788,  1790,
1110 <    1792,  1794,  1796,  1798,  1800,  1802,  1804,  1806,  1808,  1810,
1111 <    1812,  1814,  1816,  1818,  1820,  1822,  1824,  1829,  1834,  1839,
1112 <    1844,  1845,  1852,  1855,  1857,  1859,  1861,  1863,  1865,  1867,
1113 <    1869,  1871,  1876,  1881,  1882,  1888,  1892,  1894,  1896,  1898,
1114 <    1903,  1908,  1909,  1915,  1919,  1921,  1923,  1925,  1931,  1934,
1115 <    1936,  1938,  1940,  1942,  1944,  1946,  1948,  1950,  1952,  1954,
1116 <    1956,  1958,  1960,  1962,  1964,  1966,  1968,  1970,  1972,  1974,
1117 <    1979,  1984,  1989,  1994,  1999,  2004,  2009,  2014,  2019,  2024,
1118 <    2029,  2034,  2039,  2044,  2049,  2054,  2059,  2064,  2070,  2073,
1119 <    2075,  2077,  2079,  2081,  2083,  2085,  2087,  2089,  2091,  2096,
1120 <    2101,  2106,  2111,  2116,  2121
1121 < };
1122 <
1123 < /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
1124 < static const yytype_int16 yyrhs[] =
1125 < {
1126 <     267,     0,    -1,    -1,   267,   268,    -1,   296,    -1,   302,
1127 <      -1,   317,    -1,   557,    -1,   340,    -1,   359,    -1,   373,
1128 <      -1,   278,    -1,   578,    -1,   391,    -1,   398,    -1,   402,
1129 <      -1,   412,    -1,   421,    -1,   447,    -1,   457,    -1,   463,
1130 <      -1,   477,    -1,   541,    -1,   467,    -1,   273,    -1,     1,
1131 <     261,    -1,     1,   262,    -1,    -1,   270,    -1,   129,   269,
1132 <      -1,   129,   171,   269,    -1,   129,   172,   269,    -1,   129,
1133 <     173,   269,    -1,   129,   174,   269,    -1,   129,   175,   269,
1134 <      -1,    -1,   272,    -1,   129,   271,    -1,   129,    14,   271,
1135 <      -1,   129,    15,   271,    -1,   129,    16,   271,    -1,   117,
1136 <     263,   274,   262,   261,    -1,   274,   275,    -1,   275,    -1,
1137 <     276,    -1,   277,    -1,     1,   261,    -1,   116,   264,   151,
1138 <     261,    -1,   146,   264,   151,   261,    -1,   179,   263,   279,
1139 <     262,   261,    -1,   279,   280,    -1,   280,    -1,   287,    -1,
1140 <     292,    -1,   295,    -1,   289,    -1,   290,    -1,   291,    -1,
1141 <     294,    -1,   286,    -1,   293,    -1,   288,    -1,   285,    -1,
1142 <     281,    -1,     1,   261,    -1,    -1,   166,   282,   264,   283,
1143 <     261,    -1,   283,   265,   284,    -1,   284,    -1,   167,    -1,
1144 <     168,    -1,   165,   264,   151,   261,    -1,   163,   264,   151,
1145 <     261,    -1,   118,   264,   151,   261,    -1,   181,   264,   151,
1146 <     261,    -1,    36,   264,   151,   261,    -1,   121,   264,   151,
1147 <     261,    -1,   120,   264,   151,   261,    -1,   256,   264,   151,
1148 <     261,    -1,   257,   264,   151,   261,    -1,   225,   264,   129,
1149 <     261,    -1,    83,   264,   195,   261,    -1,     5,   263,   297,
1150 <     262,   261,    -1,   297,   298,    -1,   298,    -1,   299,    -1,
1151 <     301,    -1,   300,    -1,     1,   261,    -1,   118,   264,   151,
1152 <     261,    -1,    46,   264,   151,   261,    -1,    36,   264,   151,
1153 <     261,    -1,   100,   263,   303,   262,   261,    -1,   303,   304,
1154 <      -1,   304,    -1,   305,    -1,   306,    -1,   315,    -1,   316,
1155 <      -1,   307,    -1,   309,    -1,   311,    -1,   312,    -1,   314,
1156 <      -1,   310,    -1,   313,    -1,   308,    -1,     1,   261,    -1,
1157 <     217,   264,   151,   261,    -1,   136,   264,   151,   261,    -1,
1158 <      61,   264,   151,   261,    -1,    54,   264,   151,   261,    -1,
1159 <      59,   264,   151,   261,    -1,    60,   264,   151,   261,    -1,
1160 <      57,   264,   151,   261,    -1,    56,   264,   151,   261,    -1,
1161 <      58,   264,   151,   261,    -1,    55,   264,   151,   261,    -1,
1162 <     101,   264,   218,   261,    -1,   101,   264,   220,   261,    -1,
1163 <     101,   264,   224,   261,    -1,   101,   264,   222,   261,    -1,
1164 <     101,   264,   223,   261,    -1,   101,   264,   221,   261,    -1,
1165 <     101,   264,   219,   261,    -1,   254,   264,   195,   261,    -1,
1166 <      -1,   134,   318,   319,   263,   320,   262,   261,    -1,    -1,
1167 <     323,    -1,   320,   321,    -1,   321,    -1,   322,    -1,   324,
1168 <      -1,   325,    -1,   329,    -1,   328,    -1,   326,    -1,   327,
1169 <      -1,   333,    -1,     1,   261,    -1,   118,   264,   151,   261,
1170 <      -1,   151,    -1,   249,   264,   151,   261,    -1,   145,   264,
1171 <     151,   261,    -1,    48,   264,   195,   261,    -1,   164,   264,
1172 <     151,   261,    -1,    25,   264,   151,   261,    -1,    -1,   234,
1173 <     330,   264,   331,   261,    -1,   331,   265,   332,    -1,   332,
1174 <      -1,   202,    -1,   205,    -1,   206,    -1,   208,    -1,   209,
1175 <      -1,   212,    -1,   231,    -1,   226,    -1,   228,    -1,   235,
1176 <      -1,   232,    -1,   211,    -1,   227,    -1,   230,    -1,   213,
1177 <      -1,   239,    -1,   203,    -1,   204,    -1,   216,    -1,    -1,
1178 <      52,   334,   264,   335,   261,    -1,   335,   265,   336,    -1,
1179 <     336,    -1,    -1,   128,   337,   339,    -1,    -1,   338,   339,
1180 <      -1,    71,    -1,   159,    -1,    90,    -1,   248,    -1,   258,
1181 <      -1,    64,    -1,    37,    -1,   157,    -1,     5,    -1,    76,
1182 <      -1,   123,    -1,   227,    -1,   238,    -1,   139,    -1,    78,
1183 <      -1,   160,    -1,    48,    -1,    -1,    25,   341,   342,   263,
1184 <     343,   262,   261,    -1,    -1,   346,    -1,   343,   344,    -1,
1185 <     344,    -1,   345,    -1,   356,    -1,   357,    -1,   347,    -1,
1186 <     348,    -1,   358,    -1,   349,    -1,   350,    -1,   351,    -1,
1187 <     352,    -1,   353,    -1,   354,    -1,   355,    -1,     1,   261,
1188 <      -1,   118,   264,   151,   261,    -1,   151,    -1,   148,   264,
1189 <     270,   261,    -1,   149,   264,   270,   261,    -1,   132,   264,
1190 <     129,   261,    -1,    29,   264,   270,   261,    -1,   110,   264,
1191 <     129,   261,    -1,   105,   264,   129,   261,    -1,   107,   264,
1192 <     129,   261,    -1,   106,   264,   129,   261,    -1,   176,   264,
1193 <     272,   261,    -1,    22,   264,   129,   261,    -1,    23,   264,
1194 <     129,   261,    -1,   131,   264,   129,   261,    -1,    -1,    98,
1195 <     360,   263,   365,   262,   261,    -1,    -1,    52,   362,   264,
1196 <     363,   261,    -1,   363,   265,   364,    -1,   364,    -1,   233,
1197 <      -1,    75,    -1,   229,    -1,   365,   366,    -1,   366,    -1,
1198 <     367,    -1,   361,    -1,   371,    -1,   372,    -1,     1,   261,
1199 <      -1,    -1,   150,   264,   369,   368,   261,    -1,   369,   265,
1200 <     370,    -1,   370,    -1,   129,    -1,   129,   200,   129,    -1,
1201 <      87,   264,   151,   261,    -1,    82,   264,   151,   261,    -1,
1202 <      -1,    72,   374,   263,   375,   262,   261,    -1,   375,   376,
1203 <      -1,   376,    -1,   377,    -1,   378,    -1,   379,    -1,   381,
1204 <      -1,   388,    -1,   389,    -1,   390,    -1,   380,    -1,     1,
1205 <     261,    -1,   249,   264,   151,   261,    -1,   145,   264,   151,
1206 <     261,    -1,    25,   264,   151,   261,    -1,    48,   264,   195,
1207 <     261,    -1,    -1,    52,   382,   264,   383,   261,    -1,   383,
1208 <     265,   384,    -1,   384,    -1,    -1,   128,   385,   387,    -1,
1209 <      -1,   386,   387,    -1,   189,    -1,    49,    -1,    91,    -1,
1210 <      73,    -1,    20,    -1,   127,    -1,    66,    -1,   170,    -1,
1211 <     119,    -1,   188,   264,   151,   261,    -1,   155,   264,   151,
1212 <     261,    -1,   154,   264,   129,   261,    -1,    -1,   169,   392,
1213 <     263,   393,   262,   261,    -1,   393,   394,    -1,   394,    -1,
1214 <     395,    -1,   396,    -1,   397,    -1,     1,   261,    -1,   153,
1215 <     264,   151,   261,    -1,    21,   264,   151,   261,    -1,   122,
1216 <     264,   151,   261,    -1,   240,   263,   399,   262,   261,    -1,
1217 <     399,   400,    -1,   400,    -1,   401,    -1,     1,    -1,   118,
1218 <     264,   151,   261,    -1,    -1,   183,   403,   263,   404,   262,
1219 <     261,    -1,   404,   405,    -1,   405,    -1,   406,    -1,   407,
1220 <      -1,   408,    -1,     1,   261,    -1,   118,   264,   151,   261,
1221 <      -1,   249,   264,   151,   261,    -1,    -1,   185,   409,   264,
1222 <     410,   261,    -1,   410,   265,   411,    -1,   411,    -1,    90,
1223 <      -1,   245,    -1,   248,    -1,   258,    -1,   246,    -1,   237,
1224 <      -1,   169,    -1,   247,    -1,   236,    -1,   216,    -1,   201,
1225 <      -1,    -1,   184,   413,   263,   414,   262,   261,    -1,   414,
1226 <     415,    -1,   415,    -1,   416,    -1,   417,    -1,     1,   261,
1227 <      -1,   118,   264,   151,   261,    -1,    -1,   185,   418,   264,
1228 <     419,   261,    -1,   419,   265,   420,    -1,   420,    -1,    90,
1229 <      -1,   245,    -1,   248,    -1,   258,    -1,   246,    -1,   237,
1230 <      -1,   169,    -1,   247,    -1,   236,    -1,   216,    -1,   201,
1231 <      -1,    -1,    28,   422,   423,   263,   424,   262,   261,    -1,
1232 <      -1,   427,    -1,   424,   425,    -1,   425,    -1,   426,    -1,
1233 <     428,    -1,   429,    -1,   430,    -1,   431,    -1,   433,    -1,
1234 <     432,    -1,   434,    -1,   443,    -1,   444,    -1,   445,    -1,
1235 <     442,    -1,   441,    -1,   446,    -1,     1,   261,    -1,   118,
1236 <     264,   151,   261,    -1,   151,    -1,    82,   264,   151,   261,
1237 <      -1,   256,   264,   151,   261,    -1,   177,   264,   151,   261,
1238 <      -1,     3,   264,   151,   261,    -1,   150,   264,   129,   261,
1239 <      -1,     6,   264,   214,   261,    -1,     6,   264,   215,   261,
1240 <      -1,    -1,    52,   435,   264,   436,   261,    -1,   436,   265,
1241 <     437,    -1,   437,    -1,    -1,   128,   438,   440,    -1,    -1,
1242 <     439,   440,    -1,    26,    -1,    30,    -1,    10,    -1,    12,
1243 <      -1,   243,    -1,   164,   264,   151,   261,    -1,    48,   264,
1244 <     195,   261,    -1,    84,   264,   151,   261,    -1,    96,   264,
1245 <     151,   261,    -1,    25,   264,   151,   261,    -1,    24,   264,
1246 <     151,   261,    -1,    -1,    88,   448,   263,   453,   262,   261,
1247 <      -1,    -1,   185,   450,   264,   451,   261,    -1,   451,   265,
1248 <     452,    -1,   452,    -1,   156,    -1,   453,   454,    -1,   454,
1249 <      -1,   455,    -1,   456,    -1,   449,    -1,     1,    -1,   249,
1250 <     264,   151,   261,    -1,   153,   264,   151,   261,    -1,    -1,
1251 <      35,   458,   263,   459,   262,   261,    -1,   459,   460,    -1,
1252 <     460,    -1,   461,    -1,   462,    -1,     1,    -1,    87,   264,
1253 <     151,   261,    -1,   153,   264,   151,   261,    -1,    50,   263,
1254 <     464,   262,   261,    -1,   464,   465,    -1,   465,    -1,   466,
1255 <      -1,     1,    -1,    87,   264,   151,   261,    -1,    -1,    62,
1256 <     468,   263,   473,   262,   261,    -1,    -1,   185,   470,   264,
1257 <     471,   261,    -1,   471,   265,   472,    -1,   472,    -1,   156,
1258 <      -1,   473,   474,    -1,   474,    -1,   475,    -1,   476,    -1,
1259 <     469,    -1,     1,    -1,   118,   264,   151,   261,    -1,   153,
1260 <     264,   151,   261,    -1,    63,   263,   478,   262,   261,    -1,
1261 <     478,   479,    -1,   479,    -1,   488,    -1,   489,    -1,   491,
1262 <      -1,   492,    -1,   493,    -1,   494,    -1,   495,    -1,   496,
1263 <      -1,   497,    -1,   498,    -1,   487,    -1,   500,    -1,   501,
1264 <      -1,   502,    -1,   503,    -1,   518,    -1,   505,    -1,   507,
1265 <      -1,   509,    -1,   508,    -1,   512,    -1,   506,    -1,   513,
1266 <      -1,   514,    -1,   515,    -1,   516,    -1,   517,    -1,   533,
1267 <      -1,   519,    -1,   523,    -1,   524,    -1,   529,    -1,   510,
1268 <      -1,   511,    -1,   539,    -1,   537,    -1,   538,    -1,   520,
1269 <      -1,   490,    -1,   521,    -1,   522,    -1,   540,    -1,   528,
1270 <      -1,   499,    -1,   526,    -1,   527,    -1,   483,    -1,   486,
1271 <      -1,   481,    -1,   482,    -1,   484,    -1,   485,    -1,   504,
1272 <      -1,   480,    -1,   525,    -1,     1,    -1,   112,   264,   129,
1273 <     261,    -1,    69,   264,   129,   261,    -1,    70,   264,   129,
1274 <     261,    -1,    12,   264,   195,   261,    -1,   255,   264,   195,
1275 <     261,    -1,   158,   264,   270,   261,    -1,   182,   264,   195,
1276 <     261,    -1,    89,   264,   270,   261,    -1,    81,   264,   195,
1277 <     261,    -1,    85,   264,   195,   261,    -1,    42,   264,   195,
1278 <     261,    -1,    51,   264,   195,   261,    -1,     8,   264,   195,
1279 <     261,    -1,   109,   264,   270,   261,    -1,   108,   264,   129,
1280 <     261,    -1,   102,   264,   129,   261,    -1,     9,   264,   270,
1281 <     261,    -1,   199,   264,   270,   261,    -1,   198,   264,   270,
1282 <     261,    -1,    74,   264,   129,   261,    -1,    93,   264,   195,
1283 <     261,    -1,    92,   264,   151,   261,    -1,    86,   264,   195,
1284 <     261,    -1,   260,   264,   195,   261,    -1,   190,   264,   195,
1285 <     261,    -1,   193,   264,   195,   261,    -1,   194,   264,   195,
1286 <     261,    -1,   192,   264,   195,   261,    -1,   192,   264,   196,
1287 <     261,    -1,   191,   264,   195,   261,    -1,   191,   264,   196,
1288 <     261,    -1,   143,   264,   270,   261,    -1,    19,   264,   270,
1289 <     261,    -1,   135,   264,   195,   261,    -1,   144,   264,   270,
1290 <     261,    -1,   186,   264,   195,   261,    -1,   126,   264,   195,
1291 <     261,    -1,   244,   264,   195,   261,    -1,   138,   264,   195,
1292 <     261,    -1,   113,   264,   151,   261,    -1,    43,   264,   129,
1293 <     261,    -1,   111,   264,   129,   261,    -1,   180,   264,   151,
1294 <     261,    -1,    31,   264,   151,   261,    -1,    27,   264,   129,
1295 <     261,    -1,   250,   264,   195,   261,    -1,    45,   264,   151,
1296 <     261,    -1,   241,   264,   151,   261,    -1,   147,   264,   195,
1297 <     261,    -1,    38,   264,   195,   261,    -1,   242,   264,   270,
1298 <     261,    -1,    -1,   140,   530,   264,   531,   261,    -1,   531,
1299 <     265,   532,    -1,   532,    -1,   202,    -1,   205,    -1,   206,
1300 <      -1,   208,    -1,   209,    -1,   212,    -1,   231,    -1,   226,
1301 <      -1,   228,    -1,   235,    -1,   232,    -1,   211,    -1,   227,
1302 <      -1,   230,    -1,   213,    -1,   239,    -1,   203,    -1,   204,
1303 <      -1,   216,    -1,    -1,   137,   534,   264,   535,   261,    -1,
1304 <     535,   265,   536,    -1,   536,    -1,   202,    -1,   205,    -1,
1305 <     206,    -1,   208,    -1,   209,    -1,   212,    -1,   231,    -1,
1306 <     226,    -1,   228,    -1,   235,    -1,   232,    -1,   211,    -1,
1307 <     227,    -1,   230,    -1,   213,    -1,   239,    -1,   203,    -1,
1308 <     204,    -1,   216,    -1,   114,   264,   129,   261,    -1,   115,
1309 <     264,   129,   261,    -1,    32,   264,   129,   261,    -1,   207,
1310 <     264,   272,   261,    -1,    -1,    65,   542,   263,   543,   262,
1311 <     261,    -1,   543,   544,    -1,   544,    -1,   545,    -1,   546,
1312 <      -1,   547,    -1,   551,    -1,   552,    -1,   553,    -1,     1,
1313 <      -1,    47,   264,   195,   261,    -1,    44,   264,   270,   261,
1314 <      -1,    -1,   100,   548,   264,   549,   261,    -1,   549,   265,
1315 <     550,    -1,   550,    -1,   197,    -1,    11,    -1,   249,   264,
1316 <     151,   261,    -1,   118,   264,   151,   261,    -1,    -1,     4,
1317 <     554,   264,   555,   261,    -1,   555,   265,   556,    -1,   556,
1318 <      -1,   197,    -1,    11,    -1,    21,   263,   558,   262,   261,
1319 <      -1,   558,   559,    -1,   559,    -1,   562,    -1,   563,    -1,
1320 <     564,    -1,   565,    -1,   570,    -1,   566,    -1,   567,    -1,
1321 <     568,    -1,   569,    -1,   571,    -1,   572,    -1,   573,    -1,
1322 <     561,    -1,   574,    -1,   575,    -1,   576,    -1,   577,    -1,
1323 <     560,    -1,     1,    -1,    39,   264,   195,   261,    -1,   161,
1324 <     264,   195,   261,    -1,    41,   264,   195,   261,    -1,   251,
1325 <     264,   195,   261,    -1,   252,   264,   195,   261,    -1,   253,
1326 <     264,   195,   261,    -1,    94,   264,   270,   261,    -1,    95,
1327 <     264,   270,   261,    -1,   104,   264,   129,   261,    -1,   152,
1328 <     264,   195,   261,    -1,   103,   264,   129,   261,    -1,    34,
1329 <     264,   129,   261,    -1,    33,   264,   129,   261,    -1,   124,
1330 <     264,   195,   261,    -1,   125,   264,   195,   261,    -1,    13,
1331 <     264,   195,   261,    -1,   141,   264,   129,   261,    -1,   142,
1332 <     264,   270,   261,    -1,   178,   263,   579,   262,   261,    -1,
1333 <     579,   580,    -1,   580,    -1,   581,    -1,   582,    -1,   584,
1334 <      -1,   586,    -1,   585,    -1,   583,    -1,   587,    -1,     1,
1335 <      -1,    53,   264,   195,   261,    -1,    80,   264,   195,   261,
1336 <      -1,    77,   264,   151,   261,    -1,    97,   264,   270,   261,
1337 <      -1,    75,   264,   195,   261,    -1,    40,   264,   195,   261,
1338 <      -1,    79,   264,   195,   261,    -1
1339 < };
1340 <
1341 < /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
1021 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1022   static const yytype_uint16 yyrline[] =
1023   {
1024 <       0,   395,   395,   396,   399,   400,   401,   402,   403,   404,
1025 <     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
1026 <     415,   416,   417,   418,   419,   420,   421,   425,   425,   426,
1027 <     430,   434,   438,   442,   446,   452,   452,   453,   454,   455,
1028 <     456,   463,   466,   466,   467,   467,   467,   469,   475,   482,
1029 <     484,   484,   485,   485,   486,   486,   487,   487,   488,   489,
1030 <     489,   490,   490,   491,   492,   496,   495,   514,   514,   515,
1031 <     521,   529,   563,   623,   638,   653,   662,   676,   685,   713,
1032 <     743,   766,   775,   777,   777,   778,   778,   779,   779,   781,
1033 <     790,   799,   812,   814,   815,   817,   817,   818,   819,   819,
1034 <     820,   820,   821,   821,   822,   822,   823,   824,   826,   830,
1035 <     834,   841,   848,   855,   862,   869,   876,   883,   890,   894,
1036 <     898,   902,   906,   910,   914,   920,   930,   929,  1023,  1023,
1037 <    1024,  1024,  1025,  1025,  1025,  1026,  1026,  1026,  1027,  1027,
1038 <    1027,  1029,  1041,  1053,  1087,  1099,  1110,  1152,  1162,  1161,
1039 <    1167,  1167,  1168,  1172,  1176,  1180,  1184,  1188,  1192,  1196,
1040 <    1200,  1204,  1208,  1212,  1216,  1220,  1224,  1228,  1232,  1236,
1041 <    1240,  1247,  1246,  1250,  1250,  1251,  1251,  1252,  1252,  1254,
1042 <    1261,  1268,  1275,  1282,  1289,  1296,  1303,  1310,  1317,  1324,
1043 <    1331,  1338,  1345,  1352,  1359,  1366,  1380,  1379,  1429,  1429,
1044 <    1431,  1431,  1432,  1433,  1433,  1434,  1435,  1436,  1437,  1438,
1045 <    1439,  1440,  1441,  1442,  1443,  1444,  1446,  1455,  1464,  1470,
1046 <    1476,  1482,  1488,  1494,  1500,  1506,  1512,  1518,  1524,  1530,
1047 <    1540,  1539,  1556,  1555,  1560,  1560,  1561,  1565,  1569,  1577,
1048 <    1577,  1578,  1578,  1578,  1578,  1578,  1580,  1580,  1582,  1582,
1049 <    1584,  1598,  1618,  1627,  1640,  1639,  1708,  1708,  1709,  1709,
1050 <    1709,  1709,  1710,  1710,  1710,  1711,  1711,  1713,  1750,  1763,
1051 <    1772,  1784,  1783,  1787,  1787,  1788,  1788,  1789,  1789,  1791,
1052 <    1798,  1805,  1812,  1819,  1826,  1833,  1840,  1847,  1857,  1876,
1053 <    1886,  1900,  1899,  1915,  1915,  1916,  1916,  1916,  1916,  1918,
1054 <    1927,  1942,  1955,  1957,  1957,  1958,  1958,  1960,  1976,  1975,
1055 <    1991,  1991,  1992,  1992,  1992,  1992,  1994,  2003,  2026,  2025,
1056 <    2031,  2031,  2032,  2036,  2040,  2044,  2048,  2052,  2056,  2060,
1057 <    2064,  2068,  2072,  2082,  2081,  2098,  2098,  2099,  2099,  2099,
1058 <    2101,  2108,  2107,  2113,  2113,  2114,  2118,  2122,  2126,  2130,
1059 <    2134,  2138,  2142,  2146,  2150,  2154,  2164,  2163,  2309,  2309,
1060 <    2310,  2310,  2311,  2311,  2311,  2312,  2312,  2313,  2313,  2314,
1061 <    2314,  2314,  2315,  2315,  2316,  2316,  2317,  2319,  2331,  2343,
1062 <    2352,  2378,  2396,  2414,  2420,  2424,  2433,  2432,  2436,  2436,
1063 <    2437,  2437,  2438,  2438,  2440,  2451,  2458,  2465,  2472,  2482,
1064 <    2523,  2534,  2547,  2560,  2569,  2605,  2604,  2668,  2667,  2671,
1065 <    2671,  2672,  2678,  2678,  2679,  2679,  2679,  2679,  2681,  2700,
1066 <    2710,  2709,  2732,  2732,  2733,  2733,  2733,  2735,  2741,  2750,
1067 <    2752,  2752,  2753,  2753,  2755,  2774,  2773,  2821,  2820,  2824,
1068 <    2824,  2825,  2831,  2831,  2832,  2832,  2832,  2832,  2834,  2840,
1069 <    2849,  2852,  2852,  2853,  2853,  2854,  2854,  2855,  2855,  2856,
1070 <    2856,  2857,  2857,  2858,  2858,  2859,  2859,  2860,  2860,  2861,
1071 <    2861,  2862,  2862,  2863,  2863,  2864,  2864,  2865,  2865,  2866,
1072 <    2867,  2867,  2868,  2868,  2869,  2869,  2870,  2870,  2871,  2871,
1073 <    2872,  2872,  2873,  2874,  2874,  2875,  2875,  2876,  2877,  2877,
1074 <    2878,  2878,  2879,  2879,  2880,  2880,  2881,  2881,  2882,  2885,
1075 <    2890,  2895,  2900,  2905,  2910,  2915,  2920,  2925,  2930,  2935,
1076 <    2940,  2945,  2950,  2955,  2960,  2965,  2970,  2975,  2981,  2992,
1077 <    2997,  3006,  3011,  3016,  3021,  3026,  3031,  3034,  3039,  3042,
1078 <    3047,  3052,  3057,  3062,  3067,  3072,  3077,  3082,  3087,  3098,
1079 <    3103,  3108,  3117,  3149,  3167,  3172,  3181,  3190,  3195,  3200,
1080 <    3206,  3205,  3210,  3210,  3211,  3214,  3217,  3220,  3223,  3226,
1081 <    3229,  3232,  3235,  3238,  3241,  3244,  3247,  3250,  3253,  3256,
1082 <    3259,  3262,  3265,  3271,  3270,  3275,  3275,  3276,  3279,  3282,
1083 <    3285,  3288,  3291,  3294,  3297,  3300,  3303,  3306,  3309,  3312,
1084 <    3315,  3318,  3321,  3324,  3327,  3330,  3335,  3340,  3345,  3350,
1085 <    3360,  3359,  3383,  3383,  3384,  3385,  3386,  3387,  3388,  3389,
1086 <    3390,  3392,  3398,  3405,  3404,  3409,  3409,  3410,  3414,  3420,
1087 <    3454,  3464,  3463,  3513,  3513,  3514,  3518,  3527,  3530,  3530,
1088 <    3531,  3531,  3532,  3532,  3533,  3533,  3534,  3534,  3535,  3535,
1089 <    3536,  3537,  3537,  3538,  3538,  3539,  3539,  3540,  3540,  3542,
1410 <    3547,  3552,  3557,  3562,  3567,  3572,  3577,  3582,  3587,  3592,
1411 <    3597,  3602,  3607,  3612,  3617,  3622,  3627,  3635,  3638,  3638,
1412 <    3639,  3639,  3640,  3641,  3642,  3642,  3643,  3644,  3646,  3652,
1413 <    3658,  3667,  3681,  3687,  3693
1024 >       0,   381,   381,   382,   385,   386,   387,   388,   389,   390,
1025 >     391,   392,   393,   394,   395,   396,   397,   398,   399,   400,
1026 >     401,   402,   403,   404,   405,   406,   407,   411,   411,   412,
1027 >     413,   414,   415,   416,   417,   418,   419,   422,   422,   423,
1028 >     424,   425,   426,   433,   436,   436,   437,   437,   437,   439,
1029 >     445,   452,   454,   454,   455,   456,   457,   458,   459,   460,
1030 >     461,   462,   463,   464,   465,   466,   467,   468,   469,   470,
1031 >     471,   472,   475,   517,   575,   604,   612,   626,   654,   669,
1032 >     684,   693,   707,   716,   744,   772,   797,   819,   841,   850,
1033 >     852,   852,   853,   854,   855,   856,   858,   867,   876,   889,
1034 >     888,   906,   906,   907,   907,   907,   909,   915,   924,   925,
1035 >     925,   927,   927,   928,   930,   937,   937,   950,   951,   953,
1036 >     953,   954,   954,   956,   964,   967,   973,   972,   978,   978,
1037 >     979,   983,   987,   991,   995,   999,  1003,  1007,  1011,  1022,
1038 >    1021,  1107,  1107,  1108,  1109,  1110,  1111,  1112,  1113,  1114,
1039 >    1115,  1116,  1117,  1118,  1120,  1126,  1132,  1138,  1149,  1155,
1040 >    1161,  1172,  1179,  1178,  1184,  1184,  1185,  1189,  1193,  1197,
1041 >    1201,  1205,  1209,  1213,  1217,  1221,  1225,  1229,  1233,  1237,
1042 >    1241,  1245,  1249,  1253,  1257,  1261,  1265,  1269,  1276,  1275,
1043 >    1281,  1281,  1282,  1286,  1290,  1294,  1298,  1302,  1306,  1310,
1044 >    1314,  1318,  1322,  1326,  1330,  1334,  1338,  1342,  1346,  1350,
1045 >    1354,  1358,  1362,  1366,  1370,  1381,  1380,  1442,  1442,  1443,
1046 >    1444,  1445,  1446,  1447,  1448,  1449,  1450,  1451,  1452,  1453,
1047 >    1454,  1455,  1455,  1456,  1457,  1458,  1459,  1461,  1467,  1473,
1048 >    1479,  1485,  1491,  1497,  1503,  1509,  1515,  1521,  1528,  1534,
1049 >    1540,  1546,  1555,  1565,  1564,  1570,  1570,  1571,  1575,  1586,
1050 >    1585,  1592,  1591,  1596,  1596,  1597,  1601,  1605,  1611,  1611,
1051 >    1612,  1612,  1612,  1612,  1612,  1614,  1614,  1616,  1616,  1618,
1052 >    1631,  1648,  1654,  1664,  1663,  1705,  1705,  1706,  1707,  1708,
1053 >    1709,  1710,  1711,  1712,  1713,  1714,  1716,  1722,  1728,  1734,
1054 >    1746,  1745,  1751,  1751,  1752,  1756,  1760,  1764,  1768,  1772,
1055 >    1776,  1780,  1784,  1788,  1794,  1808,  1817,  1831,  1830,  1845,
1056 >    1845,  1846,  1846,  1846,  1846,  1848,  1854,  1860,  1870,  1872,
1057 >    1872,  1873,  1873,  1875,  1891,  1890,  1915,  1915,  1916,  1916,
1058 >    1916,  1916,  1918,  1924,  1944,  1943,  1949,  1949,  1950,  1954,
1059 >    1958,  1962,  1966,  1970,  1974,  1978,  1982,  1986,  1996,  1995,
1060 >    2016,  2016,  2017,  2017,  2017,  2019,  2026,  2025,  2031,  2031,
1061 >    2032,  2036,  2040,  2044,  2048,  2052,  2056,  2060,  2064,  2068,
1062 >    2078,  2077,  2149,  2149,  2150,  2151,  2152,  2153,  2154,  2155,
1063 >    2156,  2157,  2158,  2159,  2160,  2161,  2162,  2163,  2164,  2166,
1064 >    2172,  2178,  2184,  2197,  2210,  2216,  2222,  2226,  2233,  2232,
1065 >    2237,  2237,  2238,  2242,  2248,  2259,  2265,  2271,  2277,  2293,
1066 >    2292,  2318,  2318,  2319,  2319,  2319,  2321,  2341,  2351,  2350,
1067 >    2377,  2377,  2378,  2378,  2378,  2380,  2386,  2395,  2397,  2397,
1068 >    2398,  2398,  2400,  2418,  2417,  2440,  2440,  2441,  2441,  2441,
1069 >    2443,  2449,  2458,  2461,  2461,  2462,  2463,  2464,  2465,  2466,
1070 >    2467,  2468,  2469,  2470,  2471,  2472,  2473,  2474,  2475,  2476,
1071 >    2477,  2478,  2479,  2480,  2481,  2482,  2483,  2484,  2485,  2486,
1072 >    2487,  2488,  2489,  2490,  2491,  2492,  2493,  2494,  2495,  2496,
1073 >    2497,  2498,  2499,  2500,  2501,  2502,  2503,  2504,  2505,  2506,
1074 >    2507,  2508,  2509,  2510,  2511,  2512,  2515,  2520,  2525,  2530,
1075 >    2536,  2542,  2548,  2554,  2559,  2564,  2569,  2574,  2579,  2584,
1076 >    2589,  2594,  2599,  2604,  2609,  2614,  2619,  2625,  2636,  2641,
1077 >    2646,  2651,  2656,  2661,  2666,  2669,  2674,  2677,  2682,  2687,
1078 >    2692,  2697,  2702,  2707,  2712,  2717,  2722,  2727,  2732,  2741,
1079 >    2746,  2751,  2756,  2762,  2761,  2766,  2766,  2767,  2770,  2773,
1080 >    2776,  2779,  2782,  2785,  2788,  2791,  2794,  2797,  2800,  2803,
1081 >    2806,  2809,  2812,  2815,  2818,  2821,  2824,  2827,  2830,  2836,
1082 >    2835,  2840,  2840,  2841,  2844,  2847,  2850,  2853,  2856,  2859,
1083 >    2862,  2865,  2868,  2871,  2874,  2877,  2880,  2883,  2886,  2889,
1084 >    2892,  2895,  2898,  2903,  2908,  2913,  2922,  2925,  2925,  2926,
1085 >    2927,  2928,  2929,  2930,  2931,  2932,  2933,  2934,  2935,  2936,
1086 >    2937,  2938,  2939,  2940,  2942,  2947,  2952,  2957,  2962,  2967,
1087 >    2972,  2977,  2982,  2987,  2992,  2997,  3002,  3007,  3015,  3018,
1088 >    3018,  3019,  3020,  3021,  3022,  3023,  3024,  3025,  3026,  3027,
1089 >    3029,  3035,  3041,  3047,  3053,  3062,  3077,  3083
1090   };
1091   #endif
1092  
1093 < #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1093 > #if YYDEBUG || YYERROR_VERBOSE || 0
1094   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1095     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
1096   static const char *const yytname[] =
1097   {
1098 <  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
1099 <  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
1100 <  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
1101 <  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CHANNEL",
1102 <  "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE", "CLASS",
1427 <  "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ", "CRYPTLINK",
1428 <  "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
1098 >  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1099 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1100 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1101 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1102 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1103    "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1104    "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1105 <  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
1432 <  "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL", "ENABLE",
1105 >  "DISABLE_REMOTE_COMMANDS", "DOTS_IN_IDENT", "EGDPOOL_PATH", "EMAIL",
1106    "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1107 <  "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
1108 <  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
1109 <  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
1110 <  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1111 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1112 <  "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER", "HIDE_SERVER_IPS",
1113 <  "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK",
1114 <  "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP", "KILL",
1115 <  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
1116 <  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
1117 <  "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL", "MAX_ACCEPT",
1118 <  "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1119 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1120 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1121 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1122 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1107 >  "FLATTEN_LINKS", "GECOS", "GENERAL", "GLINE", "GLINE_DURATION",
1108 >  "GLINE_ENABLE", "GLINE_EXEMPT", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1109 >  "GLINE_REQUEST_DURATION", "GLOBAL_KILL", "HAVENT_READ_CONF", "HIDDEN",
1110 >  "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE", "HIDE_IDLE_FROM_OPERS",
1111 >  "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SERVICES", "HIDE_SPOOF_IPS",
1112 >  "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT",
1113 >  "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME", "IP", "IRCD_AUTH",
1114 >  "IRCD_FLAGS", "IRCD_SID", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "KILL",
1115 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KNOCK_CLIENT_COUNT",
1116 >  "KNOCK_CLIENT_TIME", "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY",
1117 >  "LISTEN", "MASK", "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL",
1118 >  "MAX_IDENT", "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES",
1119 >  "MAX_NICK_LENGTH", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1120 >  "MAX_TOPIC_LENGTH", "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD",
1121 >  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "MOTD", "NAME",
1122 >  "NEED_IDENT", "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK",
1123    "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1124 <  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
1125 <  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
1126 <  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
1127 <  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
1128 <  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
1129 <  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
1130 <  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
1131 <  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
1132 <  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "T_SSL_CONNECTION_METHOD",
1133 <  "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
1134 <  "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE",
1135 <  "SERVERINFO", "SERVLINK_PATH", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1136 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SILENT", "SPOOF",
1137 <  "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1138 <  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
1139 <  "TMASKED", "T_REJECT", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS",
1140 <  "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN",
1141 <  "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF", "T_DEBUG", "T_DRONE",
1142 <  "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS",
1143 <  "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR", "T_L_INFO",
1144 <  "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS", "T_NCHANGE",
1145 <  "T_OPERWALL", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SKILL", "T_SPY",
1146 <  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_GLOBOPS",
1147 <  "T_WALLOP", "T_SERVICE", "T_SERVICES_NAME", "THROTTLE_TIME",
1148 <  "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE", "TRESV",
1149 <  "UNKLINE", "USER", "USE_EGD", "USE_EXCEPT", "USE_INVEX", "USE_KNOCK",
1150 <  "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST", "VHOST6", "XLINE", "WARN",
1151 <  "WARN_NO_NLINE", "';'", "'}'", "'{'", "'='", "','", "$accept", "conf",
1152 <  "conf_item", "timespec_", "timespec", "sizespec_", "sizespec",
1153 <  "modules_entry", "modules_items", "modules_item", "modules_module",
1154 <  "modules_path", "serverinfo_entry", "serverinfo_items",
1155 <  "serverinfo_item", "serverinfo_ssl_connection_method", "$@1",
1483 <  "method_types", "method_type_item", "serverinfo_ssl_certificate_file",
1484 <  "serverinfo_rsa_private_key_file", "serverinfo_name", "serverinfo_sid",
1124 >  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES",
1125 >  "OPER_PASS_RESV", "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID",
1126 >  "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
1127 >  "PING_TIME", "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT",
1128 >  "REDIRSERV", "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1129 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1130 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1131 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1132 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1133 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1134 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1135 >  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY",
1136 >  "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN",
1137 >  "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
1138 >  "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4",
1139 >  "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE",
1140 >  "T_NONONREG", "T_RECVQ", "T_REJ", "T_RESTART", "T_SERVER", "T_SERVICE",
1141 >  "T_SERVICES_NAME", "T_SERVNOTICE", "T_SET", "T_SHARED", "T_SIZE",
1142 >  "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", "T_SSL_CIPHER_LIST",
1143 >  "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED", "T_UNRESV",
1144 >  "T_UNXLINE", "T_WALLOP", "T_WALLOPS", "T_WEBIRC", "TBOOL",
1145 >  "THROTTLE_COUNT", "THROTTLE_TIME", "TKLINE_EXPIRE_NOTICES", "TMASKED",
1146 >  "TRUE_NO_OPER_FLOOD", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "TYPE",
1147 >  "UNKLINE", "USE_EGD", "USE_LOGGING", "USER", "VHOST", "VHOST6",
1148 >  "WARN_NO_CONNECT_BLOCK", "XLINE", "';'", "'}'", "'{'", "'='", "','",
1149 >  "':'", "$accept", "conf", "conf_item", "timespec_", "timespec",
1150 >  "sizespec_", "sizespec", "modules_entry", "modules_items",
1151 >  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
1152 >  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
1153 >  "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1154 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1155 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1156    "serverinfo_description", "serverinfo_network_name",
1157    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1158 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1159 <  "admin_item", "admin_name", "admin_email", "admin_description",
1160 <  "logging_entry", "logging_items", "logging_item", "logging_path",
1161 <  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
1162 <  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
1163 <  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
1164 <  "logging_log_level", "logging_use_logging", "oper_entry", "$@2",
1165 <  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
1166 <  "oper_user", "oper_password", "oper_encrypted",
1167 <  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "$@3",
1168 <  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@4",
1169 <  "oper_flags_items", "oper_flags_item", "$@5", "$@6",
1170 <  "oper_flags_item_atom", "class_entry", "$@7", "class_name_b",
1171 <  "class_items", "class_item", "class_name", "class_name_t",
1172 <  "class_ping_time", "class_ping_warning", "class_number_per_ip",
1173 <  "class_connectfreq", "class_max_number", "class_max_global",
1174 <  "class_max_local", "class_max_ident", "class_sendq",
1175 <  "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1176 <  "class_number_per_cidr", "listen_entry", "$@8", "listen_flags", "$@9",
1177 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1178 <  "listen_port", "$@10", "port_items", "port_item", "listen_address",
1179 <  "listen_host", "auth_entry", "$@11", "auth_items", "auth_item",
1180 <  "auth_user", "auth_passwd", "auth_class", "auth_encrypted", "auth_flags",
1181 <  "$@12", "auth_flags_items", "auth_flags_item", "$@13", "$@14",
1182 <  "auth_flags_item_atom", "auth_spoof", "auth_redir_serv",
1183 <  "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1184 <  "resv_creason", "resv_channel", "resv_nick", "service_entry",
1185 <  "service_items", "service_item", "service_name", "shared_entry", "$@16",
1158 >  "serverinfo_max_clients", "serverinfo_max_nick_length",
1159 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1160 >  "admin_items", "admin_item", "admin_name", "admin_email",
1161 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1162 >  "motd_mask", "motd_file", "logging_entry", "logging_items",
1163 >  "logging_item", "logging_use_logging", "logging_file_entry", "$@2",
1164 >  "logging_file_items", "logging_file_item", "logging_file_name",
1165 >  "logging_file_size", "logging_file_type", "$@3",
1166 >  "logging_file_type_items", "logging_file_type_item", "oper_entry", "$@4",
1167 >  "oper_items", "oper_item", "oper_name", "oper_user", "oper_password",
1168 >  "oper_encrypted", "oper_rsa_public_key_file",
1169 >  "oper_ssl_certificate_fingerprint", "oper_ssl_connection_required",
1170 >  "oper_class", "oper_umodes", "$@5", "oper_umodes_items",
1171 >  "oper_umodes_item", "oper_flags", "$@6", "oper_flags_items",
1172 >  "oper_flags_item", "class_entry", "$@7", "class_items", "class_item",
1173 >  "class_name", "class_ping_time", "class_number_per_ip",
1174 >  "class_connectfreq", "class_max_channels", "class_max_number",
1175 >  "class_max_global", "class_max_local", "class_max_ident", "class_sendq",
1176 >  "class_recvq", "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1177 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1178 >  "class_flags", "$@8", "class_flags_items", "class_flags_item",
1179 >  "listen_entry", "$@9", "listen_flags", "$@10", "listen_flags_items",
1180 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1181 >  "$@11", "port_items", "port_item", "listen_address", "listen_host",
1182 >  "auth_entry", "$@12", "auth_items", "auth_item", "auth_user",
1183 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@13",
1184 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1185 >  "auth_redir_port", "resv_entry", "$@14", "resv_items", "resv_item",
1186 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1187 >  "service_items", "service_item", "service_name", "shared_entry", "$@15",
1188    "shared_items", "shared_item", "shared_name", "shared_user",
1189 <  "shared_type", "$@17", "shared_types", "shared_type_item",
1190 <  "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1191 <  "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1192 <  "connect_entry", "$@20", "connect_name_b", "connect_items",
1193 <  "connect_item", "connect_name", "connect_name_t", "connect_host",
1194 <  "connect_vhost", "connect_send_password", "connect_accept_password",
1195 <  "connect_port", "connect_aftype", "connect_flags", "$@21",
1196 <  "connect_flags_items", "connect_flags_item", "$@22", "$@23",
1197 <  "connect_flags_item_atom", "connect_rsa_public_key_file",
1198 <  "connect_encrypted", "connect_hub_mask", "connect_leaf_mask",
1199 <  "connect_class", "connect_cipher_preference", "kill_entry", "$@24",
1527 <  "kill_type", "$@25", "kill_type_items", "kill_type_item", "kill_items",
1528 <  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@26",
1189 >  "shared_type", "$@16", "shared_types", "shared_type_item",
1190 >  "cluster_entry", "$@17", "cluster_items", "cluster_item", "cluster_name",
1191 >  "cluster_type", "$@18", "cluster_types", "cluster_type_item",
1192 >  "connect_entry", "$@19", "connect_items", "connect_item", "connect_name",
1193 >  "connect_host", "connect_vhost", "connect_send_password",
1194 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1195 >  "connect_port", "connect_aftype", "connect_flags", "$@20",
1196 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1197 >  "connect_hub_mask", "connect_leaf_mask", "connect_class",
1198 >  "connect_ssl_cipher_list", "kill_entry", "$@21", "kill_items",
1199 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@22",
1200    "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1201 <  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@27",
1531 <  "gecos_flags", "$@28", "gecos_flags_items", "gecos_flags_item",
1201 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@23",
1202    "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1203 <  "general_entry", "general_items", "general_item", "general_max_watch",
1204 <  "general_gline_min_cidr", "general_gline_min_cidr6",
1205 <  "general_burst_away", "general_use_whois_actually",
1206 <  "general_reject_hold_time", "general_tkline_expire_notices",
1203 >  "general_entry", "general_items", "general_item", "general_away_count",
1204 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1205 >  "general_gline_enable", "general_gline_duration",
1206 >  "general_gline_request_duration", "general_gline_min_cidr",
1207 >  "general_gline_min_cidr6", "general_tkline_expire_notices",
1208    "general_kill_chase_time_limit", "general_hide_spoof_ips",
1209 <  "general_ignore_bogus_ts", "general_disable_remote_commands",
1210 <  "general_failed_oper_notice", "general_anti_nick_flood",
1211 <  "general_max_nick_time", "general_max_nick_changes",
1212 <  "general_max_accept", "general_anti_spam_exit_message_time",
1213 <  "general_ts_warn_delta", "general_ts_max_delta",
1214 <  "general_havent_read_conf", "general_kline_with_reason",
1215 <  "general_kline_reason", "general_invisible_on_connect",
1216 <  "general_warn_no_nline", "general_stats_e_disabled",
1546 <  "general_stats_o_oper_only", "general_stats_P_oper_only",
1209 >  "general_ignore_bogus_ts", "general_failed_oper_notice",
1210 >  "general_anti_nick_flood", "general_max_nick_time",
1211 >  "general_max_nick_changes", "general_max_accept",
1212 >  "general_anti_spam_exit_message_time", "general_ts_warn_delta",
1213 >  "general_ts_max_delta", "general_havent_read_conf",
1214 >  "general_invisible_on_connect", "general_warn_no_connect_block",
1215 >  "general_stats_e_disabled", "general_stats_o_oper_only",
1216 >  "general_stats_P_oper_only", "general_stats_u_oper_only",
1217    "general_stats_k_oper_only", "general_stats_i_oper_only",
1218    "general_pace_wait", "general_caller_id_wait",
1219    "general_opers_bypass_callerid", "general_pace_wait_simple",
1220    "general_short_motd", "general_no_oper_flood",
1221    "general_true_no_oper_flood", "general_oper_pass_resv",
1222 <  "general_message_locale", "general_dots_in_ident", "general_max_targets",
1223 <  "general_servlink_path", "general_default_cipher_preference",
1224 <  "general_compression_level", "general_use_egd", "general_egdpool_path",
1225 <  "general_services_name", "general_ping_cookie", "general_disable_auth",
1556 <  "general_throttle_time", "general_oper_umodes", "$@29", "umode_oitems",
1557 <  "umode_oitem", "general_oper_only_umodes", "$@30", "umode_items",
1222 >  "general_dots_in_ident", "general_max_targets", "general_services_name",
1223 >  "general_ping_cookie", "general_disable_auth", "general_throttle_count",
1224 >  "general_throttle_time", "general_oper_umodes", "$@24", "umode_oitems",
1225 >  "umode_oitem", "general_oper_only_umodes", "$@25", "umode_items",
1226    "umode_item", "general_min_nonwildcard",
1227    "general_min_nonwildcard_simple", "general_default_floodcount",
1560  "general_client_flood", "gline_entry", "$@31", "gline_items",
1561  "gline_item", "gline_enable", "gline_duration", "gline_logging", "$@32",
1562  "gline_logging_types", "gline_logging_type_item", "gline_user",
1563  "gline_server", "gline_action", "$@33", "gdeny_types", "gdeny_type_item",
1228    "channel_entry", "channel_items", "channel_item",
1229 <  "channel_disable_fake_channels", "channel_restrict_channels",
1230 <  "channel_disable_local_channels", "channel_use_except",
1231 <  "channel_use_invex", "channel_use_knock", "channel_knock_delay",
1232 <  "channel_knock_delay_channel", "channel_max_chans_per_user",
1569 <  "channel_quiet_on_ban", "channel_max_bans",
1229 >  "channel_disable_fake_channels", "channel_invite_client_count",
1230 >  "channel_invite_client_time", "channel_knock_client_count",
1231 >  "channel_knock_client_time", "channel_knock_delay_channel",
1232 >  "channel_max_channels", "channel_max_bans",
1233    "channel_default_split_user_count", "channel_default_split_server_count",
1234    "channel_no_create_on_split", "channel_no_join_on_split",
1235 <  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
1236 <  "serverhide_entry", "serverhide_items", "serverhide_item",
1237 <  "serverhide_flatten_links", "serverhide_hide_servers",
1238 <  "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
1239 <  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
1235 >  "channel_jflood_count", "channel_jflood_time", "serverhide_entry",
1236 >  "serverhide_items", "serverhide_item", "serverhide_flatten_links",
1237 >  "serverhide_disable_remote_commands", "serverhide_hide_servers",
1238 >  "serverhide_hide_services", "serverhide_hidden_name",
1239 >  "serverhide_links_delay", "serverhide_hidden",
1240 >  "serverhide_hide_server_ips", YY_NULLPTR
1241   };
1242   #endif
1243  
1244   # ifdef YYPRINT
1245 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1246 <   token YYLEX-NUM.  */
1245 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1246 >   (internal) symbol number NUM (which must be that of a token).  */
1247   static const yytype_uint16 yytoknum[] =
1248   {
1249         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1605 | Line 1269 | static const yytype_uint16 yytoknum[] =
1269       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1270       465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1271       475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1272 <     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
1609 <     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
1610 <     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
1611 <     515,    59,   125,   123,    61,    44
1272 >     485,    59,   125,   123,    61,    44,    58
1273   };
1274   # endif
1275  
1276 < /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
1616 < static const yytype_uint16 yyr1[] =
1617 < {
1618 <       0,   266,   267,   267,   268,   268,   268,   268,   268,   268,
1619 <     268,   268,   268,   268,   268,   268,   268,   268,   268,   268,
1620 <     268,   268,   268,   268,   268,   268,   268,   269,   269,   270,
1621 <     270,   270,   270,   270,   270,   271,   271,   272,   272,   272,
1622 <     272,   273,   274,   274,   275,   275,   275,   276,   277,   278,
1623 <     279,   279,   280,   280,   280,   280,   280,   280,   280,   280,
1624 <     280,   280,   280,   280,   280,   282,   281,   283,   283,   284,
1625 <     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
1626 <     294,   295,   296,   297,   297,   298,   298,   298,   298,   299,
1627 <     300,   301,   302,   303,   303,   304,   304,   304,   304,   304,
1628 <     304,   304,   304,   304,   304,   304,   304,   304,   305,   306,
1629 <     307,   308,   309,   310,   311,   312,   313,   314,   315,   315,
1630 <     315,   315,   315,   315,   315,   316,   318,   317,   319,   319,
1631 <     320,   320,   321,   321,   321,   321,   321,   321,   321,   321,
1632 <     321,   322,   323,   324,   325,   326,   327,   328,   330,   329,
1633 <     331,   331,   332,   332,   332,   332,   332,   332,   332,   332,
1634 <     332,   332,   332,   332,   332,   332,   332,   332,   332,   332,
1635 <     332,   334,   333,   335,   335,   337,   336,   338,   336,   339,
1636 <     339,   339,   339,   339,   339,   339,   339,   339,   339,   339,
1637 <     339,   339,   339,   339,   339,   339,   341,   340,   342,   342,
1638 <     343,   343,   344,   344,   344,   344,   344,   344,   344,   344,
1639 <     344,   344,   344,   344,   344,   344,   345,   346,   347,   348,
1640 <     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
1641 <     360,   359,   362,   361,   363,   363,   364,   364,   364,   365,
1642 <     365,   366,   366,   366,   366,   366,   368,   367,   369,   369,
1643 <     370,   370,   371,   372,   374,   373,   375,   375,   376,   376,
1644 <     376,   376,   376,   376,   376,   376,   376,   377,   378,   379,
1645 <     380,   382,   381,   383,   383,   385,   384,   386,   384,   387,
1646 <     387,   387,   387,   387,   387,   387,   387,   387,   388,   389,
1647 <     390,   392,   391,   393,   393,   394,   394,   394,   394,   395,
1648 <     396,   397,   398,   399,   399,   400,   400,   401,   403,   402,
1649 <     404,   404,   405,   405,   405,   405,   406,   407,   409,   408,
1650 <     410,   410,   411,   411,   411,   411,   411,   411,   411,   411,
1651 <     411,   411,   411,   413,   412,   414,   414,   415,   415,   415,
1652 <     416,   418,   417,   419,   419,   420,   420,   420,   420,   420,
1653 <     420,   420,   420,   420,   420,   420,   422,   421,   423,   423,
1654 <     424,   424,   425,   425,   425,   425,   425,   425,   425,   425,
1655 <     425,   425,   425,   425,   425,   425,   425,   426,   427,   428,
1656 <     429,   430,   431,   432,   433,   433,   435,   434,   436,   436,
1657 <     438,   437,   439,   437,   440,   440,   440,   440,   440,   441,
1658 <     442,   443,   444,   445,   446,   448,   447,   450,   449,   451,
1659 <     451,   452,   453,   453,   454,   454,   454,   454,   455,   456,
1660 <     458,   457,   459,   459,   460,   460,   460,   461,   462,   463,
1661 <     464,   464,   465,   465,   466,   468,   467,   470,   469,   471,
1662 <     471,   472,   473,   473,   474,   474,   474,   474,   475,   476,
1663 <     477,   478,   478,   479,   479,   479,   479,   479,   479,   479,
1664 <     479,   479,   479,   479,   479,   479,   479,   479,   479,   479,
1665 <     479,   479,   479,   479,   479,   479,   479,   479,   479,   479,
1666 <     479,   479,   479,   479,   479,   479,   479,   479,   479,   479,
1667 <     479,   479,   479,   479,   479,   479,   479,   479,   479,   479,
1668 <     479,   479,   479,   479,   479,   479,   479,   479,   479,   480,
1669 <     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
1670 <     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
1671 <     501,   502,   503,   504,   505,   506,   507,   507,   508,   508,
1672 <     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
1673 <     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
1674 <     530,   529,   531,   531,   532,   532,   532,   532,   532,   532,
1675 <     532,   532,   532,   532,   532,   532,   532,   532,   532,   532,
1676 <     532,   532,   532,   534,   533,   535,   535,   536,   536,   536,
1677 <     536,   536,   536,   536,   536,   536,   536,   536,   536,   536,
1678 <     536,   536,   536,   536,   536,   536,   537,   538,   539,   540,
1679 <     542,   541,   543,   543,   544,   544,   544,   544,   544,   544,
1680 <     544,   545,   546,   548,   547,   549,   549,   550,   550,   551,
1681 <     552,   554,   553,   555,   555,   556,   556,   557,   558,   558,
1682 <     559,   559,   559,   559,   559,   559,   559,   559,   559,   559,
1683 <     559,   559,   559,   559,   559,   559,   559,   559,   559,   560,
1684 <     561,   562,   563,   564,   565,   566,   567,   568,   569,   570,
1685 <     571,   572,   573,   574,   575,   576,   577,   578,   579,   579,
1686 <     580,   580,   580,   580,   580,   580,   580,   580,   581,   582,
1687 <     583,   584,   585,   586,   587
1688 < };
1276 > #define YYPACT_NINF -790
1277  
1278 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1279 < static const yytype_uint8 yyr2[] =
1278 > #define yypact_value_is_default(Yystate) \
1279 >  (!!((Yystate) == (-790)))
1280 >
1281 > #define YYTABLE_NINF -116
1282 >
1283 > #define yytable_value_is_error(Yytable_value) \
1284 >  0
1285 >
1286 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1287 >     STATE-NUM.  */
1288 > static const yytype_int16 yypact[] =
1289   {
1290 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1291 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1292 <       1,     1,     1,     1,     1,     2,     2,     0,     1,     2,
1293 <       3,     3,     3,     3,     3,     0,     1,     2,     3,     3,
1294 <       3,     5,     2,     1,     1,     1,     2,     4,     4,     5,
1295 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1296 <       1,     1,     1,     1,     2,     0,     5,     3,     1,     1,
1297 <       1,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1298 <       4,     4,     5,     2,     1,     1,     1,     1,     2,     4,
1299 <       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
1300 <       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
1301 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1302 <       4,     4,     4,     4,     4,     4,     0,     7,     0,     1,
1303 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1304 <       2,     4,     1,     4,     4,     4,     4,     4,     0,     5,
1305 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1306 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1307 <       1,     0,     5,     3,     1,     0,     3,     0,     2,     1,
1308 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1309 <       1,     1,     1,     1,     1,     1,     0,     7,     0,     1,
1310 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1311 <       1,     1,     1,     1,     1,     2,     4,     1,     4,     4,
1312 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1313 <       0,     6,     0,     5,     3,     1,     1,     1,     1,     2,
1314 <       1,     1,     1,     1,     1,     2,     0,     5,     3,     1,
1315 <       1,     3,     4,     4,     0,     6,     2,     1,     1,     1,
1316 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
1317 <       4,     0,     5,     3,     1,     0,     3,     0,     2,     1,
1318 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1319 <       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
1320 <       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
1321 <       2,     1,     1,     1,     1,     2,     4,     4,     0,     5,
1322 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1323 <       1,     1,     1,     0,     6,     2,     1,     1,     1,     2,
1324 <       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1325 <       1,     1,     1,     1,     1,     1,     0,     7,     0,     1,
1326 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1327 <       1,     1,     1,     1,     1,     1,     2,     4,     1,     4,
1328 <       4,     4,     4,     4,     4,     4,     0,     5,     3,     1,
1329 <       0,     3,     0,     2,     1,     1,     1,     1,     1,     4,
1330 <       4,     4,     4,     4,     4,     0,     6,     0,     5,     3,
1331 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1332 <       0,     6,     2,     1,     1,     1,     1,     4,     4,     5,
1333 <       2,     1,     1,     1,     4,     0,     6,     0,     5,     3,
1334 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1335 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1336 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1337 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1338 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1339 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1340 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
1341 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1342 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1343 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1344 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1345 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1346 <       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
1347 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1348 <       1,     1,     1,     0,     5,     3,     1,     1,     1,     1,
1349 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1350 <       1,     1,     1,     1,     1,     1,     4,     4,     4,     4,
1351 <       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
1352 <       1,     4,     4,     0,     5,     3,     1,     1,     1,     4,
1353 <       4,     0,     5,     3,     1,     1,     1,     5,     2,     1,
1354 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1355 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
1356 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1357 <       4,     4,     4,     4,     4,     4,     4,     5,     2,     1,
1358 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1359 <       4,     4,     4,     4,     4
1290 >    -790,   639,  -790,  -150,  -213,  -210,  -790,  -790,  -790,  -207,
1291 >    -790,  -192,  -790,  -790,  -790,  -189,  -790,  -790,  -790,  -187,
1292 >    -179,  -790,  -163,  -157,  -790,  -790,  -790,  -790,  -790,  -790,
1293 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1294 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,    26,
1295 >     926,  -142,  -134,  -121,    16,  -116,   403,  -113,  -108,   -95,
1296 >       9,   -83,   -78,   -63,   769,   372,   -54,     4,    10,   -50,
1297 >     -53,   -33,   -31,   -16,    11,  -790,  -790,  -790,  -790,  -790,
1298 >     -14,    -9,     3,    30,    35,    55,    65,    72,    76,    79,
1299 >      84,    91,    93,    95,   156,  -790,  -790,  -790,  -790,  -790,
1300 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1301 >     667,   545,    20,  -790,    97,    12,  -790,  -790,    41,  -790,
1302 >     102,   103,   112,   119,   131,   132,   133,   136,   137,   140,
1303 >     141,   143,   144,   145,   146,   148,   149,   150,   152,   163,
1304 >     164,   167,   168,   169,   171,   172,   173,   174,  -790,   177,
1305 >    -790,   180,   182,   184,   185,   188,   190,   193,   197,   200,
1306 >     202,   206,   210,   214,   218,   220,   223,   224,   226,   227,
1307 >      42,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1308 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1309 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1310 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1311 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1312 >    -790,  -790,   420,    46,   295,    45,   229,   231,    23,  -790,
1313 >    -790,  -790,    14,   437,    21,  -790,   235,   236,   237,   239,
1314 >     240,   244,   247,   248,   291,  -790,  -790,  -790,  -790,  -790,
1315 >    -790,  -790,  -790,  -790,    70,   250,   251,   252,   254,   256,
1316 >     257,   258,   259,   261,   263,   267,   271,   273,   274,   275,
1317 >     276,   278,    92,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1318 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1319 >    -790,   122,   109,   279,    38,  -790,  -790,  -790,   305,  -790,
1320 >     280,    36,  -790,  -790,   128,  -790,   120,   125,   260,   199,
1321 >    -790,   331,   402,   304,   405,   413,   416,   413,   421,   413,
1322 >     413,   422,   423,   325,   326,   309,  -790,   312,   311,   313,
1323 >     315,  -790,   317,   320,   323,   328,   329,   337,   338,   340,
1324 >     342,   344,   347,   348,   349,   196,  -790,  -790,  -790,  -790,
1325 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1326 >    -790,  -790,  -790,  -790,   353,   352,   354,   357,   359,   362,
1327 >     364,  -790,   367,   368,   369,   370,   374,   375,   376,   272,
1328 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1329 >    -790,  -790,  -790,  -790,  -790,  -790,   377,   378,    27,  -790,
1330 >    -790,  -790,   431,   382,  -790,  -790,   386,   390,    18,  -790,
1331 >    -790,  -790,   366,   413,   502,   413,   413,   415,   512,   417,
1332 >     515,   418,   413,   425,   519,   520,   413,   521,   429,   432,
1333 >     434,   413,   530,   537,   413,   538,   539,   542,   543,   447,
1334 >     427,   449,   430,   453,   413,   413,   457,   458,   459,  -177,
1335 >    -158,   461,   462,   464,   549,   567,   413,   469,   470,   413,
1336 >     413,   473,   456,  -790,   468,   466,   467,  -790,   472,   474,
1337 >     475,   477,   480,   155,  -790,  -790,  -790,  -790,  -790,  -790,
1338 >    -790,  -790,  -790,  -790,   482,   485,   107,  -790,  -790,  -790,
1339 >     491,   490,   492,  -790,   493,  -790,     8,  -790,  -790,  -790,
1340 >    -790,  -790,   561,   566,   497,  -790,   499,   498,   500,    15,
1341 >    -790,  -790,  -790,   504,   505,   506,  -790,   516,   518,   524,
1342 >     532,   534,  -790,   535,   211,  -790,  -790,  -790,  -790,  -790,
1343 >    -790,  -790,  -790,  -790,  -790,  -790,   507,   540,   544,   546,
1344 >      13,  -790,  -790,  -790,  -790,   533,   536,   551,   574,   560,
1345 >     564,   568,   413,   548,  -790,  -790,   602,   571,   604,   637,
1346 >     671,   657,   658,   659,   662,   663,   666,   668,   670,   679,
1347 >     672,   673,   675,   565,  -790,   576,   575,  -790,    94,  -790,
1348 >    -790,  -790,  -790,   592,   579,  -790,   581,   683,   584,  -790,
1349 >     586,   585,  -790,   589,    71,  -790,  -790,  -790,  -790,   587,
1350 >     597,   599,  -790,   600,   608,   611,   618,   249,   622,   624,
1351 >     626,   627,   631,   635,   640,   641,   642,   644,  -790,  -790,
1352 >     756,   763,   413,   647,   770,   773,   775,   413,   777,   778,
1353 >     413,   765,   781,   788,   413,   789,   789,   674,  -790,  -790,
1354 >     782,   -55,   783,   693,   784,   796,   695,   801,   803,   793,
1355 >     804,   807,   809,   810,   710,  -790,   811,   814,   713,  -790,
1356 >     714,  -790,   820,   824,   723,  -790,   724,   727,   728,   729,
1357 >     730,   731,   732,   733,   734,   735,   736,   737,   738,   739,
1358 >     740,   741,   742,   743,   744,   745,   746,   748,   749,   750,
1359 >     751,   752,   753,   754,   747,   755,   664,   757,   758,   759,
1360 >     762,   764,   768,   771,   776,   779,   785,   786,   787,   790,
1361 >     791,   792,   794,   795,   797,   798,   799,   800,  -790,  -790,
1362 >     849,   774,   760,   867,   886,   872,   877,   879,   802,  -790,
1363 >     880,   884,   808,  -790,  -790,   885,   890,   806,   901,   812,
1364 >    -790,   813,   815,  -790,  -790,   891,   895,   816,  -790,  -790,
1365 >     898,   819,   817,   905,   906,   909,   912,   829,   818,   916,
1366 >     822,  -790,  -790,   919,   920,   921,   823,  -790,   825,   826,
1367 >     827,   828,   830,   831,   832,   833,  -790,   834,   835,   836,
1368 >     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
1369 >     847,   848,   850,   851,  -790,  -790,   931,   821,   852,  -790,
1370 >     853,  -790,    83,   854,  -790,  -790,   951,   855,   957,   856,
1371 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,   413,   413,
1372 >     413,   413,   413,   413,   413,  -790,  -790,  -790,  -790,  -790,
1373 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,   857,   859,   860,
1374 >     -52,   861,   862,   863,   864,   865,   866,   868,   869,   870,
1375 >     871,   873,   345,   874,   875,  -790,   876,   878,   881,   882,
1376 >     883,   887,   888,     0,   889,   892,   893,   894,   896,   897,
1377 >     899,  -790,   900,   902,  -790,  -790,   903,   904,  -790,  -790,
1378 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1379 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1380 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1381 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1382 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -174,  -790,  -790,
1383 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1384 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1385 >    -790,  -790,  -169,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1386 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1387 >    -790,  -790,  -790,  -790,  -790,   907,   908,   591,   910,   911,
1388 >     913,   914,   915,  -790,   917,   918,  -790,   922,   923,   -26,
1389 >     929,   924,  -790,  -790,  -790,  -790,   925,   927,  -790,   930,
1390 >     932,   514,   933,   934,   935,   936,   937,   709,   938,  -790,
1391 >     939,   940,   941,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1392 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1393 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,   942,
1394 >     638,  -790,  -790,   943,   928,   944,  -790,   106,  -790,  -790,
1395 >    -790,  -790,  -790,   945,   692,   946,  -790,  -790,  -790,  -790,
1396 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -168,
1397 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1398 >    -790,  -790,   789,   789,   789,  -790,  -790,  -790,  -790,  -790,
1399 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -162,  -790,
1400 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1401 >    -790,  -790,   747,  -790,   664,  -790,  -790,  -790,  -790,  -790,
1402 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,   -64,  -790,  -790,
1403 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1404 >    -790,   -62,  -790,   984,   901,   948,  -790,  -790,  -790,  -790,
1405 >    -790,   947,  -790,  -790,   949,  -790,  -790,  -790,  -790,   950,
1406 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1407 >     -46,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1408 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1409 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,   -40,
1410 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1411 >    -790,  -790,  -790,  -790,  -790,  -790,   -20,  -790,  -790,   974,
1412 >     -96,   953,   958,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1413 >    -790,  -790,  -790,  -790,  -790,   -12,  -790,  -790,  -790,   -52,
1414 >    -790,  -790,  -790,  -790,     0,  -790,  -790,  -790,   591,  -790,
1415 >     -26,  -790,  -790,  -790,   973,   975,   976,  -790,   514,  -790,
1416 >     709,  -790,   638,   959,   960,   961,   517,  -790,  -790,   692,
1417 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1418 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1419 >    -790,  -790,    67,  -790,  -790,  -790,   517,  -790
1420   };
1421  
1422 < /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
1423 <   Performed when YYTABLE doesn't specify something else to do.  Zero
1424 <   means the default is an error.  */
1422 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1423 >     Performed when YYTABLE does not specify something else to do.  Zero
1424 >     means the default is an error.  */
1425   static const yytype_uint16 yydefact[] =
1426   {
1427 <       2,     0,     1,     0,     0,     0,   196,   356,   420,     0,
1428 <     435,     0,   610,   254,   405,   230,     0,     0,   126,   291,
1429 <       0,     0,   308,   333,     0,     3,    24,    11,     4,     5,
1430 <       6,     8,     9,    10,    13,    14,    15,    16,    17,    18,
1431 <      19,    20,    23,    21,    22,     7,    12,    25,    26,     0,
1775 <       0,   198,   358,     0,     0,     0,     0,     0,     0,     0,
1776 <       0,     0,     0,   128,     0,     0,     0,     0,     0,     0,
1777 <       0,     0,     0,     0,     0,    84,    85,    87,    86,   658,
1427 >       2,     0,     1,     0,     0,     0,   215,   380,   428,     0,
1428 >     443,     0,   283,   419,   259,     0,    99,   139,   317,     0,
1429 >       0,   358,     0,     0,   334,     3,    23,    11,     4,    24,
1430 >       5,     6,     8,     9,    10,    13,    14,    15,    16,    17,
1431 >      18,    19,    20,    22,    21,     7,    12,    25,    26,     0,
1432         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1779       0,     0,     0,     0,     0,     0,     0,     0,     0,   639,
1780     657,   652,   640,   641,   642,   643,   645,   646,   647,   648,
1781     644,   649,   650,   651,   653,   654,   655,   656,   217,     0,
1782     199,   378,     0,   359,     0,   433,     0,     0,   431,   432,
1783       0,   508,     0,     0,     0,     0,     0,     0,     0,     0,
1433         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1434 +       0,     0,     0,     0,     0,    91,    92,    94,    93,   623,
1435         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1436 <       0,     0,     0,   583,     0,   560,     0,     0,     0,     0,
1436 >       0,     0,     0,     0,     0,   608,   622,   610,   611,   612,
1437 >     613,   614,   615,   609,   616,   617,   618,   619,   620,   621,
1438 >       0,     0,     0,   441,     0,     0,   439,   440,     0,   505,
1439         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1788       0,     0,     0,     0,     0,     0,     0,     0,   452,   506,
1789     501,   502,   499,   503,   504,   500,   463,   453,   454,   491,
1790     455,   456,   457,   458,   459,   460,   461,   462,   496,   464,
1791     465,   466,   467,   505,   469,   474,   470,   472,   471,   485,
1792     486,   473,   475,   476,   477,   478,   479,   468,   481,   490,
1793     492,   493,   482,   483,   507,   497,   498,   495,   484,   480,
1794     488,   489,   487,   494,     0,     0,     0,     0,     0,     0,
1440         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1441 <       0,     0,    94,    95,    96,    99,   106,   100,   104,   101,
1442 <     102,   105,   103,    97,    98,     0,     0,     0,     0,    43,
1798 <      44,    45,   142,     0,   129,     0,   687,     0,     0,     0,
1799 <       0,     0,     0,     0,     0,   679,   680,   681,   685,   682,
1800 <     684,   683,   686,     0,     0,     0,     0,     0,     0,     0,
1801 <       0,    65,     0,     0,     0,     0,     0,    51,    63,    62,
1802 <      59,    52,    61,    55,    56,    57,    53,    60,    58,    54,
1803 <       0,     0,   306,     0,     0,   304,   305,    88,     0,     0,
1804 <       0,     0,    83,     0,     0,     0,     0,     0,     0,     0,
1441 >       0,     0,     0,     0,     0,     0,     0,     0,   579,     0,
1442 >     553,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1443         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1444 <       0,     0,   638,     0,     0,   426,     0,     0,     0,   423,
1445 <     424,   425,     0,     0,   430,   447,     0,     0,   437,   446,
1446 <       0,   443,   444,   445,     0,     0,     0,     0,     0,     0,
1444 >       0,   454,   455,   456,   502,   504,   496,   497,   498,   499,
1445 >     500,   495,   467,   457,   458,   459,   460,   461,   462,   463,
1446 >     464,   465,   466,   492,   468,   469,   501,   471,   476,   477,
1447 >     472,   474,   473,   485,   486,   475,   478,   479,   480,   481,
1448 >     470,   483,   503,   493,   494,   490,   491,   484,   482,   488,
1449 >     489,   487,     0,     0,     0,     0,     0,     0,     0,    45,
1450 >      46,    47,     0,     0,     0,   649,     0,     0,     0,     0,
1451 >       0,     0,     0,     0,     0,   640,   641,   642,   643,   644,
1452 >     647,   645,   646,   648,     0,     0,     0,     0,     0,     0,
1453         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1454 +       0,     0,     0,    53,    68,    65,    63,    69,    70,    64,
1455 +      54,    67,    57,    58,    59,    55,    66,    60,    61,    62,
1456 +      56,     0,     0,     0,     0,   110,   111,   112,     0,   332,
1457 +       0,     0,   330,   331,     0,    95,     0,     0,     0,     0,
1458 +      90,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1459 +       0,     0,     0,     0,     0,     0,   607,     0,     0,     0,
1460 +       0,   253,     0,     0,     0,     0,     0,     0,     0,     0,
1461 +       0,     0,     0,     0,     0,     0,   218,   219,   222,   224,
1462 +     225,   226,   227,   228,   229,   230,   231,   232,   220,   221,
1463 +     223,   233,   234,   235,     0,     0,     0,     0,     0,     0,
1464 +       0,   408,     0,     0,     0,     0,     0,     0,     0,     0,
1465 +     383,   384,   385,   386,   387,   388,   389,   391,   390,   393,
1466 +     397,   394,   395,   396,   392,   434,     0,     0,     0,   431,
1467 +     432,   433,     0,     0,   438,   449,     0,     0,     0,   446,
1468 +     447,   448,     0,     0,     0,     0,     0,     0,     0,     0,
1469         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1470         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1471         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1472         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1473 <     451,   620,   631,     0,     0,   623,     0,     0,     0,   613,
1474 <     614,   615,   616,   617,   618,   619,     0,     0,     0,   271,
1475 <       0,     0,     0,     0,     0,     0,   257,   258,   259,   260,
1476 <     265,   261,   262,   263,   264,   417,     0,   407,     0,   416,
1477 <       0,   413,   414,   415,     0,   232,     0,     0,     0,   242,
1478 <       0,   240,   241,   243,   244,   107,     0,     0,     0,     0,
1479 <       0,     0,     0,     0,     0,     0,     0,     0,     0,    93,
1480 <      46,     0,     0,     0,    42,     0,     0,     0,     0,     0,
1481 <       0,   294,   295,   296,   297,     0,     0,     0,     0,     0,
1482 <       0,     0,     0,   678,    64,     0,     0,     0,     0,     0,
1824 <       0,     0,     0,     0,     0,     0,     0,     0,    50,     0,
1825 <       0,   318,     0,     0,   311,   312,   313,   314,     0,     0,
1826 <     341,     0,   336,   337,   338,     0,     0,   303,     0,     0,
1827 <       0,    82,     0,     0,     0,     0,     0,    27,     0,     0,
1473 >       0,     0,     0,   453,     0,     0,     0,   300,     0,     0,
1474 >       0,     0,     0,     0,   286,   287,   288,   289,   294,   290,
1475 >     291,   292,   293,   425,     0,     0,     0,   422,   423,   424,
1476 >       0,     0,     0,   261,     0,   271,     0,   269,   270,   272,
1477 >     273,    48,     0,     0,     0,    44,     0,     0,     0,     0,
1478 >     102,   103,   104,     0,     0,     0,   188,     0,     0,     0,
1479 >       0,     0,   162,     0,     0,   142,   143,   144,   145,   148,
1480 >     149,   150,   151,   147,   146,   152,     0,     0,     0,     0,
1481 >       0,   320,   321,   322,   323,     0,     0,     0,     0,     0,
1482 >       0,     0,     0,     0,   639,    71,     0,     0,     0,     0,
1483         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1484 <       0,   637,     0,     0,     0,     0,     0,     0,     0,     0,
1485 <       0,     0,     0,     0,     0,     0,     0,   201,   202,   205,
1486 <     206,   208,   209,   210,   211,   212,   213,   214,   203,   204,
1487 <     207,     0,     0,     0,     0,     0,     0,   386,     0,     0,
1488 <       0,     0,     0,     0,     0,     0,     0,   361,   362,   363,
1834 <     364,   365,   366,   368,   367,   369,   374,   373,   370,   371,
1835 <     372,   375,     0,     0,     0,   422,     0,   429,     0,     0,
1836 <       0,     0,   442,     0,     0,     0,     0,     0,     0,     0,
1484 >       0,     0,     0,     0,    52,     0,     0,   366,     0,   361,
1485 >     362,   363,   113,     0,     0,   109,     0,     0,     0,   329,
1486 >       0,     0,   344,     0,     0,   337,   338,   339,   340,     0,
1487 >       0,     0,    89,     0,     0,     0,     0,    27,     0,     0,
1488 >       0,     0,     0,     0,     0,     0,     0,     0,   606,   236,
1489         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1490 +       0,     0,     0,     0,     0,     0,     0,     0,   217,   398,
1491         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1492 +       0,     0,     0,     0,     0,   382,     0,     0,     0,   430,
1493 +       0,   437,     0,     0,     0,   445,     0,     0,     0,     0,
1494         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1495         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1841       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
1842       0,   450,     0,     0,     0,     0,     0,     0,     0,   612,
1843     266,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1844     256,     0,     0,     0,     0,   412,   245,     0,     0,     0,
1845       0,     0,   239,     0,     0,     0,     0,     0,     0,     0,
1496         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1847       0,    92,     0,     0,    41,     0,     0,     0,   171,     0,
1848       0,     0,   148,     0,     0,   131,   132,   133,   134,   137,
1849     138,   136,   135,   139,   298,     0,     0,     0,     0,   293,
1850       0,     0,     0,     0,     0,     0,     0,   677,     0,     0,
1497         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1498 <      49,   315,     0,     0,     0,     0,   310,   339,     0,     0,
1499 <       0,   335,     0,   302,    91,    90,    89,   674,   671,   670,
1500 <     659,   661,    27,    27,    27,    27,    27,    29,    28,   665,
1501 <     666,   669,   667,   672,   673,   675,   676,   668,   660,   662,
1856 <     663,   664,   215,     0,     0,     0,     0,     0,     0,     0,
1857 <       0,     0,     0,     0,     0,     0,     0,   200,   376,     0,
1498 >       0,     0,     0,     0,     0,     0,     0,     0,   452,   295,
1499 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   285,
1500 >       0,     0,     0,   421,   274,     0,     0,     0,     0,     0,
1501 >     268,     0,     0,    43,   105,     0,     0,     0,   101,   153,
1502         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1503 <       0,     0,     0,     0,   360,     0,     0,   421,   434,     0,
1504 <       0,     0,   436,   521,   525,   512,   541,   553,   552,   608,
1505 <     558,   519,   549,   555,   520,   510,   511,   528,   517,   518,
1506 <     531,   516,   530,   529,   524,   523,   522,   550,   509,   548,
1507 <     606,   607,   545,   542,   587,   603,   604,   588,   589,   590,
1508 <     591,   598,   592,   601,   605,   594,   599,   595,   600,   593,
1509 <     597,   596,   602,     0,   586,   547,   564,   580,   581,   565,
1510 <     566,   567,   568,   575,   569,   578,   582,   571,   576,   572,
1511 <     577,   570,   574,   573,   579,     0,   563,   540,   543,   557,
1512 <     514,   551,   515,   544,   533,   538,   539,   536,   537,   534,
1513 <     535,   527,   526,    35,    35,    35,    37,    36,   609,   556,
1514 <     559,   546,   554,   513,   532,     0,     0,     0,     0,     0,
1515 <       0,   611,     0,     0,   277,     0,     0,     0,     0,     0,
1516 <     255,     0,     0,     0,   406,     0,     0,     0,   250,   246,
1517 <     249,   231,   111,   117,   115,   114,   116,   112,   113,   110,
1518 <     118,   124,   119,   123,   121,   122,   120,   109,   108,   125,
1519 <      47,    48,   140,     0,     0,     0,     0,     0,     0,     0,
1520 <       0,     0,   130,     0,     0,     0,   292,   693,   688,   692,
1521 <     690,   694,   689,   691,    75,    81,    73,    77,    76,    72,
1522 <      71,    69,    70,     0,    68,    74,    80,    78,    79,     0,
1523 <       0,     0,   309,     0,     0,   334,   307,    30,    31,    32,
1524 <      33,    34,     0,     0,     0,     0,     0,     0,     0,     0,
1525 <       0,     0,     0,     0,     0,   197,     0,     0,     0,     0,
1526 <       0,     0,   392,     0,     0,     0,     0,     0,     0,     0,
1527 <       0,   357,   427,   428,   448,   449,   441,     0,   440,   584,
1528 <       0,   561,     0,    38,    39,    40,   636,   635,     0,   634,
1529 <     622,   621,   628,   627,     0,   626,   630,   629,   269,   270,
1530 <     275,     0,   274,     0,   268,   290,   289,   288,   267,   419,
1531 <     411,     0,   410,   418,   237,   238,   236,     0,   235,   253,
1532 <     252,     0,     0,     0,     0,     0,   177,     0,     0,     0,
1533 <       0,     0,   127,   300,   301,   299,    66,     0,   316,   322,
1534 <     328,   332,   331,   330,   327,   323,   326,   329,   324,   325,
1535 <       0,   321,   317,   340,   345,   351,   355,   354,   353,   350,
1536 <     346,   349,   352,   347,   348,     0,   344,   227,   228,   221,
1537 <     223,   225,   224,   222,   216,   229,   220,   218,   219,   226,
1538 <     382,   384,   385,   404,   403,   400,   390,     0,   389,     0,
1539 <     379,   401,   402,   377,   383,   399,   381,   380,   438,     0,
1540 <     585,   562,   632,     0,   624,     0,     0,   272,   277,   283,
1541 <     280,   285,   282,   281,   287,   284,   286,   279,   278,   408,
1542 <       0,   233,     0,   251,   248,   247,   147,   145,   175,     0,
1543 <     174,     0,   141,   144,   146,   152,   168,   169,   153,   154,
1544 <     155,   156,   163,   157,   166,   170,   159,   164,   160,   165,
1545 <     158,   162,   161,   167,     0,   151,   143,    67,   319,     0,
1546 <     342,     0,     0,   387,   392,   396,   397,   394,   395,   398,
1547 <     393,   439,   633,   625,   276,   273,   409,   234,     0,   172,
1548 <     177,   187,   185,   195,   184,   179,   188,   193,   181,   189,
1549 <     192,   186,   180,   194,   190,   191,   182,   183,   178,   149,
1550 <       0,   320,   343,   391,   388,   176,   173,   150
1551 < };
1552 <
1553 < /* YYDEFGOTO[NTERM-NUM].  */
1554 < static const yytype_int16 yydefgoto[] =
1555 < {
1556 <      -1,     1,    25,   847,   848,   996,   997,    26,   278,   279,
1913 <     280,   281,    27,   316,   317,   318,   542,  1083,  1084,   319,
1914 <     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
1915 <      28,    74,    75,    76,    77,    78,    29,   261,   262,   263,
1916 <     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
1917 <     274,    30,    63,   283,   784,   785,   786,   284,   787,   788,
1918 <     789,   790,   791,   792,  1059,  1314,  1315,   793,  1055,  1289,
1919 <    1290,  1338,  1291,  1358,    31,    51,   119,   606,   607,   608,
1920 <     120,   609,   610,   611,   612,   613,   614,   615,   616,   617,
1921 <     618,   619,   620,    32,    60,   489,   747,  1177,  1178,   490,
1922 <     491,   492,  1183,  1029,  1030,   493,   494,    33,    58,   465,
1923 <     466,   467,   468,   469,   470,   471,   733,  1161,  1162,  1266,
1924 <    1163,  1278,   472,   473,   474,    34,    64,   520,   521,   522,
1925 <     523,   524,    35,   334,   335,   336,    36,    67,   553,   554,
1926 <     555,   556,   557,   823,  1210,  1211,    37,    68,   561,   562,
1927 <     563,   564,   829,  1225,  1226,    38,    52,   122,   636,   637,
1928 <     638,   123,   639,   640,   641,   642,   643,   644,   645,   884,
1929 <    1247,  1248,  1322,  1249,  1330,   646,   647,   648,   649,   650,
1930 <     651,    39,    59,   479,   742,  1171,  1172,   480,   481,   482,
1931 <     483,    40,    53,   368,   369,   370,   371,    41,   127,   128,
1932 <     129,    42,    55,   379,   660,  1137,  1138,   380,   381,   382,
1933 <     383,    43,   187,   188,   189,   190,   191,   192,   193,   194,
1934 <     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1935 <     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1936 <     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1937 <     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
1938 <     235,   236,   237,   238,   417,   975,   976,   239,   415,   953,
1939 <     954,   240,   241,   242,   243,    44,    57,   448,   449,   450,
1940 <     451,   452,   725,  1154,  1155,   453,   454,   455,   722,  1148,
1941 <    1149,    45,    98,    99,   100,   101,   102,   103,   104,   105,
1942 <     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
1943 <     116,   117,    46,   294,   295,   296,   297,   298,   299,   300,
1944 <     301,   302
1503 >       0,   141,   324,     0,     0,     0,     0,   319,     0,     0,
1504 >       0,     0,     0,     0,     0,     0,   638,     0,     0,     0,
1505 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1506 >       0,     0,     0,     0,    51,   364,     0,     0,     0,   360,
1507 >       0,   108,     0,     0,   328,   341,     0,     0,     0,     0,
1508 >     336,    98,    97,    96,   633,   632,   624,   625,    27,    27,
1509 >      27,    27,    27,    27,    27,    29,    28,   626,   636,   637,
1510 >     627,   628,   629,   631,   630,   634,   635,     0,     0,     0,
1511 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1512 >       0,     0,    37,     0,     0,   216,     0,     0,     0,     0,
1513 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1514 >       0,   381,     0,     0,   429,   442,     0,     0,   444,   520,
1515 >     524,   506,   507,   539,   509,   605,   550,   546,   519,   511,
1516 >     510,   513,   514,   512,   527,   517,   518,   528,   516,   523,
1517 >     522,   521,   547,   508,   603,   604,   543,   589,   583,   599,
1518 >     584,   585,   586,   594,   602,   587,   596,   600,   590,   601,
1519 >     591,   595,   588,   598,   593,   592,   597,     0,   582,   545,
1520 >     562,   563,   564,   557,   575,   558,   559,   560,   570,   578,
1521 >     561,   572,   576,   566,   577,   567,   571,   565,   574,   569,
1522 >     568,   573,     0,   556,   540,   538,   541,   549,   542,   530,
1523 >     536,   537,   534,   535,   531,   532,   533,   548,   551,   552,
1524 >     515,   544,   526,   525,   529,     0,     0,     0,     0,     0,
1525 >       0,     0,     0,   284,     0,     0,   420,     0,     0,     0,
1526 >     279,   275,   278,   260,    49,    50,     0,     0,   100,     0,
1527 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   140,
1528 >       0,     0,     0,   318,   651,   650,   656,   654,   657,   652,
1529 >     653,   655,    80,    88,    79,    86,    87,    78,    82,    81,
1530 >      73,    72,    77,    74,    76,    85,    75,    83,    84,     0,
1531 >       0,   359,   114,     0,     0,     0,   126,     0,   118,   119,
1532 >     121,   120,   333,     0,     0,     0,   335,    30,    31,    32,
1533 >      33,    34,    35,    36,   248,   249,   240,   258,   257,     0,
1534 >     256,   241,   243,   245,   252,   244,   242,   251,   237,   250,
1535 >     239,   238,    37,    37,    37,    39,    38,   246,   247,   403,
1536 >     406,   407,   417,   414,   400,   415,   412,   413,     0,   411,
1537 >     416,   399,   405,   402,   404,   418,   401,   435,   436,   450,
1538 >     451,   580,     0,   554,     0,   298,   299,   308,   305,   310,
1539 >     306,   307,   313,   309,   311,   304,   312,     0,   303,   297,
1540 >     316,   315,   314,   296,   427,   426,   282,   281,   266,   267,
1541 >     265,     0,   264,     0,     0,     0,   106,   107,   161,   157,
1542 >     208,   195,   205,   204,   193,   198,   214,   207,   212,   197,
1543 >     200,   209,   211,   206,   213,   201,   203,   210,   199,   202,
1544 >       0,   191,   154,   156,   158,   159,   160,   171,   172,   173,
1545 >     166,   184,   167,   168,   169,   179,   187,   170,   181,   185,
1546 >     175,   186,   176,   180,   174,   183,   178,   177,   182,     0,
1547 >     165,   155,   327,   325,   326,   365,   370,   376,   379,   372,
1548 >     378,   373,   377,   375,   371,   374,     0,   369,   122,     0,
1549 >       0,     0,     0,   117,   342,   348,   354,   357,   350,   356,
1550 >     351,   355,   353,   349,   352,     0,   347,   343,   254,     0,
1551 >      40,    41,    42,   409,     0,   581,   555,   301,     0,   262,
1552 >       0,   280,   277,   276,     0,     0,     0,   189,     0,   163,
1553 >       0,   367,     0,     0,     0,     0,     0,   116,   345,     0,
1554 >     255,   410,   302,   263,   194,   192,   196,   190,   164,   368,
1555 >     123,   125,   124,   132,   137,   136,   131,   134,   138,   135,
1556 >     130,   133,     0,   129,   346,   127,     0,   128
1557   };
1558  
1559 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1560 <   STATE-NUM.  */
1949 < #define YYPACT_NINF -622
1950 < static const yytype_int16 yypact[] =
1559 >  /* YYPGOTO[NTERM-NUM].  */
1560 > static const yytype_int16 yypgoto[] =
1561   {
1562 <    -622,   715,  -622,  -218,  -245,  -237,  -622,  -622,  -622,  -231,
1563 <    -622,  -228,  -622,  -622,  -622,  -622,  -202,  -196,  -622,  -622,
1564 <    -194,  -191,  -622,  -622,  -185,  -622,  -622,  -622,  -622,  -622,
1565 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1566 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   298,
1567 <     644,  -140,   -61,  -183,    16,  -161,   429,  -150,  -147,  -144,
1568 <    -124,   432,    75,    -9,  -109,   564,   248,   -88,   -70,    20,
1569 <     -45,   -64,   -16,   -13,     2,  -622,  -622,  -622,  -622,  -622,
1570 <      -6,     9,    23,    36,    50,    63,    82,    83,    92,    93,
1571 <      95,    98,    99,   101,   103,   106,   113,   115,   130,  -622,
1572 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1573 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -28,
1574 <    -622,  -622,     5,  -622,    24,  -622,   116,    48,  -622,  -622,
1575 <     132,  -622,   120,   121,   123,   124,   125,   127,   129,   134,
1576 <     135,   136,   139,   140,   141,   142,   144,   145,   146,   148,
1577 <     151,   153,   154,   157,   161,   162,   163,   164,   168,   171,
1578 <     172,   179,   180,  -622,   182,  -622,   189,   190,   191,   194,
1579 <     198,   199,   200,   201,   202,   204,   205,   206,   211,   212,
1580 <     214,   215,   217,   218,   219,   220,   230,    15,  -622,  -622,
1581 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1582 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1583 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1584 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1585 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1586 <    -622,  -622,  -622,  -622,   301,   510,     3,   236,   234,   232,
1587 <     233,   237,   238,   242,   243,   244,   245,   249,   252,   255,
1588 <     259,   185,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1589 <    -622,  -622,  -622,  -622,  -622,   239,   260,   265,    30,  -622,
1590 <    -622,  -622,  -622,   131,  -622,    29,  -622,   266,   268,   270,
1591 <     272,   281,   282,   284,    35,  -622,  -622,  -622,  -622,  -622,
1982 <    -622,  -622,  -622,   288,   290,   295,   296,   297,   306,   307,
1983 <     313,  -622,   314,   316,   324,   325,   195,  -622,  -622,  -622,
1984 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1985 <     105,   186,  -622,   326,    39,  -622,  -622,  -622,   246,   308,
1986 <     406,   331,  -622,   399,   261,   466,   401,   402,   470,   470,
1987 <     471,   474,   411,   412,   479,   470,   415,   417,   418,   419,
1988 <     421,   340,  -622,   702,   550,  -622,   354,   360,     7,  -622,
1989 <    -622,  -622,   475,   364,  -622,  -622,   365,   366,  -622,  -622,
1990 <      19,  -622,  -622,  -622,   436,   470,   438,   470,   506,   486,
1991 <     511,   447,   452,   519,   499,   456,   523,   524,   527,   463,
1992 <     464,   465,   470,   512,   467,   537,   538,   470,   540,   547,
1993 <     529,   552,   553,   492,   493,   433,   504,   437,   470,   470,
1994 <     507,   470,   554,   509,   513,   514,  -103,   -48,   517,   518,
1995 <     470,   470,   577,   556,   470,   522,   526,   528,   531,   449,
1996 <    -622,  -622,  -622,   455,   458,  -622,   468,   469,    18,  -622,
1997 <    -622,  -622,  -622,  -622,  -622,  -622,   473,   477,   480,  -622,
1998 <     481,   482,   485,   487,   488,    73,  -622,  -622,  -622,  -622,
1999 <    -622,  -622,  -622,  -622,  -622,  -622,   490,  -622,   491,  -622,
2000 <      14,  -622,  -622,  -622,   476,  -622,   494,   496,   497,  -622,
2001 <     133,  -622,  -622,  -622,  -622,  -622,   578,   579,   584,   605,
2002 <     606,   611,   613,   615,   472,   616,   619,   533,   520,  -622,
2003 <    -622,   620,   623,   521,  -622,   278,   530,   508,   525,   534,
2004 <      76,  -622,  -622,  -622,  -622,   580,   581,   588,   633,   593,
2005 <     597,   470,   532,  -622,  -622,   643,   600,   648,   649,   650,
2006 <     651,   653,   546,   660,   685,   665,   666,   557,  -622,   558,
2007 <     559,  -622,   560,    62,  -622,  -622,  -622,  -622,   565,   561,
2008 <    -622,    27,  -622,  -622,  -622,   670,   566,  -622,   567,   569,
2009 <     570,  -622,   574,   575,   582,   585,   586,   410,   587,   591,
2010 <     592,   594,   595,   598,   599,   601,   602,   609,   610,   622,
2011 <     624,  -622,   626,   576,   590,   608,   617,   618,   625,   627,
2012 <     641,   652,   654,   655,   656,   657,   188,  -622,  -622,  -622,
2013 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2014 <    -622,   629,   658,   659,   663,   667,   668,  -622,   671,   672,
2015 <     679,   682,   686,   687,   689,   690,   178,  -622,  -622,  -622,
2016 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2017 <    -622,  -622,   688,   691,   631,  -622,   647,  -622,   694,   710,
2018 <     692,   673,  -622,   696,   697,   699,   700,   704,   708,   709,
2019 <     711,   712,   713,   720,   723,   727,   728,   730,   731,   732,
2020 <     733,   734,   735,   737,   738,   742,   746,   747,   749,   750,
2021 <     751,   753,   754,   755,   698,   756,   736,   757,   758,   759,
2022 <     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
2023 <     770,   771,   772,   293,   773,   775,   776,   777,   778,   779,
2024 <     780,  -622,   695,   470,   646,   781,   726,   729,   782,  -622,
2025 <    -622,   846,   693,   783,   884,   784,   891,   893,   895,   787,
2026 <    -622,   898,   786,   900,   791,  -622,  -622,   789,   903,   904,
2027 <     788,   795,  -622,   796,   797,   798,   799,   800,   801,   802,
2028 <     803,   804,   805,   806,   807,   808,   809,   810,   811,   812,
2029 <     813,  -622,   814,   815,  -622,   816,   817,   818,  -622,   819,
2030 <     820,   821,  -622,   822,     4,  -622,  -622,  -622,  -622,  -622,
2031 <    -622,  -622,  -622,  -622,  -622,   927,   928,   929,   826,  -622,
2032 <     827,   828,   829,   830,   831,   832,   833,  -622,   834,   835,
2033 <     836,   837,   838,   839,   840,   165,   841,   842,   843,   844,
2034 <    -622,  -622,   955,   845,   956,   847,  -622,  -622,   959,   848,
2035 <     850,  -622,   852,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2036 <    -622,  -622,   470,   470,   470,   470,   470,  -622,  -622,  -622,
2037 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2038 <    -622,  -622,  -622,   985,   986,   470,   987,   988,   989,   990,
2039 <     969,   992,   993,   470,   470,   577,   862,  -622,  -622,   973,
2040 <     126,   974,   975,   717,   863,   977,   978,   979,   980,  1003,
2041 <     982,   983,   984,   875,  -622,   876,   877,  -622,  -622,   878,
2042 <     879,   991,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2043 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2044 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2045 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2046 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2047 <    -622,  -622,  -622,  -252,  -622,  -622,  -622,  -622,  -622,  -622,
2048 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2049 <    -622,  -622,  -622,  -622,  -622,  -251,  -622,  -622,  -622,  -622,
2050 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2051 <    -622,  -622,  -622,   577,   577,   577,  -622,  -622,  -622,  -622,
2052 <    -622,  -622,  -622,  -622,  -622,    -5,   880,   881,    22,   882,
2053 <     883,  -622,   885,   887,  1017,   888,   889,   890,   892,   894,
2054 <    -622,   896,   996,   897,  -622,   -63,   899,   901,   638,   902,
2055 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2056 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2057 <    -622,  -622,  -622,  1005,   964,   905,  1010,  1012,  1013,   906,
2058 <    1014,   907,  -622,   910,   911,   912,  -622,  -622,  -622,  -622,
2059 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2060 <    -622,  -622,  -622,  -220,  -622,  -622,  -622,  -622,  -622,   913,
2061 <     621,   914,  -622,   915,   628,  -622,  -622,  -622,  -622,  -622,
2062 <    -622,  -622,   916,   917,   918,   919,   920,   921,   922,   923,
2063 <     924,   925,   926,   930,   931,  -622,   932,   933,   934,   935,
2064 <     936,   937,  1026,   938,   939,   940,   941,   942,   943,   944,
2065 <     945,  -622,  -622,  -622,  -622,  -622,  -622,  -210,  -622,  -622,
2066 <     698,  -622,   736,  -622,  -622,  -622,  -622,  -622,  -197,  -622,
2067 <    -622,  -622,  -622,  -622,  -174,  -622,  -622,  -622,  -622,  -622,
2068 <    -622,  -156,  -622,   358,  -622,  -622,  -622,  -622,  -622,  -622,
2069 <    -622,  -121,  -622,  -622,  -622,  -622,  -622,  -100,  -622,  -622,
2070 <    -622,  1037,   788,   946,   947,   948,  1060,   949,   950,   951,
2071 <     774,   952,  -622,  -622,  -622,  -622,  -622,   165,  -622,  -622,
2072 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2073 <     -87,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2074 <    -622,  -622,  -622,  -622,  -622,   -71,  -622,  -622,  -622,  -622,
2075 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2076 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,   -29,  -622,    69,
2077 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   991,
2078 <    -622,  -622,  -622,    -5,  -622,    22,   358,  -622,  1017,  -622,
2079 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2080 <     996,  -622,   -63,  -622,  -622,  -622,  -622,  -622,  -622,    64,
2081 <    -622,   515,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2082 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2083 <    -622,  -622,  -622,  -622,    78,  -622,  -622,  -622,  -622,   621,
2084 <    -622,   628,    69,  -622,  1026,  -622,  -622,  -622,  -622,  -622,
2085 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   515,  -622,
2086 <    1060,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2087 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2088 <     774,  -622,  -622,  -622,  -622,  -622,  -622,  -622
1562 >    -790,  -790,  -790,  -789,  -313,  -723,  -635,  -790,  -790,   952,
1563 >    -790,  -790,  -790,  -790,   954,  -790,  -790,  -790,  -790,  -790,
1564 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1565 >    -790,  -790,  -790,  -790,  1041,  -790,  -790,  -790,  -790,  -790,
1566 >    -790,   607,  -790,  -790,  -790,  -790,   858,  -790,  -790,  -790,
1567 >    -790,    74,  -790,  -790,  -790,  -790,  -790,  -170,  -790,  -790,
1568 >    -790,   593,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1569 >    -790,  -790,  -790,  -138,  -790,  -790,  -790,  -129,  -790,  -790,
1570 >    -790,   955,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1571 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1572 >    -790,  -107,  -790,  -790,  -790,  -790,  -790,  -114,  -790,   651,
1573 >    -790,  -790,  -790,    -7,  -790,  -790,  -790,  -790,  -790,   678,
1574 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -105,  -790,  -790,
1575 >    -790,  -790,  -790,  -790,   615,  -790,  -790,  -790,  -790,  -790,
1576 >     956,  -790,  -790,  -790,  -790,   563,  -790,  -790,  -790,  -790,
1577 >    -790,  -109,  -790,  -790,  -790,   562,  -790,  -790,  -790,  -790,
1578 >     -87,  -790,  -790,  -790,   805,  -790,  -790,  -790,  -790,  -790,
1579 >    -790,  -790,  -790,  -790,  -790,  -790,   -56,  -790,  -790,  -790,
1580 >    -790,  -790,  -790,  -790,  -790,   696,  -790,  -790,  -790,  -790,
1581 >    -790,   962,  -790,  -790,  -790,  -790,  1066,  -790,  -790,  -790,
1582 >    -790,   963,  -790,  -790,  -790,  -790,  1023,  -790,  -790,  -790,
1583 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1584 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1585 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1586 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1587 >    -790,  -790,  -790,  -790,  -790,    80,  -790,  -790,  -790,    85,
1588 >    -790,  -790,  -790,  -790,  -790,  1101,  -790,  -790,  -790,  -790,
1589 >    -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1590 >    -790,  -790,   964,  -790,  -790,  -790,  -790,  -790,  -790,  -790,
1591 >    -790
1592   };
1593  
1594 < /* YYPGOTO[NTERM-NUM].  */
1595 < static const yytype_int16 yypgoto[] =
1594 >  /* YYDEFGOTO[NTERM-NUM].  */
1595 > static const yytype_int16 yydefgoto[] =
1596   {
1597 <    -622,  -622,  -622,  -493,  -348,  -621,  -430,  -622,  -622,   501,
1598 <    -622,  -622,  -622,  -622,   873,  -622,  -622,  -622,  -282,  -622,
1599 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1600 <    -622,  -622,  1116,  -622,  -622,  -622,  -622,  -622,   953,  -622,
1601 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1602 <    -622,  -622,  -622,  -622,  -622,   431,  -622,  -622,  -622,  -622,
1603 <    -622,  -622,  -622,  -622,  -622,  -622,  -143,  -622,  -622,  -622,
1604 <    -122,  -622,  -622,  -119,  -622,  -622,  -622,  -622,   614,  -622,
1605 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1606 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -66,  -622,
1607 <     739,  -622,  -622,  -622,    40,  -622,  -622,  -622,  -622,  -622,
1608 <     785,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -47,  -622,
1609 <    -622,   -43,  -622,  -622,  -622,  -622,  -622,  -622,   705,  -622,
1610 <    -622,  -622,  -622,  -622,   908,  -622,  -622,  -622,  -622,   674,
1611 <    -622,  -622,  -622,  -622,  -622,   -95,  -622,  -622,  -622,   669,
1612 <    -622,  -622,  -622,  -622,   -93,  -622,  -622,  -622,  -622,   596,
1613 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1614 <    -622,   -98,  -622,  -622,   -91,  -622,  -622,  -622,  -622,  -622,
1615 <    -622,  -622,  -622,  -622,  -622,  -622,   -46,  -622,   790,  -622,
1616 <    -622,  -622,  -622,  -622,   865,  -622,  -622,  -622,  -622,  1108,
1617 <    -622,  -622,  -622,  -622,  -622,  -622,   -23,  -622,   857,  -622,
1618 <    -622,  -622,  -622,  1051,  -622,  -622,  -622,  -622,  -622,  -622,
1619 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1620 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1621 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1622 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1623 <    -622,  -622,  -622,  -622,  -622,  -622,    97,  -622,  -622,  -622,
1624 <     100,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   793,  -622,
1625 <    -622,  -622,  -622,  -622,   -22,  -622,  -622,  -622,  -622,  -622,
1626 <     -19,  -622,  -622,  1147,  -622,  -622,  -622,  -622,  -622,  -622,
2124 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
2125 <    -622,  -622,  -622,  -622,   954,  -622,  -622,  -622,  -622,  -622,
2126 <    -622,  -622
1597 >      -1,     1,    25,   825,   826,  1085,  1086,    26,   228,   229,
1598 >     230,   231,    27,   272,   273,   274,   275,   276,   277,   278,
1599 >     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
1600 >     289,   290,    28,    74,    75,    76,    77,    78,    29,    61,
1601 >     509,   510,   511,   512,    30,   294,   295,   296,   297,   298,
1602 >    1047,  1048,  1049,  1050,  1051,  1221,  1292,  1293,    31,    62,
1603 >     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
1604 >     534,   758,  1199,  1200,   535,   752,  1170,  1171,    32,    51,
1605 >     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
1606 >     355,   356,   357,   358,   359,   360,   361,   362,   363,   623,
1607 >    1069,  1070,    33,    59,   495,   737,  1141,  1142,   496,   497,
1608 >     498,  1145,   991,   992,   499,   500,    34,    57,   473,   474,
1609 >     475,   476,   477,   478,   479,   722,  1127,  1128,   480,   481,
1610 >     482,    35,    63,   540,   541,   542,   543,   544,    36,   301,
1611 >     302,   303,    37,    69,   594,   595,   596,   597,   598,   807,
1612 >    1235,  1236,    38,    66,   578,   579,   580,   581,   797,  1216,
1613 >    1217,    39,    52,   379,   380,   381,   382,   383,   384,   385,
1614 >     386,   387,   388,   389,   646,  1098,  1099,   390,   391,   392,
1615 >     393,   394,    40,    58,   486,   487,   488,   489,    41,    53,
1616 >     398,   399,   400,   401,    42,   115,   116,   117,    43,    55,
1617 >     408,   409,   410,   411,    44,   170,   171,   172,   173,   174,
1618 >     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
1619 >     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
1620 >     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1621 >     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1622 >     215,   216,   217,   442,   952,   953,   218,   440,   927,   928,
1623 >     219,   220,   221,    45,    94,    95,    96,    97,    98,    99,
1624 >     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
1625 >      46,   244,   245,   246,   247,   248,   249,   250,   251,   252,
1626 >     253
1627   };
1628  
1629 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1630 <   positive, shift that token.  If negative, reduce the rule which
1631 <   number is the opposite.  If YYTABLE_NINF, syntax error.  */
1632 < #define YYTABLE_NINF -1
2133 < static const yytype_uint16 yytable[] =
1629 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1630 >     positive, shift that token.  If negative, reduce the rule whose
1631 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1632 > static const yytype_int16 yytable[] =
1633   {
1634 <     578,   579,   714,    70,   475,   775,  1146,   585,   365,  1139,
1635 <    1141,   118,  1174,  1140,  1142,   475,   131,   125,    49,   441,
1636 <     375,   332,   442,   132,   133,   365,    50,   134,   558,   776,
1637 <     516,   275,    54,  1152,   135,    56,   286,   664,    71,   666,
1638 <     332,  1196,   136,    47,    48,  1197,   137,   138,    72,   125,
1639 <     517,  1258,   777,   139,   681,  1259,   778,   140,   141,   686,
1640 <     142,    61,   443,   549,  1262,   444,   143,    62,  1263,    65,
1641 <     697,   698,    66,   700,   456,   287,   275,   516,    69,  1325,
1642 <     124,  1326,   711,   712,   144,   145,   716,  1264,   288,   146,
1643 <     121,  1265,   705,   706,   366,  1327,   147,   517,   457,  1328,
1644 <     148,   149,   130,   126,   150,  1267,   549,   151,   152,  1268,
1645 <     289,   366,   290,   244,   291,   292,   245,   153,   445,   246,
1646 <      73,   458,   779,   154,   155,   459,   156,   157,   158,   159,
1647 <     160,    79,   293,   375,   484,   126,   446,   376,   333,   247,
1648 <    1279,   161,   282,    80,  1280,   559,   276,   707,   708,   780,
1649 <     162,   518,   163,   164,   285,   165,   476,   333,   166,   167,
1650 <     367,  1281,   168,    81,    82,  1282,  1175,   476,   781,    83,
1651 <    1176,    84,   377,   169,  1318,   330,   277,   367,  1319,   621,
1652 <     550,   622,   519,   806,   623,   485,   248,   558,   477,   592,
1653 <    1320,   276,  1147,   331,  1321,   170,   303,   171,   518,   477,
1654 <     338,   172,   624,   625,   378,   173,   174,   175,   176,   177,
1655 <     593,   594,   560,   178,   179,   486,   337,   595,   460,  1153,
1656 <     487,   277,   180,   550,    85,    86,   626,   461,   462,   519,
1657 <     627,   304,  1323,    87,    88,   363,  1324,   484,   782,   249,
1658 <     250,   251,   252,   253,   254,   255,   256,   551,   339,   303,
1659 <     376,   340,   478,   783,    89,    90,   181,   182,   343,   183,
1660 <     628,   463,   629,   478,   341,   184,  1061,   447,   364,   654,
1661 <     185,    91,    92,   344,   630,   186,   744,   439,   305,   775,
1662 <     728,   661,    93,   488,   304,   377,   257,   345,   485,   830,
1663 <     551,    94,   513,   596,   597,   598,   631,   532,   599,    70,
1664 <     346,   566,   441,   776,   559,   442,   600,   993,   994,   995,
1665 <     373,   552,  1329,   306,   347,   307,   308,   378,   486,   601,
1666 <     602,   258,   464,   487,   825,  1339,   777,   348,   632,  1340,
1667 <     778,   305,  1081,  1082,    71,   739,   603,   604,   798,  1359,
1668 <    1117,  1118,   633,  1360,    72,   443,   349,   350,   444,  1097,
1669 <    1098,  1099,  1100,  1101,   552,   634,   351,   352,   309,   353,
1670 <     310,   311,   354,   355,   605,   356,   306,   357,   307,   308,
1671 <     358,   560,  1143,  1144,  1145,  1006,   312,   359,  1269,   360,
1672 <     372,    95,    96,    97,   384,   385,   488,   386,   387,   388,
1673 <     573,   389,   361,   390,   515,   751,   779,   568,   391,   392,
1674 <     393,   445,   259,   394,   395,   396,   397,  1270,   398,   399,
1675 <     400,   309,   401,   310,   311,   402,    73,   403,   404,   446,
1676 <     313,   405,   713,   780,  1271,   406,   407,   408,   409,   312,
1677 <     131,  1272,   410,   248,   635,   411,   412,   132,   133,   260,
1678 <     893,   134,   781,   413,   414,  1114,   416,   508,   135,  1273,
1679 <     876,   314,   315,   418,   419,   420,   136,   547,   421,   569,
1680 <     137,   138,   422,   423,   424,   425,   426,   139,   427,   428,
1681 <     429,   140,   141,   313,   142,   430,   431,  1274,   432,   433,
1682 <     143,   434,   435,   436,   437,  1275,   249,   250,   251,   252,
1683 <     253,   254,   255,   256,   438,   495,   496,   497,   144,   145,
1684 <     510,   498,   499,   146,   314,   315,   500,   501,   502,   503,
1685 <     147,   456,   782,   504,   148,   149,   505,  1104,   150,   506,
1686 <    1341,   151,   152,   507,   511,  1112,  1113,   783,  1276,   512,
1687 <     525,   153,   526,   257,   527,   457,   528,   154,   155,   577,
1688 <     156,   157,   158,   159,   160,   529,   530,  1277,   531,   534,
1689 <     447,   621,  1342,   622,   535,   161,   623,   570,   458,   536,
1690 <     537,   538,   459,  1343,   162,   286,   163,   164,   258,   165,
1691 <     539,   540,   166,   167,   624,   625,   168,   541,   543,  1344,
1692 <     544,   842,   843,   844,   845,   846,  1345,   169,   545,   546,
1693 <     565,  1346,   571,  1347,   572,   574,   575,   576,   626,   577,
1694 <     580,   591,   627,   581,   287,  1348,   582,   583,   584,   170,
1695 <     586,   171,   587,   588,   589,   172,   590,   288,   652,   173,
1696 <     174,   175,   176,   177,   653,   657,   656,   178,   179,   658,
1697 <     659,   663,   628,   665,   629,   667,   180,   668,  1349,   289,
1698 <     669,   290,   670,   291,   292,    79,   630,   671,   672,   259,
1699 <     673,   674,   675,   676,  1350,   460,   677,    80,   678,   679,
1700 <     680,   293,   683,   682,   461,   462,   684,   685,   631,   687,
1701 <     181,   182,  1351,   183,  1352,  1353,   688,    81,    82,   184,
1702 <     689,   690,   691,    83,   185,    84,   260,   692,   693,   186,
1703 <     761,   762,   763,   764,   765,   766,   767,   694,   463,   695,
1704 <     632,   696,   699,   592,   702,   701,   713,   715,   703,   704,
1705 <     721,  1199,   709,   710,   633,     2,     3,   717,  1214,   723,
1706 <       4,   718,   724,   719,   593,   594,   720,   634,   770,   753,
1707 <     754,   595,   726,   727,   730,   755,     5,   746,    85,    86,
1708 <       6,   731,  1354,     7,   732,   734,   735,    87,    88,   736,
1709 <       8,   737,   738,  1355,   741,   743,   756,   757,   748,   464,
1710 <     749,   750,   758,  1356,   759,     9,   760,   768,    89,    90,
1711 <     769,   772,   795,  1357,   773,   800,   801,    10,    11,   514,
1712 <      12,   771,   774,   802,   803,    91,    92,    13,   804,   796,
1713 <    1200,   794,   805,   807,   808,   809,    93,  1215,   797,   810,
1714 <     811,   812,   813,    14,   814,    94,   635,   596,   597,   598,
1715 <     815,   816,   599,    15,   817,    16,   818,   819,   820,   821,
1716 <     600,   832,  1201,   822,   824,   828,   827,   833,   834,  1216,
1717 <     835,   836,    17,   601,   602,   837,   838,  1202,  1181,   895,
1718 <     863,  1007,   896,   839,  1217,   899,   840,   841,   849,    18,
1719 <     603,   604,   850,   851,   864,   852,   853,  1203,  1204,   854,
1720 <     855,   900,   856,   857,  1218,  1219,  1205,  1206,  1207,  1208,
1721 <     858,   859,   865,  1220,  1221,  1222,  1223,  1009,   605,  1209,
1722 <    1010,   866,   867,   860,    19,   861,  1224,   862,  1013,   868,
1723 <     878,   869,   897,    20,    21,    95,    96,    97,    22,    23,
1724 <     934,   935,   936,   937,   938,   870,   939,   940,   898,   941,
1725 <     942,   943,  1121,  1016,   944,  1317,   871,  1028,   872,   873,
1726 <     874,   875,   879,   880,   945,   946,   947,   881,   948,   949,
1727 <     950,   882,   883,   951,   902,   885,   886,   952,   956,   957,
1728 <     958,   959,   960,   887,   961,   962,   888,   963,   964,   965,
1729 <     889,   890,   966,   891,   892,    24,   901,   903,   904,  1005,
1730 <     905,   906,   967,   968,   969,   907,   970,   971,   972,   908,
1731 <     909,   973,   910,   911,   912,   974,  1295,  1296,  1297,  1298,
1732 <    1299,   913,  1300,  1301,   914,  1302,  1303,  1304,   915,   916,
1733 <    1305,   917,   918,   919,   920,   921,   922,  1012,   923,   924,
1734 <    1306,  1307,  1308,   925,  1309,  1310,  1311,   926,   927,  1312,
1735 <     928,   929,   930,  1313,   931,   932,   933,   955,   977,   978,
1736 <     979,   980,   981,   982,   983,   984,   985,   986,   987,   988,
1737 <     989,   990,   991,   992,   998,  1015,   999,  1000,  1001,  1002,
1738 <    1003,  1004,  1017,  1011,  1018,  1008,  1019,  1014,  1020,  1021,
1739 <    1022,  1023,  1024,  1025,  1026,  1027,  1031,  1032,  1033,  1034,
1740 <    1035,  1036,  1037,  1038,  1039,  1040,  1041,  1042,  1043,  1044,
1741 <    1045,  1046,  1047,  1048,  1049,  1050,  1051,  1052,  1063,  1064,
1742 <    1065,  1053,  1054,  1056,  1057,  1058,  1060,  1066,  1067,  1068,
1743 <    1069,  1070,  1071,  1072,  1073,  1074,  1075,  1076,  1077,  1078,
1744 <    1079,  1080,  1085,  1086,  1087,  1088,  1089,  1091,  1092,  1090,
1745 <    1093,  1095,  1094,  1096,  1102,  1103,  1105,  1106,  1107,  1108,
1746 <    1109,  1110,  1111,  1115,  1116,  1119,  1120,  1122,  1123,  1124,
1747 <    1125,  1126,  1127,  1128,  1129,  1130,  1131,  1132,  1133,  1134,
1748 <    1135,  1150,  1151,  1156,  1157,  1160,  1158,  1136,  1159,  1164,
1749 <    1165,  1166,  1170,  1167,  1246,  1168,  1184,  1169,  1173,  1185,
1750 <    1179,  1187,  1180,  1188,  1189,  1191,  1283,  1182,  1192,  1186,
1751 <    1190,  1193,  1194,  1195,  1198,  1212,  1213,  1227,  1228,  1229,
1752 <    1230,  1231,  1232,  1233,  1234,  1235,  1236,  1237,  1288,   548,
1753 <     342,  1238,  1239,  1240,  1241,  1242,  1243,  1244,  1245,  1250,
1754 <    1251,  1252,  1253,  1254,  1255,  1256,  1257,  1285,  1286,  1287,
1755 <    1292,  1293,  1294,  1316,   509,  1062,  1337,  1367,  1366,  1365,
1756 <     877,  1335,  1284,  1334,  1361,   799,  1364,   826,  1362,   752,
1757 <     831,  1363,   894,   655,  1336,   374,  1331,   662,   440,  1261,
1758 <    1260,   729,   567,  1333,  1332,   362,     0,     0,   533,     0,
1759 <     740,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1634 >     853,   854,   608,  1067,   610,   292,   612,   613,  1096,   490,
1635 >     225,   299,    70,   113,   536,   506,   506,   113,   852,   405,
1636 >      49,   395,   536,    50,   225,  1138,    54,    70,   395,  1057,
1637 >    1058,  1059,  1060,  1061,  1062,  1063,   703,   299,    71,   292,
1638 >     704,    56,   405,   119,    60,    72,    64,   483,   120,   121,
1639 >     537,   122,   123,    71,    65,   705,   124,  1111,   537,   706,
1640 >      72,  1112,  1113,  1238,   125,   126,  1114,  1239,   491,  1243,
1641 >      67,   127,   590,  1244,   128,   492,    68,   493,  1068,   114,
1642 >     129,    47,    48,   114,  1043,   130,   131,   396,   132,   133,
1643 >     134,   110,   135,   254,   396,   575,   538,   507,   507,   111,
1644 >     667,   136,   669,   670,   538,   137,   138,  1043,   483,   676,
1645 >     226,  1264,   112,   680,   300,    73,   139,   118,   685,   255,
1646 >     222,   688,   406,   575,   226,   223,   140,   857,   858,   590,
1647 >      73,   698,   699,   141,   227,   142,   494,   143,   224,   144,
1648 >     300,   145,   146,   712,   539,   406,   715,   716,   227,   407,
1649 >     232,   397,   539,   256,   147,   233,   464,    79,   397,   148,
1650 >     149,   150,   257,   151,   152,   153,  1139,  1247,   154,  1249,
1651 >     234,  1248,   407,  1250,   465,   591,  1140,   484,   305,   291,
1652 >      80,    81,  -115,   304,   258,  1257,    82,  1044,   259,  1258,
1653 >     466,  1259,   508,   508,   155,  1260,   260,   327,   576,   261,
1654 >     262,   306,  1097,   307,   156,   157,   158,   159,   160,   161,
1655 >    1044,  1261,   513,   328,   329,  1262,  -115,   330,   308,  1268,
1656 >     311,    83,    84,  1269,   467,   312,   576,    85,    86,   293,
1657 >     514,   263,   591,    87,    88,    89,   162,   313,   484,   775,
1658 >     739,    90,    91,   309,   403,   766,   515,   747,   264,   599,
1659 >     664,   265,   266,   267,   600,   504,   163,   164,   165,   658,
1660 >     166,   167,   168,   293,   314,   331,    92,    93,   588,   315,
1661 >     584,   169,   485,   364,   462,   365,   501,   366,   268,   468,
1662 >     516,  1045,   332,   333,   334,   335,   336,   469,   470,   316,
1663 >     337,   367,   235,   592,   338,   269,   490,   593,  1295,   317,
1664 >     339,   555,  1296,   809,  1045,  1046,   318,   368,   471,   839,
1665 >     319,   340,   341,   320,   844,   517,   577,   847,   321,   270,
1666 >     271,   851,   236,   342,   573,   322,   798,   323,  1046,   324,
1667 >     237,   402,   369,   485,   370,   518,   412,   413,  1222,   732,
1668 >     582,   371,   238,   239,   577,   343,   414,   240,   241,   242,
1669 >     592,   519,   372,   415,   593,   491,  1082,  1083,  1084,  1240,
1670 >    1241,  1242,   492,   607,   493,   416,   417,   418,   520,   521,
1671 >     419,   420,   243,   254,   421,   422,   373,   423,   424,   425,
1672 >     426,   472,   427,   428,   429,   344,   430,   728,   325,   601,
1673 >     818,   819,   820,   821,   822,   823,   824,   431,   432,   255,
1674 >     374,   433,   434,   435,   119,   436,   437,   438,   439,   120,
1675 >     121,   441,   122,   123,   443,   522,   444,   124,   445,   446,
1676 >     375,   464,   447,   494,   448,   125,   126,   449,   637,   376,
1677 >     602,   450,   127,   256,   451,   128,   452,   523,   513,   465,
1678 >     453,   129,   257,   760,   454,   603,   130,   131,   455,   132,
1679 >     133,   134,   456,   135,   457,   466,   514,   458,   459,   852,
1680 >     460,   461,   136,   502,   258,   503,   137,   138,   259,   545,
1681 >     546,   547,   515,   548,   549,   377,   260,   139,   550,   261,
1682 >     262,   551,   552,   586,   556,   557,   558,   140,   559,   467,
1683 >     560,   561,   562,   563,   141,   564,   142,   565,   143,   378,
1684 >     144,   566,   145,   146,   654,   567,   516,   568,   569,   570,
1685 >     571,   263,   572,   583,   587,   147,   604,   605,  1150,   606,
1686 >     148,   149,   150,   553,   151,   152,   153,   607,   264,   154,
1687 >     609,   265,   266,   267,  1151,   611,   614,   615,   616,   617,
1688 >     618,   517,  1152,   619,   468,   620,   364,   621,   365,   622,
1689 >     366,   624,   469,   470,   625,   155,  1153,   626,   268,  1283,
1690 >     660,   518,   627,   628,   367,   156,   157,   158,   159,   160,
1691 >     161,   629,   630,   471,   631,   269,   632,   519,   633,   666,
1692 >     368,   634,   635,   636,   639,  1265,   640,  1154,   641,  1155,
1693 >    1284,   642,  1285,   643,   520,   521,   644,   162,   645,   270,
1694 >     271,   647,   648,   649,   650,   369,  1117,   370,   651,   652,
1695 >     653,   656,   657,   661,   371,  1156,   668,   163,   164,   165,
1696 >     662,   166,   167,   168,   663,   372,   672,  1118,   671,   674,
1697 >     673,   675,   169,   678,   679,   681,  1119,  1286,   677,     2,
1698 >       3,   522,   682,     4,   686,   683,   472,   684,  1157,   373,
1699 >    1158,   687,   689,   690,  1287,     5,   691,   692,     6,     7,
1700 >     693,   694,   695,   523,   696,     8,   697,  1120,   327,  1159,
1701 >     700,   701,   702,   374,   707,   708,     9,   709,   710,    10,
1702 >      11,   711,   713,   714,   328,   329,   717,   718,   330,  1160,
1703 >     741,  1288,  1289,   375,  1161,   742,  1121,  1122,  1162,   719,
1704 >     720,   721,   376,   771,  1123,  1163,   723,    12,   724,   725,
1705 >    1164,   726,    13,  1206,   727,   930,   730,   931,   932,   731,
1706 >    1165,    14,   734,  1166,   735,  1167,   736,   738,   743,  1124,
1707 >     744,   777,   745,   779,   746,   749,   331,  1168,   762,   750,
1708 >     751,    15,    16,  1290,  1169,  1125,   768,  1291,   377,   769,
1709 >     753,   780,   754,   332,   333,   334,   335,   336,   755,    17,
1710 >    1177,   337,  1178,  1179,   770,   338,   756,  1225,   757,   759,
1711 >     235,   339,   378,   772,   763,  1207,    18,   773,   764,   776,
1712 >     765,   774,   340,   341,   778,   781,   782,   783,   784,    19,
1713 >      20,   785,   786,   790,   342,   787,   794,   788,   907,   789,
1714 >     236,   791,   792,  1126,   793,   800,  1208,   795,   237,   796,
1715 >     801,    21,   803,  1209,   802,   804,   343,   805,   811,   806,
1716 >     238,   239,  1210,   808,    22,   240,   241,   242,   812,  1226,
1717 >     813,   814,    23,   933,   934,   935,    24,   936,   937,   815,
1718 >     938,   939,   816,   940,  1211,   941,  1212,  1213,   942,   817,
1719 >     243,   943,   944,   827,   945,   828,   344,   829,   830,   946,
1720 >    1227,  1214,   831,   947,   948,   949,   832,  1228,  1215,   950,
1721 >     837,   833,   834,   835,   951,   836,  1229,   838,  1180,  1181,
1722 >    1182,   840,  1183,  1184,   841,  1185,  1186,   842,  1187,   843,
1723 >    1188,   845,   846,  1189,   848,   849,  1190,  1191,  1230,  1192,
1724 >    1231,  1232,   850,   852,  1193,   855,   860,   866,  1194,  1195,
1725 >    1196,   856,   859,   861,  1197,  1233,   908,   909,   910,  1198,
1726 >     911,   912,  1234,   913,   914,   862,   915,    79,   916,   863,
1727 >     864,   917,   865,   867,   918,   919,   868,   920,   869,   870,
1728 >     872,   871,   921,   873,   874,   875,   922,   923,   924,   876,
1729 >      80,    81,   925,   877,   878,   879,    82,   926,   880,   881,
1730 >     882,   883,   884,   885,   886,   887,   888,   889,   890,   891,
1731 >     892,   893,   894,   895,   896,   897,   898,   899,   975,   900,
1732 >     901,   902,   903,   904,   905,   906,   929,   976,   954,   955,
1733 >     956,    83,    84,   957,   977,   958,   978,    85,    86,   959,
1734 >     979,   980,   960,    87,    88,    89,   981,   961,   982,   984,
1735 >     962,    90,    91,   985,   987,   990,   963,   964,   965,   988,
1736 >     996,   966,   967,   968,   997,   969,   970,   999,   971,   972,
1737 >     973,   974,  1000,   983,  1002,  1003,    92,    93,  1004,   986,
1738 >     989,  1005,  1006,   993,   994,  1008,   995,   998,  1010,  1011,
1739 >    1012,  1001,  1007,  1009,  1013,  1040,  1014,  1015,  1016,  1017,
1740 >    1039,  1018,  1019,  1020,  1021,  1022,  1023,  1024,  1025,  1026,
1741 >    1027,  1028,  1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,
1742 >    1053,  1037,  1038,  1041,  1042,  1052,  1055,  1056,  1064,  1054,
1743 >    1065,  1066,  1071,  1072,  1073,  1074,  1075,  1076,  1251,  1077,
1744 >    1078,  1079,  1080,  1263,  1081,  1087,  1088,  1089,  1274,  1090,
1745 >    1275,  1276,  1091,  1092,  1093,   310,   748,   761,  1094,  1095,
1746 >    1100,  1223,  1278,  1101,  1102,  1103,  1297,  1104,  1105,  1277,
1747 >    1106,  1107,  1270,  1108,  1109,  1110,  1273,  1252,  1115,  1116,
1748 >     799,  1129,  1130,  1272,  1131,  1132,  1133,   740,  1134,  1135,
1749 >    1143,   729,   585,  1136,  1137,   767,  1146,   810,  1147,  1144,
1750 >    1294,  1148,  1219,  1149,  1172,  1173,  1174,  1175,  1176,  1201,
1751 >    1202,  1203,  1204,  1205,  1218,  1279,  1224,  1237,  1220,  1253,
1752 >     505,   404,   733,  1254,   655,  1255,  1256,  1266,  1271,  1267,
1753 >    1280,  1281,  1282,   463,  1246,   326,     0,  1245,     0,     0,
1754 >       0,     0,     0,     0,     0,     0,     0,     0,   554,     0,
1755 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1756 >       0,     0,     0,     0,     0,     0,   574,     0,     0,     0,
1757 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1758 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1759 >       0,     0,     0,     0,     0,     0,     0,   589,     0,     0,
1760 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1761 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1762 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1763 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1764 >     638,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1765 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1766 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1767 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1768 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1769         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1770 <     745
1770 >     659,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1771 >       0,   665
1772   };
1773  
2265 #define yypact_value_is_default(yystate) \
2266  ((yystate) == (-622))
2267
2268 #define yytable_value_is_error(yytable_value) \
2269  YYID (0)
2270
1774   static const yytype_int16 yycheck[] =
1775   {
1776 <     348,   349,   432,     1,     1,     1,    11,   355,     1,   261,
1777 <     261,   151,    75,   265,   265,     1,     1,     1,   263,     1,
1778 <       1,     1,     4,     8,     9,     1,   263,    12,     1,    25,
1779 <       1,     1,   263,    11,    19,   263,     1,   385,    36,   387,
1780 <       1,   261,    27,   261,   262,   265,    31,    32,    46,     1,
1781 <      21,   261,    48,    38,   402,   265,    52,    42,    43,   407,
1782 <      45,   263,    44,     1,   261,    47,    51,   263,   265,   263,
1783 <     418,   419,   263,   421,     1,    40,     1,     1,   263,    10,
1784 <     263,    12,   430,   431,    69,    70,   434,   261,    53,    74,
1785 <     151,   265,   195,   196,    87,    26,    81,    21,    25,    30,
1786 <      85,    86,   263,    87,    89,   261,     1,    92,    93,   265,
1787 <      75,    87,    77,   263,    79,    80,   263,   102,   100,   263,
1788 <     118,    48,   118,   108,   109,    52,   111,   112,   113,   114,
1789 <     115,     1,    97,     1,     1,    87,   118,   118,   118,   263,
1790 <     261,   126,   151,    13,   265,   118,   116,   195,   196,   145,
1791 <     135,   122,   137,   138,   263,   140,   153,   118,   143,   144,
1792 <     153,   261,   147,    33,    34,   265,   229,   153,   164,    39,
1793 <     233,    41,   153,   158,   261,   263,   146,   153,   265,     1,
1794 <     118,     3,   153,   531,     6,    52,     1,     1,   185,     1,
1795 <     261,   116,   197,   263,   265,   180,     1,   182,   122,   185,
1796 <     264,   186,    24,    25,   185,   190,   191,   192,   193,   194,
1797 <      22,    23,   185,   198,   199,    82,   261,    29,   145,   197,
1798 <      87,   146,   207,   118,    94,    95,    48,   154,   155,   153,
1799 <      52,    36,   261,   103,   104,   263,   265,     1,   234,    54,
1800 <      55,    56,    57,    58,    59,    60,    61,   185,   264,     1,
1801 <     118,   264,   249,   249,   124,   125,   241,   242,   264,   244,
1802 <      82,   188,    84,   249,   262,   250,   262,   249,   263,   262,
1803 <     255,   141,   142,   264,    96,   260,   262,   262,    83,     1,
1804 <     262,   262,   152,   150,    36,   153,   101,   264,    52,   262,
1805 <     185,   161,   262,   105,   106,   107,   118,   262,   110,     1,
1806 <     264,   262,     1,    25,   118,     4,   118,    14,    15,    16,
1807 <     262,   249,   243,   118,   264,   120,   121,   185,    82,   131,
1808 <     132,   136,   249,    87,   262,   261,    48,   264,   150,   265,
1809 <      52,    83,   167,   168,    36,   262,   148,   149,   262,   261,
1810 <     214,   215,   164,   265,    46,    44,   264,   264,    47,   842,
1811 <     843,   844,   845,   846,   249,   177,   264,   264,   163,   264,
1812 <     165,   166,   264,   264,   176,   264,   118,   264,   120,   121,
1813 <     264,   185,   993,   994,   995,   723,   181,   264,    20,   264,
1814 <     264,   251,   252,   253,   264,   264,   150,   264,   264,   264,
1815 <     129,   264,   262,   264,   263,   262,   118,   151,   264,   264,
1816 <     264,   100,   217,   264,   264,   264,   264,    49,   264,   264,
1817 <     264,   163,   264,   165,   166,   264,   118,   264,   264,   118,
1818 <     225,   264,   129,   145,    66,   264,   264,   264,   264,   181,
1819 <       1,    73,   264,     1,   256,   264,   264,     8,     9,   254,
1820 <     262,    12,   164,   264,   264,   875,   264,   262,    19,    91,
1821 <     262,   256,   257,   264,   264,   264,    27,   262,   264,   151,
1822 <      31,    32,   264,   264,   264,   264,   264,    38,   264,   264,
1823 <     264,    42,    43,   225,    45,   264,   264,   119,   264,   264,
1824 <      51,   264,   264,   264,   264,   127,    54,    55,    56,    57,
1825 <      58,    59,    60,    61,   264,   261,   264,   264,    69,    70,
1826 <     261,   264,   264,    74,   256,   257,   264,   264,   264,   264,
1827 <      81,     1,   234,   264,    85,    86,   264,   865,    89,   264,
1828 <       5,    92,    93,   264,   264,   873,   874,   249,   170,   264,
1829 <     264,   102,   264,   101,   264,    25,   264,   108,   109,   129,
1830 <     111,   112,   113,   114,   115,   264,   264,   189,   264,   261,
1831 <     249,     1,    37,     3,   264,   126,     6,   151,    48,   264,
1832 <     264,   264,    52,    48,   135,     1,   137,   138,   136,   140,
1833 <     264,   264,   143,   144,    24,    25,   147,   264,   264,    64,
1834 <     264,   171,   172,   173,   174,   175,    71,   158,   264,   264,
1835 <     264,    76,   261,    78,   195,   129,   195,   195,    48,   129,
1836 <     129,   261,    52,   129,    40,    90,   195,   195,   129,   180,
1837 <     195,   182,   195,   195,   195,   186,   195,    53,   264,   190,
1838 <     191,   192,   193,   194,   264,   261,   151,   198,   199,   264,
1839 <     264,   195,    82,   195,    84,   129,   207,   151,   123,    75,
1840 <     129,    77,   195,    79,    80,     1,    96,   195,   129,   217,
1841 <     151,   195,   129,   129,   139,   145,   129,    13,   195,   195,
1842 <     195,    97,   195,   151,   154,   155,   129,   129,   118,   129,
1843 <     241,   242,   157,   244,   159,   160,   129,    33,    34,   250,
1844 <     151,   129,   129,    39,   255,    41,   254,   195,   195,   260,
1845 <     218,   219,   220,   221,   222,   223,   224,   264,   188,   195,
1846 <     150,   264,   195,     1,   195,   151,   129,   151,   195,   195,
1847 <     261,    90,   195,   195,   164,     0,     1,   195,    90,   264,
1848 <       5,   195,   264,   195,    22,    23,   195,   177,   195,   151,
1849 <     151,    29,   264,   264,   261,   151,    21,   261,    94,    95,
1850 <      25,   264,   227,    28,   264,   264,   264,   103,   104,   264,
1851 <      35,   264,   264,   238,   264,   264,   151,   151,   264,   249,
1852 <     264,   264,   151,   248,   151,    50,   151,   151,   124,   125,
1853 <     151,   151,   264,   258,   151,   195,   195,    62,    63,   278,
1854 <      65,   261,   261,   195,   151,   141,   142,    72,   195,   264,
1855 <     169,   261,   195,   261,   151,   195,   152,   169,   264,   151,
1856 <     151,   151,   151,    88,   151,   161,   256,   105,   106,   107,
1857 <     264,   151,   110,    98,   129,   100,   151,   151,   261,   261,
1858 <     118,   151,   201,   264,   264,   264,   261,   261,   261,   201,
1859 <     261,   261,   117,   131,   132,   261,   261,   216,   200,   151,
1860 <     264,   195,   151,   261,   216,   151,   261,   261,   261,   134,
1861 <     148,   149,   261,   261,   264,   261,   261,   236,   237,   261,
1862 <     261,   151,   261,   261,   236,   237,   245,   246,   247,   248,
1863 <     261,   261,   264,   245,   246,   247,   248,   151,   176,   258,
1864 <     151,   264,   264,   261,   169,   261,   258,   261,   195,   264,
1865 <     261,   264,   261,   178,   179,   251,   252,   253,   183,   184,
1866 <     202,   203,   204,   205,   206,   264,   208,   209,   261,   211,
1867 <     212,   213,   195,   129,   216,  1197,   264,   129,   264,   264,
1868 <     264,   264,   264,   264,   226,   227,   228,   264,   230,   231,
1869 <     232,   264,   264,   235,   261,   264,   264,   239,   202,   203,
1870 <     204,   205,   206,   264,   208,   209,   264,   211,   212,   213,
1871 <     264,   264,   216,   264,   264,   240,   264,   261,   261,   264,
1872 <     261,   261,   226,   227,   228,   261,   230,   231,   232,   261,
1873 <     261,   235,   261,   261,   261,   239,   202,   203,   204,   205,
1874 <     206,   261,   208,   209,   261,   211,   212,   213,   261,   261,
1875 <     216,   261,   261,   261,   261,   261,   261,   151,   261,   261,
1876 <     226,   227,   228,   261,   230,   231,   232,   261,   261,   235,
1877 <     261,   261,   261,   239,   261,   261,   261,   261,   261,   261,
1878 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1879 <     261,   261,   261,   261,   261,   151,   261,   261,   261,   261,
1880 <     261,   261,   151,   261,   151,   264,   151,   264,   261,   151,
1881 <     264,   151,   261,   264,   151,   151,   261,   261,   261,   261,
1882 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1883 <     261,   261,   261,   261,   261,   261,   261,   261,   151,   151,
1884 <     151,   264,   264,   264,   264,   264,   264,   261,   261,   261,
1885 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1886 <     261,   261,   261,   261,   261,   261,   151,   151,   261,   264,
1887 <     151,   261,   264,   261,   129,   129,   129,   129,   129,   129,
1888 <     151,   129,   129,   261,   151,   151,   151,   264,   151,   151,
1889 <     151,   151,   129,   151,   151,   151,   261,   261,   261,   261,
1890 <     261,   261,   261,   261,   261,   128,   261,   156,   261,   261,
1891 <     261,   261,   156,   261,   128,   261,   151,   261,   261,   195,
1892 <     261,   151,   261,   151,   151,   151,   129,   265,   261,   264,
1893 <     264,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1894 <     261,   261,   261,   261,   261,   261,   261,   261,   128,   316,
1895 <      74,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1896 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1897 <     261,   261,   261,   261,   261,   784,  1282,  1360,  1340,  1338,
1898 <     606,  1268,  1182,  1266,  1319,   520,  1324,   553,  1321,   490,
1899 <     561,  1322,   636,   368,  1280,   127,  1259,   380,   187,  1142,
1900 <    1140,   448,   334,  1265,  1263,    98,    -1,    -1,   294,    -1,
1901 <     465,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1776 >     635,   636,   315,    55,   317,     1,   319,   320,     8,     1,
1777 >       1,     1,     1,     1,     1,     1,     1,     1,   114,     1,
1778 >     233,     1,     1,   233,     1,    51,   233,     1,     1,   818,
1779 >     819,   820,   821,   822,   823,   824,   213,     1,    27,     1,
1780 >     217,   233,     1,     1,   233,    34,   233,     1,     6,     7,
1781 >      37,     9,    10,    27,   233,   213,    14,   231,    37,   217,
1782 >      34,   235,   231,   231,    22,    23,   235,   235,    60,   231,
1783 >     233,    29,     1,   235,    32,    67,   233,    69,   130,    67,
1784 >      38,   231,   232,    67,     1,    43,    44,    67,    46,    47,
1785 >      48,   233,    50,     1,    67,     1,    83,    83,    83,   233,
1786 >     413,    59,   415,   416,    83,    63,    64,     1,     1,   422,
1787 >     101,   207,   233,   426,   104,   104,    74,   233,   431,    27,
1788 >     233,   434,   104,     1,   101,   233,    84,   182,   183,     1,
1789 >     104,   444,   445,    91,   125,    93,   128,    95,   233,    97,
1790 >     104,    99,   100,   456,   131,   104,   459,   460,   125,   131,
1791 >     233,   131,   131,    61,   112,   233,     1,     1,   131,   117,
1792 >     118,   119,    70,   121,   122,   123,   192,   231,   126,   231,
1793 >     233,   235,   131,   235,    19,   104,   202,   131,   231,   233,
1794 >      24,    25,   178,   233,    92,   231,    30,   104,    96,   235,
1795 >      35,   231,   178,   178,   152,   235,   104,     1,   104,   107,
1796 >     108,   234,   202,   234,   162,   163,   164,   165,   166,   167,
1797 >     104,   231,     1,    17,    18,   235,   178,    21,   234,   231,
1798 >     234,    65,    66,   235,    69,   234,   104,    71,    72,   225,
1799 >      19,   139,   104,    77,    78,    79,   194,   234,   131,   552,
1800 >     232,    85,    86,   232,   232,   232,    35,   232,   156,   129,
1801 >     232,   159,   160,   161,   129,   232,   214,   215,   216,   232,
1802 >     218,   219,   220,   225,   234,    69,   110,   111,   232,   234,
1803 >     232,   229,   226,     1,   232,     3,   231,     5,   186,   124,
1804 >      69,   198,    86,    87,    88,    89,    90,   132,   133,   234,
1805 >      94,    19,     1,   222,    98,   203,     1,   226,   231,   234,
1806 >     104,   231,   235,   232,   198,   222,   234,    35,   153,   622,
1807 >     234,   115,   116,   234,   627,   104,   222,   630,   234,   227,
1808 >     228,   634,    31,   127,   232,   234,   232,   234,   222,   234,
1809 >      39,   234,    60,   226,    62,   124,   234,   234,   232,   232,
1810 >     231,    69,    51,    52,   222,   149,   234,    56,    57,    58,
1811 >     222,   140,    80,   234,   226,    60,    11,    12,    13,  1082,
1812 >    1083,  1084,    67,   114,    69,   234,   234,   234,   157,   158,
1813 >     234,   234,    81,     1,   234,   234,   104,   234,   234,   234,
1814 >     234,   226,   234,   234,   234,   189,   234,   232,   232,   129,
1815 >     141,   142,   143,   144,   145,   146,   147,   234,   234,    27,
1816 >     128,   234,   234,   234,     1,   234,   234,   234,   234,     6,
1817 >       7,   234,     9,    10,   234,   204,   234,    14,   234,   234,
1818 >     148,     1,   234,   128,   234,    22,    23,   234,   232,   157,
1819 >     231,   234,    29,    61,   234,    32,   234,   226,     1,    19,
1820 >     234,    38,    70,   232,   234,   114,    43,    44,   234,    46,
1821 >      47,    48,   234,    50,   234,    35,    19,   234,   234,   114,
1822 >     234,   234,    59,   234,    92,   234,    63,    64,    96,   234,
1823 >     234,   234,    35,   234,   234,   203,   104,    74,   234,   107,
1824 >     108,   234,   234,   178,   234,   234,   234,    84,   234,    69,
1825 >     234,   234,   234,   234,    91,   234,    93,   234,    95,   227,
1826 >      97,   234,    99,   100,   232,   234,    69,   234,   234,   234,
1827 >     234,   139,   234,   234,   234,   112,   114,   213,     4,   114,
1828 >     117,   118,   119,   232,   121,   122,   123,   114,   156,   126,
1829 >     114,   159,   160,   161,    20,   114,   114,   114,   213,   213,
1830 >     231,   104,    28,   231,   124,   234,     1,   234,     3,   234,
1831 >       5,   234,   132,   133,   234,   152,    42,   234,   186,    42,
1832 >     129,   124,   234,   234,    19,   162,   163,   164,   165,   166,
1833 >     167,   234,   234,   153,   234,   203,   234,   140,   234,   213,
1834 >      35,   234,   234,   234,   231,  1220,   234,    73,   234,    75,
1835 >      73,   234,    75,   234,   157,   158,   234,   194,   234,   227,
1836 >     228,   234,   234,   234,   234,    60,    15,    62,   234,   234,
1837 >     234,   234,   234,   231,    69,   101,   114,   214,   215,   216,
1838 >     234,   218,   219,   220,   234,    80,   114,    36,   213,   114,
1839 >     213,   213,   229,   114,   114,   114,    45,   120,   213,     0,
1840 >       1,   204,   213,     4,   114,   213,   226,   213,   134,   104,
1841 >     136,   114,   114,   114,   137,    16,   114,   114,    19,    20,
1842 >     213,   234,   213,   226,   234,    26,   213,    76,     1,   155,
1843 >     213,   213,   213,   128,   213,   213,    37,   213,   129,    40,
1844 >      41,   114,   213,   213,    17,    18,   213,   231,    21,   175,
1845 >     129,   174,   175,   148,   180,   129,   105,   106,   184,   231,
1846 >     234,   234,   157,   129,   113,   191,   234,    68,   234,   234,
1847 >     196,   234,    73,    75,   234,    51,   234,    53,    54,   234,
1848 >     206,    82,   231,   209,   234,   211,   234,   234,   231,   138,
1849 >     231,   129,   234,   129,   234,   231,    69,   223,   231,   234,
1850 >     234,   102,   103,   226,   230,   154,   213,   230,   203,   213,
1851 >     234,   114,   234,    86,    87,    88,    89,    90,   234,   120,
1852 >      51,    94,    53,    54,   213,    98,   234,    75,   234,   234,
1853 >       1,   104,   227,   213,   234,   137,   137,   213,   234,   231,
1854 >     234,   213,   115,   116,   213,   114,   129,   129,   129,   150,
1855 >     151,   129,   129,   114,   127,   129,   231,   129,    51,   129,
1856 >      31,   129,   129,   212,   129,   213,   168,   231,    39,   234,
1857 >     231,   172,   129,   175,   233,   231,   149,   231,   231,   234,
1858 >      51,    52,   184,   234,   185,    56,    57,    58,   231,   137,
1859 >     231,   231,   193,   169,   170,   171,   197,   173,   174,   231,
1860 >     176,   177,   231,   179,   206,   181,   208,   209,   184,   231,
1861 >      81,   187,   188,   231,   190,   231,   189,   231,   231,   195,
1862 >     168,   223,   231,   199,   200,   201,   231,   175,   230,   205,
1863 >     114,   231,   231,   231,   210,   231,   184,   114,   169,   170,
1864 >     171,   234,   173,   174,   114,   176,   177,   114,   179,   114,
1865 >     181,   114,   114,   184,   129,   114,   187,   188,   206,   190,
1866 >     208,   209,   114,   114,   195,   231,   213,   114,   199,   200,
1867 >     201,   129,   129,   129,   205,   223,   169,   170,   171,   210,
1868 >     173,   174,   230,   176,   177,   129,   179,     1,   181,   234,
1869 >     129,   184,   129,   129,   187,   188,   129,   190,   129,   129,
1870 >     129,   231,   195,   129,   231,   231,   199,   200,   201,   129,
1871 >      24,    25,   205,   129,   231,   231,    30,   210,   231,   231,
1872 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
1873 >     231,   231,   231,   231,   231,   231,   231,   231,   129,   231,
1874 >     231,   231,   231,   231,   231,   231,   231,   213,   231,   231,
1875 >     231,    65,    66,   231,   234,   231,   129,    71,    72,   231,
1876 >     114,   129,   231,    77,    78,    79,   129,   231,   129,   129,
1877 >     231,    85,    86,   129,   129,   114,   231,   231,   231,   129,
1878 >     129,   231,   231,   231,   129,   231,   231,   129,   231,   231,
1879 >     231,   231,   213,   231,   129,   129,   110,   111,   129,   231,
1880 >     234,   129,   213,   231,   231,   129,   231,   231,   129,   129,
1881 >     129,   234,   234,   231,   231,   234,   231,   231,   231,   231,
1882 >     129,   231,   231,   231,   231,   231,   231,   231,   231,   231,
1883 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
1884 >     129,   231,   231,   231,   231,   231,   129,   231,   231,   234,
1885 >     231,   231,   231,   231,   231,   231,   231,   231,   114,   231,
1886 >     231,   231,   231,   129,   231,   231,   231,   231,   135,   231,
1887 >     135,   135,   231,   231,   231,    74,   509,   524,   231,   231,
1888 >     231,  1047,  1260,   231,   231,   231,  1296,   231,   231,  1258,
1889 >     231,   231,  1239,   231,   231,   231,  1250,  1144,   231,   231,
1890 >     578,   231,   231,  1248,   231,   231,   231,   496,   231,   231,
1891 >     221,   473,   294,   231,   231,   540,   231,   594,   231,   235,
1892 >    1269,   231,   234,   231,   231,   231,   231,   231,   231,   231,
1893 >     231,   231,   231,   231,   231,  1262,   231,   231,   234,   231,
1894 >     228,   115,   486,   236,   379,   236,   236,   234,  1244,   231,
1895 >     231,   231,   231,   170,  1114,    94,    -1,  1112,    -1,    -1,
1896 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   244,    -1,
1897 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1898 >      -1,    -1,    -1,    -1,    -1,    -1,   272,    -1,    -1,    -1,
1899 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1900 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1901 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,   301,    -1,    -1,
1902 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1903 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1904        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1905 <     480
1905 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1906 >     345,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1907 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1908 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1909 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1910 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1911 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1912 >     398,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1913 >      -1,   408
1914   };
1915  
1916 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1917 <   symbol of state STATE-NUM.  */
1916 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1917 >     symbol of state STATE-NUM.  */
1918   static const yytype_uint16 yystos[] =
1919   {
1920 <       0,   267,     0,     1,     5,    21,    25,    28,    35,    50,
1921 <      62,    63,    65,    72,    88,    98,   100,   117,   134,   169,
1922 <     178,   179,   183,   184,   240,   268,   273,   278,   296,   302,
1923 <     317,   340,   359,   373,   391,   398,   402,   412,   421,   447,
1924 <     457,   463,   467,   477,   541,   557,   578,   261,   262,   263,
1925 <     263,   341,   422,   458,   263,   468,   263,   542,   374,   448,
1926 <     360,   263,   263,   318,   392,   263,   263,   403,   413,   263,
1927 <       1,    36,    46,   118,   297,   298,   299,   300,   301,     1,
1928 <      13,    33,    34,    39,    41,    94,    95,   103,   104,   124,
1929 <     125,   141,   142,   152,   161,   251,   252,   253,   558,   559,
1930 <     560,   561,   562,   563,   564,   565,   566,   567,   568,   569,
1931 <     570,   571,   572,   573,   574,   575,   576,   577,   151,   342,
1932 <     346,   151,   423,   427,   263,     1,    87,   464,   465,   466,
1933 <     263,     1,     8,     9,    12,    19,    27,    31,    32,    38,
1934 <      42,    43,    45,    51,    69,    70,    74,    81,    85,    86,
1935 <      89,    92,    93,   102,   108,   109,   111,   112,   113,   114,
1936 <     115,   126,   135,   137,   138,   140,   143,   144,   147,   158,
1937 <     180,   182,   186,   190,   191,   192,   193,   194,   198,   199,
1938 <     207,   241,   242,   244,   250,   255,   260,   478,   479,   480,
1939 <     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
1940 <     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
1941 <     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
1942 <     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
1943 <     521,   522,   523,   524,   525,   526,   527,   528,   529,   533,
1944 <     537,   538,   539,   540,   263,   263,   263,   263,     1,    54,
1945 <      55,    56,    57,    58,    59,    60,    61,   101,   136,   217,
1946 <     254,   303,   304,   305,   306,   307,   308,   309,   310,   311,
1947 <     312,   313,   314,   315,   316,     1,   116,   146,   274,   275,
1948 <     276,   277,   151,   319,   323,   263,     1,    40,    53,    75,
1949 <      77,    79,    80,    97,   579,   580,   581,   582,   583,   584,
1950 <     585,   586,   587,     1,    36,    83,   118,   120,   121,   163,
1951 <     165,   166,   181,   225,   256,   257,   279,   280,   281,   285,
1952 <     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
1953 <     263,   263,     1,   118,   399,   400,   401,   261,   264,   264,
1954 <     264,   262,   298,   264,   264,   264,   264,   264,   264,   264,
1955 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1956 <     264,   262,   559,   263,   263,     1,    87,   153,   459,   460,
1957 <     461,   462,   264,   262,   465,     1,   118,   153,   185,   469,
1958 <     473,   474,   475,   476,   264,   264,   264,   264,   264,   264,
1959 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1960 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1961 <     264,   264,   264,   264,   264,   534,   264,   530,   264,   264,
1962 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1963 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   262,
1964 <     479,     1,     4,    44,    47,   100,   118,   249,   543,   544,
1965 <     545,   546,   547,   551,   552,   553,     1,    25,    48,    52,
1966 <     145,   154,   155,   188,   249,   375,   376,   377,   378,   379,
1967 <     380,   381,   388,   389,   390,     1,   153,   185,   249,   449,
1968 <     453,   454,   455,   456,     1,    52,    82,    87,   150,   361,
1969 <     365,   366,   367,   371,   372,   261,   264,   264,   264,   264,
1970 <     264,   264,   264,   264,   264,   264,   264,   264,   262,   304,
1971 <     261,   264,   264,   262,   275,   263,     1,    21,   122,   153,
1972 <     393,   394,   395,   396,   397,   264,   264,   264,   264,   264,
1973 <     264,   264,   262,   580,   261,   264,   264,   264,   264,   264,
1974 <     264,   264,   282,   264,   264,   264,   264,   262,   280,     1,
1975 <     118,   185,   249,   404,   405,   406,   407,   408,     1,   118,
1976 <     185,   414,   415,   416,   417,   264,   262,   400,   151,   151,
1977 <     151,   261,   195,   129,   129,   195,   195,   129,   270,   270,
1978 <     129,   129,   195,   195,   129,   270,   195,   195,   195,   195,
1979 <     195,   261,     1,    22,    23,    29,   105,   106,   107,   110,
1980 <     118,   131,   132,   148,   149,   176,   343,   344,   345,   347,
1981 <     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
1982 <     358,     1,     3,     6,    24,    25,    48,    52,    82,    84,
1983 <      96,   118,   150,   164,   177,   256,   424,   425,   426,   428,
1984 <     429,   430,   431,   432,   433,   434,   441,   442,   443,   444,
1985 <     445,   446,   264,   264,   262,   460,   151,   261,   264,   264,
1986 <     470,   262,   474,   195,   270,   195,   270,   129,   151,   129,
1987 <     195,   195,   129,   151,   195,   129,   129,   129,   195,   195,
1988 <     195,   270,   151,   195,   129,   129,   270,   129,   129,   151,
1989 <     129,   129,   195,   195,   264,   195,   264,   270,   270,   195,
1990 <     270,   151,   195,   195,   195,   195,   196,   195,   196,   195,
1991 <     195,   270,   270,   129,   272,   151,   270,   195,   195,   195,
1992 <     195,   261,   554,   264,   264,   548,   264,   264,   262,   544,
1993 <     261,   264,   264,   382,   264,   264,   264,   264,   264,   262,
1994 <     376,   264,   450,   264,   262,   454,   261,   362,   264,   264,
1995 <     264,   262,   366,   151,   151,   151,   151,   151,   151,   151,
1996 <     151,   218,   219,   220,   221,   222,   223,   224,   151,   151,
1997 <     195,   261,   151,   151,   261,     1,    25,    48,    52,   118,
1998 <     145,   164,   234,   249,   320,   321,   322,   324,   325,   326,
1999 <     327,   328,   329,   333,   261,   264,   264,   264,   262,   394,
2000 <     195,   195,   195,   151,   195,   195,   270,   261,   151,   195,
2001 <     151,   151,   151,   151,   151,   264,   151,   129,   151,   151,
2002 <     261,   261,   264,   409,   264,   262,   405,   261,   264,   418,
2003 <     262,   415,   151,   261,   261,   261,   261,   261,   261,   261,
2004 <     261,   261,   171,   172,   173,   174,   175,   269,   270,   261,
2005 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2006 <     261,   261,   261,   264,   264,   264,   264,   264,   264,   264,
2007 <     264,   264,   264,   264,   264,   264,   262,   344,   261,   264,
2008 <     264,   264,   264,   264,   435,   264,   264,   264,   264,   264,
2009 <     264,   264,   264,   262,   425,   151,   151,   261,   261,   151,
2010 <     151,   264,   261,   261,   261,   261,   261,   261,   261,   261,
2011 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2012 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2013 <     261,   261,   261,   261,   202,   203,   204,   205,   206,   208,
2014 <     209,   211,   212,   213,   216,   226,   227,   228,   230,   231,
2015 <     232,   235,   239,   535,   536,   261,   202,   203,   204,   205,
2016 <     206,   208,   209,   211,   212,   213,   216,   226,   227,   228,
2017 <     230,   231,   232,   235,   239,   531,   532,   261,   261,   261,
2018 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2019 <     261,   261,   261,    14,    15,    16,   271,   272,   261,   261,
2020 <     261,   261,   261,   261,   261,   264,   270,   195,   264,   151,
2021 <     151,   261,   151,   195,   264,   151,   129,   151,   151,   151,
2022 <     261,   151,   264,   151,   261,   264,   151,   151,   129,   369,
2023 <     370,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2024 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2025 <     261,   261,   261,   264,   264,   334,   264,   264,   264,   330,
2026 <     264,   262,   321,   151,   151,   151,   261,   261,   261,   261,
2027 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2028 <     261,   167,   168,   283,   284,   261,   261,   261,   261,   151,
2029 <     264,   151,   261,   151,   264,   261,   261,   269,   269,   269,
2030 <     269,   269,   129,   129,   270,   129,   129,   129,   129,   151,
2031 <     129,   129,   270,   270,   272,   261,   151,   214,   215,   151,
2032 <     151,   195,   264,   151,   151,   151,   151,   129,   151,   151,
2033 <     151,   261,   261,   261,   261,   261,   156,   471,   472,   261,
2034 <     265,   261,   265,   271,   271,   271,    11,   197,   555,   556,
2035 <     261,   261,    11,   197,   549,   550,   261,   261,   261,   261,
2036 <     128,   383,   384,   386,   261,   261,   261,   261,   261,   261,
2037 <     156,   451,   452,   261,    75,   229,   233,   363,   364,   261,
2038 <     261,   200,   265,   368,   151,   195,   264,   151,   151,   151,
2039 <     264,   151,   261,   261,   261,   261,   261,   265,   261,    90,
2040 <     169,   201,   216,   236,   237,   245,   246,   247,   248,   258,
2041 <     410,   411,   261,   261,    90,   169,   201,   216,   236,   237,
2042 <     245,   246,   247,   248,   258,   419,   420,   261,   261,   261,
2043 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2044 <     261,   261,   261,   261,   261,   261,   128,   436,   437,   439,
2045 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   265,
2046 <     536,   532,   261,   265,   261,   265,   385,   261,   265,    20,
2047 <      49,    66,    73,    91,   119,   127,   170,   189,   387,   261,
2048 <     265,   261,   265,   129,   370,   261,   261,   261,   128,   335,
2049 <     336,   338,   261,   261,   261,   202,   203,   204,   205,   206,
2537 <     208,   209,   211,   212,   213,   216,   226,   227,   228,   230,
2538 <     231,   232,   235,   239,   331,   332,   261,   284,   261,   265,
2539 <     261,   265,   438,   261,   265,    10,    12,    26,    30,   243,
2540 <     440,   472,   556,   550,   387,   384,   452,   364,   337,   261,
2541 <     265,     5,    37,    48,    64,    71,    76,    78,    90,   123,
2542 <     139,   157,   159,   160,   227,   238,   248,   258,   339,   261,
2543 <     265,   411,   420,   440,   437,   339,   336,   332
1920 >       0,   238,     0,     1,     4,    16,    19,    20,    26,    37,
1921 >      40,    41,    68,    73,    82,   102,   103,   120,   137,   150,
1922 >     151,   172,   185,   193,   197,   239,   244,   249,   269,   275,
1923 >     281,   295,   315,   339,   353,   368,   375,   379,   389,   398,
1924 >     419,   425,   431,   435,   441,   500,   517,   231,   232,   233,
1925 >     233,   316,   399,   426,   233,   436,   233,   354,   420,   340,
1926 >     233,   276,   296,   369,   233,   233,   390,   233,   233,   380,
1927 >       1,    27,    34,   104,   270,   271,   272,   273,   274,     1,
1928 >      24,    25,    30,    65,    66,    71,    72,    77,    78,    79,
1929 >      85,    86,   110,   111,   501,   502,   503,   504,   505,   506,
1930 >     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1931 >     233,   233,   233,     1,    67,   432,   433,   434,   233,     1,
1932 >       6,     7,     9,    10,    14,    22,    23,    29,    32,    38,
1933 >      43,    44,    46,    47,    48,    50,    59,    63,    64,    74,
1934 >      84,    91,    93,    95,    97,    99,   100,   112,   117,   118,
1935 >     119,   121,   122,   123,   126,   152,   162,   163,   164,   165,
1936 >     166,   167,   194,   214,   215,   216,   218,   219,   220,   229,
1937 >     442,   443,   444,   445,   446,   447,   448,   449,   450,   451,
1938 >     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
1939 >     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
1940 >     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
1941 >     482,   483,   484,   485,   486,   487,   488,   489,   493,   497,
1942 >     498,   499,   233,   233,   233,     1,   101,   125,   245,   246,
1943 >     247,   248,   233,   233,   233,     1,    31,    39,    51,    52,
1944 >      56,    57,    58,    81,   518,   519,   520,   521,   522,   523,
1945 >     524,   525,   526,   527,     1,    27,    61,    70,    92,    96,
1946 >     104,   107,   108,   139,   156,   159,   160,   161,   186,   203,
1947 >     227,   228,   250,   251,   252,   253,   254,   255,   256,   257,
1948 >     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
1949 >     268,   233,     1,   225,   282,   283,   284,   285,   286,     1,
1950 >     104,   376,   377,   378,   233,   231,   234,   234,   234,   232,
1951 >     271,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1952 >     234,   234,   234,   234,   234,   232,   502,     1,    17,    18,
1953 >      21,    69,    86,    87,    88,    89,    90,    94,    98,   104,
1954 >     115,   116,   127,   149,   189,   317,   318,   319,   320,   321,
1955 >     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
1956 >     332,   333,   334,   335,     1,     3,     5,    19,    35,    60,
1957 >      62,    69,    80,   104,   128,   148,   157,   203,   227,   400,
1958 >     401,   402,   403,   404,   405,   406,   407,   408,   409,   410,
1959 >     414,   415,   416,   417,   418,     1,    67,   131,   427,   428,
1960 >     429,   430,   234,   232,   433,     1,   104,   131,   437,   438,
1961 >     439,   440,   234,   234,   234,   234,   234,   234,   234,   234,
1962 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1963 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1964 >     494,   234,   490,   234,   234,   234,   234,   234,   234,   234,
1965 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1966 >     234,   234,   232,   443,     1,    19,    35,    69,   124,   132,
1967 >     133,   153,   226,   355,   356,   357,   358,   359,   360,   361,
1968 >     365,   366,   367,     1,   131,   226,   421,   422,   423,   424,
1969 >       1,    60,    67,    69,   128,   341,   345,   346,   347,   351,
1970 >     352,   231,   234,   234,   232,   246,     1,    83,   178,   277,
1971 >     278,   279,   280,     1,    19,    35,    69,   104,   124,   140,
1972 >     157,   158,   204,   226,   297,   298,   299,   300,   301,   302,
1973 >     303,   304,   305,   306,   307,   311,     1,    37,    83,   131,
1974 >     370,   371,   372,   373,   374,   234,   234,   234,   234,   234,
1975 >     234,   234,   234,   232,   519,   231,   234,   234,   234,   234,
1976 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1977 >     234,   234,   234,   232,   251,     1,   104,   222,   391,   392,
1978 >     393,   394,   231,   234,   232,   283,   178,   234,   232,   377,
1979 >       1,   104,   222,   226,   381,   382,   383,   384,   385,   129,
1980 >     129,   129,   231,   114,   114,   213,   114,   114,   241,   114,
1981 >     241,   114,   241,   241,   114,   114,   213,   213,   231,   231,
1982 >     234,   234,   234,   336,   234,   234,   234,   234,   234,   234,
1983 >     234,   234,   234,   234,   234,   234,   234,   232,   318,   231,
1984 >     234,   234,   234,   234,   234,   234,   411,   234,   234,   234,
1985 >     234,   234,   234,   234,   232,   401,   234,   234,   232,   428,
1986 >     129,   231,   234,   234,   232,   438,   213,   241,   114,   241,
1987 >     241,   213,   114,   213,   114,   213,   241,   213,   114,   114,
1988 >     241,   114,   213,   213,   213,   241,   114,   114,   241,   114,
1989 >     114,   114,   114,   213,   234,   213,   234,   213,   241,   241,
1990 >     213,   213,   213,   213,   217,   213,   217,   213,   213,   213,
1991 >     129,   114,   241,   213,   213,   241,   241,   213,   231,   231,
1992 >     234,   234,   362,   234,   234,   234,   234,   234,   232,   356,
1993 >     234,   234,   232,   422,   231,   234,   234,   342,   234,   232,
1994 >     346,   129,   129,   231,   231,   234,   234,   232,   278,   231,
1995 >     234,   234,   312,   234,   234,   234,   234,   234,   308,   234,
1996 >     232,   298,   231,   234,   234,   234,   232,   371,   213,   213,
1997 >     213,   129,   213,   213,   213,   241,   231,   129,   213,   129,
1998 >     114,   114,   129,   129,   129,   129,   129,   129,   129,   129,
1999 >     114,   129,   129,   129,   231,   231,   234,   395,   232,   392,
2000 >     213,   231,   233,   129,   231,   231,   234,   386,   234,   232,
2001 >     382,   231,   231,   231,   231,   231,   231,   231,   141,   142,
2002 >     143,   144,   145,   146,   147,   240,   241,   231,   231,   231,
2003 >     231,   231,   231,   231,   231,   231,   231,   114,   114,   241,
2004 >     234,   114,   114,   114,   241,   114,   114,   241,   129,   114,
2005 >     114,   241,   114,   243,   243,   231,   129,   182,   183,   129,
2006 >     213,   129,   129,   234,   129,   129,   114,   129,   129,   129,
2007 >     129,   231,   129,   129,   231,   231,   129,   129,   231,   231,
2008 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2009 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2010 >     231,   231,   231,   231,   231,   231,   231,    51,   169,   170,
2011 >     171,   173,   174,   176,   177,   179,   181,   184,   187,   188,
2012 >     190,   195,   199,   200,   201,   205,   210,   495,   496,   231,
2013 >      51,    53,    54,   169,   170,   171,   173,   174,   176,   177,
2014 >     179,   181,   184,   187,   188,   190,   195,   199,   200,   201,
2015 >     205,   210,   491,   492,   231,   231,   231,   231,   231,   231,
2016 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2017 >     231,   231,   231,   231,   231,   129,   213,   234,   129,   114,
2018 >     129,   129,   129,   231,   129,   129,   231,   129,   129,   234,
2019 >     114,   349,   350,   231,   231,   231,   129,   129,   231,   129,
2020 >     213,   234,   129,   129,   129,   129,   213,   234,   129,   231,
2021 >     129,   129,   129,   231,   231,   231,   231,   231,   231,   231,
2022 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2023 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   129,
2024 >     234,   231,   231,     1,   104,   198,   222,   287,   288,   289,
2025 >     290,   291,   231,   129,   234,   129,   231,   240,   240,   240,
2026 >     240,   240,   240,   240,   231,   231,   231,    55,   130,   337,
2027 >     338,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2028 >     231,   231,    11,    12,    13,   242,   243,   231,   231,   231,
2029 >     231,   231,   231,   231,   231,   231,     8,   202,   412,   413,
2030 >     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
2031 >     231,   231,   235,   231,   235,   231,   231,    15,    36,    45,
2032 >      76,   105,   106,   113,   138,   154,   212,   363,   364,   231,
2033 >     231,   231,   231,   231,   231,   231,   231,   231,    51,   192,
2034 >     202,   343,   344,   221,   235,   348,   231,   231,   231,   231,
2035 >       4,    20,    28,    42,    73,    75,   101,   134,   136,   155,
2036 >     175,   180,   184,   191,   196,   206,   209,   211,   223,   230,
2037 >     313,   314,   231,   231,   231,   231,   231,    51,    53,    54,
2038 >     169,   170,   171,   173,   174,   176,   177,   179,   181,   184,
2039 >     187,   188,   190,   195,   199,   200,   201,   205,   210,   309,
2040 >     310,   231,   231,   231,   231,   231,    75,   137,   168,   175,
2041 >     184,   206,   208,   209,   223,   230,   396,   397,   231,   234,
2042 >     234,   292,   232,   288,   231,    75,   137,   168,   175,   184,
2043 >     206,   208,   209,   223,   230,   387,   388,   231,   231,   235,
2044 >     242,   242,   242,   231,   235,   496,   492,   231,   235,   231,
2045 >     235,   114,   350,   231,   236,   236,   236,   231,   235,   231,
2046 >     235,   231,   235,   129,   207,   243,   234,   231,   231,   235,
2047 >     338,   413,   364,   344,   135,   135,   135,   314,   310,   397,
2048 >     231,   231,   231,    42,    73,    75,   120,   137,   174,   175,
2049 >     226,   230,   293,   294,   388,   231,   235,   294
2050   };
2051  
2052 < #define yyerrok         (yyerrstatus = 0)
2053 < #define yyclearin       (yychar = YYEMPTY)
2054 < #define YYEMPTY         (-2)
2055 < #define YYEOF           0
2056 <
2057 < #define YYACCEPT        goto yyacceptlab
2058 < #define YYABORT         goto yyabortlab
2059 < #define YYERROR         goto yyerrorlab
2060 <
2061 <
2062 < /* Like YYERROR except do call yyerror.  This remains here temporarily
2063 <   to ease the transition to the new meaning of YYERROR, for GCC.
2064 <   Once GCC version 2 has supplanted version 1, this can go.  However,
2065 <   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
2066 <   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
2067 <   discussed.  */
2068 <
2069 < #define YYFAIL          goto yyerrlab
2070 < #if defined YYFAIL
2071 <  /* This is here to suppress warnings from the GCC cpp's
2072 <     -Wunused-macros.  Normally we don't worry about that warning, but
2073 <     some users do, and we want to make it easy for users to remove
2074 <     YYFAIL uses, which will produce warnings from Bison 2.5.  */
2075 < #endif
2052 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2053 > static const yytype_uint16 yyr1[] =
2054 > {
2055 >       0,   237,   238,   238,   239,   239,   239,   239,   239,   239,
2056 >     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
2057 >     239,   239,   239,   239,   239,   239,   239,   240,   240,   241,
2058 >     241,   241,   241,   241,   241,   241,   241,   242,   242,   243,
2059 >     243,   243,   243,   244,   245,   245,   246,   246,   246,   247,
2060 >     248,   249,   250,   250,   251,   251,   251,   251,   251,   251,
2061 >     251,   251,   251,   251,   251,   251,   251,   251,   251,   251,
2062 >     251,   251,   252,   253,   254,   255,   256,   257,   258,   259,
2063 >     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
2064 >     270,   270,   271,   271,   271,   271,   272,   273,   274,   276,
2065 >     275,   277,   277,   278,   278,   278,   279,   280,   281,   282,
2066 >     282,   283,   283,   283,   284,   286,   285,   287,   287,   288,
2067 >     288,   288,   288,   289,   290,   290,   292,   291,   293,   293,
2068 >     294,   294,   294,   294,   294,   294,   294,   294,   294,   296,
2069 >     295,   297,   297,   298,   298,   298,   298,   298,   298,   298,
2070 >     298,   298,   298,   298,   299,   300,   301,   302,   303,   304,
2071 >     305,   306,   308,   307,   309,   309,   310,   310,   310,   310,
2072 >     310,   310,   310,   310,   310,   310,   310,   310,   310,   310,
2073 >     310,   310,   310,   310,   310,   310,   310,   310,   312,   311,
2074 >     313,   313,   314,   314,   314,   314,   314,   314,   314,   314,
2075 >     314,   314,   314,   314,   314,   314,   314,   314,   314,   314,
2076 >     314,   314,   314,   314,   314,   316,   315,   317,   317,   318,
2077 >     318,   318,   318,   318,   318,   318,   318,   318,   318,   318,
2078 >     318,   318,   318,   318,   318,   318,   318,   319,   320,   321,
2079 >     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
2080 >     332,   333,   334,   336,   335,   337,   337,   338,   338,   340,
2081 >     339,   342,   341,   343,   343,   344,   344,   344,   345,   345,
2082 >     346,   346,   346,   346,   346,   348,   347,   349,   349,   350,
2083 >     350,   351,   352,   354,   353,   355,   355,   356,   356,   356,
2084 >     356,   356,   356,   356,   356,   356,   357,   358,   359,   360,
2085 >     362,   361,   363,   363,   364,   364,   364,   364,   364,   364,
2086 >     364,   364,   364,   364,   365,   366,   367,   369,   368,   370,
2087 >     370,   371,   371,   371,   371,   372,   373,   374,   375,   376,
2088 >     376,   377,   377,   378,   380,   379,   381,   381,   382,   382,
2089 >     382,   382,   383,   384,   386,   385,   387,   387,   388,   388,
2090 >     388,   388,   388,   388,   388,   388,   388,   388,   390,   389,
2091 >     391,   391,   392,   392,   392,   393,   395,   394,   396,   396,
2092 >     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
2093 >     399,   398,   400,   400,   401,   401,   401,   401,   401,   401,
2094 >     401,   401,   401,   401,   401,   401,   401,   401,   401,   402,
2095 >     403,   404,   405,   406,   407,   408,   409,   409,   411,   410,
2096 >     412,   412,   413,   413,   414,   415,   416,   417,   418,   420,
2097 >     419,   421,   421,   422,   422,   422,   423,   424,   426,   425,
2098 >     427,   427,   428,   428,   428,   429,   430,   431,   432,   432,
2099 >     433,   433,   434,   436,   435,   437,   437,   438,   438,   438,
2100 >     439,   440,   441,   442,   442,   443,   443,   443,   443,   443,
2101 >     443,   443,   443,   443,   443,   443,   443,   443,   443,   443,
2102 >     443,   443,   443,   443,   443,   443,   443,   443,   443,   443,
2103 >     443,   443,   443,   443,   443,   443,   443,   443,   443,   443,
2104 >     443,   443,   443,   443,   443,   443,   443,   443,   443,   443,
2105 >     443,   443,   443,   443,   443,   443,   444,   445,   446,   447,
2106 >     448,   449,   450,   451,   452,   453,   454,   455,   456,   457,
2107 >     458,   459,   460,   461,   462,   463,   464,   465,   466,   467,
2108 >     468,   469,   470,   471,   472,   472,   473,   473,   474,   475,
2109 >     476,   477,   478,   479,   480,   481,   482,   483,   484,   485,
2110 >     486,   487,   488,   490,   489,   491,   491,   492,   492,   492,
2111 >     492,   492,   492,   492,   492,   492,   492,   492,   492,   492,
2112 >     492,   492,   492,   492,   492,   492,   492,   492,   492,   494,
2113 >     493,   495,   495,   496,   496,   496,   496,   496,   496,   496,
2114 >     496,   496,   496,   496,   496,   496,   496,   496,   496,   496,
2115 >     496,   496,   496,   497,   498,   499,   500,   501,   501,   502,
2116 >     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
2117 >     502,   502,   502,   502,   503,   504,   505,   506,   507,   508,
2118 >     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
2119 >     518,   519,   519,   519,   519,   519,   519,   519,   519,   519,
2120 >     520,   521,   522,   523,   524,   525,   526,   527
2121 > };
2122  
2123 < #define YYRECOVERING()  (!!yyerrstatus)
2123 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2124 > static const yytype_uint8 yyr2[] =
2125 > {
2126 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2127 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2128 >       1,     1,     1,     1,     1,     2,     2,     0,     1,     2,
2129 >       3,     3,     3,     3,     3,     3,     3,     0,     1,     2,
2130 >       3,     3,     3,     5,     2,     1,     1,     1,     2,     4,
2131 >       4,     5,     2,     1,     1,     1,     1,     1,     1,     1,
2132 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2133 >       1,     2,     4,     4,     4,     4,     4,     4,     4,     4,
2134 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     5,
2135 >       2,     1,     1,     1,     1,     2,     4,     4,     4,     0,
2136 >       6,     2,     1,     1,     1,     2,     4,     4,     5,     2,
2137 >       1,     1,     1,     2,     4,     0,     6,     2,     1,     1,
2138 >       1,     1,     2,     4,     4,     4,     0,     5,     3,     1,
2139 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2140 >       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
2141 >       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
2142 >       4,     4,     0,     5,     3,     1,     1,     1,     1,     1,
2143 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2144 >       1,     1,     1,     1,     1,     1,     1,     1,     0,     5,
2145 >       3,     1,     3,     1,     3,     1,     3,     1,     1,     1,
2146 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2147 >       1,     1,     1,     1,     1,     0,     6,     2,     1,     1,
2148 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2149 >       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
2150 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2151 >       4,     4,     4,     0,     5,     3,     1,     1,     1,     0,
2152 >       6,     0,     5,     3,     1,     1,     1,     1,     2,     1,
2153 >       1,     1,     1,     1,     2,     0,     5,     3,     1,     1,
2154 >       3,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2155 >       1,     1,     1,     1,     1,     2,     4,     4,     4,     4,
2156 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2157 >       1,     1,     1,     1,     4,     4,     4,     0,     6,     2,
2158 >       1,     1,     1,     1,     2,     4,     4,     4,     5,     2,
2159 >       1,     1,     1,     4,     0,     6,     2,     1,     1,     1,
2160 >       1,     2,     4,     4,     0,     5,     3,     1,     1,     1,
2161 >       1,     1,     1,     1,     1,     1,     1,     1,     0,     6,
2162 >       2,     1,     1,     1,     2,     4,     0,     5,     3,     1,
2163 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2164 >       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
2165 >       1,     1,     1,     1,     1,     1,     1,     1,     2,     4,
2166 >       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
2167 >       3,     1,     1,     1,     4,     4,     4,     4,     4,     0,
2168 >       6,     2,     1,     1,     1,     1,     4,     4,     0,     6,
2169 >       2,     1,     1,     1,     1,     4,     4,     5,     2,     1,
2170 >       1,     1,     4,     0,     6,     2,     1,     1,     1,     1,
2171 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2172 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2173 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2174 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2175 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2176 >       1,     1,     1,     1,     1,     1,     4,     4,     4,     4,
2177 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2178 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2179 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2180 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2181 >       4,     4,     4,     0,     5,     3,     1,     1,     1,     1,
2182 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2183 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2184 >       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2185 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2186 >       1,     1,     1,     4,     4,     4,     5,     2,     1,     1,
2187 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2188 >       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
2189 >       4,     4,     4,     4,     4,     4,     4,     4,     5,     2,
2190 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2191 >       4,     4,     4,     4,     4,     4,     4,     4
2192 > };
2193  
2573 #define YYBACKUP(Token, Value)                                  \
2574 do                                                              \
2575  if (yychar == YYEMPTY && yylen == 1)                          \
2576    {                                                           \
2577      yychar = (Token);                                         \
2578      yylval = (Value);                                         \
2579      YYPOPSTACK (1);                                           \
2580      goto yybackup;                                            \
2581    }                                                           \
2582  else                                                          \
2583    {                                                           \
2584      yyerror (YY_("syntax error: cannot back up")); \
2585      YYERROR;                                                  \
2586    }                                                           \
2587 while (YYID (0))
2588
2589
2590 #define YYTERROR        1
2591 #define YYERRCODE       256
2592
2593
2594 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
2595   If N is 0, then set CURRENT to the empty location which ends
2596   the previous symbol: RHS[0] (always defined).  */
2597
2598 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
2599 #ifndef YYLLOC_DEFAULT
2600 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
2601    do                                                                  \
2602      if (YYID (N))                                                    \
2603        {                                                               \
2604          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
2605          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
2606          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
2607          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
2608        }                                                               \
2609      else                                                              \
2610        {                                                               \
2611          (Current).first_line   = (Current).last_line   =              \
2612            YYRHSLOC (Rhs, 0).last_line;                                \
2613          (Current).first_column = (Current).last_column =              \
2614            YYRHSLOC (Rhs, 0).last_column;                              \
2615        }                                                               \
2616    while (YYID (0))
2617 #endif
2194  
2195 + #define yyerrok         (yyerrstatus = 0)
2196 + #define yyclearin       (yychar = YYEMPTY)
2197 + #define YYEMPTY         (-2)
2198 + #define YYEOF           0
2199 +
2200 + #define YYACCEPT        goto yyacceptlab
2201 + #define YYABORT         goto yyabortlab
2202 + #define YYERROR         goto yyerrorlab
2203  
2620 /* This macro is provided for backward compatibility. */
2204  
2205 < #ifndef YY_LOCATION_PRINT
2623 < # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2624 < #endif
2205 > #define YYRECOVERING()  (!!yyerrstatus)
2206  
2207 + #define YYBACKUP(Token, Value)                                  \
2208 + do                                                              \
2209 +  if (yychar == YYEMPTY)                                        \
2210 +    {                                                           \
2211 +      yychar = (Token);                                         \
2212 +      yylval = (Value);                                         \
2213 +      YYPOPSTACK (yylen);                                       \
2214 +      yystate = *yyssp;                                         \
2215 +      goto yybackup;                                            \
2216 +    }                                                           \
2217 +  else                                                          \
2218 +    {                                                           \
2219 +      yyerror (YY_("syntax error: cannot back up")); \
2220 +      YYERROR;                                                  \
2221 +    }                                                           \
2222 + while (0)
2223 +
2224 + /* Error token number */
2225 + #define YYTERROR        1
2226 + #define YYERRCODE       256
2227  
2627 /* YYLEX -- calling `yylex' with the right arguments.  */
2228  
2629 #ifdef YYLEX_PARAM
2630 # define YYLEX yylex (YYLEX_PARAM)
2631 #else
2632 # define YYLEX yylex ()
2633 #endif
2229  
2230   /* Enable debugging if requested.  */
2231   #if YYDEBUG
# Line 2640 | Line 2235 | while (YYID (0))
2235   #  define YYFPRINTF fprintf
2236   # endif
2237  
2238 < # define YYDPRINTF(Args)                        \
2239 < do {                                            \
2240 <  if (yydebug)                                  \
2241 <    YYFPRINTF Args;                             \
2242 < } while (YYID (0))
2243 <
2244 < # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2245 < do {                                                                      \
2246 <  if (yydebug)                                                            \
2247 <    {                                                                     \
2248 <      YYFPRINTF (stderr, "%s ", Title);                                   \
2654 <      yy_symbol_print (stderr,                                            \
2655 <                  Type, Value); \
2656 <      YYFPRINTF (stderr, "\n");                                           \
2657 <    }                                                                     \
2658 < } while (YYID (0))
2238 > # define YYDPRINTF(Args)                        \
2239 > do {                                            \
2240 >  if (yydebug)                                  \
2241 >    YYFPRINTF Args;                             \
2242 > } while (0)
2243 >
2244 > /* This macro is provided for backward compatibility. */
2245 > #ifndef YY_LOCATION_PRINT
2246 > # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2247 > #endif
2248 >
2249  
2250 + # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2251 + do {                                                                      \
2252 +  if (yydebug)                                                            \
2253 +    {                                                                     \
2254 +      YYFPRINTF (stderr, "%s ", Title);                                   \
2255 +      yy_symbol_print (stderr,                                            \
2256 +                  Type, Value); \
2257 +      YYFPRINTF (stderr, "\n");                                           \
2258 +    }                                                                     \
2259 + } while (0)
2260  
2661 /*--------------------------------.
2662 | Print this symbol on YYOUTPUT.  |
2663 `--------------------------------*/
2261  
2262 < /*ARGSUSED*/
2263 < #if (defined __STDC__ || defined __C99__FUNC__ \
2264 <     || defined __cplusplus || defined _MSC_VER)
2262 > /*----------------------------------------.
2263 > | Print this symbol's value on YYOUTPUT.  |
2264 > `----------------------------------------*/
2265 >
2266   static void
2267   yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2670 #else
2671 static void
2672 yy_symbol_value_print (yyoutput, yytype, yyvaluep)
2673    FILE *yyoutput;
2674    int yytype;
2675    YYSTYPE const * const yyvaluep;
2676 #endif
2268   {
2269 +  FILE *yyo = yyoutput;
2270 +  YYUSE (yyo);
2271    if (!yyvaluep)
2272      return;
2273   # ifdef YYPRINT
2274    if (yytype < YYNTOKENS)
2275      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2683 # else
2684  YYUSE (yyoutput);
2276   # endif
2277 <  switch (yytype)
2687 <    {
2688 <      default:
2689 <        break;
2690 <    }
2277 >  YYUSE (yytype);
2278   }
2279  
2280  
# Line 2695 | Line 2282 | yy_symbol_value_print (yyoutput, yytype,
2282   | Print this symbol on YYOUTPUT.  |
2283   `--------------------------------*/
2284  
2698 #if (defined __STDC__ || defined __C99__FUNC__ \
2699     || defined __cplusplus || defined _MSC_VER)
2285   static void
2286   yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2702 #else
2703 static void
2704 yy_symbol_print (yyoutput, yytype, yyvaluep)
2705    FILE *yyoutput;
2706    int yytype;
2707    YYSTYPE const * const yyvaluep;
2708 #endif
2287   {
2288 <  if (yytype < YYNTOKENS)
2289 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2712 <  else
2713 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2288 >  YYFPRINTF (yyoutput, "%s %s (",
2289 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2290  
2291    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2292    YYFPRINTF (yyoutput, ")");
# Line 2721 | Line 2297 | yy_symbol_print (yyoutput, yytype, yyval
2297   | TOP (included).                                                   |
2298   `------------------------------------------------------------------*/
2299  
2724 #if (defined __STDC__ || defined __C99__FUNC__ \
2725     || defined __cplusplus || defined _MSC_VER)
2300   static void
2301   yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
2728 #else
2729 static void
2730 yy_stack_print (yybottom, yytop)
2731    yytype_int16 *yybottom;
2732    yytype_int16 *yytop;
2733 #endif
2302   {
2303    YYFPRINTF (stderr, "Stack now");
2304    for (; yybottom <= yytop; yybottom++)
# Line 2741 | Line 2309 | yy_stack_print (yybottom, yytop)
2309    YYFPRINTF (stderr, "\n");
2310   }
2311  
2312 < # define YY_STACK_PRINT(Bottom, Top)                            \
2313 < do {                                                            \
2314 <  if (yydebug)                                                  \
2315 <    yy_stack_print ((Bottom), (Top));                           \
2316 < } while (YYID (0))
2312 > # define YY_STACK_PRINT(Bottom, Top)                            \
2313 > do {                                                            \
2314 >  if (yydebug)                                                  \
2315 >    yy_stack_print ((Bottom), (Top));                           \
2316 > } while (0)
2317  
2318  
2319   /*------------------------------------------------.
2320   | Report that the YYRULE is going to be reduced.  |
2321   `------------------------------------------------*/
2322  
2755 #if (defined __STDC__ || defined __C99__FUNC__ \
2756     || defined __cplusplus || defined _MSC_VER)
2757 static void
2758 yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
2759 #else
2323   static void
2324 < yy_reduce_print (yyvsp, yyrule)
2762 <    YYSTYPE *yyvsp;
2763 <    int yyrule;
2764 < #endif
2324 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2325   {
2326 +  unsigned long int yylno = yyrline[yyrule];
2327    int yynrhs = yyr2[yyrule];
2328    int yyi;
2768  unsigned long int yylno = yyrline[yyrule];
2329    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2330 <             yyrule - 1, yylno);
2330 >             yyrule - 1, yylno);
2331    /* The symbols being reduced.  */
2332    for (yyi = 0; yyi < yynrhs; yyi++)
2333      {
2334        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2335 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2336 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2337 <                                       );
2335 >      yy_symbol_print (stderr,
2336 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2337 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2338 >                                              );
2339        YYFPRINTF (stderr, "\n");
2340      }
2341   }
2342  
2343 < # define YY_REDUCE_PRINT(Rule)          \
2344 < do {                                    \
2345 <  if (yydebug)                          \
2346 <    yy_reduce_print (yyvsp, Rule); \
2347 < } while (YYID (0))
2343 > # define YY_REDUCE_PRINT(Rule)          \
2344 > do {                                    \
2345 >  if (yydebug)                          \
2346 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2347 > } while (0)
2348  
2349   /* Nonzero means print parse trace.  It is left uninitialized so that
2350     multiple parsers can coexist.  */
# Line 2797 | Line 2358 | int yydebug;
2358  
2359  
2360   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2361 < #ifndef YYINITDEPTH
2361 > #ifndef YYINITDEPTH
2362   # define YYINITDEPTH 200
2363   #endif
2364  
# Line 2820 | Line 2381 | int yydebug;
2381   #   define yystrlen strlen
2382   #  else
2383   /* Return the length of YYSTR.  */
2823 #if (defined __STDC__ || defined __C99__FUNC__ \
2824     || defined __cplusplus || defined _MSC_VER)
2384   static YYSIZE_T
2385   yystrlen (const char *yystr)
2827 #else
2828 static YYSIZE_T
2829 yystrlen (yystr)
2830    const char *yystr;
2831 #endif
2386   {
2387    YYSIZE_T yylen;
2388    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2844 | Line 2398 | yystrlen (yystr)
2398   #  else
2399   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2400     YYDEST.  */
2847 #if (defined __STDC__ || defined __C99__FUNC__ \
2848     || defined __cplusplus || defined _MSC_VER)
2401   static char *
2402   yystpcpy (char *yydest, const char *yysrc)
2851 #else
2852 static char *
2853 yystpcpy (yydest, yysrc)
2854    char *yydest;
2855    const char *yysrc;
2856 #endif
2403   {
2404    char *yyd = yydest;
2405    const char *yys = yysrc;
# Line 2883 | Line 2429 | yytnamerr (char *yyres, const char *yyst
2429        char const *yyp = yystr;
2430  
2431        for (;;)
2432 <        switch (*++yyp)
2433 <          {
2434 <          case '\'':
2435 <          case ',':
2436 <            goto do_not_strip_quotes;
2437 <
2438 <          case '\\':
2439 <            if (*++yyp != '\\')
2440 <              goto do_not_strip_quotes;
2441 <            /* Fall through.  */
2442 <          default:
2443 <            if (yyres)
2444 <              yyres[yyn] = *yyp;
2445 <            yyn++;
2446 <            break;
2447 <
2448 <          case '"':
2449 <            if (yyres)
2450 <              yyres[yyn] = '\0';
2451 <            return yyn;
2452 <          }
2432 >        switch (*++yyp)
2433 >          {
2434 >          case '\'':
2435 >          case ',':
2436 >            goto do_not_strip_quotes;
2437 >
2438 >          case '\\':
2439 >            if (*++yyp != '\\')
2440 >              goto do_not_strip_quotes;
2441 >            /* Fall through.  */
2442 >          default:
2443 >            if (yyres)
2444 >              yyres[yyn] = *yyp;
2445 >            yyn++;
2446 >            break;
2447 >
2448 >          case '"':
2449 >            if (yyres)
2450 >              yyres[yyn] = '\0';
2451 >            return yyn;
2452 >          }
2453      do_not_strip_quotes: ;
2454      }
2455  
# Line 2926 | Line 2472 | static int
2472   yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2473                  yytype_int16 *yyssp, int yytoken)
2474   {
2475 <  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
2475 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2476    YYSIZE_T yysize = yysize0;
2931  YYSIZE_T yysize1;
2477    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2478    /* Internationalized format string. */
2479 <  const char *yyformat = 0;
2479 >  const char *yyformat = YY_NULLPTR;
2480    /* Arguments of yyformat. */
2481    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2482    /* Number of reported tokens (one for the "unexpected", one per
# Line 2939 | Line 2484 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2484    int yycount = 0;
2485  
2486    /* There are many possibilities here to consider:
2942     - Assume YYFAIL is not used.  It's too flawed to consider.  See
2943       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
2944       for details.  YYERROR is fine as it does not invoke this
2945       function.
2487       - If this state is a consistent state with a default action, then
2488         the only way this function was invoked is if the default action
2489         is an error action.  In that case, don't check for expected
# Line 2991 | Line 2532 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2532                      break;
2533                    }
2534                  yyarg[yycount++] = yytname[yyx];
2535 <                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
2536 <                if (! (yysize <= yysize1
2537 <                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2538 <                  return 2;
2539 <                yysize = yysize1;
2535 >                {
2536 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2537 >                  if (! (yysize <= yysize1
2538 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2539 >                    return 2;
2540 >                  yysize = yysize1;
2541 >                }
2542                }
2543          }
2544      }
# Line 3015 | Line 2558 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2558   # undef YYCASE_
2559      }
2560  
2561 <  yysize1 = yysize + yystrlen (yyformat);
2562 <  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2563 <    return 2;
2564 <  yysize = yysize1;
2561 >  {
2562 >    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2563 >    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2564 >      return 2;
2565 >    yysize = yysize1;
2566 >  }
2567  
2568    if (*yymsg_alloc < yysize)
2569      {
# Line 3055 | Line 2600 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2600   | Release the memory associated to this symbol.  |
2601   `-----------------------------------------------*/
2602  
3058 /*ARGSUSED*/
3059 #if (defined __STDC__ || defined __C99__FUNC__ \
3060     || defined __cplusplus || defined _MSC_VER)
2603   static void
2604   yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
3063 #else
3064 static void
3065 yydestruct (yymsg, yytype, yyvaluep)
3066    const char *yymsg;
3067    int yytype;
3068    YYSTYPE *yyvaluep;
3069 #endif
2605   {
2606    YYUSE (yyvaluep);
3072
2607    if (!yymsg)
2608      yymsg = "Deleting";
2609    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2610  
2611 <  switch (yytype)
2612 <    {
2613 <
3080 <      default:
3081 <        break;
3082 <    }
2611 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2612 >  YYUSE (yytype);
2613 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2614   }
2615  
2616  
3086 /* Prevent warnings from -Wmissing-prototypes.  */
3087 #ifdef YYPARSE_PARAM
3088 #if defined __STDC__ || defined __cplusplus
3089 int yyparse (void *YYPARSE_PARAM);
3090 #else
3091 int yyparse ();
3092 #endif
3093 #else /* ! YYPARSE_PARAM */
3094 #if defined __STDC__ || defined __cplusplus
3095 int yyparse (void);
3096 #else
3097 int yyparse ();
3098 #endif
3099 #endif /* ! YYPARSE_PARAM */
2617  
2618  
2619   /* The lookahead symbol.  */
# Line 3104 | Line 2621 | int yychar;
2621  
2622   /* The semantic value of the lookahead symbol.  */
2623   YYSTYPE yylval;
3107
2624   /* Number of syntax errors so far.  */
2625   int yynerrs;
2626  
# Line 3113 | Line 2629 | int yynerrs;
2629   | yyparse.  |
2630   `----------*/
2631  
3116 #ifdef YYPARSE_PARAM
3117 #if (defined __STDC__ || defined __C99__FUNC__ \
3118     || defined __cplusplus || defined _MSC_VER)
3119 int
3120 yyparse (void *YYPARSE_PARAM)
3121 #else
3122 int
3123 yyparse (YYPARSE_PARAM)
3124    void *YYPARSE_PARAM;
3125 #endif
3126 #else /* ! YYPARSE_PARAM */
3127 #if (defined __STDC__ || defined __C99__FUNC__ \
3128     || defined __cplusplus || defined _MSC_VER)
2632   int
2633   yyparse (void)
3131 #else
3132 int
3133 yyparse ()
3134
3135 #endif
3136 #endif
2634   {
2635      int yystate;
2636      /* Number of tokens to shift before error messages enabled.  */
2637      int yyerrstatus;
2638  
2639      /* The stacks and their tools:
2640 <       `yyss': related to states.
2641 <       `yyvs': related to semantic values.
2640 >       'yyss': related to states.
2641 >       'yyvs': related to semantic values.
2642  
2643 <       Refer to the stacks thru separate pointers, to allow yyoverflow
2643 >       Refer to the stacks through separate pointers, to allow yyoverflow
2644         to reallocate them elsewhere.  */
2645  
2646      /* The state stack.  */
# Line 3161 | Line 2658 | yyparse ()
2658    int yyn;
2659    int yyresult;
2660    /* Lookahead token as an internal (translated) token number.  */
2661 <  int yytoken;
2661 >  int yytoken = 0;
2662    /* The variables used to return semantic value and location from the
2663       action routines.  */
2664    YYSTYPE yyval;
# Line 3179 | Line 2676 | yyparse ()
2676       Keep to zero when no symbol should be popped.  */
2677    int yylen = 0;
2678  
2679 <  yytoken = 0;
2680 <  yyss = yyssa;
3184 <  yyvs = yyvsa;
2679 >  yyssp = yyss = yyssa;
2680 >  yyvsp = yyvs = yyvsa;
2681    yystacksize = YYINITDEPTH;
2682  
2683    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 3190 | Line 2686 | yyparse ()
2686    yyerrstatus = 0;
2687    yynerrs = 0;
2688    yychar = YYEMPTY; /* Cause a token to be read.  */
3193
3194  /* Initialize stack pointers.
3195     Waste one element of value and location stack
3196     so that they stay on the same level as the state stack.
3197     The wasted elements are never initialized.  */
3198  yyssp = yyss;
3199  yyvsp = yyvs;
3200
2689    goto yysetstate;
2690  
2691   /*------------------------------------------------------------.
# Line 3218 | Line 2706 | yyparse ()
2706  
2707   #ifdef yyoverflow
2708        {
2709 <        /* Give user a chance to reallocate the stack.  Use copies of
2710 <           these so that the &'s don't force the real ones into
2711 <           memory.  */
2712 <        YYSTYPE *yyvs1 = yyvs;
2713 <        yytype_int16 *yyss1 = yyss;
2714 <
2715 <        /* Each stack pointer address is followed by the size of the
2716 <           data in use in that stack, in bytes.  This used to be a
2717 <           conditional around just the two extra args, but that might
2718 <           be undefined if yyoverflow is a macro.  */
2719 <        yyoverflow (YY_("memory exhausted"),
2720 <                    &yyss1, yysize * sizeof (*yyssp),
2721 <                    &yyvs1, yysize * sizeof (*yyvsp),
2722 <                    &yystacksize);
2709 >        /* Give user a chance to reallocate the stack.  Use copies of
2710 >           these so that the &'s don't force the real ones into
2711 >           memory.  */
2712 >        YYSTYPE *yyvs1 = yyvs;
2713 >        yytype_int16 *yyss1 = yyss;
2714 >
2715 >        /* Each stack pointer address is followed by the size of the
2716 >           data in use in that stack, in bytes.  This used to be a
2717 >           conditional around just the two extra args, but that might
2718 >           be undefined if yyoverflow is a macro.  */
2719 >        yyoverflow (YY_("memory exhausted"),
2720 >                    &yyss1, yysize * sizeof (*yyssp),
2721 >                    &yyvs1, yysize * sizeof (*yyvsp),
2722 >                    &yystacksize);
2723  
2724 <        yyss = yyss1;
2725 <        yyvs = yyvs1;
2724 >        yyss = yyss1;
2725 >        yyvs = yyvs1;
2726        }
2727   #else /* no yyoverflow */
2728   # ifndef YYSTACK_RELOCATE
# Line 3242 | Line 2730 | yyparse ()
2730   # else
2731        /* Extend the stack our own way.  */
2732        if (YYMAXDEPTH <= yystacksize)
2733 <        goto yyexhaustedlab;
2733 >        goto yyexhaustedlab;
2734        yystacksize *= 2;
2735        if (YYMAXDEPTH < yystacksize)
2736 <        yystacksize = YYMAXDEPTH;
2736 >        yystacksize = YYMAXDEPTH;
2737  
2738        {
2739 <        yytype_int16 *yyss1 = yyss;
2740 <        union yyalloc *yyptr =
2741 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2742 <        if (! yyptr)
2743 <          goto yyexhaustedlab;
2744 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2745 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2739 >        yytype_int16 *yyss1 = yyss;
2740 >        union yyalloc *yyptr =
2741 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2742 >        if (! yyptr)
2743 >          goto yyexhaustedlab;
2744 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2745 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2746   #  undef YYSTACK_RELOCATE
2747 <        if (yyss1 != yyssa)
2748 <          YYSTACK_FREE (yyss1);
2747 >        if (yyss1 != yyssa)
2748 >          YYSTACK_FREE (yyss1);
2749        }
2750   # endif
2751   #endif /* no yyoverflow */
# Line 3266 | Line 2754 | yyparse ()
2754        yyvsp = yyvs + yysize - 1;
2755  
2756        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2757 <                  (unsigned long int) yystacksize));
2757 >                  (unsigned long int) yystacksize));
2758  
2759        if (yyss + yystacksize - 1 <= yyssp)
2760 <        YYABORT;
2760 >        YYABORT;
2761      }
2762  
2763    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3298 | Line 2786 | yybackup:
2786    if (yychar == YYEMPTY)
2787      {
2788        YYDPRINTF ((stderr, "Reading a token: "));
2789 <      yychar = YYLEX;
2789 >      yychar = yylex ();
2790      }
2791  
2792    if (yychar <= YYEOF)
# Line 3338 | Line 2826 | yybackup:
2826    yychar = YYEMPTY;
2827  
2828    yystate = yyn;
2829 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2830    *++yyvsp = yylval;
2831 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2832  
2833    goto yynewstate;
2834  
# Line 3361 | Line 2851 | yyreduce:
2851    yylen = yyr2[yyn];
2852  
2853    /* If YYLEN is nonzero, implement the default value of the action:
2854 <     `$$ = $1'.
2854 >     '$$ = $1'.
2855  
2856       Otherwise, the following line sets YYVAL to garbage.
2857       This behavior is undocumented and Bison
# Line 3375 | Line 2865 | yyreduce:
2865    switch (yyn)
2866      {
2867          case 27:
2868 <
3379 < /* Line 1806 of yacc.c  */
3380 < #line 425 "ircd_parser.y"
2868 > #line 411 "conf_parser.y" /* yacc.c:1646  */
2869      { (yyval.number) = 0; }
2870 + #line 2871 "conf_parser.c" /* yacc.c:1646  */
2871      break;
2872  
2873    case 29:
2874 <
2875 < /* Line 1806 of yacc.c  */
2876 < #line 427 "ircd_parser.y"
3388 <    {
3389 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3390 <                }
2874 > #line 412 "conf_parser.y" /* yacc.c:1646  */
2875 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2876 > #line 2877 "conf_parser.c" /* yacc.c:1646  */
2877      break;
2878  
2879    case 30:
2880 <
2881 < /* Line 1806 of yacc.c  */
2882 < #line 431 "ircd_parser.y"
3397 <    {
3398 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3399 <                }
2880 > #line 413 "conf_parser.y" /* yacc.c:1646  */
2881 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2882 > #line 2883 "conf_parser.c" /* yacc.c:1646  */
2883      break;
2884  
2885    case 31:
2886 <
2887 < /* Line 1806 of yacc.c  */
2888 < #line 435 "ircd_parser.y"
3406 <    {
3407 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3408 <                }
2886 > #line 414 "conf_parser.y" /* yacc.c:1646  */
2887 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2888 > #line 2889 "conf_parser.c" /* yacc.c:1646  */
2889      break;
2890  
2891    case 32:
2892 <
2893 < /* Line 1806 of yacc.c  */
2894 < #line 439 "ircd_parser.y"
3415 <    {
3416 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3417 <                }
2892 > #line 415 "conf_parser.y" /* yacc.c:1646  */
2893 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2894 > #line 2895 "conf_parser.c" /* yacc.c:1646  */
2895      break;
2896  
2897    case 33:
2898 <
2899 < /* Line 1806 of yacc.c  */
2900 < #line 443 "ircd_parser.y"
3424 <    {
3425 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3426 <                }
2898 > #line 416 "conf_parser.y" /* yacc.c:1646  */
2899 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2900 > #line 2901 "conf_parser.c" /* yacc.c:1646  */
2901      break;
2902  
2903    case 34:
2904 <
2905 < /* Line 1806 of yacc.c  */
2906 < #line 447 "ircd_parser.y"
3433 <    {
3434 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3435 <                }
2904 > #line 417 "conf_parser.y" /* yacc.c:1646  */
2905 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2906 > #line 2907 "conf_parser.c" /* yacc.c:1646  */
2907      break;
2908  
2909    case 35:
2910 <
2911 < /* Line 1806 of yacc.c  */
2912 < #line 452 "ircd_parser.y"
3442 <    { (yyval.number) = 0; }
2910 > #line 418 "conf_parser.y" /* yacc.c:1646  */
2911 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2912 > #line 2913 "conf_parser.c" /* yacc.c:1646  */
2913      break;
2914  
2915 <  case 37:
2916 <
2917 < /* Line 1806 of yacc.c  */
2918 < #line 453 "ircd_parser.y"
3449 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2915 >  case 36:
2916 > #line 419 "conf_parser.y" /* yacc.c:1646  */
2917 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2918 > #line 2919 "conf_parser.c" /* yacc.c:1646  */
2919      break;
2920  
2921 <  case 38:
2922 <
2923 < /* Line 1806 of yacc.c  */
2924 < #line 454 "ircd_parser.y"
3456 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2921 >  case 37:
2922 > #line 422 "conf_parser.y" /* yacc.c:1646  */
2923 >    { (yyval.number) = 0; }
2924 > #line 2925 "conf_parser.c" /* yacc.c:1646  */
2925      break;
2926  
2927    case 39:
2928 <
2929 < /* Line 1806 of yacc.c  */
2930 < #line 455 "ircd_parser.y"
3463 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2928 > #line 423 "conf_parser.y" /* yacc.c:1646  */
2929 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2930 > #line 2931 "conf_parser.c" /* yacc.c:1646  */
2931      break;
2932  
2933    case 40:
2934 + #line 424 "conf_parser.y" /* yacc.c:1646  */
2935 +    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2936 + #line 2937 "conf_parser.c" /* yacc.c:1646  */
2937 +    break;
2938  
2939 < /* Line 1806 of yacc.c  */
2940 < #line 456 "ircd_parser.y"
2941 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2939 >  case 41:
2940 > #line 425 "conf_parser.y" /* yacc.c:1646  */
2941 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2942 > #line 2943 "conf_parser.c" /* yacc.c:1646  */
2943      break;
2944  
2945 <  case 47:
2945 >  case 42:
2946 > #line 426 "conf_parser.y" /* yacc.c:1646  */
2947 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2948 > #line 2949 "conf_parser.c" /* yacc.c:1646  */
2949 >    break;
2950  
2951 < /* Line 1806 of yacc.c  */
2952 < #line 470 "ircd_parser.y"
2951 >  case 49:
2952 > #line 440 "conf_parser.y" /* yacc.c:1646  */
2953      {
2954    if (conf_parser_ctx.pass == 2)
2955      add_conf_module(libio_basename(yylval.string));
2956   }
2957 + #line 2958 "conf_parser.c" /* yacc.c:1646  */
2958      break;
2959  
2960 <  case 48:
2961 <
3485 < /* Line 1806 of yacc.c  */
3486 < #line 476 "ircd_parser.y"
2960 >  case 50:
2961 > #line 446 "conf_parser.y" /* yacc.c:1646  */
2962      {
2963    if (conf_parser_ctx.pass == 2)
2964      mod_add_path(yylval.string);
2965   }
2966 + #line 2967 "conf_parser.c" /* yacc.c:1646  */
2967      break;
2968  
2969 <  case 65:
2970 <
3495 < /* Line 1806 of yacc.c  */
3496 < #line 496 "ircd_parser.y"
2969 >  case 72:
2970 > #line 476 "conf_parser.y" /* yacc.c:1646  */
2971      {
2972   #ifdef HAVE_LIBCRYPTO
2973 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
2974 <    ServerInfo.tls_version = 0;
2973 >  if (conf_parser_ctx.pass == 2)
2974 >  {
2975 >    if (!ConfigServerInfo.rsa_private_key_file)
2976 >    {
2977 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2978 >      break;
2979 >    }
2980 >
2981 >    if (SSL_CTX_use_certificate_file(ConfigServerInfo.server_ctx, yylval.string,
2982 >                                     SSL_FILETYPE_PEM) <= 0 ||
2983 >        SSL_CTX_use_certificate_file(ConfigServerInfo.client_ctx, yylval.string,
2984 >                                     SSL_FILETYPE_PEM) <= 0)
2985 >    {
2986 >      report_crypto_errors();
2987 >      conf_error_report("Could not open/read certificate file");
2988 >      break;
2989 >    }
2990 >
2991 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2992 >                                    SSL_FILETYPE_PEM) <= 0 ||
2993 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
2994 >                                    SSL_FILETYPE_PEM) <= 0)
2995 >    {
2996 >      report_crypto_errors();
2997 >      conf_error_report("Could not read RSA private key");
2998 >      break;
2999 >    }
3000 >
3001 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
3002 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
3003 >    {
3004 >      report_crypto_errors();
3005 >      conf_error_report("Could not read RSA private key");
3006 >      break;
3007 >    }
3008 >  }
3009   #endif
3010   }
3011 + #line 3012 "conf_parser.c" /* yacc.c:1646  */
3012      break;
3013  
3014 <  case 66:
3015 <
3507 < /* Line 1806 of yacc.c  */
3508 < #line 502 "ircd_parser.y"
3014 >  case 73:
3015 > #line 518 "conf_parser.y" /* yacc.c:1646  */
3016      {
3017   #ifdef HAVE_LIBCRYPTO
3018 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3018 >  BIO *file = NULL;
3019 >
3020 >  if (conf_parser_ctx.pass != 1)
3021 >    break;
3022 >
3023 >  if (ConfigServerInfo.rsa_private_key)
3024    {
3025 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
3026 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
3515 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
3516 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
3025 >    RSA_free(ConfigServerInfo.rsa_private_key);
3026 >    ConfigServerInfo.rsa_private_key = NULL;
3027    }
3028 < #endif
3029 < }
3028 >
3029 >  if (ConfigServerInfo.rsa_private_key_file)
3030 >  {
3031 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3032 >    ConfigServerInfo.rsa_private_key_file = NULL;
3033 >  }
3034 >
3035 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3036 >
3037 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3038 >  {
3039 >    conf_error_report("File open failed, ignoring");
3040      break;
3041 +  }
3042  
3043 <  case 69:
3043 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3044  
3045 < /* Line 1806 of yacc.c  */
3046 < #line 516 "ircd_parser.y"
3047 <    {
3048 < #ifdef HAVE_LIBCRYPTO
3049 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3050 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
3530 < #endif
3531 < }
3045 >  BIO_set_close(file, BIO_CLOSE);
3046 >  BIO_free(file);
3047 >
3048 >  if (ConfigServerInfo.rsa_private_key == NULL)
3049 >  {
3050 >    conf_error_report("Couldn't extract key, ignoring");
3051      break;
3052 +  }
3053  
3054 <  case 70:
3054 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3055 >  {
3056 >    RSA_free(ConfigServerInfo.rsa_private_key);
3057 >    ConfigServerInfo.rsa_private_key = NULL;
3058  
3059 < /* Line 1806 of yacc.c  */
3060 < #line 522 "ircd_parser.y"
3061 <    {
3062 < #ifdef HAVE_LIBCRYPTO
3063 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3064 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
3059 >    conf_error_report("Invalid key, ignoring");
3060 >    break;
3061 >  }
3062 >
3063 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3064 >  {
3065 >    RSA_free(ConfigServerInfo.rsa_private_key);
3066 >    ConfigServerInfo.rsa_private_key = NULL;
3067 >
3068 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3069 >  }
3070   #endif
3071   }
3072 + #line 3073 "conf_parser.c" /* yacc.c:1646  */
3073      break;
3074  
3075 <  case 71:
3076 <
3548 < /* Line 1806 of yacc.c  */
3549 < #line 530 "ircd_parser.y"
3075 >  case 74:
3076 > #line 576 "conf_parser.y" /* yacc.c:1646  */
3077      {
3078   #ifdef HAVE_LIBCRYPTO
3079 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3079 >  if (conf_parser_ctx.pass == 2)
3080    {
3081 <    if (!ServerInfo.rsa_private_key_file)
3555 <    {
3556 <      yyerror("No rsa_private_key_file specified, SSL disabled");
3557 <      break;
3558 <    }
3081 >    BIO *file = BIO_new_file(yylval.string, "r");
3082  
3083 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
3561 <                                     SSL_FILETYPE_PEM) <= 0)
3083 >    if (file)
3084      {
3085 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3564 <      break;
3565 <    }
3085 >      DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
3086  
3087 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
3568 <                                    SSL_FILETYPE_PEM) <= 0)
3569 <    {
3570 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3571 <      break;
3572 <    }
3087 >      BIO_free(file);
3088  
3089 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
3090 <    {
3091 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3092 <      break;
3089 >      if (dh)
3090 >      {
3091 >        if (DH_size(dh) < 128)
3092 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3093 >        else
3094 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3095 >
3096 >        DH_free(dh);
3097 >      }
3098      }
3099 +    else
3100 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3101    }
3102   #endif
3103   }
3104 + #line 3105 "conf_parser.c" /* yacc.c:1646  */
3105      break;
3106  
3107 <  case 72:
3108 <
3586 < /* Line 1806 of yacc.c  */
3587 < #line 564 "ircd_parser.y"
3107 >  case 75:
3108 > #line 605 "conf_parser.y" /* yacc.c:1646  */
3109      {
3110   #ifdef HAVE_LIBCRYPTO
3111 <  if (conf_parser_ctx.pass == 1)
3112 <  {
3113 <    BIO *file;
3111 >  if (conf_parser_ctx.pass == 2)
3112 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3113 > #endif
3114 > }
3115 > #line 3116 "conf_parser.c" /* yacc.c:1646  */
3116 >    break;
3117  
3118 <    if (ServerInfo.rsa_private_key)
3118 >  case 76:
3119 > #line 613 "conf_parser.y" /* yacc.c:1646  */
3120      {
3121 <      RSA_free(ServerInfo.rsa_private_key);
3122 <      ServerInfo.rsa_private_key = NULL;
3123 <    }
3124 <
3600 <    if (ServerInfo.rsa_private_key_file)
3121 > #ifdef HAVE_LIBCRYPTO
3122 >  if (conf_parser_ctx.pass == 2)
3123 >  {
3124 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3125      {
3126 <      MyFree(ServerInfo.rsa_private_key_file);
3127 <      ServerInfo.rsa_private_key_file = NULL;
3126 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3127 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3128      }
3129 +  }
3130 + #endif
3131 + }
3132 + #line 3133 "conf_parser.c" /* yacc.c:1646  */
3133 +    break;
3134  
3135 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3136 <
3608 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3135 >  case 77:
3136 > #line 627 "conf_parser.y" /* yacc.c:1646  */
3137      {
3138 <      yyerror("File open failed, ignoring");
3139 <      break;
3140 <    }
3141 <
3614 <    ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
3615 <      0, NULL);
3616 <
3617 <    BIO_set_close(file, BIO_CLOSE);
3618 <    BIO_free(file);
3138 > #ifdef HAVE_LIBCRYPTO
3139 > #if OPENSSL_VERSION_NUMBER >= 0x1000005FL && !defined(OPENSSL_NO_ECDH)
3140 >  int nid = 0;
3141 >  EC_KEY *key = NULL;
3142  
3143 <    if (ServerInfo.rsa_private_key == NULL)
3143 >  if (conf_parser_ctx.pass == 2)
3144 >  {
3145 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3146      {
3147 <      yyerror("Couldn't extract key, ignoring");
3148 <      break;
3147 >        conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
3148 >        break;
3149      }
3150  
3151 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3151 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3152      {
3153 <      RSA_free(ServerInfo.rsa_private_key);
3629 <      ServerInfo.rsa_private_key = NULL;
3630 <
3631 <      yyerror("Invalid key, ignoring");
3153 >      conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
3154        break;
3155      }
3156  
3157 <    /* require 2048 bit (256 byte) key */
3158 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3159 <    {
3160 <      RSA_free(ServerInfo.rsa_private_key);
3639 <      ServerInfo.rsa_private_key = NULL;
3640 <
3641 <      yyerror("Not a 2048 bit key, ignoring");
3642 <    }
3643 <  }
3157 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3158 >    EC_KEY_free(key);
3159 > }
3160 > #endif
3161   #endif
3162   }
3163 + #line 3164 "conf_parser.c" /* yacc.c:1646  */
3164      break;
3165  
3166 <  case 73:
3167 <
3650 < /* Line 1806 of yacc.c  */
3651 < #line 624 "ircd_parser.y"
3166 >  case 78:
3167 > #line 655 "conf_parser.y" /* yacc.c:1646  */
3168      {
3169    /* this isn't rehashable */
3170 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
3170 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3171    {
3172      if (valid_servname(yylval.string))
3173 <      DupString(ServerInfo.name, yylval.string);
3173 >      ConfigServerInfo.name = xstrdup(yylval.string);
3174      else
3175      {
3176 <      ilog(L_ERROR, "Ignoring serverinfo::name -- invalid name. Aborting.");
3176 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3177        exit(0);
3178      }
3179    }
3180   }
3181 + #line 3182 "conf_parser.c" /* yacc.c:1646  */
3182      break;
3183  
3184 <  case 74:
3185 <
3669 < /* Line 1806 of yacc.c  */
3670 < #line 639 "ircd_parser.y"
3184 >  case 79:
3185 > #line 670 "conf_parser.y" /* yacc.c:1646  */
3186      {
3187    /* this isn't rehashable */
3188 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3188 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3189    {
3190      if (valid_sid(yylval.string))
3191 <      DupString(ServerInfo.sid, yylval.string);
3191 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3192      else
3193      {
3194 <      ilog(L_ERROR, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
3194 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3195        exit(0);
3196      }
3197    }
3198   }
3199 + #line 3200 "conf_parser.c" /* yacc.c:1646  */
3200      break;
3201  
3202 <  case 75:
3203 <
3688 < /* Line 1806 of yacc.c  */
3689 < #line 654 "ircd_parser.y"
3202 >  case 80:
3203 > #line 685 "conf_parser.y" /* yacc.c:1646  */
3204      {
3205    if (conf_parser_ctx.pass == 2)
3206    {
3207 <    MyFree(ServerInfo.description);
3208 <    DupString(ServerInfo.description,yylval.string);
3207 >    MyFree(ConfigServerInfo.description);
3208 >    ConfigServerInfo.description = xstrdup(yylval.string);
3209    }
3210   }
3211 + #line 3212 "conf_parser.c" /* yacc.c:1646  */
3212      break;
3213  
3214 <  case 76:
3215 <
3701 < /* Line 1806 of yacc.c  */
3702 < #line 663 "ircd_parser.y"
3214 >  case 81:
3215 > #line 694 "conf_parser.y" /* yacc.c:1646  */
3216      {
3217    if (conf_parser_ctx.pass == 2)
3218    {
3219      char *p;
3220  
3221 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3222 <      p = '\0';
3221 >    if ((p = strchr(yylval.string, ' ')))
3222 >      *p = '\0';
3223  
3224 <    MyFree(ServerInfo.network_name);
3225 <    DupString(ServerInfo.network_name, yylval.string);
3224 >    MyFree(ConfigServerInfo.network_name);
3225 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3226    }
3227   }
3228 + #line 3229 "conf_parser.c" /* yacc.c:1646  */
3229      break;
3230  
3231 <  case 77:
3232 <
3719 < /* Line 1806 of yacc.c  */
3720 < #line 677 "ircd_parser.y"
3231 >  case 82:
3232 > #line 708 "conf_parser.y" /* yacc.c:1646  */
3233      {
3234 <  if (conf_parser_ctx.pass == 2)
3723 <  {
3724 <    MyFree(ServerInfo.network_desc);
3725 <    DupString(ServerInfo.network_desc, yylval.string);
3726 <  }
3727 < }
3234 >  if (conf_parser_ctx.pass != 2)
3235      break;
3236  
3237 <  case 78:
3237 >  MyFree(ConfigServerInfo.network_desc);
3238 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3239 > }
3240 > #line 3241 "conf_parser.c" /* yacc.c:1646  */
3241 >    break;
3242  
3243 < /* Line 1806 of yacc.c  */
3244 < #line 686 "ircd_parser.y"
3243 >  case 83:
3244 > #line 717 "conf_parser.y" /* yacc.c:1646  */
3245      {
3246    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3247    {
# Line 3743 | Line 3254 | yyreduce:
3254      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3255  
3256      if (getaddrinfo(yylval.string, NULL, &hints, &res))
3257 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
3257 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3258      else
3259      {
3260 <      assert(res != NULL);
3260 >      assert(res);
3261  
3262 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3263 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3264 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3262 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3263 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3264 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3265        freeaddrinfo(res);
3266  
3267 <      ServerInfo.specific_ipv4_vhost = 1;
3267 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3268      }
3269    }
3270   }
3271 + #line 3272 "conf_parser.c" /* yacc.c:1646  */
3272      break;
3273  
3274 <  case 79:
3275 <
3764 < /* Line 1806 of yacc.c  */
3765 < #line 714 "ircd_parser.y"
3274 >  case 84:
3275 > #line 745 "conf_parser.y" /* yacc.c:1646  */
3276      {
3767 #ifdef IPV6
3277    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3278    {
3279      struct addrinfo hints, *res;
# Line 3776 | Line 3285 | yyreduce:
3285      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3286  
3287      if (getaddrinfo(yylval.string, NULL, &hints, &res))
3288 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
3288 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3289      else
3290      {
3291 <      assert(res != NULL);
3291 >      assert(res);
3292  
3293 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3294 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3295 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3293 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3294 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3295 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3296        freeaddrinfo(res);
3297  
3298 <      ServerInfo.specific_ipv6_vhost = 1;
3298 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3299      }
3300    }
3792 #endif
3301   }
3302 + #line 3303 "conf_parser.c" /* yacc.c:1646  */
3303      break;
3304  
3305 <  case 80:
3306 <
3798 < /* Line 1806 of yacc.c  */
3799 < #line 744 "ircd_parser.y"
3305 >  case 85:
3306 > #line 773 "conf_parser.y" /* yacc.c:1646  */
3307      {
3308 <  if (conf_parser_ctx.pass == 2)
3308 >  if (conf_parser_ctx.pass != 2)
3309 >    break;
3310 >
3311 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3312    {
3313 <    recalc_fdlimit(NULL);
3313 >    char buf[IRCD_BUFSIZE] = "";
3314  
3315 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3316 <    {
3317 <      char buf[IRCD_BUFSIZE];
3318 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3319 <      yyerror(buf);
3320 <    }
3321 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3322 <    {
3323 <      char buf[IRCD_BUFSIZE];
3324 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3325 <      yyerror(buf);
3816 <    }
3817 <    else
3818 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3315 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3316 >    conf_error_report(buf);
3317 >    ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
3318 >  }
3319 >  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3320 >  {
3321 >    char buf[IRCD_BUFSIZE] = "";
3322 >
3323 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3324 >    conf_error_report(buf);
3325 >    ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
3326    }
3327 +  else
3328 +    ConfigServerInfo.max_clients = (yyvsp[-1].number);
3329   }
3330 + #line 3331 "conf_parser.c" /* yacc.c:1646  */
3331      break;
3332  
3333 <  case 81:
3334 <
3825 < /* Line 1806 of yacc.c  */
3826 < #line 767 "ircd_parser.y"
3333 >  case 86:
3334 > #line 798 "conf_parser.y" /* yacc.c:1646  */
3335      {
3336 <  if (conf_parser_ctx.pass == 2)
3829 <    ServerInfo.hub = yylval.number;
3830 < }
3336 >  if (conf_parser_ctx.pass != 2)
3337      break;
3338  
3339 <  case 89:
3834 <
3835 < /* Line 1806 of yacc.c  */
3836 < #line 782 "ircd_parser.y"
3837 <    {
3838 <  if (conf_parser_ctx.pass == 2)
3339 >  if ((yyvsp[-1].number) < 9)
3340    {
3341 <    MyFree(AdminInfo.name);
3342 <    DupString(AdminInfo.name, yylval.string);
3341 >    conf_error_report("max_nick_length too low, setting to 9");
3342 >    ConfigServerInfo.max_nick_length = 9;
3343    }
3344 +  else if ((yyvsp[-1].number) > NICKLEN)
3345 +  {
3346 +    char buf[IRCD_BUFSIZE] = "";
3347 +
3348 +    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3349 +    conf_error_report(buf);
3350 +    ConfigServerInfo.max_nick_length = NICKLEN;
3351 +  }
3352 +  else
3353 +    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3354   }
3355 + #line 3356 "conf_parser.c" /* yacc.c:1646  */
3356      break;
3357  
3358 <  case 90:
3359 <
3848 < /* Line 1806 of yacc.c  */
3849 < #line 791 "ircd_parser.y"
3358 >  case 87:
3359 > #line 820 "conf_parser.y" /* yacc.c:1646  */
3360      {
3361 <  if (conf_parser_ctx.pass == 2)
3361 >  if (conf_parser_ctx.pass != 2)
3362 >    break;
3363 >
3364 >  if ((yyvsp[-1].number) < 80)
3365    {
3366 <    MyFree(AdminInfo.email);
3367 <    DupString(AdminInfo.email, yylval.string);
3366 >    conf_error_report("max_topic_length too low, setting to 80");
3367 >    ConfigServerInfo.max_topic_length = 80;
3368    }
3369 +  else if ((yyvsp[-1].number) > TOPICLEN)
3370 +  {
3371 +    char buf[IRCD_BUFSIZE] = "";
3372 +
3373 +    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3374 +    conf_error_report(buf);
3375 +    ConfigServerInfo.max_topic_length = TOPICLEN;
3376 +  }
3377 +  else
3378 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3379   }
3380 + #line 3381 "conf_parser.c" /* yacc.c:1646  */
3381      break;
3382  
3383 <  case 91:
3384 <
3861 < /* Line 1806 of yacc.c  */
3862 < #line 800 "ircd_parser.y"
3383 >  case 88:
3384 > #line 842 "conf_parser.y" /* yacc.c:1646  */
3385      {
3386    if (conf_parser_ctx.pass == 2)
3387 <  {
3866 <    MyFree(AdminInfo.description);
3867 <    DupString(AdminInfo.description, yylval.string);
3868 <  }
3387 >    ConfigServerInfo.hub = yylval.number;
3388   }
3389 + #line 3390 "conf_parser.c" /* yacc.c:1646  */
3390      break;
3391  
3392 <  case 108:
3393 <
3874 < /* Line 1806 of yacc.c  */
3875 < #line 827 "ircd_parser.y"
3392 >  case 96:
3393 > #line 859 "conf_parser.y" /* yacc.c:1646  */
3394      {
3395 <                        }
3395 >  if (conf_parser_ctx.pass != 2)
3396      break;
3397  
3398 <  case 109:
3398 >  MyFree(ConfigAdminInfo.name);
3399 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3400 > }
3401 > #line 3402 "conf_parser.c" /* yacc.c:1646  */
3402 >    break;
3403  
3404 < /* Line 1806 of yacc.c  */
3405 < #line 831 "ircd_parser.y"
3404 >  case 97:
3405 > #line 868 "conf_parser.y" /* yacc.c:1646  */
3406      {
3407 <                        }
3407 >  if (conf_parser_ctx.pass != 2)
3408      break;
3409  
3410 <  case 110:
3410 >  MyFree(ConfigAdminInfo.email);
3411 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3412 > }
3413 > #line 3414 "conf_parser.c" /* yacc.c:1646  */
3414 >    break;
3415  
3416 < /* Line 1806 of yacc.c  */
3417 < #line 835 "ircd_parser.y"
3416 >  case 98:
3417 > #line 877 "conf_parser.y" /* yacc.c:1646  */
3418      {
3419 <  if (conf_parser_ctx.pass == 2)
3894 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
3895 <            sizeof(ConfigLoggingEntry.userlog));
3896 < }
3419 >  if (conf_parser_ctx.pass != 2)
3420      break;
3421  
3422 <  case 111:
3422 >  MyFree(ConfigAdminInfo.description);
3423 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3424 > }
3425 > #line 3426 "conf_parser.c" /* yacc.c:1646  */
3426 >    break;
3427  
3428 < /* Line 1806 of yacc.c  */
3429 < #line 842 "ircd_parser.y"
3428 >  case 99:
3429 > #line 889 "conf_parser.y" /* yacc.c:1646  */
3430      {
3431    if (conf_parser_ctx.pass == 2)
3432 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
3906 <            sizeof(ConfigLoggingEntry.failed_operlog));
3432 >    reset_block_state();
3433   }
3434 + #line 3435 "conf_parser.c" /* yacc.c:1646  */
3435      break;
3436  
3437 <  case 112:
3437 >  case 100:
3438 > #line 893 "conf_parser.y" /* yacc.c:1646  */
3439 >    {
3440 >  dlink_node *ptr = NULL;
3441  
3442 < /* Line 1806 of yacc.c  */
3443 < #line 849 "ircd_parser.y"
3442 >  if (conf_parser_ctx.pass != 2)
3443 >    break;
3444 >
3445 >  if (!block_state.file.buf[0])
3446 >    break;
3447 >
3448 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
3449 >    motd_add(ptr->data, block_state.file.buf);
3450 > }
3451 > #line 3452 "conf_parser.c" /* yacc.c:1646  */
3452 >    break;
3453 >
3454 >  case 106:
3455 > #line 910 "conf_parser.y" /* yacc.c:1646  */
3456      {
3457    if (conf_parser_ctx.pass == 2)
3458 <    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
3917 <            sizeof(ConfigLoggingEntry.operlog));
3458 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3459   }
3460 + #line 3461 "conf_parser.c" /* yacc.c:1646  */
3461      break;
3462  
3463 <  case 113:
3464 <
3923 < /* Line 1806 of yacc.c  */
3924 < #line 856 "ircd_parser.y"
3463 >  case 107:
3464 > #line 916 "conf_parser.y" /* yacc.c:1646  */
3465      {
3466    if (conf_parser_ctx.pass == 2)
3467 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
3928 <            sizeof(ConfigLoggingEntry.operspylog));
3467 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3468   }
3469 + #line 3470 "conf_parser.c" /* yacc.c:1646  */
3470      break;
3471  
3472    case 114:
3473 <
3934 < /* Line 1806 of yacc.c  */
3935 < #line 863 "ircd_parser.y"
3473 > #line 931 "conf_parser.y" /* yacc.c:1646  */
3474      {
3475    if (conf_parser_ctx.pass == 2)
3476 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
3939 <            sizeof(ConfigLoggingEntry.glinelog));
3476 >    ConfigLog.use_logging = yylval.number;
3477   }
3478 + #line 3479 "conf_parser.c" /* yacc.c:1646  */
3479      break;
3480  
3481    case 115:
3482 <
3945 < /* Line 1806 of yacc.c  */
3946 < #line 870 "ircd_parser.y"
3482 > #line 937 "conf_parser.y" /* yacc.c:1646  */
3483      {
3484    if (conf_parser_ctx.pass == 2)
3485 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
3950 <            sizeof(ConfigLoggingEntry.klinelog));
3485 >    reset_block_state();
3486   }
3487 + #line 3488 "conf_parser.c" /* yacc.c:1646  */
3488      break;
3489  
3490    case 116:
3491 <
3956 < /* Line 1806 of yacc.c  */
3957 < #line 877 "ircd_parser.y"
3491 > #line 941 "conf_parser.y" /* yacc.c:1646  */
3492      {
3493 <  if (conf_parser_ctx.pass == 2)
3494 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
3495 <            sizeof(ConfigLoggingEntry.ioerrlog));
3493 >  if (conf_parser_ctx.pass != 2)
3494 >    break;
3495 >
3496 >  if (block_state.type.value && block_state.file.buf[0])
3497 >    log_set_file(block_state.type.value, block_state.size.value,
3498 >                 block_state.file.buf);
3499   }
3500 + #line 3501 "conf_parser.c" /* yacc.c:1646  */
3501      break;
3502  
3503 <  case 117:
3503 >  case 123:
3504 > #line 957 "conf_parser.y" /* yacc.c:1646  */
3505 >    {
3506 >  if (conf_parser_ctx.pass != 2)
3507 >    break;
3508  
3509 < /* Line 1806 of yacc.c  */
3510 < #line 884 "ircd_parser.y"
3509 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3510 > }
3511 > #line 3512 "conf_parser.c" /* yacc.c:1646  */
3512 >    break;
3513 >
3514 >  case 124:
3515 > #line 965 "conf_parser.y" /* yacc.c:1646  */
3516      {
3517 <  if (conf_parser_ctx.pass == 2)
3971 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
3972 <            sizeof(ConfigLoggingEntry.killlog));
3517 >  block_state.size.value = (yyvsp[-1].number);
3518   }
3519 + #line 3520 "conf_parser.c" /* yacc.c:1646  */
3520      break;
3521  
3522 <  case 118:
3522 >  case 125:
3523 > #line 968 "conf_parser.y" /* yacc.c:1646  */
3524 >    {
3525 >  block_state.size.value = 0;
3526 > }
3527 > #line 3528 "conf_parser.c" /* yacc.c:1646  */
3528 >    break;
3529  
3530 < /* Line 1806 of yacc.c  */
3531 < #line 891 "ircd_parser.y"
3532 <    {
3530 >  case 126:
3531 > #line 973 "conf_parser.y" /* yacc.c:1646  */
3532 >    {
3533    if (conf_parser_ctx.pass == 2)
3534 <    set_log_level(L_CRIT);
3534 >    block_state.type.value = 0;
3535   }
3536 + #line 3537 "conf_parser.c" /* yacc.c:1646  */
3537      break;
3538  
3539 <  case 119:
3540 <
3988 < /* Line 1806 of yacc.c  */
3989 < #line 895 "ircd_parser.y"
3539 >  case 130:
3540 > #line 980 "conf_parser.y" /* yacc.c:1646  */
3541      {
3542    if (conf_parser_ctx.pass == 2)
3543 <    set_log_level(L_ERROR);
3543 >    block_state.type.value = LOG_TYPE_USER;
3544   }
3545 + #line 3546 "conf_parser.c" /* yacc.c:1646  */
3546      break;
3547  
3548 <  case 120:
3549 <
3998 < /* Line 1806 of yacc.c  */
3999 < #line 899 "ircd_parser.y"
3548 >  case 131:
3549 > #line 984 "conf_parser.y" /* yacc.c:1646  */
3550      {
3551    if (conf_parser_ctx.pass == 2)
3552 <    set_log_level(L_WARN);
3552 >    block_state.type.value = LOG_TYPE_OPER;
3553   }
3554 + #line 3555 "conf_parser.c" /* yacc.c:1646  */
3555      break;
3556  
3557 <  case 121:
3558 <
4008 < /* Line 1806 of yacc.c  */
4009 < #line 903 "ircd_parser.y"
3557 >  case 132:
3558 > #line 988 "conf_parser.y" /* yacc.c:1646  */
3559      {
3560    if (conf_parser_ctx.pass == 2)
3561 <    set_log_level(L_NOTICE);
3561 >    block_state.type.value = LOG_TYPE_GLINE;
3562   }
3563 + #line 3564 "conf_parser.c" /* yacc.c:1646  */
3564      break;
3565  
3566 <  case 122:
3567 <
4018 < /* Line 1806 of yacc.c  */
4019 < #line 907 "ircd_parser.y"
3566 >  case 133:
3567 > #line 992 "conf_parser.y" /* yacc.c:1646  */
3568      {
3569    if (conf_parser_ctx.pass == 2)
3570 <    set_log_level(L_TRACE);
3570 >    block_state.type.value = LOG_TYPE_XLINE;
3571   }
3572 + #line 3573 "conf_parser.c" /* yacc.c:1646  */
3573      break;
3574  
3575 <  case 123:
3576 <
4028 < /* Line 1806 of yacc.c  */
4029 < #line 911 "ircd_parser.y"
3575 >  case 134:
3576 > #line 996 "conf_parser.y" /* yacc.c:1646  */
3577      {
3578    if (conf_parser_ctx.pass == 2)
3579 <    set_log_level(L_INFO);
3579 >    block_state.type.value = LOG_TYPE_RESV;
3580   }
3581 + #line 3582 "conf_parser.c" /* yacc.c:1646  */
3582      break;
3583  
3584 <  case 124:
3585 <
4038 < /* Line 1806 of yacc.c  */
4039 < #line 915 "ircd_parser.y"
3584 >  case 135:
3585 > #line 1000 "conf_parser.y" /* yacc.c:1646  */
3586      {
3587    if (conf_parser_ctx.pass == 2)
3588 <    set_log_level(L_DEBUG);
3588 >    block_state.type.value = LOG_TYPE_DLINE;
3589   }
3590 + #line 3591 "conf_parser.c" /* yacc.c:1646  */
3591      break;
3592  
3593 <  case 125:
3594 <
4048 < /* Line 1806 of yacc.c  */
4049 < #line 921 "ircd_parser.y"
3593 >  case 136:
3594 > #line 1004 "conf_parser.y" /* yacc.c:1646  */
3595      {
3596    if (conf_parser_ctx.pass == 2)
3597 <    ConfigLoggingEntry.use_logging = yylval.number;
3597 >    block_state.type.value = LOG_TYPE_KLINE;
3598   }
3599 + #line 3600 "conf_parser.c" /* yacc.c:1646  */
3600      break;
3601  
3602 <  case 126:
3603 <
4058 < /* Line 1806 of yacc.c  */
4059 < #line 930 "ircd_parser.y"
3602 >  case 137:
3603 > #line 1008 "conf_parser.y" /* yacc.c:1646  */
3604      {
3605    if (conf_parser_ctx.pass == 2)
3606 <  {
4063 <    yy_conf = make_conf_item(OPER_TYPE);
4064 <    yy_aconf = map_to_conf(yy_conf);
4065 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
4066 <  }
4067 <  else
4068 <  {
4069 <    MyFree(class_name);
4070 <    class_name = NULL;
4071 <  }
3606 >    block_state.type.value = LOG_TYPE_KILL;
3607   }
3608 + #line 3609 "conf_parser.c" /* yacc.c:1646  */
3609      break;
3610  
3611 <  case 127:
3612 <
4077 < /* Line 1806 of yacc.c  */
4078 < #line 943 "ircd_parser.y"
3611 >  case 138:
3612 > #line 1012 "conf_parser.y" /* yacc.c:1646  */
3613      {
3614    if (conf_parser_ctx.pass == 2)
3615 <  {
3616 <    struct CollectItem *yy_tmp;
3617 <    dlink_node *ptr;
3618 <    dlink_node *next_ptr;
3615 >    block_state.type.value = LOG_TYPE_DEBUG;
3616 > }
3617 > #line 3618 "conf_parser.c" /* yacc.c:1646  */
3618 >    break;
3619  
3620 <    conf_add_class_to_conf(yy_conf, class_name);
3620 >  case 139:
3621 > #line 1022 "conf_parser.y" /* yacc.c:1646  */
3622 >    {
3623 >  if (conf_parser_ctx.pass != 2)
3624 >    break;
3625  
3626 <    /* Now, make sure there is a copy of the "base" given oper
3627 <     * block in each of the collected copies
3628 <     */
3626 >  reset_block_state();
3627 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3628 > }
3629 > #line 3630 "conf_parser.c" /* yacc.c:1646  */
3630 >    break;
3631  
3632 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3632 >  case 140:
3633 > #line 1029 "conf_parser.y" /* yacc.c:1646  */
3634      {
3635 <      struct AccessItem *new_aconf;
4095 <      struct ConfItem *new_conf;
4096 <      yy_tmp = ptr->data;
3635 >  dlink_node *ptr = NULL;
3636  
3637 <      new_conf = make_conf_item(OPER_TYPE);
3638 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
3637 >  if (conf_parser_ctx.pass != 2)
3638 >    break;
3639  
3640 <      new_aconf->flags = yy_aconf->flags;
3640 >  if (!block_state.name.buf[0])
3641 >    break;
3642 > #ifdef HAVE_LIBCRYPTO
3643 >  if (!block_state.file.buf[0] &&
3644 >      !block_state.rpass.buf[0])
3645 >    break;
3646 > #else
3647 >  if (!block_state.rpass.buf[0])
3648 >    break;
3649 > #endif
3650  
3651 <      if (yy_conf->name != NULL)
3652 <        DupString(new_conf->name, yy_conf->name);
3653 <      if (yy_tmp->user != NULL)
3654 <        DupString(new_aconf->user, yy_tmp->user);
4107 <      else
4108 <        DupString(new_aconf->user, "*");
4109 <      if (yy_tmp->host != NULL)
4110 <        DupString(new_aconf->host, yy_tmp->host);
4111 <      else
4112 <        DupString(new_aconf->host, "*");
4113 <      conf_add_class_to_conf(new_conf, class_name);
4114 <      if (yy_aconf->passwd != NULL)
4115 <        DupString(new_aconf->passwd, yy_aconf->passwd);
3651 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
3652 >  {
3653 >    struct MaskItem *conf = NULL;
3654 >    struct split_nuh_item nuh;
3655  
3656 <      new_aconf->port = yy_aconf->port;
3657 < #ifdef HAVE_LIBCRYPTO
3658 <      if (yy_aconf->rsa_public_key_file != NULL)
3659 <      {
3660 <        BIO *file;
3656 >    nuh.nuhmask  = ptr->data;
3657 >    nuh.nickptr  = NULL;
3658 >    nuh.userptr  = block_state.user.buf;
3659 >    nuh.hostptr  = block_state.host.buf;
3660 >    nuh.nicksize = 0;
3661 >    nuh.usersize = sizeof(block_state.user.buf);
3662 >    nuh.hostsize = sizeof(block_state.host.buf);
3663 >    split_nuh(&nuh);
3664  
3665 <        DupString(new_aconf->rsa_public_key_file,
3666 <                  yy_aconf->rsa_public_key_file);
3665 >    conf         = conf_make(CONF_OPER);
3666 >    conf->name   = xstrdup(block_state.name.buf);
3667 >    conf->user   = xstrdup(block_state.user.buf);
3668 >    conf->host   = xstrdup(block_state.host.buf);
3669 >
3670 >    if (block_state.cert.buf[0])
3671 >      conf->certfp = xstrdup(block_state.cert.buf);
3672 >
3673 >    if (block_state.rpass.buf[0])
3674 >      conf->passwd = xstrdup(block_state.rpass.buf);
3675 >
3676 >    conf->flags = block_state.flags.value;
3677 >    conf->modes = block_state.modes.value;
3678 >    conf->port  = block_state.port.value;
3679 >    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3680  
3681 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
4127 <        new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
4128 <                                                           NULL, 0, NULL);
4129 <        BIO_set_close(file, BIO_CLOSE);
4130 <        BIO_free(file);
4131 <      }
4132 < #endif
3681 >    conf_add_class_to_conf(conf, block_state.class.buf);
3682  
3683   #ifdef HAVE_LIBCRYPTO
3684 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
3685 <          && yy_tmp->host)
3686 < #else
3687 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
3688 < #endif
3684 >    if (block_state.file.buf[0])
3685 >    {
3686 >      BIO *file = NULL;
3687 >      RSA *pkey = NULL;
3688 >
3689 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3690        {
3691 <        conf_add_class_to_conf(new_conf, class_name);
3692 <        if (yy_tmp->name != NULL)
4143 <          DupString(new_conf->name, yy_tmp->name);
3691 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3692 >        break;
3693        }
3694  
3695 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
3696 <      free_collect_item(yy_tmp);
3697 <    }
3698 <
3699 <    yy_conf = NULL;
3700 <    yy_aconf = NULL;
3701 <
3695 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3696 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3697 >      else
3698 >      {
3699 >        if (RSA_size(pkey) > 128)
3700 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3701 >        else
3702 >          conf->rsa_public_key = pkey;
3703 >      }
3704  
3705 <    MyFree(class_name);
3706 <    class_name = NULL;
3705 >      BIO_set_close(file, BIO_CLOSE);
3706 >      BIO_free(file);
3707 >    }
3708 > #endif /* HAVE_LIBCRYPTO */
3709    }
3710   }
3711 + #line 3712 "conf_parser.c" /* yacc.c:1646  */
3712      break;
3713  
3714 <  case 141:
3715 <
4162 < /* Line 1806 of yacc.c  */
4163 < #line 1030 "ircd_parser.y"
3714 >  case 154:
3715 > #line 1121 "conf_parser.y" /* yacc.c:1646  */
3716      {
3717    if (conf_parser_ctx.pass == 2)
3718 <  {
4167 <    if (strlen(yylval.string) > OPERNICKLEN)
4168 <      yylval.string[OPERNICKLEN] = '\0';
4169 <
4170 <    MyFree(yy_conf->name);
4171 <    DupString(yy_conf->name, yylval.string);
4172 <  }
3718 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3719   }
3720 + #line 3721 "conf_parser.c" /* yacc.c:1646  */
3721      break;
3722  
3723 <  case 142:
3724 <
4178 < /* Line 1806 of yacc.c  */
4179 < #line 1042 "ircd_parser.y"
3723 >  case 155:
3724 > #line 1127 "conf_parser.y" /* yacc.c:1646  */
3725      {
3726    if (conf_parser_ctx.pass == 2)
3727 <  {
4183 <    if (strlen(yylval.string) > OPERNICKLEN)
4184 <      yylval.string[OPERNICKLEN] = '\0';
4185 <
4186 <    MyFree(yy_conf->name);
4187 <    DupString(yy_conf->name, yylval.string);
4188 <  }
3727 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3728   }
3729 + #line 3730 "conf_parser.c" /* yacc.c:1646  */
3730      break;
3731  
3732 <  case 143:
3733 <
4194 < /* Line 1806 of yacc.c  */
4195 < #line 1054 "ircd_parser.y"
3732 >  case 156:
3733 > #line 1133 "conf_parser.y" /* yacc.c:1646  */
3734      {
3735    if (conf_parser_ctx.pass == 2)
3736 <  {
3737 <    struct split_nuh_item nuh;
3738 <
3739 <    nuh.nuhmask  = yylval.string;
4202 <    nuh.nickptr  = NULL;
4203 <    nuh.userptr  = userbuf;
4204 <    nuh.hostptr  = hostbuf;
3736 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3737 > }
3738 > #line 3739 "conf_parser.c" /* yacc.c:1646  */
3739 >    break;
3740  
3741 <    nuh.nicksize = 0;
3742 <    nuh.usersize = sizeof(userbuf);
3743 <    nuh.hostsize = sizeof(hostbuf);
3741 >  case 157:
3742 > #line 1139 "conf_parser.y" /* yacc.c:1646  */
3743 >    {
3744 >  if (conf_parser_ctx.pass != 2)
3745 >    break;
3746  
3747 <    split_nuh(&nuh);
3747 >  if (yylval.number)
3748 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3749 >  else
3750 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3751 > }
3752 > #line 3753 "conf_parser.c" /* yacc.c:1646  */
3753 >    break;
3754  
3755 <    if (yy_aconf->user == NULL)
3755 >  case 158:
3756 > #line 1150 "conf_parser.y" /* yacc.c:1646  */
3757      {
3758 <      DupString(yy_aconf->user, userbuf);
3759 <      DupString(yy_aconf->host, hostbuf);
3760 <    }
3761 <    else
3758 >  if (conf_parser_ctx.pass == 2)
3759 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3760 > }
3761 > #line 3762 "conf_parser.c" /* yacc.c:1646  */
3762 >    break;
3763 >
3764 >  case 159:
3765 > #line 1156 "conf_parser.y" /* yacc.c:1646  */
3766      {
3767 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3767 >  if (conf_parser_ctx.pass == 2)
3768 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3769 > }
3770 > #line 3771 "conf_parser.c" /* yacc.c:1646  */
3771 >    break;
3772  
3773 <      DupString(yy_tmp->user, userbuf);
3774 <      DupString(yy_tmp->host, hostbuf);
3773 >  case 160:
3774 > #line 1162 "conf_parser.y" /* yacc.c:1646  */
3775 >    {
3776 >  if (conf_parser_ctx.pass != 2)
3777 >    break;
3778  
3779 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3780 <    }
3781 <  }
3779 >  if (yylval.number)
3780 >    block_state.flags.value |= CONF_FLAGS_SSL;
3781 >  else
3782 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3783   }
3784 + #line 3785 "conf_parser.c" /* yacc.c:1646  */
3785      break;
3786  
3787 <  case 144:
3788 <
4232 < /* Line 1806 of yacc.c  */
4233 < #line 1088 "ircd_parser.y"
3787 >  case 161:
3788 > #line 1173 "conf_parser.y" /* yacc.c:1646  */
3789      {
3790    if (conf_parser_ctx.pass == 2)
3791 <  {
4237 <    if (yy_aconf->passwd != NULL)
4238 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4239 <
4240 <    MyFree(yy_aconf->passwd);
4241 <    DupString(yy_aconf->passwd, yylval.string);
4242 <  }
3791 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3792   }
3793 + #line 3794 "conf_parser.c" /* yacc.c:1646  */
3794      break;
3795  
3796 <  case 145:
3797 <
4248 < /* Line 1806 of yacc.c  */
4249 < #line 1100 "ircd_parser.y"
3796 >  case 162:
3797 > #line 1179 "conf_parser.y" /* yacc.c:1646  */
3798      {
3799    if (conf_parser_ctx.pass == 2)
3800 <  {
4253 <    if (yylval.number)
4254 <      SetConfEncrypted(yy_aconf);
4255 <    else
4256 <      ClearConfEncrypted(yy_aconf);
4257 <  }
3800 >    block_state.modes.value = 0;
3801   }
3802 + #line 3803 "conf_parser.c" /* yacc.c:1646  */
3803      break;
3804  
3805 <  case 146:
3806 <
4263 < /* Line 1806 of yacc.c  */
4264 < #line 1111 "ircd_parser.y"
3805 >  case 166:
3806 > #line 1186 "conf_parser.y" /* yacc.c:1646  */
3807      {
4266 #ifdef HAVE_LIBCRYPTO
3808    if (conf_parser_ctx.pass == 2)
3809 <  {
3810 <    BIO *file;
3809 >    block_state.modes.value |= UMODE_BOTS;
3810 > }
3811 > #line 3812 "conf_parser.c" /* yacc.c:1646  */
3812 >    break;
3813  
3814 <    if (yy_aconf->rsa_public_key != NULL)
3814 >  case 167:
3815 > #line 1190 "conf_parser.y" /* yacc.c:1646  */
3816      {
3817 <      RSA_free(yy_aconf->rsa_public_key);
3818 <      yy_aconf->rsa_public_key = NULL;
3819 <    }
3817 >  if (conf_parser_ctx.pass == 2)
3818 >    block_state.modes.value |= UMODE_CCONN;
3819 > }
3820 > #line 3821 "conf_parser.c" /* yacc.c:1646  */
3821 >    break;
3822  
3823 <    if (yy_aconf->rsa_public_key_file != NULL)
3823 >  case 168:
3824 > #line 1194 "conf_parser.y" /* yacc.c:1646  */
3825      {
3826 <      MyFree(yy_aconf->rsa_public_key_file);
3827 <      yy_aconf->rsa_public_key_file = NULL;
3828 <    }
3829 <
3830 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
4284 <    file = BIO_new_file(yylval.string, "r");
3826 >  if (conf_parser_ctx.pass == 2)
3827 >    block_state.modes.value |= UMODE_DEAF;
3828 > }
3829 > #line 3830 "conf_parser.c" /* yacc.c:1646  */
3830 >    break;
3831  
3832 <    if (file == NULL)
3832 >  case 169:
3833 > #line 1198 "conf_parser.y" /* yacc.c:1646  */
3834      {
3835 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
3836 <      break;
3837 <    }
3838 <
3839 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
3835 >  if (conf_parser_ctx.pass == 2)
3836 >    block_state.modes.value |= UMODE_DEBUG;
3837 > }
3838 > #line 3839 "conf_parser.c" /* yacc.c:1646  */
3839 >    break;
3840  
3841 <    if (yy_aconf->rsa_public_key == NULL)
3841 >  case 170:
3842 > #line 1202 "conf_parser.y" /* yacc.c:1646  */
3843      {
3844 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
3845 <      break;
4298 <    }
4299 <
4300 <    BIO_set_close(file, BIO_CLOSE);
4301 <    BIO_free(file);
4302 <  }
4303 < #endif /* HAVE_LIBCRYPTO */
3844 >  if (conf_parser_ctx.pass == 2)
3845 >    block_state.modes.value |= UMODE_FULL;
3846   }
3847 + #line 3848 "conf_parser.c" /* yacc.c:1646  */
3848      break;
3849  
3850 <  case 147:
3851 <
4309 < /* Line 1806 of yacc.c  */
4310 < #line 1153 "ircd_parser.y"
3850 >  case 171:
3851 > #line 1206 "conf_parser.y" /* yacc.c:1646  */
3852      {
3853    if (conf_parser_ctx.pass == 2)
3854 <  {
4314 <    MyFree(class_name);
4315 <    DupString(class_name, yylval.string);
4316 <  }
3854 >    block_state.modes.value |= UMODE_HIDDEN;
3855   }
3856 + #line 3857 "conf_parser.c" /* yacc.c:1646  */
3857      break;
3858  
3859 <  case 148:
3860 <
4322 < /* Line 1806 of yacc.c  */
4323 < #line 1162 "ircd_parser.y"
3859 >  case 172:
3860 > #line 1210 "conf_parser.y" /* yacc.c:1646  */
3861      {
3862    if (conf_parser_ctx.pass == 2)
3863 <    yy_aconf->modes = 0;
3863 >    block_state.modes.value |= UMODE_HIDECHANS;
3864   }
3865 + #line 3866 "conf_parser.c" /* yacc.c:1646  */
3866      break;
3867  
3868 <  case 152:
3869 <
4332 < /* Line 1806 of yacc.c  */
4333 < #line 1169 "ircd_parser.y"
3868 >  case 173:
3869 > #line 1214 "conf_parser.y" /* yacc.c:1646  */
3870      {
3871    if (conf_parser_ctx.pass == 2)
3872 <    yy_aconf->modes |= UMODE_BOTS;
3872 >    block_state.modes.value |= UMODE_HIDEIDLE;
3873   }
3874 + #line 3875 "conf_parser.c" /* yacc.c:1646  */
3875      break;
3876  
3877 <  case 153:
3878 <
4342 < /* Line 1806 of yacc.c  */
4343 < #line 1173 "ircd_parser.y"
3877 >  case 174:
3878 > #line 1218 "conf_parser.y" /* yacc.c:1646  */
3879      {
3880    if (conf_parser_ctx.pass == 2)
3881 <    yy_aconf->modes |= UMODE_CCONN;
3881 >    block_state.modes.value |= UMODE_SKILL;
3882   }
3883 + #line 3884 "conf_parser.c" /* yacc.c:1646  */
3884      break;
3885  
3886 <  case 154:
3887 <
4352 < /* Line 1806 of yacc.c  */
4353 < #line 1177 "ircd_parser.y"
3886 >  case 175:
3887 > #line 1222 "conf_parser.y" /* yacc.c:1646  */
3888      {
3889    if (conf_parser_ctx.pass == 2)
3890 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3890 >    block_state.modes.value |= UMODE_NCHANGE;
3891   }
3892 + #line 3893 "conf_parser.c" /* yacc.c:1646  */
3893      break;
3894  
3895 <  case 155:
3896 <
4362 < /* Line 1806 of yacc.c  */
4363 < #line 1181 "ircd_parser.y"
3895 >  case 176:
3896 > #line 1226 "conf_parser.y" /* yacc.c:1646  */
3897      {
3898    if (conf_parser_ctx.pass == 2)
3899 <    yy_aconf->modes |= UMODE_DEAF;
3899 >    block_state.modes.value |= UMODE_REJ;
3900   }
3901 + #line 3902 "conf_parser.c" /* yacc.c:1646  */
3902      break;
3903  
3904 <  case 156:
3905 <
4372 < /* Line 1806 of yacc.c  */
4373 < #line 1185 "ircd_parser.y"
3904 >  case 177:
3905 > #line 1230 "conf_parser.y" /* yacc.c:1646  */
3906      {
3907    if (conf_parser_ctx.pass == 2)
3908 <    yy_aconf->modes |= UMODE_DEBUG;
3908 >    block_state.modes.value |= UMODE_UNAUTH;
3909   }
3910 + #line 3911 "conf_parser.c" /* yacc.c:1646  */
3911      break;
3912  
3913 <  case 157:
3914 <
4382 < /* Line 1806 of yacc.c  */
4383 < #line 1189 "ircd_parser.y"
3913 >  case 178:
3914 > #line 1234 "conf_parser.y" /* yacc.c:1646  */
3915      {
3916    if (conf_parser_ctx.pass == 2)
3917 <    yy_aconf->modes |= UMODE_FULL;
3917 >    block_state.modes.value |= UMODE_SPY;
3918   }
3919 + #line 3920 "conf_parser.c" /* yacc.c:1646  */
3920      break;
3921  
3922 <  case 158:
3923 <
4392 < /* Line 1806 of yacc.c  */
4393 < #line 1193 "ircd_parser.y"
3922 >  case 179:
3923 > #line 1238 "conf_parser.y" /* yacc.c:1646  */
3924      {
3925    if (conf_parser_ctx.pass == 2)
3926 <    yy_aconf->modes |= UMODE_SKILL;
3926 >    block_state.modes.value |= UMODE_EXTERNAL;
3927   }
3928 + #line 3929 "conf_parser.c" /* yacc.c:1646  */
3929      break;
3930  
3931 <  case 159:
3932 <
4402 < /* Line 1806 of yacc.c  */
4403 < #line 1197 "ircd_parser.y"
3931 >  case 180:
3932 > #line 1242 "conf_parser.y" /* yacc.c:1646  */
3933      {
3934    if (conf_parser_ctx.pass == 2)
3935 <    yy_aconf->modes |= UMODE_NCHANGE;
3935 >    block_state.modes.value |= UMODE_SERVNOTICE;
3936   }
3937 + #line 3938 "conf_parser.c" /* yacc.c:1646  */
3938      break;
3939  
3940 <  case 160:
3941 <
4412 < /* Line 1806 of yacc.c  */
4413 < #line 1201 "ircd_parser.y"
3940 >  case 181:
3941 > #line 1246 "conf_parser.y" /* yacc.c:1646  */
3942      {
3943    if (conf_parser_ctx.pass == 2)
3944 <    yy_aconf->modes |= UMODE_REJ;
3944 >    block_state.modes.value |= UMODE_INVISIBLE;
3945   }
3946 + #line 3947 "conf_parser.c" /* yacc.c:1646  */
3947      break;
3948  
3949 <  case 161:
3950 <
4422 < /* Line 1806 of yacc.c  */
4423 < #line 1205 "ircd_parser.y"
3949 >  case 182:
3950 > #line 1250 "conf_parser.y" /* yacc.c:1646  */
3951      {
3952    if (conf_parser_ctx.pass == 2)
3953 <    yy_aconf->modes |= UMODE_UNAUTH;
3953 >    block_state.modes.value |= UMODE_WALLOP;
3954   }
3955 + #line 3956 "conf_parser.c" /* yacc.c:1646  */
3956      break;
3957  
3958 <  case 162:
3959 <
4432 < /* Line 1806 of yacc.c  */
4433 < #line 1209 "ircd_parser.y"
3958 >  case 183:
3959 > #line 1254 "conf_parser.y" /* yacc.c:1646  */
3960      {
3961    if (conf_parser_ctx.pass == 2)
3962 <    yy_aconf->modes |= UMODE_SPY;
3962 >    block_state.modes.value |= UMODE_SOFTCALLERID;
3963   }
3964 + #line 3965 "conf_parser.c" /* yacc.c:1646  */
3965      break;
3966  
3967 <  case 163:
3968 <
4442 < /* Line 1806 of yacc.c  */
4443 < #line 1213 "ircd_parser.y"
3967 >  case 184:
3968 > #line 1258 "conf_parser.y" /* yacc.c:1646  */
3969      {
3970    if (conf_parser_ctx.pass == 2)
3971 <    yy_aconf->modes |= UMODE_EXTERNAL;
3971 >    block_state.modes.value |= UMODE_CALLERID;
3972   }
3973 + #line 3974 "conf_parser.c" /* yacc.c:1646  */
3974      break;
3975  
3976 <  case 164:
3977 <
4452 < /* Line 1806 of yacc.c  */
4453 < #line 1217 "ircd_parser.y"
3976 >  case 185:
3977 > #line 1262 "conf_parser.y" /* yacc.c:1646  */
3978      {
3979    if (conf_parser_ctx.pass == 2)
3980 <    yy_aconf->modes |= UMODE_OPERWALL;
3980 >    block_state.modes.value |= UMODE_LOCOPS;
3981   }
3982 + #line 3983 "conf_parser.c" /* yacc.c:1646  */
3983      break;
3984  
3985 <  case 165:
3986 <
4462 < /* Line 1806 of yacc.c  */
4463 < #line 1221 "ircd_parser.y"
3985 >  case 186:
3986 > #line 1266 "conf_parser.y" /* yacc.c:1646  */
3987      {
3988    if (conf_parser_ctx.pass == 2)
3989 <    yy_aconf->modes |= UMODE_SERVNOTICE;
3989 >    block_state.modes.value |= UMODE_REGONLY;
3990   }
3991 + #line 3992 "conf_parser.c" /* yacc.c:1646  */
3992      break;
3993  
3994 <  case 166:
3995 <
4472 < /* Line 1806 of yacc.c  */
4473 < #line 1225 "ircd_parser.y"
3994 >  case 187:
3995 > #line 1270 "conf_parser.y" /* yacc.c:1646  */
3996      {
3997    if (conf_parser_ctx.pass == 2)
3998 <    yy_aconf->modes |= UMODE_INVISIBLE;
3998 >    block_state.modes.value |= UMODE_FARCONNECT;
3999   }
4000 + #line 4001 "conf_parser.c" /* yacc.c:1646  */
4001      break;
4002  
4003 <  case 167:
4004 <
4482 < /* Line 1806 of yacc.c  */
4483 < #line 1229 "ircd_parser.y"
4003 >  case 188:
4004 > #line 1276 "conf_parser.y" /* yacc.c:1646  */
4005      {
4006    if (conf_parser_ctx.pass == 2)
4007 <    yy_aconf->modes |= UMODE_WALLOP;
4007 >    block_state.port.value = 0;
4008   }
4009 + #line 4010 "conf_parser.c" /* yacc.c:1646  */
4010      break;
4011  
4012 <  case 168:
4013 <
4492 < /* Line 1806 of yacc.c  */
4493 < #line 1233 "ircd_parser.y"
4012 >  case 192:
4013 > #line 1283 "conf_parser.y" /* yacc.c:1646  */
4014      {
4015    if (conf_parser_ctx.pass == 2)
4016 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
4016 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4017   }
4018 + #line 4019 "conf_parser.c" /* yacc.c:1646  */
4019      break;
4020  
4021 <  case 169:
4022 <
4502 < /* Line 1806 of yacc.c  */
4503 < #line 1237 "ircd_parser.y"
4021 >  case 193:
4022 > #line 1287 "conf_parser.y" /* yacc.c:1646  */
4023      {
4024    if (conf_parser_ctx.pass == 2)
4025 <    yy_aconf->modes |= UMODE_CALLERID;
4025 >    block_state.port.value |= OPER_FLAG_KILL;
4026   }
4027 + #line 4028 "conf_parser.c" /* yacc.c:1646  */
4028      break;
4029  
4030 <  case 170:
4031 <
4512 < /* Line 1806 of yacc.c  */
4513 < #line 1241 "ircd_parser.y"
4030 >  case 194:
4031 > #line 1291 "conf_parser.y" /* yacc.c:1646  */
4032      {
4033    if (conf_parser_ctx.pass == 2)
4034 <    yy_aconf->modes |= UMODE_LOCOPS;
4034 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4035   }
4036 + #line 4037 "conf_parser.c" /* yacc.c:1646  */
4037      break;
4038  
4039 <  case 171:
4040 <
4522 < /* Line 1806 of yacc.c  */
4523 < #line 1247 "ircd_parser.y"
4039 >  case 195:
4040 > #line 1295 "conf_parser.y" /* yacc.c:1646  */
4041      {
4042 +  if (conf_parser_ctx.pass == 2)
4043 +    block_state.port.value |= OPER_FLAG_CONNECT;
4044   }
4045 + #line 4046 "conf_parser.c" /* yacc.c:1646  */
4046      break;
4047  
4048 <  case 175:
4049 <
4050 < /* Line 1806 of yacc.c  */
4051 < #line 1251 "ircd_parser.y"
4052 <    { not_atom = 1; }
4048 >  case 196:
4049 > #line 1299 "conf_parser.y" /* yacc.c:1646  */
4050 >    {
4051 >  if (conf_parser_ctx.pass == 2)
4052 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4053 > }
4054 > #line 4055 "conf_parser.c" /* yacc.c:1646  */
4055      break;
4056  
4057 <  case 177:
4058 <
4059 < /* Line 1806 of yacc.c  */
4060 < #line 1252 "ircd_parser.y"
4061 <    { not_atom = 0; }
4057 >  case 197:
4058 > #line 1303 "conf_parser.y" /* yacc.c:1646  */
4059 >    {
4060 >  if (conf_parser_ctx.pass == 2)
4061 >    block_state.port.value |= OPER_FLAG_SQUIT;
4062 > }
4063 > #line 4064 "conf_parser.c" /* yacc.c:1646  */
4064      break;
4065  
4066 <  case 179:
4067 <
4544 < /* Line 1806 of yacc.c  */
4545 < #line 1255 "ircd_parser.y"
4066 >  case 198:
4067 > #line 1307 "conf_parser.y" /* yacc.c:1646  */
4068      {
4069    if (conf_parser_ctx.pass == 2)
4070 <  {
4549 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4550 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4551 <  }
4070 >    block_state.port.value |= OPER_FLAG_KLINE;
4071   }
4072 + #line 4073 "conf_parser.c" /* yacc.c:1646  */
4073      break;
4074  
4075 <  case 180:
4076 <
4557 < /* Line 1806 of yacc.c  */
4558 < #line 1262 "ircd_parser.y"
4075 >  case 199:
4076 > #line 1311 "conf_parser.y" /* yacc.c:1646  */
4077      {
4078    if (conf_parser_ctx.pass == 2)
4079 <  {
4562 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
4563 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
4564 <  }
4079 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4080   }
4081 + #line 4082 "conf_parser.c" /* yacc.c:1646  */
4082      break;
4083  
4084 <  case 181:
4085 <
4570 < /* Line 1806 of yacc.c  */
4571 < #line 1269 "ircd_parser.y"
4084 >  case 200:
4085 > #line 1315 "conf_parser.y" /* yacc.c:1646  */
4086      {
4087    if (conf_parser_ctx.pass == 2)
4088 <  {
4575 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
4576 <    else yy_aconf->port |= OPER_FLAG_K;
4577 <  }
4088 >    block_state.port.value |= OPER_FLAG_DLINE;
4089   }
4090 + #line 4091 "conf_parser.c" /* yacc.c:1646  */
4091      break;
4092  
4093 <  case 182:
4094 <
4583 < /* Line 1806 of yacc.c  */
4584 < #line 1276 "ircd_parser.y"
4093 >  case 201:
4094 > #line 1319 "conf_parser.y" /* yacc.c:1646  */
4095      {
4096    if (conf_parser_ctx.pass == 2)
4097 <  {
4588 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4589 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
4590 <  }
4097 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4098   }
4099 + #line 4100 "conf_parser.c" /* yacc.c:1646  */
4100      break;
4101  
4102 <  case 183:
4103 <
4596 < /* Line 1806 of yacc.c  */
4597 < #line 1283 "ircd_parser.y"
4102 >  case 202:
4103 > #line 1323 "conf_parser.y" /* yacc.c:1646  */
4104      {
4105    if (conf_parser_ctx.pass == 2)
4106 <  {
4601 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
4602 <    else yy_aconf->port |= OPER_FLAG_X;
4603 <  }
4106 >    block_state.port.value |= OPER_FLAG_XLINE;
4107   }
4108 + #line 4109 "conf_parser.c" /* yacc.c:1646  */
4109      break;
4110  
4111 <  case 184:
4112 <
4609 < /* Line 1806 of yacc.c  */
4610 < #line 1290 "ircd_parser.y"
4111 >  case 203:
4112 > #line 1327 "conf_parser.y" /* yacc.c:1646  */
4113      {
4114    if (conf_parser_ctx.pass == 2)
4115 <  {
4614 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
4615 <    else yy_aconf->port |= OPER_FLAG_GLINE;
4616 <  }
4115 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4116   }
4117 + #line 4118 "conf_parser.c" /* yacc.c:1646  */
4118      break;
4119  
4120 <  case 185:
4121 <
4622 < /* Line 1806 of yacc.c  */
4623 < #line 1297 "ircd_parser.y"
4120 >  case 204:
4121 > #line 1331 "conf_parser.y" /* yacc.c:1646  */
4122      {
4123    if (conf_parser_ctx.pass == 2)
4124 <  {
4627 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
4628 <    else yy_aconf->port |= OPER_FLAG_DIE;
4629 <  }
4124 >    block_state.port.value |= OPER_FLAG_GLINE;
4125   }
4126 + #line 4127 "conf_parser.c" /* yacc.c:1646  */
4127      break;
4128  
4129 <  case 186:
4130 <
4635 < /* Line 1806 of yacc.c  */
4636 < #line 1304 "ircd_parser.y"
4129 >  case 205:
4130 > #line 1335 "conf_parser.y" /* yacc.c:1646  */
4131      {
4132    if (conf_parser_ctx.pass == 2)
4133 <  {
4640 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
4641 <    else yy_aconf->port |= OPER_FLAG_REHASH;
4642 <  }
4133 >    block_state.port.value |= OPER_FLAG_DIE;
4134   }
4135 + #line 4136 "conf_parser.c" /* yacc.c:1646  */
4136      break;
4137  
4138 <  case 187:
4139 <
4648 < /* Line 1806 of yacc.c  */
4649 < #line 1311 "ircd_parser.y"
4138 >  case 206:
4139 > #line 1339 "conf_parser.y" /* yacc.c:1646  */
4140      {
4141    if (conf_parser_ctx.pass == 2)
4142 <  {
4653 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
4654 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
4655 <  }
4142 >    block_state.port.value |= OPER_FLAG_RESTART;
4143   }
4144 + #line 4145 "conf_parser.c" /* yacc.c:1646  */
4145      break;
4146  
4147 <  case 188:
4148 <
4661 < /* Line 1806 of yacc.c  */
4662 < #line 1318 "ircd_parser.y"
4147 >  case 207:
4148 > #line 1343 "conf_parser.y" /* yacc.c:1646  */
4149      {
4150    if (conf_parser_ctx.pass == 2)
4151 <  {
4666 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4667 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4668 <  }
4151 >    block_state.port.value |= OPER_FLAG_REHASH;
4152   }
4153 + #line 4154 "conf_parser.c" /* yacc.c:1646  */
4154      break;
4155  
4156 <  case 189:
4157 <
4674 < /* Line 1806 of yacc.c  */
4675 < #line 1325 "ircd_parser.y"
4156 >  case 208:
4157 > #line 1347 "conf_parser.y" /* yacc.c:1646  */
4158      {
4159    if (conf_parser_ctx.pass == 2)
4160 <  {
4679 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
4680 <    else yy_aconf->port |= OPER_FLAG_N;
4681 <  }
4160 >    block_state.port.value |= OPER_FLAG_ADMIN;
4161   }
4162 + #line 4163 "conf_parser.c" /* yacc.c:1646  */
4163      break;
4164  
4165 <  case 190:
4166 <
4687 < /* Line 1806 of yacc.c  */
4688 < #line 1332 "ircd_parser.y"
4165 >  case 209:
4166 > #line 1351 "conf_parser.y" /* yacc.c:1646  */
4167      {
4168    if (conf_parser_ctx.pass == 2)
4169 <  {
4692 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4693 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
4694 <  }
4169 >    block_state.port.value |= OPER_FLAG_GLOBOPS;
4170   }
4171 + #line 4172 "conf_parser.c" /* yacc.c:1646  */
4172      break;
4173  
4174 <  case 191:
4175 <
4700 < /* Line 1806 of yacc.c  */
4701 < #line 1339 "ircd_parser.y"
4174 >  case 210:
4175 > #line 1355 "conf_parser.y" /* yacc.c:1646  */
4176      {
4177    if (conf_parser_ctx.pass == 2)
4178 <  {
4705 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLOBOPS;
4706 <    else yy_aconf->port |= OPER_FLAG_GLOBOPS;
4707 <  }
4178 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4179   }
4180 + #line 4181 "conf_parser.c" /* yacc.c:1646  */
4181      break;
4182  
4183 <  case 192:
4184 <
4713 < /* Line 1806 of yacc.c  */
4714 < #line 1346 "ircd_parser.y"
4183 >  case 211:
4184 > #line 1359 "conf_parser.y" /* yacc.c:1646  */
4185      {
4186    if (conf_parser_ctx.pass == 2)
4187 <  {
4718 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
4719 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
4720 <  }
4187 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4188   }
4189 + #line 4190 "conf_parser.c" /* yacc.c:1646  */
4190      break;
4191  
4192 <  case 193:
4193 <
4726 < /* Line 1806 of yacc.c  */
4727 < #line 1353 "ircd_parser.y"
4192 >  case 212:
4193 > #line 1363 "conf_parser.y" /* yacc.c:1646  */
4194      {
4195    if (conf_parser_ctx.pass == 2)
4196 <  {
4731 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
4732 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
4733 <  }
4196 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4197   }
4198 + #line 4199 "conf_parser.c" /* yacc.c:1646  */
4199      break;
4200  
4201 <  case 194:
4202 <
4739 < /* Line 1806 of yacc.c  */
4740 < #line 1360 "ircd_parser.y"
4201 >  case 213:
4202 > #line 1367 "conf_parser.y" /* yacc.c:1646  */
4203      {
4204    if (conf_parser_ctx.pass == 2)
4205 <  {
4744 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
4745 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4746 <  }
4205 >    block_state.port.value |= OPER_FLAG_SET;
4206   }
4207 + #line 4208 "conf_parser.c" /* yacc.c:1646  */
4208      break;
4209  
4210 <  case 195:
4211 <
4752 < /* Line 1806 of yacc.c  */
4753 < #line 1367 "ircd_parser.y"
4210 >  case 214:
4211 > #line 1371 "conf_parser.y" /* yacc.c:1646  */
4212      {
4213    if (conf_parser_ctx.pass == 2)
4214 <  {
4757 <    if (not_atom) ClearConfEncrypted(yy_aconf);
4758 <    else SetConfEncrypted(yy_aconf);
4759 <  }
4214 >    block_state.port.value |= OPER_FLAG_MODULE;
4215   }
4216 + #line 4217 "conf_parser.c" /* yacc.c:1646  */
4217      break;
4218  
4219 <  case 196:
4220 <
4765 < /* Line 1806 of yacc.c  */
4766 < #line 1380 "ircd_parser.y"
4219 >  case 215:
4220 > #line 1381 "conf_parser.y" /* yacc.c:1646  */
4221      {
4222 <  if (conf_parser_ctx.pass == 1)
4769 <  {
4770 <    yy_conf = make_conf_item(CLASS_TYPE);
4771 <    yy_class = map_to_conf(yy_conf);
4772 <  }
4773 < }
4222 >  if (conf_parser_ctx.pass != 1)
4223      break;
4224  
4225 <  case 197:
4225 >  reset_block_state();
4226  
4227 < /* Line 1806 of yacc.c  */
4228 < #line 1387 "ircd_parser.y"
4229 <    {
4230 <  if (conf_parser_ctx.pass == 1)
4231 <  {
4232 <    struct ConfItem *cconf = NULL;
4233 <    struct ClassItem *class = NULL;
4227 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4228 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4229 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4230 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4231 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4232 > }
4233 > #line 4234 "conf_parser.c" /* yacc.c:1646  */
4234 >    break;
4235  
4236 <    if (yy_class_name == NULL)
4237 <      delete_conf_item(yy_conf);
4788 <    else
4236 >  case 216:
4237 > #line 1393 "conf_parser.y" /* yacc.c:1646  */
4238      {
4239 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
4239 >  struct ClassItem *class = NULL;
4240  
4241 <      if (cconf != NULL)                /* The class existed already */
4242 <      {
4794 <        int user_count = 0;
4241 >  if (conf_parser_ctx.pass != 1)
4242 >    break;
4243  
4244 <        rebuild_cidr_class(cconf, yy_class);
4244 >  if (!block_state.class.buf[0])
4245 >    break;
4246 >
4247 >  if (!(class = class_find(block_state.class.buf, 0)))
4248 >    class = class_make();
4249  
4250 <        class = map_to_conf(cconf);
4250 >  class->active = 1;
4251 >  MyFree(class->name);
4252 >  class->name = xstrdup(block_state.class.buf);
4253 >  class->ping_freq = block_state.ping_freq.value;
4254 >  class->max_perip = block_state.max_perip.value;
4255 >  class->con_freq = block_state.con_freq.value;
4256 >  class->max_total = block_state.max_total.value;
4257 >  class->max_global = block_state.max_global.value;
4258 >  class->max_local = block_state.max_local.value;
4259 >  class->max_ident = block_state.max_ident.value;
4260 >  class->max_sendq = block_state.max_sendq.value;
4261 >  class->max_recvq = block_state.max_recvq.value;
4262 >  class->max_channels = block_state.max_channels.value;
4263  
4264 <        user_count = class->curr_user_count;
4265 <        memcpy(class, yy_class, sizeof(*class));
4266 <        class->curr_user_count = user_count;
4267 <        class->active = 1;
4264 >  if (block_state.min_idle.value > block_state.max_idle.value)
4265 >  {
4266 >    block_state.min_idle.value = 0;
4267 >    block_state.max_idle.value = 0;
4268 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4269 >  }
4270  
4271 <        delete_conf_item(yy_conf);
4271 >  class->flags = block_state.flags.value;
4272 >  class->min_idle = block_state.min_idle.value;
4273 >  class->max_idle = block_state.max_idle.value;
4274  
4275 <        MyFree(cconf->name);            /* Allows case change of class name */
4276 <        cconf->name = yy_class_name;
4277 <      }
4278 <      else      /* Brand new class */
4279 <      {
4280 <        MyFree(yy_conf->name);          /* just in case it was allocated */
4813 <        yy_conf->name = yy_class_name;
4814 <        yy_class->active = 1;
4815 <      }
4816 <    }
4275 >  if (class->number_per_cidr && block_state.number_per_cidr.value)
4276 >    if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
4277 >        (class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
4278 >      if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
4279 >          (class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
4280 >        rebuild_cidr_list(class);
4281  
4282 <    yy_class_name = NULL;
4283 <  }
4282 >  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4283 >  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4284 >  class->number_per_cidr = block_state.number_per_cidr.value;
4285   }
4286 + #line 4287 "conf_parser.c" /* yacc.c:1646  */
4287      break;
4288  
4289 <  case 216:
4290 <
4825 < /* Line 1806 of yacc.c  */
4826 < #line 1447 "ircd_parser.y"
4289 >  case 237:
4290 > #line 1462 "conf_parser.y" /* yacc.c:1646  */
4291      {
4292    if (conf_parser_ctx.pass == 1)
4293 <  {
4830 <    MyFree(yy_class_name);
4831 <    DupString(yy_class_name, yylval.string);
4832 <  }
4293 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4294   }
4295 + #line 4296 "conf_parser.c" /* yacc.c:1646  */
4296      break;
4297  
4298 <  case 217:
4299 <
4838 < /* Line 1806 of yacc.c  */
4839 < #line 1456 "ircd_parser.y"
4298 >  case 238:
4299 > #line 1468 "conf_parser.y" /* yacc.c:1646  */
4300      {
4301    if (conf_parser_ctx.pass == 1)
4302 <  {
4843 <    MyFree(yy_class_name);
4844 <    DupString(yy_class_name, yylval.string);
4845 <  }
4302 >    block_state.ping_freq.value = (yyvsp[-1].number);
4303   }
4304 + #line 4305 "conf_parser.c" /* yacc.c:1646  */
4305      break;
4306  
4307 <  case 218:
4308 <
4851 < /* Line 1806 of yacc.c  */
4852 < #line 1465 "ircd_parser.y"
4307 >  case 239:
4308 > #line 1474 "conf_parser.y" /* yacc.c:1646  */
4309      {
4310    if (conf_parser_ctx.pass == 1)
4311 <    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
4311 >    block_state.max_perip.value = (yyvsp[-1].number);
4312   }
4313 + #line 4314 "conf_parser.c" /* yacc.c:1646  */
4314      break;
4315  
4316 <  case 219:
4317 <
4861 < /* Line 1806 of yacc.c  */
4862 < #line 1471 "ircd_parser.y"
4316 >  case 240:
4317 > #line 1480 "conf_parser.y" /* yacc.c:1646  */
4318      {
4319    if (conf_parser_ctx.pass == 1)
4320 <    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
4320 >    block_state.con_freq.value = (yyvsp[-1].number);
4321   }
4322 + #line 4323 "conf_parser.c" /* yacc.c:1646  */
4323      break;
4324  
4325 <  case 220:
4326 <
4871 < /* Line 1806 of yacc.c  */
4872 < #line 1477 "ircd_parser.y"
4325 >  case 241:
4326 > #line 1486 "conf_parser.y" /* yacc.c:1646  */
4327      {
4328    if (conf_parser_ctx.pass == 1)
4329 <    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
4329 >    block_state.max_channels.value = (yyvsp[-1].number);
4330   }
4331 + #line 4332 "conf_parser.c" /* yacc.c:1646  */
4332      break;
4333  
4334 <  case 221:
4335 <
4881 < /* Line 1806 of yacc.c  */
4882 < #line 1483 "ircd_parser.y"
4334 >  case 242:
4335 > #line 1492 "conf_parser.y" /* yacc.c:1646  */
4336      {
4337    if (conf_parser_ctx.pass == 1)
4338 <    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
4338 >    block_state.max_total.value = (yyvsp[-1].number);
4339   }
4340 + #line 4341 "conf_parser.c" /* yacc.c:1646  */
4341      break;
4342  
4343 <  case 222:
4344 <
4891 < /* Line 1806 of yacc.c  */
4892 < #line 1489 "ircd_parser.y"
4343 >  case 243:
4344 > #line 1498 "conf_parser.y" /* yacc.c:1646  */
4345      {
4346    if (conf_parser_ctx.pass == 1)
4347 <    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
4347 >    block_state.max_global.value = (yyvsp[-1].number);
4348   }
4349 + #line 4350 "conf_parser.c" /* yacc.c:1646  */
4350      break;
4351  
4352 <  case 223:
4353 <
4901 < /* Line 1806 of yacc.c  */
4902 < #line 1495 "ircd_parser.y"
4352 >  case 244:
4353 > #line 1504 "conf_parser.y" /* yacc.c:1646  */
4354      {
4355    if (conf_parser_ctx.pass == 1)
4356 <    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
4356 >    block_state.max_local.value = (yyvsp[-1].number);
4357   }
4358 + #line 4359 "conf_parser.c" /* yacc.c:1646  */
4359      break;
4360  
4361 <  case 224:
4362 <
4911 < /* Line 1806 of yacc.c  */
4912 < #line 1501 "ircd_parser.y"
4361 >  case 245:
4362 > #line 1510 "conf_parser.y" /* yacc.c:1646  */
4363      {
4364    if (conf_parser_ctx.pass == 1)
4365 <    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
4365 >    block_state.max_ident.value = (yyvsp[-1].number);
4366   }
4367 + #line 4368 "conf_parser.c" /* yacc.c:1646  */
4368      break;
4369  
4370 <  case 225:
4371 <
4921 < /* Line 1806 of yacc.c  */
4922 < #line 1507 "ircd_parser.y"
4370 >  case 246:
4371 > #line 1516 "conf_parser.y" /* yacc.c:1646  */
4372      {
4373    if (conf_parser_ctx.pass == 1)
4374 <    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
4374 >    block_state.max_sendq.value = (yyvsp[-1].number);
4375   }
4376 + #line 4377 "conf_parser.c" /* yacc.c:1646  */
4377      break;
4378  
4379 <  case 226:
4380 <
4931 < /* Line 1806 of yacc.c  */
4932 < #line 1513 "ircd_parser.y"
4379 >  case 247:
4380 > #line 1522 "conf_parser.y" /* yacc.c:1646  */
4381      {
4382    if (conf_parser_ctx.pass == 1)
4383 <    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
4383 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4384 >      block_state.max_recvq.value = (yyvsp[-1].number);
4385   }
4386 + #line 4387 "conf_parser.c" /* yacc.c:1646  */
4387      break;
4388  
4389 <  case 227:
4390 <
4941 < /* Line 1806 of yacc.c  */
4942 < #line 1519 "ircd_parser.y"
4389 >  case 248:
4390 > #line 1529 "conf_parser.y" /* yacc.c:1646  */
4391      {
4392    if (conf_parser_ctx.pass == 1)
4393 <    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
4393 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4394   }
4395 + #line 4396 "conf_parser.c" /* yacc.c:1646  */
4396      break;
4397  
4398 <  case 228:
4399 <
4951 < /* Line 1806 of yacc.c  */
4952 < #line 1525 "ircd_parser.y"
4398 >  case 249:
4399 > #line 1535 "conf_parser.y" /* yacc.c:1646  */
4400      {
4401    if (conf_parser_ctx.pass == 1)
4402 <    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
4402 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4403   }
4404 + #line 4405 "conf_parser.c" /* yacc.c:1646  */
4405      break;
4406  
4407 <  case 229:
4408 <
4961 < /* Line 1806 of yacc.c  */
4962 < #line 1531 "ircd_parser.y"
4407 >  case 250:
4408 > #line 1541 "conf_parser.y" /* yacc.c:1646  */
4409      {
4410    if (conf_parser_ctx.pass == 1)
4411 <    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
4411 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4412   }
4413 + #line 4414 "conf_parser.c" /* yacc.c:1646  */
4414      break;
4415  
4416 <  case 230:
4417 <
4971 < /* Line 1806 of yacc.c  */
4972 < #line 1540 "ircd_parser.y"
4416 >  case 251:
4417 > #line 1547 "conf_parser.y" /* yacc.c:1646  */
4418      {
4419 <  if (conf_parser_ctx.pass == 2)
4975 <  {
4976 <    listener_address = NULL;
4977 <    listener_flags = 0;
4978 <  }
4979 < }
4419 >  if (conf_parser_ctx.pass != 1)
4420      break;
4421  
4422 <  case 231:
4422 >  block_state.min_idle.value = (yyvsp[-1].number);
4423 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4424 > }
4425 > #line 4426 "conf_parser.c" /* yacc.c:1646  */
4426 >    break;
4427  
4428 < /* Line 1806 of yacc.c  */
4429 < #line 1547 "ircd_parser.y"
4428 >  case 252:
4429 > #line 1556 "conf_parser.y" /* yacc.c:1646  */
4430      {
4431 <  if (conf_parser_ctx.pass == 2)
4432 <  {
4433 <    MyFree(listener_address);
4434 <    listener_address = NULL;
4435 <  }
4431 >  if (conf_parser_ctx.pass != 1)
4432 >    break;
4433 >
4434 >  block_state.max_idle.value = (yyvsp[-1].number);
4435 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4436   }
4437 + #line 4438 "conf_parser.c" /* yacc.c:1646  */
4438      break;
4439  
4440 <  case 232:
4440 >  case 253:
4441 > #line 1565 "conf_parser.y" /* yacc.c:1646  */
4442 >    {
4443 >  if (conf_parser_ctx.pass == 1)
4444 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4445 > }
4446 > #line 4447 "conf_parser.c" /* yacc.c:1646  */
4447 >    break;
4448  
4449 < /* Line 1806 of yacc.c  */
4450 < #line 1556 "ircd_parser.y"
4449 >  case 257:
4450 > #line 1572 "conf_parser.y" /* yacc.c:1646  */
4451      {
4452 <  listener_flags = 0;
4452 >  if (conf_parser_ctx.pass == 1)
4453 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4454   }
4455 + #line 4456 "conf_parser.c" /* yacc.c:1646  */
4456      break;
4457  
4458 <  case 236:
4458 >  case 258:
4459 > #line 1576 "conf_parser.y" /* yacc.c:1646  */
4460 >    {
4461 >  if (conf_parser_ctx.pass == 1)
4462 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4463 > }
4464 > #line 4465 "conf_parser.c" /* yacc.c:1646  */
4465 >    break;
4466  
4467 < /* Line 1806 of yacc.c  */
4468 < #line 1562 "ircd_parser.y"
4467 >  case 259:
4468 > #line 1586 "conf_parser.y" /* yacc.c:1646  */
4469      {
4470    if (conf_parser_ctx.pass == 2)
4471 <    listener_flags |= LISTENER_SSL;
4471 >    reset_block_state();
4472   }
4473 + #line 4474 "conf_parser.c" /* yacc.c:1646  */
4474      break;
4475  
4476 <  case 237:
4476 >  case 261:
4477 > #line 1592 "conf_parser.y" /* yacc.c:1646  */
4478 >    {
4479 >  block_state.flags.value = 0;
4480 > }
4481 > #line 4482 "conf_parser.c" /* yacc.c:1646  */
4482 >    break;
4483  
4484 < /* Line 1806 of yacc.c  */
4485 < #line 1566 "ircd_parser.y"
4484 >  case 265:
4485 > #line 1598 "conf_parser.y" /* yacc.c:1646  */
4486      {
4487    if (conf_parser_ctx.pass == 2)
4488 <    listener_flags |= LISTENER_HIDDEN;
4488 >    block_state.flags.value |= LISTENER_SSL;
4489   }
4490 + #line 4491 "conf_parser.c" /* yacc.c:1646  */
4491      break;
4492  
4493 <  case 238:
4494 <
5026 < /* Line 1806 of yacc.c  */
5027 < #line 1570 "ircd_parser.y"
4493 >  case 266:
4494 > #line 1602 "conf_parser.y" /* yacc.c:1646  */
4495      {
4496    if (conf_parser_ctx.pass == 2)
4497 <    listener_flags |= LISTENER_SERVER;
4497 >    block_state.flags.value |= LISTENER_HIDDEN;
4498   }
4499 + #line 4500 "conf_parser.c" /* yacc.c:1646  */
4500      break;
4501  
4502 <  case 246:
4503 <
4504 < /* Line 1806 of yacc.c  */
4505 < #line 1580 "ircd_parser.y"
4506 <    { listener_flags = 0; }
4502 >  case 267:
4503 > #line 1606 "conf_parser.y" /* yacc.c:1646  */
4504 >    {
4505 >  if (conf_parser_ctx.pass == 2)
4506 >   block_state.flags.value |= LISTENER_SERVER;
4507 > }
4508 > #line 4509 "conf_parser.c" /* yacc.c:1646  */
4509      break;
4510  
4511 <  case 250:
4511 >  case 275:
4512 > #line 1614 "conf_parser.y" /* yacc.c:1646  */
4513 >    { block_state.flags.value = 0; }
4514 > #line 4515 "conf_parser.c" /* yacc.c:1646  */
4515 >    break;
4516  
4517 < /* Line 1806 of yacc.c  */
4518 < #line 1585 "ircd_parser.y"
4517 >  case 279:
4518 > #line 1619 "conf_parser.y" /* yacc.c:1646  */
4519      {
4520    if (conf_parser_ctx.pass == 2)
4521    {
4522 <    if ((listener_flags & LISTENER_SSL))
4523 < #ifdef HAVE_LIBCRYPTO
4524 <      if (!ServerInfo.server_ctx)
4522 > #ifndef HAVE_LIBCRYPTO
4523 >    if (block_state.flags.value & LISTENER_SSL)
4524 >    {
4525 >      conf_error_report("SSL not available - port closed");
4526 >      break;
4527 >    }
4528   #endif
4529 <      {
5053 <        yyerror("SSL not available - port closed");
5054 <        break;
5055 <      }
5056 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
4529 >    add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4530    }
4531   }
4532 + #line 4533 "conf_parser.c" /* yacc.c:1646  */
4533      break;
4534  
4535 <  case 251:
4536 <
5063 < /* Line 1806 of yacc.c  */
5064 < #line 1599 "ircd_parser.y"
4535 >  case 280:
4536 > #line 1632 "conf_parser.y" /* yacc.c:1646  */
4537      {
4538    if (conf_parser_ctx.pass == 2)
4539    {
4540 <    int i;
4541 <
4542 <    if ((listener_flags & LISTENER_SSL))
4543 < #ifdef HAVE_LIBCRYPTO
4544 <      if (!ServerInfo.server_ctx)
4540 > #ifndef HAVE_LIBCRYPTO
4541 >    if (block_state.flags.value & LISTENER_SSL)
4542 >    {
4543 >      conf_error_report("SSL not available - port closed");
4544 >      break;
4545 >    }
4546   #endif
5074      {
5075        yyerror("SSL not available - port closed");
5076        break;
5077      }
4547  
4548 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
4549 <      add_listener(i, listener_address, listener_flags);
4548 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4549 >      add_listener(i, block_state.addr.buf, block_state.flags.value);
4550    }
4551   }
4552 + #line 4553 "conf_parser.c" /* yacc.c:1646  */
4553      break;
4554  
4555 <  case 252:
4556 <
5087 < /* Line 1806 of yacc.c  */
5088 < #line 1619 "ircd_parser.y"
4555 >  case 281:
4556 > #line 1649 "conf_parser.y" /* yacc.c:1646  */
4557      {
4558    if (conf_parser_ctx.pass == 2)
4559 <  {
5092 <    MyFree(listener_address);
5093 <    DupString(listener_address, yylval.string);
5094 <  }
4559 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4560   }
4561 + #line 4562 "conf_parser.c" /* yacc.c:1646  */
4562      break;
4563  
4564 <  case 253:
4565 <
5100 < /* Line 1806 of yacc.c  */
5101 < #line 1628 "ircd_parser.y"
4564 >  case 282:
4565 > #line 1655 "conf_parser.y" /* yacc.c:1646  */
4566      {
4567    if (conf_parser_ctx.pass == 2)
4568 <  {
5105 <    MyFree(listener_address);
5106 <    DupString(listener_address, yylval.string);
5107 <  }
4568 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4569   }
4570 + #line 4571 "conf_parser.c" /* yacc.c:1646  */
4571      break;
4572  
4573 <  case 254:
4574 <
5113 < /* Line 1806 of yacc.c  */
5114 < #line 1640 "ircd_parser.y"
4573 >  case 283:
4574 > #line 1664 "conf_parser.y" /* yacc.c:1646  */
4575      {
4576    if (conf_parser_ctx.pass == 2)
4577 <  {
5118 <    yy_conf = make_conf_item(CLIENT_TYPE);
5119 <    yy_aconf = map_to_conf(yy_conf);
5120 <  }
5121 <  else
5122 <  {
5123 <    MyFree(class_name);
5124 <    class_name = NULL;
5125 <  }
4577 >    reset_block_state();
4578   }
4579 + #line 4580 "conf_parser.c" /* yacc.c:1646  */
4580      break;
4581  
4582 <  case 255:
4583 <
5131 < /* Line 1806 of yacc.c  */
5132 < #line 1652 "ircd_parser.y"
5133 <    {
5134 <  if (conf_parser_ctx.pass == 2)
5135 <  {
5136 <    struct CollectItem *yy_tmp = NULL;
5137 <    dlink_node *ptr = NULL, *next_ptr = NULL;
5138 <
5139 <    if (yy_aconf->user && yy_aconf->host)
5140 <    {
5141 <      conf_add_class_to_conf(yy_conf, class_name);
5142 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
5143 <    }
5144 <    else
5145 <      delete_conf_item(yy_conf);
5146 <
5147 <    /* copy over settings from first struct */
5148 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
4582 >  case 284:
4583 > #line 1668 "conf_parser.y" /* yacc.c:1646  */
4584      {
4585 <      struct AccessItem *new_aconf;
5151 <      struct ConfItem *new_conf;
5152 <
5153 <      new_conf = make_conf_item(CLIENT_TYPE);
5154 <      new_aconf = map_to_conf(new_conf);
5155 <
5156 <      yy_tmp = ptr->data;
4585 >  dlink_node *ptr = NULL;
4586  
4587 <      assert(yy_tmp->user && yy_tmp->host);
5159 <
5160 <      if (yy_aconf->passwd != NULL)
5161 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5162 <      if (yy_conf->name != NULL)
5163 <        DupString(new_conf->name, yy_conf->name);
5164 <      if (yy_aconf->passwd != NULL)
5165 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5166 <
5167 <      new_aconf->flags = yy_aconf->flags;
5168 <      new_aconf->port  = yy_aconf->port;
5169 <
5170 <      DupString(new_aconf->user, yy_tmp->user);
5171 <      collapse(new_aconf->user);
5172 <
5173 <      DupString(new_aconf->host, yy_tmp->host);
5174 <      collapse(new_aconf->host);
5175 <
5176 <      conf_add_class_to_conf(new_conf, class_name);
5177 <      add_conf_by_address(CONF_CLIENT, new_aconf);
5178 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
5179 <      free_collect_item(yy_tmp);
5180 <    }
5181 <
5182 <    MyFree(class_name);
5183 <    class_name = NULL;
5184 <    yy_conf = NULL;
5185 <    yy_aconf = NULL;
5186 <  }
5187 < }
4587 >  if (conf_parser_ctx.pass != 2)
4588      break;
4589  
4590 <  case 267:
5191 <
5192 < /* Line 1806 of yacc.c  */
5193 < #line 1714 "ircd_parser.y"
5194 <    {
5195 <  if (conf_parser_ctx.pass == 2)
4590 >  DLINK_FOREACH(ptr, block_state.mask.list.head)
4591    {
4592 <    struct CollectItem *yy_tmp = NULL;
4592 >    struct MaskItem *conf = NULL;
4593      struct split_nuh_item nuh;
4594  
4595 <    nuh.nuhmask  = yylval.string;
4595 >    nuh.nuhmask  = ptr->data;
4596      nuh.nickptr  = NULL;
4597 <    nuh.userptr  = userbuf;
4598 <    nuh.hostptr  = hostbuf;
5204 <
4597 >    nuh.userptr  = block_state.user.buf;
4598 >    nuh.hostptr  = block_state.host.buf;
4599      nuh.nicksize = 0;
4600 <    nuh.usersize = sizeof(userbuf);
4601 <    nuh.hostsize = sizeof(hostbuf);
5208 <
4600 >    nuh.usersize = sizeof(block_state.user.buf);
4601 >    nuh.hostsize = sizeof(block_state.host.buf);
4602      split_nuh(&nuh);
4603  
4604 <    if (yy_aconf->user == NULL)
4605 <    {
4606 <      DupString(yy_aconf->user, userbuf);
5214 <      DupString(yy_aconf->host, hostbuf);
5215 <    }
5216 <    else
5217 <    {
5218 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4604 >    conf        = conf_make(CONF_CLIENT);
4605 >    conf->user  = xstrdup(block_state.user.buf);
4606 >    conf->host  = xstrdup(block_state.host.buf);
4607  
4608 <      DupString(yy_tmp->user, userbuf);
4609 <      DupString(yy_tmp->host, hostbuf);
4608 >    if (block_state.rpass.buf[0])
4609 >      conf->passwd = xstrdup(block_state.rpass.buf);
4610 >    if (block_state.name.buf[0])
4611 >      conf->name = xstrdup(block_state.name.buf);
4612  
4613 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4614 <    }
4613 >    conf->flags = block_state.flags.value;
4614 >    conf->port  = block_state.port.value;
4615 >
4616 >    conf_add_class_to_conf(conf, block_state.class.buf);
4617 >    add_conf_by_address(CONF_CLIENT, conf);
4618    }
4619   }
4620 + #line 4621 "conf_parser.c" /* yacc.c:1646  */
4621      break;
4622  
4623 <  case 268:
4624 <
5231 < /* Line 1806 of yacc.c  */
5232 < #line 1751 "ircd_parser.y"
4623 >  case 296:
4624 > #line 1717 "conf_parser.y" /* yacc.c:1646  */
4625      {
4626    if (conf_parser_ctx.pass == 2)
4627 <  {
5236 <    /* be paranoid */
5237 <    if (yy_aconf->passwd != NULL)
5238 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
5239 <
5240 <    MyFree(yy_aconf->passwd);
5241 <    DupString(yy_aconf->passwd, yylval.string);
5242 <  }
4627 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4628   }
4629 + #line 4630 "conf_parser.c" /* yacc.c:1646  */
4630      break;
4631  
4632 <  case 269:
4633 <
5248 < /* Line 1806 of yacc.c  */
5249 < #line 1764 "ircd_parser.y"
4632 >  case 297:
4633 > #line 1723 "conf_parser.y" /* yacc.c:1646  */
4634      {
4635    if (conf_parser_ctx.pass == 2)
4636 <  {
5253 <    MyFree(class_name);
5254 <    DupString(class_name, yylval.string);
5255 <  }
4636 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4637   }
4638 + #line 4639 "conf_parser.c" /* yacc.c:1646  */
4639      break;
4640  
4641 <  case 270:
4641 >  case 298:
4642 > #line 1729 "conf_parser.y" /* yacc.c:1646  */
4643 >    {
4644 >  if (conf_parser_ctx.pass == 2)
4645 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4646 > }
4647 > #line 4648 "conf_parser.c" /* yacc.c:1646  */
4648 >    break;
4649  
4650 < /* Line 1806 of yacc.c  */
4651 < #line 1773 "ircd_parser.y"
4650 >  case 299:
4651 > #line 1735 "conf_parser.y" /* yacc.c:1646  */
4652      {
4653    if (conf_parser_ctx.pass == 2)
4654    {
4655      if (yylval.number)
4656 <      SetConfEncrypted(yy_aconf);
4656 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4657      else
4658 <      ClearConfEncrypted(yy_aconf);
4658 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4659    }
4660   }
4661 + #line 4662 "conf_parser.c" /* yacc.c:1646  */
4662      break;
4663  
4664 <  case 271:
4665 <
5276 < /* Line 1806 of yacc.c  */
5277 < #line 1784 "ircd_parser.y"
4664 >  case 300:
4665 > #line 1746 "conf_parser.y" /* yacc.c:1646  */
4666      {
4667 +  if (conf_parser_ctx.pass == 2)
4668 +    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4669   }
4670 + #line 4671 "conf_parser.c" /* yacc.c:1646  */
4671      break;
4672  
4673 <  case 275:
4674 <
4675 < /* Line 1806 of yacc.c  */
4676 < #line 1788 "ircd_parser.y"
4677 <    { not_atom = 1; }
4673 >  case 304:
4674 > #line 1753 "conf_parser.y" /* yacc.c:1646  */
4675 >    {
4676 >  if (conf_parser_ctx.pass == 2)
4677 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4678 > }
4679 > #line 4680 "conf_parser.c" /* yacc.c:1646  */
4680      break;
4681  
4682 <  case 277:
4683 <
4684 < /* Line 1806 of yacc.c  */
4685 < #line 1789 "ircd_parser.y"
4686 <    { not_atom = 0; }
4682 >  case 305:
4683 > #line 1757 "conf_parser.y" /* yacc.c:1646  */
4684 >    {
4685 >  if (conf_parser_ctx.pass == 2)
4686 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4687 > }
4688 > #line 4689 "conf_parser.c" /* yacc.c:1646  */
4689      break;
4690  
4691 <  case 279:
4692 <
5298 < /* Line 1806 of yacc.c  */
5299 < #line 1792 "ircd_parser.y"
4691 >  case 306:
4692 > #line 1761 "conf_parser.y" /* yacc.c:1646  */
4693      {
4694    if (conf_parser_ctx.pass == 2)
4695 <  {
5303 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5304 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
5305 <  }
4695 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4696   }
4697 + #line 4698 "conf_parser.c" /* yacc.c:1646  */
4698      break;
4699  
4700 <  case 280:
4701 <
5311 < /* Line 1806 of yacc.c  */
5312 < #line 1799 "ircd_parser.y"
4700 >  case 307:
4701 > #line 1765 "conf_parser.y" /* yacc.c:1646  */
4702      {
4703    if (conf_parser_ctx.pass == 2)
4704 <  {
5316 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5317 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5318 <  }
4704 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4705   }
4706 + #line 4707 "conf_parser.c" /* yacc.c:1646  */
4707      break;
4708  
4709 <  case 281:
4710 <
5324 < /* Line 1806 of yacc.c  */
5325 < #line 1806 "ircd_parser.y"
4709 >  case 308:
4710 > #line 1769 "conf_parser.y" /* yacc.c:1646  */
4711      {
4712    if (conf_parser_ctx.pass == 2)
4713 <  {
5329 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5330 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5331 <  }
4713 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4714   }
4715 + #line 4716 "conf_parser.c" /* yacc.c:1646  */
4716      break;
4717  
4718 <  case 282:
4719 <
5337 < /* Line 1806 of yacc.c  */
5338 < #line 1813 "ircd_parser.y"
4718 >  case 309:
4719 > #line 1773 "conf_parser.y" /* yacc.c:1646  */
4720      {
4721    if (conf_parser_ctx.pass == 2)
4722 <  {
5342 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
5343 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
5344 <  }
4722 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4723   }
4724 + #line 4725 "conf_parser.c" /* yacc.c:1646  */
4725      break;
4726  
4727 <  case 283:
4728 <
5350 < /* Line 1806 of yacc.c  */
5351 < #line 1820 "ircd_parser.y"
4727 >  case 310:
4728 > #line 1777 "conf_parser.y" /* yacc.c:1646  */
4729      {
4730    if (conf_parser_ctx.pass == 2)
4731 <  {
5355 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5356 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5357 <  }
4731 >    block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
4732   }
4733 + #line 4734 "conf_parser.c" /* yacc.c:1646  */
4734      break;
4735  
4736 <  case 284:
4737 <
5363 < /* Line 1806 of yacc.c  */
5364 < #line 1827 "ircd_parser.y"
4736 >  case 311:
4737 > #line 1781 "conf_parser.y" /* yacc.c:1646  */
4738      {
4739    if (conf_parser_ctx.pass == 2)
4740 <  {
5368 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5369 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5370 <  }
4740 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4741   }
4742 + #line 4743 "conf_parser.c" /* yacc.c:1646  */
4743      break;
4744  
4745 <  case 285:
4746 <
5376 < /* Line 1806 of yacc.c  */
5377 < #line 1834 "ircd_parser.y"
4745 >  case 312:
4746 > #line 1785 "conf_parser.y" /* yacc.c:1646  */
4747      {
4748    if (conf_parser_ctx.pass == 2)
4749 <  {
5381 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5382 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5383 <  }
4749 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4750   }
4751 + #line 4752 "conf_parser.c" /* yacc.c:1646  */
4752      break;
4753  
4754 <  case 286:
4755 <
5389 < /* Line 1806 of yacc.c  */
5390 < #line 1841 "ircd_parser.y"
4754 >  case 313:
4755 > #line 1789 "conf_parser.y" /* yacc.c:1646  */
4756      {
4757    if (conf_parser_ctx.pass == 2)
4758 <  {
5394 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
5395 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
5396 <  }
4758 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4759   }
4760 + #line 4761 "conf_parser.c" /* yacc.c:1646  */
4761      break;
4762  
4763 <  case 287:
4764 <
5402 < /* Line 1806 of yacc.c  */
5403 < #line 1848 "ircd_parser.y"
4763 >  case 314:
4764 > #line 1795 "conf_parser.y" /* yacc.c:1646  */
4765      {
4766 <  if (conf_parser_ctx.pass == 2)
4766 >  if (conf_parser_ctx.pass != 2)
4767 >    break;
4768 >
4769 >  if (valid_hostname(yylval.string))
4770    {
4771 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
4772 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
4771 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4772 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4773    }
4774 +  else
4775 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4776   }
4777 + #line 4778 "conf_parser.c" /* yacc.c:1646  */
4778      break;
4779  
4780 <  case 288:
4781 <
5415 < /* Line 1806 of yacc.c  */
5416 < #line 1858 "ircd_parser.y"
4780 >  case 315:
4781 > #line 1809 "conf_parser.y" /* yacc.c:1646  */
4782      {
4783 <  if (conf_parser_ctx.pass == 2)
4784 <  {
5420 <    MyFree(yy_conf->name);
4783 >  if (conf_parser_ctx.pass != 2)
4784 >    break;
4785  
4786 <    if (strlen(yylval.string) < HOSTLEN)
4787 <    {    
5424 <      DupString(yy_conf->name, yylval.string);
5425 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
5426 <    }
5427 <    else
5428 <    {
5429 <      ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
5430 <      yy_conf->name = NULL;
5431 <    }
5432 <  }
4786 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4787 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4788   }
4789 + #line 4790 "conf_parser.c" /* yacc.c:1646  */
4790      break;
4791  
4792 <  case 289:
4793 <
5438 < /* Line 1806 of yacc.c  */
5439 < #line 1877 "ircd_parser.y"
4792 >  case 316:
4793 > #line 1818 "conf_parser.y" /* yacc.c:1646  */
4794      {
4795 <  if (conf_parser_ctx.pass == 2)
5442 <  {
5443 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5444 <    MyFree(yy_conf->name);
5445 <    DupString(yy_conf->name, yylval.string);
5446 <  }
5447 < }
4795 >  if (conf_parser_ctx.pass != 2)
4796      break;
4797  
4798 <  case 290:
4798 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4799 >  block_state.port.value = (yyvsp[-1].number);
4800 > }
4801 > #line 4802 "conf_parser.c" /* yacc.c:1646  */
4802 >    break;
4803  
4804 < /* Line 1806 of yacc.c  */
4805 < #line 1887 "ircd_parser.y"
4804 >  case 317:
4805 > #line 1831 "conf_parser.y" /* yacc.c:1646  */
4806      {
4807 <  if (conf_parser_ctx.pass == 2)
5456 <  {
5457 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5458 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5459 <  }
5460 < }
4807 >  if (conf_parser_ctx.pass != 2)
4808      break;
4809  
4810 <  case 291:
4810 >  reset_block_state();
4811 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4812 > }
4813 > #line 4814 "conf_parser.c" /* yacc.c:1646  */
4814 >    break;
4815  
4816 < /* Line 1806 of yacc.c  */
4817 < #line 1900 "ircd_parser.y"
4816 >  case 318:
4817 > #line 1838 "conf_parser.y" /* yacc.c:1646  */
4818      {
4819 <  if (conf_parser_ctx.pass == 2)
5469 <  {
5470 <    MyFree(resv_reason);
5471 <    resv_reason = NULL;
5472 <  }
5473 < }
4819 >  if (conf_parser_ctx.pass != 2)
4820      break;
4821  
4822 <  case 292:
4822 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4823 > }
4824 > #line 4825 "conf_parser.c" /* yacc.c:1646  */
4825 >    break;
4826  
4827 < /* Line 1806 of yacc.c  */
4828 < #line 1907 "ircd_parser.y"
4827 >  case 325:
4828 > #line 1849 "conf_parser.y" /* yacc.c:1646  */
4829      {
4830    if (conf_parser_ctx.pass == 2)
4831 <  {
5483 <    MyFree(resv_reason);
5484 <    resv_reason = NULL;
5485 <  }
4831 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4832   }
4833 + #line 4834 "conf_parser.c" /* yacc.c:1646  */
4834      break;
4835  
4836 <  case 299:
4837 <
5491 < /* Line 1806 of yacc.c  */
5492 < #line 1919 "ircd_parser.y"
4836 >  case 326:
4837 > #line 1855 "conf_parser.y" /* yacc.c:1646  */
4838      {
4839    if (conf_parser_ctx.pass == 2)
4840 <  {
5496 <    MyFree(resv_reason);
5497 <    DupString(resv_reason, yylval.string);
5498 <  }
4840 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4841   }
4842 + #line 4843 "conf_parser.c" /* yacc.c:1646  */
4843      break;
4844  
4845 <  case 300:
4846 <
5504 < /* Line 1806 of yacc.c  */
5505 < #line 1928 "ircd_parser.y"
4845 >  case 327:
4846 > #line 1861 "conf_parser.y" /* yacc.c:1646  */
4847      {
4848    if (conf_parser_ctx.pass == 2)
4849 <  {
5509 <    if (IsChanPrefix(*yylval.string))
5510 <    {
5511 <      char def_reason[] = "No reason";
5512 <
5513 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5514 <    }
5515 <  }
5516 <  /* ignore it for now.. but we really should make a warning if
5517 <   * its an erroneous name --fl_ */
4849 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4850   }
4851 + #line 4852 "conf_parser.c" /* yacc.c:1646  */
4852      break;
4853  
4854 <  case 301:
4855 <
5523 < /* Line 1806 of yacc.c  */
5524 < #line 1943 "ircd_parser.y"
4854 >  case 333:
4855 > #line 1876 "conf_parser.y" /* yacc.c:1646  */
4856      {
4857 <  if (conf_parser_ctx.pass == 2)
4858 <  {
5528 <    char def_reason[] = "No reason";
4857 >  if (conf_parser_ctx.pass != 2)
4858 >    break;
4859  
4860 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
4860 >  if (valid_servname(yylval.string))
4861 >  {
4862 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4863 >    conf->name = xstrdup(yylval.string);
4864    }
4865   }
4866 + #line 4867 "conf_parser.c" /* yacc.c:1646  */
4867      break;
4868  
4869 <  case 307:
4870 <
5537 < /* Line 1806 of yacc.c  */
5538 < #line 1961 "ircd_parser.y"
5539 <    {
5540 <  if (conf_parser_ctx.pass == 2)
5541 <  {
5542 <    if (valid_servname(yylval.string))
4869 >  case 334:
4870 > #line 1891 "conf_parser.y" /* yacc.c:1646  */
4871      {
4872 <      yy_conf = make_conf_item(SERVICE_TYPE);
5545 <      DupString(yy_conf->name, yylval.string);
5546 <    }
5547 <  }
5548 < }
4872 >  if (conf_parser_ctx.pass != 2)
4873      break;
4874  
4875 <  case 308:
4875 >  reset_block_state();
4876  
4877 < /* Line 1806 of yacc.c  */
4878 < #line 1976 "ircd_parser.y"
4879 <    {
4880 <  if (conf_parser_ctx.pass == 2)
5557 <  {
5558 <    yy_conf = make_conf_item(ULINE_TYPE);
5559 <    yy_match_item = map_to_conf(yy_conf);
5560 <    yy_match_item->action = SHARED_ALL;
5561 <  }
4877 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4878 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4879 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4880 >  block_state.flags.value = SHARED_ALL;
4881   }
4882 + #line 4883 "conf_parser.c" /* yacc.c:1646  */
4883      break;
4884  
4885 <  case 309:
4886 <
5567 < /* Line 1806 of yacc.c  */
5568 < #line 1984 "ircd_parser.y"
4885 >  case 335:
4886 > #line 1902 "conf_parser.y" /* yacc.c:1646  */
4887      {
4888 <  if (conf_parser_ctx.pass == 2)
4889 <  {
4890 <    yy_conf = NULL;
5573 <  }
5574 < }
4888 >  struct MaskItem *conf = NULL;
4889 >
4890 >  if (conf_parser_ctx.pass != 2)
4891      break;
4892  
4893 <  case 316:
4893 >  conf = conf_make(CONF_ULINE);
4894 >  conf->flags = block_state.flags.value;
4895 >  conf->name = xstrdup(block_state.name.buf);
4896 >  conf->user = xstrdup(block_state.user.buf);
4897 >  conf->host = xstrdup(block_state.host.buf);
4898 > }
4899 > #line 4900 "conf_parser.c" /* yacc.c:1646  */
4900 >    break;
4901  
4902 < /* Line 1806 of yacc.c  */
4903 < #line 1995 "ircd_parser.y"
4902 >  case 342:
4903 > #line 1919 "conf_parser.y" /* yacc.c:1646  */
4904      {
4905    if (conf_parser_ctx.pass == 2)
4906 <  {
5584 <    MyFree(yy_conf->name);
5585 <    DupString(yy_conf->name, yylval.string);
5586 <  }
4906 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4907   }
4908 + #line 4909 "conf_parser.c" /* yacc.c:1646  */
4909      break;
4910  
4911 <  case 317:
4912 <
5592 < /* Line 1806 of yacc.c  */
5593 < #line 2004 "ircd_parser.y"
4911 >  case 343:
4912 > #line 1925 "conf_parser.y" /* yacc.c:1646  */
4913      {
4914    if (conf_parser_ctx.pass == 2)
4915    {
# Line 5598 | Line 4917 | yyreduce:
4917  
4918      nuh.nuhmask  = yylval.string;
4919      nuh.nickptr  = NULL;
4920 <    nuh.userptr  = userbuf;
4921 <    nuh.hostptr  = hostbuf;
4920 >    nuh.userptr  = block_state.user.buf;
4921 >    nuh.hostptr  = block_state.host.buf;
4922  
4923      nuh.nicksize = 0;
4924 <    nuh.usersize = sizeof(userbuf);
4925 <    nuh.hostsize = sizeof(hostbuf);
4924 >    nuh.usersize = sizeof(block_state.user.buf);
4925 >    nuh.hostsize = sizeof(block_state.host.buf);
4926  
4927      split_nuh(&nuh);
5609
5610    DupString(yy_match_item->user, userbuf);
5611    DupString(yy_match_item->host, hostbuf);
4928    }
4929   }
4930 + #line 4931 "conf_parser.c" /* yacc.c:1646  */
4931      break;
4932  
4933 <  case 318:
4934 <
5618 < /* Line 1806 of yacc.c  */
5619 < #line 2026 "ircd_parser.y"
4933 >  case 344:
4934 > #line 1944 "conf_parser.y" /* yacc.c:1646  */
4935      {
4936    if (conf_parser_ctx.pass == 2)
4937 <    yy_match_item->action = 0;
4937 >    block_state.flags.value = 0;
4938   }
4939 + #line 4940 "conf_parser.c" /* yacc.c:1646  */
4940      break;
4941  
4942 <  case 322:
4943 <
5628 < /* Line 1806 of yacc.c  */
5629 < #line 2033 "ircd_parser.y"
4942 >  case 348:
4943 > #line 1951 "conf_parser.y" /* yacc.c:1646  */
4944      {
4945    if (conf_parser_ctx.pass == 2)
4946 <    yy_match_item->action |= SHARED_KLINE;
4946 >    block_state.flags.value |= SHARED_KLINE;
4947   }
4948 + #line 4949 "conf_parser.c" /* yacc.c:1646  */
4949      break;
4950  
4951 <  case 323:
4952 <
5638 < /* Line 1806 of yacc.c  */
5639 < #line 2037 "ircd_parser.y"
4951 >  case 349:
4952 > #line 1955 "conf_parser.y" /* yacc.c:1646  */
4953      {
4954    if (conf_parser_ctx.pass == 2)
4955 <    yy_match_item->action |= SHARED_TKLINE;
4955 >    block_state.flags.value |= SHARED_UNKLINE;
4956   }
4957 + #line 4958 "conf_parser.c" /* yacc.c:1646  */
4958      break;
4959  
4960 <  case 324:
4961 <
5648 < /* Line 1806 of yacc.c  */
5649 < #line 2041 "ircd_parser.y"
4960 >  case 350:
4961 > #line 1959 "conf_parser.y" /* yacc.c:1646  */
4962      {
4963    if (conf_parser_ctx.pass == 2)
4964 <    yy_match_item->action |= SHARED_UNKLINE;
4964 >    block_state.flags.value |= SHARED_DLINE;
4965   }
4966 + #line 4967 "conf_parser.c" /* yacc.c:1646  */
4967      break;
4968  
4969 <  case 325:
4970 <
5658 < /* Line 1806 of yacc.c  */
5659 < #line 2045 "ircd_parser.y"
4969 >  case 351:
4970 > #line 1963 "conf_parser.y" /* yacc.c:1646  */
4971      {
4972    if (conf_parser_ctx.pass == 2)
4973 <    yy_match_item->action |= SHARED_XLINE;
4973 >    block_state.flags.value |= SHARED_UNDLINE;
4974   }
4975 + #line 4976 "conf_parser.c" /* yacc.c:1646  */
4976      break;
4977  
4978 <  case 326:
4979 <
5668 < /* Line 1806 of yacc.c  */
5669 < #line 2049 "ircd_parser.y"
4978 >  case 352:
4979 > #line 1967 "conf_parser.y" /* yacc.c:1646  */
4980      {
4981    if (conf_parser_ctx.pass == 2)
4982 <    yy_match_item->action |= SHARED_TXLINE;
4982 >    block_state.flags.value |= SHARED_XLINE;
4983   }
4984 + #line 4985 "conf_parser.c" /* yacc.c:1646  */
4985      break;
4986  
4987 <  case 327:
4988 <
5678 < /* Line 1806 of yacc.c  */
5679 < #line 2053 "ircd_parser.y"
4987 >  case 353:
4988 > #line 1971 "conf_parser.y" /* yacc.c:1646  */
4989      {
4990    if (conf_parser_ctx.pass == 2)
4991 <    yy_match_item->action |= SHARED_UNXLINE;
4991 >    block_state.flags.value |= SHARED_UNXLINE;
4992   }
4993 + #line 4994 "conf_parser.c" /* yacc.c:1646  */
4994      break;
4995  
4996 <  case 328:
4997 <
5688 < /* Line 1806 of yacc.c  */
5689 < #line 2057 "ircd_parser.y"
4996 >  case 354:
4997 > #line 1975 "conf_parser.y" /* yacc.c:1646  */
4998      {
4999    if (conf_parser_ctx.pass == 2)
5000 <    yy_match_item->action |= SHARED_RESV;
5000 >    block_state.flags.value |= SHARED_RESV;
5001   }
5002 + #line 5003 "conf_parser.c" /* yacc.c:1646  */
5003      break;
5004  
5005 <  case 329:
5006 <
5698 < /* Line 1806 of yacc.c  */
5699 < #line 2061 "ircd_parser.y"
5005 >  case 355:
5006 > #line 1979 "conf_parser.y" /* yacc.c:1646  */
5007      {
5008    if (conf_parser_ctx.pass == 2)
5009 <    yy_match_item->action |= SHARED_TRESV;
5009 >    block_state.flags.value |= SHARED_UNRESV;
5010   }
5011 + #line 5012 "conf_parser.c" /* yacc.c:1646  */
5012      break;
5013  
5014 <  case 330:
5015 <
5708 < /* Line 1806 of yacc.c  */
5709 < #line 2065 "ircd_parser.y"
5014 >  case 356:
5015 > #line 1983 "conf_parser.y" /* yacc.c:1646  */
5016      {
5017    if (conf_parser_ctx.pass == 2)
5018 <    yy_match_item->action |= SHARED_UNRESV;
5018 >    block_state.flags.value |= SHARED_LOCOPS;
5019   }
5020 + #line 5021 "conf_parser.c" /* yacc.c:1646  */
5021      break;
5022  
5023 <  case 331:
5024 <
5718 < /* Line 1806 of yacc.c  */
5719 < #line 2069 "ircd_parser.y"
5023 >  case 357:
5024 > #line 1987 "conf_parser.y" /* yacc.c:1646  */
5025      {
5026    if (conf_parser_ctx.pass == 2)
5027 <    yy_match_item->action |= SHARED_LOCOPS;
5027 >    block_state.flags.value = SHARED_ALL;
5028   }
5029 + #line 5030 "conf_parser.c" /* yacc.c:1646  */
5030      break;
5031  
5032 <  case 332:
5033 <
5728 < /* Line 1806 of yacc.c  */
5729 < #line 2073 "ircd_parser.y"
5032 >  case 358:
5033 > #line 1996 "conf_parser.y" /* yacc.c:1646  */
5034      {
5035 <  if (conf_parser_ctx.pass == 2)
5732 <    yy_match_item->action = SHARED_ALL;
5733 < }
5035 >  if (conf_parser_ctx.pass != 2)
5036      break;
5037  
5038 <  case 333:
5038 >  reset_block_state();
5039  
5040 < /* Line 1806 of yacc.c  */
5041 < #line 2082 "ircd_parser.y"
5740 <    {
5741 <  if (conf_parser_ctx.pass == 2)
5742 <  {
5743 <    yy_conf = make_conf_item(CLUSTER_TYPE);
5744 <    yy_conf->flags = SHARED_ALL;
5745 <  }
5040 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5041 >  block_state.flags.value = SHARED_ALL;
5042   }
5043 + #line 5044 "conf_parser.c" /* yacc.c:1646  */
5044      break;
5045  
5046 <  case 334:
5047 <
5751 < /* Line 1806 of yacc.c  */
5752 < #line 2089 "ircd_parser.y"
5046 >  case 359:
5047 > #line 2005 "conf_parser.y" /* yacc.c:1646  */
5048      {
5049 <  if (conf_parser_ctx.pass == 2)
5755 <  {
5756 <    if (yy_conf->name == NULL)
5757 <      DupString(yy_conf->name, "*");
5758 <    yy_conf = NULL;
5759 <  }
5760 < }
5761 <    break;
5762 <
5763 <  case 340:
5049 >  struct MaskItem *conf = NULL;
5050  
5051 < /* Line 1806 of yacc.c  */
5766 < #line 2102 "ircd_parser.y"
5767 <    {
5768 <  if (conf_parser_ctx.pass == 2)
5769 <    DupString(yy_conf->name, yylval.string);
5770 < }
5051 >  if (conf_parser_ctx.pass != 2)
5052      break;
5053  
5054 <  case 341:
5055 <
5056 < /* Line 1806 of yacc.c  */
5776 < #line 2108 "ircd_parser.y"
5777 <    {
5778 <  if (conf_parser_ctx.pass == 2)
5779 <    yy_conf->flags = 0;
5054 >  conf = conf_make(CONF_CLUSTER);
5055 >  conf->flags = block_state.flags.value;
5056 >  conf->name = xstrdup(block_state.name.buf);
5057   }
5058 + #line 5059 "conf_parser.c" /* yacc.c:1646  */
5059      break;
5060  
5061 <  case 345:
5062 <
5785 < /* Line 1806 of yacc.c  */
5786 < #line 2115 "ircd_parser.y"
5061 >  case 365:
5062 > #line 2020 "conf_parser.y" /* yacc.c:1646  */
5063      {
5064    if (conf_parser_ctx.pass == 2)
5065 <    yy_conf->flags |= SHARED_KLINE;
5065 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5066   }
5067 + #line 5068 "conf_parser.c" /* yacc.c:1646  */
5068      break;
5069  
5070 <  case 346:
5071 <
5795 < /* Line 1806 of yacc.c  */
5796 < #line 2119 "ircd_parser.y"
5070 >  case 366:
5071 > #line 2026 "conf_parser.y" /* yacc.c:1646  */
5072      {
5073    if (conf_parser_ctx.pass == 2)
5074 <    yy_conf->flags |= SHARED_TKLINE;
5074 >    block_state.flags.value = 0;
5075   }
5076 + #line 5077 "conf_parser.c" /* yacc.c:1646  */
5077      break;
5078  
5079 <  case 347:
5080 <
5805 < /* Line 1806 of yacc.c  */
5806 < #line 2123 "ircd_parser.y"
5079 >  case 370:
5080 > #line 2033 "conf_parser.y" /* yacc.c:1646  */
5081      {
5082    if (conf_parser_ctx.pass == 2)
5083 <    yy_conf->flags |= SHARED_UNKLINE;
5083 >    block_state.flags.value |= SHARED_KLINE;
5084   }
5085 + #line 5086 "conf_parser.c" /* yacc.c:1646  */
5086      break;
5087  
5088 <  case 348:
5089 <
5815 < /* Line 1806 of yacc.c  */
5816 < #line 2127 "ircd_parser.y"
5088 >  case 371:
5089 > #line 2037 "conf_parser.y" /* yacc.c:1646  */
5090      {
5091    if (conf_parser_ctx.pass == 2)
5092 <    yy_conf->flags |= SHARED_XLINE;
5092 >    block_state.flags.value |= SHARED_UNKLINE;
5093   }
5094 + #line 5095 "conf_parser.c" /* yacc.c:1646  */
5095      break;
5096  
5097 <  case 349:
5098 <
5825 < /* Line 1806 of yacc.c  */
5826 < #line 2131 "ircd_parser.y"
5097 >  case 372:
5098 > #line 2041 "conf_parser.y" /* yacc.c:1646  */
5099      {
5100    if (conf_parser_ctx.pass == 2)
5101 <    yy_conf->flags |= SHARED_TXLINE;
5101 >    block_state.flags.value |= SHARED_DLINE;
5102   }
5103 + #line 5104 "conf_parser.c" /* yacc.c:1646  */
5104      break;
5105  
5106 <  case 350:
5107 <
5835 < /* Line 1806 of yacc.c  */
5836 < #line 2135 "ircd_parser.y"
5106 >  case 373:
5107 > #line 2045 "conf_parser.y" /* yacc.c:1646  */
5108      {
5109    if (conf_parser_ctx.pass == 2)
5110 <    yy_conf->flags |= SHARED_UNXLINE;
5110 >    block_state.flags.value |= SHARED_UNDLINE;
5111   }
5112 + #line 5113 "conf_parser.c" /* yacc.c:1646  */
5113      break;
5114  
5115 <  case 351:
5116 <
5845 < /* Line 1806 of yacc.c  */
5846 < #line 2139 "ircd_parser.y"
5115 >  case 374:
5116 > #line 2049 "conf_parser.y" /* yacc.c:1646  */
5117      {
5118    if (conf_parser_ctx.pass == 2)
5119 <    yy_conf->flags |= SHARED_RESV;
5119 >    block_state.flags.value |= SHARED_XLINE;
5120   }
5121 + #line 5122 "conf_parser.c" /* yacc.c:1646  */
5122      break;
5123  
5124 <  case 352:
5125 <
5855 < /* Line 1806 of yacc.c  */
5856 < #line 2143 "ircd_parser.y"
5124 >  case 375:
5125 > #line 2053 "conf_parser.y" /* yacc.c:1646  */
5126      {
5127    if (conf_parser_ctx.pass == 2)
5128 <    yy_conf->flags |= SHARED_TRESV;
5128 >    block_state.flags.value |= SHARED_UNXLINE;
5129   }
5130 + #line 5131 "conf_parser.c" /* yacc.c:1646  */
5131      break;
5132  
5133 <  case 353:
5134 <
5865 < /* Line 1806 of yacc.c  */
5866 < #line 2147 "ircd_parser.y"
5133 >  case 376:
5134 > #line 2057 "conf_parser.y" /* yacc.c:1646  */
5135      {
5136    if (conf_parser_ctx.pass == 2)
5137 <    yy_conf->flags |= SHARED_UNRESV;
5137 >    block_state.flags.value |= SHARED_RESV;
5138   }
5139 + #line 5140 "conf_parser.c" /* yacc.c:1646  */
5140      break;
5141  
5142 <  case 354:
5143 <
5875 < /* Line 1806 of yacc.c  */
5876 < #line 2151 "ircd_parser.y"
5142 >  case 377:
5143 > #line 2061 "conf_parser.y" /* yacc.c:1646  */
5144      {
5145    if (conf_parser_ctx.pass == 2)
5146 <    yy_conf->flags |= SHARED_LOCOPS;
5146 >    block_state.flags.value |= SHARED_UNRESV;
5147   }
5148 + #line 5149 "conf_parser.c" /* yacc.c:1646  */
5149      break;
5150  
5151 <  case 355:
5152 <
5885 < /* Line 1806 of yacc.c  */
5886 < #line 2155 "ircd_parser.y"
5151 >  case 378:
5152 > #line 2065 "conf_parser.y" /* yacc.c:1646  */
5153      {
5154    if (conf_parser_ctx.pass == 2)
5155 <    yy_conf->flags = SHARED_ALL;
5155 >    block_state.flags.value |= SHARED_LOCOPS;
5156   }
5157 + #line 5158 "conf_parser.c" /* yacc.c:1646  */
5158      break;
5159  
5160 <  case 356:
5161 <
5895 < /* Line 1806 of yacc.c  */
5896 < #line 2164 "ircd_parser.y"
5160 >  case 379:
5161 > #line 2069 "conf_parser.y" /* yacc.c:1646  */
5162      {
5163    if (conf_parser_ctx.pass == 2)
5164 <  {
5900 <    yy_conf = make_conf_item(SERVER_TYPE);
5901 <    yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
5902 <    yy_aconf->passwd = NULL;
5903 <    /* defaults */
5904 <    yy_aconf->port = PORTNUM;
5905 <
5906 <    if (ConfigFileEntry.burst_away)
5907 <      yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
5908 <  }
5909 <  else
5910 <  {
5911 <    MyFree(class_name);
5912 <    class_name = NULL;
5913 <  }
5164 >    block_state.flags.value = SHARED_ALL;
5165   }
5166 + #line 5167 "conf_parser.c" /* yacc.c:1646  */
5167      break;
5168  
5169 <  case 357:
5170 <
5919 < /* Line 1806 of yacc.c  */
5920 < #line 2182 "ircd_parser.y"
5169 >  case 380:
5170 > #line 2078 "conf_parser.y" /* yacc.c:1646  */
5171      {
5922  if (conf_parser_ctx.pass == 2)
5923  {
5924    struct CollectItem *yy_hconf=NULL;
5925    struct CollectItem *yy_lconf=NULL;
5926    dlink_node *ptr;
5927    dlink_node *next_ptr;
5928 #ifdef HAVE_LIBCRYPTO
5929    if (yy_aconf->host &&
5930        ((yy_aconf->passwd && yy_aconf->spasswd) ||
5931         (yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
5932 #else /* !HAVE_LIBCRYPTO */
5933      if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
5934          yy_aconf->passwd && yy_aconf->spasswd)
5935 #endif /* !HAVE_LIBCRYPTO */
5936        {
5937          if (conf_add_server(yy_conf, class_name) == -1)
5938          {
5939            delete_conf_item(yy_conf);
5940            yy_conf = NULL;
5941            yy_aconf = NULL;
5942          }
5943        }
5944        else
5945        {
5946          /* Even if yy_conf ->name is NULL
5947           * should still unhook any hub/leaf confs still pending
5948           */
5949          unhook_hub_leaf_confs();
5950
5951          if (yy_conf->name != NULL)
5952          {
5953 #ifndef HAVE_LIBCRYPTO
5954            if (IsConfCryptLink(yy_aconf))
5955              yyerror("Ignoring connect block -- no OpenSSL support");
5956 #else
5957            if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
5958              yyerror("Ignoring connect block -- missing key");
5959 #endif
5960            if (yy_aconf->host == NULL)
5961              yyerror("Ignoring connect block -- missing host");
5962            else if (!IsConfCryptLink(yy_aconf) &&
5963                    (!yy_aconf->passwd || !yy_aconf->spasswd))
5964              yyerror("Ignoring connect block -- missing password");
5965          }
5966
5967
5968          /* XXX
5969           * This fixes a try_connections() core (caused by invalid class_ptr
5970           * pointers) reported by metalrock. That's an ugly fix, but there
5971           * is currently no better way. The entire config subsystem needs an
5972           * rewrite ASAP. make_conf_item() shouldn't really add things onto
5973           * a doubly linked list immediately without any sanity checks!  -Michael
5974           */
5975          delete_conf_item(yy_conf);
5976
5977          yy_aconf = NULL;
5978          yy_conf = NULL;
5979        }
5980
5981      /*
5982       * yy_conf is still pointing at the server that is having
5983       * a connect block built for it. This means, y_aconf->name
5984       * points to the actual irc name this server will be known as.
5985       * Now this new server has a set or even just one hub_mask (or leaf_mask)
5986       * given in the link list at yy_hconf. Fill in the HUB confs
5987       * from this link list now.
5988       */        
5989      DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
5990      {
5991        struct ConfItem *new_hub_conf;
5992        struct MatchItem *match_item;
5993
5994        yy_hconf = ptr->data;
5172  
5173 <        /* yy_conf == NULL is a fatal error for this connect block! */
5174 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5998 <        {
5999 <          new_hub_conf = make_conf_item(HUB_TYPE);
6000 <          match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
6001 <          DupString(new_hub_conf->name, yy_conf->name);
6002 <          if (yy_hconf->user != NULL)
6003 <            DupString(match_item->user, yy_hconf->user);
6004 <          else
6005 <            DupString(match_item->user, "*");
6006 <          if (yy_hconf->host != NULL)
6007 <            DupString(match_item->host, yy_hconf->host);
6008 <          else
6009 <            DupString(match_item->host, "*");
6010 <        }
6011 <        dlinkDelete(&yy_hconf->node, &hub_conf_list);
6012 <        free_collect_item(yy_hconf);
6013 <      }
6014 <
6015 <      /* Ditto for the LEAF confs */
6016 <
6017 <      DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
6018 <      {
6019 <        struct ConfItem *new_leaf_conf;
6020 <        struct MatchItem *match_item;
6021 <
6022 <        yy_lconf = ptr->data;
5173 >  if (conf_parser_ctx.pass != 2)
5174 >    break;
5175  
5176 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5177 <        {
5178 <          new_leaf_conf = make_conf_item(LEAF_TYPE);
6027 <          match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
6028 <          DupString(new_leaf_conf->name, yy_conf->name);
6029 <          if (yy_lconf->user != NULL)
6030 <            DupString(match_item->user, yy_lconf->user);
6031 <          else
6032 <            DupString(match_item->user, "*");
6033 <          if (yy_lconf->host != NULL)
6034 <            DupString(match_item->host, yy_lconf->host);
6035 <          else
6036 <            DupString(match_item->host, "*");
6037 <        }
6038 <        dlinkDelete(&yy_lconf->node, &leaf_conf_list);
6039 <        free_collect_item(yy_lconf);
6040 <      }
6041 <      MyFree(class_name);
6042 <      class_name = NULL;
6043 <      yy_conf = NULL;
6044 <      yy_aconf = NULL;
6045 <  }
5176 >  reset_block_state();
5177 >  block_state.aftype.value = AF_INET;
5178 >  block_state.port.value = PORTNUM;
5179   }
5180 + #line 5181 "conf_parser.c" /* yacc.c:1646  */
5181      break;
5182  
5183 <  case 377:
5184 <
6051 < /* Line 1806 of yacc.c  */
6052 < #line 2320 "ircd_parser.y"
5183 >  case 381:
5184 > #line 2087 "conf_parser.y" /* yacc.c:1646  */
5185      {
5186 <  if (conf_parser_ctx.pass == 2)
5187 <  {
6056 <    if (yy_conf->name != NULL)
6057 <      yyerror("Multiple connect name entry");
5186 >  struct MaskItem *conf = NULL;
5187 >  struct addrinfo hints, *res;
5188  
5189 <    MyFree(yy_conf->name);
6060 <    DupString(yy_conf->name, yylval.string);
6061 <  }
6062 < }
5189 >  if (conf_parser_ctx.pass != 2)
5190      break;
5191  
5192 <  case 378:
5192 >  if (!block_state.name.buf[0] ||
5193 >      !block_state.host.buf[0])
5194 >    break;
5195  
5196 < /* Line 1806 of yacc.c  */
5197 < #line 2332 "ircd_parser.y"
5198 <    {
6070 <  if (conf_parser_ctx.pass == 2)
6071 <  {
6072 <    if (yy_conf->name != NULL)
6073 <      yyerror("Multiple connect name entry");
5196 >  if (!block_state.rpass.buf[0] ||
5197 >      !block_state.spass.buf[0])
5198 >    break;
5199  
5200 <    MyFree(yy_conf->name);
5201 <    DupString(yy_conf->name, yylval.string);
6077 <  }
6078 < }
5200 >  if (has_wildcards(block_state.name.buf) ||
5201 >      has_wildcards(block_state.host.buf))
5202      break;
5203  
5204 <  case 379:
5204 >  conf = conf_make(CONF_SERVER);
5205 >  conf->port = block_state.port.value;
5206 >  conf->flags = block_state.flags.value;
5207 >  conf->aftype = block_state.aftype.value;
5208 >  conf->host = xstrdup(block_state.host.buf);
5209 >  conf->name = xstrdup(block_state.name.buf);
5210 >  conf->passwd = xstrdup(block_state.rpass.buf);
5211 >  conf->spasswd = xstrdup(block_state.spass.buf);
5212  
5213 < /* Line 1806 of yacc.c  */
5214 < #line 2344 "ircd_parser.y"
6085 <    {
6086 <  if (conf_parser_ctx.pass == 2)
6087 <  {
6088 <    MyFree(yy_aconf->host);
6089 <    DupString(yy_aconf->host, yylval.string);
6090 <  }
6091 < }
6092 <    break;
5213 >  if (block_state.cert.buf[0])
5214 >    conf->certfp = xstrdup(block_state.cert.buf);
5215  
5216 <  case 380:
5216 >  if (block_state.ciph.buf[0])
5217 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5218  
5219 < /* Line 1806 of yacc.c  */
5220 < #line 2353 "ircd_parser.y"
6098 <    {
6099 <  if (conf_parser_ctx.pass == 2)
6100 <  {
6101 <    struct addrinfo hints, *res;
5219 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5220 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5221  
5222 +  if (block_state.bind.buf[0])
5223 +  {
5224      memset(&hints, 0, sizeof(hints));
5225  
5226      hints.ai_family   = AF_UNSPEC;
5227      hints.ai_socktype = SOCK_STREAM;
5228      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5229  
5230 <    if (getaddrinfo(yylval.string, NULL, &hints, &res))
5231 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
5230 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5231 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5232      else
5233      {
5234 <      assert(res != NULL);
5234 >      assert(res);
5235  
5236 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
5237 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
5238 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
5236 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5237 >      conf->bind.ss.ss_family = res->ai_family;
5238 >      conf->bind.ss_len = res->ai_addrlen;
5239        freeaddrinfo(res);
5240      }
5241    }
6121 }
6122    break;
5242  
5243 <  case 381:
5244 <
6126 < /* Line 1806 of yacc.c  */
6127 < #line 2379 "ircd_parser.y"
6128 <    {
6129 <  if (conf_parser_ctx.pass == 2)
6130 <  {
6131 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6132 <      yyerror("Server passwords cannot begin with a colon");
6133 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6134 <      yyerror("Server passwords cannot contain spaces");
6135 <    else {
6136 <      if (yy_aconf->spasswd != NULL)
6137 <        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
6138 <
6139 <      MyFree(yy_aconf->spasswd);
6140 <      DupString(yy_aconf->spasswd, yylval.string);
6141 <    }
6142 <  }
5243 >  conf_add_class_to_conf(conf, block_state.class.buf);
5244 >  lookup_confhost(conf);
5245   }
5246 + #line 5247 "conf_parser.c" /* yacc.c:1646  */
5247      break;
5248  
5249 <  case 382:
5250 <
6148 < /* Line 1806 of yacc.c  */
6149 < #line 2397 "ircd_parser.y"
5249 >  case 399:
5250 > #line 2167 "conf_parser.y" /* yacc.c:1646  */
5251      {
5252    if (conf_parser_ctx.pass == 2)
5253 <  {
6153 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6154 <      yyerror("Server passwords cannot begin with a colon");
6155 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6156 <      yyerror("Server passwords cannot contain spaces");
6157 <    else {
6158 <      if (yy_aconf->passwd != NULL)
6159 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
6160 <
6161 <      MyFree(yy_aconf->passwd);
6162 <      DupString(yy_aconf->passwd, yylval.string);
6163 <    }
6164 <  }
5253 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5254   }
5255 + #line 5256 "conf_parser.c" /* yacc.c:1646  */
5256      break;
5257  
5258 <  case 383:
5259 <
6170 < /* Line 1806 of yacc.c  */
6171 < #line 2415 "ircd_parser.y"
5258 >  case 400:
5259 > #line 2173 "conf_parser.y" /* yacc.c:1646  */
5260      {
5261    if (conf_parser_ctx.pass == 2)
5262 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5262 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5263   }
5264 + #line 5265 "conf_parser.c" /* yacc.c:1646  */
5265      break;
5266  
5267 <  case 384:
5268 <
6180 < /* Line 1806 of yacc.c  */
6181 < #line 2421 "ircd_parser.y"
5267 >  case 401:
5268 > #line 2179 "conf_parser.y" /* yacc.c:1646  */
5269      {
5270    if (conf_parser_ctx.pass == 2)
5271 <    yy_aconf->aftype = AF_INET;
5271 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5272   }
5273 + #line 5274 "conf_parser.c" /* yacc.c:1646  */
5274      break;
5275  
5276 <  case 385:
5277 <
6190 < /* Line 1806 of yacc.c  */
6191 < #line 2425 "ircd_parser.y"
5276 >  case 402:
5277 > #line 2185 "conf_parser.y" /* yacc.c:1646  */
5278      {
5279 < #ifdef IPV6
6194 <  if (conf_parser_ctx.pass == 2)
6195 <    yy_aconf->aftype = AF_INET6;
6196 < #endif
6197 < }
5279 >  if (conf_parser_ctx.pass != 2)
5280      break;
5281  
5282 <  case 386:
5283 <
5284 < /* Line 1806 of yacc.c  */
5285 < #line 2433 "ircd_parser.y"
5286 <    {
5282 >  if ((yyvsp[-1].string)[0] == ':')
5283 >    conf_error_report("Server passwords cannot begin with a colon");
5284 >  else if (strchr((yyvsp[-1].string), ' '))
5285 >    conf_error_report("Server passwords cannot contain spaces");
5286 >  else
5287 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5288   }
5289 + #line 5290 "conf_parser.c" /* yacc.c:1646  */
5290      break;
5291  
5292 <  case 390:
5293 <
5294 < /* Line 1806 of yacc.c  */
5295 < #line 2437 "ircd_parser.y"
6212 <    { not_atom = 1; }
5292 >  case 403:
5293 > #line 2198 "conf_parser.y" /* yacc.c:1646  */
5294 >    {
5295 >  if (conf_parser_ctx.pass != 2)
5296      break;
5297  
5298 <  case 392:
5299 <
5300 < /* Line 1806 of yacc.c  */
5301 < #line 2438 "ircd_parser.y"
5302 <    { not_atom = 0; }
5298 >  if ((yyvsp[-1].string)[0] == ':')
5299 >    conf_error_report("Server passwords cannot begin with a colon");
5300 >  else if (strchr((yyvsp[-1].string), ' '))
5301 >    conf_error_report("Server passwords cannot contain spaces");
5302 >  else
5303 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5304 > }
5305 > #line 5306 "conf_parser.c" /* yacc.c:1646  */
5306      break;
5307  
5308 <  case 394:
5309 <
6224 < /* Line 1806 of yacc.c  */
6225 < #line 2441 "ircd_parser.y"
5308 >  case 404:
5309 > #line 2211 "conf_parser.y" /* yacc.c:1646  */
5310      {
5311    if (conf_parser_ctx.pass == 2)
5312 < #ifndef HAVE_LIBZ
6229 <    yyerror("Ignoring flags = compressed; -- no zlib support");
6230 < #else
6231 < {
6232 <   if (not_atom)ClearConfCompressed(yy_aconf);
6233 <   else SetConfCompressed(yy_aconf);
6234 < }
6235 < #endif
5312 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5313   }
5314 + #line 5315 "conf_parser.c" /* yacc.c:1646  */
5315      break;
5316  
5317 <  case 395:
5318 <
6241 < /* Line 1806 of yacc.c  */
6242 < #line 2452 "ircd_parser.y"
5317 >  case 405:
5318 > #line 2217 "conf_parser.y" /* yacc.c:1646  */
5319      {
5320    if (conf_parser_ctx.pass == 2)
5321 <  {
6246 <    if (not_atom)ClearConfCryptLink(yy_aconf);
6247 <    else SetConfCryptLink(yy_aconf);
6248 <  }
5321 >    block_state.port.value = (yyvsp[-1].number);
5322   }
5323 + #line 5324 "conf_parser.c" /* yacc.c:1646  */
5324      break;
5325  
5326 <  case 396:
5327 <
6254 < /* Line 1806 of yacc.c  */
6255 < #line 2459 "ircd_parser.y"
5326 >  case 406:
5327 > #line 2223 "conf_parser.y" /* yacc.c:1646  */
5328      {
5329    if (conf_parser_ctx.pass == 2)
5330 <  {
6259 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
6260 <    else SetConfAllowAutoConn(yy_aconf);
6261 <  }
5330 >    block_state.aftype.value = AF_INET;
5331   }
5332 + #line 5333 "conf_parser.c" /* yacc.c:1646  */
5333      break;
5334  
5335 <  case 397:
5336 <
6267 < /* Line 1806 of yacc.c  */
6268 < #line 2466 "ircd_parser.y"
5335 >  case 407:
5336 > #line 2227 "conf_parser.y" /* yacc.c:1646  */
5337      {
5338    if (conf_parser_ctx.pass == 2)
5339 <  {
6272 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
6273 <    else SetConfAwayBurst(yy_aconf);
6274 <  }
5339 >    block_state.aftype.value = AF_INET6;
5340   }
5341 + #line 5342 "conf_parser.c" /* yacc.c:1646  */
5342      break;
5343  
5344 <  case 398:
5345 <
6280 < /* Line 1806 of yacc.c  */
6281 < #line 2473 "ircd_parser.y"
5344 >  case 408:
5345 > #line 2233 "conf_parser.y" /* yacc.c:1646  */
5346      {
5347 <  if (conf_parser_ctx.pass == 2)
6284 <  {
6285 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
6286 <    else SetConfTopicBurst(yy_aconf);
6287 <  }
5347 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5348   }
5349 + #line 5350 "conf_parser.c" /* yacc.c:1646  */
5350      break;
5351  
5352 <  case 399:
5353 <
6293 < /* Line 1806 of yacc.c  */
6294 < #line 2483 "ircd_parser.y"
5352 >  case 412:
5353 > #line 2239 "conf_parser.y" /* yacc.c:1646  */
5354      {
6296 #ifdef HAVE_LIBCRYPTO
5355    if (conf_parser_ctx.pass == 2)
5356 <  {
5357 <    BIO *file;
5358 <
5359 <    if (yy_aconf->rsa_public_key != NULL)
6302 <    {
6303 <      RSA_free(yy_aconf->rsa_public_key);
6304 <      yy_aconf->rsa_public_key = NULL;
6305 <    }
6306 <
6307 <    if (yy_aconf->rsa_public_key_file != NULL)
6308 <    {
6309 <      MyFree(yy_aconf->rsa_public_key_file);
6310 <      yy_aconf->rsa_public_key_file = NULL;
6311 <    }
6312 <
6313 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
6314 <
6315 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
6316 <    {
6317 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
6318 <      break;
6319 <    }
6320 <
6321 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
5356 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5357 > }
5358 > #line 5359 "conf_parser.c" /* yacc.c:1646  */
5359 >    break;
5360  
5361 <    if (yy_aconf->rsa_public_key == NULL)
5361 >  case 413:
5362 > #line 2243 "conf_parser.y" /* yacc.c:1646  */
5363      {
5364 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
5365 <      break;
6327 <    }
6328 <      
6329 <    BIO_set_close(file, BIO_CLOSE);
6330 <    BIO_free(file);
6331 <  }
6332 < #endif /* HAVE_LIBCRYPTO */
5364 >  if (conf_parser_ctx.pass == 2)
5365 >    block_state.flags.value |= CONF_FLAGS_SSL;
5366   }
5367 + #line 5368 "conf_parser.c" /* yacc.c:1646  */
5368      break;
5369  
5370 <  case 400:
5371 <
6338 < /* Line 1806 of yacc.c  */
6339 < #line 2524 "ircd_parser.y"
5370 >  case 414:
5371 > #line 2249 "conf_parser.y" /* yacc.c:1646  */
5372      {
5373    if (conf_parser_ctx.pass == 2)
5374    {
5375      if (yylval.number)
5376 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
5376 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5377      else
5378 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
5378 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5379    }
5380   }
5381 + #line 5382 "conf_parser.c" /* yacc.c:1646  */
5382      break;
5383  
5384 <  case 401:
5385 <
6353 < /* Line 1806 of yacc.c  */
6354 < #line 2535 "ircd_parser.y"
5384 >  case 415:
5385 > #line 2260 "conf_parser.y" /* yacc.c:1646  */
5386      {
5387    if (conf_parser_ctx.pass == 2)
5388 <  {
6358 <    struct CollectItem *yy_tmp;
6359 <
6360 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6361 <    DupString(yy_tmp->host, yylval.string);
6362 <    DupString(yy_tmp->user, "*");
6363 <    dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
6364 <  }
5388 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5389   }
5390 + #line 5391 "conf_parser.c" /* yacc.c:1646  */
5391      break;
5392  
5393 <  case 402:
5394 <
6370 < /* Line 1806 of yacc.c  */
6371 < #line 2548 "ircd_parser.y"
5393 >  case 416:
5394 > #line 2266 "conf_parser.y" /* yacc.c:1646  */
5395      {
5396    if (conf_parser_ctx.pass == 2)
5397 <  {
6375 <    struct CollectItem *yy_tmp;
6376 <
6377 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6378 <    DupString(yy_tmp->host, yylval.string);
6379 <    DupString(yy_tmp->user, "*");
6380 <    dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
6381 <  }
5397 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5398   }
5399 + #line 5400 "conf_parser.c" /* yacc.c:1646  */
5400      break;
5401  
5402 <  case 403:
5403 <
6387 < /* Line 1806 of yacc.c  */
6388 < #line 2561 "ircd_parser.y"
5402 >  case 417:
5403 > #line 2272 "conf_parser.y" /* yacc.c:1646  */
5404      {
5405    if (conf_parser_ctx.pass == 2)
5406 <  {
6392 <    MyFree(class_name);
6393 <    DupString(class_name, yylval.string);
6394 <  }
5406 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5407   }
5408 + #line 5409 "conf_parser.c" /* yacc.c:1646  */
5409      break;
5410  
5411 <  case 404:
5412 <
6400 < /* Line 1806 of yacc.c  */
6401 < #line 2570 "ircd_parser.y"
5411 >  case 418:
5412 > #line 2278 "conf_parser.y" /* yacc.c:1646  */
5413      {
5414   #ifdef HAVE_LIBCRYPTO
5415    if (conf_parser_ctx.pass == 2)
5416 <  {
6406 <    struct EncCapability *ecap;
6407 <    const char *cipher_name;
6408 <    int found = 0;
6409 <
6410 <    yy_aconf->cipher_preference = NULL;
6411 <    cipher_name = yylval.string;
6412 <
6413 <    for (ecap = CipherTable; ecap->name; ecap++)
6414 <    {
6415 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
6416 <          (ecap->cap & CAP_ENC_MASK))
6417 <      {
6418 <        yy_aconf->cipher_preference = ecap;
6419 <        found = 1;
6420 <        break;
6421 <      }
6422 <    }
6423 <
6424 <    if (!found)
6425 <      yyerror("Invalid cipher");
6426 <  }
5416 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5417   #else
5418    if (conf_parser_ctx.pass == 2)
5419 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
5419 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5420   #endif
5421   }
5422 + #line 5423 "conf_parser.c" /* yacc.c:1646  */
5423      break;
5424  
5425 <  case 405:
5426 <
6436 < /* Line 1806 of yacc.c  */
6437 < #line 2605 "ircd_parser.y"
5425 >  case 419:
5426 > #line 2293 "conf_parser.y" /* yacc.c:1646  */
5427      {
5428    if (conf_parser_ctx.pass == 2)
5429 <  {
6441 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
6442 <    regex_ban = 0;
6443 <  }
5429 >    reset_block_state();
5430   }
5431 + #line 5432 "conf_parser.c" /* yacc.c:1646  */
5432      break;
5433  
5434 <  case 406:
5435 <
6449 < /* Line 1806 of yacc.c  */
6450 < #line 2612 "ircd_parser.y"
6451 <    {
6452 <  if (conf_parser_ctx.pass == 2)
6453 <  {
6454 <    if (userbuf[0] && hostbuf[0])
5434 >  case 420:
5435 > #line 2297 "conf_parser.y" /* yacc.c:1646  */
5436      {
5437 <      if (regex_ban)
6457 <      {
6458 < #ifdef HAVE_LIBPCRE
6459 <        void *exp_user = NULL;
6460 <        void *exp_host = NULL;
6461 <        const char *errptr = NULL;
5437 >  struct MaskItem *conf = NULL;
5438  
5439 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
6464 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
6465 <        {
6466 <          ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
6467 <               errptr);
6468 <          break;
6469 <        }
6470 <
6471 <        yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
6472 <        yy_aconf->regexuser = exp_user;
6473 <        yy_aconf->regexhost = exp_host;
6474 <
6475 <        DupString(yy_aconf->user, userbuf);
6476 <        DupString(yy_aconf->host, hostbuf);
6477 <
6478 <        if (reasonbuf[0])
6479 <          DupString(yy_aconf->reason, reasonbuf);
6480 <        else
6481 <          DupString(yy_aconf->reason, "No reason");
6482 < #else
6483 <        ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
6484 <        break;
6485 < #endif
6486 <      }
6487 <      else
6488 <      {
6489 <        yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
6490 <
6491 <        DupString(yy_aconf->user, userbuf);
6492 <        DupString(yy_aconf->host, hostbuf);
6493 <
6494 <        if (reasonbuf[0])
6495 <          DupString(yy_aconf->reason, reasonbuf);
6496 <        else
6497 <          DupString(yy_aconf->reason, "No reason");
6498 <        add_conf_by_address(CONF_KILL, yy_aconf);
6499 <      }
6500 <    }
6501 <
6502 <    yy_aconf = NULL;
6503 <  }
6504 < }
5439 >  if (conf_parser_ctx.pass != 2)
5440      break;
5441  
5442 <  case 407:
5443 <
6509 < /* Line 1806 of yacc.c  */
6510 < #line 2668 "ircd_parser.y"
6511 <    {
6512 < }
5442 >  if (!block_state.user.buf[0] ||
5443 >      !block_state.host.buf[0])
5444      break;
5445  
5446 <  case 411:
5446 >  conf = conf_make(CONF_KLINE);
5447 >  conf->user = xstrdup(block_state.user.buf);
5448 >  conf->host = xstrdup(block_state.host.buf);
5449  
5450 < /* Line 1806 of yacc.c  */
5451 < #line 2673 "ircd_parser.y"
5452 <    {
5453 <  if (conf_parser_ctx.pass == 2)
5454 <    regex_ban = 1;
5450 >  if (block_state.rpass.buf[0])
5451 >    conf->reason = xstrdup(block_state.rpass.buf);
5452 >  else
5453 >    conf->reason = xstrdup(CONF_NOREASON);
5454 >  add_conf_by_address(CONF_KLINE, conf);
5455   }
5456 + #line 5457 "conf_parser.c" /* yacc.c:1646  */
5457      break;
5458  
5459 <  case 418:
5460 <
6527 < /* Line 1806 of yacc.c  */
6528 < #line 2682 "ircd_parser.y"
5459 >  case 426:
5460 > #line 2322 "conf_parser.y" /* yacc.c:1646  */
5461      {
5462 +
5463    if (conf_parser_ctx.pass == 2)
5464    {
5465      struct split_nuh_item nuh;
5466  
5467      nuh.nuhmask  = yylval.string;
5468      nuh.nickptr  = NULL;
5469 <    nuh.userptr  = userbuf;
5470 <    nuh.hostptr  = hostbuf;
5469 >    nuh.userptr  = block_state.user.buf;
5470 >    nuh.hostptr  = block_state.host.buf;
5471  
5472      nuh.nicksize = 0;
5473 <    nuh.usersize = sizeof(userbuf);
5474 <    nuh.hostsize = sizeof(hostbuf);
5473 >    nuh.usersize = sizeof(block_state.user.buf);
5474 >    nuh.hostsize = sizeof(block_state.host.buf);
5475  
5476      split_nuh(&nuh);
5477    }
5478   }
5479 + #line 5480 "conf_parser.c" /* yacc.c:1646  */
5480      break;
5481  
5482 <  case 419:
5483 <
6550 < /* Line 1806 of yacc.c  */
6551 < #line 2701 "ircd_parser.y"
5482 >  case 427:
5483 > #line 2342 "conf_parser.y" /* yacc.c:1646  */
5484      {
5485    if (conf_parser_ctx.pass == 2)
5486 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5486 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5487   }
5488 + #line 5489 "conf_parser.c" /* yacc.c:1646  */
5489      break;
5490  
5491 <  case 420:
5492 <
6560 < /* Line 1806 of yacc.c  */
6561 < #line 2710 "ircd_parser.y"
5491 >  case 428:
5492 > #line 2351 "conf_parser.y" /* yacc.c:1646  */
5493      {
5494    if (conf_parser_ctx.pass == 2)
5495 <    hostbuf[0] = reasonbuf[0] = '\0';
5495 >    reset_block_state();
5496   }
5497 + #line 5498 "conf_parser.c" /* yacc.c:1646  */
5498      break;
5499  
5500 <  case 421:
5501 <
6570 < /* Line 1806 of yacc.c  */
6571 < #line 2714 "ircd_parser.y"
5500 >  case 429:
5501 > #line 2355 "conf_parser.y" /* yacc.c:1646  */
5502      {
5503 <  if (conf_parser_ctx.pass == 2)
5503 >  struct MaskItem *conf = NULL;
5504 >
5505 >  if (conf_parser_ctx.pass != 2)
5506 >    break;
5507 >
5508 >  if (!block_state.addr.buf[0])
5509 >    break;
5510 >
5511 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5512    {
5513 <    if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
5514 <    {
6577 <      yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
6578 <      DupString(yy_aconf->host, hostbuf);
5513 >    conf = conf_make(CONF_DLINE);
5514 >    conf->host = xstrdup(block_state.addr.buf);
5515  
5516 <      if (reasonbuf[0])
5517 <        DupString(yy_aconf->reason, reasonbuf);
5518 <      else
5519 <        DupString(yy_aconf->reason, "No reason");
5520 <      add_conf_by_address(CONF_DLINE, yy_aconf);
6585 <      yy_aconf = NULL;
6586 <    }
5516 >    if (block_state.rpass.buf[0])
5517 >      conf->reason = xstrdup(block_state.rpass.buf);
5518 >    else
5519 >      conf->reason = xstrdup(CONF_NOREASON);
5520 >    add_conf_by_address(CONF_DLINE, conf);
5521    }
5522   }
5523 + #line 5524 "conf_parser.c" /* yacc.c:1646  */
5524      break;
5525  
5526 <  case 427:
5527 <
6593 < /* Line 1806 of yacc.c  */
6594 < #line 2736 "ircd_parser.y"
5526 >  case 435:
5527 > #line 2381 "conf_parser.y" /* yacc.c:1646  */
5528      {
5529    if (conf_parser_ctx.pass == 2)
5530 <    strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
5530 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5531   }
5532 + #line 5533 "conf_parser.c" /* yacc.c:1646  */
5533      break;
5534  
5535 <  case 428:
5536 <
6603 < /* Line 1806 of yacc.c  */
6604 < #line 2742 "ircd_parser.y"
5535 >  case 436:
5536 > #line 2387 "conf_parser.y" /* yacc.c:1646  */
5537      {
5538    if (conf_parser_ctx.pass == 2)
5539 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5539 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5540   }
5541 + #line 5542 "conf_parser.c" /* yacc.c:1646  */
5542      break;
5543  
5544 <  case 434:
5545 <
6613 < /* Line 1806 of yacc.c  */
6614 < #line 2756 "ircd_parser.y"
5544 >  case 442:
5545 > #line 2401 "conf_parser.y" /* yacc.c:1646  */
5546      {
5547    if (conf_parser_ctx.pass == 2)
5548    {
5549      if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5550      {
5551 <      yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
5552 <      DupString(yy_aconf->host, yylval.string);
5551 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5552 >      conf->host = xstrdup(yylval.string);
5553  
5554 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
6624 <      yy_aconf = NULL;
5554 >      add_conf_by_address(CONF_EXEMPT, conf);
5555      }
5556    }
5557   }
5558 + #line 5559 "conf_parser.c" /* yacc.c:1646  */
5559      break;
5560  
5561 <  case 435:
5562 <
6632 < /* Line 1806 of yacc.c  */
6633 < #line 2774 "ircd_parser.y"
5561 >  case 443:
5562 > #line 2418 "conf_parser.y" /* yacc.c:1646  */
5563      {
5564    if (conf_parser_ctx.pass == 2)
5565 <  {
6637 <    regex_ban = 0;
6638 <    reasonbuf[0] = gecos_name[0] = '\0';
6639 <  }
5565 >    reset_block_state();
5566   }
5567 + #line 5568 "conf_parser.c" /* yacc.c:1646  */
5568      break;
5569  
5570 <  case 436:
5571 <
6645 < /* Line 1806 of yacc.c  */
6646 < #line 2781 "ircd_parser.y"
5570 >  case 444:
5571 > #line 2422 "conf_parser.y" /* yacc.c:1646  */
5572      {
5573 <  if (conf_parser_ctx.pass == 2)
6649 <  {
6650 <    if (gecos_name[0])
6651 <    {
6652 <      if (regex_ban)
6653 <      {
6654 < #ifdef HAVE_LIBPCRE
6655 <        void *exp_p = NULL;
6656 <        const char *errptr = NULL;
5573 >  struct MaskItem *conf = NULL;
5574  
5575 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
5576 <        {
6660 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
6661 <               errptr);
6662 <          break;
6663 <        }
5575 >  if (conf_parser_ctx.pass != 2)
5576 >    break;
5577  
5578 <        yy_conf = make_conf_item(RXLINE_TYPE);
5579 <        yy_conf->regexpname = exp_p;
6667 < #else
6668 <        ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
6669 <        break;
6670 < #endif
6671 <      }
6672 <      else
6673 <        yy_conf = make_conf_item(XLINE_TYPE);
5578 >  if (!block_state.name.buf[0])
5579 >    break;
5580  
5581 <      yy_match_item = map_to_conf(yy_conf);
5582 <      DupString(yy_conf->name, gecos_name);
5581 >  conf = conf_make(CONF_XLINE);
5582 >  conf->name = xstrdup(block_state.name.buf);
5583  
5584 <      if (reasonbuf[0])
5585 <        DupString(yy_match_item->reason, reasonbuf);
5586 <      else
5587 <        DupString(yy_match_item->reason, "No reason");
6682 <    }
6683 <  }
5584 >  if (block_state.rpass.buf[0])
5585 >    conf->reason = xstrdup(block_state.rpass.buf);
5586 >  else
5587 >    conf->reason = xstrdup(CONF_NOREASON);
5588   }
5589 + #line 5590 "conf_parser.c" /* yacc.c:1646  */
5590      break;
5591  
5592 <  case 437:
5593 <
6689 < /* Line 1806 of yacc.c  */
6690 < #line 2821 "ircd_parser.y"
5592 >  case 450:
5593 > #line 2444 "conf_parser.y" /* yacc.c:1646  */
5594      {
5595 +  if (conf_parser_ctx.pass == 2)
5596 +    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5597   }
5598 + #line 5599 "conf_parser.c" /* yacc.c:1646  */
5599      break;
5600  
5601 <  case 441:
5602 <
6697 < /* Line 1806 of yacc.c  */
6698 < #line 2826 "ircd_parser.y"
5601 >  case 451:
5602 > #line 2450 "conf_parser.y" /* yacc.c:1646  */
5603      {
5604    if (conf_parser_ctx.pass == 2)
5605 <    regex_ban = 1;
5605 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5606   }
5607 + #line 5608 "conf_parser.c" /* yacc.c:1646  */
5608      break;
5609  
5610 <  case 448:
5611 <
6707 < /* Line 1806 of yacc.c  */
6708 < #line 2835 "ircd_parser.y"
5610 >  case 506:
5611 > #line 2516 "conf_parser.y" /* yacc.c:1646  */
5612      {
5613 <  if (conf_parser_ctx.pass == 2)
6711 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
5613 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5614   }
5615 + #line 5616 "conf_parser.c" /* yacc.c:1646  */
5616      break;
5617  
5618 <  case 449:
5618 >  case 507:
5619 > #line 2521 "conf_parser.y" /* yacc.c:1646  */
5620 >    {
5621 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5622 > }
5623 > #line 5624 "conf_parser.c" /* yacc.c:1646  */
5624 >    break;
5625  
5626 < /* Line 1806 of yacc.c  */
5627 < #line 2841 "ircd_parser.y"
5626 >  case 508:
5627 > #line 2526 "conf_parser.y" /* yacc.c:1646  */
5628      {
5629 <  if (conf_parser_ctx.pass == 2)
6721 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5629 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5630   }
5631 + #line 5632 "conf_parser.c" /* yacc.c:1646  */
5632      break;
5633  
5634    case 509:
5635 <
6727 < /* Line 1806 of yacc.c  */
6728 < #line 2886 "ircd_parser.y"
5635 > #line 2531 "conf_parser.y" /* yacc.c:1646  */
5636      {
5637 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
5637 >  if (conf_parser_ctx.pass == 2)
5638 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5639   }
5640 + #line 5641 "conf_parser.c" /* yacc.c:1646  */
5641      break;
5642  
5643    case 510:
5644 <
6736 < /* Line 1806 of yacc.c  */
6737 < #line 2891 "ircd_parser.y"
5644 > #line 2537 "conf_parser.y" /* yacc.c:1646  */
5645      {
5646 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
5646 >  if (conf_parser_ctx.pass == 2)
5647 >    ConfigGeneral.glines = yylval.number;
5648   }
5649 + #line 5650 "conf_parser.c" /* yacc.c:1646  */
5650      break;
5651  
5652    case 511:
5653 <
6745 < /* Line 1806 of yacc.c  */
6746 < #line 2896 "ircd_parser.y"
5653 > #line 2543 "conf_parser.y" /* yacc.c:1646  */
5654      {
5655 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
5655 >  if (conf_parser_ctx.pass == 2)
5656 >    ConfigGeneral.gline_time = (yyvsp[-1].number);
5657   }
5658 + #line 5659 "conf_parser.c" /* yacc.c:1646  */
5659      break;
5660  
5661    case 512:
5662 <
6754 < /* Line 1806 of yacc.c  */
6755 < #line 2901 "ircd_parser.y"
5662 > #line 2549 "conf_parser.y" /* yacc.c:1646  */
5663      {
5664 <  ConfigFileEntry.burst_away = yylval.number;
5664 >  if (conf_parser_ctx.pass == 2)
5665 >    ConfigGeneral.gline_request_time = (yyvsp[-1].number);
5666   }
5667 + #line 5668 "conf_parser.c" /* yacc.c:1646  */
5668      break;
5669  
5670    case 513:
5671 <
6763 < /* Line 1806 of yacc.c  */
6764 < #line 2906 "ircd_parser.y"
5671 > #line 2555 "conf_parser.y" /* yacc.c:1646  */
5672      {
5673 <  ConfigFileEntry.use_whois_actually = yylval.number;
5673 >  ConfigGeneral.gline_min_cidr = (yyvsp[-1].number);
5674   }
5675 + #line 5676 "conf_parser.c" /* yacc.c:1646  */
5676      break;
5677  
5678    case 514:
5679 <
6772 < /* Line 1806 of yacc.c  */
6773 < #line 2911 "ircd_parser.y"
5679 > #line 2560 "conf_parser.y" /* yacc.c:1646  */
5680      {
5681 <  GlobalSetOptions.rejecttime = yylval.number;
5681 >  ConfigGeneral.gline_min_cidr6 = (yyvsp[-1].number);
5682   }
5683 + #line 5684 "conf_parser.c" /* yacc.c:1646  */
5684      break;
5685  
5686    case 515:
5687 <
6781 < /* Line 1806 of yacc.c  */
6782 < #line 2916 "ircd_parser.y"
5687 > #line 2565 "conf_parser.y" /* yacc.c:1646  */
5688      {
5689 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
5689 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5690   }
5691 + #line 5692 "conf_parser.c" /* yacc.c:1646  */
5692      break;
5693  
5694    case 516:
5695 <
6790 < /* Line 1806 of yacc.c  */
6791 < #line 2921 "ircd_parser.y"
5695 > #line 2570 "conf_parser.y" /* yacc.c:1646  */
5696      {
5697 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
5697 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5698   }
5699 + #line 5700 "conf_parser.c" /* yacc.c:1646  */
5700      break;
5701  
5702    case 517:
5703 <
6799 < /* Line 1806 of yacc.c  */
6800 < #line 2926 "ircd_parser.y"
5703 > #line 2575 "conf_parser.y" /* yacc.c:1646  */
5704      {
5705 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
5705 >  ConfigGeneral.hide_spoof_ips = yylval.number;
5706   }
5707 + #line 5708 "conf_parser.c" /* yacc.c:1646  */
5708      break;
5709  
5710    case 518:
5711 <
6808 < /* Line 1806 of yacc.c  */
6809 < #line 2931 "ircd_parser.y"
5711 > #line 2580 "conf_parser.y" /* yacc.c:1646  */
5712      {
5713 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
5713 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5714   }
5715 + #line 5716 "conf_parser.c" /* yacc.c:1646  */
5716      break;
5717  
5718    case 519:
5719 <
6817 < /* Line 1806 of yacc.c  */
6818 < #line 2936 "ircd_parser.y"
5719 > #line 2585 "conf_parser.y" /* yacc.c:1646  */
5720      {
5721 <  ConfigFileEntry.disable_remote = yylval.number;
5721 >  ConfigGeneral.failed_oper_notice = yylval.number;
5722   }
5723 + #line 5724 "conf_parser.c" /* yacc.c:1646  */
5724      break;
5725  
5726    case 520:
5727 <
6826 < /* Line 1806 of yacc.c  */
6827 < #line 2941 "ircd_parser.y"
5727 > #line 2590 "conf_parser.y" /* yacc.c:1646  */
5728      {
5729 <  ConfigFileEntry.failed_oper_notice = yylval.number;
5729 >  ConfigGeneral.anti_nick_flood = yylval.number;
5730   }
5731 + #line 5732 "conf_parser.c" /* yacc.c:1646  */
5732      break;
5733  
5734    case 521:
5735 <
6835 < /* Line 1806 of yacc.c  */
6836 < #line 2946 "ircd_parser.y"
5735 > #line 2595 "conf_parser.y" /* yacc.c:1646  */
5736      {
5737 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5737 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5738   }
5739 + #line 5740 "conf_parser.c" /* yacc.c:1646  */
5740      break;
5741  
5742    case 522:
5743 <
6844 < /* Line 1806 of yacc.c  */
6845 < #line 2951 "ircd_parser.y"
5743 > #line 2600 "conf_parser.y" /* yacc.c:1646  */
5744      {
5745 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5745 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5746   }
5747 + #line 5748 "conf_parser.c" /* yacc.c:1646  */
5748      break;
5749  
5750    case 523:
5751 <
6853 < /* Line 1806 of yacc.c  */
6854 < #line 2956 "ircd_parser.y"
5751 > #line 2605 "conf_parser.y" /* yacc.c:1646  */
5752      {
5753 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5753 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5754   }
5755 + #line 5756 "conf_parser.c" /* yacc.c:1646  */
5756      break;
5757  
5758    case 524:
5759 <
6862 < /* Line 1806 of yacc.c  */
6863 < #line 2961 "ircd_parser.y"
5759 > #line 2610 "conf_parser.y" /* yacc.c:1646  */
5760      {
5761 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5761 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5762   }
5763 + #line 5764 "conf_parser.c" /* yacc.c:1646  */
5764      break;
5765  
5766    case 525:
5767 <
6871 < /* Line 1806 of yacc.c  */
6872 < #line 2966 "ircd_parser.y"
5767 > #line 2615 "conf_parser.y" /* yacc.c:1646  */
5768      {
5769 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5769 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5770   }
5771 + #line 5772 "conf_parser.c" /* yacc.c:1646  */
5772      break;
5773  
5774    case 526:
5775 <
6880 < /* Line 1806 of yacc.c  */
6881 < #line 2971 "ircd_parser.y"
5775 > #line 2620 "conf_parser.y" /* yacc.c:1646  */
5776      {
5777 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5777 >  if (conf_parser_ctx.pass == 2)
5778 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5779   }
5780 + #line 5781 "conf_parser.c" /* yacc.c:1646  */
5781      break;
5782  
5783    case 527:
5784 <
6889 < /* Line 1806 of yacc.c  */
6890 < #line 2976 "ircd_parser.y"
5784 > #line 2626 "conf_parser.y" /* yacc.c:1646  */
5785      {
5786 <  if (conf_parser_ctx.pass == 2)
5787 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
5786 >  if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
5787 >  {
5788 >    ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
5789 >    ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
5790 >    ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
5791 >    exit(0);
5792 >  }
5793   }
5794 + #line 5795 "conf_parser.c" /* yacc.c:1646  */
5795      break;
5796  
5797    case 528:
5798 <
6899 < /* Line 1806 of yacc.c  */
6900 < #line 2982 "ircd_parser.y"
5798 > #line 2637 "conf_parser.y" /* yacc.c:1646  */
5799      {
5800 <  if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
6903 <  {
6904 <    ilog(L_CRIT, "You haven't read your config file properly.");
6905 <    ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
6906 <    ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
6907 <    exit(0);
6908 <  }
5800 >  ConfigGeneral.invisible_on_connect = yylval.number;
5801   }
5802 + #line 5803 "conf_parser.c" /* yacc.c:1646  */
5803      break;
5804  
5805    case 529:
5806 <
6914 < /* Line 1806 of yacc.c  */
6915 < #line 2993 "ircd_parser.y"
5806 > #line 2642 "conf_parser.y" /* yacc.c:1646  */
5807      {
5808 <  ConfigFileEntry.kline_with_reason = yylval.number;
5808 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5809   }
5810 + #line 5811 "conf_parser.c" /* yacc.c:1646  */
5811      break;
5812  
5813    case 530:
5814 <
6923 < /* Line 1806 of yacc.c  */
6924 < #line 2998 "ircd_parser.y"
5814 > #line 2647 "conf_parser.y" /* yacc.c:1646  */
5815      {
5816 <  if (conf_parser_ctx.pass == 2)
6927 <  {
6928 <    MyFree(ConfigFileEntry.kline_reason);
6929 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
6930 <  }
5816 >  ConfigGeneral.stats_e_disabled = yylval.number;
5817   }
5818 + #line 5819 "conf_parser.c" /* yacc.c:1646  */
5819      break;
5820  
5821    case 531:
5822 <
6936 < /* Line 1806 of yacc.c  */
6937 < #line 3007 "ircd_parser.y"
5822 > #line 2652 "conf_parser.y" /* yacc.c:1646  */
5823      {
5824 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5824 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5825   }
5826 + #line 5827 "conf_parser.c" /* yacc.c:1646  */
5827      break;
5828  
5829    case 532:
5830 <
6945 < /* Line 1806 of yacc.c  */
6946 < #line 3012 "ircd_parser.y"
5830 > #line 2657 "conf_parser.y" /* yacc.c:1646  */
5831      {
5832 <  ConfigFileEntry.warn_no_nline = yylval.number;
5832 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5833   }
5834 + #line 5835 "conf_parser.c" /* yacc.c:1646  */
5835      break;
5836  
5837    case 533:
5838 <
6954 < /* Line 1806 of yacc.c  */
6955 < #line 3017 "ircd_parser.y"
5838 > #line 2662 "conf_parser.y" /* yacc.c:1646  */
5839      {
5840 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5840 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5841   }
5842 + #line 5843 "conf_parser.c" /* yacc.c:1646  */
5843      break;
5844  
5845    case 534:
5846 <
6963 < /* Line 1806 of yacc.c  */
6964 < #line 3022 "ircd_parser.y"
5846 > #line 2667 "conf_parser.y" /* yacc.c:1646  */
5847      {
5848 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5848 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5849   }
5850 + #line 5851 "conf_parser.c" /* yacc.c:1646  */
5851      break;
5852  
5853    case 535:
5854 <
6972 < /* Line 1806 of yacc.c  */
6973 < #line 3027 "ircd_parser.y"
5854 > #line 2670 "conf_parser.y" /* yacc.c:1646  */
5855      {
5856 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5856 >  ConfigGeneral.stats_k_oper_only = 1;
5857   }
5858 + #line 5859 "conf_parser.c" /* yacc.c:1646  */
5859      break;
5860  
5861    case 536:
5862 <
6981 < /* Line 1806 of yacc.c  */
6982 < #line 3032 "ircd_parser.y"
5862 > #line 2675 "conf_parser.y" /* yacc.c:1646  */
5863      {
5864 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5864 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5865   }
5866 + #line 5867 "conf_parser.c" /* yacc.c:1646  */
5867      break;
5868  
5869    case 537:
5870 <
6990 < /* Line 1806 of yacc.c  */
6991 < #line 3035 "ircd_parser.y"
5870 > #line 2678 "conf_parser.y" /* yacc.c:1646  */
5871      {
5872 <  ConfigFileEntry.stats_k_oper_only = 1;
5872 >  ConfigGeneral.stats_i_oper_only = 1;
5873   }
5874 + #line 5875 "conf_parser.c" /* yacc.c:1646  */
5875      break;
5876  
5877    case 538:
5878 <
6999 < /* Line 1806 of yacc.c  */
7000 < #line 3040 "ircd_parser.y"
5878 > #line 2683 "conf_parser.y" /* yacc.c:1646  */
5879      {
5880 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5880 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5881   }
5882 + #line 5883 "conf_parser.c" /* yacc.c:1646  */
5883      break;
5884  
5885    case 539:
5886 <
7008 < /* Line 1806 of yacc.c  */
7009 < #line 3043 "ircd_parser.y"
5886 > #line 2688 "conf_parser.y" /* yacc.c:1646  */
5887      {
5888 <  ConfigFileEntry.stats_i_oper_only = 1;
5888 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5889   }
5890 + #line 5891 "conf_parser.c" /* yacc.c:1646  */
5891      break;
5892  
5893    case 540:
5894 <
7017 < /* Line 1806 of yacc.c  */
7018 < #line 3048 "ircd_parser.y"
5894 > #line 2693 "conf_parser.y" /* yacc.c:1646  */
5895      {
5896 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5896 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5897   }
5898 + #line 5899 "conf_parser.c" /* yacc.c:1646  */
5899      break;
5900  
5901    case 541:
5902 <
7026 < /* Line 1806 of yacc.c  */
7027 < #line 3053 "ircd_parser.y"
5902 > #line 2698 "conf_parser.y" /* yacc.c:1646  */
5903      {
5904 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5904 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5905   }
5906 + #line 5907 "conf_parser.c" /* yacc.c:1646  */
5907      break;
5908  
5909    case 542:
5910 <
7035 < /* Line 1806 of yacc.c  */
7036 < #line 3058 "ircd_parser.y"
5910 > #line 2703 "conf_parser.y" /* yacc.c:1646  */
5911      {
5912 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5912 >  ConfigGeneral.short_motd = yylval.number;
5913   }
5914 + #line 5915 "conf_parser.c" /* yacc.c:1646  */
5915      break;
5916  
5917    case 543:
5918 <
7044 < /* Line 1806 of yacc.c  */
7045 < #line 3063 "ircd_parser.y"
5918 > #line 2708 "conf_parser.y" /* yacc.c:1646  */
5919      {
5920 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5920 >  ConfigGeneral.no_oper_flood = yylval.number;
5921   }
5922 + #line 5923 "conf_parser.c" /* yacc.c:1646  */
5923      break;
5924  
5925    case 544:
5926 <
7053 < /* Line 1806 of yacc.c  */
7054 < #line 3068 "ircd_parser.y"
5926 > #line 2713 "conf_parser.y" /* yacc.c:1646  */
5927      {
5928 <  ConfigFileEntry.short_motd = yylval.number;
5928 >  ConfigGeneral.true_no_oper_flood = yylval.number;
5929   }
5930 + #line 5931 "conf_parser.c" /* yacc.c:1646  */
5931      break;
5932  
5933    case 545:
5934 <
7062 < /* Line 1806 of yacc.c  */
7063 < #line 3073 "ircd_parser.y"
5934 > #line 2718 "conf_parser.y" /* yacc.c:1646  */
5935      {
5936 <  ConfigFileEntry.no_oper_flood = yylval.number;
5936 >  ConfigGeneral.oper_pass_resv = yylval.number;
5937   }
5938 + #line 5939 "conf_parser.c" /* yacc.c:1646  */
5939      break;
5940  
5941    case 546:
5942 <
7071 < /* Line 1806 of yacc.c  */
7072 < #line 3078 "ircd_parser.y"
5942 > #line 2723 "conf_parser.y" /* yacc.c:1646  */
5943      {
5944 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5944 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
5945   }
5946 + #line 5947 "conf_parser.c" /* yacc.c:1646  */
5947      break;
5948  
5949    case 547:
5950 <
7080 < /* Line 1806 of yacc.c  */
7081 < #line 3083 "ircd_parser.y"
5950 > #line 2728 "conf_parser.y" /* yacc.c:1646  */
5951      {
5952 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5952 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
5953   }
5954 + #line 5955 "conf_parser.c" /* yacc.c:1646  */
5955      break;
5956  
5957    case 548:
5958 <
7089 < /* Line 1806 of yacc.c  */
7090 < #line 3088 "ircd_parser.y"
5958 > #line 2733 "conf_parser.y" /* yacc.c:1646  */
5959      {
5960 <  if (conf_parser_ctx.pass == 2)
5960 >  if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
5961    {
5962 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
5963 <      yylval.string[LOCALE_LENGTH-1] = '\0';
7096 <
7097 <    set_locale(yylval.string);
5962 >    MyFree(ConfigGeneral.service_name);
5963 >    ConfigGeneral.service_name = xstrdup(yylval.string);
5964    }
5965   }
5966 + #line 5967 "conf_parser.c" /* yacc.c:1646  */
5967      break;
5968  
5969    case 549:
5970 <
7104 < /* Line 1806 of yacc.c  */
7105 < #line 3099 "ircd_parser.y"
5970 > #line 2742 "conf_parser.y" /* yacc.c:1646  */
5971      {
5972 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
5972 >  ConfigGeneral.ping_cookie = yylval.number;
5973   }
5974 + #line 5975 "conf_parser.c" /* yacc.c:1646  */
5975      break;
5976  
5977    case 550:
5978 <
7113 < /* Line 1806 of yacc.c  */
7114 < #line 3104 "ircd_parser.y"
5978 > #line 2747 "conf_parser.y" /* yacc.c:1646  */
5979      {
5980 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
5980 >  ConfigGeneral.disable_auth = yylval.number;
5981   }
5982 + #line 5983 "conf_parser.c" /* yacc.c:1646  */
5983      break;
5984  
5985    case 551:
5986 <
7122 < /* Line 1806 of yacc.c  */
7123 < #line 3109 "ircd_parser.y"
5986 > #line 2752 "conf_parser.y" /* yacc.c:1646  */
5987      {
5988 <  if (conf_parser_ctx.pass == 2)
7126 <  {
7127 <    MyFree(ConfigFileEntry.servlink_path);
7128 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
7129 <  }
5988 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
5989   }
5990 + #line 5991 "conf_parser.c" /* yacc.c:1646  */
5991      break;
5992  
5993    case 552:
5994 <
7135 < /* Line 1806 of yacc.c  */
7136 < #line 3118 "ircd_parser.y"
5994 > #line 2757 "conf_parser.y" /* yacc.c:1646  */
5995      {
5996 < #ifdef HAVE_LIBCRYPTO
7139 <  if (conf_parser_ctx.pass == 2)
7140 <  {
7141 <    struct EncCapability *ecap;
7142 <    const char *cipher_name;
7143 <    int found = 0;
7144 <
7145 <    ConfigFileEntry.default_cipher_preference = NULL;
7146 <    cipher_name = yylval.string;
7147 <
7148 <    for (ecap = CipherTable; ecap->name; ecap++)
7149 <    {
7150 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
7151 <          (ecap->cap & CAP_ENC_MASK))
7152 <      {
7153 <        ConfigFileEntry.default_cipher_preference = ecap;
7154 <        found = 1;
7155 <        break;
7156 <      }
7157 <    }
7158 <
7159 <    if (!found)
7160 <      yyerror("Invalid cipher");
7161 <  }
7162 < #else
7163 <  if (conf_parser_ctx.pass == 2)
7164 <    yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
7165 < #endif
5996 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
5997   }
5998 + #line 5999 "conf_parser.c" /* yacc.c:1646  */
5999      break;
6000  
6001    case 553:
6002 <
7171 < /* Line 1806 of yacc.c  */
7172 < #line 3150 "ircd_parser.y"
6002 > #line 2762 "conf_parser.y" /* yacc.c:1646  */
6003      {
6004 <  if (conf_parser_ctx.pass == 2)
7175 <  {
7176 <    ConfigFileEntry.compression_level = (yyvsp[(3) - (4)].number);
7177 < #ifndef HAVE_LIBZ
7178 <    yyerror("Ignoring compression_level -- no zlib support");
7179 < #else
7180 <    if ((ConfigFileEntry.compression_level < 1) ||
7181 <        (ConfigFileEntry.compression_level > 9))
7182 <    {
7183 <      yyerror("Ignoring invalid compression_level, using default");
7184 <      ConfigFileEntry.compression_level = 0;
7185 <    }
7186 < #endif
7187 <  }
6004 >  ConfigGeneral.oper_umodes = 0;
6005   }
6006 + #line 6007 "conf_parser.c" /* yacc.c:1646  */
6007      break;
6008  
6009 <  case 554:
6010 <
7193 < /* Line 1806 of yacc.c  */
7194 < #line 3168 "ircd_parser.y"
6009 >  case 557:
6010 > #line 2768 "conf_parser.y" /* yacc.c:1646  */
6011      {
6012 <  ConfigFileEntry.use_egd = yylval.number;
6012 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6013   }
6014 + #line 6015 "conf_parser.c" /* yacc.c:1646  */
6015      break;
6016  
6017 <  case 555:
6018 <
7202 < /* Line 1806 of yacc.c  */
7203 < #line 3173 "ircd_parser.y"
6017 >  case 558:
6018 > #line 2771 "conf_parser.y" /* yacc.c:1646  */
6019      {
6020 <  if (conf_parser_ctx.pass == 2)
7206 <  {
7207 <    MyFree(ConfigFileEntry.egdpool_path);
7208 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
7209 <  }
6020 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6021   }
6022 + #line 6023 "conf_parser.c" /* yacc.c:1646  */
6023      break;
6024  
6025 <  case 556:
6026 <
7215 < /* Line 1806 of yacc.c  */
7216 < #line 3182 "ircd_parser.y"
6025 >  case 559:
6026 > #line 2774 "conf_parser.y" /* yacc.c:1646  */
6027      {
6028 <  if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
7219 <  {
7220 <    MyFree(ConfigFileEntry.service_name);
7221 <    DupString(ConfigFileEntry.service_name, yylval.string);
7222 <  }
6028 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6029   }
6030 + #line 6031 "conf_parser.c" /* yacc.c:1646  */
6031      break;
6032  
6033 <  case 557:
6034 <
7228 < /* Line 1806 of yacc.c  */
7229 < #line 3191 "ircd_parser.y"
6033 >  case 560:
6034 > #line 2777 "conf_parser.y" /* yacc.c:1646  */
6035      {
6036 <  ConfigFileEntry.ping_cookie = yylval.number;
6036 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6037   }
6038 + #line 6039 "conf_parser.c" /* yacc.c:1646  */
6039      break;
6040  
6041 <  case 558:
6042 <
7237 < /* Line 1806 of yacc.c  */
7238 < #line 3196 "ircd_parser.y"
6041 >  case 561:
6042 > #line 2780 "conf_parser.y" /* yacc.c:1646  */
6043      {
6044 <  ConfigFileEntry.disable_auth = yylval.number;
6044 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6045   }
6046 + #line 6047 "conf_parser.c" /* yacc.c:1646  */
6047      break;
6048  
6049 <  case 559:
6050 <
7246 < /* Line 1806 of yacc.c  */
7247 < #line 3201 "ircd_parser.y"
6049 >  case 562:
6050 > #line 2783 "conf_parser.y" /* yacc.c:1646  */
6051      {
6052 <  ConfigFileEntry.throttle_time = yylval.number;
6052 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6053   }
6054 + #line 6055 "conf_parser.c" /* yacc.c:1646  */
6055      break;
6056  
6057 <  case 560:
6058 <
7255 < /* Line 1806 of yacc.c  */
7256 < #line 3206 "ircd_parser.y"
6057 >  case 563:
6058 > #line 2786 "conf_parser.y" /* yacc.c:1646  */
6059      {
6060 <  ConfigFileEntry.oper_umodes = 0;
6060 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6061   }
6062 + #line 6063 "conf_parser.c" /* yacc.c:1646  */
6063      break;
6064  
6065    case 564:
6066 <
7264 < /* Line 1806 of yacc.c  */
7265 < #line 3212 "ircd_parser.y"
6066 > #line 2789 "conf_parser.y" /* yacc.c:1646  */
6067      {
6068 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
6068 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6069   }
6070 + #line 6071 "conf_parser.c" /* yacc.c:1646  */
6071      break;
6072  
6073    case 565:
6074 <
7273 < /* Line 1806 of yacc.c  */
7274 < #line 3215 "ircd_parser.y"
6074 > #line 2792 "conf_parser.y" /* yacc.c:1646  */
6075      {
6076 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6076 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6077   }
6078 + #line 6079 "conf_parser.c" /* yacc.c:1646  */
6079      break;
6080  
6081    case 566:
6082 <
7282 < /* Line 1806 of yacc.c  */
7283 < #line 3218 "ircd_parser.y"
6082 > #line 2795 "conf_parser.y" /* yacc.c:1646  */
6083      {
6084 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
6084 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6085   }
6086 + #line 6087 "conf_parser.c" /* yacc.c:1646  */
6087      break;
6088  
6089    case 567:
6090 <
7291 < /* Line 1806 of yacc.c  */
7292 < #line 3221 "ircd_parser.y"
6090 > #line 2798 "conf_parser.y" /* yacc.c:1646  */
6091      {
6092 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6092 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6093   }
6094 + #line 6095 "conf_parser.c" /* yacc.c:1646  */
6095      break;
6096  
6097    case 568:
6098 <
7300 < /* Line 1806 of yacc.c  */
7301 < #line 3224 "ircd_parser.y"
6098 > #line 2801 "conf_parser.y" /* yacc.c:1646  */
6099      {
6100 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6100 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6101   }
6102 + #line 6103 "conf_parser.c" /* yacc.c:1646  */
6103      break;
6104  
6105    case 569:
6106 <
7309 < /* Line 1806 of yacc.c  */
7310 < #line 3227 "ircd_parser.y"
6106 > #line 2804 "conf_parser.y" /* yacc.c:1646  */
6107      {
6108 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6108 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6109   }
6110 + #line 6111 "conf_parser.c" /* yacc.c:1646  */
6111      break;
6112  
6113    case 570:
6114 <
7318 < /* Line 1806 of yacc.c  */
7319 < #line 3230 "ircd_parser.y"
6114 > #line 2807 "conf_parser.y" /* yacc.c:1646  */
6115      {
6116 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6116 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6117   }
6118 + #line 6119 "conf_parser.c" /* yacc.c:1646  */
6119      break;
6120  
6121    case 571:
6122 <
7327 < /* Line 1806 of yacc.c  */
7328 < #line 3233 "ircd_parser.y"
6122 > #line 2810 "conf_parser.y" /* yacc.c:1646  */
6123      {
6124 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6124 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6125   }
6126 + #line 6127 "conf_parser.c" /* yacc.c:1646  */
6127      break;
6128  
6129    case 572:
6130 <
7336 < /* Line 1806 of yacc.c  */
7337 < #line 3236 "ircd_parser.y"
6130 > #line 2813 "conf_parser.y" /* yacc.c:1646  */
6131      {
6132 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6132 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6133   }
6134 + #line 6135 "conf_parser.c" /* yacc.c:1646  */
6135      break;
6136  
6137    case 573:
6138 <
7345 < /* Line 1806 of yacc.c  */
7346 < #line 3239 "ircd_parser.y"
6138 > #line 2816 "conf_parser.y" /* yacc.c:1646  */
6139      {
6140 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6140 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6141   }
6142 + #line 6143 "conf_parser.c" /* yacc.c:1646  */
6143      break;
6144  
6145    case 574:
6146 <
7354 < /* Line 1806 of yacc.c  */
7355 < #line 3242 "ircd_parser.y"
6146 > #line 2819 "conf_parser.y" /* yacc.c:1646  */
6147      {
6148 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6148 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6149   }
6150 + #line 6151 "conf_parser.c" /* yacc.c:1646  */
6151      break;
6152  
6153    case 575:
6154 <
7363 < /* Line 1806 of yacc.c  */
7364 < #line 3245 "ircd_parser.y"
6154 > #line 2822 "conf_parser.y" /* yacc.c:1646  */
6155      {
6156 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6156 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6157   }
6158 + #line 6159 "conf_parser.c" /* yacc.c:1646  */
6159      break;
6160  
6161    case 576:
6162 <
7372 < /* Line 1806 of yacc.c  */
7373 < #line 3248 "ircd_parser.y"
6162 > #line 2825 "conf_parser.y" /* yacc.c:1646  */
6163      {
6164 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6164 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6165   }
6166 + #line 6167 "conf_parser.c" /* yacc.c:1646  */
6167      break;
6168  
6169    case 577:
6170 <
7381 < /* Line 1806 of yacc.c  */
7382 < #line 3251 "ircd_parser.y"
6170 > #line 2828 "conf_parser.y" /* yacc.c:1646  */
6171      {
6172 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6172 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6173   }
6174 + #line 6175 "conf_parser.c" /* yacc.c:1646  */
6175      break;
6176  
6177    case 578:
6178 <
7390 < /* Line 1806 of yacc.c  */
7391 < #line 3254 "ircd_parser.y"
6178 > #line 2831 "conf_parser.y" /* yacc.c:1646  */
6179      {
6180 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6180 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6181   }
6182 + #line 6183 "conf_parser.c" /* yacc.c:1646  */
6183      break;
6184  
6185    case 579:
6186 <
7399 < /* Line 1806 of yacc.c  */
7400 < #line 3257 "ircd_parser.y"
6186 > #line 2836 "conf_parser.y" /* yacc.c:1646  */
6187      {
6188 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6188 >  ConfigGeneral.oper_only_umodes = 0;
6189   }
6190 + #line 6191 "conf_parser.c" /* yacc.c:1646  */
6191      break;
6192  
6193 <  case 580:
6194 <
7408 < /* Line 1806 of yacc.c  */
7409 < #line 3260 "ircd_parser.y"
6193 >  case 583:
6194 > #line 2842 "conf_parser.y" /* yacc.c:1646  */
6195      {
6196 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6196 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6197   }
6198 + #line 6199 "conf_parser.c" /* yacc.c:1646  */
6199      break;
6200  
6201 <  case 581:
6202 <
7417 < /* Line 1806 of yacc.c  */
7418 < #line 3263 "ircd_parser.y"
6201 >  case 584:
6202 > #line 2845 "conf_parser.y" /* yacc.c:1646  */
6203      {
6204 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6204 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6205   }
6206 + #line 6207 "conf_parser.c" /* yacc.c:1646  */
6207      break;
6208  
6209 <  case 582:
6210 <
7426 < /* Line 1806 of yacc.c  */
7427 < #line 3266 "ircd_parser.y"
6209 >  case 585:
6210 > #line 2848 "conf_parser.y" /* yacc.c:1646  */
6211      {
6212 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6212 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6213   }
6214 + #line 6215 "conf_parser.c" /* yacc.c:1646  */
6215      break;
6216  
6217 <  case 583:
6218 <
7435 < /* Line 1806 of yacc.c  */
7436 < #line 3271 "ircd_parser.y"
6217 >  case 586:
6218 > #line 2851 "conf_parser.y" /* yacc.c:1646  */
6219      {
6220 <  ConfigFileEntry.oper_only_umodes = 0;
6220 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6221   }
6222 + #line 6223 "conf_parser.c" /* yacc.c:1646  */
6223      break;
6224  
6225    case 587:
6226 <
7444 < /* Line 1806 of yacc.c  */
7445 < #line 3277 "ircd_parser.y"
6226 > #line 2854 "conf_parser.y" /* yacc.c:1646  */
6227      {
6228 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6228 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6229   }
6230 + #line 6231 "conf_parser.c" /* yacc.c:1646  */
6231      break;
6232  
6233    case 588:
6234 <
7453 < /* Line 1806 of yacc.c  */
7454 < #line 3280 "ircd_parser.y"
6234 > #line 2857 "conf_parser.y" /* yacc.c:1646  */
6235      {
6236 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6236 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6237   }
6238 + #line 6239 "conf_parser.c" /* yacc.c:1646  */
6239      break;
6240  
6241    case 589:
6242 <
7462 < /* Line 1806 of yacc.c  */
7463 < #line 3283 "ircd_parser.y"
6242 > #line 2860 "conf_parser.y" /* yacc.c:1646  */
6243      {
6244 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6244 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6245   }
6246 + #line 6247 "conf_parser.c" /* yacc.c:1646  */
6247      break;
6248  
6249    case 590:
6250 <
7471 < /* Line 1806 of yacc.c  */
7472 < #line 3286 "ircd_parser.y"
6250 > #line 2863 "conf_parser.y" /* yacc.c:1646  */
6251      {
6252 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6252 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6253   }
6254 + #line 6255 "conf_parser.c" /* yacc.c:1646  */
6255      break;
6256  
6257    case 591:
6258 <
7480 < /* Line 1806 of yacc.c  */
7481 < #line 3289 "ircd_parser.y"
6258 > #line 2866 "conf_parser.y" /* yacc.c:1646  */
6259      {
6260 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6260 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6261   }
6262 + #line 6263 "conf_parser.c" /* yacc.c:1646  */
6263      break;
6264  
6265    case 592:
6266 <
6267 < /* Line 1806 of yacc.c  */
6268 < #line 3292 "ircd_parser.y"
7491 <    {
7492 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
6266 > #line 2869 "conf_parser.y" /* yacc.c:1646  */
6267 >    {
6268 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6269   }
6270 + #line 6271 "conf_parser.c" /* yacc.c:1646  */
6271      break;
6272  
6273    case 593:
6274 <
7498 < /* Line 1806 of yacc.c  */
7499 < #line 3295 "ircd_parser.y"
6274 > #line 2872 "conf_parser.y" /* yacc.c:1646  */
6275      {
6276 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6276 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6277   }
6278 + #line 6279 "conf_parser.c" /* yacc.c:1646  */
6279      break;
6280  
6281    case 594:
6282 <
7507 < /* Line 1806 of yacc.c  */
7508 < #line 3298 "ircd_parser.y"
6282 > #line 2875 "conf_parser.y" /* yacc.c:1646  */
6283      {
6284 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6284 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6285   }
6286 + #line 6287 "conf_parser.c" /* yacc.c:1646  */
6287      break;
6288  
6289    case 595:
6290 <
7516 < /* Line 1806 of yacc.c  */
7517 < #line 3301 "ircd_parser.y"
6290 > #line 2878 "conf_parser.y" /* yacc.c:1646  */
6291      {
6292 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6292 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6293   }
6294 + #line 6295 "conf_parser.c" /* yacc.c:1646  */
6295      break;
6296  
6297    case 596:
6298 <
7525 < /* Line 1806 of yacc.c  */
7526 < #line 3304 "ircd_parser.y"
6298 > #line 2881 "conf_parser.y" /* yacc.c:1646  */
6299      {
6300 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6300 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6301   }
6302 + #line 6303 "conf_parser.c" /* yacc.c:1646  */
6303      break;
6304  
6305    case 597:
6306 <
7534 < /* Line 1806 of yacc.c  */
7535 < #line 3307 "ircd_parser.y"
6306 > #line 2884 "conf_parser.y" /* yacc.c:1646  */
6307      {
6308 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6308 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6309   }
6310 + #line 6311 "conf_parser.c" /* yacc.c:1646  */
6311      break;
6312  
6313    case 598:
6314 <
7543 < /* Line 1806 of yacc.c  */
7544 < #line 3310 "ircd_parser.y"
6314 > #line 2887 "conf_parser.y" /* yacc.c:1646  */
6315      {
6316 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6316 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6317   }
6318 + #line 6319 "conf_parser.c" /* yacc.c:1646  */
6319      break;
6320  
6321    case 599:
6322 <
7552 < /* Line 1806 of yacc.c  */
7553 < #line 3313 "ircd_parser.y"
6322 > #line 2890 "conf_parser.y" /* yacc.c:1646  */
6323      {
6324 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6324 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6325   }
6326 + #line 6327 "conf_parser.c" /* yacc.c:1646  */
6327      break;
6328  
6329    case 600:
6330 <
7561 < /* Line 1806 of yacc.c  */
7562 < #line 3316 "ircd_parser.y"
6330 > #line 2893 "conf_parser.y" /* yacc.c:1646  */
6331      {
6332 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6332 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6333   }
6334 + #line 6335 "conf_parser.c" /* yacc.c:1646  */
6335      break;
6336  
6337    case 601:
6338 <
7570 < /* Line 1806 of yacc.c  */
7571 < #line 3319 "ircd_parser.y"
6338 > #line 2896 "conf_parser.y" /* yacc.c:1646  */
6339      {
6340 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6340 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6341   }
6342 + #line 6343 "conf_parser.c" /* yacc.c:1646  */
6343      break;
6344  
6345    case 602:
6346 <
7579 < /* Line 1806 of yacc.c  */
7580 < #line 3322 "ircd_parser.y"
6346 > #line 2899 "conf_parser.y" /* yacc.c:1646  */
6347      {
6348 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6348 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6349   }
6350 + #line 6351 "conf_parser.c" /* yacc.c:1646  */
6351      break;
6352  
6353    case 603:
6354 <
7588 < /* Line 1806 of yacc.c  */
7589 < #line 3325 "ircd_parser.y"
6354 > #line 2904 "conf_parser.y" /* yacc.c:1646  */
6355      {
6356 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6356 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6357   }
6358 + #line 6359 "conf_parser.c" /* yacc.c:1646  */
6359      break;
6360  
6361    case 604:
6362 <
7597 < /* Line 1806 of yacc.c  */
7598 < #line 3328 "ircd_parser.y"
6362 > #line 2909 "conf_parser.y" /* yacc.c:1646  */
6363      {
6364 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6364 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6365   }
6366 + #line 6367 "conf_parser.c" /* yacc.c:1646  */
6367      break;
6368  
6369    case 605:
6370 <
7606 < /* Line 1806 of yacc.c  */
7607 < #line 3331 "ircd_parser.y"
7608 <    {
7609 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
7610 < }
7611 <    break;
7612 <
7613 <  case 606:
7614 <
7615 < /* Line 1806 of yacc.c  */
7616 < #line 3336 "ircd_parser.y"
6370 > #line 2914 "conf_parser.y" /* yacc.c:1646  */
6371      {
6372 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6372 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6373   }
6374 + #line 6375 "conf_parser.c" /* yacc.c:1646  */
6375      break;
6376  
6377 <  case 607:
6378 <
7624 < /* Line 1806 of yacc.c  */
7625 < #line 3341 "ircd_parser.y"
7626 <    {
7627 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
7628 < }
7629 <    break;
7630 <
7631 <  case 608:
7632 <
7633 < /* Line 1806 of yacc.c  */
7634 < #line 3346 "ircd_parser.y"
7635 <    {
7636 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
7637 < }
7638 <    break;
7639 <
7640 <  case 609:
7641 <
7642 < /* Line 1806 of yacc.c  */
7643 < #line 3351 "ircd_parser.y"
7644 <    {
7645 <  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
7646 < }
7647 <    break;
7648 <
7649 <  case 610:
7650 <
7651 < /* Line 1806 of yacc.c  */
7652 < #line 3360 "ircd_parser.y"
7653 <    {
7654 <  if (conf_parser_ctx.pass == 2)
7655 <  {
7656 <    yy_conf = make_conf_item(GDENY_TYPE);
7657 <    yy_aconf = map_to_conf(yy_conf);
7658 <  }
7659 < }
7660 <    break;
7661 <
7662 <  case 611:
7663 <
7664 < /* Line 1806 of yacc.c  */
7665 < #line 3367 "ircd_parser.y"
7666 <    {
7667 <  if (conf_parser_ctx.pass == 2)
7668 <  {
7669 <    /*
7670 <     * since we re-allocate yy_conf/yy_aconf after the end of action=, at the
7671 <     * end we will have one extra, so we should free it.
7672 <     */
7673 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
7674 <    {
7675 <      delete_conf_item(yy_conf);
7676 <      yy_conf = NULL;
7677 <      yy_aconf = NULL;
7678 <    }
7679 <  }
7680 < }
7681 <    break;
7682 <
7683 <  case 621:
7684 <
7685 < /* Line 1806 of yacc.c  */
7686 < #line 3393 "ircd_parser.y"
6377 >  case 624:
6378 > #line 2943 "conf_parser.y" /* yacc.c:1646  */
6379      {
6380 <  if (conf_parser_ctx.pass == 2)
7689 <    ConfigFileEntry.glines = yylval.number;
6380 >  ConfigChannel.disable_fake_channels = yylval.number;
6381   }
6382 + #line 6383 "conf_parser.c" /* yacc.c:1646  */
6383      break;
6384  
6385 <  case 622:
6386 <
7695 < /* Line 1806 of yacc.c  */
7696 < #line 3399 "ircd_parser.y"
6385 >  case 625:
6386 > #line 2948 "conf_parser.y" /* yacc.c:1646  */
6387      {
6388 <  if (conf_parser_ctx.pass == 2)
7699 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
6388 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6389   }
6390 + #line 6391 "conf_parser.c" /* yacc.c:1646  */
6391      break;
6392  
6393 <  case 623:
6394 <
7705 < /* Line 1806 of yacc.c  */
7706 < #line 3405 "ircd_parser.y"
6393 >  case 626:
6394 > #line 2953 "conf_parser.y" /* yacc.c:1646  */
6395      {
6396 <  if (conf_parser_ctx.pass == 2)
7709 <    ConfigFileEntry.gline_logging = 0;
6396 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6397   }
6398 + #line 6399 "conf_parser.c" /* yacc.c:1646  */
6399      break;
6400  
6401    case 627:
6402 <
7715 < /* Line 1806 of yacc.c  */
7716 < #line 3411 "ircd_parser.y"
6402 > #line 2958 "conf_parser.y" /* yacc.c:1646  */
6403      {
6404 <  if (conf_parser_ctx.pass == 2)
7719 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
6404 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6405   }
6406 + #line 6407 "conf_parser.c" /* yacc.c:1646  */
6407      break;
6408  
6409    case 628:
6410 <
7725 < /* Line 1806 of yacc.c  */
7726 < #line 3415 "ircd_parser.y"
6410 > #line 2963 "conf_parser.y" /* yacc.c:1646  */
6411      {
6412 <  if (conf_parser_ctx.pass == 2)
7729 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
6412 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6413   }
6414 + #line 6415 "conf_parser.c" /* yacc.c:1646  */
6415      break;
6416  
6417    case 629:
6418 <
7735 < /* Line 1806 of yacc.c  */
7736 < #line 3421 "ircd_parser.y"
6418 > #line 2968 "conf_parser.y" /* yacc.c:1646  */
6419      {
6420 <  if (conf_parser_ctx.pass == 2)
7739 <  {
7740 <    struct split_nuh_item nuh;
7741 <
7742 <    nuh.nuhmask  = yylval.string;
7743 <    nuh.nickptr  = NULL;
7744 <    nuh.userptr  = userbuf;
7745 <    nuh.hostptr  = hostbuf;
7746 <
7747 <    nuh.nicksize = 0;
7748 <    nuh.usersize = sizeof(userbuf);
7749 <    nuh.hostsize = sizeof(hostbuf);
7750 <
7751 <    split_nuh(&nuh);
7752 <
7753 <    if (yy_aconf->user == NULL)
7754 <    {
7755 <      DupString(yy_aconf->user, userbuf);
7756 <      DupString(yy_aconf->host, hostbuf);
7757 <    }
7758 <    else
7759 <    {
7760 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
7761 <
7762 <      DupString(yy_tmp->user, userbuf);
7763 <      DupString(yy_tmp->host, hostbuf);
7764 <
7765 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
7766 <    }
7767 <  }
6420 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6421   }
6422 + #line 6423 "conf_parser.c" /* yacc.c:1646  */
6423      break;
6424  
6425    case 630:
6426 <
7773 < /* Line 1806 of yacc.c  */
7774 < #line 3455 "ircd_parser.y"
6426 > #line 2973 "conf_parser.y" /* yacc.c:1646  */
6427      {
6428 <  if (conf_parser_ctx.pass == 2)  
7777 <  {
7778 <    MyFree(yy_conf->name);
7779 <    DupString(yy_conf->name, yylval.string);
7780 <  }
6428 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6429   }
6430 + #line 6431 "conf_parser.c" /* yacc.c:1646  */
6431      break;
6432  
6433    case 631:
6434 <
7786 < /* Line 1806 of yacc.c  */
7787 < #line 3464 "ircd_parser.y"
6434 > #line 2978 "conf_parser.y" /* yacc.c:1646  */
6435      {
6436 <  if (conf_parser_ctx.pass == 2)
7790 <    yy_aconf->flags = 0;
6436 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6437   }
6438 + #line 6439 "conf_parser.c" /* yacc.c:1646  */
6439      break;
6440  
6441    case 632:
6442 <
7796 < /* Line 1806 of yacc.c  */
7797 < #line 3468 "ircd_parser.y"
7798 <    {
7799 <  if (conf_parser_ctx.pass == 2)
7800 <  {
7801 <    struct CollectItem *yy_tmp = NULL;
7802 <    dlink_node *ptr, *next_ptr;
7803 <
7804 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
7805 <    {
7806 <      struct AccessItem *new_aconf;
7807 <      struct ConfItem *new_conf;
7808 <
7809 <      yy_tmp = ptr->data;
7810 <      new_conf = make_conf_item(GDENY_TYPE);
7811 <      new_aconf = map_to_conf(new_conf);
7812 <
7813 <      new_aconf->flags = yy_aconf->flags;
7814 <
7815 <      if (yy_conf->name != NULL)
7816 <        DupString(new_conf->name, yy_conf->name);
7817 <      else
7818 <        DupString(new_conf->name, "*");
7819 <      if (yy_aconf->user != NULL)
7820 <         DupString(new_aconf->user, yy_tmp->user);
7821 <      else  
7822 <        DupString(new_aconf->user, "*");
7823 <      if (yy_aconf->host != NULL)
7824 <        DupString(new_aconf->host, yy_tmp->host);
7825 <      else
7826 <        DupString(new_aconf->host, "*");
7827 <
7828 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
7829 <    }
7830 <
7831 <    /*
7832 <     * In case someone has fed us with more than one action= after user/name
7833 <     * which would leak memory  -Michael
7834 <     */
7835 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
7836 <      delete_conf_item(yy_conf);
7837 <
7838 <    yy_conf = make_conf_item(GDENY_TYPE);
7839 <    yy_aconf = map_to_conf(yy_conf);
7840 <  }
7841 < }
7842 <    break;
7843 <
7844 <  case 635:
7845 <
7846 < /* Line 1806 of yacc.c  */
7847 < #line 3515 "ircd_parser.y"
7848 <    {
7849 <  if (conf_parser_ctx.pass == 2)
7850 <    yy_aconf->flags |= GDENY_REJECT;
7851 < }
7852 <    break;
7853 <
7854 <  case 636:
7855 <
7856 < /* Line 1806 of yacc.c  */
7857 < #line 3519 "ircd_parser.y"
7858 <    {
7859 <  if (conf_parser_ctx.pass == 2)
7860 <    yy_aconf->flags |= GDENY_BLOCK;
7861 < }
7862 <    break;
7863 <
7864 <  case 659:
7865 <
7866 < /* Line 1806 of yacc.c  */
7867 < #line 3543 "ircd_parser.y"
7868 <    {
7869 <  ConfigChannel.disable_fake_channels = yylval.number;
7870 < }
7871 <    break;
7872 <
7873 <  case 660:
7874 <
7875 < /* Line 1806 of yacc.c  */
7876 < #line 3548 "ircd_parser.y"
6442 > #line 2983 "conf_parser.y" /* yacc.c:1646  */
6443      {
6444 <  ConfigChannel.restrict_channels = yylval.number;
6444 >  ConfigChannel.default_split_user_count = (yyvsp[-1].number);
6445   }
6446 + #line 6447 "conf_parser.c" /* yacc.c:1646  */
6447      break;
6448  
6449 <  case 661:
6450 <
7884 < /* Line 1806 of yacc.c  */
7885 < #line 3553 "ircd_parser.y"
6449 >  case 633:
6450 > #line 2988 "conf_parser.y" /* yacc.c:1646  */
6451      {
6452 <  ConfigChannel.disable_local_channels = yylval.number;
6452 >  ConfigChannel.default_split_server_count = (yyvsp[-1].number);
6453   }
6454 + #line 6455 "conf_parser.c" /* yacc.c:1646  */
6455      break;
6456  
6457 <  case 662:
6458 <
7893 < /* Line 1806 of yacc.c  */
7894 < #line 3558 "ircd_parser.y"
7895 <    {
7896 <  ConfigChannel.use_except = yylval.number;
7897 < }
7898 <    break;
7899 <
7900 <  case 663:
7901 <
7902 < /* Line 1806 of yacc.c  */
7903 < #line 3563 "ircd_parser.y"
7904 <    {
7905 <  ConfigChannel.use_invex = yylval.number;
7906 < }
7907 <    break;
7908 <
7909 <  case 664:
7910 <
7911 < /* Line 1806 of yacc.c  */
7912 < #line 3568 "ircd_parser.y"
7913 <    {
7914 <  ConfigChannel.use_knock = yylval.number;
7915 < }
7916 <    break;
7917 <
7918 <  case 665:
7919 <
7920 < /* Line 1806 of yacc.c  */
7921 < #line 3573 "ircd_parser.y"
7922 <    {
7923 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
7924 < }
7925 <    break;
7926 <
7927 <  case 666:
7928 <
7929 < /* Line 1806 of yacc.c  */
7930 < #line 3578 "ircd_parser.y"
7931 <    {
7932 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
7933 < }
7934 <    break;
7935 <
7936 <  case 667:
7937 <
7938 < /* Line 1806 of yacc.c  */
7939 < #line 3583 "ircd_parser.y"
7940 <    {
7941 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
7942 < }
7943 <    break;
7944 <
7945 <  case 668:
7946 <
7947 < /* Line 1806 of yacc.c  */
7948 < #line 3588 "ircd_parser.y"
7949 <    {
7950 <  ConfigChannel.quiet_on_ban = yylval.number;
7951 < }
7952 <    break;
7953 <
7954 <  case 669:
7955 <
7956 < /* Line 1806 of yacc.c  */
7957 < #line 3593 "ircd_parser.y"
7958 <    {
7959 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
7960 < }
7961 <    break;
7962 <
7963 <  case 670:
7964 <
7965 < /* Line 1806 of yacc.c  */
7966 < #line 3598 "ircd_parser.y"
7967 <    {
7968 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
7969 < }
7970 <    break;
7971 <
7972 <  case 671:
7973 <
7974 < /* Line 1806 of yacc.c  */
7975 < #line 3603 "ircd_parser.y"
7976 <    {
7977 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
7978 < }
7979 <    break;
7980 <
7981 <  case 672:
7982 <
7983 < /* Line 1806 of yacc.c  */
7984 < #line 3608 "ircd_parser.y"
6457 >  case 634:
6458 > #line 2993 "conf_parser.y" /* yacc.c:1646  */
6459      {
6460    ConfigChannel.no_create_on_split = yylval.number;
6461   }
6462 + #line 6463 "conf_parser.c" /* yacc.c:1646  */
6463      break;
6464  
6465 <  case 673:
6466 <
7992 < /* Line 1806 of yacc.c  */
7993 < #line 3613 "ircd_parser.y"
6465 >  case 635:
6466 > #line 2998 "conf_parser.y" /* yacc.c:1646  */
6467      {
6468    ConfigChannel.no_join_on_split = yylval.number;
6469   }
6470 + #line 6471 "conf_parser.c" /* yacc.c:1646  */
6471      break;
6472  
6473 <  case 674:
6474 <
8001 < /* Line 1806 of yacc.c  */
8002 < #line 3618 "ircd_parser.y"
6473 >  case 636:
6474 > #line 3003 "conf_parser.y" /* yacc.c:1646  */
6475      {
6476 <  ConfigChannel.burst_topicwho = yylval.number;
6476 >  GlobalSetOptions.joinfloodcount = yylval.number;
6477   }
6478 + #line 6479 "conf_parser.c" /* yacc.c:1646  */
6479      break;
6480  
6481 <  case 675:
6482 <
8010 < /* Line 1806 of yacc.c  */
8011 < #line 3623 "ircd_parser.y"
6481 >  case 637:
6482 > #line 3008 "conf_parser.y" /* yacc.c:1646  */
6483      {
6484 <  GlobalSetOptions.joinfloodcount = yylval.number;
6484 >  GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
6485   }
6486 + #line 6487 "conf_parser.c" /* yacc.c:1646  */
6487      break;
6488  
6489 <  case 676:
6490 <
8019 < /* Line 1806 of yacc.c  */
8020 < #line 3628 "ircd_parser.y"
6489 >  case 650:
6490 > #line 3030 "conf_parser.y" /* yacc.c:1646  */
6491      {
6492 <  GlobalSetOptions.joinfloodtime = yylval.number;
6492 >  if (conf_parser_ctx.pass == 2)
6493 >    ConfigServerHide.flatten_links = yylval.number;
6494   }
6495 + #line 6496 "conf_parser.c" /* yacc.c:1646  */
6496      break;
6497  
6498 <  case 688:
6499 <
8028 < /* Line 1806 of yacc.c  */
8029 < #line 3647 "ircd_parser.y"
6498 >  case 651:
6499 > #line 3036 "conf_parser.y" /* yacc.c:1646  */
6500      {
6501    if (conf_parser_ctx.pass == 2)
6502 <    ConfigServerHide.flatten_links = yylval.number;
6502 >    ConfigServerHide.disable_remote_commands = yylval.number;
6503   }
6504 + #line 6505 "conf_parser.c" /* yacc.c:1646  */
6505      break;
6506  
6507 <  case 689:
6508 <
8038 < /* Line 1806 of yacc.c  */
8039 < #line 3653 "ircd_parser.y"
6507 >  case 652:
6508 > #line 3042 "conf_parser.y" /* yacc.c:1646  */
6509      {
6510    if (conf_parser_ctx.pass == 2)
6511      ConfigServerHide.hide_servers = yylval.number;
6512   }
6513 + #line 6514 "conf_parser.c" /* yacc.c:1646  */
6514      break;
6515  
6516 <  case 690:
6516 >  case 653:
6517 > #line 3048 "conf_parser.y" /* yacc.c:1646  */
6518 >    {
6519 >  if (conf_parser_ctx.pass == 2)
6520 >    ConfigServerHide.hide_services = yylval.number;
6521 > }
6522 > #line 6523 "conf_parser.c" /* yacc.c:1646  */
6523 >    break;
6524  
6525 < /* Line 1806 of yacc.c  */
6526 < #line 3659 "ircd_parser.y"
6525 >  case 654:
6526 > #line 3054 "conf_parser.y" /* yacc.c:1646  */
6527      {
6528    if (conf_parser_ctx.pass == 2)
6529    {
6530      MyFree(ConfigServerHide.hidden_name);
6531 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6531 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6532    }
6533   }
6534 + #line 6535 "conf_parser.c" /* yacc.c:1646  */
6535      break;
6536  
6537 <  case 691:
6538 <
8061 < /* Line 1806 of yacc.c  */
8062 < #line 3668 "ircd_parser.y"
6537 >  case 655:
6538 > #line 3063 "conf_parser.y" /* yacc.c:1646  */
6539      {
6540    if (conf_parser_ctx.pass == 2)
6541    {
6542 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6542 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6543      {
6544 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6544 >      event_write_links_file.when = (yyvsp[-1].number);
6545 >      event_addish(&event_write_links_file, NULL);
6546        ConfigServerHide.links_disabled = 0;
6547      }
6548  
6549 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6549 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6550    }
6551   }
6552 + #line 6553 "conf_parser.c" /* yacc.c:1646  */
6553      break;
6554  
6555 <  case 692:
6556 <
8079 < /* Line 1806 of yacc.c  */
8080 < #line 3682 "ircd_parser.y"
6555 >  case 656:
6556 > #line 3078 "conf_parser.y" /* yacc.c:1646  */
6557      {
6558    if (conf_parser_ctx.pass == 2)
6559      ConfigServerHide.hidden = yylval.number;
6560   }
6561 + #line 6562 "conf_parser.c" /* yacc.c:1646  */
6562      break;
6563  
6564 <  case 693:
6565 <
8089 < /* Line 1806 of yacc.c  */
8090 < #line 3688 "ircd_parser.y"
8091 <    {
8092 <  if (conf_parser_ctx.pass == 2)
8093 <    ConfigServerHide.disable_hidden = yylval.number;
8094 < }
8095 <    break;
8096 <
8097 <  case 694:
8098 <
8099 < /* Line 1806 of yacc.c  */
8100 < #line 3694 "ircd_parser.y"
6564 >  case 657:
6565 > #line 3084 "conf_parser.y" /* yacc.c:1646  */
6566      {
6567    if (conf_parser_ctx.pass == 2)
6568      ConfigServerHide.hide_server_ips = yylval.number;
6569   }
6570 + #line 6571 "conf_parser.c" /* yacc.c:1646  */
6571      break;
6572  
6573  
6574 <
8109 < /* Line 1806 of yacc.c  */
8110 < #line 8111 "ircd_parser.c"
6574 > #line 6575 "conf_parser.c" /* yacc.c:1646  */
6575        default: break;
6576      }
6577    /* User semantic actions sometimes alter yychar, and that requires
# Line 8129 | Line 6593 | yyreduce:
6593  
6594    *++yyvsp = yyval;
6595  
6596 <  /* Now `shift' the result of the reduction.  Determine what state
6596 >  /* Now 'shift' the result of the reduction.  Determine what state
6597       that goes to, based on the state we popped back to and the rule
6598       number reduced by.  */
6599  
# Line 8144 | Line 6608 | yyreduce:
6608    goto yynewstate;
6609  
6610  
6611 < /*------------------------------------.
6612 < | yyerrlab -- here on detecting error |
6613 < `------------------------------------*/
6611 > /*--------------------------------------.
6612 > | yyerrlab -- here on detecting error.  |
6613 > `--------------------------------------*/
6614   yyerrlab:
6615    /* Make sure we have latest lookahead translation.  See comments at
6616       user semantic actions for why this is necessary.  */
# Line 8197 | Line 6661 | yyerrlab:
6661    if (yyerrstatus == 3)
6662      {
6663        /* If just tried and failed to reuse lookahead token after an
6664 <         error, discard it.  */
6664 >         error, discard it.  */
6665  
6666        if (yychar <= YYEOF)
6667 <        {
6668 <          /* Return failure if at end of input.  */
6669 <          if (yychar == YYEOF)
6670 <            YYABORT;
6671 <        }
6667 >        {
6668 >          /* Return failure if at end of input.  */
6669 >          if (yychar == YYEOF)
6670 >            YYABORT;
6671 >        }
6672        else
6673 <        {
6674 <          yydestruct ("Error: discarding",
6675 <                      yytoken, &yylval);
6676 <          yychar = YYEMPTY;
6677 <        }
6673 >        {
6674 >          yydestruct ("Error: discarding",
6675 >                      yytoken, &yylval);
6676 >          yychar = YYEMPTY;
6677 >        }
6678      }
6679  
6680    /* Else will try to reuse lookahead token after shifting the error
# Line 8229 | Line 6693 | yyerrorlab:
6693    if (/*CONSTCOND*/ 0)
6694       goto yyerrorlab;
6695  
6696 <  /* Do not reclaim the symbols of the rule which action triggered
6696 >  /* Do not reclaim the symbols of the rule whose action triggered
6697       this YYERROR.  */
6698    YYPOPSTACK (yylen);
6699    yylen = 0;
# Line 8242 | Line 6706 | yyerrorlab:
6706   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6707   `-------------------------------------------------------------*/
6708   yyerrlab1:
6709 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6709 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6710  
6711    for (;;)
6712      {
6713        yyn = yypact[yystate];
6714        if (!yypact_value_is_default (yyn))
6715 <        {
6716 <          yyn += YYTERROR;
6717 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6718 <            {
6719 <              yyn = yytable[yyn];
6720 <              if (0 < yyn)
6721 <                break;
6722 <            }
6723 <        }
6715 >        {
6716 >          yyn += YYTERROR;
6717 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6718 >            {
6719 >              yyn = yytable[yyn];
6720 >              if (0 < yyn)
6721 >                break;
6722 >            }
6723 >        }
6724  
6725        /* Pop the current state because it cannot handle the error token.  */
6726        if (yyssp == yyss)
6727 <        YYABORT;
6727 >        YYABORT;
6728  
6729  
6730        yydestruct ("Error: popping",
6731 <                  yystos[yystate], yyvsp);
6731 >                  yystos[yystate], yyvsp);
6732        YYPOPSTACK (1);
6733        yystate = *yyssp;
6734        YY_STACK_PRINT (yyss, yyssp);
6735      }
6736  
6737 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6738    *++yyvsp = yylval;
6739 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6740  
6741  
6742    /* Shift the error token.  */
# Line 8294 | Line 6760 | yyabortlab:
6760    yyresult = 1;
6761    goto yyreturn;
6762  
6763 < #if !defined(yyoverflow) || YYERROR_VERBOSE
6763 > #if !defined yyoverflow || YYERROR_VERBOSE
6764   /*-------------------------------------------------.
6765   | yyexhaustedlab -- memory exhaustion comes here.  |
6766   `-------------------------------------------------*/
# Line 8313 | Line 6779 | yyreturn:
6779        yydestruct ("Cleanup: discarding lookahead",
6780                    yytoken, &yylval);
6781      }
6782 <  /* Do not reclaim the symbols of the rule which action triggered
6782 >  /* Do not reclaim the symbols of the rule whose action triggered
6783       this YYABORT or YYACCEPT.  */
6784    YYPOPSTACK (yylen);
6785    YY_STACK_PRINT (yyss, yyssp);
6786    while (yyssp != yyss)
6787      {
6788        yydestruct ("Cleanup: popping",
6789 <                  yystos[*yyssp], yyvsp);
6789 >                  yystos[*yyssp], yyvsp);
6790        YYPOPSTACK (1);
6791      }
6792   #ifndef yyoverflow
# Line 8331 | Line 6797 | yyreturn:
6797    if (yymsg != yymsgbuf)
6798      YYSTACK_FREE (yymsg);
6799   #endif
6800 <  /* Make sure YYID is used.  */
8335 <  return YYID (yyresult);
6800 >  return yyresult;
6801   }
8337
8338
8339

Comparing:
ircd-hybrid-8/src/ircd_parser.c (property svn:keywords), Revision 1216 by michael, Tue Sep 13 18:22:31 2011 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (property svn:keywords), Revision 4499 by michael, Sat Aug 16 18:29:23 2014 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)