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 6162 by michael, Thu Jun 18 10:56:46 2015 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.4.  */
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-2015 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.4"
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  
72 #define YY_NO_UNPUT
68   #include <sys/types.h>
69   #include <string.h>
70  
# Line 77 | Line 72
72   #include "stdinc.h"
73   #include "ircd.h"
74   #include "list.h"
75 < #include "s_conf.h"
75 > #include "conf.h"
76 > #include "conf_class.h"
77 > #include "conf_pseudo.h"
78   #include "event.h"
79 < #include "s_log.h"
79 > #include "id.h"
80 > #include "log.h"
81   #include "client.h"     /* for UMODE_ALL only */
82   #include "irc_string.h"
85 #include "sprintf_irc.h"
83   #include "memory.h"
84   #include "modules.h"
85 < #include "s_serv.h"
85 > #include "server.h"
86   #include "hostmask.h"
87   #include "send.h"
88   #include "listener.h"
89   #include "resv.h"
90   #include "numeric.h"
91 < #include "s_user.h"
91 > #include "user.h"
92 > #include "motd.h"
93  
94   #ifdef HAVE_LIBCRYPTO
95   #include <openssl/rsa.h>
96   #include <openssl/bio.h>
97   #include <openssl/pem.h>
98 + #include <openssl/dh.h>
99   #endif
100  
101 < 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;
101 > #include "rsa.h"
102  
103 < 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 < };
103 > int yylex(void);
104  
105 < static void
139 < free_collect_item(struct CollectItem *item)
105 > static struct
106   {
107 <  MyFree(item->name);
108 <  MyFree(item->user);
109 <  MyFree(item->host);
110 <  MyFree(item->passwd);
111 < #ifdef HAVE_LIBCRYPTO
112 <  MyFree(item->rsa_public_key_file);
113 < #endif
114 <  MyFree(item);
115 < }
107 >  struct
108 >  {
109 >    dlink_list list;
110 >  } mask,
111 >    leaf,
112 >    hub;
113 >
114 >  struct
115 >  {
116 >    char buf[IRCD_BUFSIZE];
117 >  } name,
118 >    nick,
119 >    user,
120 >    host,
121 >    addr,
122 >    bind,
123 >    file,
124 >    ciph,
125 >    cert,
126 >    rpass,
127 >    spass,
128 >    whois,
129 >    class,
130 >    target,
131 >    prepend,
132 >    command;
133 >
134 >  struct
135 >  {
136 >    unsigned int value;
137 >  } flags,
138 >    modes,
139 >    size,
140 >    type,
141 >    port,
142 >    aftype,
143 >    ping_freq,
144 >    max_perip,
145 >    con_freq,
146 >    min_idle,
147 >    max_idle,
148 >    max_total,
149 >    max_global,
150 >    max_local,
151 >    max_ident,
152 >    max_sendq,
153 >    max_recvq,
154 >    max_channels,
155 >    cidr_bitlen_ipv4,
156 >    cidr_bitlen_ipv6,
157 >    number_per_cidr;
158 > } block_state;
159  
160   static void
161 < unhook_hub_leaf_confs(void)
161 > reset_block_state(void)
162   {
163 <  dlink_node *ptr;
155 <  dlink_node *next_ptr;
156 <  struct CollectItem *yy_hconf;
157 <  struct CollectItem *yy_lconf;
163 >  dlink_node *node = NULL, *node_next = NULL;
164  
165 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
165 >  DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
166    {
167 <    yy_hconf = ptr->data;
168 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
169 <    free_collect_item(yy_hconf);
167 >    MyFree(node->data);
168 >    dlinkDelete(node, &block_state.mask.list);
169 >    free_dlink_node(node);
170    }
171  
172 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
172 >  DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
173    {
174 <    yy_lconf = ptr->data;
175 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
176 <    free_collect_item(yy_lconf);
174 >    MyFree(node->data);
175 >    dlinkDelete(node, &block_state.leaf.list);
176 >    free_dlink_node(node);
177    }
172 }
178  
179 +  DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
180 +  {
181 +    MyFree(node->data);
182 +    dlinkDelete(node, &block_state.hub.list);
183 +    free_dlink_node(node);
184 +  }
185  
186 +  memset(&block_state, 0, sizeof(block_state));
187 + }
188  
176 /* Line 268 of yacc.c  */
177 #line 178 "ircd_parser.c"
189  
190 < /* Enabling traces.  */
191 < #ifndef YYDEBUG
192 < # define YYDEBUG 0
193 < #endif
190 > #line 191 "conf_parser.c" /* yacc.c:339  */
191 >
192 > # ifndef YY_NULLPTR
193 > #  if defined __cplusplus && 201103L <= __cplusplus
194 > #   define YY_NULLPTR nullptr
195 > #  else
196 > #   define YY_NULLPTR 0
197 > #  endif
198 > # endif
199  
200   /* Enabling verbose error messages.  */
201   #ifdef YYERROR_VERBOSE
# Line 189 | Line 205 | unhook_hub_leaf_confs(void)
205   # define YYERROR_VERBOSE 0
206   #endif
207  
208 < /* Enabling the token table.  */
209 < #ifndef YYTOKEN_TABLE
210 < # define YYTOKEN_TABLE 0
208 > /* In a future release of Bison, this section will be replaced
209 >   by #include "y.tab.h".  */
210 > #ifndef YY_YY_CONF_PARSER_H_INCLUDED
211 > # define YY_YY_CONF_PARSER_H_INCLUDED
212 > /* Debug traces.  */
213 > #ifndef YYDEBUG
214 > # define YYDEBUG 0
215 > #endif
216 > #if YYDEBUG
217 > extern int yydebug;
218   #endif
219  
220 <
198 < /* Tokens.  */
220 > /* Token type.  */
221   #ifndef YYTOKENTYPE
222   # define YYTOKENTYPE
223 <   /* Put the tokens into the symbol table, so that GDB and other debuggers
224 <      know about them.  */
225 <   enum yytokentype {
226 <     ACCEPT_PASSWORD = 258,
227 <     ACTION = 259,
228 <     ADMIN = 260,
229 <     AFTYPE = 261,
230 <     T_ALLOW = 262,
231 <     ANTI_NICK_FLOOD = 263,
232 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
233 <     AUTOCONN = 265,
234 <     T_BLOCK = 266,
235 <     BURST_AWAY = 267,
236 <     BURST_TOPICWHO = 268,
237 <     BYTES = 269,
238 <     KBYTES = 270,
239 <     MBYTES = 271,
240 <     GBYTES = 272,
241 <     TBYTES = 273,
242 <     CALLER_ID_WAIT = 274,
243 <     CAN_FLOOD = 275,
244 <     CHANNEL = 276,
245 <     CIDR_BITLEN_IPV4 = 277,
246 <     CIDR_BITLEN_IPV6 = 278,
247 <     CIPHER_PREFERENCE = 279,
248 <     CLASS = 280,
249 <     COMPRESSED = 281,
250 <     COMPRESSION_LEVEL = 282,
251 <     CONNECT = 283,
252 <     CONNECTFREQ = 284,
253 <     CRYPTLINK = 285,
254 <     DEFAULT_CIPHER_PREFERENCE = 286,
255 <     DEFAULT_FLOODCOUNT = 287,
256 <     DEFAULT_SPLIT_SERVER_COUNT = 288,
257 <     DEFAULT_SPLIT_USER_COUNT = 289,
258 <     DENY = 290,
259 <     DESCRIPTION = 291,
260 <     DIE = 292,
261 <     DISABLE_AUTH = 293,
262 <     DISABLE_FAKE_CHANNELS = 294,
263 <     DISABLE_HIDDEN = 295,
264 <     DISABLE_LOCAL_CHANNELS = 296,
265 <     DISABLE_REMOTE_COMMANDS = 297,
266 <     DOTS_IN_IDENT = 298,
267 <     DURATION = 299,
268 <     EGDPOOL_PATH = 300,
269 <     EMAIL = 301,
270 <     ENABLE = 302,
271 <     ENCRYPTED = 303,
272 <     EXCEED_LIMIT = 304,
273 <     EXEMPT = 305,
274 <     FAILED_OPER_NOTICE = 306,
275 <     IRCD_FLAGS = 307,
276 <     FLATTEN_LINKS = 308,
277 <     FFAILED_OPERLOG = 309,
278 <     FKILLLOG = 310,
279 <     FKLINELOG = 311,
280 <     FGLINELOG = 312,
281 <     FIOERRLOG = 313,
282 <     FOPERLOG = 314,
283 <     FOPERSPYLOG = 315,
284 <     FUSERLOG = 316,
285 <     GECOS = 317,
286 <     GENERAL = 318,
287 <     GLINE = 319,
288 <     GLINES = 320,
289 <     GLINE_EXEMPT = 321,
290 <     GLINE_LOG = 322,
291 <     GLINE_TIME = 323,
292 <     GLINE_MIN_CIDR = 324,
293 <     GLINE_MIN_CIDR6 = 325,
294 <     GLOBAL_KILL = 326,
295 <     IRCD_AUTH = 327,
296 <     NEED_IDENT = 328,
297 <     HAVENT_READ_CONF = 329,
298 <     HIDDEN = 330,
299 <     HIDDEN_ADMIN = 331,
300 <     HIDDEN_NAME = 332,
301 <     HIDDEN_OPER = 333,
302 <     HIDE_SERVER_IPS = 334,
303 <     HIDE_SERVERS = 335,
304 <     HIDE_SPOOF_IPS = 336,
305 <     HOST = 337,
306 <     HUB = 338,
307 <     HUB_MASK = 339,
308 <     IGNORE_BOGUS_TS = 340,
309 <     INVISIBLE_ON_CONNECT = 341,
310 <     IP = 342,
311 <     KILL = 343,
312 <     KILL_CHASE_TIME_LIMIT = 344,
313 <     KLINE = 345,
314 <     KLINE_EXEMPT = 346,
315 <     KLINE_REASON = 347,
316 <     KLINE_WITH_REASON = 348,
317 <     KNOCK_DELAY = 349,
318 <     KNOCK_DELAY_CHANNEL = 350,
319 <     LEAF_MASK = 351,
320 <     LINKS_DELAY = 352,
321 <     LISTEN = 353,
322 <     T_LOG = 354,
323 <     LOGGING = 355,
324 <     LOG_LEVEL = 356,
325 <     MAX_ACCEPT = 357,
326 <     MAX_BANS = 358,
327 <     MAX_CHANS_PER_USER = 359,
328 <     MAX_GLOBAL = 360,
329 <     MAX_IDENT = 361,
330 <     MAX_LOCAL = 362,
331 <     MAX_NICK_CHANGES = 363,
332 <     MAX_NICK_TIME = 364,
333 <     MAX_NUMBER = 365,
334 <     MAX_TARGETS = 366,
335 <     MAX_WATCH = 367,
336 <     MESSAGE_LOCALE = 368,
337 <     MIN_NONWILDCARD = 369,
338 <     MIN_NONWILDCARD_SIMPLE = 370,
339 <     MODULE = 371,
340 <     MODULES = 372,
341 <     NAME = 373,
342 <     NEED_PASSWORD = 374,
343 <     NETWORK_DESC = 375,
344 <     NETWORK_NAME = 376,
345 <     NICK = 377,
346 <     NICK_CHANGES = 378,
347 <     NO_CREATE_ON_SPLIT = 379,
348 <     NO_JOIN_ON_SPLIT = 380,
349 <     NO_OPER_FLOOD = 381,
350 <     NO_TILDE = 382,
351 <     NOT = 383,
352 <     NUMBER = 384,
353 <     NUMBER_PER_IDENT = 385,
354 <     NUMBER_PER_CIDR = 386,
355 <     NUMBER_PER_IP = 387,
356 <     NUMBER_PER_IP_GLOBAL = 388,
357 <     OPERATOR = 389,
358 <     OPERS_BYPASS_CALLERID = 390,
359 <     OPER_LOG = 391,
360 <     OPER_ONLY_UMODES = 392,
361 <     OPER_PASS_RESV = 393,
362 <     OPER_SPY_T = 394,
363 <     OPER_UMODES = 395,
364 <     JOIN_FLOOD_COUNT = 396,
365 <     JOIN_FLOOD_TIME = 397,
366 <     PACE_WAIT = 398,
367 <     PACE_WAIT_SIMPLE = 399,
368 <     PASSWORD = 400,
369 <     PATH = 401,
370 <     PING_COOKIE = 402,
371 <     PING_TIME = 403,
372 <     PING_WARNING = 404,
373 <     PORT = 405,
374 <     QSTRING = 406,
375 <     QUIET_ON_BAN = 407,
376 <     REASON = 408,
377 <     REDIRPORT = 409,
378 <     REDIRSERV = 410,
379 <     REGEX_T = 411,
380 <     REHASH = 412,
381 <     TREJECT_HOLD_TIME = 413,
382 <     REMOTE = 414,
383 <     REMOTEBAN = 415,
384 <     RESTRICT_CHANNELS = 416,
385 <     RESTRICTED = 417,
386 <     RSA_PRIVATE_KEY_FILE = 418,
387 <     RSA_PUBLIC_KEY_FILE = 419,
388 <     SSL_CERTIFICATE_FILE = 420,
389 <     T_SSL_CONNECTION_METHOD = 421,
390 <     T_SSLV3 = 422,
391 <     T_TLSV1 = 423,
392 <     RESV = 424,
393 <     RESV_EXEMPT = 425,
394 <     SECONDS = 426,
395 <     MINUTES = 427,
396 <     HOURS = 428,
397 <     DAYS = 429,
398 <     WEEKS = 430,
399 <     SENDQ = 431,
400 <     SEND_PASSWORD = 432,
401 <     SERVERHIDE = 433,
402 <     SERVERINFO = 434,
403 <     SERVLINK_PATH = 435,
404 <     IRCD_SID = 436,
405 <     TKLINE_EXPIRE_NOTICES = 437,
406 <     T_SHARED = 438,
407 <     T_CLUSTER = 439,
408 <     TYPE = 440,
409 <     SHORT_MOTD = 441,
410 <     SILENT = 442,
411 <     SPOOF = 443,
412 <     SPOOF_NOTICE = 444,
413 <     STATS_E_DISABLED = 445,
414 <     STATS_I_OPER_ONLY = 446,
415 <     STATS_K_OPER_ONLY = 447,
416 <     STATS_O_OPER_ONLY = 448,
417 <     STATS_P_OPER_ONLY = 449,
418 <     TBOOL = 450,
419 <     TMASKED = 451,
420 <     T_REJECT = 452,
421 <     TS_MAX_DELTA = 453,
422 <     TS_WARN_DELTA = 454,
423 <     TWODOTS = 455,
424 <     T_ALL = 456,
425 <     T_BOTS = 457,
426 <     T_SOFTCALLERID = 458,
427 <     T_CALLERID = 459,
428 <     T_CCONN = 460,
429 <     T_CCONN_FULL = 461,
430 <     T_CLIENT_FLOOD = 462,
431 <     T_DEAF = 463,
432 <     T_DEBUG = 464,
433 <     T_DRONE = 465,
434 <     T_EXTERNAL = 466,
435 <     T_FULL = 467,
436 <     T_INVISIBLE = 468,
437 <     T_IPV4 = 469,
438 <     T_IPV6 = 470,
439 <     T_LOCOPS = 471,
440 <     T_LOGPATH = 472,
441 <     T_L_CRIT = 473,
442 <     T_L_DEBUG = 474,
443 <     T_L_ERROR = 475,
444 <     T_L_INFO = 476,
445 <     T_L_NOTICE = 477,
446 <     T_L_TRACE = 478,
447 <     T_L_WARN = 479,
448 <     T_MAX_CLIENTS = 480,
449 <     T_NCHANGE = 481,
450 <     T_OPERWALL = 482,
451 <     T_REJ = 483,
430 <     T_SERVER = 484,
431 <     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 <   };
223 >  enum yytokentype
224 >  {
225 >    ACCEPT_PASSWORD = 258,
226 >    ADMIN = 259,
227 >    AFTYPE = 260,
228 >    ANTI_NICK_FLOOD = 261,
229 >    ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
230 >    AUTOCONN = 263,
231 >    AWAY_COUNT = 264,
232 >    AWAY_TIME = 265,
233 >    BYTES = 266,
234 >    KBYTES = 267,
235 >    MBYTES = 268,
236 >    CALLER_ID_WAIT = 269,
237 >    CAN_FLOOD = 270,
238 >    CHANNEL = 271,
239 >    CIDR_BITLEN_IPV4 = 272,
240 >    CIDR_BITLEN_IPV6 = 273,
241 >    CLASS = 274,
242 >    CONNECT = 275,
243 >    CONNECTFREQ = 276,
244 >    CYCLE_ON_HOST_CHANGE = 277,
245 >    DEFAULT_FLOODCOUNT = 278,
246 >    DEFAULT_JOIN_FLOOD_COUNT = 279,
247 >    DEFAULT_JOIN_FLOOD_TIME = 280,
248 >    DEFAULT_MAX_CLIENTS = 281,
249 >    DEFAULT_SPLIT_SERVER_COUNT = 282,
250 >    DEFAULT_SPLIT_USER_COUNT = 283,
251 >    DENY = 284,
252 >    DESCRIPTION = 285,
253 >    DIE = 286,
254 >    DISABLE_AUTH = 287,
255 >    DISABLE_FAKE_CHANNELS = 288,
256 >    DISABLE_REMOTE_COMMANDS = 289,
257 >    DLINE_MIN_CIDR = 290,
258 >    DLINE_MIN_CIDR6 = 291,
259 >    DOTS_IN_IDENT = 292,
260 >    EMAIL = 293,
261 >    ENCRYPTED = 294,
262 >    EXCEED_LIMIT = 295,
263 >    EXEMPT = 296,
264 >    FAILED_OPER_NOTICE = 297,
265 >    FLATTEN_LINKS = 298,
266 >    GECOS = 299,
267 >    GENERAL = 300,
268 >    HIDDEN = 301,
269 >    HIDDEN_NAME = 302,
270 >    HIDE_CHANS = 303,
271 >    HIDE_IDLE = 304,
272 >    HIDE_IDLE_FROM_OPERS = 305,
273 >    HIDE_SERVER_IPS = 306,
274 >    HIDE_SERVERS = 307,
275 >    HIDE_SERVICES = 308,
276 >    HOST = 309,
277 >    HUB = 310,
278 >    HUB_MASK = 311,
279 >    IGNORE_BOGUS_TS = 312,
280 >    INVISIBLE_ON_CONNECT = 313,
281 >    INVITE_CLIENT_COUNT = 314,
282 >    INVITE_CLIENT_TIME = 315,
283 >    IP = 316,
284 >    IRCD_AUTH = 317,
285 >    IRCD_FLAGS = 318,
286 >    IRCD_SID = 319,
287 >    KILL = 320,
288 >    KILL_CHASE_TIME_LIMIT = 321,
289 >    KLINE = 322,
290 >    KLINE_EXEMPT = 323,
291 >    KLINE_MIN_CIDR = 324,
292 >    KLINE_MIN_CIDR6 = 325,
293 >    KNOCK_CLIENT_COUNT = 326,
294 >    KNOCK_CLIENT_TIME = 327,
295 >    KNOCK_DELAY_CHANNEL = 328,
296 >    LEAF_MASK = 329,
297 >    LINKS_DELAY = 330,
298 >    LISTEN = 331,
299 >    MASK = 332,
300 >    MAX_ACCEPT = 333,
301 >    MAX_BANS = 334,
302 >    MAX_CHANNELS = 335,
303 >    MAX_GLOBAL = 336,
304 >    MAX_IDENT = 337,
305 >    MAX_IDLE = 338,
306 >    MAX_LOCAL = 339,
307 >    MAX_NICK_CHANGES = 340,
308 >    MAX_NICK_LENGTH = 341,
309 >    MAX_NICK_TIME = 342,
310 >    MAX_NUMBER = 343,
311 >    MAX_TARGETS = 344,
312 >    MAX_TOPIC_LENGTH = 345,
313 >    MAX_WATCH = 346,
314 >    MIN_IDLE = 347,
315 >    MIN_NONWILDCARD = 348,
316 >    MIN_NONWILDCARD_SIMPLE = 349,
317 >    MODULE = 350,
318 >    MODULES = 351,
319 >    MOTD = 352,
320 >    NAME = 353,
321 >    NEED_IDENT = 354,
322 >    NEED_PASSWORD = 355,
323 >    NETWORK_DESC = 356,
324 >    NETWORK_NAME = 357,
325 >    NICK = 358,
326 >    NO_CREATE_ON_SPLIT = 359,
327 >    NO_JOIN_ON_SPLIT = 360,
328 >    NO_OPER_FLOOD = 361,
329 >    NO_TILDE = 362,
330 >    NUMBER = 363,
331 >    NUMBER_PER_CIDR = 364,
332 >    NUMBER_PER_IP = 365,
333 >    OPER_ONLY_UMODES = 366,
334 >    OPER_PASS_RESV = 367,
335 >    OPER_UMODES = 368,
336 >    OPERATOR = 369,
337 >    OPERS_BYPASS_CALLERID = 370,
338 >    PACE_WAIT = 371,
339 >    PACE_WAIT_SIMPLE = 372,
340 >    PASSWORD = 373,
341 >    PATH = 374,
342 >    PING_COOKIE = 375,
343 >    PING_TIME = 376,
344 >    PORT = 377,
345 >    QSTRING = 378,
346 >    RANDOM_IDLE = 379,
347 >    REASON = 380,
348 >    REDIRPORT = 381,
349 >    REDIRSERV = 382,
350 >    REHASH = 383,
351 >    REMOTE = 384,
352 >    REMOTEBAN = 385,
353 >    RESV = 386,
354 >    RESV_EXEMPT = 387,
355 >    RSA_PRIVATE_KEY_FILE = 388,
356 >    RSA_PUBLIC_KEY_FILE = 389,
357 >    SECONDS = 390,
358 >    MINUTES = 391,
359 >    HOURS = 392,
360 >    DAYS = 393,
361 >    WEEKS = 394,
362 >    MONTHS = 395,
363 >    YEARS = 396,
364 >    SEND_PASSWORD = 397,
365 >    SENDQ = 398,
366 >    SERVERHIDE = 399,
367 >    SERVERINFO = 400,
368 >    SHORT_MOTD = 401,
369 >    SPOOF = 402,
370 >    SPOOF_NOTICE = 403,
371 >    SQUIT = 404,
372 >    SSL_CERTIFICATE_FILE = 405,
373 >    SSL_CERTIFICATE_FINGERPRINT = 406,
374 >    SSL_CONNECTION_REQUIRED = 407,
375 >    SSL_DH_ELLIPTIC_CURVE = 408,
376 >    SSL_DH_PARAM_FILE = 409,
377 >    SSL_MESSAGE_DIGEST_ALGORITHM = 410,
378 >    STATS_E_DISABLED = 411,
379 >    STATS_I_OPER_ONLY = 412,
380 >    STATS_K_OPER_ONLY = 413,
381 >    STATS_M_OPER_ONLY = 414,
382 >    STATS_O_OPER_ONLY = 415,
383 >    STATS_P_OPER_ONLY = 416,
384 >    STATS_U_OPER_ONLY = 417,
385 >    T_ALL = 418,
386 >    T_BOTS = 419,
387 >    T_CALLERID = 420,
388 >    T_CCONN = 421,
389 >    T_COMMAND = 422,
390 >    T_CLUSTER = 423,
391 >    T_DEAF = 424,
392 >    T_DEBUG = 425,
393 >    T_DLINE = 426,
394 >    T_EXTERNAL = 427,
395 >    T_FARCONNECT = 428,
396 >    T_FILE = 429,
397 >    T_FULL = 430,
398 >    T_GLOBOPS = 431,
399 >    T_INVISIBLE = 432,
400 >    T_IPV4 = 433,
401 >    T_IPV6 = 434,
402 >    T_LOCOPS = 435,
403 >    T_LOG = 436,
404 >    T_NCHANGE = 437,
405 >    T_NONONREG = 438,
406 >    T_OPME = 439,
407 >    T_PREPEND = 440,
408 >    T_PSEUDO = 441,
409 >    T_RECVQ = 442,
410 >    T_REJ = 443,
411 >    T_RESTART = 444,
412 >    T_SERVER = 445,
413 >    T_SERVICE = 446,
414 >    T_SERVNOTICE = 447,
415 >    T_SET = 448,
416 >    T_SHARED = 449,
417 >    T_SIZE = 450,
418 >    T_SKILL = 451,
419 >    T_SOFTCALLERID = 452,
420 >    T_SPY = 453,
421 >    T_SSL = 454,
422 >    T_SSL_CIPHER_LIST = 455,
423 >    T_TARGET = 456,
424 >    T_UMODES = 457,
425 >    T_UNAUTH = 458,
426 >    T_UNDLINE = 459,
427 >    T_UNLIMITED = 460,
428 >    T_UNRESV = 461,
429 >    T_UNXLINE = 462,
430 >    T_WALLOP = 463,
431 >    T_WALLOPS = 464,
432 >    T_WEBIRC = 465,
433 >    TBOOL = 466,
434 >    THROTTLE_COUNT = 467,
435 >    THROTTLE_TIME = 468,
436 >    TKLINE_EXPIRE_NOTICES = 469,
437 >    TMASKED = 470,
438 >    TS_MAX_DELTA = 471,
439 >    TS_WARN_DELTA = 472,
440 >    TWODOTS = 473,
441 >    TYPE = 474,
442 >    UNKLINE = 475,
443 >    USE_LOGGING = 476,
444 >    USER = 477,
445 >    VHOST = 478,
446 >    VHOST6 = 479,
447 >    WARN_NO_CONNECT_BLOCK = 480,
448 >    WHOIS = 481,
449 >    XLINE = 482,
450 >    XLINE_EXEMPT = 483
451 >  };
452   #endif
453   /* Tokens.  */
454   #define ACCEPT_PASSWORD 258
455 < #define ACTION 259
456 < #define ADMIN 260
457 < #define AFTYPE 261
458 < #define T_ALLOW 262
459 < #define ANTI_NICK_FLOOD 263
460 < #define ANTI_SPAM_EXIT_MESSAGE_TIME 264
461 < #define AUTOCONN 265
462 < #define T_BLOCK 266
463 < #define BURST_AWAY 267
464 < #define BURST_TOPICWHO 268
465 < #define BYTES 269
466 < #define KBYTES 270
467 < #define MBYTES 271
468 < #define GBYTES 272
469 < #define TBYTES 273
470 < #define CALLER_ID_WAIT 274
471 < #define CAN_FLOOD 275
472 < #define CHANNEL 276
473 < #define CIDR_BITLEN_IPV4 277
474 < #define CIDR_BITLEN_IPV6 278
475 < #define CIPHER_PREFERENCE 279
476 < #define CLASS 280
477 < #define COMPRESSED 281
478 < #define COMPRESSION_LEVEL 282
479 < #define CONNECT 283
480 < #define CONNECTFREQ 284
481 < #define CRYPTLINK 285
482 < #define DEFAULT_CIPHER_PREFERENCE 286
483 < #define DEFAULT_FLOODCOUNT 287
484 < #define DEFAULT_SPLIT_SERVER_COUNT 288
485 < #define DEFAULT_SPLIT_USER_COUNT 289
486 < #define DENY 290
487 < #define DESCRIPTION 291
488 < #define DIE 292
489 < #define DISABLE_AUTH 293
490 < #define DISABLE_FAKE_CHANNELS 294
491 < #define DISABLE_HIDDEN 295
492 < #define DISABLE_LOCAL_CHANNELS 296
493 < #define DISABLE_REMOTE_COMMANDS 297
494 < #define DOTS_IN_IDENT 298
495 < #define DURATION 299
496 < #define EGDPOOL_PATH 300
497 < #define EMAIL 301
498 < #define ENABLE 302
499 < #define ENCRYPTED 303
500 < #define EXCEED_LIMIT 304
501 < #define EXEMPT 305
502 < #define FAILED_OPER_NOTICE 306
503 < #define IRCD_FLAGS 307
504 < #define FLATTEN_LINKS 308
505 < #define FFAILED_OPERLOG 309
506 < #define FKILLLOG 310
507 < #define FKLINELOG 311
508 < #define FGLINELOG 312
509 < #define FIOERRLOG 313
510 < #define FOPERLOG 314
511 < #define FOPERSPYLOG 315
512 < #define FUSERLOG 316
513 < #define GECOS 317
514 < #define GENERAL 318
515 < #define GLINE 319
516 < #define GLINES 320
517 < #define GLINE_EXEMPT 321
518 < #define GLINE_LOG 322
519 < #define GLINE_TIME 323
520 < #define GLINE_MIN_CIDR 324
521 < #define GLINE_MIN_CIDR6 325
522 < #define GLOBAL_KILL 326
523 < #define IRCD_AUTH 327
524 < #define NEED_IDENT 328
525 < #define HAVENT_READ_CONF 329
526 < #define HIDDEN 330
527 < #define HIDDEN_ADMIN 331
528 < #define HIDDEN_NAME 332
529 < #define HIDDEN_OPER 333
530 < #define HIDE_SERVER_IPS 334
531 < #define HIDE_SERVERS 335
532 < #define HIDE_SPOOF_IPS 336
533 < #define HOST 337
534 < #define HUB 338
535 < #define HUB_MASK 339
536 < #define IGNORE_BOGUS_TS 340
537 < #define INVISIBLE_ON_CONNECT 341
538 < #define IP 342
539 < #define KILL 343
540 < #define KILL_CHASE_TIME_LIMIT 344
541 < #define KLINE 345
542 < #define KLINE_EXEMPT 346
543 < #define KLINE_REASON 347
544 < #define KLINE_WITH_REASON 348
545 < #define KNOCK_DELAY 349
546 < #define KNOCK_DELAY_CHANNEL 350
547 < #define LEAF_MASK 351
548 < #define LINKS_DELAY 352
549 < #define LISTEN 353
550 < #define T_LOG 354
551 < #define LOGGING 355
552 < #define LOG_LEVEL 356
553 < #define MAX_ACCEPT 357
554 < #define MAX_BANS 358
555 < #define MAX_CHANS_PER_USER 359
556 < #define MAX_GLOBAL 360
557 < #define MAX_IDENT 361
558 < #define MAX_LOCAL 362
559 < #define MAX_NICK_CHANGES 363
560 < #define MAX_NICK_TIME 364
561 < #define MAX_NUMBER 365
562 < #define MAX_TARGETS 366
563 < #define MAX_WATCH 367
564 < #define MESSAGE_LOCALE 368
565 < #define MIN_NONWILDCARD 369
566 < #define MIN_NONWILDCARD_SIMPLE 370
567 < #define MODULE 371
568 < #define MODULES 372
569 < #define NAME 373
570 < #define NEED_PASSWORD 374
571 < #define NETWORK_DESC 375
572 < #define NETWORK_NAME 376
573 < #define NICK 377
574 < #define NICK_CHANGES 378
575 < #define NO_CREATE_ON_SPLIT 379
576 < #define NO_JOIN_ON_SPLIT 380
577 < #define NO_OPER_FLOOD 381
578 < #define NO_TILDE 382
579 < #define NOT 383
580 < #define NUMBER 384
581 < #define NUMBER_PER_IDENT 385
582 < #define NUMBER_PER_CIDR 386
583 < #define NUMBER_PER_IP 387
584 < #define NUMBER_PER_IP_GLOBAL 388
585 < #define OPERATOR 389
586 < #define OPERS_BYPASS_CALLERID 390
587 < #define OPER_LOG 391
588 < #define OPER_ONLY_UMODES 392
589 < #define OPER_PASS_RESV 393
590 < #define OPER_SPY_T 394
591 < #define OPER_UMODES 395
592 < #define JOIN_FLOOD_COUNT 396
593 < #define JOIN_FLOOD_TIME 397
594 < #define PACE_WAIT 398
595 < #define PACE_WAIT_SIMPLE 399
596 < #define PASSWORD 400
597 < #define PATH 401
598 < #define PING_COOKIE 402
599 < #define PING_TIME 403
600 < #define PING_WARNING 404
601 < #define PORT 405
602 < #define QSTRING 406
603 < #define QUIET_ON_BAN 407
604 < #define REASON 408
605 < #define REDIRPORT 409
606 < #define REDIRSERV 410
607 < #define REGEX_T 411
608 < #define REHASH 412
609 < #define TREJECT_HOLD_TIME 413
610 < #define REMOTE 414
611 < #define REMOTEBAN 415
612 < #define RESTRICT_CHANNELS 416
613 < #define RESTRICTED 417
614 < #define RSA_PRIVATE_KEY_FILE 418
615 < #define RSA_PUBLIC_KEY_FILE 419
616 < #define SSL_CERTIFICATE_FILE 420
617 < #define T_SSL_CONNECTION_METHOD 421
618 < #define T_SSLV3 422
619 < #define T_TLSV1 423
620 < #define RESV 424
621 < #define RESV_EXEMPT 425
622 < #define SECONDS 426
623 < #define MINUTES 427
624 < #define HOURS 428
625 < #define DAYS 429
626 < #define WEEKS 430
627 < #define SENDQ 431
628 < #define SEND_PASSWORD 432
629 < #define SERVERHIDE 433
630 < #define SERVERINFO 434
631 < #define SERVLINK_PATH 435
632 < #define IRCD_SID 436
633 < #define TKLINE_EXPIRE_NOTICES 437
634 < #define T_SHARED 438
635 < #define T_CLUSTER 439
636 < #define TYPE 440
637 < #define SHORT_MOTD 441
638 < #define SILENT 442
639 < #define SPOOF 443
640 < #define SPOOF_NOTICE 444
641 < #define STATS_E_DISABLED 445
642 < #define STATS_I_OPER_ONLY 446
643 < #define STATS_K_OPER_ONLY 447
644 < #define STATS_O_OPER_ONLY 448
645 < #define STATS_P_OPER_ONLY 449
646 < #define TBOOL 450
647 < #define TMASKED 451
648 < #define T_REJECT 452
649 < #define TS_MAX_DELTA 453
650 < #define TS_WARN_DELTA 454
651 < #define TWODOTS 455
652 < #define T_ALL 456
653 < #define T_BOTS 457
654 < #define T_SOFTCALLERID 458
655 < #define T_CALLERID 459
656 < #define T_CCONN 460
657 < #define T_CCONN_FULL 461
658 < #define T_CLIENT_FLOOD 462
659 < #define T_DEAF 463
660 < #define T_DEBUG 464
661 < #define T_DRONE 465
662 < #define T_EXTERNAL 466
663 < #define T_FULL 467
664 < #define T_INVISIBLE 468
665 < #define T_IPV4 469
666 < #define T_IPV6 470
667 < #define T_LOCOPS 471
668 < #define T_LOGPATH 472
669 < #define T_L_CRIT 473
670 < #define T_L_DEBUG 474
671 < #define T_L_ERROR 475
672 < #define T_L_INFO 476
673 < #define T_L_NOTICE 477
674 < #define T_L_TRACE 478
675 < #define T_L_WARN 479
676 < #define T_MAX_CLIENTS 480
677 < #define T_NCHANGE 481
678 < #define T_OPERWALL 482
679 < #define T_REJ 483
691 < #define T_SERVER 484
692 < #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 <
455 > #define ADMIN 259
456 > #define AFTYPE 260
457 > #define ANTI_NICK_FLOOD 261
458 > #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
459 > #define AUTOCONN 263
460 > #define AWAY_COUNT 264
461 > #define AWAY_TIME 265
462 > #define BYTES 266
463 > #define KBYTES 267
464 > #define MBYTES 268
465 > #define CALLER_ID_WAIT 269
466 > #define CAN_FLOOD 270
467 > #define CHANNEL 271
468 > #define CIDR_BITLEN_IPV4 272
469 > #define CIDR_BITLEN_IPV6 273
470 > #define CLASS 274
471 > #define CONNECT 275
472 > #define CONNECTFREQ 276
473 > #define CYCLE_ON_HOST_CHANGE 277
474 > #define DEFAULT_FLOODCOUNT 278
475 > #define DEFAULT_JOIN_FLOOD_COUNT 279
476 > #define DEFAULT_JOIN_FLOOD_TIME 280
477 > #define DEFAULT_MAX_CLIENTS 281
478 > #define DEFAULT_SPLIT_SERVER_COUNT 282
479 > #define DEFAULT_SPLIT_USER_COUNT 283
480 > #define DENY 284
481 > #define DESCRIPTION 285
482 > #define DIE 286
483 > #define DISABLE_AUTH 287
484 > #define DISABLE_FAKE_CHANNELS 288
485 > #define DISABLE_REMOTE_COMMANDS 289
486 > #define DLINE_MIN_CIDR 290
487 > #define DLINE_MIN_CIDR6 291
488 > #define DOTS_IN_IDENT 292
489 > #define EMAIL 293
490 > #define ENCRYPTED 294
491 > #define EXCEED_LIMIT 295
492 > #define EXEMPT 296
493 > #define FAILED_OPER_NOTICE 297
494 > #define FLATTEN_LINKS 298
495 > #define GECOS 299
496 > #define GENERAL 300
497 > #define HIDDEN 301
498 > #define HIDDEN_NAME 302
499 > #define HIDE_CHANS 303
500 > #define HIDE_IDLE 304
501 > #define HIDE_IDLE_FROM_OPERS 305
502 > #define HIDE_SERVER_IPS 306
503 > #define HIDE_SERVERS 307
504 > #define HIDE_SERVICES 308
505 > #define HOST 309
506 > #define HUB 310
507 > #define HUB_MASK 311
508 > #define IGNORE_BOGUS_TS 312
509 > #define INVISIBLE_ON_CONNECT 313
510 > #define INVITE_CLIENT_COUNT 314
511 > #define INVITE_CLIENT_TIME 315
512 > #define IP 316
513 > #define IRCD_AUTH 317
514 > #define IRCD_FLAGS 318
515 > #define IRCD_SID 319
516 > #define KILL 320
517 > #define KILL_CHASE_TIME_LIMIT 321
518 > #define KLINE 322
519 > #define KLINE_EXEMPT 323
520 > #define KLINE_MIN_CIDR 324
521 > #define KLINE_MIN_CIDR6 325
522 > #define KNOCK_CLIENT_COUNT 326
523 > #define KNOCK_CLIENT_TIME 327
524 > #define KNOCK_DELAY_CHANNEL 328
525 > #define LEAF_MASK 329
526 > #define LINKS_DELAY 330
527 > #define LISTEN 331
528 > #define MASK 332
529 > #define MAX_ACCEPT 333
530 > #define MAX_BANS 334
531 > #define MAX_CHANNELS 335
532 > #define MAX_GLOBAL 336
533 > #define MAX_IDENT 337
534 > #define MAX_IDLE 338
535 > #define MAX_LOCAL 339
536 > #define MAX_NICK_CHANGES 340
537 > #define MAX_NICK_LENGTH 341
538 > #define MAX_NICK_TIME 342
539 > #define MAX_NUMBER 343
540 > #define MAX_TARGETS 344
541 > #define MAX_TOPIC_LENGTH 345
542 > #define MAX_WATCH 346
543 > #define MIN_IDLE 347
544 > #define MIN_NONWILDCARD 348
545 > #define MIN_NONWILDCARD_SIMPLE 349
546 > #define MODULE 350
547 > #define MODULES 351
548 > #define MOTD 352
549 > #define NAME 353
550 > #define NEED_IDENT 354
551 > #define NEED_PASSWORD 355
552 > #define NETWORK_DESC 356
553 > #define NETWORK_NAME 357
554 > #define NICK 358
555 > #define NO_CREATE_ON_SPLIT 359
556 > #define NO_JOIN_ON_SPLIT 360
557 > #define NO_OPER_FLOOD 361
558 > #define NO_TILDE 362
559 > #define NUMBER 363
560 > #define NUMBER_PER_CIDR 364
561 > #define NUMBER_PER_IP 365
562 > #define OPER_ONLY_UMODES 366
563 > #define OPER_PASS_RESV 367
564 > #define OPER_UMODES 368
565 > #define OPERATOR 369
566 > #define OPERS_BYPASS_CALLERID 370
567 > #define PACE_WAIT 371
568 > #define PACE_WAIT_SIMPLE 372
569 > #define PASSWORD 373
570 > #define PATH 374
571 > #define PING_COOKIE 375
572 > #define PING_TIME 376
573 > #define PORT 377
574 > #define QSTRING 378
575 > #define RANDOM_IDLE 379
576 > #define REASON 380
577 > #define REDIRPORT 381
578 > #define REDIRSERV 382
579 > #define REHASH 383
580 > #define REMOTE 384
581 > #define REMOTEBAN 385
582 > #define RESV 386
583 > #define RESV_EXEMPT 387
584 > #define RSA_PRIVATE_KEY_FILE 388
585 > #define RSA_PUBLIC_KEY_FILE 389
586 > #define SECONDS 390
587 > #define MINUTES 391
588 > #define HOURS 392
589 > #define DAYS 393
590 > #define WEEKS 394
591 > #define MONTHS 395
592 > #define YEARS 396
593 > #define SEND_PASSWORD 397
594 > #define SENDQ 398
595 > #define SERVERHIDE 399
596 > #define SERVERINFO 400
597 > #define SHORT_MOTD 401
598 > #define SPOOF 402
599 > #define SPOOF_NOTICE 403
600 > #define SQUIT 404
601 > #define SSL_CERTIFICATE_FILE 405
602 > #define SSL_CERTIFICATE_FINGERPRINT 406
603 > #define SSL_CONNECTION_REQUIRED 407
604 > #define SSL_DH_ELLIPTIC_CURVE 408
605 > #define SSL_DH_PARAM_FILE 409
606 > #define SSL_MESSAGE_DIGEST_ALGORITHM 410
607 > #define STATS_E_DISABLED 411
608 > #define STATS_I_OPER_ONLY 412
609 > #define STATS_K_OPER_ONLY 413
610 > #define STATS_M_OPER_ONLY 414
611 > #define STATS_O_OPER_ONLY 415
612 > #define STATS_P_OPER_ONLY 416
613 > #define STATS_U_OPER_ONLY 417
614 > #define T_ALL 418
615 > #define T_BOTS 419
616 > #define T_CALLERID 420
617 > #define T_CCONN 421
618 > #define T_COMMAND 422
619 > #define T_CLUSTER 423
620 > #define T_DEAF 424
621 > #define T_DEBUG 425
622 > #define T_DLINE 426
623 > #define T_EXTERNAL 427
624 > #define T_FARCONNECT 428
625 > #define T_FILE 429
626 > #define T_FULL 430
627 > #define T_GLOBOPS 431
628 > #define T_INVISIBLE 432
629 > #define T_IPV4 433
630 > #define T_IPV6 434
631 > #define T_LOCOPS 435
632 > #define T_LOG 436
633 > #define T_NCHANGE 437
634 > #define T_NONONREG 438
635 > #define T_OPME 439
636 > #define T_PREPEND 440
637 > #define T_PSEUDO 441
638 > #define T_RECVQ 442
639 > #define T_REJ 443
640 > #define T_RESTART 444
641 > #define T_SERVER 445
642 > #define T_SERVICE 446
643 > #define T_SERVNOTICE 447
644 > #define T_SET 448
645 > #define T_SHARED 449
646 > #define T_SIZE 450
647 > #define T_SKILL 451
648 > #define T_SOFTCALLERID 452
649 > #define T_SPY 453
650 > #define T_SSL 454
651 > #define T_SSL_CIPHER_LIST 455
652 > #define T_TARGET 456
653 > #define T_UMODES 457
654 > #define T_UNAUTH 458
655 > #define T_UNDLINE 459
656 > #define T_UNLIMITED 460
657 > #define T_UNRESV 461
658 > #define T_UNXLINE 462
659 > #define T_WALLOP 463
660 > #define T_WALLOPS 464
661 > #define T_WEBIRC 465
662 > #define TBOOL 466
663 > #define THROTTLE_COUNT 467
664 > #define THROTTLE_TIME 468
665 > #define TKLINE_EXPIRE_NOTICES 469
666 > #define TMASKED 470
667 > #define TS_MAX_DELTA 471
668 > #define TS_WARN_DELTA 472
669 > #define TWODOTS 473
670 > #define TYPE 474
671 > #define UNKLINE 475
672 > #define USE_LOGGING 476
673 > #define USER 477
674 > #define VHOST 478
675 > #define VHOST6 479
676 > #define WARN_NO_CONNECT_BLOCK 480
677 > #define WHOIS 481
678 > #define XLINE 482
679 > #define XLINE_EXEMPT 483
680  
681 + /* Value type.  */
682   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
728 typedef union YYSTYPE
729 {
683  
684 < /* Line 293 of yacc.c  */
685 < #line 131 "ircd_parser.y"
684 > union YYSTYPE
685 > {
686 > #line 153 "conf_parser.y" /* yacc.c:355  */
687  
688    int number;
689    char *string;
690  
691 + #line 692 "conf_parser.c" /* yacc.c:355  */
692 + };
693  
694 <
739 < /* Line 293 of yacc.c  */
740 < #line 741 "ircd_parser.c"
741 < } YYSTYPE;
694 > typedef union YYSTYPE YYSTYPE;
695   # define YYSTYPE_IS_TRIVIAL 1
743 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
696   # define YYSTYPE_IS_DECLARED 1
697   #endif
698  
699  
700 < /* Copy the second part of user declarations.  */
700 > extern YYSTYPE yylval;
701 >
702 > int yyparse (void);
703  
704 + #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
705  
706 < /* Line 343 of yacc.c  */
707 < #line 753 "ircd_parser.c"
706 > /* Copy the second part of user declarations.  */
707 >
708 > #line 709 "conf_parser.c" /* yacc.c:358  */
709  
710   #ifdef short
711   # undef short
# Line 763 | Line 719 | typedef unsigned char yytype_uint8;
719  
720   #ifdef YYTYPE_INT8
721   typedef YYTYPE_INT8 yytype_int8;
766 #elif (defined __STDC__ || defined __C99__FUNC__ \
767     || defined __cplusplus || defined _MSC_VER)
768 typedef signed char yytype_int8;
722   #else
723 < typedef short int yytype_int8;
723 > typedef signed char yytype_int8;
724   #endif
725  
726   #ifdef YYTYPE_UINT16
# Line 787 | Line 740 | typedef short int yytype_int16;
740   #  define YYSIZE_T __SIZE_TYPE__
741   # elif defined size_t
742   #  define YYSIZE_T size_t
743 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
791 <     || defined __cplusplus || defined _MSC_VER)
743 > # elif ! defined YYSIZE_T
744   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
745   #  define YYSIZE_T size_t
746   # else
# Line 802 | Line 754 | typedef short int yytype_int16;
754   # if defined YYENABLE_NLS && YYENABLE_NLS
755   #  if ENABLE_NLS
756   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
757 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
757 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
758   #  endif
759   # endif
760   # ifndef YY_
761 < #  define YY_(msgid) msgid
761 > #  define YY_(Msgid) Msgid
762 > # endif
763 > #endif
764 >
765 > #ifndef YY_ATTRIBUTE
766 > # if (defined __GNUC__                                               \
767 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
768 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
769 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
770 > # else
771 > #  define YY_ATTRIBUTE(Spec) /* empty */
772 > # endif
773 > #endif
774 >
775 > #ifndef YY_ATTRIBUTE_PURE
776 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
777 > #endif
778 >
779 > #ifndef YY_ATTRIBUTE_UNUSED
780 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
781 > #endif
782 >
783 > #if !defined _Noreturn \
784 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
785 > # if defined _MSC_VER && 1200 <= _MSC_VER
786 > #  define _Noreturn __declspec (noreturn)
787 > # else
788 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
789   # endif
790   #endif
791  
792   /* Suppress unused-variable warnings by "using" E.  */
793   #if ! defined lint || defined __GNUC__
794 < # define YYUSE(e) ((void) (e))
794 > # define YYUSE(E) ((void) (E))
795   #else
796 < # define YYUSE(e) /* empty */
796 > # define YYUSE(E) /* empty */
797   #endif
798  
799 < /* Identity function, used to suppress warnings about constant conditions.  */
800 < #ifndef lint
801 < # define YYID(n) (n)
802 < #else
803 < #if (defined __STDC__ || defined __C99__FUNC__ \
804 <     || defined __cplusplus || defined _MSC_VER)
805 < static int
806 < YYID (int yyi)
799 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
800 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
801 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
802 >    _Pragma ("GCC diagnostic push") \
803 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
804 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
805 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
806 >    _Pragma ("GCC diagnostic pop")
807   #else
808 < static int
830 < YYID (yyi)
831 <    int yyi;
808 > # define YY_INITIAL_VALUE(Value) Value
809   #endif
810 < {
811 <  return yyi;
812 < }
810 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
811 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
812 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
813   #endif
814 + #ifndef YY_INITIAL_VALUE
815 + # define YY_INITIAL_VALUE(Value) /* Nothing. */
816 + #endif
817 +
818  
819   #if ! defined yyoverflow || YYERROR_VERBOSE
820  
# Line 852 | Line 833 | YYID (yyi)
833   #    define alloca _alloca
834   #   else
835   #    define YYSTACK_ALLOC alloca
836 < #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
856 <     || defined __cplusplus || defined _MSC_VER)
836 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
837   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
838 +      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
839   #     ifndef EXIT_SUCCESS
840   #      define EXIT_SUCCESS 0
841   #     endif
# Line 864 | Line 845 | YYID (yyi)
845   # endif
846  
847   # ifdef YYSTACK_ALLOC
848 <   /* Pacify GCC's `empty if-body' warning.  */
849 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
848 >   /* Pacify GCC's 'empty if-body' warning.  */
849 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
850   #  ifndef YYSTACK_ALLOC_MAXIMUM
851      /* The OS might guarantee only one guard page at the bottom of the stack,
852         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 881 | Line 862 | YYID (yyi)
862   #  endif
863   #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
864         && ! ((defined YYMALLOC || defined malloc) \
865 <             && (defined YYFREE || defined free)))
865 >             && (defined YYFREE || defined free)))
866   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
867   #   ifndef EXIT_SUCCESS
868   #    define EXIT_SUCCESS 0
# Line 889 | Line 870 | YYID (yyi)
870   #  endif
871   #  ifndef YYMALLOC
872   #   define YYMALLOC malloc
873 < #   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
893 <     || defined __cplusplus || defined _MSC_VER)
873 > #   if ! defined malloc && ! defined EXIT_SUCCESS
874   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
875   #   endif
876   #  endif
877   #  ifndef YYFREE
878   #   define YYFREE free
879 < #   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
900 <     || defined __cplusplus || defined _MSC_VER)
879 > #   if ! defined free && ! defined EXIT_SUCCESS
880   void free (void *); /* INFRINGES ON USER NAME SPACE */
881   #   endif
882   #  endif
# Line 907 | Line 886 | void free (void *); /* INFRINGES ON USER
886  
887   #if (! defined yyoverflow \
888       && (! defined __cplusplus \
889 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
889 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
890  
891   /* A type that is properly aligned for any stack member.  */
892   union yyalloc
# Line 932 | Line 911 | union yyalloc
911     elements in the stack, and YYPTR gives the new location of the
912     stack.  Advance YYPTR to a properly aligned location for the next
913     stack.  */
914 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
915 <    do                                                                  \
916 <      {                                                                 \
917 <        YYSIZE_T yynewbytes;                                            \
918 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
919 <        Stack = &yyptr->Stack_alloc;                                    \
920 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
921 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
922 <      }                                                                 \
923 <    while (YYID (0))
914 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
915 >    do                                                                  \
916 >      {                                                                 \
917 >        YYSIZE_T yynewbytes;                                            \
918 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
919 >        Stack = &yyptr->Stack_alloc;                                    \
920 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
921 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
922 >      }                                                                 \
923 >    while (0)
924  
925   #endif
926  
927   #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
928 < /* Copy COUNT objects from FROM to TO.  The source and destination do
928 > /* Copy COUNT objects from SRC to DST.  The source and destination do
929     not overlap.  */
930   # ifndef YYCOPY
931   #  if defined __GNUC__ && 1 < __GNUC__
932 < #   define YYCOPY(To, From, Count) \
933 <      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
932 > #   define YYCOPY(Dst, Src, Count) \
933 >      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
934   #  else
935 < #   define YYCOPY(To, From, Count)              \
936 <      do                                        \
937 <        {                                       \
938 <          YYSIZE_T yyi;                         \
939 <          for (yyi = 0; yyi < (Count); yyi++)   \
940 <            (To)[yyi] = (From)[yyi];            \
941 <        }                                       \
942 <      while (YYID (0))
935 > #   define YYCOPY(Dst, Src, Count)              \
936 >      do                                        \
937 >        {                                       \
938 >          YYSIZE_T yyi;                         \
939 >          for (yyi = 0; yyi < (Count); yyi++)   \
940 >            (Dst)[yyi] = (Src)[yyi];            \
941 >        }                                       \
942 >      while (0)
943   #  endif
944   # endif
945   #endif /* !YYCOPY_NEEDED */
# Line 968 | Line 947 | union yyalloc
947   /* YYFINAL -- State number of the termination state.  */
948   #define YYFINAL  2
949   /* YYLAST -- Last index in YYTABLE.  */
950 < #define YYLAST   1270
950 > #define YYLAST   1381
951  
952   /* YYNTOKENS -- Number of terminals.  */
953 < #define YYNTOKENS  266
953 > #define YYNTOKENS  235
954   /* YYNNTS -- Number of nonterminals.  */
955 < #define YYNNTS  322
955 > #define YYNNTS  296
956   /* YYNRULES -- Number of rules.  */
957 < #define YYNRULES  694
958 < /* YYNRULES -- Number of states.  */
959 < #define YYNSTATES  1368
957 > #define YYNRULES  664
958 > /* YYNSTATES -- Number of states.  */
959 > #define YYNSTATES  1313
960  
961 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
961 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
962 >   by yylex, with out-of-bounds checking.  */
963   #define YYUNDEFTOK  2
964 < #define YYMAXUTOK   515
964 > #define YYMAXUTOK   483
965  
966 < #define YYTRANSLATE(YYX)                                                \
966 > #define YYTRANSLATE(YYX)                                                \
967    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
968  
969 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
970 < static const yytype_uint16 yytranslate[] =
969 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
970 >   as returned by yylex, without out-of-bounds checking.  */
971 > static const yytype_uint8 yytranslate[] =
972   {
973         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
974         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
975         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
976         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
977 <       2,     2,     2,     2,   265,     2,     2,     2,     2,     2,
978 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   261,
979 <       2,   264,     2,     2,     2,     2,     2,     2,     2,     2,
977 >       2,     2,     2,     2,   233,     2,     2,     2,     2,     2,
978 >       2,     2,     2,     2,     2,     2,     2,     2,   234,   229,
979 >       2,   232,     2,     2,     2,     2,     2,     2,     2,     2,
980         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
981         2,     2,     2,     2,     2,     2,     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,
985 <       2,     2,     2,   263,     2,   262,     2,     2,     2,     2,
985 >       2,     2,     2,   231,     2,   230,     2,     2,     2,     2,
986         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
987         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
988         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 1037 | Line 1018 | static const yytype_uint16 yytranslate[]
1018       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1019       205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1020       215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1021 <     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
1021 >     225,   226,   227,   228
1022   };
1023  
1024   #if YYDEBUG
1025 < /* 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.  */
1025 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1026   static const yytype_uint16 yyrline[] =
1027   {
1028 <       0,   395,   395,   396,   399,   400,   401,   402,   403,   404,
1029 <     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
1030 <     415,   416,   417,   418,   419,   420,   421,   425,   425,   426,
1031 <     430,   434,   438,   442,   446,   452,   452,   453,   454,   455,
1032 <     456,   463,   466,   466,   467,   467,   467,   469,   475,   482,
1033 <     484,   484,   485,   485,   486,   486,   487,   487,   488,   489,
1034 <     489,   490,   490,   491,   492,   496,   495,   514,   514,   515,
1035 <     521,   529,   563,   623,   638,   653,   662,   676,   685,   713,
1036 <     743,   766,   775,   777,   777,   778,   778,   779,   779,   781,
1037 <     790,   799,   812,   814,   815,   817,   817,   818,   819,   819,
1038 <     820,   820,   821,   821,   822,   822,   823,   824,   826,   830,
1039 <     834,   841,   848,   855,   862,   869,   876,   883,   890,   894,
1040 <     898,   902,   906,   910,   914,   920,   930,   929,  1023,  1023,
1041 <    1024,  1024,  1025,  1025,  1025,  1026,  1026,  1026,  1027,  1027,
1042 <    1027,  1029,  1041,  1053,  1087,  1099,  1110,  1152,  1162,  1161,
1043 <    1167,  1167,  1168,  1172,  1176,  1180,  1184,  1188,  1192,  1196,
1044 <    1200,  1204,  1208,  1212,  1216,  1220,  1224,  1228,  1232,  1236,
1045 <    1240,  1247,  1246,  1250,  1250,  1251,  1251,  1252,  1252,  1254,
1046 <    1261,  1268,  1275,  1282,  1289,  1296,  1303,  1310,  1317,  1324,
1047 <    1331,  1338,  1345,  1352,  1359,  1366,  1380,  1379,  1429,  1429,
1048 <    1431,  1431,  1432,  1433,  1433,  1434,  1435,  1436,  1437,  1438,
1049 <    1439,  1440,  1441,  1442,  1443,  1444,  1446,  1455,  1464,  1470,
1050 <    1476,  1482,  1488,  1494,  1500,  1506,  1512,  1518,  1524,  1530,
1051 <    1540,  1539,  1556,  1555,  1560,  1560,  1561,  1565,  1569,  1577,
1052 <    1577,  1578,  1578,  1578,  1578,  1578,  1580,  1580,  1582,  1582,
1053 <    1584,  1598,  1618,  1627,  1640,  1639,  1708,  1708,  1709,  1709,
1054 <    1709,  1709,  1710,  1710,  1710,  1711,  1711,  1713,  1750,  1763,
1055 <    1772,  1784,  1783,  1787,  1787,  1788,  1788,  1789,  1789,  1791,
1056 <    1798,  1805,  1812,  1819,  1826,  1833,  1840,  1847,  1857,  1876,
1057 <    1886,  1900,  1899,  1915,  1915,  1916,  1916,  1916,  1916,  1918,
1058 <    1927,  1942,  1955,  1957,  1957,  1958,  1958,  1960,  1976,  1975,
1059 <    1991,  1991,  1992,  1992,  1992,  1992,  1994,  2003,  2026,  2025,
1060 <    2031,  2031,  2032,  2036,  2040,  2044,  2048,  2052,  2056,  2060,
1061 <    2064,  2068,  2072,  2082,  2081,  2098,  2098,  2099,  2099,  2099,
1062 <    2101,  2108,  2107,  2113,  2113,  2114,  2118,  2122,  2126,  2130,
1063 <    2134,  2138,  2142,  2146,  2150,  2154,  2164,  2163,  2309,  2309,
1064 <    2310,  2310,  2311,  2311,  2311,  2312,  2312,  2313,  2313,  2314,
1065 <    2314,  2314,  2315,  2315,  2316,  2316,  2317,  2319,  2331,  2343,
1066 <    2352,  2378,  2396,  2414,  2420,  2424,  2433,  2432,  2436,  2436,
1067 <    2437,  2437,  2438,  2438,  2440,  2451,  2458,  2465,  2472,  2482,
1068 <    2523,  2534,  2547,  2560,  2569,  2605,  2604,  2668,  2667,  2671,
1069 <    2671,  2672,  2678,  2678,  2679,  2679,  2679,  2679,  2681,  2700,
1070 <    2710,  2709,  2732,  2732,  2733,  2733,  2733,  2735,  2741,  2750,
1071 <    2752,  2752,  2753,  2753,  2755,  2774,  2773,  2821,  2820,  2824,
1072 <    2824,  2825,  2831,  2831,  2832,  2832,  2832,  2832,  2834,  2840,
1073 <    2849,  2852,  2852,  2853,  2853,  2854,  2854,  2855,  2855,  2856,
1074 <    2856,  2857,  2857,  2858,  2858,  2859,  2859,  2860,  2860,  2861,
1075 <    2861,  2862,  2862,  2863,  2863,  2864,  2864,  2865,  2865,  2866,
1076 <    2867,  2867,  2868,  2868,  2869,  2869,  2870,  2870,  2871,  2871,
1077 <    2872,  2872,  2873,  2874,  2874,  2875,  2875,  2876,  2877,  2877,
1078 <    2878,  2878,  2879,  2879,  2880,  2880,  2881,  2881,  2882,  2885,
1079 <    2890,  2895,  2900,  2905,  2910,  2915,  2920,  2925,  2930,  2935,
1080 <    2940,  2945,  2950,  2955,  2960,  2965,  2970,  2975,  2981,  2992,
1081 <    2997,  3006,  3011,  3016,  3021,  3026,  3031,  3034,  3039,  3042,
1082 <    3047,  3052,  3057,  3062,  3067,  3072,  3077,  3082,  3087,  3098,
1083 <    3103,  3108,  3117,  3149,  3167,  3172,  3181,  3190,  3195,  3200,
1084 <    3206,  3205,  3210,  3210,  3211,  3214,  3217,  3220,  3223,  3226,
1085 <    3229,  3232,  3235,  3238,  3241,  3244,  3247,  3250,  3253,  3256,
1086 <    3259,  3262,  3265,  3271,  3270,  3275,  3275,  3276,  3279,  3282,
1087 <    3285,  3288,  3291,  3294,  3297,  3300,  3303,  3306,  3309,  3312,
1088 <    3315,  3318,  3321,  3324,  3327,  3330,  3335,  3340,  3345,  3350,
1089 <    3360,  3359,  3383,  3383,  3384,  3385,  3386,  3387,  3388,  3389,
1090 <    3390,  3392,  3398,  3405,  3404,  3409,  3409,  3410,  3414,  3420,
1091 <    3454,  3464,  3463,  3513,  3513,  3514,  3518,  3527,  3530,  3530,
1092 <    3531,  3531,  3532,  3532,  3533,  3533,  3534,  3534,  3535,  3535,
1093 <    3536,  3537,  3537,  3538,  3538,  3539,  3539,  3540,  3540,  3542,
1094 <    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
1028 >       0,   385,   385,   386,   389,   390,   391,   392,   393,   394,
1029 >     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
1030 >     405,   406,   407,   408,   409,   410,   411,   412,   416,   416,
1031 >     417,   418,   419,   420,   421,   422,   423,   424,   427,   427,
1032 >     428,   429,   430,   431,   438,   441,   441,   442,   442,   442,
1033 >     444,   450,   457,   459,   459,   460,   461,   462,   463,   464,
1034 >     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1035 >     475,   476,   477,   480,   520,   578,   607,   615,   629,   657,
1036 >     672,   687,   697,   711,   720,   748,   776,   801,   823,   845,
1037 >     854,   856,   856,   857,   858,   859,   860,   862,   871,   880,
1038 >     893,   892,   910,   910,   911,   911,   911,   913,   919,   929,
1039 >     928,   947,   947,   948,   948,   948,   948,   948,   950,   956,
1040 >     962,   968,   989,   990,   990,   992,   992,   993,   995,  1002,
1041 >    1002,  1015,  1016,  1018,  1018,  1019,  1019,  1021,  1029,  1032,
1042 >    1038,  1037,  1043,  1043,  1044,  1048,  1052,  1056,  1060,  1064,
1043 >    1068,  1072,  1083,  1082,  1171,  1171,  1172,  1173,  1174,  1175,
1044 >    1176,  1177,  1178,  1179,  1180,  1181,  1182,  1183,  1185,  1191,
1045 >    1197,  1203,  1209,  1220,  1226,  1232,  1243,  1250,  1249,  1255,
1046 >    1255,  1256,  1260,  1264,  1268,  1272,  1276,  1280,  1284,  1288,
1047 >    1292,  1296,  1300,  1304,  1308,  1312,  1316,  1320,  1324,  1328,
1048 >    1332,  1336,  1340,  1347,  1346,  1352,  1352,  1353,  1357,  1361,
1049 >    1365,  1369,  1373,  1377,  1381,  1385,  1389,  1393,  1397,  1401,
1050 >    1405,  1409,  1413,  1417,  1421,  1425,  1429,  1433,  1437,  1441,
1051 >    1452,  1451,  1508,  1508,  1509,  1510,  1511,  1512,  1513,  1514,
1052 >    1515,  1516,  1517,  1518,  1519,  1520,  1521,  1521,  1522,  1523,
1053 >    1524,  1525,  1527,  1533,  1539,  1545,  1551,  1557,  1563,  1569,
1054 >    1575,  1581,  1587,  1594,  1600,  1606,  1612,  1621,  1631,  1630,
1055 >    1636,  1636,  1637,  1641,  1652,  1651,  1658,  1657,  1662,  1662,
1056 >    1663,  1667,  1671,  1677,  1677,  1678,  1678,  1678,  1678,  1678,
1057 >    1680,  1680,  1682,  1682,  1684,  1697,  1714,  1720,  1730,  1729,
1058 >    1771,  1771,  1772,  1773,  1774,  1775,  1776,  1777,  1778,  1779,
1059 >    1780,  1782,  1788,  1794,  1800,  1812,  1811,  1817,  1817,  1818,
1060 >    1822,  1826,  1830,  1834,  1838,  1842,  1846,  1850,  1854,  1860,
1061 >    1874,  1883,  1897,  1896,  1911,  1911,  1912,  1912,  1912,  1912,
1062 >    1914,  1920,  1926,  1936,  1938,  1938,  1939,  1939,  1941,  1957,
1063 >    1956,  1981,  1981,  1982,  1982,  1982,  1982,  1984,  1990,  2010,
1064 >    2009,  2015,  2015,  2016,  2020,  2024,  2028,  2032,  2036,  2040,
1065 >    2044,  2048,  2052,  2062,  2061,  2082,  2082,  2083,  2083,  2083,
1066 >    2085,  2092,  2091,  2097,  2097,  2098,  2102,  2106,  2110,  2114,
1067 >    2118,  2122,  2126,  2130,  2134,  2144,  2143,  2215,  2215,  2216,
1068 >    2217,  2218,  2219,  2220,  2221,  2222,  2223,  2224,  2225,  2226,
1069 >    2227,  2228,  2229,  2230,  2232,  2238,  2244,  2250,  2263,  2276,
1070 >    2282,  2288,  2292,  2299,  2298,  2303,  2303,  2304,  2308,  2314,
1071 >    2325,  2331,  2337,  2343,  2359,  2358,  2384,  2384,  2385,  2385,
1072 >    2385,  2387,  2407,  2417,  2416,  2443,  2443,  2444,  2444,  2444,
1073 >    2446,  2452,  2461,  2463,  2463,  2464,  2464,  2466,  2484,  2483,
1074 >    2506,  2506,  2507,  2507,  2507,  2509,  2515,  2524,  2527,  2527,
1075 >    2528,  2529,  2530,  2531,  2532,  2533,  2534,  2535,  2536,  2537,
1076 >    2538,  2539,  2540,  2541,  2542,  2543,  2544,  2545,  2546,  2547,
1077 >    2548,  2549,  2550,  2551,  2552,  2553,  2554,  2555,  2556,  2557,
1078 >    2558,  2559,  2560,  2561,  2562,  2563,  2564,  2565,  2566,  2567,
1079 >    2568,  2569,  2570,  2571,  2572,  2573,  2574,  2577,  2582,  2587,
1080 >    2592,  2598,  2603,  2608,  2613,  2618,  2623,  2628,  2633,  2638,
1081 >    2643,  2648,  2653,  2658,  2663,  2668,  2674,  2679,  2684,  2689,
1082 >    2694,  2699,  2704,  2709,  2712,  2717,  2720,  2725,  2730,  2735,
1083 >    2740,  2745,  2750,  2755,  2760,  2765,  2770,  2775,  2780,  2785,
1084 >    2791,  2790,  2795,  2795,  2796,  2799,  2802,  2805,  2808,  2811,
1085 >    2814,  2817,  2820,  2823,  2826,  2829,  2832,  2835,  2838,  2841,
1086 >    2844,  2847,  2850,  2853,  2856,  2859,  2865,  2864,  2869,  2869,
1087 >    2870,  2873,  2876,  2879,  2882,  2885,  2888,  2891,  2894,  2897,
1088 >    2900,  2903,  2906,  2909,  2912,  2915,  2918,  2921,  2924,  2927,
1089 >    2932,  2937,  2942,  2951,  2954,  2954,  2955,  2956,  2957,  2958,
1090 >    2959,  2960,  2961,  2962,  2963,  2964,  2965,  2966,  2967,  2968,
1091 >    2969,  2971,  2976,  2981,  2986,  2991,  2996,  3001,  3006,  3011,
1092 >    3016,  3021,  3026,  3031,  3036,  3044,  3047,  3047,  3048,  3049,
1093 >    3050,  3051,  3052,  3053,  3054,  3055,  3056,  3058,  3064,  3070,
1094 >    3076,  3082,  3091,  3106,  3112
1095   };
1096   #endif
1097  
1098 < #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1098 > #if YYDEBUG || YYERROR_VERBOSE || 0
1099   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1100     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
1101   static const char *const yytname[] =
1102   {
1103 <  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
1104 <  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
1105 <  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
1106 <  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CHANNEL",
1107 <  "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE", "CLASS",
1108 <  "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ", "CRYPTLINK",
1109 <  "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
1110 <  "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1111 <  "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1112 <  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
1113 <  "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL", "ENABLE",
1114 <  "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1115 <  "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
1116 <  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
1117 <  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
1118 <  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1119 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1120 <  "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER", "HIDE_SERVER_IPS",
1121 <  "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK",
1122 <  "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP", "KILL",
1123 <  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
1124 <  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
1125 <  "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL", "MAX_ACCEPT",
1126 <  "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1127 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1128 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1129 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1130 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1131 <  "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1132 <  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
1133 <  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
1134 <  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
1135 <  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
1136 <  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
1137 <  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
1138 <  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
1139 <  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
1140 <  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "T_SSL_CONNECTION_METHOD",
1141 <  "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
1142 <  "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE",
1143 <  "SERVERINFO", "SERVLINK_PATH", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1144 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SILENT", "SPOOF",
1145 <  "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1146 <  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
1147 <  "TMASKED", "T_REJECT", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS",
1148 <  "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN",
1149 <  "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF", "T_DEBUG", "T_DRONE",
1150 <  "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS",
1151 <  "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR", "T_L_INFO",
1152 <  "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS", "T_NCHANGE",
1153 <  "T_OPERWALL", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SKILL", "T_SPY",
1154 <  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_GLOBOPS",
1155 <  "T_WALLOP", "T_SERVICE", "T_SERVICES_NAME", "THROTTLE_TIME",
1156 <  "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE", "TRESV",
1157 <  "UNKLINE", "USER", "USE_EGD", "USE_EXCEPT", "USE_INVEX", "USE_KNOCK",
1158 <  "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST", "VHOST6", "XLINE", "WARN",
1159 <  "WARN_NO_NLINE", "';'", "'}'", "'{'", "'='", "','", "$accept", "conf",
1160 <  "conf_item", "timespec_", "timespec", "sizespec_", "sizespec",
1480 <  "modules_entry", "modules_items", "modules_item", "modules_module",
1481 <  "modules_path", "serverinfo_entry", "serverinfo_items",
1482 <  "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",
1103 >  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1104 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1105 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1106 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1107 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1108 >  "DEFAULT_JOIN_FLOOD_COUNT", "DEFAULT_JOIN_FLOOD_TIME",
1109 >  "DEFAULT_MAX_CLIENTS", "DEFAULT_SPLIT_SERVER_COUNT",
1110 >  "DEFAULT_SPLIT_USER_COUNT", "DENY", "DESCRIPTION", "DIE", "DISABLE_AUTH",
1111 >  "DISABLE_FAKE_CHANNELS", "DISABLE_REMOTE_COMMANDS", "DLINE_MIN_CIDR",
1112 >  "DLINE_MIN_CIDR6", "DOTS_IN_IDENT", "EMAIL", "ENCRYPTED", "EXCEED_LIMIT",
1113 >  "EXEMPT", "FAILED_OPER_NOTICE", "FLATTEN_LINKS", "GECOS", "GENERAL",
1114 >  "HIDDEN", "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE",
1115 >  "HIDE_IDLE_FROM_OPERS", "HIDE_SERVER_IPS", "HIDE_SERVERS",
1116 >  "HIDE_SERVICES", "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS",
1117 >  "INVISIBLE_ON_CONNECT", "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME",
1118 >  "IP", "IRCD_AUTH", "IRCD_FLAGS", "IRCD_SID", "KILL",
1119 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_MIN_CIDR",
1120 >  "KLINE_MIN_CIDR6", "KNOCK_CLIENT_COUNT", "KNOCK_CLIENT_TIME",
1121 >  "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY", "LISTEN", "MASK",
1122 >  "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL", "MAX_IDENT",
1123 >  "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES", "MAX_NICK_LENGTH",
1124 >  "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS", "MAX_TOPIC_LENGTH",
1125 >  "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD", "MIN_NONWILDCARD_SIMPLE",
1126 >  "MODULE", "MODULES", "MOTD", "NAME", "NEED_IDENT", "NEED_PASSWORD",
1127 >  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NO_CREATE_ON_SPLIT",
1128 >  "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE", "NUMBER",
1129 >  "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES", "OPER_PASS_RESV",
1130 >  "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID", "PACE_WAIT",
1131 >  "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME",
1132 >  "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT", "REDIRSERV",
1133 >  "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1134 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1135 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1136 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1137 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1138 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1139 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1140 >  "STATS_K_OPER_ONLY", "STATS_M_OPER_ONLY", "STATS_O_OPER_ONLY",
1141 >  "STATS_P_OPER_ONLY", "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS",
1142 >  "T_CALLERID", "T_CCONN", "T_COMMAND", "T_CLUSTER", "T_DEAF", "T_DEBUG",
1143 >  "T_DLINE", "T_EXTERNAL", "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS",
1144 >  "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_LOG", "T_NCHANGE",
1145 >  "T_NONONREG", "T_OPME", "T_PREPEND", "T_PSEUDO", "T_RECVQ", "T_REJ",
1146 >  "T_RESTART", "T_SERVER", "T_SERVICE", "T_SERVNOTICE", "T_SET",
1147 >  "T_SHARED", "T_SIZE", "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL",
1148 >  "T_SSL_CIPHER_LIST", "T_TARGET", "T_UMODES", "T_UNAUTH", "T_UNDLINE",
1149 >  "T_UNLIMITED", "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS",
1150 >  "T_WEBIRC", "TBOOL", "THROTTLE_COUNT", "THROTTLE_TIME",
1151 >  "TKLINE_EXPIRE_NOTICES", "TMASKED", "TS_MAX_DELTA", "TS_WARN_DELTA",
1152 >  "TWODOTS", "TYPE", "UNKLINE", "USE_LOGGING", "USER", "VHOST", "VHOST6",
1153 >  "WARN_NO_CONNECT_BLOCK", "WHOIS", "XLINE", "XLINE_EXEMPT", "';'", "'}'",
1154 >  "'{'", "'='", "','", "':'", "$accept", "conf", "conf_item", "timespec_",
1155 >  "timespec", "sizespec_", "sizespec", "modules_entry", "modules_items",
1156 >  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
1157 >  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
1158 >  "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1159 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1160 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1161    "serverinfo_description", "serverinfo_network_name",
1162    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1163 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1164 <  "admin_item", "admin_name", "admin_email", "admin_description",
1165 <  "logging_entry", "logging_items", "logging_item", "logging_path",
1166 <  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
1167 <  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
1168 <  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
1169 <  "logging_log_level", "logging_use_logging", "oper_entry", "$@2",
1170 <  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
1171 <  "oper_user", "oper_password", "oper_encrypted",
1172 <  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "$@3",
1173 <  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@4",
1174 <  "oper_flags_items", "oper_flags_item", "$@5", "$@6",
1175 <  "oper_flags_item_atom", "class_entry", "$@7", "class_name_b",
1176 <  "class_items", "class_item", "class_name", "class_name_t",
1177 <  "class_ping_time", "class_ping_warning", "class_number_per_ip",
1178 <  "class_connectfreq", "class_max_number", "class_max_global",
1179 <  "class_max_local", "class_max_ident", "class_sendq",
1180 <  "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1181 <  "class_number_per_cidr", "listen_entry", "$@8", "listen_flags", "$@9",
1182 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1183 <  "listen_port", "$@10", "port_items", "port_item", "listen_address",
1184 <  "listen_host", "auth_entry", "$@11", "auth_items", "auth_item",
1185 <  "auth_user", "auth_passwd", "auth_class", "auth_encrypted", "auth_flags",
1186 <  "$@12", "auth_flags_items", "auth_flags_item", "$@13", "$@14",
1187 <  "auth_flags_item_atom", "auth_spoof", "auth_redir_serv",
1163 >  "serverinfo_default_max_clients", "serverinfo_max_nick_length",
1164 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1165 >  "admin_items", "admin_item", "admin_name", "admin_email",
1166 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1167 >  "motd_mask", "motd_file", "pseudo_entry", "$@2", "pseudo_items",
1168 >  "pseudo_item", "pseudo_command", "pseudo_name", "pseudo_prepend",
1169 >  "pseudo_target", "logging_entry", "logging_items", "logging_item",
1170 >  "logging_use_logging", "logging_file_entry", "$@3", "logging_file_items",
1171 >  "logging_file_item", "logging_file_name", "logging_file_size",
1172 >  "logging_file_type", "$@4", "logging_file_type_items",
1173 >  "logging_file_type_item", "oper_entry", "$@5", "oper_items", "oper_item",
1174 >  "oper_name", "oper_user", "oper_password", "oper_whois",
1175 >  "oper_encrypted", "oper_rsa_public_key_file",
1176 >  "oper_ssl_certificate_fingerprint", "oper_ssl_connection_required",
1177 >  "oper_class", "oper_umodes", "$@6", "oper_umodes_items",
1178 >  "oper_umodes_item", "oper_flags", "$@7", "oper_flags_items",
1179 >  "oper_flags_item", "class_entry", "$@8", "class_items", "class_item",
1180 >  "class_name", "class_ping_time", "class_number_per_ip",
1181 >  "class_connectfreq", "class_max_channels", "class_max_number",
1182 >  "class_max_global", "class_max_local", "class_max_ident", "class_sendq",
1183 >  "class_recvq", "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1184 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1185 >  "class_flags", "$@9", "class_flags_items", "class_flags_item",
1186 >  "listen_entry", "$@10", "listen_flags", "$@11", "listen_flags_items",
1187 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1188 >  "$@12", "port_items", "port_item", "listen_address", "listen_host",
1189 >  "auth_entry", "$@13", "auth_items", "auth_item", "auth_user",
1190 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@14",
1191 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1192    "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1193 <  "resv_creason", "resv_channel", "resv_nick", "service_entry",
1193 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1194    "service_items", "service_item", "service_name", "shared_entry", "$@16",
1195    "shared_items", "shared_item", "shared_name", "shared_user",
1196    "shared_type", "$@17", "shared_types", "shared_type_item",
1197    "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1198    "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1199 <  "connect_entry", "$@20", "connect_name_b", "connect_items",
1200 <  "connect_item", "connect_name", "connect_name_t", "connect_host",
1201 <  "connect_vhost", "connect_send_password", "connect_accept_password",
1199 >  "connect_entry", "$@20", "connect_items", "connect_item", "connect_name",
1200 >  "connect_host", "connect_vhost", "connect_send_password",
1201 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1202    "connect_port", "connect_aftype", "connect_flags", "$@21",
1203 <  "connect_flags_items", "connect_flags_item", "$@22", "$@23",
1204 <  "connect_flags_item_atom", "connect_rsa_public_key_file",
1205 <  "connect_encrypted", "connect_hub_mask", "connect_leaf_mask",
1206 <  "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",
1203 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1204 >  "connect_hub_mask", "connect_leaf_mask", "connect_class",
1205 >  "connect_ssl_cipher_list", "kill_entry", "$@22", "kill_items",
1206 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@23",
1207    "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1208 <  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@27",
1531 <  "gecos_flags", "$@28", "gecos_flags_items", "gecos_flags_item",
1208 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@24",
1209    "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1210 <  "general_entry", "general_items", "general_item", "general_max_watch",
1211 <  "general_gline_min_cidr", "general_gline_min_cidr6",
1212 <  "general_burst_away", "general_use_whois_actually",
1213 <  "general_reject_hold_time", "general_tkline_expire_notices",
1214 <  "general_kill_chase_time_limit", "general_hide_spoof_ips",
1215 <  "general_ignore_bogus_ts", "general_disable_remote_commands",
1216 <  "general_failed_oper_notice", "general_anti_nick_flood",
1217 <  "general_max_nick_time", "general_max_nick_changes",
1218 <  "general_max_accept", "general_anti_spam_exit_message_time",
1219 <  "general_ts_warn_delta", "general_ts_max_delta",
1220 <  "general_havent_read_conf", "general_kline_with_reason",
1221 <  "general_kline_reason", "general_invisible_on_connect",
1222 <  "general_warn_no_nline", "general_stats_e_disabled",
1546 <  "general_stats_o_oper_only", "general_stats_P_oper_only",
1210 >  "general_entry", "general_items", "general_item", "general_away_count",
1211 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1212 >  "general_dline_min_cidr", "general_dline_min_cidr6",
1213 >  "general_kline_min_cidr", "general_kline_min_cidr6",
1214 >  "general_tkline_expire_notices", "general_kill_chase_time_limit",
1215 >  "general_ignore_bogus_ts", "general_failed_oper_notice",
1216 >  "general_anti_nick_flood", "general_max_nick_time",
1217 >  "general_max_nick_changes", "general_max_accept",
1218 >  "general_anti_spam_exit_message_time", "general_ts_warn_delta",
1219 >  "general_ts_max_delta", "general_invisible_on_connect",
1220 >  "general_warn_no_connect_block", "general_stats_e_disabled",
1221 >  "general_stats_m_oper_only", "general_stats_o_oper_only",
1222 >  "general_stats_P_oper_only", "general_stats_u_oper_only",
1223    "general_stats_k_oper_only", "general_stats_i_oper_only",
1224    "general_pace_wait", "general_caller_id_wait",
1225    "general_opers_bypass_callerid", "general_pace_wait_simple",
1226 <  "general_short_motd", "general_no_oper_flood",
1227 <  "general_true_no_oper_flood", "general_oper_pass_resv",
1228 <  "general_message_locale", "general_dots_in_ident", "general_max_targets",
1229 <  "general_servlink_path", "general_default_cipher_preference",
1230 <  "general_compression_level", "general_use_egd", "general_egdpool_path",
1555 <  "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",
1226 >  "general_short_motd", "general_no_oper_flood", "general_oper_pass_resv",
1227 >  "general_dots_in_ident", "general_max_targets", "general_ping_cookie",
1228 >  "general_disable_auth", "general_throttle_count",
1229 >  "general_throttle_time", "general_oper_umodes", "$@25", "umode_oitems",
1230 >  "umode_oitem", "general_oper_only_umodes", "$@26", "umode_items",
1231    "umode_item", "general_min_nonwildcard",
1232    "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",
1233    "channel_entry", "channel_items", "channel_item",
1234 <  "channel_disable_fake_channels", "channel_restrict_channels",
1235 <  "channel_disable_local_channels", "channel_use_except",
1236 <  "channel_use_invex", "channel_use_knock", "channel_knock_delay",
1237 <  "channel_knock_delay_channel", "channel_max_chans_per_user",
1569 <  "channel_quiet_on_ban", "channel_max_bans",
1234 >  "channel_disable_fake_channels", "channel_invite_client_count",
1235 >  "channel_invite_client_time", "channel_knock_client_count",
1236 >  "channel_knock_client_time", "channel_knock_delay_channel",
1237 >  "channel_max_channels", "channel_max_bans",
1238    "channel_default_split_user_count", "channel_default_split_server_count",
1239    "channel_no_create_on_split", "channel_no_join_on_split",
1240 <  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
1240 >  "channel_default_join_flood_count", "channel_default_join_flood_time",
1241    "serverhide_entry", "serverhide_items", "serverhide_item",
1242 <  "serverhide_flatten_links", "serverhide_hide_servers",
1242 >  "serverhide_flatten_links", "serverhide_disable_remote_commands",
1243 >  "serverhide_hide_servers", "serverhide_hide_services",
1244    "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
1245 <  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
1245 >  "serverhide_hide_server_ips", YY_NULLPTR
1246   };
1247   #endif
1248  
1249   # ifdef YYPRINT
1250 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1251 <   token YYLEX-NUM.  */
1250 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1251 >   (internal) symbol number NUM (which must be that of a token).  */
1252   static const yytype_uint16 yytoknum[] =
1253   {
1254         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1604 | Line 1273 | static const yytype_uint16 yytoknum[] =
1273       445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
1274       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1275       465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1276 <     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1277 <     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
1276 >     475,   476,   477,   478,   479,   480,   481,   482,   483,    59,
1277 >     125,   123,    61,    44,    58
1278   };
1279   # endif
1280  
1281 < /* 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 < };
1281 > #define YYPACT_NINF -739
1282  
1283 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1284 < static const yytype_uint8 yyr2[] =
1283 > #define yypact_value_is_default(Yystate) \
1284 >  (!!((Yystate) == (-739)))
1285 >
1286 > #define YYTABLE_NINF -130
1287 >
1288 > #define yytable_value_is_error(Yytable_value) \
1289 >  0
1290 >
1291 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1292 >     STATE-NUM.  */
1293 > static const yytype_int16 yypact[] =
1294   {
1295 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1296 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1297 <       1,     1,     1,     1,     1,     2,     2,     0,     1,     2,
1298 <       3,     3,     3,     3,     3,     0,     1,     2,     3,     3,
1299 <       3,     5,     2,     1,     1,     1,     2,     4,     4,     5,
1300 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1301 <       1,     1,     1,     1,     2,     0,     5,     3,     1,     1,
1302 <       1,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1303 <       4,     4,     5,     2,     1,     1,     1,     1,     2,     4,
1304 <       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
1305 <       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
1306 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1307 <       4,     4,     4,     4,     4,     4,     0,     7,     0,     1,
1308 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1309 <       2,     4,     1,     4,     4,     4,     4,     4,     0,     5,
1310 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1311 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1312 <       1,     0,     5,     3,     1,     0,     3,     0,     2,     1,
1313 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1314 <       1,     1,     1,     1,     1,     1,     0,     7,     0,     1,
1315 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1316 <       1,     1,     1,     1,     1,     2,     4,     1,     4,     4,
1317 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1318 <       0,     6,     0,     5,     3,     1,     1,     1,     1,     2,
1319 <       1,     1,     1,     1,     1,     2,     0,     5,     3,     1,
1320 <       1,     3,     4,     4,     0,     6,     2,     1,     1,     1,
1321 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
1322 <       4,     0,     5,     3,     1,     0,     3,     0,     2,     1,
1323 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1324 <       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
1325 <       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
1326 <       2,     1,     1,     1,     1,     2,     4,     4,     0,     5,
1327 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1328 <       1,     1,     1,     0,     6,     2,     1,     1,     1,     2,
1329 <       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1330 <       1,     1,     1,     1,     1,     1,     0,     7,     0,     1,
1331 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1332 <       1,     1,     1,     1,     1,     1,     2,     4,     1,     4,
1333 <       4,     4,     4,     4,     4,     4,     0,     5,     3,     1,
1334 <       0,     3,     0,     2,     1,     1,     1,     1,     1,     4,
1335 <       4,     4,     4,     4,     4,     0,     6,     0,     5,     3,
1336 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1337 <       0,     6,     2,     1,     1,     1,     1,     4,     4,     5,
1338 <       2,     1,     1,     1,     4,     0,     6,     0,     5,     3,
1339 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1340 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1341 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1342 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1343 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1344 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1345 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
1346 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1347 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1348 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1349 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1350 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1351 <       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
1352 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1353 <       1,     1,     1,     0,     5,     3,     1,     1,     1,     1,
1354 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1355 <       1,     1,     1,     1,     1,     1,     4,     4,     4,     4,
1356 <       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
1357 <       1,     4,     4,     0,     5,     3,     1,     1,     1,     4,
1358 <       4,     0,     5,     3,     1,     1,     1,     5,     2,     1,
1359 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1360 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
1361 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1362 <       4,     4,     4,     4,     4,     4,     4,     5,     2,     1,
1363 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1364 <       4,     4,     4,     4,     4
1295 >    -739,   690,  -739,  -204,  -227,  -225,  -739,  -739,  -739,  -212,
1296 >    -739,  -183,  -739,  -739,  -739,  -172,  -739,  -739,  -739,  -171,
1297 >    -159,  -739,  -145,  -739,  -142,  -739,  -739,  -739,  -739,  -739,
1298 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1299 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1300 >    -739,   322,   939,  -134,  -105,   -70,    21,   -69,   390,   -61,
1301 >     -55,   -49,    40,   -47,   -34,   -31,   669,   530,   -28,   106,
1302 >     -23,    11,   -15,   -14,     6,    27,    52,    31,  -739,  -739,
1303 >    -739,  -739,  -739,    54,    62,    90,    96,   103,   114,   117,
1304 >     118,   121,   131,   132,   144,   145,   148,   171,  -739,  -739,
1305 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1306 >    -739,  -739,  -739,   680,   523,    14,  -739,   152,    69,  -739,
1307 >    -739,    19,  -739,   153,   155,   156,   157,   161,   162,   175,
1308 >     176,   177,   179,   182,   183,   184,   185,   186,   187,   189,
1309 >     191,   192,   196,   199,   201,   202,   203,   204,  -739,   207,
1310 >    -739,   208,   209,   210,   211,   213,   218,   220,   222,   223,
1311 >     226,   230,   233,   234,   239,   241,   246,   248,   250,     7,
1312 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1313 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1314 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1315 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1316 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,   343,    26,   329,
1317 >     -11,   253,   254,    39,  -739,  -739,  -739,    33,   312,    22,
1318 >    -739,   255,   260,   261,   263,   265,   266,   268,   272,     4,
1319 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,    -2,
1320 >     276,   277,   279,   280,   281,   283,   285,   286,   287,   288,
1321 >     289,   290,   291,   293,   295,   298,   300,   124,  -739,  -739,
1322 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1323 >    -739,  -739,  -739,  -739,  -739,  -739,    10,    44,   305,    67,
1324 >    -739,  -739,  -739,   137,   173,  -739,   308,    89,  -739,  -739,
1325 >      17,  -739,   215,   282,   353,    76,  -739,   206,   433,   435,
1326 >     437,   342,   446,   433,   447,   433,   433,   449,   450,   348,
1327 >     350,   174,  -739,   335,   341,   346,   349,  -739,   352,   355,
1328 >     356,   357,   358,   359,   363,   367,   368,   369,   373,   377,
1329 >     378,   172,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1330 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1331 >     345,   379,   380,   381,   382,   386,   387,  -739,   391,   394,
1332 >     395,   397,   398,   402,   403,   244,  -739,  -739,  -739,  -739,
1333 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1334 >    -739,  -739,   404,   405,    32,  -739,  -739,  -739,   457,   393,
1335 >    -739,  -739,   406,   408,    80,  -739,  -739,  -739,   371,   433,
1336 >     533,   433,   433,   432,   538,   436,   541,   542,   543,   442,
1337 >     443,   444,   433,   548,   550,   551,   552,   433,   554,   556,
1338 >     559,   563,   481,   441,   482,   455,   485,   433,   433,   488,
1339 >     489,   491,  -187,  -180,   494,   496,   497,   500,   605,   433,
1340 >     503,   433,   433,   506,   495,  -739,   498,   486,   493,  -739,
1341 >     501,   504,   505,   507,   508,    65,  -739,  -739,  -739,  -739,
1342 >    -739,  -739,  -739,  -739,  -739,  -739,   509,   510,    86,  -739,
1343 >    -739,  -739,   499,   513,   515,  -739,   516,  -739,    79,  -739,
1344 >    -739,  -739,  -739,  -739,   603,   606,   520,  -739,   521,   519,
1345 >     524,    35,  -739,  -739,  -739,   528,   526,   527,  -739,   539,
1346 >     544,   545,   547,   549,  -739,   553,   560,   227,  -739,  -739,
1347 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1348 >     536,   561,   565,   566,    61,  -739,  -739,  -739,  -739,   562,
1349 >     564,   569,   609,   571,   572,   573,   433,   577,  -739,  -739,
1350 >     666,   615,   580,   665,   701,   703,   691,   692,   693,   694,
1351 >     696,   697,   702,   706,   707,   708,   709,   595,  -739,   607,
1352 >     608,  -739,    87,  -739,  -739,  -739,  -739,   626,   610,  -739,
1353 >     612,   616,   614,   617,   618,   619,   135,  -739,  -739,  -739,
1354 >    -739,  -739,   718,   623,  -739,   624,   622,  -739,   625,    82,
1355 >    -739,  -739,  -739,  -739,   627,   631,   632,  -739,   633,   431,
1356 >     634,   635,   636,   637,   639,   640,   641,   643,   644,   645,
1357 >     646,   648,   649,  -739,  -739,   736,   739,   433,   647,   740,
1358 >     747,   751,   433,   772,   774,   433,   760,   780,   781,   433,
1359 >     784,   784,   668,  -739,  -739,   776,  -133,   777,   684,   779,
1360 >     782,   675,   785,   787,   803,   789,   791,   792,   793,   704,
1361 >    -739,   797,   798,   712,  -739,   714,  -739,   799,   800,   719,
1362 >    -739,   720,   722,   723,   724,   727,   728,   732,   733,   742,
1363 >     744,   745,   746,   748,   749,   754,   755,   756,   757,   758,
1364 >     759,   761,   763,   764,   765,   767,   762,   768,   630,   771,
1365 >     778,   786,   788,   794,   795,   796,   801,   802,   804,   805,
1366 >     806,   807,   808,   809,   810,   811,   812,   813,   816,  -739,
1367 >    -739,   824,   725,   698,   845,   817,   846,   853,   857,   818,
1368 >    -739,   866,   868,   819,  -739,  -739,   878,   880,   773,   896,
1369 >     820,  -739,   821,   822,  -739,  -739,   883,   885,   823,  -739,
1370 >    -739,   886,   815,   790,   890,   891,   893,   897,   835,   825,
1371 >     898,   904,   826,  -739,  -739,   905,   906,   909,   827,  -739,
1372 >     829,   830,   831,   832,   833,   834,   836,   837,  -739,   838,
1373 >     839,   840,   841,   842,   843,   844,   847,   848,   849,   850,
1374 >     851,   852,   854,   855,   856,   858,  -739,  -739,   930,   859,
1375 >     860,  -739,   861,  -739,    77,  -739,   931,   941,   951,   952,
1376 >     863,  -739,   864,  -739,  -739,   959,   862,   963,   867,  -739,
1377 >    -739,  -739,  -739,  -739,   433,   433,   433,   433,   433,   433,
1378 >     433,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1379 >    -739,  -739,  -739,  -739,  -739,  -739,   869,   870,   871,   -13,
1380 >     872,   873,   874,   875,   876,   877,   879,   881,   882,   884,
1381 >     887,    41,   888,   889,  -739,   892,   894,   895,   899,   900,
1382 >     901,   902,    -5,   903,   907,   908,   910,   911,   912,   913,
1383 >    -739,   914,   915,  -739,  -739,   916,   917,  -739,  -739,  -739,
1384 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1385 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1386 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1387 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1388 >    -739,  -739,  -739,  -162,  -739,  -739,  -739,  -739,  -739,  -739,
1389 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1390 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -138,  -739,
1391 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1392 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1393 >     918,   919,   476,   920,   921,   922,   923,   924,  -739,   925,
1394 >     926,  -739,   927,   928,    68,   940,   929,  -739,  -739,  -739,
1395 >    -739,   932,   934,  -739,   935,   936,   468,   937,   938,   942,
1396 >     943,   944,   721,   945,   946,  -739,   947,   948,   949,  -739,
1397 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1398 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1399 >    -739,  -739,  -739,  -739,  -739,   950,   462,  -739,  -739,   953,
1400 >     865,   954,  -739,    73,  -739,  -739,  -739,  -739,   955,   956,
1401 >     958,   960,  -739,  -739,   961,   775,   962,  -739,  -739,  -739,
1402 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1403 >     -92,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1404 >    -739,  -739,  -739,   784,   784,   784,  -739,  -739,  -739,  -739,
1405 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,   -81,
1406 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1407 >    -739,  -739,  -739,   762,  -739,   630,  -739,  -739,  -739,  -739,
1408 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,   -73,  -739,
1409 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1410 >    -739,  -739,   -52,  -739,   980,   896,   964,  -739,  -739,  -739,
1411 >    -739,  -739,   965,  -739,   966,  -739,  -739,  -739,  -739,   967,
1412 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1413 >    -739,   -27,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1414 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1415 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1416 >     -16,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1417 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,    56,  -739,
1418 >    -739,   972,   -50,   970,   968,  -739,  -739,  -739,  -739,  -739,
1419 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1420 >    -739,   108,  -739,  -739,  -739,   -13,  -739,  -739,  -739,  -739,
1421 >      -5,  -739,  -739,  -739,   476,  -739,    68,  -739,  -739,  -739,
1422 >     978,   983,   985,  -739,   468,  -739,   721,  -739,   462,   969,
1423 >     974,   975,   267,  -739,  -739,   775,  -739,  -739,  -739,  -739,
1424 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1425 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,   110,  -739,  -739,
1426 >    -739,   267,  -739
1427   };
1428  
1429 < /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
1430 <   Performed when YYTABLE doesn't specify something else to do.  Zero
1431 <   means the default is an error.  */
1429 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1430 >     Performed when YYTABLE does not specify something else to do.  Zero
1431 >     means the default is an error.  */
1432   static const yytype_uint16 yydefact[] =
1433   {
1434 <       2,     0,     1,     0,     0,     0,   196,   356,   420,     0,
1435 <     435,     0,   610,   254,   405,   230,     0,     0,   126,   291,
1436 <       0,     0,   308,   333,     0,     3,    24,    11,     4,     5,
1437 <       6,     8,     9,    10,    13,    14,    15,    16,    17,    18,
1438 <      19,    20,    23,    21,    22,     7,    12,    25,    26,     0,
1439 <       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,
1434 >       2,     0,     1,     0,     0,     0,   230,   395,   443,     0,
1435 >     458,     0,   298,   434,   274,     0,   100,   152,   332,     0,
1436 >       0,   373,     0,   109,     0,   349,     3,    23,    11,     4,
1437 >      24,    25,     5,     6,     8,     9,    10,    13,    14,    15,
1438 >      16,    17,    18,    19,    20,    22,    21,     7,    12,    26,
1439 >      27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1440         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1441 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   639,
1442 <     657,   652,   640,   641,   642,   643,   645,   646,   647,   648,
1443 <     644,   649,   650,   651,   653,   654,   655,   656,   217,     0,
1444 <     199,   378,     0,   359,     0,   433,     0,     0,   431,   432,
1445 <       0,   508,     0,     0,     0,     0,     0,     0,     0,     0,
1441 >       0,     0,     0,     0,     0,     0,     0,     0,    92,    93,
1442 >      95,    94,   630,     0,     0,     0,     0,     0,     0,     0,
1443 >       0,     0,     0,     0,     0,     0,     0,     0,   615,   629,
1444 >     617,   618,   619,   620,   621,   622,   616,   623,   624,   625,
1445 >     626,   627,   628,     0,     0,     0,   456,     0,     0,   454,
1446 >     455,     0,   516,     0,     0,     0,     0,     0,     0,     0,
1447         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1448 +       0,     0,     0,     0,     0,     0,     0,     0,   586,     0,
1449 +     560,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1450         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1451 <       0,     0,     0,   583,     0,   560,     0,     0,     0,     0,
1451 >     469,   470,   471,   514,   515,   509,   510,   511,   512,   508,
1452 >     481,   472,   473,   474,   475,   476,   477,   478,   479,   480,
1453 >     482,   483,   513,   487,   488,   489,   490,   486,   485,   491,
1454 >     499,   500,   492,   493,   494,   495,   484,   497,   506,   507,
1455 >     504,   505,   498,   496,   502,   503,   501,     0,     0,     0,
1456 >       0,     0,     0,     0,    46,    47,    48,     0,     0,     0,
1457 >     656,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1458 >     647,   648,   649,   650,   651,   654,   652,   653,   655,     0,
1459         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1460 <       0,     0,     0,     0,     0,     0,     0,     0,   452,   506,
1461 <     501,   502,   499,   503,   504,   500,   463,   453,   454,   491,
1462 <     455,   456,   457,   458,   459,   460,   461,   462,   496,   464,
1463 <     465,   466,   467,   505,   469,   474,   470,   472,   471,   485,
1464 <     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,
1460 >       0,     0,     0,     0,     0,     0,     0,     0,    54,    69,
1461 >      66,    64,    70,    71,    65,    55,    68,    58,    59,    60,
1462 >      56,    67,    61,    62,    63,    57,     0,     0,     0,     0,
1463 >     124,   125,   126,     0,     0,   347,     0,     0,   345,   346,
1464 >       0,    96,     0,     0,     0,     0,    91,     0,     0,     0,
1465         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1466 <       0,     0,    94,    95,    96,    99,   106,   100,   104,   101,
1797 <     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,
1466 >       0,     0,   614,     0,     0,     0,     0,   268,     0,     0,
1467         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1468 <       0,     0,   638,     0,     0,   426,     0,     0,     0,   423,
1469 <     424,   425,     0,     0,   430,   447,     0,     0,   437,   446,
1470 <       0,   443,   444,   445,     0,     0,     0,     0,     0,     0,
1468 >       0,     0,   233,   234,   237,   239,   240,   241,   242,   243,
1469 >     244,   245,   246,   247,   235,   236,   238,   248,   249,   250,
1470 >       0,     0,     0,     0,     0,     0,     0,   423,     0,     0,
1471 >       0,     0,     0,     0,     0,     0,   398,   399,   400,   401,
1472 >     402,   403,   404,   406,   405,   408,   412,   409,   410,   411,
1473 >     407,   449,     0,     0,     0,   446,   447,   448,     0,     0,
1474 >     453,   464,     0,     0,     0,   461,   462,   463,     0,     0,
1475         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1476         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1477         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1478         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1479 +       0,     0,     0,     0,     0,   468,     0,     0,     0,   315,
1480 +       0,     0,     0,     0,     0,     0,   301,   302,   303,   304,
1481 +     309,   305,   306,   307,   308,   440,     0,     0,     0,   437,
1482 +     438,   439,     0,     0,     0,   276,     0,   286,     0,   284,
1483 +     285,   287,   288,    49,     0,     0,     0,    45,     0,     0,
1484 +       0,     0,   103,   104,   105,     0,     0,     0,   203,     0,
1485 +       0,     0,     0,     0,   177,     0,     0,     0,   155,   156,
1486 +     157,   158,   159,   162,   163,   164,   165,   161,   160,   166,
1487 +       0,     0,     0,     0,     0,   335,   336,   337,   338,     0,
1488 +       0,     0,     0,     0,     0,     0,     0,     0,   646,    72,
1489         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1490 <     451,   620,   631,     0,     0,   623,     0,     0,     0,   613,
1491 <     614,   615,   616,   617,   618,   619,     0,     0,     0,   271,
1492 <       0,     0,     0,     0,     0,     0,   257,   258,   259,   260,
1493 <     265,   261,   262,   263,   264,   417,     0,   407,     0,   416,
1494 <       0,   413,   414,   415,     0,   232,     0,     0,     0,   242,
1819 <       0,   240,   241,   243,   244,   107,     0,     0,     0,     0,
1820 <       0,     0,     0,     0,     0,     0,     0,     0,     0,    93,
1821 <      46,     0,     0,     0,    42,     0,     0,     0,     0,     0,
1822 <       0,   294,   295,   296,   297,     0,     0,     0,     0,     0,
1823 <       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,
1490 >       0,     0,     0,     0,     0,     0,     0,     0,    53,     0,
1491 >       0,   381,     0,   376,   377,   378,   127,     0,     0,   123,
1492 >       0,     0,     0,     0,     0,     0,     0,   112,   113,   115,
1493 >     114,   116,     0,     0,   344,     0,     0,   359,     0,     0,
1494 >     352,   353,   354,   355,     0,     0,     0,    90,     0,    28,
1495         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1496 <       0,   637,     0,     0,     0,     0,     0,     0,     0,     0,
1830 <       0,     0,     0,     0,     0,     0,     0,   201,   202,   205,
1831 <     206,   208,   209,   210,   211,   212,   213,   214,   203,   204,
1832 <     207,     0,     0,     0,     0,     0,     0,   386,     0,     0,
1833 <       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,
1496 >       0,     0,     0,   613,   251,     0,     0,     0,     0,     0,
1497         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1498 +       0,     0,     0,   232,   413,     0,     0,     0,     0,     0,
1499         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1500 +     397,     0,     0,     0,   445,     0,   452,     0,     0,     0,
1501 +     460,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1502         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1503         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,
1504         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1505 <       0,    92,     0,     0,    41,     0,     0,     0,   171,     0,
1506 <       0,     0,   148,     0,     0,   131,   132,   133,   134,   137,
1507 <     138,   136,   135,   139,   298,     0,     0,     0,     0,   293,
1508 <       0,     0,     0,     0,     0,     0,     0,   677,     0,     0,
1505 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   467,
1506 >     310,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1507 >     300,     0,     0,     0,   436,   289,     0,     0,     0,     0,
1508 >       0,   283,     0,     0,    44,   106,     0,     0,     0,   102,
1509 >     167,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1510 >       0,     0,     0,   154,   339,     0,     0,     0,     0,   334,
1511 >       0,     0,     0,     0,     0,     0,     0,     0,   645,     0,
1512         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1513 <      49,   315,     0,     0,     0,     0,   310,   339,     0,     0,
1514 <       0,   335,     0,   302,    91,    90,    89,   674,   671,   670,
1515 <     659,   661,    27,    27,    27,    27,    27,    29,    28,   665,
1516 <     666,   669,   667,   672,   673,   675,   676,   668,   660,   662,
1517 <     663,   664,   215,     0,     0,     0,     0,     0,     0,     0,
1518 <       0,     0,     0,     0,     0,     0,     0,   200,   376,     0,
1513 >       0,     0,     0,     0,     0,     0,    52,   379,     0,     0,
1514 >       0,   375,     0,   122,     0,   117,     0,     0,     0,     0,
1515 >       0,   111,     0,   343,   356,     0,     0,     0,     0,   351,
1516 >      99,    98,    97,   643,    28,    28,    28,    28,    28,    28,
1517 >      28,    30,    29,   644,   640,   639,   631,   632,   633,   634,
1518 >     635,   636,   638,   637,   641,   642,     0,     0,     0,     0,
1519         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1520 <       0,     0,     0,     0,   360,     0,     0,   421,   434,     0,
1521 <       0,     0,   436,   521,   525,   512,   541,   553,   552,   608,
1522 <     558,   519,   549,   555,   520,   510,   511,   528,   517,   518,
1523 <     531,   516,   530,   529,   524,   523,   522,   550,   509,   548,
1524 <     606,   607,   545,   542,   587,   603,   604,   588,   589,   590,
1525 <     591,   598,   592,   601,   605,   594,   599,   595,   600,   593,
1526 <     597,   596,   602,     0,   586,   547,   564,   580,   581,   565,
1527 <     566,   567,   568,   575,   569,   578,   582,   571,   576,   572,
1528 <     577,   570,   574,   573,   579,     0,   563,   540,   543,   557,
1529 <     514,   551,   515,   544,   533,   538,   539,   536,   537,   534,
1530 <     535,   527,   526,    35,    35,    35,    37,    36,   609,   556,
1531 <     559,   546,   554,   513,   532,     0,     0,     0,     0,     0,
1532 <       0,   611,     0,     0,   277,     0,     0,     0,     0,     0,
1533 <     255,     0,     0,     0,   406,     0,     0,     0,   250,   246,
1534 <     249,   231,   111,   117,   115,   114,   116,   112,   113,   110,
1535 <     118,   124,   119,   123,   121,   122,   120,   109,   108,   125,
1536 <      47,    48,   140,     0,     0,     0,     0,     0,     0,     0,
1537 <       0,     0,   130,     0,     0,     0,   292,   693,   688,   692,
1538 <     690,   694,   689,   691,    75,    81,    73,    77,    76,    72,
1539 <      71,    69,    70,     0,    68,    74,    80,    78,    79,     0,
1540 <       0,     0,   309,     0,     0,   334,   307,    30,    31,    32,
1541 <      33,    34,     0,     0,     0,     0,     0,     0,     0,     0,
1542 <       0,     0,     0,     0,     0,   197,     0,     0,     0,     0,
1543 <       0,     0,   392,     0,     0,     0,     0,     0,     0,     0,
1544 <       0,   357,   427,   428,   448,   449,   441,     0,   440,   584,
1545 <       0,   561,     0,    38,    39,    40,   636,   635,     0,   634,
1546 <     622,   621,   628,   627,     0,   626,   630,   629,   269,   270,
1547 <     275,     0,   274,     0,   268,   290,   289,   288,   267,   419,
1548 <     411,     0,   410,   418,   237,   238,   236,     0,   235,   253,
1549 <     252,     0,     0,     0,     0,     0,   177,     0,     0,     0,
1550 <       0,     0,   127,   300,   301,   299,    66,     0,   316,   322,
1551 <     328,   332,   331,   330,   327,   323,   326,   329,   324,   325,
1552 <       0,   321,   317,   340,   345,   351,   355,   354,   353,   350,
1553 <     346,   349,   352,   347,   348,     0,   344,   227,   228,   221,
1554 <     223,   225,   224,   222,   216,   229,   220,   218,   219,   226,
1555 <     382,   384,   385,   404,   403,   400,   390,     0,   389,     0,
1556 <     379,   401,   402,   377,   383,   399,   381,   380,   438,     0,
1557 <     585,   562,   632,     0,   624,     0,     0,   272,   277,   283,
1558 <     280,   285,   282,   281,   287,   284,   286,   279,   278,   408,
1559 <       0,   233,     0,   251,   248,   247,   147,   145,   175,     0,
1560 <     174,     0,   141,   144,   146,   152,   168,   169,   153,   154,
1561 <     155,   156,   163,   157,   166,   170,   159,   164,   160,   165,
1562 <     158,   162,   161,   167,     0,   151,   143,    67,   319,     0,
1563 <     342,     0,     0,   387,   392,   396,   397,   394,   395,   398,
1564 <     393,   439,   633,   625,   276,   273,   409,   234,     0,   172,
1565 <     177,   187,   185,   195,   184,   179,   188,   193,   181,   189,
1905 <     192,   186,   180,   194,   190,   191,   182,   183,   178,   149,
1906 <       0,   320,   343,   391,   388,   176,   173,   150
1907 < };
1908 <
1909 < /* YYDEFGOTO[NTERM-NUM].  */
1910 < static const yytype_int16 yydefgoto[] =
1911 < {
1912 <      -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
1520 >       0,    38,     0,     0,   231,     0,     0,     0,     0,     0,
1521 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1522 >     396,     0,     0,   444,   457,     0,     0,   459,   529,   533,
1523 >     517,   518,   548,   520,   612,   557,   521,   522,   554,   528,
1524 >     527,   536,   526,   523,   524,   532,   531,   530,   555,   519,
1525 >     610,   611,   552,   596,   590,   606,   591,   592,   593,   601,
1526 >     609,   594,   603,   607,   597,   608,   598,   602,   595,   605,
1527 >     600,   599,   604,     0,   589,   553,   569,   570,   571,   564,
1528 >     582,   565,   566,   567,   577,   585,   568,   579,   583,   573,
1529 >     584,   574,   578,   572,   581,   576,   575,   580,     0,   563,
1530 >     549,   547,   550,   556,   551,   538,   545,   546,   543,   544,
1531 >     539,   540,   541,   542,   558,   559,   525,   535,   534,   537,
1532 >       0,     0,     0,     0,     0,     0,     0,     0,   299,     0,
1533 >       0,   435,     0,     0,     0,   294,   290,   293,   275,    50,
1534 >      51,     0,     0,   101,     0,     0,     0,     0,     0,     0,
1535 >       0,     0,     0,     0,     0,   153,     0,     0,     0,   333,
1536 >     658,   657,   663,   661,   664,   659,   660,   662,    86,    81,
1537 >      89,    80,    87,    88,    79,    83,    82,    74,    73,    78,
1538 >      75,    77,    76,    84,    85,     0,     0,   374,   128,     0,
1539 >       0,     0,   140,     0,   132,   133,   135,   134,     0,     0,
1540 >       0,     0,   110,   348,     0,     0,     0,   350,    31,    32,
1541 >      33,    34,    35,    36,    37,   263,   264,   255,   273,   272,
1542 >       0,   271,   256,   258,   260,   267,   259,   257,   266,   252,
1543 >     265,   254,   253,    38,    38,    38,    40,    39,   261,   262,
1544 >     418,   421,   422,   432,   429,   415,   430,   427,   428,     0,
1545 >     426,   431,   414,   420,   417,   419,   433,   416,   450,   451,
1546 >     465,   466,   587,     0,   561,     0,   313,   314,   324,   320,
1547 >     321,   323,   328,   325,   326,   319,   327,   322,     0,   318,
1548 >     312,   331,   330,   329,   311,   442,   441,   297,   296,   281,
1549 >     282,   280,     0,   279,     0,     0,     0,   107,   108,   176,
1550 >     172,   222,   210,   219,   208,   213,   228,   221,   226,   212,
1551 >     215,   223,   225,   229,   220,   227,   216,   218,   224,   214,
1552 >     217,     0,   206,   168,   170,   173,   174,   175,   186,   187,
1553 >     188,   181,   199,   182,   183,   184,   194,   202,   185,   196,
1554 >     200,   190,   201,   191,   195,   189,   198,   193,   192,   197,
1555 >       0,   180,   169,   171,   342,   340,   341,   380,   385,   391,
1556 >     394,   387,   393,   388,   392,   390,   386,   389,     0,   384,
1557 >     136,     0,     0,     0,     0,   131,   119,   118,   120,   121,
1558 >     357,   363,   369,   372,   365,   371,   366,   370,   368,   364,
1559 >     367,     0,   362,   358,   269,     0,    41,    42,    43,   424,
1560 >       0,   588,   562,   316,     0,   277,     0,   295,   292,   291,
1561 >       0,     0,     0,   204,     0,   178,     0,   382,     0,     0,
1562 >       0,     0,     0,   130,   360,     0,   270,   425,   317,   278,
1563 >     209,   207,   211,   205,   179,   383,   137,   139,   138,   150,
1564 >     149,   145,   147,   151,   148,   144,   146,     0,   143,   361,
1565 >     141,     0,   142
1566   };
1567  
1568 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1569 <   STATE-NUM.  */
1949 < #define YYPACT_NINF -622
1950 < static const yytype_int16 yypact[] =
1568 >  /* YYPGOTO[NTERM-NUM].  */
1569 > static const yytype_int16 yypgoto[] =
1570   {
1571 <    -622,   715,  -622,  -218,  -245,  -237,  -622,  -622,  -622,  -231,
1572 <    -622,  -228,  -622,  -622,  -622,  -622,  -202,  -196,  -622,  -622,
1573 <    -194,  -191,  -622,  -622,  -185,  -622,  -622,  -622,  -622,  -622,
1574 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1575 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   298,
1576 <     644,  -140,   -61,  -183,    16,  -161,   429,  -150,  -147,  -144,
1577 <    -124,   432,    75,    -9,  -109,   564,   248,   -88,   -70,    20,
1578 <     -45,   -64,   -16,   -13,     2,  -622,  -622,  -622,  -622,  -622,
1579 <      -6,     9,    23,    36,    50,    63,    82,    83,    92,    93,
1580 <      95,    98,    99,   101,   103,   106,   113,   115,   130,  -622,
1581 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1582 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -28,
1583 <    -622,  -622,     5,  -622,    24,  -622,   116,    48,  -622,  -622,
1584 <     132,  -622,   120,   121,   123,   124,   125,   127,   129,   134,
1585 <     135,   136,   139,   140,   141,   142,   144,   145,   146,   148,
1586 <     151,   153,   154,   157,   161,   162,   163,   164,   168,   171,
1587 <     172,   179,   180,  -622,   182,  -622,   189,   190,   191,   194,
1588 <     198,   199,   200,   201,   202,   204,   205,   206,   211,   212,
1589 <     214,   215,   217,   218,   219,   220,   230,    15,  -622,  -622,
1590 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1591 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1592 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1593 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1594 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1595 <    -622,  -622,  -622,  -622,   301,   510,     3,   236,   234,   232,
1596 <     233,   237,   238,   242,   243,   244,   245,   249,   252,   255,
1597 <     259,   185,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1598 <    -622,  -622,  -622,  -622,  -622,   239,   260,   265,    30,  -622,
1599 <    -622,  -622,  -622,   131,  -622,    29,  -622,   266,   268,   270,
1600 <     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
1571 >    -739,  -739,  -739,  -457,  -306,  -738,  -640,  -739,  -739,   957,
1572 >    -739,  -739,  -739,  -739,   971,  -739,  -739,  -739,  -739,  -739,
1573 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1574 >    -739,  -739,  -739,  -739,  1032,  -739,  -739,  -739,  -739,  -739,
1575 >    -739,   621,  -739,  -739,  -739,  -739,  -739,   529,  -739,  -739,
1576 >    -739,  -739,  -739,  -739,   933,  -739,  -739,  -739,  -739,    66,
1577 >    -739,  -739,  -739,  -739,  -739,  -191,  -739,  -739,  -739,   642,
1578 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1579 >    -739,  -739,  -151,  -739,  -739,  -739,  -148,  -739,  -739,  -739,
1580 >     828,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1581 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1582 >    -128,  -739,  -739,  -739,  -739,  -739,  -132,  -739,   650,  -739,
1583 >    -739,  -739,   -22,  -739,  -739,  -739,  -739,  -739,   670,  -739,
1584 >    -739,  -739,  -739,  -739,  -739,  -739,  -104,  -739,  -739,  -739,
1585 >    -739,  -739,  -739,   654,  -739,  -739,  -739,  -739,  -739,   973,
1586 >    -739,  -739,  -739,  -739,   582,  -739,  -739,  -739,  -739,  -739,
1587 >    -117,  -739,  -739,  -739,   598,  -739,  -739,  -739,  -739,   -95,
1588 >    -739,  -739,  -739,   976,  -739,  -739,  -739,  -739,  -739,  -739,
1589 >    -739,  -739,  -739,  -739,  -739,   -68,  -739,  -739,  -739,  -739,
1590 >    -739,  -739,  -739,  -739,   716,  -739,  -739,  -739,  -739,  -739,
1591 >     814,  -739,  -739,  -739,  -739,  1077,  -739,  -739,  -739,  -739,
1592 >     977,  -739,  -739,  -739,  -739,  1027,  -739,  -739,  -739,  -739,
1593 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1594 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1595 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1596 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1597 >      81,  -739,  -739,  -739,    84,  -739,  -739,  -739,  -739,  -739,
1598 >    1108,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,  -739,
1599 >    -739,  -739,  -739,  -739,  -739,  -739,  -739,   979,  -739,  -739,
1600 >    -739,  -739,  -739,  -739,  -739,  -739
1601   };
1602  
1603 < /* YYPGOTO[NTERM-NUM].  */
1604 < static const yytype_int16 yypgoto[] =
1603 >  /* YYDEFGOTO[NTERM-NUM].  */
1604 > static const yytype_int16 yydefgoto[] =
1605   {
1606 <    -622,  -622,  -622,  -493,  -348,  -621,  -430,  -622,  -622,   501,
1607 <    -622,  -622,  -622,  -622,   873,  -622,  -622,  -622,  -282,  -622,
1608 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1609 <    -622,  -622,  1116,  -622,  -622,  -622,  -622,  -622,   953,  -622,
1610 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1611 <    -622,  -622,  -622,  -622,  -622,   431,  -622,  -622,  -622,  -622,
1612 <    -622,  -622,  -622,  -622,  -622,  -622,  -143,  -622,  -622,  -622,
1613 <    -122,  -622,  -622,  -119,  -622,  -622,  -622,  -622,   614,  -622,
1614 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1615 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -66,  -622,
1616 <     739,  -622,  -622,  -622,    40,  -622,  -622,  -622,  -622,  -622,
1617 <     785,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   -47,  -622,
1618 <    -622,   -43,  -622,  -622,  -622,  -622,  -622,  -622,   705,  -622,
1619 <    -622,  -622,  -622,  -622,   908,  -622,  -622,  -622,  -622,   674,
1620 <    -622,  -622,  -622,  -622,  -622,   -95,  -622,  -622,  -622,   669,
1621 <    -622,  -622,  -622,  -622,   -93,  -622,  -622,  -622,  -622,   596,
1622 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1623 <    -622,   -98,  -622,  -622,   -91,  -622,  -622,  -622,  -622,  -622,
1624 <    -622,  -622,  -622,  -622,  -622,  -622,   -46,  -622,   790,  -622,
1625 <    -622,  -622,  -622,  -622,   865,  -622,  -622,  -622,  -622,  1108,
1626 <    -622,  -622,  -622,  -622,  -622,  -622,   -23,  -622,   857,  -622,
1627 <    -622,  -622,  -622,  1051,  -622,  -622,  -622,  -622,  -622,  -622,
1628 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1629 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1630 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1631 <    -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,  -622,
1632 <    -622,  -622,  -622,  -622,  -622,  -622,    97,  -622,  -622,  -622,
1633 <     100,  -622,  -622,  -622,  -622,  -622,  -622,  -622,   793,  -622,
1634 <    -622,  -622,  -622,  -622,   -22,  -622,  -622,  -622,  -622,  -622,
1635 <     -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
1606 >      -1,     1,    26,   831,   832,  1096,  1097,    27,   223,   224,
1607 >     225,   226,    28,   267,   268,   269,   270,   271,   272,   273,
1608 >     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
1609 >     284,   285,    29,    77,    78,    79,    80,    81,    30,    63,
1610 >     501,   502,   503,   504,    31,    70,   586,   587,   588,   589,
1611 >     590,   591,    32,   289,   290,   291,   292,   293,  1053,  1054,
1612 >    1055,  1056,  1057,  1233,  1307,  1308,    33,    64,   517,   518,
1613 >     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
1614 >     759,  1210,  1211,   529,   753,  1181,  1182,    34,    53,   341,
1615 >     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
1616 >     352,   353,   354,   355,   356,   357,   358,   359,   628,  1080,
1617 >    1081,    35,    61,   487,   738,  1152,  1153,   488,   489,   490,
1618 >    1156,   996,   997,   491,   492,    36,    59,   465,   466,   467,
1619 >     468,   469,   470,   471,   723,  1138,  1139,   472,   473,   474,
1620 >      37,    65,   534,   535,   536,   537,   538,    38,   297,   298,
1621 >     299,    39,    72,   599,   600,   601,   602,   603,   816,  1251,
1622 >    1252,    40,    68,   572,   573,   574,   575,   799,  1228,  1229,
1623 >      41,    54,   375,   376,   377,   378,   379,   380,   381,   382,
1624 >     383,   384,   385,   651,  1109,  1110,   386,   387,   388,   389,
1625 >     390,    42,    60,   478,   479,   480,   481,    43,    55,   394,
1626 >     395,   396,   397,    44,   118,   119,   120,    45,    57,   404,
1627 >     405,   406,   407,    46,   169,   170,   171,   172,   173,   174,
1628 >     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
1629 >     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
1630 >     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1631 >     205,   206,   207,   208,   209,   210,   211,   212,   435,   958,
1632 >     959,   213,   433,   933,   934,   214,   215,   216,    47,    97,
1633 >      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
1634 >     108,   109,   110,   111,   112,    48,   239,   240,   241,   242,
1635 >     243,   244,   245,   246,   247,   248
1636   };
1637  
1638 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1639 <   positive, shift that token.  If negative, reduce the rule which
1640 <   number is the opposite.  If YYTABLE_NINF, syntax error.  */
1641 < #define YYTABLE_NINF -1
2133 < static const yytype_uint16 yytable[] =
1638 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1639 >     positive, shift that token.  If negative, reduce the rule whose
1640 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1641 > static const yytype_int16 yytable[] =
1642   {
1643 <     578,   579,   714,    70,   475,   775,  1146,   585,   365,  1139,
1644 <    1141,   118,  1174,  1140,  1142,   475,   131,   125,    49,   441,
1645 <     375,   332,   442,   132,   133,   365,    50,   134,   558,   776,
1646 <     516,   275,    54,  1152,   135,    56,   286,   664,    71,   666,
1647 <     332,  1196,   136,    47,    48,  1197,   137,   138,    72,   125,
1648 <     517,  1258,   777,   139,   681,  1259,   778,   140,   141,   686,
1649 <     142,    61,   443,   549,  1262,   444,   143,    62,  1263,    65,
1650 <     697,   698,    66,   700,   456,   287,   275,   516,    69,  1325,
1651 <     124,  1326,   711,   712,   144,   145,   716,  1264,   288,   146,
1652 <     121,  1265,   705,   706,   366,  1327,   147,   517,   457,  1328,
1653 <     148,   149,   130,   126,   150,  1267,   549,   151,   152,  1268,
1654 <     289,   366,   290,   244,   291,   292,   245,   153,   445,   246,
1655 <      73,   458,   779,   154,   155,   459,   156,   157,   158,   159,
1656 <     160,    79,   293,   375,   484,   126,   446,   376,   333,   247,
1657 <    1279,   161,   282,    80,  1280,   559,   276,   707,   708,   780,
1658 <     162,   518,   163,   164,   285,   165,   476,   333,   166,   167,
1659 <     367,  1281,   168,    81,    82,  1282,  1175,   476,   781,    83,
1660 <    1176,    84,   377,   169,  1318,   330,   277,   367,  1319,   621,
1661 <     550,   622,   519,   806,   623,   485,   248,   558,   477,   592,
1662 <    1320,   276,  1147,   331,  1321,   170,   303,   171,   518,   477,
1663 <     338,   172,   624,   625,   378,   173,   174,   175,   176,   177,
1664 <     593,   594,   560,   178,   179,   486,   337,   595,   460,  1153,
1665 <     487,   277,   180,   550,    85,    86,   626,   461,   462,   519,
1666 <     627,   304,  1323,    87,    88,   363,  1324,   484,   782,   249,
1667 <     250,   251,   252,   253,   254,   255,   256,   551,   339,   303,
1668 <     376,   340,   478,   783,    89,    90,   181,   182,   343,   183,
1669 <     628,   463,   629,   478,   341,   184,  1061,   447,   364,   654,
1670 <     185,    91,    92,   344,   630,   186,   744,   439,   305,   775,
1671 <     728,   661,    93,   488,   304,   377,   257,   345,   485,   830,
1672 <     551,    94,   513,   596,   597,   598,   631,   532,   599,    70,
1673 <     346,   566,   441,   776,   559,   442,   600,   993,   994,   995,
1674 <     373,   552,  1329,   306,   347,   307,   308,   378,   486,   601,
1675 <     602,   258,   464,   487,   825,  1339,   777,   348,   632,  1340,
1676 <     778,   305,  1081,  1082,    71,   739,   603,   604,   798,  1359,
1677 <    1117,  1118,   633,  1360,    72,   443,   349,   350,   444,  1097,
1678 <    1098,  1099,  1100,  1101,   552,   634,   351,   352,   309,   353,
1679 <     310,   311,   354,   355,   605,   356,   306,   357,   307,   308,
1680 <     358,   560,  1143,  1144,  1145,  1006,   312,   359,  1269,   360,
1681 <     372,    95,    96,    97,   384,   385,   488,   386,   387,   388,
1682 <     573,   389,   361,   390,   515,   751,   779,   568,   391,   392,
1683 <     393,   445,   259,   394,   395,   396,   397,  1270,   398,   399,
1684 <     400,   309,   401,   310,   311,   402,    73,   403,   404,   446,
1685 <     313,   405,   713,   780,  1271,   406,   407,   408,   409,   312,
1686 <     131,  1272,   410,   248,   635,   411,   412,   132,   133,   260,
1687 <     893,   134,   781,   413,   414,  1114,   416,   508,   135,  1273,
1688 <     876,   314,   315,   418,   419,   420,   136,   547,   421,   569,
1689 <     137,   138,   422,   423,   424,   425,   426,   139,   427,   428,
1690 <     429,   140,   141,   313,   142,   430,   431,  1274,   432,   433,
1691 <     143,   434,   435,   436,   437,  1275,   249,   250,   251,   252,
1692 <     253,   254,   255,   256,   438,   495,   496,   497,   144,   145,
1693 <     510,   498,   499,   146,   314,   315,   500,   501,   502,   503,
1694 <     147,   456,   782,   504,   148,   149,   505,  1104,   150,   506,
1695 <    1341,   151,   152,   507,   511,  1112,  1113,   783,  1276,   512,
1696 <     525,   153,   526,   257,   527,   457,   528,   154,   155,   577,
1697 <     156,   157,   158,   159,   160,   529,   530,  1277,   531,   534,
1698 <     447,   621,  1342,   622,   535,   161,   623,   570,   458,   536,
1699 <     537,   538,   459,  1343,   162,   286,   163,   164,   258,   165,
1700 <     539,   540,   166,   167,   624,   625,   168,   541,   543,  1344,
1701 <     544,   842,   843,   844,   845,   846,  1345,   169,   545,   546,
1702 <     565,  1346,   571,  1347,   572,   574,   575,   576,   626,   577,
1703 <     580,   591,   627,   581,   287,  1348,   582,   583,   584,   170,
1704 <     586,   171,   587,   588,   589,   172,   590,   288,   652,   173,
1705 <     174,   175,   176,   177,   653,   657,   656,   178,   179,   658,
1706 <     659,   663,   628,   665,   629,   667,   180,   668,  1349,   289,
1707 <     669,   290,   670,   291,   292,    79,   630,   671,   672,   259,
1708 <     673,   674,   675,   676,  1350,   460,   677,    80,   678,   679,
1709 <     680,   293,   683,   682,   461,   462,   684,   685,   631,   687,
1710 <     181,   182,  1351,   183,  1352,  1353,   688,    81,    82,   184,
1711 <     689,   690,   691,    83,   185,    84,   260,   692,   693,   186,
1712 <     761,   762,   763,   764,   765,   766,   767,   694,   463,   695,
1713 <     632,   696,   699,   592,   702,   701,   713,   715,   703,   704,
1714 <     721,  1199,   709,   710,   633,     2,     3,   717,  1214,   723,
1715 <       4,   718,   724,   719,   593,   594,   720,   634,   770,   753,
1716 <     754,   595,   726,   727,   730,   755,     5,   746,    85,    86,
1717 <       6,   731,  1354,     7,   732,   734,   735,    87,    88,   736,
1718 <       8,   737,   738,  1355,   741,   743,   756,   757,   748,   464,
1719 <     749,   750,   758,  1356,   759,     9,   760,   768,    89,    90,
1720 <     769,   772,   795,  1357,   773,   800,   801,    10,    11,   514,
1721 <      12,   771,   774,   802,   803,    91,    92,    13,   804,   796,
1722 <    1200,   794,   805,   807,   808,   809,    93,  1215,   797,   810,
1723 <     811,   812,   813,    14,   814,    94,   635,   596,   597,   598,
1724 <     815,   816,   599,    15,   817,    16,   818,   819,   820,   821,
1725 <     600,   832,  1201,   822,   824,   828,   827,   833,   834,  1216,
1726 <     835,   836,    17,   601,   602,   837,   838,  1202,  1181,   895,
1727 <     863,  1007,   896,   839,  1217,   899,   840,   841,   849,    18,
1728 <     603,   604,   850,   851,   864,   852,   853,  1203,  1204,   854,
1729 <     855,   900,   856,   857,  1218,  1219,  1205,  1206,  1207,  1208,
1730 <     858,   859,   865,  1220,  1221,  1222,  1223,  1009,   605,  1209,
1731 <    1010,   866,   867,   860,    19,   861,  1224,   862,  1013,   868,
1732 <     878,   869,   897,    20,    21,    95,    96,    97,    22,    23,
1733 <     934,   935,   936,   937,   938,   870,   939,   940,   898,   941,
1734 <     942,   943,  1121,  1016,   944,  1317,   871,  1028,   872,   873,
1735 <     874,   875,   879,   880,   945,   946,   947,   881,   948,   949,
1736 <     950,   882,   883,   951,   902,   885,   886,   952,   956,   957,
1737 <     958,   959,   960,   887,   961,   962,   888,   963,   964,   965,
1738 <     889,   890,   966,   891,   892,    24,   901,   903,   904,  1005,
1739 <     905,   906,   967,   968,   969,   907,   970,   971,   972,   908,
1740 <     909,   973,   910,   911,   912,   974,  1295,  1296,  1297,  1298,
1741 <    1299,   913,  1300,  1301,   914,  1302,  1303,  1304,   915,   916,
1742 <    1305,   917,   918,   919,   920,   921,   922,  1012,   923,   924,
1743 <    1306,  1307,  1308,   925,  1309,  1310,  1311,   926,   927,  1312,
1744 <     928,   929,   930,  1313,   931,   932,   933,   955,   977,   978,
1745 <     979,   980,   981,   982,   983,   984,   985,   986,   987,   988,
1746 <     989,   990,   991,   992,   998,  1015,   999,  1000,  1001,  1002,
1747 <    1003,  1004,  1017,  1011,  1018,  1008,  1019,  1014,  1020,  1021,
1748 <    1022,  1023,  1024,  1025,  1026,  1027,  1031,  1032,  1033,  1034,
1749 <    1035,  1036,  1037,  1038,  1039,  1040,  1041,  1042,  1043,  1044,
1750 <    1045,  1046,  1047,  1048,  1049,  1050,  1051,  1052,  1063,  1064,
1751 <    1065,  1053,  1054,  1056,  1057,  1058,  1060,  1066,  1067,  1068,
1752 <    1069,  1070,  1071,  1072,  1073,  1074,  1075,  1076,  1077,  1078,
1753 <    1079,  1080,  1085,  1086,  1087,  1088,  1089,  1091,  1092,  1090,
1754 <    1093,  1095,  1094,  1096,  1102,  1103,  1105,  1106,  1107,  1108,
1755 <    1109,  1110,  1111,  1115,  1116,  1119,  1120,  1122,  1123,  1124,
1756 <    1125,  1126,  1127,  1128,  1129,  1130,  1131,  1132,  1133,  1134,
1757 <    1135,  1150,  1151,  1156,  1157,  1160,  1158,  1136,  1159,  1164,
1758 <    1165,  1166,  1170,  1167,  1246,  1168,  1184,  1169,  1173,  1185,
1759 <    1179,  1187,  1180,  1188,  1189,  1191,  1283,  1182,  1192,  1186,
1760 <    1190,  1193,  1194,  1195,  1198,  1212,  1213,  1227,  1228,  1229,
1761 <    1230,  1231,  1232,  1233,  1234,  1235,  1236,  1237,  1288,   548,
1762 <     342,  1238,  1239,  1240,  1241,  1242,  1243,  1244,  1245,  1250,
1763 <    1251,  1252,  1253,  1254,  1255,  1256,  1257,  1285,  1286,  1287,
1764 <    1292,  1293,  1294,  1316,   509,  1062,  1337,  1367,  1366,  1365,
1765 <     877,  1335,  1284,  1334,  1361,   799,  1364,   826,  1362,   752,
1766 <     831,  1363,   894,   655,  1336,   374,  1331,   662,   440,  1261,
1767 <    1260,   729,   567,  1333,  1332,   362,     0,     0,   533,     0,
1768 <     740,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1643 >     862,   863,   610,  1107,    51,   230,    52,   615,   122,   617,
1644 >     618,   569,   295,   123,   124,   391,   125,   126,   595,    56,
1645 >     401,   127,   116,   530,   705,    49,    50,   475,   706,   128,
1646 >     129,   707,    73,   391,   498,   708,   498,  1078,   231,   130,
1647 >     220,   220,   131,   132,   133,   866,   867,   232,    58,   134,
1648 >     233,   234,  1093,  1094,  1095,   235,   236,   237,   861,    62,
1649 >      66,    74,   530,   531,   135,   136,   456,  1122,   287,    75,
1650 >     116,  1123,    67,   137,  1049,   392,   138,   139,  1049,   238,
1651 >     482,   401,   117,   595,   457,   140,    69,   475,   569,    71,
1652 >     295,  1124,   141,   392,   142,  1125,   143,   113,   144,   532,
1653 >     145,   146,   531,   672,   458,   674,   675,   287,   570,   296,
1654 >     499,  1079,   499,   147,  1149,   596,   685,   402,   148,   149,
1655 >     150,   690,   151,   152,   153,   249,   114,   154,   459,    76,
1656 >     117,   700,   701,   483,   221,   221,   581,  1254,   532,   393,
1657 >     484,  1255,   485,   714,   403,   716,   717,   533,  1259,   861,
1658 >     250,   476,  1260,   155,   251,  1280,  1263,   393,   222,   222,
1659 >    1264,   115,   121,   156,   157,   158,   159,   160,   161,   162,
1660 >     217,  1050,    82,   323,   581,  1050,   218,  1265,   402,   252,
1661 >     596,  1266,   219,   460,   227,   570,   533,   296,   253,   324,
1662 >     325,   461,   462,   326,  1108,    83,    84,   228,    85,    86,
1663 >     229,   486,  1273,   286,    87,   403,  1274,   500,   294,   500,
1664 >     254,   476,   463,  1275,   255,   301,   300,  1276,   493,   163,
1665 >     164,   165,   256,   166,   167,   257,   258,   549,   505,   571,
1666 >      88,    89,   168,   582,   547,   327,   597,   454,   302,   598,
1667 >     777,  -129,    90,    91,    92,   360,   506,   361,   477,   362,
1668 >      93,    94,   328,   329,   330,   331,   332,   259,  1150,   303,
1669 >     333,   305,   663,   363,   334,   748,   507,  1151,  1051,   496,
1670 >     335,   582,  1051,   576,   260,    95,    96,   261,   262,   263,
1671 >    -129,   336,   337,   364,   304,  1277,   307,   464,   288,  1278,
1672 >     508,   768,  1052,   338,   308,   729,  1052,   578,   365,   399,
1673 >     366,   597,   583,  1234,   598,   607,   571,   367,   477,   740,
1674 >     669,   580,   818,   505,   608,   339,   733,   800,   368,   593,
1675 >     584,   848,   309,    73,   264,   509,   853,   288,   310,   856,
1676 >     482,   506,  1299,   860,  1300,   311,   585,  1284,   604,  1310,
1677 >     583,  1285,   369,  1311,   456,   510,   312,   265,   266,   313,
1678 >     314,   507,    74,   315,   567,  1256,  1257,  1258,   584,   340,
1679 >      75,   511,   457,   316,   317,   810,   370,  1068,  1069,  1070,
1680 >    1071,  1072,  1073,  1074,   585,   508,   318,   319,   512,   513,
1681 >     320,  1301,   458,   483,   398,   408,   371,   409,   410,   411,
1682 >     484,   122,   485,   412,   413,   372,   123,   124,  1302,   125,
1683 >     126,   321,   642,   623,   127,   605,   459,   414,   415,   416,
1684 >     509,   417,   128,   129,   418,   419,   420,   421,   422,   423,
1685 >      76,   424,   130,   425,   426,   131,   132,   133,   427,   514,
1686 >     510,   428,   134,   429,   430,   431,   432,  1303,  1304,   434,
1687 >     436,   437,   438,   439,   373,   440,   511,   135,   136,   515,
1688 >     441,   486,   442,   516,   443,   444,   137,   762,   445,   138,
1689 >     139,   460,   446,   512,   513,   447,   448,   374,   140,   461,
1690 >     462,   449,  1161,   450,   659,   141,   606,   142,   451,   143,
1691 >     452,   144,   453,   145,   146,   494,   495,   539,  1162,  1305,
1692 >     463,  1128,   540,   541,  1306,   542,   147,   543,   544,  1163,
1693 >     545,   148,   149,   150,   546,   151,   152,   153,   550,   551,
1694 >     154,   552,   553,   554,   514,   555,  1129,   556,   557,   558,
1695 >     559,   560,   561,   562,   360,   563,   361,   564,   362,  1218,
1696 >     565,   249,   566,  1164,   515,  1165,   155,   577,   516,   609,
1697 >     592,   609,   363,   611,  1130,   612,   156,   157,   158,   159,
1698 >     160,   161,   162,   613,   614,   616,   250,   619,   620,   621,
1699 >     251,   622,   364,  1166,   624,   464,   824,   825,   826,   827,
1700 >     828,   829,   830,   625,   644,  1131,  1132,   365,   626,   366,
1701 >     665,   627,   671,  1133,   629,   252,   367,   630,   631,   632,
1702 >     633,   634,  1281,  1219,   253,   635,  1167,   368,  1168,   636,
1703 >     637,   638,   163,   164,   165,   639,   166,   167,  1134,   640,
1704 >     641,   645,   646,   647,   648,   168,   254,  1169,   649,   650,
1705 >     255,   369,   666,   652,  1135,  1220,   653,   654,   256,   655,
1706 >     656,   257,   258,  1221,   657,   658,   661,   662,   667,  1170,
1707 >     668,   673,  1222,   676,  1171,   370,   677,   678,  1172,   679,
1708 >     680,   681,  1173,   682,   683,   684,   686,  1174,   687,   688,
1709 >     689,  1175,   691,   259,   692,   371,  1223,   693,  1224,  1225,
1710 >     230,   694,  1176,   696,   372,  1177,   936,  1178,   937,   938,
1711 >     260,   323,  1226,   261,   262,   263,  1136,   698,  1179,  1227,
1712 >       2,     3,   695,   697,     4,  1180,   699,   324,   325,   702,
1713 >     703,   326,   704,   231,  1137,   709,     5,   710,   711,     6,
1714 >       7,   712,   232,   713,   715,   233,   234,   718,   721,     8,
1715 >     235,   236,   237,   373,   719,   722,   742,   720,   735,   743,
1716 >     264,     9,   773,   724,    10,    11,   725,   726,   780,   727,
1717 >     728,   731,   732,   327,   238,   736,   374,   737,   739,   744,
1718 >     745,   746,    12,   265,   266,    13,   747,   750,   751,   752,
1719 >     328,   329,   330,   331,   332,   764,    14,  1188,   333,  1189,
1720 >    1190,   754,   334,   770,   779,   771,   755,   756,   335,   757,
1721 >     772,   758,   774,   775,   776,   760,    15,    16,   782,   336,
1722 >     337,   781,   761,   765,   939,   940,   941,   766,   767,   942,
1723 >     943,   338,   944,   945,    17,   946,   778,   947,   913,   783,
1724 >     948,   784,   949,   950,   785,   786,   787,   788,   951,   789,
1725 >     790,    18,   952,   339,   796,   791,   953,   954,   955,   792,
1726 >     793,   794,   795,   956,    19,    20,   797,   802,   957,   803,
1727 >     798,   812,  1241,   804,   846,   805,   806,   847,   850,   807,
1728 >     808,   809,   813,   814,   815,   851,   820,   817,    21,   852,
1729 >     821,   822,   823,   833,   834,   835,   836,   340,   837,   838,
1730 >     839,    22,   840,   841,   842,   843,    23,   844,   845,   849,
1731 >     854,    24,   855,   857,    25,  1191,  1192,  1193,   858,   859,
1732 >    1194,  1195,   861,  1196,  1197,   869,  1198,   864,  1199,   865,
1733 >     868,  1200,   870,  1201,  1202,   871,  1242,   872,   873,  1203,
1734 >     874,   875,   876,  1204,   877,   878,   879,  1205,  1206,  1207,
1735 >     881,   882,   885,   886,  1208,   984,   914,   915,   916,  1209,
1736 >     982,   917,   918,   880,   919,   920,   981,   921,  1243,   922,
1737 >      82,   883,   923,   884,   924,   925,  1244,   980,   887,   888,
1738 >     926,   889,   890,   891,   927,  1245,   892,   893,   928,   929,
1739 >     930,   894,   895,    83,    84,   931,    85,    86,   983,   985,
1740 >     932,   896,    87,   897,   898,   899,   986,   900,   901,  1246,
1741 >     987,  1247,  1248,   902,   903,   904,   905,   906,   907,   989,
1742 >     908,   990,   909,   910,   911,  1249,   912,   935,    88,    89,
1743 >     960,   992,  1250,   993,   995,   994,  1001,   961,  1002,  1004,
1744 >      90,    91,    92,  1007,  1008,   962,  1009,   963,    93,    94,
1745 >    1010,  1013,  1006,   964,   965,   966,  1005,  1014,  1016,  1017,
1746 >     967,   968,  1018,   969,   970,   971,   972,   973,   974,   975,
1747 >     976,   977,   978,    95,    96,   979,  1011,   988,   991,   998,
1748 >     999,  1000,  1003,  1045,  1058,  1015,  1019,  1012,  1020,  1021,
1749 >    1022,  1023,  1024,  1025,  1059,  1026,  1027,  1028,  1029,  1030,
1750 >    1031,  1032,  1033,  1034,  1060,  1061,  1035,  1036,  1037,  1038,
1751 >    1039,  1040,  1064,  1041,  1042,  1043,  1066,  1044,  1267,  1047,
1752 >    1048,  1046,  1062,  1063,  1065,  1279,  1067,  1231,  1075,  1076,
1753 >    1077,  1082,  1083,  1084,  1085,  1086,  1087,  1290,  1088,   306,
1754 >    1089,  1090,  1291,  1091,  1292,   811,  1092,  1098,  1099,  1235,
1755 >    1312,  1100,   749,  1101,  1102,  1294,  1293,  1286,  1103,  1104,
1756 >    1105,  1106,  1111,  1268,  1289,   730,  1112,  1113,   741,  1114,
1757 >    1115,  1116,  1117,  1118,  1119,  1120,  1121,  1126,  1127,  1140,
1758 >    1141,  1142,  1143,  1144,  1145,  1146,  1147,  1148,  1154,   763,
1759 >    1288,  1157,  1155,  1158,  1159,  1160,  1183,  1184,  1309,   643,
1760 >     801,  1185,  1186,  1187,  1212,  1213,  1214,  1215,  1216,  1217,
1761 >     497,   819,  1230,  1295,  1236,  1237,  1232,  1238,   769,  1239,
1762 >    1240,  1253,  1287,  1269,   734,   400,   455,  1283,  1296,  1270,
1763 >    1271,  1272,  1282,  1297,  1298,   322,  1262,  1261,   664,     0,
1764 >       0,     0,     0,     0,     0,     0,     0,     0,   548,     0,
1765 >       0,     0,   579,     0,     0,     0,     0,     0,     0,     0,
1766 >       0,     0,     0,     0,     0,     0,     0,     0,   568,     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 >     594,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1771 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1772 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1773         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1774 <     745
1774 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1775 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1776 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1777 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1778 >       0,   660,     0,     0,     0,     0,     0,     0,     0,     0,
1779 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1780 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1781 >       0,   670
1782   };
1783  
2265 #define yypact_value_is_default(yystate) \
2266  ((yystate) == (-622))
2267
2268 #define yytable_value_is_error(yytable_value) \
2269  YYID (0)
2270
1784   static const yytype_int16 yycheck[] =
1785   {
1786 <     348,   349,   432,     1,     1,     1,    11,   355,     1,   261,
1787 <     261,   151,    75,   265,   265,     1,     1,     1,   263,     1,
1788 <       1,     1,     4,     8,     9,     1,   263,    12,     1,    25,
1789 <       1,     1,   263,    11,    19,   263,     1,   385,    36,   387,
1790 <       1,   261,    27,   261,   262,   265,    31,    32,    46,     1,
1791 <      21,   261,    48,    38,   402,   265,    52,    42,    43,   407,
1792 <      45,   263,    44,     1,   261,    47,    51,   263,   265,   263,
1793 <     418,   419,   263,   421,     1,    40,     1,     1,   263,    10,
1794 <     263,    12,   430,   431,    69,    70,   434,   261,    53,    74,
1795 <     151,   265,   195,   196,    87,    26,    81,    21,    25,    30,
1796 <      85,    86,   263,    87,    89,   261,     1,    92,    93,   265,
1797 <      75,    87,    77,   263,    79,    80,   263,   102,   100,   263,
1798 <     118,    48,   118,   108,   109,    52,   111,   112,   113,   114,
1799 <     115,     1,    97,     1,     1,    87,   118,   118,   118,   263,
1800 <     261,   126,   151,    13,   265,   118,   116,   195,   196,   145,
1801 <     135,   122,   137,   138,   263,   140,   153,   118,   143,   144,
1802 <     153,   261,   147,    33,    34,   265,   229,   153,   164,    39,
1803 <     233,    41,   153,   158,   261,   263,   146,   153,   265,     1,
1804 <     118,     3,   153,   531,     6,    52,     1,     1,   185,     1,
1805 <     261,   116,   197,   263,   265,   180,     1,   182,   122,   185,
1806 <     264,   186,    24,    25,   185,   190,   191,   192,   193,   194,
1807 <      22,    23,   185,   198,   199,    82,   261,    29,   145,   197,
1808 <      87,   146,   207,   118,    94,    95,    48,   154,   155,   153,
1809 <      52,    36,   261,   103,   104,   263,   265,     1,   234,    54,
1810 <      55,    56,    57,    58,    59,    60,    61,   185,   264,     1,
1811 <     118,   264,   249,   249,   124,   125,   241,   242,   264,   244,
1812 <      82,   188,    84,   249,   262,   250,   262,   249,   263,   262,
1813 <     255,   141,   142,   264,    96,   260,   262,   262,    83,     1,
1814 <     262,   262,   152,   150,    36,   153,   101,   264,    52,   262,
1815 <     185,   161,   262,   105,   106,   107,   118,   262,   110,     1,
1816 <     264,   262,     1,    25,   118,     4,   118,    14,    15,    16,
1817 <     262,   249,   243,   118,   264,   120,   121,   185,    82,   131,
1818 <     132,   136,   249,    87,   262,   261,    48,   264,   150,   265,
1819 <      52,    83,   167,   168,    36,   262,   148,   149,   262,   261,
1820 <     214,   215,   164,   265,    46,    44,   264,   264,    47,   842,
1821 <     843,   844,   845,   846,   249,   177,   264,   264,   163,   264,
1822 <     165,   166,   264,   264,   176,   264,   118,   264,   120,   121,
1823 <     264,   185,   993,   994,   995,   723,   181,   264,    20,   264,
1824 <     264,   251,   252,   253,   264,   264,   150,   264,   264,   264,
1825 <     129,   264,   262,   264,   263,   262,   118,   151,   264,   264,
1826 <     264,   100,   217,   264,   264,   264,   264,    49,   264,   264,
1827 <     264,   163,   264,   165,   166,   264,   118,   264,   264,   118,
1828 <     225,   264,   129,   145,    66,   264,   264,   264,   264,   181,
1829 <       1,    73,   264,     1,   256,   264,   264,     8,     9,   254,
1830 <     262,    12,   164,   264,   264,   875,   264,   262,    19,    91,
1831 <     262,   256,   257,   264,   264,   264,    27,   262,   264,   151,
1832 <      31,    32,   264,   264,   264,   264,   264,    38,   264,   264,
1833 <     264,    42,    43,   225,    45,   264,   264,   119,   264,   264,
1834 <      51,   264,   264,   264,   264,   127,    54,    55,    56,    57,
1835 <      58,    59,    60,    61,   264,   261,   264,   264,    69,    70,
1836 <     261,   264,   264,    74,   256,   257,   264,   264,   264,   264,
1837 <      81,     1,   234,   264,    85,    86,   264,   865,    89,   264,
1838 <       5,    92,    93,   264,   264,   873,   874,   249,   170,   264,
1839 <     264,   102,   264,   101,   264,    25,   264,   108,   109,   129,
1840 <     111,   112,   113,   114,   115,   264,   264,   189,   264,   261,
1841 <     249,     1,    37,     3,   264,   126,     6,   151,    48,   264,
1842 <     264,   264,    52,    48,   135,     1,   137,   138,   136,   140,
1843 <     264,   264,   143,   144,    24,    25,   147,   264,   264,    64,
1844 <     264,   171,   172,   173,   174,   175,    71,   158,   264,   264,
1845 <     264,    76,   261,    78,   195,   129,   195,   195,    48,   129,
1846 <     129,   261,    52,   129,    40,    90,   195,   195,   129,   180,
1847 <     195,   182,   195,   195,   195,   186,   195,    53,   264,   190,
1848 <     191,   192,   193,   194,   264,   261,   151,   198,   199,   264,
1849 <     264,   195,    82,   195,    84,   129,   207,   151,   123,    75,
1850 <     129,    77,   195,    79,    80,     1,    96,   195,   129,   217,
1851 <     151,   195,   129,   129,   139,   145,   129,    13,   195,   195,
1852 <     195,    97,   195,   151,   154,   155,   129,   129,   118,   129,
1853 <     241,   242,   157,   244,   159,   160,   129,    33,    34,   250,
1854 <     151,   129,   129,    39,   255,    41,   254,   195,   195,   260,
1855 <     218,   219,   220,   221,   222,   223,   224,   264,   188,   195,
1856 <     150,   264,   195,     1,   195,   151,   129,   151,   195,   195,
1857 <     261,    90,   195,   195,   164,     0,     1,   195,    90,   264,
1858 <       5,   195,   264,   195,    22,    23,   195,   177,   195,   151,
1859 <     151,    29,   264,   264,   261,   151,    21,   261,    94,    95,
1860 <      25,   264,   227,    28,   264,   264,   264,   103,   104,   264,
1861 <      35,   264,   264,   238,   264,   264,   151,   151,   264,   249,
1862 <     264,   264,   151,   248,   151,    50,   151,   151,   124,   125,
1863 <     151,   151,   264,   258,   151,   195,   195,    62,    63,   278,
1864 <      65,   261,   261,   195,   151,   141,   142,    72,   195,   264,
1865 <     169,   261,   195,   261,   151,   195,   152,   169,   264,   151,
1866 <     151,   151,   151,    88,   151,   161,   256,   105,   106,   107,
1867 <     264,   151,   110,    98,   129,   100,   151,   151,   261,   261,
1868 <     118,   151,   201,   264,   264,   264,   261,   261,   261,   201,
1869 <     261,   261,   117,   131,   132,   261,   261,   216,   200,   151,
1870 <     264,   195,   151,   261,   216,   151,   261,   261,   261,   134,
1871 <     148,   149,   261,   261,   264,   261,   261,   236,   237,   261,
1872 <     261,   151,   261,   261,   236,   237,   245,   246,   247,   248,
1873 <     261,   261,   264,   245,   246,   247,   248,   151,   176,   258,
1874 <     151,   264,   264,   261,   169,   261,   258,   261,   195,   264,
1875 <     261,   264,   261,   178,   179,   251,   252,   253,   183,   184,
1876 <     202,   203,   204,   205,   206,   264,   208,   209,   261,   211,
1877 <     212,   213,   195,   129,   216,  1197,   264,   129,   264,   264,
1878 <     264,   264,   264,   264,   226,   227,   228,   264,   230,   231,
1879 <     232,   264,   264,   235,   261,   264,   264,   239,   202,   203,
1880 <     204,   205,   206,   264,   208,   209,   264,   211,   212,   213,
1881 <     264,   264,   216,   264,   264,   240,   264,   261,   261,   264,
1882 <     261,   261,   226,   227,   228,   261,   230,   231,   232,   261,
1883 <     261,   235,   261,   261,   261,   239,   202,   203,   204,   205,
1884 <     206,   261,   208,   209,   261,   211,   212,   213,   261,   261,
1885 <     216,   261,   261,   261,   261,   261,   261,   151,   261,   261,
1886 <     226,   227,   228,   261,   230,   231,   232,   261,   261,   235,
1887 <     261,   261,   261,   239,   261,   261,   261,   261,   261,   261,
1888 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1889 <     261,   261,   261,   261,   261,   151,   261,   261,   261,   261,
1890 <     261,   261,   151,   261,   151,   264,   151,   264,   261,   151,
1891 <     264,   151,   261,   264,   151,   151,   261,   261,   261,   261,
1892 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1893 <     261,   261,   261,   261,   261,   261,   261,   261,   151,   151,
1894 <     151,   264,   264,   264,   264,   264,   264,   261,   261,   261,
1895 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1896 <     261,   261,   261,   261,   261,   261,   151,   151,   261,   264,
1897 <     151,   261,   264,   261,   129,   129,   129,   129,   129,   129,
1898 <     151,   129,   129,   261,   151,   151,   151,   264,   151,   151,
1899 <     151,   151,   129,   151,   151,   151,   261,   261,   261,   261,
1900 <     261,   261,   261,   261,   261,   128,   261,   156,   261,   261,
1901 <     261,   261,   156,   261,   128,   261,   151,   261,   261,   195,
1902 <     261,   151,   261,   151,   151,   151,   129,   265,   261,   264,
1903 <     264,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1904 <     261,   261,   261,   261,   261,   261,   261,   261,   128,   316,
1905 <      74,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1906 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
1907 <     261,   261,   261,   261,   261,   784,  1282,  1360,  1340,  1338,
1908 <     606,  1268,  1182,  1266,  1319,   520,  1324,   553,  1321,   490,
1909 <     561,  1322,   636,   368,  1280,   127,  1259,   380,   187,  1142,
1910 <    1140,   448,   334,  1265,  1263,    98,    -1,    -1,   294,    -1,
1911 <     465,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1786 >     640,   641,   308,     8,   231,     1,   231,   313,     1,   315,
1787 >     316,     1,     1,     6,     7,     1,     9,    10,     1,   231,
1788 >       1,    14,     1,     1,   211,   229,   230,     1,   215,    22,
1789 >      23,   211,     1,     1,     1,   215,     1,    50,    34,    32,
1790 >       1,     1,    35,    36,    37,   178,   179,    43,   231,    42,
1791 >      46,    47,    11,    12,    13,    51,    52,    53,   108,   231,
1792 >     231,    30,     1,    41,    57,    58,     1,   229,     1,    38,
1793 >       1,   233,   231,    66,     1,    61,    69,    70,     1,    75,
1794 >       1,     1,    61,     1,    19,    78,   231,     1,     1,   231,
1795 >       1,   229,    85,    61,    87,   233,    89,   231,    91,    77,
1796 >      93,    94,    41,   409,    39,   411,   412,     1,    98,    98,
1797 >      77,   124,    77,   106,    46,    98,   422,    98,   111,   112,
1798 >     113,   427,   115,   116,   117,     1,   231,   120,    63,    98,
1799 >      61,   437,   438,    54,    95,    95,     1,   229,    77,   125,
1800 >      61,   233,    63,   449,   125,   451,   452,   125,   229,   108,
1801 >      26,   125,   233,   146,    30,   205,   229,   125,   119,   119,
1802 >     233,   231,   231,   156,   157,   158,   159,   160,   161,   162,
1803 >     231,    98,     1,     1,     1,    98,   231,   229,    98,    55,
1804 >      98,   233,   231,   118,   231,    98,   125,    98,    64,    17,
1805 >      18,   126,   127,    21,   199,    24,    25,   231,    27,    28,
1806 >     231,   122,   229,   231,    33,   125,   233,   174,   231,   174,
1807 >      86,   125,   147,   229,    90,   229,   231,   233,   229,   212,
1808 >     213,   214,    98,   216,   217,   101,   102,   229,     1,   219,
1809 >      59,    60,   225,    98,   230,    63,   219,   230,   232,   222,
1810 >     546,   174,    71,    72,    73,     1,    19,     3,   222,     5,
1811 >      79,    80,    80,    81,    82,    83,    84,   133,   190,   232,
1812 >      88,   230,   230,    19,    92,   230,    39,   199,   195,   230,
1813 >      98,    98,   195,   229,   150,   104,   105,   153,   154,   155,
1814 >     174,   109,   110,    39,   232,   229,   232,   222,   221,   233,
1815 >      63,   230,   219,   121,   232,   230,   219,   230,    54,   230,
1816 >      56,   219,   167,   230,   222,   229,   219,    63,   222,   230,
1817 >     230,   174,   230,     1,   108,   143,   230,   230,    74,   230,
1818 >     185,   627,   232,     1,   200,    98,   632,   221,   232,   635,
1819 >       1,    19,    65,   639,    67,   232,   201,   229,   123,   229,
1820 >     167,   233,    98,   233,     1,   118,   232,   223,   224,   232,
1821 >     232,    39,    30,   232,   230,  1093,  1094,  1095,   185,   187,
1822 >      38,   134,    19,   232,   232,   230,   122,   824,   825,   826,
1823 >     827,   828,   829,   830,   201,    63,   232,   232,   151,   152,
1824 >     232,   114,    39,    54,   232,   232,   142,   232,   232,   232,
1825 >      61,     1,    63,   232,   232,   151,     6,     7,   131,     9,
1826 >      10,   230,   230,   229,    14,   123,    63,   232,   232,   232,
1827 >      98,   232,    22,    23,   232,   232,   232,   232,   232,   232,
1828 >      98,   232,    32,   232,   232,    35,    36,    37,   232,   202,
1829 >     118,   232,    42,   232,   232,   232,   232,   170,   171,   232,
1830 >     232,   232,   232,   232,   200,   232,   134,    57,    58,   222,
1831 >     232,   122,   232,   226,   232,   232,    66,   230,   232,    69,
1832 >      70,   118,   232,   151,   152,   232,   232,   223,    78,   126,
1833 >     127,   232,     4,   232,   230,    85,   123,    87,   232,    89,
1834 >     232,    91,   232,    93,    94,   232,   232,   232,    20,   222,
1835 >     147,    15,   232,   232,   227,   232,   106,   232,   232,    31,
1836 >     232,   111,   112,   113,   232,   115,   116,   117,   232,   232,
1837 >     120,   232,   232,   232,   202,   232,    40,   232,   232,   232,
1838 >     232,   232,   232,   232,     1,   232,     3,   232,     5,    67,
1839 >     232,     1,   232,    65,   222,    67,   146,   232,   226,   108,
1840 >     232,   108,    19,   108,    68,   108,   156,   157,   158,   159,
1841 >     160,   161,   162,   211,   108,   108,    26,   108,   108,   211,
1842 >      30,   211,    39,    95,   229,   222,   135,   136,   137,   138,
1843 >     139,   140,   141,   232,   229,    99,   100,    54,   232,    56,
1844 >     123,   232,   211,   107,   232,    55,    63,   232,   232,   232,
1845 >     232,   232,  1232,   131,    64,   232,   128,    74,   130,   232,
1846 >     232,   232,   212,   213,   214,   232,   216,   217,   132,   232,
1847 >     232,   232,   232,   232,   232,   225,    86,   149,   232,   232,
1848 >      90,    98,   229,   232,   148,   163,   232,   232,    98,   232,
1849 >     232,   101,   102,   171,   232,   232,   232,   232,   232,   171,
1850 >     232,   108,   180,   211,   176,   122,   108,   211,   180,   108,
1851 >     108,   108,   184,   211,   211,   211,   108,   189,   108,   108,
1852 >     108,   193,   108,   133,   108,   142,   204,   108,   206,   207,
1853 >       1,   108,   204,   232,   151,   207,    46,   209,    48,    49,
1854 >     150,     1,   220,   153,   154,   155,   210,   232,   220,   227,
1855 >       0,     1,   211,   211,     4,   227,   211,    17,    18,   211,
1856 >     211,    21,   211,    34,   228,   211,    16,   211,   211,    19,
1857 >      20,   211,    43,   108,   211,    46,    47,   211,   232,    29,
1858 >      51,    52,    53,   200,   229,   232,   123,   229,   229,   123,
1859 >     200,    41,   123,   232,    44,    45,   232,   232,   123,   232,
1860 >     232,   232,   232,    63,    75,   232,   223,   232,   232,   229,
1861 >     229,   232,    62,   223,   224,    65,   232,   229,   232,   232,
1862 >      80,    81,    82,    83,    84,   229,    76,    46,    88,    48,
1863 >      49,   232,    92,   211,   108,   211,   232,   232,    98,   232,
1864 >     211,   232,   211,   211,   211,   232,    96,    97,   123,   109,
1865 >     110,   211,   232,   232,   164,   165,   166,   232,   232,   169,
1866 >     170,   121,   172,   173,   114,   175,   229,   177,    46,   108,
1867 >     180,   108,   182,   183,   123,   123,   123,   123,   188,   123,
1868 >     123,   131,   192,   143,   229,   123,   196,   197,   198,   123,
1869 >     123,   123,   123,   203,   144,   145,   229,   211,   208,   229,
1870 >     232,   123,    67,   231,   108,   229,   232,   108,   108,   232,
1871 >     232,   232,   229,   229,   232,   108,   229,   232,   168,   108,
1872 >     229,   229,   229,   229,   229,   229,   229,   187,   229,   229,
1873 >     229,   181,   229,   229,   229,   229,   186,   229,   229,   232,
1874 >     108,   191,   108,   123,   194,   164,   165,   166,   108,   108,
1875 >     169,   170,   108,   172,   173,   211,   175,   229,   177,   123,
1876 >     123,   180,   123,   182,   183,   123,   131,   232,   123,   188,
1877 >     123,   108,   123,   192,   123,   123,   123,   196,   197,   198,
1878 >     123,   123,   123,   123,   203,   108,   164,   165,   166,   208,
1879 >     232,   169,   170,   229,   172,   173,   211,   175,   163,   177,
1880 >       1,   229,   180,   229,   182,   183,   171,   123,   229,   229,
1881 >     188,   229,   229,   229,   192,   180,   229,   229,   196,   197,
1882 >     198,   229,   229,    24,    25,   203,    27,    28,   123,   123,
1883 >     208,   229,    33,   229,   229,   229,   123,   229,   229,   204,
1884 >     123,   206,   207,   229,   229,   229,   229,   229,   229,   123,
1885 >     229,   123,   229,   229,   229,   220,   229,   229,    59,    60,
1886 >     229,   123,   227,   123,   108,   232,   123,   229,   123,   123,
1887 >      71,    72,    73,   123,   123,   229,   123,   229,    79,    80,
1888 >     123,   123,   232,   229,   229,   229,   211,   123,   123,   123,
1889 >     229,   229,   123,   229,   229,   229,   229,   229,   229,   229,
1890 >     229,   229,   229,   104,   105,   229,   211,   229,   229,   229,
1891 >     229,   229,   229,   123,   123,   229,   229,   232,   229,   229,
1892 >     229,   229,   229,   229,   123,   229,   229,   229,   229,   229,
1893 >     229,   229,   229,   229,   123,   123,   229,   229,   229,   229,
1894 >     229,   229,   123,   229,   229,   229,   123,   229,   108,   229,
1895 >     229,   232,   229,   229,   232,   123,   229,   232,   229,   229,
1896 >     229,   229,   229,   229,   229,   229,   229,   129,   229,    77,
1897 >     229,   229,   129,   229,   129,   586,   229,   229,   229,  1053,
1898 >    1311,   229,   501,   229,   229,  1276,  1274,  1255,   229,   229,
1899 >     229,   229,   229,  1155,  1266,   465,   229,   229,   488,   229,
1900 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
1901 >     229,   229,   229,   229,   229,   229,   229,   229,   218,   517,
1902 >    1264,   229,   233,   229,   229,   229,   229,   229,  1285,   341,
1903 >     572,   229,   229,   229,   229,   229,   229,   229,   229,   229,
1904 >     223,   599,   229,  1278,   229,   229,   232,   229,   534,   229,
1905 >     229,   229,  1260,   229,   478,   118,   169,   229,   229,   234,
1906 >     234,   234,   232,   229,   229,    97,  1125,  1123,   394,    -1,
1907 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   239,    -1,
1908 >      -1,    -1,   289,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1909 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   267,    -1,
1910 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1911 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1912 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1913 >     297,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1914 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1915 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1916 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1917        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1918 <     480
1918 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1919 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1920 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1921 >      -1,   375,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1922 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1923 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1924 >      -1,   404
1925   };
1926  
1927 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1928 <   symbol of state STATE-NUM.  */
1927 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1928 >     symbol of state STATE-NUM.  */
1929   static const yytype_uint16 yystos[] =
1930   {
1931 <       0,   267,     0,     1,     5,    21,    25,    28,    35,    50,
1932 <      62,    63,    65,    72,    88,    98,   100,   117,   134,   169,
1933 <     178,   179,   183,   184,   240,   268,   273,   278,   296,   302,
1934 <     317,   340,   359,   373,   391,   398,   402,   412,   421,   447,
1935 <     457,   463,   467,   477,   541,   557,   578,   261,   262,   263,
1936 <     263,   341,   422,   458,   263,   468,   263,   542,   374,   448,
1937 <     360,   263,   263,   318,   392,   263,   263,   403,   413,   263,
1938 <       1,    36,    46,   118,   297,   298,   299,   300,   301,     1,
1939 <      13,    33,    34,    39,    41,    94,    95,   103,   104,   124,
1940 <     125,   141,   142,   152,   161,   251,   252,   253,   558,   559,
1941 <     560,   561,   562,   563,   564,   565,   566,   567,   568,   569,
1942 <     570,   571,   572,   573,   574,   575,   576,   577,   151,   342,
1943 <     346,   151,   423,   427,   263,     1,    87,   464,   465,   466,
1944 <     263,     1,     8,     9,    12,    19,    27,    31,    32,    38,
1945 <      42,    43,    45,    51,    69,    70,    74,    81,    85,    86,
1946 <      89,    92,    93,   102,   108,   109,   111,   112,   113,   114,
1947 <     115,   126,   135,   137,   138,   140,   143,   144,   147,   158,
1948 <     180,   182,   186,   190,   191,   192,   193,   194,   198,   199,
1949 <     207,   241,   242,   244,   250,   255,   260,   478,   479,   480,
1950 <     481,   482,   483,   484,   485,   486,   487,   488,   489,   490,
1951 <     491,   492,   493,   494,   495,   496,   497,   498,   499,   500,
1952 <     501,   502,   503,   504,   505,   506,   507,   508,   509,   510,
1953 <     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
1954 <     521,   522,   523,   524,   525,   526,   527,   528,   529,   533,
1955 <     537,   538,   539,   540,   263,   263,   263,   263,     1,    54,
1956 <      55,    56,    57,    58,    59,    60,    61,   101,   136,   217,
1957 <     254,   303,   304,   305,   306,   307,   308,   309,   310,   311,
1958 <     312,   313,   314,   315,   316,     1,   116,   146,   274,   275,
1959 <     276,   277,   151,   319,   323,   263,     1,    40,    53,    75,
1960 <      77,    79,    80,    97,   579,   580,   581,   582,   583,   584,
1961 <     585,   586,   587,     1,    36,    83,   118,   120,   121,   163,
1962 <     165,   166,   181,   225,   256,   257,   279,   280,   281,   285,
1963 <     286,   287,   288,   289,   290,   291,   292,   293,   294,   295,
1964 <     263,   263,     1,   118,   399,   400,   401,   261,   264,   264,
1965 <     264,   262,   298,   264,   264,   264,   264,   264,   264,   264,
1966 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1967 <     264,   262,   559,   263,   263,     1,    87,   153,   459,   460,
1968 <     461,   462,   264,   262,   465,     1,   118,   153,   185,   469,
1969 <     473,   474,   475,   476,   264,   264,   264,   264,   264,   264,
1970 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1971 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1972 <     264,   264,   264,   264,   264,   534,   264,   530,   264,   264,
1973 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
1974 <     264,   264,   264,   264,   264,   264,   264,   264,   264,   262,
1975 <     479,     1,     4,    44,    47,   100,   118,   249,   543,   544,
1976 <     545,   546,   547,   551,   552,   553,     1,    25,    48,    52,
1977 <     145,   154,   155,   188,   249,   375,   376,   377,   378,   379,
1978 <     380,   381,   388,   389,   390,     1,   153,   185,   249,   449,
1979 <     453,   454,   455,   456,     1,    52,    82,    87,   150,   361,
1980 <     365,   366,   367,   371,   372,   261,   264,   264,   264,   264,
1981 <     264,   264,   264,   264,   264,   264,   264,   264,   262,   304,
1982 <     261,   264,   264,   262,   275,   263,     1,    21,   122,   153,
1983 <     393,   394,   395,   396,   397,   264,   264,   264,   264,   264,
1984 <     264,   264,   262,   580,   261,   264,   264,   264,   264,   264,
1985 <     264,   264,   282,   264,   264,   264,   264,   262,   280,     1,
1986 <     118,   185,   249,   404,   405,   406,   407,   408,     1,   118,
1987 <     185,   414,   415,   416,   417,   264,   262,   400,   151,   151,
1988 <     151,   261,   195,   129,   129,   195,   195,   129,   270,   270,
1989 <     129,   129,   195,   195,   129,   270,   195,   195,   195,   195,
1990 <     195,   261,     1,    22,    23,    29,   105,   106,   107,   110,
1991 <     118,   131,   132,   148,   149,   176,   343,   344,   345,   347,
1992 <     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
1993 <     358,     1,     3,     6,    24,    25,    48,    52,    82,    84,
1994 <      96,   118,   150,   164,   177,   256,   424,   425,   426,   428,
1995 <     429,   430,   431,   432,   433,   434,   441,   442,   443,   444,
1996 <     445,   446,   264,   264,   262,   460,   151,   261,   264,   264,
1997 <     470,   262,   474,   195,   270,   195,   270,   129,   151,   129,
1998 <     195,   195,   129,   151,   195,   129,   129,   129,   195,   195,
1999 <     195,   270,   151,   195,   129,   129,   270,   129,   129,   151,
2000 <     129,   129,   195,   195,   264,   195,   264,   270,   270,   195,
2001 <     270,   151,   195,   195,   195,   195,   196,   195,   196,   195,
2002 <     195,   270,   270,   129,   272,   151,   270,   195,   195,   195,
2003 <     195,   261,   554,   264,   264,   548,   264,   264,   262,   544,
2004 <     261,   264,   264,   382,   264,   264,   264,   264,   264,   262,
2005 <     376,   264,   450,   264,   262,   454,   261,   362,   264,   264,
2006 <     264,   262,   366,   151,   151,   151,   151,   151,   151,   151,
2007 <     151,   218,   219,   220,   221,   222,   223,   224,   151,   151,
2008 <     195,   261,   151,   151,   261,     1,    25,    48,    52,   118,
2009 <     145,   164,   234,   249,   320,   321,   322,   324,   325,   326,
2010 <     327,   328,   329,   333,   261,   264,   264,   264,   262,   394,
2011 <     195,   195,   195,   151,   195,   195,   270,   261,   151,   195,
2012 <     151,   151,   151,   151,   151,   264,   151,   129,   151,   151,
2013 <     261,   261,   264,   409,   264,   262,   405,   261,   264,   418,
2014 <     262,   415,   151,   261,   261,   261,   261,   261,   261,   261,
2015 <     261,   261,   171,   172,   173,   174,   175,   269,   270,   261,
2016 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2017 <     261,   261,   261,   264,   264,   264,   264,   264,   264,   264,
2018 <     264,   264,   264,   264,   264,   264,   262,   344,   261,   264,
2019 <     264,   264,   264,   264,   435,   264,   264,   264,   264,   264,
2020 <     264,   264,   264,   262,   425,   151,   151,   261,   261,   151,
2021 <     151,   264,   261,   261,   261,   261,   261,   261,   261,   261,
2022 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2023 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2024 <     261,   261,   261,   261,   202,   203,   204,   205,   206,   208,
2025 <     209,   211,   212,   213,   216,   226,   227,   228,   230,   231,
2026 <     232,   235,   239,   535,   536,   261,   202,   203,   204,   205,
2027 <     206,   208,   209,   211,   212,   213,   216,   226,   227,   228,
2028 <     230,   231,   232,   235,   239,   531,   532,   261,   261,   261,
2029 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2030 <     261,   261,   261,    14,    15,    16,   271,   272,   261,   261,
2031 <     261,   261,   261,   261,   261,   264,   270,   195,   264,   151,
2032 <     151,   261,   151,   195,   264,   151,   129,   151,   151,   151,
2033 <     261,   151,   264,   151,   261,   264,   151,   151,   129,   369,
2034 <     370,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2035 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2036 <     261,   261,   261,   264,   264,   334,   264,   264,   264,   330,
2037 <     264,   262,   321,   151,   151,   151,   261,   261,   261,   261,
2038 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2039 <     261,   167,   168,   283,   284,   261,   261,   261,   261,   151,
2040 <     264,   151,   261,   151,   264,   261,   261,   269,   269,   269,
2041 <     269,   269,   129,   129,   270,   129,   129,   129,   129,   151,
2042 <     129,   129,   270,   270,   272,   261,   151,   214,   215,   151,
2043 <     151,   195,   264,   151,   151,   151,   151,   129,   151,   151,
2044 <     151,   261,   261,   261,   261,   261,   156,   471,   472,   261,
2045 <     265,   261,   265,   271,   271,   271,    11,   197,   555,   556,
2046 <     261,   261,    11,   197,   549,   550,   261,   261,   261,   261,
2047 <     128,   383,   384,   386,   261,   261,   261,   261,   261,   261,
2048 <     156,   451,   452,   261,    75,   229,   233,   363,   364,   261,
2049 <     261,   200,   265,   368,   151,   195,   264,   151,   151,   151,
2050 <     264,   151,   261,   261,   261,   261,   261,   265,   261,    90,
2051 <     169,   201,   216,   236,   237,   245,   246,   247,   248,   258,
2052 <     410,   411,   261,   261,    90,   169,   201,   216,   236,   237,
2053 <     245,   246,   247,   248,   258,   419,   420,   261,   261,   261,
2054 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
2055 <     261,   261,   261,   261,   261,   261,   128,   436,   437,   439,
2056 <     261,   261,   261,   261,   261,   261,   261,   261,   261,   265,
2057 <     536,   532,   261,   265,   261,   265,   385,   261,   265,    20,
2058 <      49,    66,    73,    91,   119,   127,   170,   189,   387,   261,
2059 <     265,   261,   265,   129,   370,   261,   261,   261,   128,   335,
2060 <     336,   338,   261,   261,   261,   202,   203,   204,   205,   206,
2061 <     208,   209,   211,   212,   213,   216,   226,   227,   228,   230,
2062 <     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
1931 >       0,   236,     0,     1,     4,    16,    19,    20,    29,    41,
1932 >      44,    45,    62,    65,    76,    96,    97,   114,   131,   144,
1933 >     145,   168,   181,   186,   191,   194,   237,   242,   247,   267,
1934 >     273,   279,   287,   301,   322,   346,   360,   375,   382,   386,
1935 >     396,   405,   426,   432,   438,   442,   448,   503,   520,   229,
1936 >     230,   231,   231,   323,   406,   433,   231,   443,   231,   361,
1937 >     427,   347,   231,   274,   302,   376,   231,   231,   397,   231,
1938 >     280,   231,   387,     1,    30,    38,    98,   268,   269,   270,
1939 >     271,   272,     1,    24,    25,    27,    28,    33,    59,    60,
1940 >      71,    72,    73,    79,    80,   104,   105,   504,   505,   506,
1941 >     507,   508,   509,   510,   511,   512,   513,   514,   515,   516,
1942 >     517,   518,   519,   231,   231,   231,     1,    61,   439,   440,
1943 >     441,   231,     1,     6,     7,     9,    10,    14,    22,    23,
1944 >      32,    35,    36,    37,    42,    57,    58,    66,    69,    70,
1945 >      78,    85,    87,    89,    91,    93,    94,   106,   111,   112,
1946 >     113,   115,   116,   117,   120,   146,   156,   157,   158,   159,
1947 >     160,   161,   162,   212,   213,   214,   216,   217,   225,   449,
1948 >     450,   451,   452,   453,   454,   455,   456,   457,   458,   459,
1949 >     460,   461,   462,   463,   464,   465,   466,   467,   468,   469,
1950 >     470,   471,   472,   473,   474,   475,   476,   477,   478,   479,
1951 >     480,   481,   482,   483,   484,   485,   486,   487,   488,   489,
1952 >     490,   491,   492,   496,   500,   501,   502,   231,   231,   231,
1953 >       1,    95,   119,   243,   244,   245,   246,   231,   231,   231,
1954 >       1,    34,    43,    46,    47,    51,    52,    53,    75,   521,
1955 >     522,   523,   524,   525,   526,   527,   528,   529,   530,     1,
1956 >      26,    30,    55,    64,    86,    90,    98,   101,   102,   133,
1957 >     150,   153,   154,   155,   200,   223,   224,   248,   249,   250,
1958 >     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
1959 >     261,   262,   263,   264,   265,   266,   231,     1,   221,   288,
1960 >     289,   290,   291,   292,   231,     1,    98,   383,   384,   385,
1961 >     231,   229,   232,   232,   232,   230,   269,   232,   232,   232,
1962 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1963 >     232,   230,   505,     1,    17,    18,    21,    63,    80,    81,
1964 >      82,    83,    84,    88,    92,    98,   109,   110,   121,   143,
1965 >     187,   324,   325,   326,   327,   328,   329,   330,   331,   332,
1966 >     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
1967 >       1,     3,     5,    19,    39,    54,    56,    63,    74,    98,
1968 >     122,   142,   151,   200,   223,   407,   408,   409,   410,   411,
1969 >     412,   413,   414,   415,   416,   417,   421,   422,   423,   424,
1970 >     425,     1,    61,   125,   434,   435,   436,   437,   232,   230,
1971 >     440,     1,    98,   125,   444,   445,   446,   447,   232,   232,
1972 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1973 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1974 >     232,   232,   232,   497,   232,   493,   232,   232,   232,   232,
1975 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1976 >     232,   232,   232,   232,   230,   450,     1,    19,    39,    63,
1977 >     118,   126,   127,   147,   222,   362,   363,   364,   365,   366,
1978 >     367,   368,   372,   373,   374,     1,   125,   222,   428,   429,
1979 >     430,   431,     1,    54,    61,    63,   122,   348,   352,   353,
1980 >     354,   358,   359,   229,   232,   232,   230,   244,     1,    77,
1981 >     174,   275,   276,   277,   278,     1,    19,    39,    63,    98,
1982 >     118,   134,   151,   152,   202,   222,   226,   303,   304,   305,
1983 >     306,   307,   308,   309,   310,   311,   312,   313,   314,   318,
1984 >       1,    41,    77,   125,   377,   378,   379,   380,   381,   232,
1985 >     232,   232,   232,   232,   232,   232,   232,   230,   522,   229,
1986 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1987 >     232,   232,   232,   232,   232,   232,   232,   230,   249,     1,
1988 >      98,   219,   398,   399,   400,   401,   229,   232,   230,   289,
1989 >     174,     1,    98,   167,   185,   201,   281,   282,   283,   284,
1990 >     285,   286,   232,   230,   384,     1,    98,   219,   222,   388,
1991 >     389,   390,   391,   392,   123,   123,   123,   229,   108,   108,
1992 >     239,   108,   108,   211,   108,   239,   108,   239,   239,   108,
1993 >     108,   211,   211,   229,   229,   232,   232,   232,   343,   232,
1994 >     232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
1995 >     232,   232,   230,   325,   229,   232,   232,   232,   232,   232,
1996 >     232,   418,   232,   232,   232,   232,   232,   232,   232,   230,
1997 >     408,   232,   232,   230,   435,   123,   229,   232,   232,   230,
1998 >     445,   211,   239,   108,   239,   239,   211,   108,   211,   108,
1999 >     108,   108,   211,   211,   211,   239,   108,   108,   108,   108,
2000 >     239,   108,   108,   108,   108,   211,   232,   211,   232,   211,
2001 >     239,   239,   211,   211,   211,   211,   215,   211,   215,   211,
2002 >     211,   211,   211,   108,   239,   211,   239,   239,   211,   229,
2003 >     229,   232,   232,   369,   232,   232,   232,   232,   232,   230,
2004 >     363,   232,   232,   230,   429,   229,   232,   232,   349,   232,
2005 >     230,   353,   123,   123,   229,   229,   232,   232,   230,   276,
2006 >     229,   232,   232,   319,   232,   232,   232,   232,   232,   315,
2007 >     232,   232,   230,   304,   229,   232,   232,   232,   230,   378,
2008 >     211,   211,   211,   123,   211,   211,   211,   239,   229,   108,
2009 >     123,   211,   123,   108,   108,   123,   123,   123,   123,   123,
2010 >     123,   123,   123,   123,   123,   123,   229,   229,   232,   402,
2011 >     230,   399,   211,   229,   231,   229,   232,   232,   232,   232,
2012 >     230,   282,   123,   229,   229,   232,   393,   232,   230,   389,
2013 >     229,   229,   229,   229,   135,   136,   137,   138,   139,   140,
2014 >     141,   238,   239,   229,   229,   229,   229,   229,   229,   229,
2015 >     229,   229,   229,   229,   229,   229,   108,   108,   239,   232,
2016 >     108,   108,   108,   239,   108,   108,   239,   123,   108,   108,
2017 >     239,   108,   241,   241,   229,   123,   178,   179,   123,   211,
2018 >     123,   123,   232,   123,   123,   108,   123,   123,   123,   123,
2019 >     229,   123,   123,   229,   229,   123,   123,   229,   229,   229,
2020 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2021 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2022 >     229,   229,   229,    46,   164,   165,   166,   169,   170,   172,
2023 >     173,   175,   177,   180,   182,   183,   188,   192,   196,   197,
2024 >     198,   203,   208,   498,   499,   229,    46,    48,    49,   164,
2025 >     165,   166,   169,   170,   172,   173,   175,   177,   180,   182,
2026 >     183,   188,   192,   196,   197,   198,   203,   208,   494,   495,
2027 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2028 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2029 >     123,   211,   232,   123,   108,   123,   123,   123,   229,   123,
2030 >     123,   229,   123,   123,   232,   108,   356,   357,   229,   229,
2031 >     229,   123,   123,   229,   123,   211,   232,   123,   123,   123,
2032 >     123,   211,   232,   123,   123,   229,   123,   123,   123,   229,
2033 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2034 >     229,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2035 >     229,   229,   229,   229,   229,   123,   232,   229,   229,     1,
2036 >      98,   195,   219,   293,   294,   295,   296,   297,   123,   123,
2037 >     123,   123,   229,   229,   123,   232,   123,   229,   238,   238,
2038 >     238,   238,   238,   238,   238,   229,   229,   229,    50,   124,
2039 >     344,   345,   229,   229,   229,   229,   229,   229,   229,   229,
2040 >     229,   229,   229,    11,    12,    13,   240,   241,   229,   229,
2041 >     229,   229,   229,   229,   229,   229,   229,     8,   199,   419,
2042 >     420,   229,   229,   229,   229,   229,   229,   229,   229,   229,
2043 >     229,   229,   229,   233,   229,   233,   229,   229,    15,    40,
2044 >      68,    99,   100,   107,   132,   148,   210,   228,   370,   371,
2045 >     229,   229,   229,   229,   229,   229,   229,   229,   229,    46,
2046 >     190,   199,   350,   351,   218,   233,   355,   229,   229,   229,
2047 >     229,     4,    20,    31,    65,    67,    95,   128,   130,   149,
2048 >     171,   176,   180,   184,   189,   193,   204,   207,   209,   220,
2049 >     227,   320,   321,   229,   229,   229,   229,   229,    46,    48,
2050 >      49,   164,   165,   166,   169,   170,   172,   173,   175,   177,
2051 >     180,   182,   183,   188,   192,   196,   197,   198,   203,   208,
2052 >     316,   317,   229,   229,   229,   229,   229,   229,    67,   131,
2053 >     163,   171,   180,   204,   206,   207,   220,   227,   403,   404,
2054 >     229,   232,   232,   298,   230,   294,   229,   229,   229,   229,
2055 >     229,    67,   131,   163,   171,   180,   204,   206,   207,   220,
2056 >     227,   394,   395,   229,   229,   233,   240,   240,   240,   229,
2057 >     233,   499,   495,   229,   233,   229,   233,   108,   357,   229,
2058 >     234,   234,   234,   229,   233,   229,   233,   229,   233,   123,
2059 >     205,   241,   232,   229,   229,   233,   345,   420,   371,   351,
2060 >     129,   129,   129,   321,   317,   404,   229,   229,   229,    65,
2061 >      67,   114,   131,   170,   171,   222,   227,   299,   300,   395,
2062 >     229,   233,   300
2063   };
2064  
2065 < #define yyerrok         (yyerrstatus = 0)
2066 < #define yyclearin       (yychar = YYEMPTY)
2067 < #define YYEMPTY         (-2)
2068 < #define YYEOF           0
2069 <
2070 < #define YYACCEPT        goto yyacceptlab
2071 < #define YYABORT         goto yyabortlab
2072 < #define YYERROR         goto yyerrorlab
2073 <
2074 <
2075 < /* Like YYERROR except do call yyerror.  This remains here temporarily
2076 <   to ease the transition to the new meaning of YYERROR, for GCC.
2077 <   Once GCC version 2 has supplanted version 1, this can go.  However,
2078 <   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
2079 <   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
2080 <   discussed.  */
2081 <
2082 < #define YYFAIL          goto yyerrlab
2083 < #if defined YYFAIL
2084 <  /* This is here to suppress warnings from the GCC cpp's
2085 <     -Wunused-macros.  Normally we don't worry about that warning, but
2086 <     some users do, and we want to make it easy for users to remove
2087 <     YYFAIL uses, which will produce warnings from Bison 2.5.  */
2088 < #endif
2065 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2066 > static const yytype_uint16 yyr1[] =
2067 > {
2068 >       0,   235,   236,   236,   237,   237,   237,   237,   237,   237,
2069 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
2070 >     237,   237,   237,   237,   237,   237,   237,   237,   238,   238,
2071 >     239,   239,   239,   239,   239,   239,   239,   239,   240,   240,
2072 >     241,   241,   241,   241,   242,   243,   243,   244,   244,   244,
2073 >     245,   246,   247,   248,   248,   249,   249,   249,   249,   249,
2074 >     249,   249,   249,   249,   249,   249,   249,   249,   249,   249,
2075 >     249,   249,   249,   250,   251,   252,   253,   254,   255,   256,
2076 >     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
2077 >     267,   268,   268,   269,   269,   269,   269,   270,   271,   272,
2078 >     274,   273,   275,   275,   276,   276,   276,   277,   278,   280,
2079 >     279,   281,   281,   282,   282,   282,   282,   282,   283,   284,
2080 >     285,   286,   287,   288,   288,   289,   289,   289,   290,   292,
2081 >     291,   293,   293,   294,   294,   294,   294,   295,   296,   296,
2082 >     298,   297,   299,   299,   300,   300,   300,   300,   300,   300,
2083 >     300,   300,   302,   301,   303,   303,   304,   304,   304,   304,
2084 >     304,   304,   304,   304,   304,   304,   304,   304,   305,   306,
2085 >     307,   308,   309,   310,   311,   312,   313,   315,   314,   316,
2086 >     316,   317,   317,   317,   317,   317,   317,   317,   317,   317,
2087 >     317,   317,   317,   317,   317,   317,   317,   317,   317,   317,
2088 >     317,   317,   317,   319,   318,   320,   320,   321,   321,   321,
2089 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2090 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2091 >     323,   322,   324,   324,   325,   325,   325,   325,   325,   325,
2092 >     325,   325,   325,   325,   325,   325,   325,   325,   325,   325,
2093 >     325,   325,   326,   327,   328,   329,   330,   331,   332,   333,
2094 >     334,   335,   336,   337,   338,   339,   340,   341,   343,   342,
2095 >     344,   344,   345,   345,   347,   346,   349,   348,   350,   350,
2096 >     351,   351,   351,   352,   352,   353,   353,   353,   353,   353,
2097 >     355,   354,   356,   356,   357,   357,   358,   359,   361,   360,
2098 >     362,   362,   363,   363,   363,   363,   363,   363,   363,   363,
2099 >     363,   364,   365,   366,   367,   369,   368,   370,   370,   371,
2100 >     371,   371,   371,   371,   371,   371,   371,   371,   371,   372,
2101 >     373,   374,   376,   375,   377,   377,   378,   378,   378,   378,
2102 >     379,   380,   381,   382,   383,   383,   384,   384,   385,   387,
2103 >     386,   388,   388,   389,   389,   389,   389,   390,   391,   393,
2104 >     392,   394,   394,   395,   395,   395,   395,   395,   395,   395,
2105 >     395,   395,   395,   397,   396,   398,   398,   399,   399,   399,
2106 >     400,   402,   401,   403,   403,   404,   404,   404,   404,   404,
2107 >     404,   404,   404,   404,   404,   406,   405,   407,   407,   408,
2108 >     408,   408,   408,   408,   408,   408,   408,   408,   408,   408,
2109 >     408,   408,   408,   408,   409,   410,   411,   412,   413,   414,
2110 >     415,   416,   416,   418,   417,   419,   419,   420,   420,   421,
2111 >     422,   423,   424,   425,   427,   426,   428,   428,   429,   429,
2112 >     429,   430,   431,   433,   432,   434,   434,   435,   435,   435,
2113 >     436,   437,   438,   439,   439,   440,   440,   441,   443,   442,
2114 >     444,   444,   445,   445,   445,   446,   447,   448,   449,   449,
2115 >     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
2116 >     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
2117 >     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
2118 >     450,   450,   450,   450,   450,   450,   450,   450,   450,   450,
2119 >     450,   450,   450,   450,   450,   450,   450,   451,   452,   453,
2120 >     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
2121 >     464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
2122 >     474,   475,   476,   477,   477,   478,   478,   479,   480,   481,
2123 >     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
2124 >     493,   492,   494,   494,   495,   495,   495,   495,   495,   495,
2125 >     495,   495,   495,   495,   495,   495,   495,   495,   495,   495,
2126 >     495,   495,   495,   495,   495,   495,   497,   496,   498,   498,
2127 >     499,   499,   499,   499,   499,   499,   499,   499,   499,   499,
2128 >     499,   499,   499,   499,   499,   499,   499,   499,   499,   499,
2129 >     500,   501,   502,   503,   504,   504,   505,   505,   505,   505,
2130 >     505,   505,   505,   505,   505,   505,   505,   505,   505,   505,
2131 >     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
2132 >     515,   516,   517,   518,   519,   520,   521,   521,   522,   522,
2133 >     522,   522,   522,   522,   522,   522,   522,   523,   524,   525,
2134 >     526,   527,   528,   529,   530
2135 > };
2136  
2137 < #define YYRECOVERING()  (!!yyerrstatus)
2137 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2138 > static const yytype_uint8 yyr2[] =
2139 > {
2140 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2141 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2142 >       1,     1,     1,     1,     1,     1,     2,     2,     0,     1,
2143 >       2,     3,     3,     3,     3,     3,     3,     3,     0,     1,
2144 >       2,     3,     3,     3,     5,     2,     1,     1,     1,     2,
2145 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2146 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2147 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2148 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2149 >       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2150 >       0,     6,     2,     1,     1,     1,     2,     4,     4,     0,
2151 >       6,     2,     1,     1,     1,     1,     1,     2,     4,     4,
2152 >       4,     4,     5,     2,     1,     1,     1,     2,     4,     0,
2153 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2154 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2155 >       1,     1,     0,     6,     2,     1,     1,     1,     1,     1,
2156 >       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
2157 >       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
2158 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2159 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2160 >       1,     1,     1,     0,     5,     3,     1,     3,     1,     3,
2161 >       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2162 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2163 >       0,     6,     2,     1,     1,     1,     1,     1,     1,     1,
2164 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2165 >       1,     2,     4,     4,     4,     4,     4,     4,     4,     4,
2166 >       4,     4,     4,     4,     4,     4,     4,     4,     0,     5,
2167 >       3,     1,     1,     1,     0,     6,     0,     5,     3,     1,
2168 >       1,     1,     1,     2,     1,     1,     1,     1,     1,     2,
2169 >       0,     5,     3,     1,     1,     3,     4,     4,     0,     6,
2170 >       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2171 >       2,     4,     4,     4,     4,     0,     5,     3,     1,     1,
2172 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
2173 >       4,     4,     0,     6,     2,     1,     1,     1,     1,     2,
2174 >       4,     4,     4,     5,     2,     1,     1,     1,     4,     0,
2175 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     0,
2176 >       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2177 >       1,     1,     1,     0,     6,     2,     1,     1,     1,     2,
2178 >       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
2179 >       1,     1,     1,     1,     1,     0,     6,     2,     1,     1,
2180 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2181 >       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
2182 >       4,     4,     4,     0,     5,     3,     1,     1,     1,     4,
2183 >       4,     4,     4,     4,     0,     6,     2,     1,     1,     1,
2184 >       1,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2185 >       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
2186 >       2,     1,     1,     1,     1,     4,     4,     5,     2,     1,
2187 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2188 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2189 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2190 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2191 >       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
2192 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2193 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2194 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2195 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2196 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2197 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2198 >       1,     1,     1,     1,     1,     1,     0,     5,     3,     1,
2199 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2200 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2201 >       4,     4,     4,     5,     2,     1,     1,     1,     1,     1,
2202 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2203 >       1,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2204 >       4,     4,     4,     4,     4,     5,     2,     1,     1,     1,
2205 >       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
2206 >       4,     4,     4,     4,     4
2207 > };
2208  
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
2209  
2210 + #define yyerrok         (yyerrstatus = 0)
2211 + #define yyclearin       (yychar = YYEMPTY)
2212 + #define YYEMPTY         (-2)
2213 + #define YYEOF           0
2214 +
2215 + #define YYACCEPT        goto yyacceptlab
2216 + #define YYABORT         goto yyabortlab
2217 + #define YYERROR         goto yyerrorlab
2218  
2620 /* This macro is provided for backward compatibility. */
2219  
2220 < #ifndef YY_LOCATION_PRINT
2623 < # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2624 < #endif
2220 > #define YYRECOVERING()  (!!yyerrstatus)
2221  
2222 + #define YYBACKUP(Token, Value)                                  \
2223 + do                                                              \
2224 +  if (yychar == YYEMPTY)                                        \
2225 +    {                                                           \
2226 +      yychar = (Token);                                         \
2227 +      yylval = (Value);                                         \
2228 +      YYPOPSTACK (yylen);                                       \
2229 +      yystate = *yyssp;                                         \
2230 +      goto yybackup;                                            \
2231 +    }                                                           \
2232 +  else                                                          \
2233 +    {                                                           \
2234 +      yyerror (YY_("syntax error: cannot back up")); \
2235 +      YYERROR;                                                  \
2236 +    }                                                           \
2237 + while (0)
2238 +
2239 + /* Error token number */
2240 + #define YYTERROR        1
2241 + #define YYERRCODE       256
2242  
2627 /* YYLEX -- calling `yylex' with the right arguments.  */
2243  
2629 #ifdef YYLEX_PARAM
2630 # define YYLEX yylex (YYLEX_PARAM)
2631 #else
2632 # define YYLEX yylex ()
2633 #endif
2244  
2245   /* Enable debugging if requested.  */
2246   #if YYDEBUG
# Line 2640 | Line 2250 | while (YYID (0))
2250   #  define YYFPRINTF fprintf
2251   # endif
2252  
2253 < # define YYDPRINTF(Args)                        \
2254 < do {                                            \
2255 <  if (yydebug)                                  \
2256 <    YYFPRINTF Args;                             \
2257 < } while (YYID (0))
2648 <
2649 < # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2650 < do {                                                                      \
2651 <  if (yydebug)                                                            \
2652 <    {                                                                     \
2653 <      YYFPRINTF (stderr, "%s ", Title);                                   \
2654 <      yy_symbol_print (stderr,                                            \
2655 <                  Type, Value); \
2656 <      YYFPRINTF (stderr, "\n");                                           \
2657 <    }                                                                     \
2658 < } while (YYID (0))
2253 > # define YYDPRINTF(Args)                        \
2254 > do {                                            \
2255 >  if (yydebug)                                  \
2256 >    YYFPRINTF Args;                             \
2257 > } while (0)
2258  
2259 + /* This macro is provided for backward compatibility. */
2260 + #ifndef YY_LOCATION_PRINT
2261 + # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2262 + #endif
2263 +
2264 +
2265 + # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2266 + do {                                                                      \
2267 +  if (yydebug)                                                            \
2268 +    {                                                                     \
2269 +      YYFPRINTF (stderr, "%s ", Title);                                   \
2270 +      yy_symbol_print (stderr,                                            \
2271 +                  Type, Value); \
2272 +      YYFPRINTF (stderr, "\n");                                           \
2273 +    }                                                                     \
2274 + } while (0)
2275  
2661 /*--------------------------------.
2662 | Print this symbol on YYOUTPUT.  |
2663 `--------------------------------*/
2276  
2277 < /*ARGSUSED*/
2278 < #if (defined __STDC__ || defined __C99__FUNC__ \
2279 <     || defined __cplusplus || defined _MSC_VER)
2277 > /*----------------------------------------.
2278 > | Print this symbol's value on YYOUTPUT.  |
2279 > `----------------------------------------*/
2280 >
2281   static void
2282   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
2283   {
2284 +  FILE *yyo = yyoutput;
2285 +  YYUSE (yyo);
2286    if (!yyvaluep)
2287      return;
2288   # ifdef YYPRINT
2289    if (yytype < YYNTOKENS)
2290      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2683 # else
2684  YYUSE (yyoutput);
2291   # endif
2292 <  switch (yytype)
2687 <    {
2688 <      default:
2689 <        break;
2690 <    }
2292 >  YYUSE (yytype);
2293   }
2294  
2295  
# Line 2695 | Line 2297 | yy_symbol_value_print (yyoutput, yytype,
2297   | Print this symbol on YYOUTPUT.  |
2298   `--------------------------------*/
2299  
2698 #if (defined __STDC__ || defined __C99__FUNC__ \
2699     || defined __cplusplus || defined _MSC_VER)
2300   static void
2301   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
2302   {
2303 <  if (yytype < YYNTOKENS)
2304 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2712 <  else
2713 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2303 >  YYFPRINTF (yyoutput, "%s %s (",
2304 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2305  
2306    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2307    YYFPRINTF (yyoutput, ")");
# Line 2721 | Line 2312 | yy_symbol_print (yyoutput, yytype, yyval
2312   | TOP (included).                                                   |
2313   `------------------------------------------------------------------*/
2314  
2724 #if (defined __STDC__ || defined __C99__FUNC__ \
2725     || defined __cplusplus || defined _MSC_VER)
2315   static void
2316   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
2317   {
2318    YYFPRINTF (stderr, "Stack now");
2319    for (; yybottom <= yytop; yybottom++)
# Line 2741 | Line 2324 | yy_stack_print (yybottom, yytop)
2324    YYFPRINTF (stderr, "\n");
2325   }
2326  
2327 < # define YY_STACK_PRINT(Bottom, Top)                            \
2328 < do {                                                            \
2329 <  if (yydebug)                                                  \
2330 <    yy_stack_print ((Bottom), (Top));                           \
2331 < } while (YYID (0))
2327 > # define YY_STACK_PRINT(Bottom, Top)                            \
2328 > do {                                                            \
2329 >  if (yydebug)                                                  \
2330 >    yy_stack_print ((Bottom), (Top));                           \
2331 > } while (0)
2332  
2333  
2334   /*------------------------------------------------.
2335   | Report that the YYRULE is going to be reduced.  |
2336   `------------------------------------------------*/
2337  
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
2338   static void
2339 < yy_reduce_print (yyvsp, yyrule)
2762 <    YYSTYPE *yyvsp;
2763 <    int yyrule;
2764 < #endif
2339 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2340   {
2341 +  unsigned long int yylno = yyrline[yyrule];
2342    int yynrhs = yyr2[yyrule];
2343    int yyi;
2768  unsigned long int yylno = yyrline[yyrule];
2344    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2345 <             yyrule - 1, yylno);
2345 >             yyrule - 1, yylno);
2346    /* The symbols being reduced.  */
2347    for (yyi = 0; yyi < yynrhs; yyi++)
2348      {
2349        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2350 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2351 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2352 <                                       );
2350 >      yy_symbol_print (stderr,
2351 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2352 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2353 >                                              );
2354        YYFPRINTF (stderr, "\n");
2355      }
2356   }
2357  
2358 < # define YY_REDUCE_PRINT(Rule)          \
2359 < do {                                    \
2360 <  if (yydebug)                          \
2361 <    yy_reduce_print (yyvsp, Rule); \
2362 < } while (YYID (0))
2358 > # define YY_REDUCE_PRINT(Rule)          \
2359 > do {                                    \
2360 >  if (yydebug)                          \
2361 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2362 > } while (0)
2363  
2364   /* Nonzero means print parse trace.  It is left uninitialized so that
2365     multiple parsers can coexist.  */
# Line 2797 | Line 2373 | int yydebug;
2373  
2374  
2375   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2376 < #ifndef YYINITDEPTH
2376 > #ifndef YYINITDEPTH
2377   # define YYINITDEPTH 200
2378   #endif
2379  
# Line 2820 | Line 2396 | int yydebug;
2396   #   define yystrlen strlen
2397   #  else
2398   /* Return the length of YYSTR.  */
2823 #if (defined __STDC__ || defined __C99__FUNC__ \
2824     || defined __cplusplus || defined _MSC_VER)
2399   static YYSIZE_T
2400   yystrlen (const char *yystr)
2827 #else
2828 static YYSIZE_T
2829 yystrlen (yystr)
2830    const char *yystr;
2831 #endif
2401   {
2402    YYSIZE_T yylen;
2403    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2844 | Line 2413 | yystrlen (yystr)
2413   #  else
2414   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2415     YYDEST.  */
2847 #if (defined __STDC__ || defined __C99__FUNC__ \
2848     || defined __cplusplus || defined _MSC_VER)
2416   static char *
2417   yystpcpy (char *yydest, const char *yysrc)
2851 #else
2852 static char *
2853 yystpcpy (yydest, yysrc)
2854    char *yydest;
2855    const char *yysrc;
2856 #endif
2418   {
2419    char *yyd = yydest;
2420    const char *yys = yysrc;
# Line 2883 | Line 2444 | yytnamerr (char *yyres, const char *yyst
2444        char const *yyp = yystr;
2445  
2446        for (;;)
2447 <        switch (*++yyp)
2448 <          {
2449 <          case '\'':
2450 <          case ',':
2451 <            goto do_not_strip_quotes;
2452 <
2453 <          case '\\':
2454 <            if (*++yyp != '\\')
2455 <              goto do_not_strip_quotes;
2456 <            /* Fall through.  */
2457 <          default:
2458 <            if (yyres)
2459 <              yyres[yyn] = *yyp;
2460 <            yyn++;
2461 <            break;
2462 <
2463 <          case '"':
2464 <            if (yyres)
2465 <              yyres[yyn] = '\0';
2466 <            return yyn;
2467 <          }
2447 >        switch (*++yyp)
2448 >          {
2449 >          case '\'':
2450 >          case ',':
2451 >            goto do_not_strip_quotes;
2452 >
2453 >          case '\\':
2454 >            if (*++yyp != '\\')
2455 >              goto do_not_strip_quotes;
2456 >            /* Fall through.  */
2457 >          default:
2458 >            if (yyres)
2459 >              yyres[yyn] = *yyp;
2460 >            yyn++;
2461 >            break;
2462 >
2463 >          case '"':
2464 >            if (yyres)
2465 >              yyres[yyn] = '\0';
2466 >            return yyn;
2467 >          }
2468      do_not_strip_quotes: ;
2469      }
2470  
# Line 2926 | Line 2487 | static int
2487   yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2488                  yytype_int16 *yyssp, int yytoken)
2489   {
2490 <  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
2490 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2491    YYSIZE_T yysize = yysize0;
2931  YYSIZE_T yysize1;
2492    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2493    /* Internationalized format string. */
2494 <  const char *yyformat = 0;
2494 >  const char *yyformat = YY_NULLPTR;
2495    /* Arguments of yyformat. */
2496    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2497    /* Number of reported tokens (one for the "unexpected", one per
# Line 2939 | Line 2499 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2499    int yycount = 0;
2500  
2501    /* 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.
2502       - If this state is a consistent state with a default action, then
2503         the only way this function was invoked is if the default action
2504         is an error action.  In that case, don't check for expected
# Line 2991 | Line 2547 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2547                      break;
2548                    }
2549                  yyarg[yycount++] = yytname[yyx];
2550 <                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
2551 <                if (! (yysize <= yysize1
2552 <                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2553 <                  return 2;
2554 <                yysize = yysize1;
2550 >                {
2551 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2552 >                  if (! (yysize <= yysize1
2553 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2554 >                    return 2;
2555 >                  yysize = yysize1;
2556 >                }
2557                }
2558          }
2559      }
# Line 3015 | Line 2573 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2573   # undef YYCASE_
2574      }
2575  
2576 <  yysize1 = yysize + yystrlen (yyformat);
2577 <  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2578 <    return 2;
2579 <  yysize = yysize1;
2576 >  {
2577 >    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2578 >    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2579 >      return 2;
2580 >    yysize = yysize1;
2581 >  }
2582  
2583    if (*yymsg_alloc < yysize)
2584      {
# Line 3055 | Line 2615 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2615   | Release the memory associated to this symbol.  |
2616   `-----------------------------------------------*/
2617  
3058 /*ARGSUSED*/
3059 #if (defined __STDC__ || defined __C99__FUNC__ \
3060     || defined __cplusplus || defined _MSC_VER)
2618   static void
2619   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
2620   {
2621    YYUSE (yyvaluep);
3072
2622    if (!yymsg)
2623      yymsg = "Deleting";
2624    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2625  
2626 <  switch (yytype)
2627 <    {
2628 <
3080 <      default:
3081 <        break;
3082 <    }
2626 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2627 >  YYUSE (yytype);
2628 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2629   }
2630  
2631  
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 */
2632  
2633  
2634   /* The lookahead symbol.  */
# Line 3104 | Line 2636 | int yychar;
2636  
2637   /* The semantic value of the lookahead symbol.  */
2638   YYSTYPE yylval;
3107
2639   /* Number of syntax errors so far.  */
2640   int yynerrs;
2641  
# Line 3113 | Line 2644 | int yynerrs;
2644   | yyparse.  |
2645   `----------*/
2646  
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)
2647   int
2648   yyparse (void)
3131 #else
3132 int
3133 yyparse ()
3134
3135 #endif
3136 #endif
2649   {
2650      int yystate;
2651      /* Number of tokens to shift before error messages enabled.  */
2652      int yyerrstatus;
2653  
2654      /* The stacks and their tools:
2655 <       `yyss': related to states.
2656 <       `yyvs': related to semantic values.
2655 >       'yyss': related to states.
2656 >       'yyvs': related to semantic values.
2657  
2658 <       Refer to the stacks thru separate pointers, to allow yyoverflow
2658 >       Refer to the stacks through separate pointers, to allow yyoverflow
2659         to reallocate them elsewhere.  */
2660  
2661      /* The state stack.  */
# Line 3161 | Line 2673 | yyparse ()
2673    int yyn;
2674    int yyresult;
2675    /* Lookahead token as an internal (translated) token number.  */
2676 <  int yytoken;
2676 >  int yytoken = 0;
2677    /* The variables used to return semantic value and location from the
2678       action routines.  */
2679    YYSTYPE yyval;
# Line 3179 | Line 2691 | yyparse ()
2691       Keep to zero when no symbol should be popped.  */
2692    int yylen = 0;
2693  
2694 <  yytoken = 0;
2695 <  yyss = yyssa;
3184 <  yyvs = yyvsa;
2694 >  yyssp = yyss = yyssa;
2695 >  yyvsp = yyvs = yyvsa;
2696    yystacksize = YYINITDEPTH;
2697  
2698    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 3190 | Line 2701 | yyparse ()
2701    yyerrstatus = 0;
2702    yynerrs = 0;
2703    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
2704    goto yysetstate;
2705  
2706   /*------------------------------------------------------------.
# Line 3218 | Line 2721 | yyparse ()
2721  
2722   #ifdef yyoverflow
2723        {
2724 <        /* Give user a chance to reallocate the stack.  Use copies of
2725 <           these so that the &'s don't force the real ones into
2726 <           memory.  */
2727 <        YYSTYPE *yyvs1 = yyvs;
2728 <        yytype_int16 *yyss1 = yyss;
2729 <
2730 <        /* Each stack pointer address is followed by the size of the
2731 <           data in use in that stack, in bytes.  This used to be a
2732 <           conditional around just the two extra args, but that might
2733 <           be undefined if yyoverflow is a macro.  */
2734 <        yyoverflow (YY_("memory exhausted"),
2735 <                    &yyss1, yysize * sizeof (*yyssp),
2736 <                    &yyvs1, yysize * sizeof (*yyvsp),
2737 <                    &yystacksize);
2724 >        /* Give user a chance to reallocate the stack.  Use copies of
2725 >           these so that the &'s don't force the real ones into
2726 >           memory.  */
2727 >        YYSTYPE *yyvs1 = yyvs;
2728 >        yytype_int16 *yyss1 = yyss;
2729 >
2730 >        /* Each stack pointer address is followed by the size of the
2731 >           data in use in that stack, in bytes.  This used to be a
2732 >           conditional around just the two extra args, but that might
2733 >           be undefined if yyoverflow is a macro.  */
2734 >        yyoverflow (YY_("memory exhausted"),
2735 >                    &yyss1, yysize * sizeof (*yyssp),
2736 >                    &yyvs1, yysize * sizeof (*yyvsp),
2737 >                    &yystacksize);
2738  
2739 <        yyss = yyss1;
2740 <        yyvs = yyvs1;
2739 >        yyss = yyss1;
2740 >        yyvs = yyvs1;
2741        }
2742   #else /* no yyoverflow */
2743   # ifndef YYSTACK_RELOCATE
# Line 3242 | Line 2745 | yyparse ()
2745   # else
2746        /* Extend the stack our own way.  */
2747        if (YYMAXDEPTH <= yystacksize)
2748 <        goto yyexhaustedlab;
2748 >        goto yyexhaustedlab;
2749        yystacksize *= 2;
2750        if (YYMAXDEPTH < yystacksize)
2751 <        yystacksize = YYMAXDEPTH;
2751 >        yystacksize = YYMAXDEPTH;
2752  
2753        {
2754 <        yytype_int16 *yyss1 = yyss;
2755 <        union yyalloc *yyptr =
2756 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2757 <        if (! yyptr)
2758 <          goto yyexhaustedlab;
2759 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2760 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2754 >        yytype_int16 *yyss1 = yyss;
2755 >        union yyalloc *yyptr =
2756 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2757 >        if (! yyptr)
2758 >          goto yyexhaustedlab;
2759 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2760 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2761   #  undef YYSTACK_RELOCATE
2762 <        if (yyss1 != yyssa)
2763 <          YYSTACK_FREE (yyss1);
2762 >        if (yyss1 != yyssa)
2763 >          YYSTACK_FREE (yyss1);
2764        }
2765   # endif
2766   #endif /* no yyoverflow */
# Line 3266 | Line 2769 | yyparse ()
2769        yyvsp = yyvs + yysize - 1;
2770  
2771        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2772 <                  (unsigned long int) yystacksize));
2772 >                  (unsigned long int) yystacksize));
2773  
2774        if (yyss + yystacksize - 1 <= yyssp)
2775 <        YYABORT;
2775 >        YYABORT;
2776      }
2777  
2778    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3298 | Line 2801 | yybackup:
2801    if (yychar == YYEMPTY)
2802      {
2803        YYDPRINTF ((stderr, "Reading a token: "));
2804 <      yychar = YYLEX;
2804 >      yychar = yylex ();
2805      }
2806  
2807    if (yychar <= YYEOF)
# Line 3338 | Line 2841 | yybackup:
2841    yychar = YYEMPTY;
2842  
2843    yystate = yyn;
2844 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2845    *++yyvsp = yylval;
2846 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2847  
2848    goto yynewstate;
2849  
# Line 3361 | Line 2866 | yyreduce:
2866    yylen = yyr2[yyn];
2867  
2868    /* If YYLEN is nonzero, implement the default value of the action:
2869 <     `$$ = $1'.
2869 >     '$$ = $1'.
2870  
2871       Otherwise, the following line sets YYVAL to garbage.
2872       This behavior is undocumented and Bison
# Line 3374 | Line 2879 | yyreduce:
2879    YY_REDUCE_PRINT (yyn);
2880    switch (yyn)
2881      {
2882 <        case 27:
2883 <
3379 < /* Line 1806 of yacc.c  */
3380 < #line 425 "ircd_parser.y"
2882 >        case 28:
2883 > #line 416 "conf_parser.y" /* yacc.c:1646  */
2884      { (yyval.number) = 0; }
2885 <    break;
3383 <
3384 <  case 29:
3385 <
3386 < /* Line 1806 of yacc.c  */
3387 < #line 427 "ircd_parser.y"
3388 <    {
3389 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3390 <                }
2885 > #line 2886 "conf_parser.c" /* yacc.c:1646  */
2886      break;
2887  
2888    case 30:
2889 <
2890 < /* Line 1806 of yacc.c  */
2891 < #line 431 "ircd_parser.y"
3397 <    {
3398 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3399 <                }
2889 > #line 417 "conf_parser.y" /* yacc.c:1646  */
2890 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2891 > #line 2892 "conf_parser.c" /* yacc.c:1646  */
2892      break;
2893  
2894    case 31:
2895 <
2896 < /* Line 1806 of yacc.c  */
2897 < #line 435 "ircd_parser.y"
3406 <    {
3407 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3408 <                }
2895 > #line 418 "conf_parser.y" /* yacc.c:1646  */
2896 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2897 > #line 2898 "conf_parser.c" /* yacc.c:1646  */
2898      break;
2899  
2900    case 32:
2901 <
2902 < /* Line 1806 of yacc.c  */
2903 < #line 439 "ircd_parser.y"
3415 <    {
3416 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3417 <                }
2901 > #line 419 "conf_parser.y" /* yacc.c:1646  */
2902 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2903 > #line 2904 "conf_parser.c" /* yacc.c:1646  */
2904      break;
2905  
2906    case 33:
2907 <
2908 < /* Line 1806 of yacc.c  */
2909 < #line 443 "ircd_parser.y"
3424 <    {
3425 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3426 <                }
2907 > #line 420 "conf_parser.y" /* yacc.c:1646  */
2908 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2909 > #line 2910 "conf_parser.c" /* yacc.c:1646  */
2910      break;
2911  
2912    case 34:
2913 <
2914 < /* Line 1806 of yacc.c  */
2915 < #line 447 "ircd_parser.y"
3433 <    {
3434 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3435 <                }
2913 > #line 421 "conf_parser.y" /* yacc.c:1646  */
2914 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2915 > #line 2916 "conf_parser.c" /* yacc.c:1646  */
2916      break;
2917  
2918    case 35:
2919 + #line 422 "conf_parser.y" /* yacc.c:1646  */
2920 +    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2921 + #line 2922 "conf_parser.c" /* yacc.c:1646  */
2922 +    break;
2923  
2924 < /* Line 1806 of yacc.c  */
2925 < #line 452 "ircd_parser.y"
2926 <    { (yyval.number) = 0; }
2924 >  case 36:
2925 > #line 423 "conf_parser.y" /* yacc.c:1646  */
2926 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2927 > #line 2928 "conf_parser.c" /* yacc.c:1646  */
2928      break;
2929  
2930    case 37:
2931 <
2932 < /* Line 1806 of yacc.c  */
2933 < #line 453 "ircd_parser.y"
3449 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2931 > #line 424 "conf_parser.y" /* yacc.c:1646  */
2932 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2933 > #line 2934 "conf_parser.c" /* yacc.c:1646  */
2934      break;
2935  
2936    case 38:
2937 <
2938 < /* Line 1806 of yacc.c  */
2939 < #line 454 "ircd_parser.y"
3456 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2937 > #line 427 "conf_parser.y" /* yacc.c:1646  */
2938 >    { (yyval.number) = 0; }
2939 > #line 2940 "conf_parser.c" /* yacc.c:1646  */
2940      break;
2941  
2942 <  case 39:
2943 <
2944 < /* Line 1806 of yacc.c  */
2945 < #line 455 "ircd_parser.y"
3463 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2942 >  case 40:
2943 > #line 428 "conf_parser.y" /* yacc.c:1646  */
2944 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2945 > #line 2946 "conf_parser.c" /* yacc.c:1646  */
2946      break;
2947  
2948 <  case 40:
2948 >  case 41:
2949 > #line 429 "conf_parser.y" /* yacc.c:1646  */
2950 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2951 > #line 2952 "conf_parser.c" /* yacc.c:1646  */
2952 >    break;
2953  
2954 < /* Line 1806 of yacc.c  */
2955 < #line 456 "ircd_parser.y"
2956 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2954 >  case 42:
2955 > #line 430 "conf_parser.y" /* yacc.c:1646  */
2956 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2957 > #line 2958 "conf_parser.c" /* yacc.c:1646  */
2958      break;
2959  
2960 <  case 47:
2960 >  case 43:
2961 > #line 431 "conf_parser.y" /* yacc.c:1646  */
2962 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2963 > #line 2964 "conf_parser.c" /* yacc.c:1646  */
2964 >    break;
2965  
2966 < /* Line 1806 of yacc.c  */
2967 < #line 470 "ircd_parser.y"
2966 >  case 50:
2967 > #line 445 "conf_parser.y" /* yacc.c:1646  */
2968      {
2969    if (conf_parser_ctx.pass == 2)
2970      add_conf_module(libio_basename(yylval.string));
2971   }
2972 + #line 2973 "conf_parser.c" /* yacc.c:1646  */
2973      break;
2974  
2975 <  case 48:
2976 <
3485 < /* Line 1806 of yacc.c  */
3486 < #line 476 "ircd_parser.y"
2975 >  case 51:
2976 > #line 451 "conf_parser.y" /* yacc.c:1646  */
2977      {
2978    if (conf_parser_ctx.pass == 2)
2979      mod_add_path(yylval.string);
2980   }
2981 + #line 2982 "conf_parser.c" /* yacc.c:1646  */
2982      break;
2983  
2984 <  case 65:
2985 <
3495 < /* Line 1806 of yacc.c  */
3496 < #line 496 "ircd_parser.y"
2984 >  case 73:
2985 > #line 481 "conf_parser.y" /* yacc.c:1646  */
2986      {
2987   #ifdef HAVE_LIBCRYPTO
2988 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
2989 <    ServerInfo.tls_version = 0;
2988 >  if (conf_parser_ctx.pass == 2)
2989 >  {
2990 >    if (!ConfigServerInfo.rsa_private_key_file)
2991 >    {
2992 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2993 >      break;
2994 >    }
2995 >
2996 >    if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
2997 >        SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
2998 >    {
2999 >      report_crypto_errors();
3000 >      conf_error_report("Could not open/read certificate file");
3001 >      break;
3002 >    }
3003 >
3004 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
3005 >                                    SSL_FILETYPE_PEM) <= 0 ||
3006 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
3007 >                                    SSL_FILETYPE_PEM) <= 0)
3008 >    {
3009 >      report_crypto_errors();
3010 >      conf_error_report("Could not read RSA private key");
3011 >      break;
3012 >    }
3013 >
3014 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
3015 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
3016 >    {
3017 >      report_crypto_errors();
3018 >      conf_error_report("Could not read RSA private key");
3019 >      break;
3020 >    }
3021 >  }
3022   #endif
3023   }
3024 + #line 3025 "conf_parser.c" /* yacc.c:1646  */
3025      break;
3026  
3027 <  case 66:
3028 <
3507 < /* Line 1806 of yacc.c  */
3508 < #line 502 "ircd_parser.y"
3027 >  case 74:
3028 > #line 521 "conf_parser.y" /* yacc.c:1646  */
3029      {
3030   #ifdef HAVE_LIBCRYPTO
3031 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3031 >  BIO *file = NULL;
3032 >
3033 >  if (conf_parser_ctx.pass != 1)
3034 >    break;
3035 >
3036 >  if (ConfigServerInfo.rsa_private_key)
3037    {
3038 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
3039 <      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);
3038 >    RSA_free(ConfigServerInfo.rsa_private_key);
3039 >    ConfigServerInfo.rsa_private_key = NULL;
3040    }
3041 < #endif
3042 < }
3041 >
3042 >  if (ConfigServerInfo.rsa_private_key_file)
3043 >  {
3044 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3045 >    ConfigServerInfo.rsa_private_key_file = NULL;
3046 >  }
3047 >
3048 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3049 >
3050 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3051 >  {
3052 >    conf_error_report("File open failed, ignoring");
3053      break;
3054 +  }
3055  
3056 <  case 69:
3056 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3057  
3058 < /* Line 1806 of yacc.c  */
3059 < #line 516 "ircd_parser.y"
3060 <    {
3061 < #ifdef HAVE_LIBCRYPTO
3062 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3063 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
3530 < #endif
3531 < }
3058 >  BIO_set_close(file, BIO_CLOSE);
3059 >  BIO_free(file);
3060 >
3061 >  if (ConfigServerInfo.rsa_private_key == NULL)
3062 >  {
3063 >    conf_error_report("Couldn't extract key, ignoring");
3064      break;
3065 +  }
3066  
3067 <  case 70:
3067 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3068 >  {
3069 >    RSA_free(ConfigServerInfo.rsa_private_key);
3070 >    ConfigServerInfo.rsa_private_key = NULL;
3071  
3072 < /* Line 1806 of yacc.c  */
3073 < #line 522 "ircd_parser.y"
3074 <    {
3075 < #ifdef HAVE_LIBCRYPTO
3076 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3077 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
3072 >    conf_error_report("Invalid key, ignoring");
3073 >    break;
3074 >  }
3075 >
3076 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3077 >  {
3078 >    RSA_free(ConfigServerInfo.rsa_private_key);
3079 >    ConfigServerInfo.rsa_private_key = NULL;
3080 >
3081 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3082 >  }
3083   #endif
3084   }
3085 + #line 3086 "conf_parser.c" /* yacc.c:1646  */
3086      break;
3087  
3088 <  case 71:
3089 <
3548 < /* Line 1806 of yacc.c  */
3549 < #line 530 "ircd_parser.y"
3088 >  case 75:
3089 > #line 579 "conf_parser.y" /* yacc.c:1646  */
3090      {
3091   #ifdef HAVE_LIBCRYPTO
3092 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3092 >  if (conf_parser_ctx.pass == 2)
3093    {
3094 <    if (!ServerInfo.rsa_private_key_file)
3555 <    {
3556 <      yyerror("No rsa_private_key_file specified, SSL disabled");
3557 <      break;
3558 <    }
3094 >    BIO *file = BIO_new_file(yylval.string, "r");
3095  
3096 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
3561 <                                     SSL_FILETYPE_PEM) <= 0)
3096 >    if (file)
3097      {
3098 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3564 <      break;
3565 <    }
3098 >      DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
3099  
3100 <    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 <    }
3100 >      BIO_free(file);
3101  
3102 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
3103 <    {
3104 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3105 <      break;
3102 >      if (dh)
3103 >      {
3104 >        if (DH_size(dh) < 128)
3105 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3106 >        else
3107 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3108 >
3109 >        DH_free(dh);
3110 >      }
3111      }
3112 +    else
3113 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3114    }
3115   #endif
3116   }
3117 + #line 3118 "conf_parser.c" /* yacc.c:1646  */
3118      break;
3119  
3120 <  case 72:
3121 <
3586 < /* Line 1806 of yacc.c  */
3587 < #line 564 "ircd_parser.y"
3120 >  case 76:
3121 > #line 608 "conf_parser.y" /* yacc.c:1646  */
3122      {
3123   #ifdef HAVE_LIBCRYPTO
3124 <  if (conf_parser_ctx.pass == 1)
3125 <  {
3126 <    BIO *file;
3124 >  if (conf_parser_ctx.pass == 2)
3125 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3126 > #endif
3127 > }
3128 > #line 3129 "conf_parser.c" /* yacc.c:1646  */
3129 >    break;
3130  
3131 <    if (ServerInfo.rsa_private_key)
3131 >  case 77:
3132 > #line 616 "conf_parser.y" /* yacc.c:1646  */
3133      {
3134 <      RSA_free(ServerInfo.rsa_private_key);
3135 <      ServerInfo.rsa_private_key = NULL;
3136 <    }
3137 <
3600 <    if (ServerInfo.rsa_private_key_file)
3134 > #ifdef HAVE_LIBCRYPTO
3135 >  if (conf_parser_ctx.pass == 2)
3136 >  {
3137 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3138      {
3139 <      MyFree(ServerInfo.rsa_private_key_file);
3140 <      ServerInfo.rsa_private_key_file = NULL;
3139 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3140 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3141      }
3142 +  }
3143 + #endif
3144 + }
3145 + #line 3146 "conf_parser.c" /* yacc.c:1646  */
3146 +    break;
3147  
3148 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3149 <
3608 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3148 >  case 78:
3149 > #line 630 "conf_parser.y" /* yacc.c:1646  */
3150      {
3151 <      yyerror("File open failed, ignoring");
3152 <      break;
3153 <    }
3154 <
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);
3151 > #ifdef HAVE_LIBCRYPTO
3152 > #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
3153 >  int nid = 0;
3154 >  EC_KEY *key = NULL;
3155  
3156 <    if (ServerInfo.rsa_private_key == NULL)
3156 >  if (conf_parser_ctx.pass == 2)
3157 >  {
3158 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3159      {
3160 <      yyerror("Couldn't extract key, ignoring");
3161 <      break;
3160 >        conf_error_report("Ignoring serverinfo::ssl_dh_elliptic_curve -- unknown curve name");
3161 >        break;
3162      }
3163  
3164 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3164 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3165      {
3166 <      RSA_free(ServerInfo.rsa_private_key);
3629 <      ServerInfo.rsa_private_key = NULL;
3630 <
3631 <      yyerror("Invalid key, ignoring");
3166 >      conf_error_report("Ignoring serverinfo::ssl_dh_elliptic_curve -- could not create curve");
3167        break;
3168      }
3169  
3170 <    /* require 2048 bit (256 byte) key */
3171 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3172 <    {
3173 <      RSA_free(ServerInfo.rsa_private_key);
3639 <      ServerInfo.rsa_private_key = NULL;
3640 <
3641 <      yyerror("Not a 2048 bit key, ignoring");
3642 <    }
3643 <  }
3170 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3171 >    EC_KEY_free(key);
3172 > }
3173 > #endif
3174   #endif
3175   }
3176 + #line 3177 "conf_parser.c" /* yacc.c:1646  */
3177      break;
3178  
3179 <  case 73:
3180 <
3650 < /* Line 1806 of yacc.c  */
3651 < #line 624 "ircd_parser.y"
3179 >  case 79:
3180 > #line 658 "conf_parser.y" /* yacc.c:1646  */
3181      {
3182    /* this isn't rehashable */
3183 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
3183 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3184    {
3185      if (valid_servname(yylval.string))
3186 <      DupString(ServerInfo.name, yylval.string);
3186 >      ConfigServerInfo.name = xstrdup(yylval.string);
3187      else
3188      {
3189 <      ilog(L_ERROR, "Ignoring serverinfo::name -- invalid name. Aborting.");
3189 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3190        exit(0);
3191      }
3192    }
3193   }
3194 + #line 3195 "conf_parser.c" /* yacc.c:1646  */
3195      break;
3196  
3197 <  case 74:
3198 <
3669 < /* Line 1806 of yacc.c  */
3670 < #line 639 "ircd_parser.y"
3197 >  case 80:
3198 > #line 673 "conf_parser.y" /* yacc.c:1646  */
3199      {
3200    /* this isn't rehashable */
3201 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3201 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3202    {
3203      if (valid_sid(yylval.string))
3204 <      DupString(ServerInfo.sid, yylval.string);
3204 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3205      else
3206      {
3207 <      ilog(L_ERROR, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
3207 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3208        exit(0);
3209      }
3210    }
3211   }
3212 + #line 3213 "conf_parser.c" /* yacc.c:1646  */
3213      break;
3214  
3215 <  case 75:
3216 <
3688 < /* Line 1806 of yacc.c  */
3689 < #line 654 "ircd_parser.y"
3215 >  case 81:
3216 > #line 688 "conf_parser.y" /* yacc.c:1646  */
3217      {
3218    if (conf_parser_ctx.pass == 2)
3219    {
3220 <    MyFree(ServerInfo.description);
3221 <    DupString(ServerInfo.description,yylval.string);
3220 >    MyFree(ConfigServerInfo.description);
3221 >    ConfigServerInfo.description = xstrdup(yylval.string);
3222 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
3223    }
3224   }
3225 + #line 3226 "conf_parser.c" /* yacc.c:1646  */
3226      break;
3227  
3228 <  case 76:
3229 <
3701 < /* Line 1806 of yacc.c  */
3702 < #line 663 "ircd_parser.y"
3228 >  case 82:
3229 > #line 698 "conf_parser.y" /* yacc.c:1646  */
3230      {
3231    if (conf_parser_ctx.pass == 2)
3232    {
3233      char *p;
3234  
3235 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3236 <      p = '\0';
3235 >    if ((p = strchr(yylval.string, ' ')))
3236 >      *p = '\0';
3237  
3238 <    MyFree(ServerInfo.network_name);
3239 <    DupString(ServerInfo.network_name, yylval.string);
3238 >    MyFree(ConfigServerInfo.network_name);
3239 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3240    }
3241   }
3242 + #line 3243 "conf_parser.c" /* yacc.c:1646  */
3243      break;
3244  
3245 <  case 77:
3246 <
3719 < /* Line 1806 of yacc.c  */
3720 < #line 677 "ircd_parser.y"
3245 >  case 83:
3246 > #line 712 "conf_parser.y" /* yacc.c:1646  */
3247      {
3248 <  if (conf_parser_ctx.pass == 2)
3723 <  {
3724 <    MyFree(ServerInfo.network_desc);
3725 <    DupString(ServerInfo.network_desc, yylval.string);
3726 <  }
3727 < }
3248 >  if (conf_parser_ctx.pass != 2)
3249      break;
3250  
3251 <  case 78:
3251 >  MyFree(ConfigServerInfo.network_desc);
3252 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3253 > }
3254 > #line 3255 "conf_parser.c" /* yacc.c:1646  */
3255 >    break;
3256  
3257 < /* Line 1806 of yacc.c  */
3258 < #line 686 "ircd_parser.y"
3257 >  case 84:
3258 > #line 721 "conf_parser.y" /* yacc.c:1646  */
3259      {
3260    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3261    {
# Line 3743 | Line 3268 | yyreduce:
3268      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3269  
3270      if (getaddrinfo(yylval.string, NULL, &hints, &res))
3271 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
3271 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3272      else
3273      {
3274 <      assert(res != NULL);
3274 >      assert(res);
3275  
3276 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3277 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3278 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3276 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3277 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3278 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3279        freeaddrinfo(res);
3280  
3281 <      ServerInfo.specific_ipv4_vhost = 1;
3281 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3282      }
3283    }
3284   }
3285 + #line 3286 "conf_parser.c" /* yacc.c:1646  */
3286      break;
3287  
3288 <  case 79:
3289 <
3764 < /* Line 1806 of yacc.c  */
3765 < #line 714 "ircd_parser.y"
3288 >  case 85:
3289 > #line 749 "conf_parser.y" /* yacc.c:1646  */
3290      {
3767 #ifdef IPV6
3291    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3292    {
3293      struct addrinfo hints, *res;
# Line 3776 | Line 3299 | yyreduce:
3299      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3300  
3301      if (getaddrinfo(yylval.string, NULL, &hints, &res))
3302 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
3302 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3303      else
3304      {
3305 <      assert(res != NULL);
3305 >      assert(res);
3306  
3307 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3308 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3309 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3307 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3308 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3309 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3310        freeaddrinfo(res);
3311  
3312 <      ServerInfo.specific_ipv6_vhost = 1;
3312 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3313      }
3314    }
3792 #endif
3315   }
3316 + #line 3317 "conf_parser.c" /* yacc.c:1646  */
3317      break;
3318  
3319 <  case 80:
3320 <
3798 < /* Line 1806 of yacc.c  */
3799 < #line 744 "ircd_parser.y"
3319 >  case 86:
3320 > #line 777 "conf_parser.y" /* yacc.c:1646  */
3321      {
3322 <  if (conf_parser_ctx.pass == 2)
3322 >  if (conf_parser_ctx.pass != 2)
3323 >    break;
3324 >
3325 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3326    {
3327 <    recalc_fdlimit(NULL);
3327 >    char buf[IRCD_BUFSIZE] = "";
3328  
3329 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3330 <    {
3331 <      char buf[IRCD_BUFSIZE];
3332 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3333 <      yyerror(buf);
3334 <    }
3335 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3336 <    {
3337 <      char buf[IRCD_BUFSIZE];
3338 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3339 <      yyerror(buf);
3816 <    }
3817 <    else
3818 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3329 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3330 >    conf_error_report(buf);
3331 >    ConfigServerInfo.default_max_clients = MAXCLIENTS_MIN;
3332 >  }
3333 >  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3334 >  {
3335 >    char buf[IRCD_BUFSIZE] = "";
3336 >
3337 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3338 >    conf_error_report(buf);
3339 >    ConfigServerInfo.default_max_clients = MAXCLIENTS_MAX;
3340    }
3341 +  else
3342 +    ConfigServerInfo.default_max_clients = (yyvsp[-1].number);
3343   }
3344 + #line 3345 "conf_parser.c" /* yacc.c:1646  */
3345      break;
3346  
3347 <  case 81:
3348 <
3825 < /* Line 1806 of yacc.c  */
3826 < #line 767 "ircd_parser.y"
3347 >  case 87:
3348 > #line 802 "conf_parser.y" /* yacc.c:1646  */
3349      {
3350 <  if (conf_parser_ctx.pass == 2)
3829 <    ServerInfo.hub = yylval.number;
3830 < }
3350 >  if (conf_parser_ctx.pass != 2)
3351      break;
3352  
3353 <  case 89:
3834 <
3835 < /* Line 1806 of yacc.c  */
3836 < #line 782 "ircd_parser.y"
3837 <    {
3838 <  if (conf_parser_ctx.pass == 2)
3353 >  if ((yyvsp[-1].number) < 9)
3354    {
3355 <    MyFree(AdminInfo.name);
3356 <    DupString(AdminInfo.name, yylval.string);
3355 >    conf_error_report("max_nick_length too low, setting to 9");
3356 >    ConfigServerInfo.max_nick_length = 9;
3357    }
3358 +  else if ((yyvsp[-1].number) > NICKLEN)
3359 +  {
3360 +    char buf[IRCD_BUFSIZE] = "";
3361 +
3362 +    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3363 +    conf_error_report(buf);
3364 +    ConfigServerInfo.max_nick_length = NICKLEN;
3365 +  }
3366 +  else
3367 +    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3368   }
3369 + #line 3370 "conf_parser.c" /* yacc.c:1646  */
3370      break;
3371  
3372 <  case 90:
3373 <
3848 < /* Line 1806 of yacc.c  */
3849 < #line 791 "ircd_parser.y"
3372 >  case 88:
3373 > #line 824 "conf_parser.y" /* yacc.c:1646  */
3374      {
3375 <  if (conf_parser_ctx.pass == 2)
3375 >  if (conf_parser_ctx.pass != 2)
3376 >    break;
3377 >
3378 >  if ((yyvsp[-1].number) < 80)
3379    {
3380 <    MyFree(AdminInfo.email);
3381 <    DupString(AdminInfo.email, yylval.string);
3380 >    conf_error_report("max_topic_length too low, setting to 80");
3381 >    ConfigServerInfo.max_topic_length = 80;
3382    }
3383 +  else if ((yyvsp[-1].number) > TOPICLEN)
3384 +  {
3385 +    char buf[IRCD_BUFSIZE] = "";
3386 +
3387 +    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3388 +    conf_error_report(buf);
3389 +    ConfigServerInfo.max_topic_length = TOPICLEN;
3390 +  }
3391 +  else
3392 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3393   }
3394 + #line 3395 "conf_parser.c" /* yacc.c:1646  */
3395      break;
3396  
3397 <  case 91:
3398 <
3861 < /* Line 1806 of yacc.c  */
3862 < #line 800 "ircd_parser.y"
3397 >  case 89:
3398 > #line 846 "conf_parser.y" /* yacc.c:1646  */
3399      {
3400    if (conf_parser_ctx.pass == 2)
3401 <  {
3866 <    MyFree(AdminInfo.description);
3867 <    DupString(AdminInfo.description, yylval.string);
3868 <  }
3401 >    ConfigServerInfo.hub = yylval.number;
3402   }
3403 + #line 3404 "conf_parser.c" /* yacc.c:1646  */
3404      break;
3405  
3406 <  case 108:
3406 >  case 97:
3407 > #line 863 "conf_parser.y" /* yacc.c:1646  */
3408 >    {
3409 >  if (conf_parser_ctx.pass != 2)
3410 >    break;
3411  
3412 < /* Line 1806 of yacc.c  */
3413 < #line 827 "ircd_parser.y"
3412 >  MyFree(ConfigAdminInfo.name);
3413 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3414 > }
3415 > #line 3416 "conf_parser.c" /* yacc.c:1646  */
3416 >    break;
3417 >
3418 >  case 98:
3419 > #line 872 "conf_parser.y" /* yacc.c:1646  */
3420      {
3421 <                        }
3421 >  if (conf_parser_ctx.pass != 2)
3422      break;
3423  
3424 <  case 109:
3424 >  MyFree(ConfigAdminInfo.email);
3425 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3426 > }
3427 > #line 3428 "conf_parser.c" /* yacc.c:1646  */
3428 >    break;
3429  
3430 < /* Line 1806 of yacc.c  */
3431 < #line 831 "ircd_parser.y"
3430 >  case 99:
3431 > #line 881 "conf_parser.y" /* yacc.c:1646  */
3432      {
3433 <                        }
3433 >  if (conf_parser_ctx.pass != 2)
3434      break;
3435  
3436 <  case 110:
3436 >  MyFree(ConfigAdminInfo.description);
3437 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3438 > }
3439 > #line 3440 "conf_parser.c" /* yacc.c:1646  */
3440 >    break;
3441  
3442 < /* Line 1806 of yacc.c  */
3443 < #line 835 "ircd_parser.y"
3442 >  case 100:
3443 > #line 893 "conf_parser.y" /* yacc.c:1646  */
3444      {
3445    if (conf_parser_ctx.pass == 2)
3446 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
3895 <            sizeof(ConfigLoggingEntry.userlog));
3446 >    reset_block_state();
3447   }
3448 + #line 3449 "conf_parser.c" /* yacc.c:1646  */
3449 +    break;
3450 +
3451 +  case 101:
3452 + #line 897 "conf_parser.y" /* yacc.c:1646  */
3453 +    {
3454 +  dlink_node *node = NULL;
3455 +
3456 +  if (conf_parser_ctx.pass != 2)
3457      break;
3458  
3459 <  case 111:
3459 >  if (!block_state.file.buf[0])
3460 >    break;
3461  
3462 < /* Line 1806 of yacc.c  */
3463 < #line 842 "ircd_parser.y"
3462 >  DLINK_FOREACH(node, block_state.mask.list.head)
3463 >    motd_add(node->data, block_state.file.buf);
3464 > }
3465 > #line 3466 "conf_parser.c" /* yacc.c:1646  */
3466 >    break;
3467 >
3468 >  case 107:
3469 > #line 914 "conf_parser.y" /* yacc.c:1646  */
3470      {
3471    if (conf_parser_ctx.pass == 2)
3472 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
3906 <            sizeof(ConfigLoggingEntry.failed_operlog));
3472 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3473   }
3474 + #line 3475 "conf_parser.c" /* yacc.c:1646  */
3475      break;
3476  
3477 <  case 112:
3478 <
3912 < /* Line 1806 of yacc.c  */
3913 < #line 849 "ircd_parser.y"
3477 >  case 108:
3478 > #line 920 "conf_parser.y" /* yacc.c:1646  */
3479      {
3480    if (conf_parser_ctx.pass == 2)
3481 <    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
3917 <            sizeof(ConfigLoggingEntry.operlog));
3481 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3482   }
3483 + #line 3484 "conf_parser.c" /* yacc.c:1646  */
3484      break;
3485  
3486 <  case 113:
3487 <
3923 < /* Line 1806 of yacc.c  */
3924 < #line 856 "ircd_parser.y"
3486 >  case 109:
3487 > #line 929 "conf_parser.y" /* yacc.c:1646  */
3488      {
3489    if (conf_parser_ctx.pass == 2)
3490 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
3928 <            sizeof(ConfigLoggingEntry.operspylog));
3490 >    reset_block_state();
3491   }
3492 + #line 3493 "conf_parser.c" /* yacc.c:1646  */
3493 +    break;
3494 +
3495 +  case 110:
3496 + #line 933 "conf_parser.y" /* yacc.c:1646  */
3497 +    {
3498 +  if (conf_parser_ctx.pass != 2)
3499      break;
3500  
3501 <  case 114:
3501 >  if (!block_state.command.buf[0] ||
3502 >      !block_state.name.buf[0] ||
3503 >      !block_state.nick.buf[0] ||
3504 >      !block_state.host.buf[0])
3505 >    break;
3506 >
3507 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
3508 >                  block_state.prepend.buf, block_state.command.buf);
3509 > }
3510 > #line 3511 "conf_parser.c" /* yacc.c:1646  */
3511 >    break;
3512  
3513 < /* Line 1806 of yacc.c  */
3514 < #line 863 "ircd_parser.y"
3513 >  case 118:
3514 > #line 951 "conf_parser.y" /* yacc.c:1646  */
3515      {
3516    if (conf_parser_ctx.pass == 2)
3517 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
3939 <            sizeof(ConfigLoggingEntry.glinelog));
3517 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
3518   }
3519 + #line 3520 "conf_parser.c" /* yacc.c:1646  */
3520      break;
3521  
3522 <  case 115:
3523 <
3945 < /* Line 1806 of yacc.c  */
3946 < #line 870 "ircd_parser.y"
3522 >  case 119:
3523 > #line 957 "conf_parser.y" /* yacc.c:1646  */
3524      {
3525    if (conf_parser_ctx.pass == 2)
3526 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
3950 <            sizeof(ConfigLoggingEntry.klinelog));
3526 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3527   }
3528 + #line 3529 "conf_parser.c" /* yacc.c:1646  */
3529      break;
3530  
3531 <  case 116:
3531 >  case 120:
3532 > #line 963 "conf_parser.y" /* yacc.c:1646  */
3533 >    {
3534 >  if (conf_parser_ctx.pass == 2)
3535 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
3536 > }
3537 > #line 3538 "conf_parser.c" /* yacc.c:1646  */
3538 >    break;
3539  
3540 < /* Line 1806 of yacc.c  */
3541 < #line 877 "ircd_parser.y"
3540 >  case 121:
3541 > #line 969 "conf_parser.y" /* yacc.c:1646  */
3542      {
3543    if (conf_parser_ctx.pass == 2)
3544 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
3545 <            sizeof(ConfigLoggingEntry.ioerrlog));
3544 >  {
3545 >    struct split_nuh_item nuh;
3546 >
3547 >    nuh.nuhmask  = yylval.string;
3548 >    nuh.nickptr  = NULL;
3549 >    nuh.userptr  = block_state.nick.buf;
3550 >    nuh.hostptr  = block_state.host.buf;
3551 >    nuh.nicksize = 0;
3552 >    nuh.usersize = sizeof(block_state.nick.buf);
3553 >    nuh.hostsize = sizeof(block_state.host.buf);
3554 >
3555 >    split_nuh(&nuh);
3556 >  }
3557   }
3558 + #line 3559 "conf_parser.c" /* yacc.c:1646  */
3559      break;
3560  
3561 <  case 117:
3561 >  case 128:
3562 > #line 996 "conf_parser.y" /* yacc.c:1646  */
3563 >    {
3564 >  if (conf_parser_ctx.pass == 2)
3565 >    ConfigLog.use_logging = yylval.number;
3566 > }
3567 > #line 3568 "conf_parser.c" /* yacc.c:1646  */
3568 >    break;
3569  
3570 < /* Line 1806 of yacc.c  */
3571 < #line 884 "ircd_parser.y"
3570 >  case 129:
3571 > #line 1002 "conf_parser.y" /* yacc.c:1646  */
3572      {
3573    if (conf_parser_ctx.pass == 2)
3574 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
3972 <            sizeof(ConfigLoggingEntry.killlog));
3574 >    reset_block_state();
3575   }
3576 + #line 3577 "conf_parser.c" /* yacc.c:1646  */
3577      break;
3578  
3579 <  case 118:
3579 >  case 130:
3580 > #line 1006 "conf_parser.y" /* yacc.c:1646  */
3581 >    {
3582 >  if (conf_parser_ctx.pass != 2)
3583 >    break;
3584  
3585 < /* Line 1806 of yacc.c  */
3586 < #line 891 "ircd_parser.y"
3587 <    {
3981 <  if (conf_parser_ctx.pass == 2)
3982 <    set_log_level(L_CRIT);
3585 >  if (block_state.type.value && block_state.file.buf[0])
3586 >    log_set_file(block_state.type.value, block_state.size.value,
3587 >                 block_state.file.buf);
3588   }
3589 + #line 3590 "conf_parser.c" /* yacc.c:1646  */
3590      break;
3591  
3592 <  case 119:
3592 >  case 137:
3593 > #line 1022 "conf_parser.y" /* yacc.c:1646  */
3594 >    {
3595 >  if (conf_parser_ctx.pass != 2)
3596 >    break;
3597 >
3598 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3599 > }
3600 > #line 3601 "conf_parser.c" /* yacc.c:1646  */
3601 >    break;
3602  
3603 < /* Line 1806 of yacc.c  */
3604 < #line 895 "ircd_parser.y"
3603 >  case 138:
3604 > #line 1030 "conf_parser.y" /* yacc.c:1646  */
3605      {
3606 <  if (conf_parser_ctx.pass == 2)
3992 <    set_log_level(L_ERROR);
3606 >  block_state.size.value = (yyvsp[-1].number);
3607   }
3608 + #line 3609 "conf_parser.c" /* yacc.c:1646  */
3609      break;
3610  
3611 <  case 120:
3611 >  case 139:
3612 > #line 1033 "conf_parser.y" /* yacc.c:1646  */
3613 >    {
3614 >  block_state.size.value = 0;
3615 > }
3616 > #line 3617 "conf_parser.c" /* yacc.c:1646  */
3617 >    break;
3618  
3619 < /* Line 1806 of yacc.c  */
3620 < #line 899 "ircd_parser.y"
3619 >  case 140:
3620 > #line 1038 "conf_parser.y" /* yacc.c:1646  */
3621      {
3622    if (conf_parser_ctx.pass == 2)
3623 <    set_log_level(L_WARN);
3623 >    block_state.type.value = 0;
3624   }
3625 + #line 3626 "conf_parser.c" /* yacc.c:1646  */
3626      break;
3627  
3628 <  case 121:
3629 <
4008 < /* Line 1806 of yacc.c  */
4009 < #line 903 "ircd_parser.y"
3628 >  case 144:
3629 > #line 1045 "conf_parser.y" /* yacc.c:1646  */
3630      {
3631    if (conf_parser_ctx.pass == 2)
3632 <    set_log_level(L_NOTICE);
3632 >    block_state.type.value = LOG_TYPE_USER;
3633   }
3634 + #line 3635 "conf_parser.c" /* yacc.c:1646  */
3635      break;
3636  
3637 <  case 122:
3638 <
4018 < /* Line 1806 of yacc.c  */
4019 < #line 907 "ircd_parser.y"
3637 >  case 145:
3638 > #line 1049 "conf_parser.y" /* yacc.c:1646  */
3639      {
3640    if (conf_parser_ctx.pass == 2)
3641 <    set_log_level(L_TRACE);
3641 >    block_state.type.value = LOG_TYPE_OPER;
3642   }
3643 + #line 3644 "conf_parser.c" /* yacc.c:1646  */
3644      break;
3645  
3646 <  case 123:
3647 <
4028 < /* Line 1806 of yacc.c  */
4029 < #line 911 "ircd_parser.y"
3646 >  case 146:
3647 > #line 1053 "conf_parser.y" /* yacc.c:1646  */
3648      {
3649    if (conf_parser_ctx.pass == 2)
3650 <    set_log_level(L_INFO);
3650 >    block_state.type.value = LOG_TYPE_XLINE;
3651   }
3652 + #line 3653 "conf_parser.c" /* yacc.c:1646  */
3653      break;
3654  
3655 <  case 124:
3656 <
4038 < /* Line 1806 of yacc.c  */
4039 < #line 915 "ircd_parser.y"
3655 >  case 147:
3656 > #line 1057 "conf_parser.y" /* yacc.c:1646  */
3657      {
3658    if (conf_parser_ctx.pass == 2)
3659 <    set_log_level(L_DEBUG);
3659 >    block_state.type.value = LOG_TYPE_RESV;
3660   }
3661 + #line 3662 "conf_parser.c" /* yacc.c:1646  */
3662      break;
3663  
3664 <  case 125:
3665 <
4048 < /* Line 1806 of yacc.c  */
4049 < #line 921 "ircd_parser.y"
3664 >  case 148:
3665 > #line 1061 "conf_parser.y" /* yacc.c:1646  */
3666      {
3667    if (conf_parser_ctx.pass == 2)
3668 <    ConfigLoggingEntry.use_logging = yylval.number;
3668 >    block_state.type.value = LOG_TYPE_DLINE;
3669   }
3670 + #line 3671 "conf_parser.c" /* yacc.c:1646  */
3671      break;
3672  
3673 <  case 126:
3674 <
4058 < /* Line 1806 of yacc.c  */
4059 < #line 930 "ircd_parser.y"
3673 >  case 149:
3674 > #line 1065 "conf_parser.y" /* yacc.c:1646  */
3675      {
3676    if (conf_parser_ctx.pass == 2)
3677 <  {
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 <  }
3677 >    block_state.type.value = LOG_TYPE_KLINE;
3678   }
3679 + #line 3680 "conf_parser.c" /* yacc.c:1646  */
3680      break;
3681  
3682 <  case 127:
3682 >  case 150:
3683 > #line 1069 "conf_parser.y" /* yacc.c:1646  */
3684 >    {
3685 >  if (conf_parser_ctx.pass == 2)
3686 >    block_state.type.value = LOG_TYPE_KILL;
3687 > }
3688 > #line 3689 "conf_parser.c" /* yacc.c:1646  */
3689 >    break;
3690  
3691 < /* Line 1806 of yacc.c  */
3692 < #line 943 "ircd_parser.y"
3691 >  case 151:
3692 > #line 1073 "conf_parser.y" /* yacc.c:1646  */
3693      {
3694    if (conf_parser_ctx.pass == 2)
3695 <  {
3696 <    struct CollectItem *yy_tmp;
3697 <    dlink_node *ptr;
3698 <    dlink_node *next_ptr;
3695 >    block_state.type.value = LOG_TYPE_DEBUG;
3696 > }
3697 > #line 3698 "conf_parser.c" /* yacc.c:1646  */
3698 >    break;
3699  
3700 <    conf_add_class_to_conf(yy_conf, class_name);
3700 >  case 152:
3701 > #line 1083 "conf_parser.y" /* yacc.c:1646  */
3702 >    {
3703 >  if (conf_parser_ctx.pass != 2)
3704 >    break;
3705  
3706 <    /* Now, make sure there is a copy of the "base" given oper
3707 <     * block in each of the collected copies
3708 <     */
3706 >  reset_block_state();
3707 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3708 > }
3709 > #line 3710 "conf_parser.c" /* yacc.c:1646  */
3710 >    break;
3711  
3712 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3712 >  case 153:
3713 > #line 1090 "conf_parser.y" /* yacc.c:1646  */
3714      {
3715 <      struct AccessItem *new_aconf;
4095 <      struct ConfItem *new_conf;
4096 <      yy_tmp = ptr->data;
3715 >  dlink_node *node = NULL;
3716  
3717 <      new_conf = make_conf_item(OPER_TYPE);
3718 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
3717 >  if (conf_parser_ctx.pass != 2)
3718 >    break;
3719  
3720 <      new_aconf->flags = yy_aconf->flags;
3720 >  if (!block_state.name.buf[0])
3721 >    break;
3722 > #ifdef HAVE_LIBCRYPTO
3723 >  if (!block_state.file.buf[0] &&
3724 >      !block_state.rpass.buf[0])
3725 >    break;
3726 > #else
3727 >  if (!block_state.rpass.buf[0])
3728 >    break;
3729 > #endif
3730  
3731 <      if (yy_conf->name != NULL)
3732 <        DupString(new_conf->name, yy_conf->name);
3733 <      if (yy_tmp->user != NULL)
3734 <        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);
3731 >  DLINK_FOREACH(node, block_state.mask.list.head)
3732 >  {
3733 >    struct MaskItem *conf = NULL;
3734 >    struct split_nuh_item nuh;
3735  
3736 <      new_aconf->port = yy_aconf->port;
3737 < #ifdef HAVE_LIBCRYPTO
3738 <      if (yy_aconf->rsa_public_key_file != NULL)
3739 <      {
3740 <        BIO *file;
3736 >    nuh.nuhmask  = node->data;
3737 >    nuh.nickptr  = NULL;
3738 >    nuh.userptr  = block_state.user.buf;
3739 >    nuh.hostptr  = block_state.host.buf;
3740 >    nuh.nicksize = 0;
3741 >    nuh.usersize = sizeof(block_state.user.buf);
3742 >    nuh.hostsize = sizeof(block_state.host.buf);
3743 >    split_nuh(&nuh);
3744  
3745 <        DupString(new_aconf->rsa_public_key_file,
3746 <                  yy_aconf->rsa_public_key_file);
3745 >    conf         = conf_make(CONF_OPER);
3746 >    conf->name   = xstrdup(block_state.name.buf);
3747 >    conf->user   = xstrdup(block_state.user.buf);
3748 >    conf->host   = xstrdup(block_state.host.buf);
3749 >
3750 >    if (block_state.cert.buf[0])
3751 >      conf->certfp = xstrdup(block_state.cert.buf);
3752 >
3753 >    if (block_state.rpass.buf[0])
3754 >      conf->passwd = xstrdup(block_state.rpass.buf);
3755 >
3756 >    if (block_state.whois.buf[0])
3757 >      conf->whois = xstrdup(block_state.whois.buf);
3758 >
3759 >    conf->flags = block_state.flags.value;
3760 >    conf->modes = block_state.modes.value;
3761 >    conf->port  = block_state.port.value;
3762 >    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3763  
3764 <        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
3764 >    conf_add_class_to_conf(conf, block_state.class.buf);
3765  
3766   #ifdef HAVE_LIBCRYPTO
3767 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
3768 <          && yy_tmp->host)
3769 < #else
3770 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
3771 < #endif
3767 >    if (block_state.file.buf[0])
3768 >    {
3769 >      BIO *file = NULL;
3770 >      RSA *pkey = NULL;
3771 >
3772 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3773        {
3774 <        conf_add_class_to_conf(new_conf, class_name);
3775 <        if (yy_tmp->name != NULL)
4143 <          DupString(new_conf->name, yy_tmp->name);
3774 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3775 >        break;
3776        }
3777  
3778 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
3779 <      free_collect_item(yy_tmp);
3780 <    }
3781 <
3782 <    yy_conf = NULL;
3783 <    yy_aconf = NULL;
3784 <
3778 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3779 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3780 >      else
3781 >      {
3782 >        if (RSA_size(pkey) > 128)
3783 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3784 >        else
3785 >          conf->rsa_public_key = pkey;
3786 >      }
3787  
3788 <    MyFree(class_name);
3789 <    class_name = NULL;
3788 >      BIO_set_close(file, BIO_CLOSE);
3789 >      BIO_free(file);
3790 >    }
3791 > #endif /* HAVE_LIBCRYPTO */
3792    }
3793   }
3794 + #line 3795 "conf_parser.c" /* yacc.c:1646  */
3795      break;
3796  
3797 <  case 141:
3798 <
4162 < /* Line 1806 of yacc.c  */
4163 < #line 1030 "ircd_parser.y"
3797 >  case 168:
3798 > #line 1186 "conf_parser.y" /* yacc.c:1646  */
3799      {
3800    if (conf_parser_ctx.pass == 2)
3801 <  {
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 <  }
3801 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3802   }
3803 + #line 3804 "conf_parser.c" /* yacc.c:1646  */
3804      break;
3805  
3806 <  case 142:
3807 <
4178 < /* Line 1806 of yacc.c  */
4179 < #line 1042 "ircd_parser.y"
3806 >  case 169:
3807 > #line 1192 "conf_parser.y" /* yacc.c:1646  */
3808      {
3809    if (conf_parser_ctx.pass == 2)
3810 <  {
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 <  }
3810 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3811   }
3812 + #line 3813 "conf_parser.c" /* yacc.c:1646  */
3813      break;
3814  
3815 <  case 143:
3816 <
4194 < /* Line 1806 of yacc.c  */
4195 < #line 1054 "ircd_parser.y"
3815 >  case 170:
3816 > #line 1198 "conf_parser.y" /* yacc.c:1646  */
3817      {
3818    if (conf_parser_ctx.pass == 2)
3819 <  {
3820 <    struct split_nuh_item nuh;
3819 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3820 > }
3821 > #line 3822 "conf_parser.c" /* yacc.c:1646  */
3822 >    break;
3823  
3824 <    nuh.nuhmask  = yylval.string;
3825 <    nuh.nickptr  = NULL;
3826 <    nuh.userptr  = userbuf;
3827 <    nuh.hostptr  = hostbuf;
3824 >  case 171:
3825 > #line 1204 "conf_parser.y" /* yacc.c:1646  */
3826 >    {
3827 >  if (conf_parser_ctx.pass == 2)
3828 >    strlcpy(block_state.whois.buf, yylval.string, sizeof(block_state.whois.buf));
3829 > }
3830 > #line 3831 "conf_parser.c" /* yacc.c:1646  */
3831 >    break;
3832  
3833 <    nuh.nicksize = 0;
3834 <    nuh.usersize = sizeof(userbuf);
3835 <    nuh.hostsize = sizeof(hostbuf);
3833 >  case 172:
3834 > #line 1210 "conf_parser.y" /* yacc.c:1646  */
3835 >    {
3836 >  if (conf_parser_ctx.pass != 2)
3837 >    break;
3838  
3839 <    split_nuh(&nuh);
3839 >  if (yylval.number)
3840 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3841 >  else
3842 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3843 > }
3844 > #line 3845 "conf_parser.c" /* yacc.c:1646  */
3845 >    break;
3846  
3847 <    if (yy_aconf->user == NULL)
3847 >  case 173:
3848 > #line 1221 "conf_parser.y" /* yacc.c:1646  */
3849      {
3850 <      DupString(yy_aconf->user, userbuf);
3851 <      DupString(yy_aconf->host, hostbuf);
3852 <    }
3853 <    else
3850 >  if (conf_parser_ctx.pass == 2)
3851 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3852 > }
3853 > #line 3854 "conf_parser.c" /* yacc.c:1646  */
3854 >    break;
3855 >
3856 >  case 174:
3857 > #line 1227 "conf_parser.y" /* yacc.c:1646  */
3858      {
3859 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3859 >  if (conf_parser_ctx.pass == 2)
3860 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3861 > }
3862 > #line 3863 "conf_parser.c" /* yacc.c:1646  */
3863 >    break;
3864  
3865 <      DupString(yy_tmp->user, userbuf);
3866 <      DupString(yy_tmp->host, hostbuf);
3865 >  case 175:
3866 > #line 1233 "conf_parser.y" /* yacc.c:1646  */
3867 >    {
3868 >  if (conf_parser_ctx.pass != 2)
3869 >    break;
3870  
3871 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3872 <    }
3873 <  }
3871 >  if (yylval.number)
3872 >    block_state.flags.value |= CONF_FLAGS_SSL;
3873 >  else
3874 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3875   }
3876 + #line 3877 "conf_parser.c" /* yacc.c:1646  */
3877      break;
3878  
3879 <  case 144:
3880 <
4232 < /* Line 1806 of yacc.c  */
4233 < #line 1088 "ircd_parser.y"
3879 >  case 176:
3880 > #line 1244 "conf_parser.y" /* yacc.c:1646  */
3881      {
3882    if (conf_parser_ctx.pass == 2)
3883 <  {
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 <  }
3883 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3884   }
3885 + #line 3886 "conf_parser.c" /* yacc.c:1646  */
3886      break;
3887  
3888 <  case 145:
3889 <
4248 < /* Line 1806 of yacc.c  */
4249 < #line 1100 "ircd_parser.y"
3888 >  case 177:
3889 > #line 1250 "conf_parser.y" /* yacc.c:1646  */
3890      {
3891    if (conf_parser_ctx.pass == 2)
3892 <  {
4253 <    if (yylval.number)
4254 <      SetConfEncrypted(yy_aconf);
4255 <    else
4256 <      ClearConfEncrypted(yy_aconf);
4257 <  }
3892 >    block_state.modes.value = 0;
3893   }
3894 + #line 3895 "conf_parser.c" /* yacc.c:1646  */
3895      break;
3896  
3897 <  case 146:
3898 <
4263 < /* Line 1806 of yacc.c  */
4264 < #line 1111 "ircd_parser.y"
3897 >  case 181:
3898 > #line 1257 "conf_parser.y" /* yacc.c:1646  */
3899      {
4266 #ifdef HAVE_LIBCRYPTO
3900    if (conf_parser_ctx.pass == 2)
3901 <  {
3902 <    BIO *file;
3901 >    block_state.modes.value |= UMODE_BOTS;
3902 > }
3903 > #line 3904 "conf_parser.c" /* yacc.c:1646  */
3904 >    break;
3905  
3906 <    if (yy_aconf->rsa_public_key != NULL)
3906 >  case 182:
3907 > #line 1261 "conf_parser.y" /* yacc.c:1646  */
3908      {
3909 <      RSA_free(yy_aconf->rsa_public_key);
3910 <      yy_aconf->rsa_public_key = NULL;
3911 <    }
3909 >  if (conf_parser_ctx.pass == 2)
3910 >    block_state.modes.value |= UMODE_CCONN;
3911 > }
3912 > #line 3913 "conf_parser.c" /* yacc.c:1646  */
3913 >    break;
3914  
3915 <    if (yy_aconf->rsa_public_key_file != NULL)
3915 >  case 183:
3916 > #line 1265 "conf_parser.y" /* yacc.c:1646  */
3917      {
3918 <      MyFree(yy_aconf->rsa_public_key_file);
3919 <      yy_aconf->rsa_public_key_file = NULL;
3920 <    }
3921 <
3922 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
4284 <    file = BIO_new_file(yylval.string, "r");
3918 >  if (conf_parser_ctx.pass == 2)
3919 >    block_state.modes.value |= UMODE_DEAF;
3920 > }
3921 > #line 3922 "conf_parser.c" /* yacc.c:1646  */
3922 >    break;
3923  
3924 <    if (file == NULL)
3924 >  case 184:
3925 > #line 1269 "conf_parser.y" /* yacc.c:1646  */
3926      {
3927 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
3928 <      break;
3929 <    }
3930 <
3931 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
3927 >  if (conf_parser_ctx.pass == 2)
3928 >    block_state.modes.value |= UMODE_DEBUG;
3929 > }
3930 > #line 3931 "conf_parser.c" /* yacc.c:1646  */
3931 >    break;
3932  
3933 <    if (yy_aconf->rsa_public_key == NULL)
3933 >  case 185:
3934 > #line 1273 "conf_parser.y" /* yacc.c:1646  */
3935      {
3936 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
3937 <      break;
4298 <    }
4299 <
4300 <    BIO_set_close(file, BIO_CLOSE);
4301 <    BIO_free(file);
4302 <  }
4303 < #endif /* HAVE_LIBCRYPTO */
3936 >  if (conf_parser_ctx.pass == 2)
3937 >    block_state.modes.value |= UMODE_FULL;
3938   }
3939 + #line 3940 "conf_parser.c" /* yacc.c:1646  */
3940      break;
3941  
3942 <  case 147:
3943 <
4309 < /* Line 1806 of yacc.c  */
4310 < #line 1153 "ircd_parser.y"
3942 >  case 186:
3943 > #line 1277 "conf_parser.y" /* yacc.c:1646  */
3944      {
3945    if (conf_parser_ctx.pass == 2)
3946 <  {
4314 <    MyFree(class_name);
4315 <    DupString(class_name, yylval.string);
4316 <  }
3946 >    block_state.modes.value |= UMODE_HIDDEN;
3947   }
3948 + #line 3949 "conf_parser.c" /* yacc.c:1646  */
3949      break;
3950  
3951 <  case 148:
3952 <
4322 < /* Line 1806 of yacc.c  */
4323 < #line 1162 "ircd_parser.y"
3951 >  case 187:
3952 > #line 1281 "conf_parser.y" /* yacc.c:1646  */
3953      {
3954    if (conf_parser_ctx.pass == 2)
3955 <    yy_aconf->modes = 0;
3955 >    block_state.modes.value |= UMODE_HIDECHANS;
3956   }
3957 + #line 3958 "conf_parser.c" /* yacc.c:1646  */
3958      break;
3959  
3960 <  case 152:
3961 <
4332 < /* Line 1806 of yacc.c  */
4333 < #line 1169 "ircd_parser.y"
3960 >  case 188:
3961 > #line 1285 "conf_parser.y" /* yacc.c:1646  */
3962      {
3963    if (conf_parser_ctx.pass == 2)
3964 <    yy_aconf->modes |= UMODE_BOTS;
3964 >    block_state.modes.value |= UMODE_HIDEIDLE;
3965   }
3966 + #line 3967 "conf_parser.c" /* yacc.c:1646  */
3967      break;
3968  
3969 <  case 153:
3970 <
4342 < /* Line 1806 of yacc.c  */
4343 < #line 1173 "ircd_parser.y"
3969 >  case 189:
3970 > #line 1289 "conf_parser.y" /* yacc.c:1646  */
3971      {
3972    if (conf_parser_ctx.pass == 2)
3973 <    yy_aconf->modes |= UMODE_CCONN;
3973 >    block_state.modes.value |= UMODE_SKILL;
3974   }
3975 + #line 3976 "conf_parser.c" /* yacc.c:1646  */
3976      break;
3977  
3978 <  case 154:
3979 <
4352 < /* Line 1806 of yacc.c  */
4353 < #line 1177 "ircd_parser.y"
3978 >  case 190:
3979 > #line 1293 "conf_parser.y" /* yacc.c:1646  */
3980      {
3981    if (conf_parser_ctx.pass == 2)
3982 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3982 >    block_state.modes.value |= UMODE_NCHANGE;
3983   }
3984 + #line 3985 "conf_parser.c" /* yacc.c:1646  */
3985      break;
3986  
3987 <  case 155:
3988 <
4362 < /* Line 1806 of yacc.c  */
4363 < #line 1181 "ircd_parser.y"
3987 >  case 191:
3988 > #line 1297 "conf_parser.y" /* yacc.c:1646  */
3989      {
3990    if (conf_parser_ctx.pass == 2)
3991 <    yy_aconf->modes |= UMODE_DEAF;
3991 >    block_state.modes.value |= UMODE_REJ;
3992   }
3993 + #line 3994 "conf_parser.c" /* yacc.c:1646  */
3994      break;
3995  
3996 <  case 156:
3997 <
4372 < /* Line 1806 of yacc.c  */
4373 < #line 1185 "ircd_parser.y"
3996 >  case 192:
3997 > #line 1301 "conf_parser.y" /* yacc.c:1646  */
3998      {
3999    if (conf_parser_ctx.pass == 2)
4000 <    yy_aconf->modes |= UMODE_DEBUG;
4000 >    block_state.modes.value |= UMODE_UNAUTH;
4001   }
4002 + #line 4003 "conf_parser.c" /* yacc.c:1646  */
4003      break;
4004  
4005 <  case 157:
4006 <
4382 < /* Line 1806 of yacc.c  */
4383 < #line 1189 "ircd_parser.y"
4005 >  case 193:
4006 > #line 1305 "conf_parser.y" /* yacc.c:1646  */
4007      {
4008    if (conf_parser_ctx.pass == 2)
4009 <    yy_aconf->modes |= UMODE_FULL;
4009 >    block_state.modes.value |= UMODE_SPY;
4010   }
4011 + #line 4012 "conf_parser.c" /* yacc.c:1646  */
4012      break;
4013  
4014 <  case 158:
4015 <
4392 < /* Line 1806 of yacc.c  */
4393 < #line 1193 "ircd_parser.y"
4014 >  case 194:
4015 > #line 1309 "conf_parser.y" /* yacc.c:1646  */
4016      {
4017    if (conf_parser_ctx.pass == 2)
4018 <    yy_aconf->modes |= UMODE_SKILL;
4018 >    block_state.modes.value |= UMODE_EXTERNAL;
4019   }
4020 + #line 4021 "conf_parser.c" /* yacc.c:1646  */
4021      break;
4022  
4023 <  case 159:
4024 <
4402 < /* Line 1806 of yacc.c  */
4403 < #line 1197 "ircd_parser.y"
4023 >  case 195:
4024 > #line 1313 "conf_parser.y" /* yacc.c:1646  */
4025      {
4026    if (conf_parser_ctx.pass == 2)
4027 <    yy_aconf->modes |= UMODE_NCHANGE;
4027 >    block_state.modes.value |= UMODE_SERVNOTICE;
4028   }
4029 + #line 4030 "conf_parser.c" /* yacc.c:1646  */
4030      break;
4031  
4032 <  case 160:
4033 <
4412 < /* Line 1806 of yacc.c  */
4413 < #line 1201 "ircd_parser.y"
4032 >  case 196:
4033 > #line 1317 "conf_parser.y" /* yacc.c:1646  */
4034      {
4035    if (conf_parser_ctx.pass == 2)
4036 <    yy_aconf->modes |= UMODE_REJ;
4036 >    block_state.modes.value |= UMODE_INVISIBLE;
4037   }
4038 + #line 4039 "conf_parser.c" /* yacc.c:1646  */
4039      break;
4040  
4041 <  case 161:
4042 <
4422 < /* Line 1806 of yacc.c  */
4423 < #line 1205 "ircd_parser.y"
4041 >  case 197:
4042 > #line 1321 "conf_parser.y" /* yacc.c:1646  */
4043      {
4044    if (conf_parser_ctx.pass == 2)
4045 <    yy_aconf->modes |= UMODE_UNAUTH;
4045 >    block_state.modes.value |= UMODE_WALLOP;
4046   }
4047 + #line 4048 "conf_parser.c" /* yacc.c:1646  */
4048      break;
4049  
4050 <  case 162:
4051 <
4432 < /* Line 1806 of yacc.c  */
4433 < #line 1209 "ircd_parser.y"
4050 >  case 198:
4051 > #line 1325 "conf_parser.y" /* yacc.c:1646  */
4052      {
4053    if (conf_parser_ctx.pass == 2)
4054 <    yy_aconf->modes |= UMODE_SPY;
4054 >    block_state.modes.value |= UMODE_SOFTCALLERID;
4055   }
4056 + #line 4057 "conf_parser.c" /* yacc.c:1646  */
4057      break;
4058  
4059 <  case 163:
4060 <
4442 < /* Line 1806 of yacc.c  */
4443 < #line 1213 "ircd_parser.y"
4059 >  case 199:
4060 > #line 1329 "conf_parser.y" /* yacc.c:1646  */
4061      {
4062    if (conf_parser_ctx.pass == 2)
4063 <    yy_aconf->modes |= UMODE_EXTERNAL;
4063 >    block_state.modes.value |= UMODE_CALLERID;
4064   }
4065 + #line 4066 "conf_parser.c" /* yacc.c:1646  */
4066      break;
4067  
4068 <  case 164:
4069 <
4452 < /* Line 1806 of yacc.c  */
4453 < #line 1217 "ircd_parser.y"
4068 >  case 200:
4069 > #line 1333 "conf_parser.y" /* yacc.c:1646  */
4070      {
4071    if (conf_parser_ctx.pass == 2)
4072 <    yy_aconf->modes |= UMODE_OPERWALL;
4072 >    block_state.modes.value |= UMODE_LOCOPS;
4073   }
4074 + #line 4075 "conf_parser.c" /* yacc.c:1646  */
4075      break;
4076  
4077 <  case 165:
4078 <
4462 < /* Line 1806 of yacc.c  */
4463 < #line 1221 "ircd_parser.y"
4077 >  case 201:
4078 > #line 1337 "conf_parser.y" /* yacc.c:1646  */
4079      {
4080    if (conf_parser_ctx.pass == 2)
4081 <    yy_aconf->modes |= UMODE_SERVNOTICE;
4081 >    block_state.modes.value |= UMODE_REGONLY;
4082   }
4083 + #line 4084 "conf_parser.c" /* yacc.c:1646  */
4084      break;
4085  
4086 <  case 166:
4087 <
4472 < /* Line 1806 of yacc.c  */
4473 < #line 1225 "ircd_parser.y"
4086 >  case 202:
4087 > #line 1341 "conf_parser.y" /* yacc.c:1646  */
4088      {
4089    if (conf_parser_ctx.pass == 2)
4090 <    yy_aconf->modes |= UMODE_INVISIBLE;
4090 >    block_state.modes.value |= UMODE_FARCONNECT;
4091   }
4092 + #line 4093 "conf_parser.c" /* yacc.c:1646  */
4093      break;
4094  
4095 <  case 167:
4096 <
4482 < /* Line 1806 of yacc.c  */
4483 < #line 1229 "ircd_parser.y"
4095 >  case 203:
4096 > #line 1347 "conf_parser.y" /* yacc.c:1646  */
4097      {
4098    if (conf_parser_ctx.pass == 2)
4099 <    yy_aconf->modes |= UMODE_WALLOP;
4099 >    block_state.port.value = 0;
4100   }
4101 + #line 4102 "conf_parser.c" /* yacc.c:1646  */
4102      break;
4103  
4104 <  case 168:
4105 <
4492 < /* Line 1806 of yacc.c  */
4493 < #line 1233 "ircd_parser.y"
4104 >  case 207:
4105 > #line 1354 "conf_parser.y" /* yacc.c:1646  */
4106      {
4107    if (conf_parser_ctx.pass == 2)
4108 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
4108 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4109   }
4110 + #line 4111 "conf_parser.c" /* yacc.c:1646  */
4111      break;
4112  
4113 <  case 169:
4114 <
4502 < /* Line 1806 of yacc.c  */
4503 < #line 1237 "ircd_parser.y"
4113 >  case 208:
4114 > #line 1358 "conf_parser.y" /* yacc.c:1646  */
4115      {
4116    if (conf_parser_ctx.pass == 2)
4117 <    yy_aconf->modes |= UMODE_CALLERID;
4117 >    block_state.port.value |= OPER_FLAG_KILL;
4118   }
4119 + #line 4120 "conf_parser.c" /* yacc.c:1646  */
4120      break;
4121  
4122 <  case 170:
4123 <
4512 < /* Line 1806 of yacc.c  */
4513 < #line 1241 "ircd_parser.y"
4122 >  case 209:
4123 > #line 1362 "conf_parser.y" /* yacc.c:1646  */
4124      {
4125    if (conf_parser_ctx.pass == 2)
4126 <    yy_aconf->modes |= UMODE_LOCOPS;
4126 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4127   }
4128 + #line 4129 "conf_parser.c" /* yacc.c:1646  */
4129      break;
4130  
4131 <  case 171:
4132 <
4522 < /* Line 1806 of yacc.c  */
4523 < #line 1247 "ircd_parser.y"
4131 >  case 210:
4132 > #line 1366 "conf_parser.y" /* yacc.c:1646  */
4133      {
4134 +  if (conf_parser_ctx.pass == 2)
4135 +    block_state.port.value |= OPER_FLAG_CONNECT;
4136   }
4137 + #line 4138 "conf_parser.c" /* yacc.c:1646  */
4138      break;
4139  
4140 <  case 175:
4141 <
4142 < /* Line 1806 of yacc.c  */
4143 < #line 1251 "ircd_parser.y"
4144 <    { not_atom = 1; }
4140 >  case 211:
4141 > #line 1370 "conf_parser.y" /* yacc.c:1646  */
4142 >    {
4143 >  if (conf_parser_ctx.pass == 2)
4144 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4145 > }
4146 > #line 4147 "conf_parser.c" /* yacc.c:1646  */
4147      break;
4148  
4149 <  case 177:
4150 <
4151 < /* Line 1806 of yacc.c  */
4152 < #line 1252 "ircd_parser.y"
4153 <    { not_atom = 0; }
4149 >  case 212:
4150 > #line 1374 "conf_parser.y" /* yacc.c:1646  */
4151 >    {
4152 >  if (conf_parser_ctx.pass == 2)
4153 >    block_state.port.value |= OPER_FLAG_SQUIT;
4154 > }
4155 > #line 4156 "conf_parser.c" /* yacc.c:1646  */
4156      break;
4157  
4158 <  case 179:
4159 <
4544 < /* Line 1806 of yacc.c  */
4545 < #line 1255 "ircd_parser.y"
4158 >  case 213:
4159 > #line 1378 "conf_parser.y" /* yacc.c:1646  */
4160      {
4161    if (conf_parser_ctx.pass == 2)
4162 <  {
4549 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4550 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4551 <  }
4162 >    block_state.port.value |= OPER_FLAG_KLINE;
4163   }
4164 + #line 4165 "conf_parser.c" /* yacc.c:1646  */
4165      break;
4166  
4167 <  case 180:
4168 <
4557 < /* Line 1806 of yacc.c  */
4558 < #line 1262 "ircd_parser.y"
4167 >  case 214:
4168 > #line 1382 "conf_parser.y" /* yacc.c:1646  */
4169      {
4170    if (conf_parser_ctx.pass == 2)
4171 <  {
4562 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
4563 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
4564 <  }
4171 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4172   }
4173 + #line 4174 "conf_parser.c" /* yacc.c:1646  */
4174      break;
4175  
4176 <  case 181:
4177 <
4570 < /* Line 1806 of yacc.c  */
4571 < #line 1269 "ircd_parser.y"
4176 >  case 215:
4177 > #line 1386 "conf_parser.y" /* yacc.c:1646  */
4178      {
4179    if (conf_parser_ctx.pass == 2)
4180 <  {
4575 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
4576 <    else yy_aconf->port |= OPER_FLAG_K;
4577 <  }
4180 >    block_state.port.value |= OPER_FLAG_DLINE;
4181   }
4182 + #line 4183 "conf_parser.c" /* yacc.c:1646  */
4183      break;
4184  
4185 <  case 182:
4186 <
4583 < /* Line 1806 of yacc.c  */
4584 < #line 1276 "ircd_parser.y"
4185 >  case 216:
4186 > #line 1390 "conf_parser.y" /* yacc.c:1646  */
4187      {
4188    if (conf_parser_ctx.pass == 2)
4189 <  {
4588 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4589 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
4590 <  }
4189 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4190   }
4191 + #line 4192 "conf_parser.c" /* yacc.c:1646  */
4192      break;
4193  
4194 <  case 183:
4195 <
4596 < /* Line 1806 of yacc.c  */
4597 < #line 1283 "ircd_parser.y"
4194 >  case 217:
4195 > #line 1394 "conf_parser.y" /* yacc.c:1646  */
4196      {
4197    if (conf_parser_ctx.pass == 2)
4198 <  {
4601 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
4602 <    else yy_aconf->port |= OPER_FLAG_X;
4603 <  }
4198 >    block_state.port.value |= OPER_FLAG_XLINE;
4199   }
4200 + #line 4201 "conf_parser.c" /* yacc.c:1646  */
4201      break;
4202  
4203 <  case 184:
4204 <
4609 < /* Line 1806 of yacc.c  */
4610 < #line 1290 "ircd_parser.y"
4203 >  case 218:
4204 > #line 1398 "conf_parser.y" /* yacc.c:1646  */
4205      {
4206    if (conf_parser_ctx.pass == 2)
4207 <  {
4614 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
4615 <    else yy_aconf->port |= OPER_FLAG_GLINE;
4616 <  }
4207 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4208   }
4209 + #line 4210 "conf_parser.c" /* yacc.c:1646  */
4210      break;
4211  
4212 <  case 185:
4213 <
4622 < /* Line 1806 of yacc.c  */
4623 < #line 1297 "ircd_parser.y"
4212 >  case 219:
4213 > #line 1402 "conf_parser.y" /* yacc.c:1646  */
4214      {
4215    if (conf_parser_ctx.pass == 2)
4216 <  {
4627 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
4628 <    else yy_aconf->port |= OPER_FLAG_DIE;
4629 <  }
4216 >    block_state.port.value |= OPER_FLAG_DIE;
4217   }
4218 + #line 4219 "conf_parser.c" /* yacc.c:1646  */
4219      break;
4220  
4221 <  case 186:
4222 <
4635 < /* Line 1806 of yacc.c  */
4636 < #line 1304 "ircd_parser.y"
4221 >  case 220:
4222 > #line 1406 "conf_parser.y" /* yacc.c:1646  */
4223      {
4224    if (conf_parser_ctx.pass == 2)
4225 <  {
4640 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
4641 <    else yy_aconf->port |= OPER_FLAG_REHASH;
4642 <  }
4225 >    block_state.port.value |= OPER_FLAG_RESTART;
4226   }
4227 + #line 4228 "conf_parser.c" /* yacc.c:1646  */
4228      break;
4229  
4230 <  case 187:
4231 <
4648 < /* Line 1806 of yacc.c  */
4649 < #line 1311 "ircd_parser.y"
4230 >  case 221:
4231 > #line 1410 "conf_parser.y" /* yacc.c:1646  */
4232      {
4233    if (conf_parser_ctx.pass == 2)
4234 <  {
4653 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
4654 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
4655 <  }
4234 >    block_state.port.value |= OPER_FLAG_REHASH;
4235   }
4236 + #line 4237 "conf_parser.c" /* yacc.c:1646  */
4237      break;
4238  
4239 <  case 188:
4240 <
4661 < /* Line 1806 of yacc.c  */
4662 < #line 1318 "ircd_parser.y"
4239 >  case 222:
4240 > #line 1414 "conf_parser.y" /* yacc.c:1646  */
4241      {
4242    if (conf_parser_ctx.pass == 2)
4243 <  {
4666 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4667 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4668 <  }
4243 >    block_state.port.value |= OPER_FLAG_ADMIN;
4244   }
4245 + #line 4246 "conf_parser.c" /* yacc.c:1646  */
4246      break;
4247  
4248 <  case 189:
4249 <
4674 < /* Line 1806 of yacc.c  */
4675 < #line 1325 "ircd_parser.y"
4248 >  case 223:
4249 > #line 1418 "conf_parser.y" /* yacc.c:1646  */
4250      {
4251    if (conf_parser_ctx.pass == 2)
4252 <  {
4679 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
4680 <    else yy_aconf->port |= OPER_FLAG_N;
4681 <  }
4252 >    block_state.port.value |= OPER_FLAG_GLOBOPS;
4253   }
4254 + #line 4255 "conf_parser.c" /* yacc.c:1646  */
4255      break;
4256  
4257 <  case 190:
4258 <
4687 < /* Line 1806 of yacc.c  */
4688 < #line 1332 "ircd_parser.y"
4257 >  case 224:
4258 > #line 1422 "conf_parser.y" /* yacc.c:1646  */
4259      {
4260    if (conf_parser_ctx.pass == 2)
4261 <  {
4692 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4693 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
4694 <  }
4261 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4262   }
4263 + #line 4264 "conf_parser.c" /* yacc.c:1646  */
4264      break;
4265  
4266 <  case 191:
4267 <
4700 < /* Line 1806 of yacc.c  */
4701 < #line 1339 "ircd_parser.y"
4266 >  case 225:
4267 > #line 1426 "conf_parser.y" /* yacc.c:1646  */
4268      {
4269    if (conf_parser_ctx.pass == 2)
4270 <  {
4705 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLOBOPS;
4706 <    else yy_aconf->port |= OPER_FLAG_GLOBOPS;
4707 <  }
4270 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4271   }
4272 + #line 4273 "conf_parser.c" /* yacc.c:1646  */
4273      break;
4274  
4275 <  case 192:
4276 <
4713 < /* Line 1806 of yacc.c  */
4714 < #line 1346 "ircd_parser.y"
4275 >  case 226:
4276 > #line 1430 "conf_parser.y" /* yacc.c:1646  */
4277      {
4278    if (conf_parser_ctx.pass == 2)
4279 <  {
4718 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
4719 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
4720 <  }
4279 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4280   }
4281 + #line 4282 "conf_parser.c" /* yacc.c:1646  */
4282      break;
4283  
4284 <  case 193:
4285 <
4726 < /* Line 1806 of yacc.c  */
4727 < #line 1353 "ircd_parser.y"
4284 >  case 227:
4285 > #line 1434 "conf_parser.y" /* yacc.c:1646  */
4286      {
4287    if (conf_parser_ctx.pass == 2)
4288 <  {
4731 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
4732 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
4733 <  }
4288 >    block_state.port.value |= OPER_FLAG_SET;
4289   }
4290 + #line 4291 "conf_parser.c" /* yacc.c:1646  */
4291      break;
4292  
4293 <  case 194:
4294 <
4739 < /* Line 1806 of yacc.c  */
4740 < #line 1360 "ircd_parser.y"
4293 >  case 228:
4294 > #line 1438 "conf_parser.y" /* yacc.c:1646  */
4295      {
4296    if (conf_parser_ctx.pass == 2)
4297 <  {
4744 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
4745 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4746 <  }
4297 >    block_state.port.value |= OPER_FLAG_MODULE;
4298   }
4299 + #line 4300 "conf_parser.c" /* yacc.c:1646  */
4300      break;
4301  
4302 <  case 195:
4303 <
4752 < /* Line 1806 of yacc.c  */
4753 < #line 1367 "ircd_parser.y"
4302 >  case 229:
4303 > #line 1442 "conf_parser.y" /* yacc.c:1646  */
4304      {
4305    if (conf_parser_ctx.pass == 2)
4306 <  {
4757 <    if (not_atom) ClearConfEncrypted(yy_aconf);
4758 <    else SetConfEncrypted(yy_aconf);
4759 <  }
4306 >    block_state.port.value |= OPER_FLAG_OPME;
4307   }
4308 + #line 4309 "conf_parser.c" /* yacc.c:1646  */
4309      break;
4310  
4311 <  case 196:
4312 <
4765 < /* Line 1806 of yacc.c  */
4766 < #line 1380 "ircd_parser.y"
4311 >  case 230:
4312 > #line 1452 "conf_parser.y" /* yacc.c:1646  */
4313      {
4314 <  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 < }
4314 >  if (conf_parser_ctx.pass != 1)
4315      break;
4316  
4317 <  case 197:
4317 >  reset_block_state();
4318  
4319 < /* Line 1806 of yacc.c  */
4320 < #line 1387 "ircd_parser.y"
4321 <    {
4322 <  if (conf_parser_ctx.pass == 1)
4323 <  {
4324 <    struct ConfItem *cconf = NULL;
4325 <    struct ClassItem *class = NULL;
4319 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4320 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4321 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4322 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4323 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4324 > }
4325 > #line 4326 "conf_parser.c" /* yacc.c:1646  */
4326 >    break;
4327  
4328 <    if (yy_class_name == NULL)
4329 <      delete_conf_item(yy_conf);
4788 <    else
4328 >  case 231:
4329 > #line 1464 "conf_parser.y" /* yacc.c:1646  */
4330      {
4331 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
4331 >  struct ClassItem *class = NULL;
4332  
4333 <      if (cconf != NULL)                /* The class existed already */
4334 <      {
4794 <        int user_count = 0;
4333 >  if (conf_parser_ctx.pass != 1)
4334 >    break;
4335  
4336 <        rebuild_cidr_class(cconf, yy_class);
4336 >  if (!block_state.class.buf[0])
4337 >    break;
4338  
4339 <        class = map_to_conf(cconf);
4339 >  if (!(class = class_find(block_state.class.buf, 0)))
4340 >    class = class_make();
4341  
4342 <        user_count = class->curr_user_count;
4343 <        memcpy(class, yy_class, sizeof(*class));
4344 <        class->curr_user_count = user_count;
4345 <        class->active = 1;
4342 >  class->active = 1;
4343 >  MyFree(class->name);
4344 >  class->name = xstrdup(block_state.class.buf);
4345 >  class->ping_freq = block_state.ping_freq.value;
4346 >  class->max_perip = block_state.max_perip.value;
4347 >  class->con_freq = block_state.con_freq.value;
4348 >  class->max_total = block_state.max_total.value;
4349 >  class->max_global = block_state.max_global.value;
4350 >  class->max_local = block_state.max_local.value;
4351 >  class->max_ident = block_state.max_ident.value;
4352 >  class->max_sendq = block_state.max_sendq.value;
4353 >  class->max_recvq = block_state.max_recvq.value;
4354 >  class->max_channels = block_state.max_channels.value;
4355  
4356 <        delete_conf_item(yy_conf);
4356 >  if (block_state.min_idle.value > block_state.max_idle.value)
4357 >  {
4358 >    block_state.min_idle.value = 0;
4359 >    block_state.max_idle.value = 0;
4360 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4361 >  }
4362  
4363 <        MyFree(cconf->name);            /* Allows case change of class name */
4364 <        cconf->name = yy_class_name;
4365 <      }
4810 <      else      /* Brand new class */
4811 <      {
4812 <        MyFree(yy_conf->name);          /* just in case it was allocated */
4813 <        yy_conf->name = yy_class_name;
4814 <        yy_class->active = 1;
4815 <      }
4816 <    }
4363 >  class->flags = block_state.flags.value;
4364 >  class->min_idle = block_state.min_idle.value;
4365 >  class->max_idle = block_state.max_idle.value;
4366  
4367 <    yy_class_name = NULL;
4368 <  }
4367 >  rebuild_cidr_list(class);
4368 >
4369 >  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4370 >  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4371 >  class->number_per_cidr = block_state.number_per_cidr.value;
4372   }
4373 + #line 4374 "conf_parser.c" /* yacc.c:1646  */
4374      break;
4375  
4376 <  case 216:
4377 <
4825 < /* Line 1806 of yacc.c  */
4826 < #line 1447 "ircd_parser.y"
4376 >  case 252:
4377 > #line 1528 "conf_parser.y" /* yacc.c:1646  */
4378      {
4379    if (conf_parser_ctx.pass == 1)
4380 <  {
4830 <    MyFree(yy_class_name);
4831 <    DupString(yy_class_name, yylval.string);
4832 <  }
4380 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4381   }
4382 + #line 4383 "conf_parser.c" /* yacc.c:1646  */
4383      break;
4384  
4385 <  case 217:
4386 <
4838 < /* Line 1806 of yacc.c  */
4839 < #line 1456 "ircd_parser.y"
4385 >  case 253:
4386 > #line 1534 "conf_parser.y" /* yacc.c:1646  */
4387      {
4388    if (conf_parser_ctx.pass == 1)
4389 <  {
4843 <    MyFree(yy_class_name);
4844 <    DupString(yy_class_name, yylval.string);
4845 <  }
4389 >    block_state.ping_freq.value = (yyvsp[-1].number);
4390   }
4391 + #line 4392 "conf_parser.c" /* yacc.c:1646  */
4392      break;
4393  
4394 <  case 218:
4395 <
4851 < /* Line 1806 of yacc.c  */
4852 < #line 1465 "ircd_parser.y"
4394 >  case 254:
4395 > #line 1540 "conf_parser.y" /* yacc.c:1646  */
4396      {
4397    if (conf_parser_ctx.pass == 1)
4398 <    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
4398 >    block_state.max_perip.value = (yyvsp[-1].number);
4399   }
4400 + #line 4401 "conf_parser.c" /* yacc.c:1646  */
4401      break;
4402  
4403 <  case 219:
4404 <
4861 < /* Line 1806 of yacc.c  */
4862 < #line 1471 "ircd_parser.y"
4403 >  case 255:
4404 > #line 1546 "conf_parser.y" /* yacc.c:1646  */
4405      {
4406    if (conf_parser_ctx.pass == 1)
4407 <    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
4407 >    block_state.con_freq.value = (yyvsp[-1].number);
4408   }
4409 + #line 4410 "conf_parser.c" /* yacc.c:1646  */
4410      break;
4411  
4412 <  case 220:
4413 <
4871 < /* Line 1806 of yacc.c  */
4872 < #line 1477 "ircd_parser.y"
4412 >  case 256:
4413 > #line 1552 "conf_parser.y" /* yacc.c:1646  */
4414      {
4415    if (conf_parser_ctx.pass == 1)
4416 <    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
4416 >    block_state.max_channels.value = (yyvsp[-1].number);
4417   }
4418 + #line 4419 "conf_parser.c" /* yacc.c:1646  */
4419      break;
4420  
4421 <  case 221:
4422 <
4881 < /* Line 1806 of yacc.c  */
4882 < #line 1483 "ircd_parser.y"
4421 >  case 257:
4422 > #line 1558 "conf_parser.y" /* yacc.c:1646  */
4423      {
4424    if (conf_parser_ctx.pass == 1)
4425 <    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
4425 >    block_state.max_total.value = (yyvsp[-1].number);
4426   }
4427 + #line 4428 "conf_parser.c" /* yacc.c:1646  */
4428      break;
4429  
4430 <  case 222:
4431 <
4891 < /* Line 1806 of yacc.c  */
4892 < #line 1489 "ircd_parser.y"
4430 >  case 258:
4431 > #line 1564 "conf_parser.y" /* yacc.c:1646  */
4432      {
4433    if (conf_parser_ctx.pass == 1)
4434 <    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
4434 >    block_state.max_global.value = (yyvsp[-1].number);
4435   }
4436 + #line 4437 "conf_parser.c" /* yacc.c:1646  */
4437      break;
4438  
4439 <  case 223:
4440 <
4901 < /* Line 1806 of yacc.c  */
4902 < #line 1495 "ircd_parser.y"
4439 >  case 259:
4440 > #line 1570 "conf_parser.y" /* yacc.c:1646  */
4441      {
4442    if (conf_parser_ctx.pass == 1)
4443 <    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
4443 >    block_state.max_local.value = (yyvsp[-1].number);
4444   }
4445 + #line 4446 "conf_parser.c" /* yacc.c:1646  */
4446      break;
4447  
4448 <  case 224:
4449 <
4911 < /* Line 1806 of yacc.c  */
4912 < #line 1501 "ircd_parser.y"
4448 >  case 260:
4449 > #line 1576 "conf_parser.y" /* yacc.c:1646  */
4450      {
4451    if (conf_parser_ctx.pass == 1)
4452 <    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
4452 >    block_state.max_ident.value = (yyvsp[-1].number);
4453   }
4454 + #line 4455 "conf_parser.c" /* yacc.c:1646  */
4455      break;
4456  
4457 <  case 225:
4458 <
4921 < /* Line 1806 of yacc.c  */
4922 < #line 1507 "ircd_parser.y"
4457 >  case 261:
4458 > #line 1582 "conf_parser.y" /* yacc.c:1646  */
4459      {
4460    if (conf_parser_ctx.pass == 1)
4461 <    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
4461 >    block_state.max_sendq.value = (yyvsp[-1].number);
4462   }
4463 + #line 4464 "conf_parser.c" /* yacc.c:1646  */
4464      break;
4465  
4466 <  case 226:
4467 <
4931 < /* Line 1806 of yacc.c  */
4932 < #line 1513 "ircd_parser.y"
4466 >  case 262:
4467 > #line 1588 "conf_parser.y" /* yacc.c:1646  */
4468      {
4469    if (conf_parser_ctx.pass == 1)
4470 <    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
4470 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4471 >      block_state.max_recvq.value = (yyvsp[-1].number);
4472   }
4473 + #line 4474 "conf_parser.c" /* yacc.c:1646  */
4474      break;
4475  
4476 <  case 227:
4477 <
4941 < /* Line 1806 of yacc.c  */
4942 < #line 1519 "ircd_parser.y"
4476 >  case 263:
4477 > #line 1595 "conf_parser.y" /* yacc.c:1646  */
4478      {
4479    if (conf_parser_ctx.pass == 1)
4480 <    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
4480 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4481   }
4482 + #line 4483 "conf_parser.c" /* yacc.c:1646  */
4483      break;
4484  
4485 <  case 228:
4486 <
4951 < /* Line 1806 of yacc.c  */
4952 < #line 1525 "ircd_parser.y"
4485 >  case 264:
4486 > #line 1601 "conf_parser.y" /* yacc.c:1646  */
4487      {
4488    if (conf_parser_ctx.pass == 1)
4489 <    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
4489 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4490   }
4491 + #line 4492 "conf_parser.c" /* yacc.c:1646  */
4492      break;
4493  
4494 <  case 229:
4495 <
4961 < /* Line 1806 of yacc.c  */
4962 < #line 1531 "ircd_parser.y"
4494 >  case 265:
4495 > #line 1607 "conf_parser.y" /* yacc.c:1646  */
4496      {
4497    if (conf_parser_ctx.pass == 1)
4498 <    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
4498 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4499   }
4500 + #line 4501 "conf_parser.c" /* yacc.c:1646  */
4501      break;
4502  
4503 <  case 230:
4504 <
4971 < /* Line 1806 of yacc.c  */
4972 < #line 1540 "ircd_parser.y"
4503 >  case 266:
4504 > #line 1613 "conf_parser.y" /* yacc.c:1646  */
4505      {
4506 <  if (conf_parser_ctx.pass == 2)
4975 <  {
4976 <    listener_address = NULL;
4977 <    listener_flags = 0;
4978 <  }
4979 < }
4506 >  if (conf_parser_ctx.pass != 1)
4507      break;
4508  
4509 <  case 231:
4509 >  block_state.min_idle.value = (yyvsp[-1].number);
4510 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4511 > }
4512 > #line 4513 "conf_parser.c" /* yacc.c:1646  */
4513 >    break;
4514  
4515 < /* Line 1806 of yacc.c  */
4516 < #line 1547 "ircd_parser.y"
4515 >  case 267:
4516 > #line 1622 "conf_parser.y" /* yacc.c:1646  */
4517      {
4518 <  if (conf_parser_ctx.pass == 2)
4519 <  {
4520 <    MyFree(listener_address);
4521 <    listener_address = NULL;
4522 <  }
4518 >  if (conf_parser_ctx.pass != 1)
4519 >    break;
4520 >
4521 >  block_state.max_idle.value = (yyvsp[-1].number);
4522 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4523   }
4524 + #line 4525 "conf_parser.c" /* yacc.c:1646  */
4525      break;
4526  
4527 <  case 232:
4527 >  case 268:
4528 > #line 1631 "conf_parser.y" /* yacc.c:1646  */
4529 >    {
4530 >  if (conf_parser_ctx.pass == 1)
4531 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4532 > }
4533 > #line 4534 "conf_parser.c" /* yacc.c:1646  */
4534 >    break;
4535  
4536 < /* Line 1806 of yacc.c  */
4537 < #line 1556 "ircd_parser.y"
4536 >  case 272:
4537 > #line 1638 "conf_parser.y" /* yacc.c:1646  */
4538      {
4539 <  listener_flags = 0;
4539 >  if (conf_parser_ctx.pass == 1)
4540 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4541   }
4542 + #line 4543 "conf_parser.c" /* yacc.c:1646  */
4543      break;
4544  
4545 <  case 236:
4545 >  case 273:
4546 > #line 1642 "conf_parser.y" /* yacc.c:1646  */
4547 >    {
4548 >  if (conf_parser_ctx.pass == 1)
4549 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4550 > }
4551 > #line 4552 "conf_parser.c" /* yacc.c:1646  */
4552 >    break;
4553  
4554 < /* Line 1806 of yacc.c  */
4555 < #line 1562 "ircd_parser.y"
4554 >  case 274:
4555 > #line 1652 "conf_parser.y" /* yacc.c:1646  */
4556      {
4557    if (conf_parser_ctx.pass == 2)
4558 <    listener_flags |= LISTENER_SSL;
4558 >    reset_block_state();
4559   }
4560 + #line 4561 "conf_parser.c" /* yacc.c:1646  */
4561      break;
4562  
4563 <  case 237:
4563 >  case 276:
4564 > #line 1658 "conf_parser.y" /* yacc.c:1646  */
4565 >    {
4566 >  block_state.flags.value = 0;
4567 > }
4568 > #line 4569 "conf_parser.c" /* yacc.c:1646  */
4569 >    break;
4570  
4571 < /* Line 1806 of yacc.c  */
4572 < #line 1566 "ircd_parser.y"
4571 >  case 280:
4572 > #line 1664 "conf_parser.y" /* yacc.c:1646  */
4573      {
4574    if (conf_parser_ctx.pass == 2)
4575 <    listener_flags |= LISTENER_HIDDEN;
4575 >    block_state.flags.value |= LISTENER_SSL;
4576   }
4577 + #line 4578 "conf_parser.c" /* yacc.c:1646  */
4578      break;
4579  
4580 <  case 238:
4581 <
5026 < /* Line 1806 of yacc.c  */
5027 < #line 1570 "ircd_parser.y"
4580 >  case 281:
4581 > #line 1668 "conf_parser.y" /* yacc.c:1646  */
4582      {
4583    if (conf_parser_ctx.pass == 2)
4584 <    listener_flags |= LISTENER_SERVER;
4584 >    block_state.flags.value |= LISTENER_HIDDEN;
4585   }
4586 + #line 4587 "conf_parser.c" /* yacc.c:1646  */
4587      break;
4588  
4589 <  case 246:
4590 <
4591 < /* Line 1806 of yacc.c  */
4592 < #line 1580 "ircd_parser.y"
4593 <    { listener_flags = 0; }
4589 >  case 282:
4590 > #line 1672 "conf_parser.y" /* yacc.c:1646  */
4591 >    {
4592 >  if (conf_parser_ctx.pass == 2)
4593 >   block_state.flags.value |= LISTENER_SERVER;
4594 > }
4595 > #line 4596 "conf_parser.c" /* yacc.c:1646  */
4596      break;
4597  
4598 <  case 250:
4598 >  case 290:
4599 > #line 1680 "conf_parser.y" /* yacc.c:1646  */
4600 >    { block_state.flags.value = 0; }
4601 > #line 4602 "conf_parser.c" /* yacc.c:1646  */
4602 >    break;
4603  
4604 < /* Line 1806 of yacc.c  */
4605 < #line 1585 "ircd_parser.y"
4604 >  case 294:
4605 > #line 1685 "conf_parser.y" /* yacc.c:1646  */
4606      {
4607    if (conf_parser_ctx.pass == 2)
4608    {
4609 <    if ((listener_flags & LISTENER_SSL))
4610 < #ifdef HAVE_LIBCRYPTO
4611 <      if (!ServerInfo.server_ctx)
4609 > #ifndef HAVE_LIBCRYPTO
4610 >    if (block_state.flags.value & LISTENER_SSL)
4611 >    {
4612 >      conf_error_report("SSL not available - port closed");
4613 >      break;
4614 >    }
4615   #endif
4616 <      {
5053 <        yyerror("SSL not available - port closed");
5054 <        break;
5055 <      }
5056 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
4616 >    add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4617    }
4618   }
4619 + #line 4620 "conf_parser.c" /* yacc.c:1646  */
4620      break;
4621  
4622 <  case 251:
4623 <
5063 < /* Line 1806 of yacc.c  */
5064 < #line 1599 "ircd_parser.y"
4622 >  case 295:
4623 > #line 1698 "conf_parser.y" /* yacc.c:1646  */
4624      {
4625    if (conf_parser_ctx.pass == 2)
4626    {
4627 <    int i;
4628 <
4629 <    if ((listener_flags & LISTENER_SSL))
4630 < #ifdef HAVE_LIBCRYPTO
4631 <      if (!ServerInfo.server_ctx)
4627 > #ifndef HAVE_LIBCRYPTO
4628 >    if (block_state.flags.value & LISTENER_SSL)
4629 >    {
4630 >      conf_error_report("SSL not available - port closed");
4631 >      break;
4632 >    }
4633   #endif
5074      {
5075        yyerror("SSL not available - port closed");
5076        break;
5077      }
4634  
4635 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
4636 <      add_listener(i, listener_address, listener_flags);
4635 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4636 >      add_listener(i, block_state.addr.buf, block_state.flags.value);
4637    }
4638   }
4639 + #line 4640 "conf_parser.c" /* yacc.c:1646  */
4640      break;
4641  
4642 <  case 252:
4643 <
5087 < /* Line 1806 of yacc.c  */
5088 < #line 1619 "ircd_parser.y"
4642 >  case 296:
4643 > #line 1715 "conf_parser.y" /* yacc.c:1646  */
4644      {
4645    if (conf_parser_ctx.pass == 2)
4646 <  {
5092 <    MyFree(listener_address);
5093 <    DupString(listener_address, yylval.string);
5094 <  }
4646 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4647   }
4648 + #line 4649 "conf_parser.c" /* yacc.c:1646  */
4649      break;
4650  
4651 <  case 253:
4652 <
5100 < /* Line 1806 of yacc.c  */
5101 < #line 1628 "ircd_parser.y"
4651 >  case 297:
4652 > #line 1721 "conf_parser.y" /* yacc.c:1646  */
4653      {
4654    if (conf_parser_ctx.pass == 2)
4655 <  {
5105 <    MyFree(listener_address);
5106 <    DupString(listener_address, yylval.string);
5107 <  }
4655 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4656   }
4657 + #line 4658 "conf_parser.c" /* yacc.c:1646  */
4658      break;
4659  
4660 <  case 254:
4661 <
5113 < /* Line 1806 of yacc.c  */
5114 < #line 1640 "ircd_parser.y"
4660 >  case 298:
4661 > #line 1730 "conf_parser.y" /* yacc.c:1646  */
4662      {
4663    if (conf_parser_ctx.pass == 2)
4664 <  {
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 <  }
4664 >    reset_block_state();
4665   }
4666 + #line 4667 "conf_parser.c" /* yacc.c:1646  */
4667      break;
4668  
4669 <  case 255:
4670 <
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)
4669 >  case 299:
4670 > #line 1734 "conf_parser.y" /* yacc.c:1646  */
4671      {
4672 <      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;
4672 >  dlink_node *node = NULL;
4673  
4674 <      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 < }
4674 >  if (conf_parser_ctx.pass != 2)
4675      break;
4676  
4677 <  case 267:
5191 <
5192 < /* Line 1806 of yacc.c  */
5193 < #line 1714 "ircd_parser.y"
5194 <    {
5195 <  if (conf_parser_ctx.pass == 2)
4677 >  DLINK_FOREACH(node, block_state.mask.list.head)
4678    {
4679 <    struct CollectItem *yy_tmp = NULL;
4679 >    struct MaskItem *conf = NULL;
4680      struct split_nuh_item nuh;
4681  
4682 <    nuh.nuhmask  = yylval.string;
4682 >    nuh.nuhmask  = node->data;
4683      nuh.nickptr  = NULL;
4684 <    nuh.userptr  = userbuf;
4685 <    nuh.hostptr  = hostbuf;
5204 <
4684 >    nuh.userptr  = block_state.user.buf;
4685 >    nuh.hostptr  = block_state.host.buf;
4686      nuh.nicksize = 0;
4687 <    nuh.usersize = sizeof(userbuf);
4688 <    nuh.hostsize = sizeof(hostbuf);
5208 <
4687 >    nuh.usersize = sizeof(block_state.user.buf);
4688 >    nuh.hostsize = sizeof(block_state.host.buf);
4689      split_nuh(&nuh);
4690  
4691 <    if (yy_aconf->user == NULL)
4692 <    {
4693 <      DupString(yy_aconf->user, userbuf);
5214 <      DupString(yy_aconf->host, hostbuf);
5215 <    }
5216 <    else
5217 <    {
5218 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4691 >    conf        = conf_make(CONF_CLIENT);
4692 >    conf->user  = xstrdup(block_state.user.buf);
4693 >    conf->host  = xstrdup(block_state.host.buf);
4694  
4695 <      DupString(yy_tmp->user, userbuf);
4696 <      DupString(yy_tmp->host, hostbuf);
4695 >    if (block_state.rpass.buf[0])
4696 >      conf->passwd = xstrdup(block_state.rpass.buf);
4697 >    if (block_state.name.buf[0])
4698 >      conf->name = xstrdup(block_state.name.buf);
4699  
4700 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4701 <    }
4700 >    conf->flags = block_state.flags.value;
4701 >    conf->port  = block_state.port.value;
4702 >
4703 >    conf_add_class_to_conf(conf, block_state.class.buf);
4704 >    add_conf_by_address(CONF_CLIENT, conf);
4705    }
4706   }
4707 + #line 4708 "conf_parser.c" /* yacc.c:1646  */
4708      break;
4709  
4710 <  case 268:
4711 <
5231 < /* Line 1806 of yacc.c  */
5232 < #line 1751 "ircd_parser.y"
4710 >  case 311:
4711 > #line 1783 "conf_parser.y" /* yacc.c:1646  */
4712      {
4713    if (conf_parser_ctx.pass == 2)
4714 <  {
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 <  }
4714 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4715   }
4716 + #line 4717 "conf_parser.c" /* yacc.c:1646  */
4717      break;
4718  
4719 <  case 269:
4720 <
5248 < /* Line 1806 of yacc.c  */
5249 < #line 1764 "ircd_parser.y"
4719 >  case 312:
4720 > #line 1789 "conf_parser.y" /* yacc.c:1646  */
4721      {
4722    if (conf_parser_ctx.pass == 2)
4723 <  {
5253 <    MyFree(class_name);
5254 <    DupString(class_name, yylval.string);
5255 <  }
4723 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4724   }
4725 + #line 4726 "conf_parser.c" /* yacc.c:1646  */
4726      break;
4727  
4728 <  case 270:
4728 >  case 313:
4729 > #line 1795 "conf_parser.y" /* yacc.c:1646  */
4730 >    {
4731 >  if (conf_parser_ctx.pass == 2)
4732 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4733 > }
4734 > #line 4735 "conf_parser.c" /* yacc.c:1646  */
4735 >    break;
4736  
4737 < /* Line 1806 of yacc.c  */
4738 < #line 1773 "ircd_parser.y"
4737 >  case 314:
4738 > #line 1801 "conf_parser.y" /* yacc.c:1646  */
4739      {
4740    if (conf_parser_ctx.pass == 2)
4741    {
4742      if (yylval.number)
4743 <      SetConfEncrypted(yy_aconf);
4743 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4744      else
4745 <      ClearConfEncrypted(yy_aconf);
4745 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4746    }
4747   }
4748 + #line 4749 "conf_parser.c" /* yacc.c:1646  */
4749      break;
4750  
4751 <  case 271:
4752 <
5276 < /* Line 1806 of yacc.c  */
5277 < #line 1784 "ircd_parser.y"
4751 >  case 315:
4752 > #line 1812 "conf_parser.y" /* yacc.c:1646  */
4753      {
4754 +  if (conf_parser_ctx.pass == 2)
4755 +    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4756   }
4757 + #line 4758 "conf_parser.c" /* yacc.c:1646  */
4758      break;
4759  
4760 <  case 275:
4761 <
4762 < /* Line 1806 of yacc.c  */
4763 < #line 1788 "ircd_parser.y"
4764 <    { not_atom = 1; }
4760 >  case 319:
4761 > #line 1819 "conf_parser.y" /* yacc.c:1646  */
4762 >    {
4763 >  if (conf_parser_ctx.pass == 2)
4764 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4765 > }
4766 > #line 4767 "conf_parser.c" /* yacc.c:1646  */
4767      break;
4768  
4769 <  case 277:
4770 <
4771 < /* Line 1806 of yacc.c  */
4772 < #line 1789 "ircd_parser.y"
4773 <    { not_atom = 0; }
4769 >  case 320:
4770 > #line 1823 "conf_parser.y" /* yacc.c:1646  */
4771 >    {
4772 >  if (conf_parser_ctx.pass == 2)
4773 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4774 > }
4775 > #line 4776 "conf_parser.c" /* yacc.c:1646  */
4776      break;
4777  
4778 <  case 279:
4779 <
5298 < /* Line 1806 of yacc.c  */
5299 < #line 1792 "ircd_parser.y"
4778 >  case 321:
4779 > #line 1827 "conf_parser.y" /* yacc.c:1646  */
4780      {
4781    if (conf_parser_ctx.pass == 2)
4782 <  {
5303 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5304 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
5305 <  }
4782 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4783   }
4784 + #line 4785 "conf_parser.c" /* yacc.c:1646  */
4785      break;
4786  
4787 <  case 280:
4788 <
5311 < /* Line 1806 of yacc.c  */
5312 < #line 1799 "ircd_parser.y"
4787 >  case 322:
4788 > #line 1831 "conf_parser.y" /* yacc.c:1646  */
4789      {
4790    if (conf_parser_ctx.pass == 2)
4791 <  {
5316 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5317 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5318 <  }
4791 >    block_state.flags.value |= CONF_FLAGS_EXEMPTXLINE;
4792   }
4793 + #line 4794 "conf_parser.c" /* yacc.c:1646  */
4794      break;
4795  
4796 <  case 281:
4797 <
5324 < /* Line 1806 of yacc.c  */
5325 < #line 1806 "ircd_parser.y"
4796 >  case 323:
4797 > #line 1835 "conf_parser.y" /* yacc.c:1646  */
4798      {
4799    if (conf_parser_ctx.pass == 2)
4800 <  {
5329 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5330 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5331 <  }
4800 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4801   }
4802 + #line 4803 "conf_parser.c" /* yacc.c:1646  */
4803      break;
4804  
4805 <  case 282:
4806 <
5337 < /* Line 1806 of yacc.c  */
5338 < #line 1813 "ircd_parser.y"
4805 >  case 324:
4806 > #line 1839 "conf_parser.y" /* yacc.c:1646  */
4807      {
4808    if (conf_parser_ctx.pass == 2)
4809 <  {
5342 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
5343 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
5344 <  }
4809 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4810   }
4811 + #line 4812 "conf_parser.c" /* yacc.c:1646  */
4812      break;
4813  
4814 <  case 283:
4815 <
5350 < /* Line 1806 of yacc.c  */
5351 < #line 1820 "ircd_parser.y"
4814 >  case 325:
4815 > #line 1843 "conf_parser.y" /* yacc.c:1646  */
4816      {
4817    if (conf_parser_ctx.pass == 2)
4818 <  {
5355 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5356 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5357 <  }
4818 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4819   }
4820 + #line 4821 "conf_parser.c" /* yacc.c:1646  */
4821      break;
4822  
4823 <  case 284:
4824 <
5363 < /* Line 1806 of yacc.c  */
5364 < #line 1827 "ircd_parser.y"
4823 >  case 326:
4824 > #line 1847 "conf_parser.y" /* yacc.c:1646  */
4825      {
4826    if (conf_parser_ctx.pass == 2)
4827 <  {
5368 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5369 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5370 <  }
4827 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4828   }
4829 + #line 4830 "conf_parser.c" /* yacc.c:1646  */
4830      break;
4831  
4832 <  case 285:
4833 <
5376 < /* Line 1806 of yacc.c  */
5377 < #line 1834 "ircd_parser.y"
4832 >  case 327:
4833 > #line 1851 "conf_parser.y" /* yacc.c:1646  */
4834      {
4835    if (conf_parser_ctx.pass == 2)
4836 <  {
5381 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5382 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5383 <  }
4836 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4837   }
4838 + #line 4839 "conf_parser.c" /* yacc.c:1646  */
4839      break;
4840  
4841 <  case 286:
4842 <
5389 < /* Line 1806 of yacc.c  */
5390 < #line 1841 "ircd_parser.y"
4841 >  case 328:
4842 > #line 1855 "conf_parser.y" /* yacc.c:1646  */
4843      {
4844    if (conf_parser_ctx.pass == 2)
4845 <  {
5394 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
5395 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
5396 <  }
4845 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4846   }
4847 + #line 4848 "conf_parser.c" /* yacc.c:1646  */
4848      break;
4849  
4850 <  case 287:
4851 <
5402 < /* Line 1806 of yacc.c  */
5403 < #line 1848 "ircd_parser.y"
4850 >  case 329:
4851 > #line 1861 "conf_parser.y" /* yacc.c:1646  */
4852      {
4853 <  if (conf_parser_ctx.pass == 2)
4853 >  if (conf_parser_ctx.pass != 2)
4854 >    break;
4855 >
4856 >  if (valid_hostname(yylval.string))
4857    {
4858 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
4859 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
4858 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4859 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4860    }
4861 +  else
4862 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4863   }
4864 + #line 4865 "conf_parser.c" /* yacc.c:1646  */
4865      break;
4866  
4867 <  case 288:
4868 <
5415 < /* Line 1806 of yacc.c  */
5416 < #line 1858 "ircd_parser.y"
4867 >  case 330:
4868 > #line 1875 "conf_parser.y" /* yacc.c:1646  */
4869      {
4870 <  if (conf_parser_ctx.pass == 2)
4871 <  {
5420 <    MyFree(yy_conf->name);
4870 >  if (conf_parser_ctx.pass != 2)
4871 >    break;
4872  
4873 <    if (strlen(yylval.string) < HOSTLEN)
4874 <    {    
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 <  }
4873 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4874 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4875   }
4876 + #line 4877 "conf_parser.c" /* yacc.c:1646  */
4877      break;
4878  
4879 <  case 289:
4880 <
5438 < /* Line 1806 of yacc.c  */
5439 < #line 1877 "ircd_parser.y"
4879 >  case 331:
4880 > #line 1884 "conf_parser.y" /* yacc.c:1646  */
4881      {
4882 <  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 < }
4882 >  if (conf_parser_ctx.pass != 2)
4883      break;
4884  
4885 <  case 290:
4885 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4886 >  block_state.port.value = (yyvsp[-1].number);
4887 > }
4888 > #line 4889 "conf_parser.c" /* yacc.c:1646  */
4889 >    break;
4890  
4891 < /* Line 1806 of yacc.c  */
4892 < #line 1887 "ircd_parser.y"
4891 >  case 332:
4892 > #line 1897 "conf_parser.y" /* yacc.c:1646  */
4893      {
4894 <  if (conf_parser_ctx.pass == 2)
5456 <  {
5457 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5458 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5459 <  }
5460 < }
4894 >  if (conf_parser_ctx.pass != 2)
4895      break;
4896  
4897 <  case 291:
4897 >  reset_block_state();
4898 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4899 > }
4900 > #line 4901 "conf_parser.c" /* yacc.c:1646  */
4901 >    break;
4902  
4903 < /* Line 1806 of yacc.c  */
4904 < #line 1900 "ircd_parser.y"
4903 >  case 333:
4904 > #line 1904 "conf_parser.y" /* yacc.c:1646  */
4905      {
4906 <  if (conf_parser_ctx.pass == 2)
5469 <  {
5470 <    MyFree(resv_reason);
5471 <    resv_reason = NULL;
5472 <  }
5473 < }
4906 >  if (conf_parser_ctx.pass != 2)
4907      break;
4908  
4909 <  case 292:
4909 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4910 > }
4911 > #line 4912 "conf_parser.c" /* yacc.c:1646  */
4912 >    break;
4913  
4914 < /* Line 1806 of yacc.c  */
4915 < #line 1907 "ircd_parser.y"
4914 >  case 340:
4915 > #line 1915 "conf_parser.y" /* yacc.c:1646  */
4916      {
4917    if (conf_parser_ctx.pass == 2)
4918 <  {
5483 <    MyFree(resv_reason);
5484 <    resv_reason = NULL;
5485 <  }
4918 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4919   }
4920 + #line 4921 "conf_parser.c" /* yacc.c:1646  */
4921      break;
4922  
4923 <  case 299:
4924 <
5491 < /* Line 1806 of yacc.c  */
5492 < #line 1919 "ircd_parser.y"
4923 >  case 341:
4924 > #line 1921 "conf_parser.y" /* yacc.c:1646  */
4925      {
4926    if (conf_parser_ctx.pass == 2)
4927 <  {
5496 <    MyFree(resv_reason);
5497 <    DupString(resv_reason, yylval.string);
5498 <  }
4927 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4928   }
4929 + #line 4930 "conf_parser.c" /* yacc.c:1646  */
4930      break;
4931  
4932 <  case 300:
4933 <
5504 < /* Line 1806 of yacc.c  */
5505 < #line 1928 "ircd_parser.y"
4932 >  case 342:
4933 > #line 1927 "conf_parser.y" /* yacc.c:1646  */
4934      {
4935    if (conf_parser_ctx.pass == 2)
4936 <  {
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_ */
4936 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4937   }
4938 + #line 4939 "conf_parser.c" /* yacc.c:1646  */
4939      break;
4940  
4941 <  case 301:
4942 <
5523 < /* Line 1806 of yacc.c  */
5524 < #line 1943 "ircd_parser.y"
4941 >  case 348:
4942 > #line 1942 "conf_parser.y" /* yacc.c:1646  */
4943      {
4944 <  if (conf_parser_ctx.pass == 2)
4945 <  {
5528 <    char def_reason[] = "No reason";
4944 >  if (conf_parser_ctx.pass != 2)
4945 >    break;
4946  
4947 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
4947 >  if (valid_servname(yylval.string))
4948 >  {
4949 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4950 >    conf->name = xstrdup(yylval.string);
4951    }
4952   }
4953 + #line 4954 "conf_parser.c" /* yacc.c:1646  */
4954      break;
4955  
4956 <  case 307:
4957 <
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))
4956 >  case 349:
4957 > #line 1957 "conf_parser.y" /* yacc.c:1646  */
4958      {
4959 <      yy_conf = make_conf_item(SERVICE_TYPE);
5545 <      DupString(yy_conf->name, yylval.string);
5546 <    }
5547 <  }
5548 < }
4959 >  if (conf_parser_ctx.pass != 2)
4960      break;
4961  
4962 <  case 308:
4962 >  reset_block_state();
4963  
4964 < /* Line 1806 of yacc.c  */
4965 < #line 1976 "ircd_parser.y"
4966 <    {
4967 <  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 <  }
4964 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4965 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4966 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4967 >  block_state.flags.value = SHARED_ALL;
4968   }
4969 + #line 4970 "conf_parser.c" /* yacc.c:1646  */
4970      break;
4971  
4972 <  case 309:
4973 <
5567 < /* Line 1806 of yacc.c  */
5568 < #line 1984 "ircd_parser.y"
4972 >  case 350:
4973 > #line 1968 "conf_parser.y" /* yacc.c:1646  */
4974      {
4975 <  if (conf_parser_ctx.pass == 2)
4976 <  {
4977 <    yy_conf = NULL;
5573 <  }
5574 < }
4975 >  struct MaskItem *conf = NULL;
4976 >
4977 >  if (conf_parser_ctx.pass != 2)
4978      break;
4979  
4980 <  case 316:
4980 >  conf = conf_make(CONF_ULINE);
4981 >  conf->flags = block_state.flags.value;
4982 >  conf->name = xstrdup(block_state.name.buf);
4983 >  conf->user = xstrdup(block_state.user.buf);
4984 >  conf->host = xstrdup(block_state.host.buf);
4985 > }
4986 > #line 4987 "conf_parser.c" /* yacc.c:1646  */
4987 >    break;
4988  
4989 < /* Line 1806 of yacc.c  */
4990 < #line 1995 "ircd_parser.y"
4989 >  case 357:
4990 > #line 1985 "conf_parser.y" /* yacc.c:1646  */
4991      {
4992    if (conf_parser_ctx.pass == 2)
4993 <  {
5584 <    MyFree(yy_conf->name);
5585 <    DupString(yy_conf->name, yylval.string);
5586 <  }
4993 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4994   }
4995 + #line 4996 "conf_parser.c" /* yacc.c:1646  */
4996      break;
4997  
4998 <  case 317:
4999 <
5592 < /* Line 1806 of yacc.c  */
5593 < #line 2004 "ircd_parser.y"
4998 >  case 358:
4999 > #line 1991 "conf_parser.y" /* yacc.c:1646  */
5000      {
5001    if (conf_parser_ctx.pass == 2)
5002    {
# Line 5598 | Line 5004 | yyreduce:
5004  
5005      nuh.nuhmask  = yylval.string;
5006      nuh.nickptr  = NULL;
5007 <    nuh.userptr  = userbuf;
5008 <    nuh.hostptr  = hostbuf;
5007 >    nuh.userptr  = block_state.user.buf;
5008 >    nuh.hostptr  = block_state.host.buf;
5009  
5010      nuh.nicksize = 0;
5011 <    nuh.usersize = sizeof(userbuf);
5012 <    nuh.hostsize = sizeof(hostbuf);
5011 >    nuh.usersize = sizeof(block_state.user.buf);
5012 >    nuh.hostsize = sizeof(block_state.host.buf);
5013  
5014      split_nuh(&nuh);
5609
5610    DupString(yy_match_item->user, userbuf);
5611    DupString(yy_match_item->host, hostbuf);
5015    }
5016   }
5017 + #line 5018 "conf_parser.c" /* yacc.c:1646  */
5018      break;
5019  
5020 <  case 318:
5021 <
5618 < /* Line 1806 of yacc.c  */
5619 < #line 2026 "ircd_parser.y"
5020 >  case 359:
5021 > #line 2010 "conf_parser.y" /* yacc.c:1646  */
5022      {
5023    if (conf_parser_ctx.pass == 2)
5024 <    yy_match_item->action = 0;
5024 >    block_state.flags.value = 0;
5025   }
5026 + #line 5027 "conf_parser.c" /* yacc.c:1646  */
5027      break;
5028  
5029 <  case 322:
5030 <
5628 < /* Line 1806 of yacc.c  */
5629 < #line 2033 "ircd_parser.y"
5029 >  case 363:
5030 > #line 2017 "conf_parser.y" /* yacc.c:1646  */
5031      {
5032    if (conf_parser_ctx.pass == 2)
5033 <    yy_match_item->action |= SHARED_KLINE;
5033 >    block_state.flags.value |= SHARED_KLINE;
5034   }
5035 + #line 5036 "conf_parser.c" /* yacc.c:1646  */
5036      break;
5037  
5038 <  case 323:
5039 <
5638 < /* Line 1806 of yacc.c  */
5639 < #line 2037 "ircd_parser.y"
5038 >  case 364:
5039 > #line 2021 "conf_parser.y" /* yacc.c:1646  */
5040      {
5041    if (conf_parser_ctx.pass == 2)
5042 <    yy_match_item->action |= SHARED_TKLINE;
5042 >    block_state.flags.value |= SHARED_UNKLINE;
5043   }
5044 + #line 5045 "conf_parser.c" /* yacc.c:1646  */
5045      break;
5046  
5047 <  case 324:
5048 <
5648 < /* Line 1806 of yacc.c  */
5649 < #line 2041 "ircd_parser.y"
5047 >  case 365:
5048 > #line 2025 "conf_parser.y" /* yacc.c:1646  */
5049      {
5050    if (conf_parser_ctx.pass == 2)
5051 <    yy_match_item->action |= SHARED_UNKLINE;
5051 >    block_state.flags.value |= SHARED_DLINE;
5052   }
5053 + #line 5054 "conf_parser.c" /* yacc.c:1646  */
5054      break;
5055  
5056 <  case 325:
5057 <
5658 < /* Line 1806 of yacc.c  */
5659 < #line 2045 "ircd_parser.y"
5056 >  case 366:
5057 > #line 2029 "conf_parser.y" /* yacc.c:1646  */
5058      {
5059    if (conf_parser_ctx.pass == 2)
5060 <    yy_match_item->action |= SHARED_XLINE;
5060 >    block_state.flags.value |= SHARED_UNDLINE;
5061   }
5062 + #line 5063 "conf_parser.c" /* yacc.c:1646  */
5063      break;
5064  
5065 <  case 326:
5066 <
5668 < /* Line 1806 of yacc.c  */
5669 < #line 2049 "ircd_parser.y"
5065 >  case 367:
5066 > #line 2033 "conf_parser.y" /* yacc.c:1646  */
5067      {
5068    if (conf_parser_ctx.pass == 2)
5069 <    yy_match_item->action |= SHARED_TXLINE;
5069 >    block_state.flags.value |= SHARED_XLINE;
5070   }
5071 + #line 5072 "conf_parser.c" /* yacc.c:1646  */
5072      break;
5073  
5074 <  case 327:
5075 <
5678 < /* Line 1806 of yacc.c  */
5679 < #line 2053 "ircd_parser.y"
5074 >  case 368:
5075 > #line 2037 "conf_parser.y" /* yacc.c:1646  */
5076      {
5077    if (conf_parser_ctx.pass == 2)
5078 <    yy_match_item->action |= SHARED_UNXLINE;
5078 >    block_state.flags.value |= SHARED_UNXLINE;
5079   }
5080 + #line 5081 "conf_parser.c" /* yacc.c:1646  */
5081      break;
5082  
5083 <  case 328:
5084 <
5688 < /* Line 1806 of yacc.c  */
5689 < #line 2057 "ircd_parser.y"
5083 >  case 369:
5084 > #line 2041 "conf_parser.y" /* yacc.c:1646  */
5085      {
5086    if (conf_parser_ctx.pass == 2)
5087 <    yy_match_item->action |= SHARED_RESV;
5087 >    block_state.flags.value |= SHARED_RESV;
5088   }
5089 + #line 5090 "conf_parser.c" /* yacc.c:1646  */
5090      break;
5091  
5092 <  case 329:
5093 <
5698 < /* Line 1806 of yacc.c  */
5699 < #line 2061 "ircd_parser.y"
5092 >  case 370:
5093 > #line 2045 "conf_parser.y" /* yacc.c:1646  */
5094      {
5095    if (conf_parser_ctx.pass == 2)
5096 <    yy_match_item->action |= SHARED_TRESV;
5096 >    block_state.flags.value |= SHARED_UNRESV;
5097   }
5098 + #line 5099 "conf_parser.c" /* yacc.c:1646  */
5099      break;
5100  
5101 <  case 330:
5102 <
5708 < /* Line 1806 of yacc.c  */
5709 < #line 2065 "ircd_parser.y"
5101 >  case 371:
5102 > #line 2049 "conf_parser.y" /* yacc.c:1646  */
5103      {
5104    if (conf_parser_ctx.pass == 2)
5105 <    yy_match_item->action |= SHARED_UNRESV;
5105 >    block_state.flags.value |= SHARED_LOCOPS;
5106   }
5107 + #line 5108 "conf_parser.c" /* yacc.c:1646  */
5108      break;
5109  
5110 <  case 331:
5111 <
5718 < /* Line 1806 of yacc.c  */
5719 < #line 2069 "ircd_parser.y"
5110 >  case 372:
5111 > #line 2053 "conf_parser.y" /* yacc.c:1646  */
5112      {
5113    if (conf_parser_ctx.pass == 2)
5114 <    yy_match_item->action |= SHARED_LOCOPS;
5114 >    block_state.flags.value = SHARED_ALL;
5115   }
5116 + #line 5117 "conf_parser.c" /* yacc.c:1646  */
5117      break;
5118  
5119 <  case 332:
5120 <
5728 < /* Line 1806 of yacc.c  */
5729 < #line 2073 "ircd_parser.y"
5119 >  case 373:
5120 > #line 2062 "conf_parser.y" /* yacc.c:1646  */
5121      {
5122 <  if (conf_parser_ctx.pass == 2)
5732 <    yy_match_item->action = SHARED_ALL;
5733 < }
5122 >  if (conf_parser_ctx.pass != 2)
5123      break;
5124  
5125 <  case 333:
5125 >  reset_block_state();
5126  
5127 < /* Line 1806 of yacc.c  */
5128 < #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 <  }
5127 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5128 >  block_state.flags.value = SHARED_ALL;
5129   }
5130 + #line 5131 "conf_parser.c" /* yacc.c:1646  */
5131      break;
5132  
5133 <  case 334:
5134 <
5751 < /* Line 1806 of yacc.c  */
5752 < #line 2089 "ircd_parser.y"
5133 >  case 374:
5134 > #line 2071 "conf_parser.y" /* yacc.c:1646  */
5135      {
5136 <  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:
5136 >  struct MaskItem *conf = NULL;
5137  
5138 < /* 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 < }
5138 >  if (conf_parser_ctx.pass != 2)
5139      break;
5140  
5141 <  case 341:
5142 <
5143 < /* Line 1806 of yacc.c  */
5776 < #line 2108 "ircd_parser.y"
5777 <    {
5778 <  if (conf_parser_ctx.pass == 2)
5779 <    yy_conf->flags = 0;
5141 >  conf = conf_make(CONF_CLUSTER);
5142 >  conf->flags = block_state.flags.value;
5143 >  conf->name = xstrdup(block_state.name.buf);
5144   }
5145 + #line 5146 "conf_parser.c" /* yacc.c:1646  */
5146      break;
5147  
5148 <  case 345:
5149 <
5785 < /* Line 1806 of yacc.c  */
5786 < #line 2115 "ircd_parser.y"
5148 >  case 380:
5149 > #line 2086 "conf_parser.y" /* yacc.c:1646  */
5150      {
5151    if (conf_parser_ctx.pass == 2)
5152 <    yy_conf->flags |= SHARED_KLINE;
5152 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5153   }
5154 + #line 5155 "conf_parser.c" /* yacc.c:1646  */
5155      break;
5156  
5157 <  case 346:
5158 <
5795 < /* Line 1806 of yacc.c  */
5796 < #line 2119 "ircd_parser.y"
5157 >  case 381:
5158 > #line 2092 "conf_parser.y" /* yacc.c:1646  */
5159      {
5160    if (conf_parser_ctx.pass == 2)
5161 <    yy_conf->flags |= SHARED_TKLINE;
5161 >    block_state.flags.value = 0;
5162   }
5163 + #line 5164 "conf_parser.c" /* yacc.c:1646  */
5164      break;
5165  
5166 <  case 347:
5167 <
5805 < /* Line 1806 of yacc.c  */
5806 < #line 2123 "ircd_parser.y"
5166 >  case 385:
5167 > #line 2099 "conf_parser.y" /* yacc.c:1646  */
5168      {
5169    if (conf_parser_ctx.pass == 2)
5170 <    yy_conf->flags |= SHARED_UNKLINE;
5170 >    block_state.flags.value |= SHARED_KLINE;
5171   }
5172 + #line 5173 "conf_parser.c" /* yacc.c:1646  */
5173      break;
5174  
5175 <  case 348:
5176 <
5815 < /* Line 1806 of yacc.c  */
5816 < #line 2127 "ircd_parser.y"
5175 >  case 386:
5176 > #line 2103 "conf_parser.y" /* yacc.c:1646  */
5177      {
5178    if (conf_parser_ctx.pass == 2)
5179 <    yy_conf->flags |= SHARED_XLINE;
5179 >    block_state.flags.value |= SHARED_UNKLINE;
5180   }
5181 + #line 5182 "conf_parser.c" /* yacc.c:1646  */
5182      break;
5183  
5184 <  case 349:
5185 <
5825 < /* Line 1806 of yacc.c  */
5826 < #line 2131 "ircd_parser.y"
5184 >  case 387:
5185 > #line 2107 "conf_parser.y" /* yacc.c:1646  */
5186      {
5187    if (conf_parser_ctx.pass == 2)
5188 <    yy_conf->flags |= SHARED_TXLINE;
5188 >    block_state.flags.value |= SHARED_DLINE;
5189   }
5190 + #line 5191 "conf_parser.c" /* yacc.c:1646  */
5191      break;
5192  
5193 <  case 350:
5194 <
5835 < /* Line 1806 of yacc.c  */
5836 < #line 2135 "ircd_parser.y"
5193 >  case 388:
5194 > #line 2111 "conf_parser.y" /* yacc.c:1646  */
5195      {
5196    if (conf_parser_ctx.pass == 2)
5197 <    yy_conf->flags |= SHARED_UNXLINE;
5197 >    block_state.flags.value |= SHARED_UNDLINE;
5198   }
5199 + #line 5200 "conf_parser.c" /* yacc.c:1646  */
5200      break;
5201  
5202 <  case 351:
5203 <
5845 < /* Line 1806 of yacc.c  */
5846 < #line 2139 "ircd_parser.y"
5202 >  case 389:
5203 > #line 2115 "conf_parser.y" /* yacc.c:1646  */
5204      {
5205    if (conf_parser_ctx.pass == 2)
5206 <    yy_conf->flags |= SHARED_RESV;
5206 >    block_state.flags.value |= SHARED_XLINE;
5207   }
5208 + #line 5209 "conf_parser.c" /* yacc.c:1646  */
5209      break;
5210  
5211 <  case 352:
5212 <
5855 < /* Line 1806 of yacc.c  */
5856 < #line 2143 "ircd_parser.y"
5211 >  case 390:
5212 > #line 2119 "conf_parser.y" /* yacc.c:1646  */
5213      {
5214    if (conf_parser_ctx.pass == 2)
5215 <    yy_conf->flags |= SHARED_TRESV;
5215 >    block_state.flags.value |= SHARED_UNXLINE;
5216   }
5217 + #line 5218 "conf_parser.c" /* yacc.c:1646  */
5218      break;
5219  
5220 <  case 353:
5221 <
5865 < /* Line 1806 of yacc.c  */
5866 < #line 2147 "ircd_parser.y"
5220 >  case 391:
5221 > #line 2123 "conf_parser.y" /* yacc.c:1646  */
5222      {
5223    if (conf_parser_ctx.pass == 2)
5224 <    yy_conf->flags |= SHARED_UNRESV;
5224 >    block_state.flags.value |= SHARED_RESV;
5225   }
5226 + #line 5227 "conf_parser.c" /* yacc.c:1646  */
5227      break;
5228  
5229 <  case 354:
5230 <
5875 < /* Line 1806 of yacc.c  */
5876 < #line 2151 "ircd_parser.y"
5229 >  case 392:
5230 > #line 2127 "conf_parser.y" /* yacc.c:1646  */
5231      {
5232    if (conf_parser_ctx.pass == 2)
5233 <    yy_conf->flags |= SHARED_LOCOPS;
5233 >    block_state.flags.value |= SHARED_UNRESV;
5234   }
5235 + #line 5236 "conf_parser.c" /* yacc.c:1646  */
5236      break;
5237  
5238 <  case 355:
5239 <
5885 < /* Line 1806 of yacc.c  */
5886 < #line 2155 "ircd_parser.y"
5238 >  case 393:
5239 > #line 2131 "conf_parser.y" /* yacc.c:1646  */
5240      {
5241    if (conf_parser_ctx.pass == 2)
5242 <    yy_conf->flags = SHARED_ALL;
5242 >    block_state.flags.value |= SHARED_LOCOPS;
5243   }
5244 + #line 5245 "conf_parser.c" /* yacc.c:1646  */
5245      break;
5246  
5247 <  case 356:
5248 <
5895 < /* Line 1806 of yacc.c  */
5896 < #line 2164 "ircd_parser.y"
5247 >  case 394:
5248 > #line 2135 "conf_parser.y" /* yacc.c:1646  */
5249      {
5250    if (conf_parser_ctx.pass == 2)
5251 <  {
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 <  }
5251 >    block_state.flags.value = SHARED_ALL;
5252   }
5253 + #line 5254 "conf_parser.c" /* yacc.c:1646  */
5254      break;
5255  
5256 <  case 357:
5257 <
5919 < /* Line 1806 of yacc.c  */
5920 < #line 2182 "ircd_parser.y"
5256 >  case 395:
5257 > #line 2144 "conf_parser.y" /* yacc.c:1646  */
5258      {
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;
5259  
5260 <        yy_hconf = ptr->data;
5261 <
5996 <        /* yy_conf == NULL is a fatal error for this connect block! */
5997 <        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;
5260 >  if (conf_parser_ctx.pass != 2)
5261 >    break;
5262  
5263 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5264 <        {
5265 <          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 <  }
5263 >  reset_block_state();
5264 >  block_state.aftype.value = AF_INET;
5265 >  block_state.port.value = PORTNUM;
5266   }
5267 + #line 5268 "conf_parser.c" /* yacc.c:1646  */
5268      break;
5269  
5270 <  case 377:
5271 <
6051 < /* Line 1806 of yacc.c  */
6052 < #line 2320 "ircd_parser.y"
5270 >  case 396:
5271 > #line 2153 "conf_parser.y" /* yacc.c:1646  */
5272      {
5273 <  if (conf_parser_ctx.pass == 2)
5274 <  {
6056 <    if (yy_conf->name != NULL)
6057 <      yyerror("Multiple connect name entry");
5273 >  struct MaskItem *conf = NULL;
5274 >  struct addrinfo hints, *res;
5275  
5276 <    MyFree(yy_conf->name);
6060 <    DupString(yy_conf->name, yylval.string);
6061 <  }
6062 < }
5276 >  if (conf_parser_ctx.pass != 2)
5277      break;
5278  
5279 <  case 378:
5279 >  if (!block_state.name.buf[0] ||
5280 >      !block_state.host.buf[0])
5281 >    break;
5282  
5283 < /* Line 1806 of yacc.c  */
5284 < #line 2332 "ircd_parser.y"
5285 <    {
6070 <  if (conf_parser_ctx.pass == 2)
6071 <  {
6072 <    if (yy_conf->name != NULL)
6073 <      yyerror("Multiple connect name entry");
5283 >  if (!block_state.rpass.buf[0] ||
5284 >      !block_state.spass.buf[0])
5285 >    break;
5286  
5287 <    MyFree(yy_conf->name);
5288 <    DupString(yy_conf->name, yylval.string);
6077 <  }
6078 < }
5287 >  if (has_wildcards(block_state.name.buf) ||
5288 >      has_wildcards(block_state.host.buf))
5289      break;
5290  
5291 <  case 379:
5291 >  conf = conf_make(CONF_SERVER);
5292 >  conf->port = block_state.port.value;
5293 >  conf->flags = block_state.flags.value;
5294 >  conf->aftype = block_state.aftype.value;
5295 >  conf->host = xstrdup(block_state.host.buf);
5296 >  conf->name = xstrdup(block_state.name.buf);
5297 >  conf->passwd = xstrdup(block_state.rpass.buf);
5298 >  conf->spasswd = xstrdup(block_state.spass.buf);
5299  
5300 < /* Line 1806 of yacc.c  */
5301 < #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;
5300 >  if (block_state.cert.buf[0])
5301 >    conf->certfp = xstrdup(block_state.cert.buf);
5302  
5303 <  case 380:
5303 >  if (block_state.ciph.buf[0])
5304 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5305  
5306 < /* Line 1806 of yacc.c  */
5307 < #line 2353 "ircd_parser.y"
6098 <    {
6099 <  if (conf_parser_ctx.pass == 2)
6100 <  {
6101 <    struct addrinfo hints, *res;
5306 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5307 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5308  
5309 +  if (block_state.bind.buf[0])
5310 +  {
5311      memset(&hints, 0, sizeof(hints));
5312  
5313      hints.ai_family   = AF_UNSPEC;
5314      hints.ai_socktype = SOCK_STREAM;
5315      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5316  
5317 <    if (getaddrinfo(yylval.string, NULL, &hints, &res))
5318 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
5317 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5318 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5319      else
5320      {
5321 <      assert(res != NULL);
5321 >      assert(res);
5322  
5323 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
5324 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
5325 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
5323 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5324 >      conf->bind.ss.ss_family = res->ai_family;
5325 >      conf->bind.ss_len = res->ai_addrlen;
5326        freeaddrinfo(res);
5327      }
5328    }
6121 }
6122    break;
6123
6124  case 381:
6125
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));
5329  
5330 <      MyFree(yy_aconf->spasswd);
5331 <      DupString(yy_aconf->spasswd, yylval.string);
6141 <    }
6142 <  }
5330 >  conf_add_class_to_conf(conf, block_state.class.buf);
5331 >  lookup_confhost(conf);
5332   }
5333 + #line 5334 "conf_parser.c" /* yacc.c:1646  */
5334      break;
5335  
5336 <  case 382:
5337 <
6148 < /* Line 1806 of yacc.c  */
6149 < #line 2397 "ircd_parser.y"
5336 >  case 414:
5337 > #line 2233 "conf_parser.y" /* yacc.c:1646  */
5338      {
5339    if (conf_parser_ctx.pass == 2)
5340 <  {
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 <  }
5340 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5341   }
5342 + #line 5343 "conf_parser.c" /* yacc.c:1646  */
5343      break;
5344  
5345 <  case 383:
5346 <
6170 < /* Line 1806 of yacc.c  */
6171 < #line 2415 "ircd_parser.y"
5345 >  case 415:
5346 > #line 2239 "conf_parser.y" /* yacc.c:1646  */
5347      {
5348    if (conf_parser_ctx.pass == 2)
5349 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5349 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5350   }
5351 + #line 5352 "conf_parser.c" /* yacc.c:1646  */
5352      break;
5353  
5354 <  case 384:
5355 <
6180 < /* Line 1806 of yacc.c  */
6181 < #line 2421 "ircd_parser.y"
5354 >  case 416:
5355 > #line 2245 "conf_parser.y" /* yacc.c:1646  */
5356      {
5357    if (conf_parser_ctx.pass == 2)
5358 <    yy_aconf->aftype = AF_INET;
5358 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5359   }
5360 + #line 5361 "conf_parser.c" /* yacc.c:1646  */
5361      break;
5362  
5363 <  case 385:
5364 <
6190 < /* Line 1806 of yacc.c  */
6191 < #line 2425 "ircd_parser.y"
5363 >  case 417:
5364 > #line 2251 "conf_parser.y" /* yacc.c:1646  */
5365      {
5366 < #ifdef IPV6
6194 <  if (conf_parser_ctx.pass == 2)
6195 <    yy_aconf->aftype = AF_INET6;
6196 < #endif
6197 < }
5366 >  if (conf_parser_ctx.pass != 2)
5367      break;
5368  
5369 <  case 386:
5370 <
5371 < /* Line 1806 of yacc.c  */
5372 < #line 2433 "ircd_parser.y"
5373 <    {
5369 >  if ((yyvsp[-1].string)[0] == ':')
5370 >    conf_error_report("Server passwords cannot begin with a colon");
5371 >  else if (strchr((yyvsp[-1].string), ' '))
5372 >    conf_error_report("Server passwords cannot contain spaces");
5373 >  else
5374 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5375   }
5376 + #line 5377 "conf_parser.c" /* yacc.c:1646  */
5377      break;
5378  
5379 <  case 390:
5380 <
5381 < /* Line 1806 of yacc.c  */
5382 < #line 2437 "ircd_parser.y"
6212 <    { not_atom = 1; }
5379 >  case 418:
5380 > #line 2264 "conf_parser.y" /* yacc.c:1646  */
5381 >    {
5382 >  if (conf_parser_ctx.pass != 2)
5383      break;
5384  
5385 <  case 392:
5386 <
5387 < /* Line 1806 of yacc.c  */
5388 < #line 2438 "ircd_parser.y"
5389 <    { not_atom = 0; }
5385 >  if ((yyvsp[-1].string)[0] == ':')
5386 >    conf_error_report("Server passwords cannot begin with a colon");
5387 >  else if (strchr((yyvsp[-1].string), ' '))
5388 >    conf_error_report("Server passwords cannot contain spaces");
5389 >  else
5390 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5391 > }
5392 > #line 5393 "conf_parser.c" /* yacc.c:1646  */
5393      break;
5394  
5395 <  case 394:
5396 <
6224 < /* Line 1806 of yacc.c  */
6225 < #line 2441 "ircd_parser.y"
5395 >  case 419:
5396 > #line 2277 "conf_parser.y" /* yacc.c:1646  */
5397      {
5398    if (conf_parser_ctx.pass == 2)
5399 < #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
5399 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5400   }
5401 + #line 5402 "conf_parser.c" /* yacc.c:1646  */
5402      break;
5403  
5404 <  case 395:
5405 <
6241 < /* Line 1806 of yacc.c  */
6242 < #line 2452 "ircd_parser.y"
5404 >  case 420:
5405 > #line 2283 "conf_parser.y" /* yacc.c:1646  */
5406      {
5407    if (conf_parser_ctx.pass == 2)
5408 <  {
6246 <    if (not_atom)ClearConfCryptLink(yy_aconf);
6247 <    else SetConfCryptLink(yy_aconf);
6248 <  }
5408 >    block_state.port.value = (yyvsp[-1].number);
5409   }
5410 + #line 5411 "conf_parser.c" /* yacc.c:1646  */
5411      break;
5412  
5413 <  case 396:
5414 <
6254 < /* Line 1806 of yacc.c  */
6255 < #line 2459 "ircd_parser.y"
5413 >  case 421:
5414 > #line 2289 "conf_parser.y" /* yacc.c:1646  */
5415      {
5416    if (conf_parser_ctx.pass == 2)
5417 <  {
6259 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
6260 <    else SetConfAllowAutoConn(yy_aconf);
6261 <  }
5417 >    block_state.aftype.value = AF_INET;
5418   }
5419 + #line 5420 "conf_parser.c" /* yacc.c:1646  */
5420      break;
5421  
5422 <  case 397:
5423 <
6267 < /* Line 1806 of yacc.c  */
6268 < #line 2466 "ircd_parser.y"
5422 >  case 422:
5423 > #line 2293 "conf_parser.y" /* yacc.c:1646  */
5424      {
5425    if (conf_parser_ctx.pass == 2)
5426 <  {
6272 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
6273 <    else SetConfAwayBurst(yy_aconf);
6274 <  }
5426 >    block_state.aftype.value = AF_INET6;
5427   }
5428 + #line 5429 "conf_parser.c" /* yacc.c:1646  */
5429      break;
5430  
5431 <  case 398:
5432 <
6280 < /* Line 1806 of yacc.c  */
6281 < #line 2473 "ircd_parser.y"
5431 >  case 423:
5432 > #line 2299 "conf_parser.y" /* yacc.c:1646  */
5433      {
5434 <  if (conf_parser_ctx.pass == 2)
6284 <  {
6285 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
6286 <    else SetConfTopicBurst(yy_aconf);
6287 <  }
5434 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5435   }
5436 + #line 5437 "conf_parser.c" /* yacc.c:1646  */
5437      break;
5438  
5439 <  case 399:
5440 <
6293 < /* Line 1806 of yacc.c  */
6294 < #line 2483 "ircd_parser.y"
5439 >  case 427:
5440 > #line 2305 "conf_parser.y" /* yacc.c:1646  */
5441      {
6296 #ifdef HAVE_LIBCRYPTO
5442    if (conf_parser_ctx.pass == 2)
5443 <  {
5444 <    BIO *file;
5445 <
5446 <    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);
5443 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5444 > }
5445 > #line 5446 "conf_parser.c" /* yacc.c:1646  */
5446 >    break;
5447  
5448 <    if (yy_aconf->rsa_public_key == NULL)
5448 >  case 428:
5449 > #line 2309 "conf_parser.y" /* yacc.c:1646  */
5450      {
5451 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
5452 <      break;
6327 <    }
6328 <      
6329 <    BIO_set_close(file, BIO_CLOSE);
6330 <    BIO_free(file);
6331 <  }
6332 < #endif /* HAVE_LIBCRYPTO */
5451 >  if (conf_parser_ctx.pass == 2)
5452 >    block_state.flags.value |= CONF_FLAGS_SSL;
5453   }
5454 + #line 5455 "conf_parser.c" /* yacc.c:1646  */
5455      break;
5456  
5457 <  case 400:
5458 <
6338 < /* Line 1806 of yacc.c  */
6339 < #line 2524 "ircd_parser.y"
5457 >  case 429:
5458 > #line 2315 "conf_parser.y" /* yacc.c:1646  */
5459      {
5460    if (conf_parser_ctx.pass == 2)
5461    {
5462      if (yylval.number)
5463 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
5463 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5464      else
5465 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
5465 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5466    }
5467   }
5468 + #line 5469 "conf_parser.c" /* yacc.c:1646  */
5469      break;
5470  
5471 <  case 401:
5472 <
6353 < /* Line 1806 of yacc.c  */
6354 < #line 2535 "ircd_parser.y"
5471 >  case 430:
5472 > #line 2326 "conf_parser.y" /* yacc.c:1646  */
5473      {
5474    if (conf_parser_ctx.pass == 2)
5475 <  {
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 <  }
5475 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5476   }
5477 + #line 5478 "conf_parser.c" /* yacc.c:1646  */
5478      break;
5479  
5480 <  case 402:
5481 <
6370 < /* Line 1806 of yacc.c  */
6371 < #line 2548 "ircd_parser.y"
5480 >  case 431:
5481 > #line 2332 "conf_parser.y" /* yacc.c:1646  */
5482      {
5483    if (conf_parser_ctx.pass == 2)
5484 <  {
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 <  }
5484 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5485   }
5486 + #line 5487 "conf_parser.c" /* yacc.c:1646  */
5487      break;
5488  
5489 <  case 403:
5490 <
6387 < /* Line 1806 of yacc.c  */
6388 < #line 2561 "ircd_parser.y"
5489 >  case 432:
5490 > #line 2338 "conf_parser.y" /* yacc.c:1646  */
5491      {
5492    if (conf_parser_ctx.pass == 2)
5493 <  {
6392 <    MyFree(class_name);
6393 <    DupString(class_name, yylval.string);
6394 <  }
5493 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5494   }
5495 + #line 5496 "conf_parser.c" /* yacc.c:1646  */
5496      break;
5497  
5498 <  case 404:
5499 <
6400 < /* Line 1806 of yacc.c  */
6401 < #line 2570 "ircd_parser.y"
5498 >  case 433:
5499 > #line 2344 "conf_parser.y" /* yacc.c:1646  */
5500      {
5501   #ifdef HAVE_LIBCRYPTO
5502    if (conf_parser_ctx.pass == 2)
5503 <  {
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 <  }
5503 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5504   #else
5505    if (conf_parser_ctx.pass == 2)
5506 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
5506 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5507   #endif
5508   }
5509 + #line 5510 "conf_parser.c" /* yacc.c:1646  */
5510      break;
5511  
5512 <  case 405:
5513 <
6436 < /* Line 1806 of yacc.c  */
6437 < #line 2605 "ircd_parser.y"
5512 >  case 434:
5513 > #line 2359 "conf_parser.y" /* yacc.c:1646  */
5514      {
5515    if (conf_parser_ctx.pass == 2)
5516 <  {
6441 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
6442 <    regex_ban = 0;
6443 <  }
5516 >    reset_block_state();
5517   }
5518 + #line 5519 "conf_parser.c" /* yacc.c:1646  */
5519      break;
5520  
5521 <  case 406:
5522 <
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])
5521 >  case 435:
5522 > #line 2363 "conf_parser.y" /* yacc.c:1646  */
5523      {
5524 <      if (regex_ban)
6457 <      {
6458 < #ifdef HAVE_LIBPCRE
6459 <        void *exp_user = NULL;
6460 <        void *exp_host = NULL;
6461 <        const char *errptr = NULL;
6462 <
6463 <        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);
5524 >  struct MaskItem *conf = NULL;
5525  
5526 <        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 < }
5526 >  if (conf_parser_ctx.pass != 2)
5527      break;
5528  
5529 <  case 407:
5530 <
6509 < /* Line 1806 of yacc.c  */
6510 < #line 2668 "ircd_parser.y"
6511 <    {
6512 < }
5529 >  if (!block_state.user.buf[0] ||
5530 >      !block_state.host.buf[0])
5531      break;
5532  
5533 <  case 411:
5533 >  conf = conf_make(CONF_KLINE);
5534 >  conf->user = xstrdup(block_state.user.buf);
5535 >  conf->host = xstrdup(block_state.host.buf);
5536  
5537 < /* Line 1806 of yacc.c  */
5538 < #line 2673 "ircd_parser.y"
5539 <    {
5540 <  if (conf_parser_ctx.pass == 2)
5541 <    regex_ban = 1;
5537 >  if (block_state.rpass.buf[0])
5538 >    conf->reason = xstrdup(block_state.rpass.buf);
5539 >  else
5540 >    conf->reason = xstrdup(CONF_NOREASON);
5541 >  add_conf_by_address(CONF_KLINE, conf);
5542   }
5543 + #line 5544 "conf_parser.c" /* yacc.c:1646  */
5544      break;
5545  
5546 <  case 418:
5547 <
6527 < /* Line 1806 of yacc.c  */
6528 < #line 2682 "ircd_parser.y"
5546 >  case 441:
5547 > #line 2388 "conf_parser.y" /* yacc.c:1646  */
5548      {
5549 +
5550    if (conf_parser_ctx.pass == 2)
5551    {
5552      struct split_nuh_item nuh;
5553  
5554      nuh.nuhmask  = yylval.string;
5555      nuh.nickptr  = NULL;
5556 <    nuh.userptr  = userbuf;
5557 <    nuh.hostptr  = hostbuf;
5556 >    nuh.userptr  = block_state.user.buf;
5557 >    nuh.hostptr  = block_state.host.buf;
5558  
5559      nuh.nicksize = 0;
5560 <    nuh.usersize = sizeof(userbuf);
5561 <    nuh.hostsize = sizeof(hostbuf);
5560 >    nuh.usersize = sizeof(block_state.user.buf);
5561 >    nuh.hostsize = sizeof(block_state.host.buf);
5562  
5563      split_nuh(&nuh);
5564    }
5565   }
5566 + #line 5567 "conf_parser.c" /* yacc.c:1646  */
5567      break;
5568  
5569 <  case 419:
5570 <
6550 < /* Line 1806 of yacc.c  */
6551 < #line 2701 "ircd_parser.y"
5569 >  case 442:
5570 > #line 2408 "conf_parser.y" /* yacc.c:1646  */
5571      {
5572    if (conf_parser_ctx.pass == 2)
5573 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5573 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5574   }
5575 + #line 5576 "conf_parser.c" /* yacc.c:1646  */
5576      break;
5577  
5578 <  case 420:
5579 <
6560 < /* Line 1806 of yacc.c  */
6561 < #line 2710 "ircd_parser.y"
5578 >  case 443:
5579 > #line 2417 "conf_parser.y" /* yacc.c:1646  */
5580      {
5581    if (conf_parser_ctx.pass == 2)
5582 <    hostbuf[0] = reasonbuf[0] = '\0';
5582 >    reset_block_state();
5583   }
5584 + #line 5585 "conf_parser.c" /* yacc.c:1646  */
5585      break;
5586  
5587 <  case 421:
5588 <
6570 < /* Line 1806 of yacc.c  */
6571 < #line 2714 "ircd_parser.y"
6572 <    {
6573 <  if (conf_parser_ctx.pass == 2)
6574 <  {
6575 <    if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
5587 >  case 444:
5588 > #line 2421 "conf_parser.y" /* yacc.c:1646  */
5589      {
5590 <      yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
6578 <      DupString(yy_aconf->host, hostbuf);
5590 >  struct MaskItem *conf = NULL;
5591  
5592 <      if (reasonbuf[0])
6581 <        DupString(yy_aconf->reason, reasonbuf);
6582 <      else
6583 <        DupString(yy_aconf->reason, "No reason");
6584 <      add_conf_by_address(CONF_DLINE, yy_aconf);
6585 <      yy_aconf = NULL;
6586 <    }
6587 <  }
6588 < }
5592 >  if (conf_parser_ctx.pass != 2)
5593      break;
5594  
5595 <  case 427:
6592 <
6593 < /* Line 1806 of yacc.c  */
6594 < #line 2736 "ircd_parser.y"
6595 <    {
6596 <  if (conf_parser_ctx.pass == 2)
6597 <    strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
6598 < }
5595 >  if (!block_state.addr.buf[0])
5596      break;
5597  
5598 <  case 428:
5598 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5599 >  {
5600 >    conf = conf_make(CONF_DLINE);
5601 >    conf->host = xstrdup(block_state.addr.buf);
5602  
5603 < /* Line 1806 of yacc.c  */
5604 < #line 2742 "ircd_parser.y"
5605 <    {
5606 <  if (conf_parser_ctx.pass == 2)
5607 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5603 >    if (block_state.rpass.buf[0])
5604 >      conf->reason = xstrdup(block_state.rpass.buf);
5605 >    else
5606 >      conf->reason = xstrdup(CONF_NOREASON);
5607 >    add_conf_by_address(CONF_DLINE, conf);
5608 >  }
5609   }
5610 + #line 5611 "conf_parser.c" /* yacc.c:1646  */
5611      break;
5612  
5613 <  case 434:
5614 <
6613 < /* Line 1806 of yacc.c  */
6614 < #line 2756 "ircd_parser.y"
5613 >  case 450:
5614 > #line 2447 "conf_parser.y" /* yacc.c:1646  */
5615      {
5616    if (conf_parser_ctx.pass == 2)
5617 <  {
6618 <    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
6619 <    {
6620 <      yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
6621 <      DupString(yy_aconf->host, yylval.string);
6622 <
6623 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
6624 <      yy_aconf = NULL;
6625 <    }
6626 <  }
5617 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5618   }
5619 + #line 5620 "conf_parser.c" /* yacc.c:1646  */
5620      break;
5621  
5622 <  case 435:
5623 <
6632 < /* Line 1806 of yacc.c  */
6633 < #line 2774 "ircd_parser.y"
5622 >  case 451:
5623 > #line 2453 "conf_parser.y" /* yacc.c:1646  */
5624      {
5625    if (conf_parser_ctx.pass == 2)
5626 <  {
6637 <    regex_ban = 0;
6638 <    reasonbuf[0] = gecos_name[0] = '\0';
6639 <  }
5626 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5627   }
5628 + #line 5629 "conf_parser.c" /* yacc.c:1646  */
5629      break;
5630  
5631 <  case 436:
5632 <
6645 < /* Line 1806 of yacc.c  */
6646 < #line 2781 "ircd_parser.y"
5631 >  case 457:
5632 > #line 2467 "conf_parser.y" /* yacc.c:1646  */
5633      {
5634    if (conf_parser_ctx.pass == 2)
5635    {
5636 <    if (gecos_name[0])
5636 >    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5637      {
5638 <      if (regex_ban)
5639 <      {
6654 < #ifdef HAVE_LIBPCRE
6655 <        void *exp_p = NULL;
6656 <        const char *errptr = NULL;
6657 <
6658 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
6659 <        {
6660 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
6661 <               errptr);
6662 <          break;
6663 <        }
6664 <
6665 <        yy_conf = make_conf_item(RXLINE_TYPE);
6666 <        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);
6674 <
6675 <      yy_match_item = map_to_conf(yy_conf);
6676 <      DupString(yy_conf->name, gecos_name);
5638 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5639 >      conf->host = xstrdup(yylval.string);
5640  
5641 <      if (reasonbuf[0])
6679 <        DupString(yy_match_item->reason, reasonbuf);
6680 <      else
6681 <        DupString(yy_match_item->reason, "No reason");
5641 >      add_conf_by_address(CONF_EXEMPT, conf);
5642      }
5643    }
5644   }
5645 + #line 5646 "conf_parser.c" /* yacc.c:1646  */
5646      break;
5647  
5648 <  case 437:
5649 <
6689 < /* Line 1806 of yacc.c  */
6690 < #line 2821 "ircd_parser.y"
6691 <    {
6692 < }
6693 <    break;
6694 <
6695 <  case 441:
6696 <
6697 < /* Line 1806 of yacc.c  */
6698 < #line 2826 "ircd_parser.y"
5648 >  case 458:
5649 > #line 2484 "conf_parser.y" /* yacc.c:1646  */
5650      {
5651    if (conf_parser_ctx.pass == 2)
5652 <    regex_ban = 1;
5652 >    reset_block_state();
5653   }
5654 + #line 5655 "conf_parser.c" /* yacc.c:1646  */
5655      break;
5656  
5657 <  case 448:
5658 <
6707 < /* Line 1806 of yacc.c  */
6708 < #line 2835 "ircd_parser.y"
5657 >  case 459:
5658 > #line 2488 "conf_parser.y" /* yacc.c:1646  */
5659      {
5660 <  if (conf_parser_ctx.pass == 2)
6711 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
6712 < }
6713 <    break;
5660 >  struct MaskItem *conf = NULL;
5661  
5662 <  case 449:
6716 <
6717 < /* Line 1806 of yacc.c  */
6718 < #line 2841 "ircd_parser.y"
6719 <    {
6720 <  if (conf_parser_ctx.pass == 2)
6721 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
6722 < }
5662 >  if (conf_parser_ctx.pass != 2)
5663      break;
5664  
5665 <  case 509:
6726 <
6727 < /* Line 1806 of yacc.c  */
6728 < #line 2886 "ircd_parser.y"
6729 <    {
6730 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
6731 < }
5665 >  if (!block_state.name.buf[0])
5666      break;
5667  
5668 <  case 510:
5668 >  conf = conf_make(CONF_XLINE);
5669 >  conf->name = xstrdup(block_state.name.buf);
5670  
5671 < /* Line 1806 of yacc.c  */
5672 < #line 2891 "ircd_parser.y"
5673 <    {
5674 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
6740 < }
6741 <    break;
6742 <
6743 <  case 511:
6744 <
6745 < /* Line 1806 of yacc.c  */
6746 < #line 2896 "ircd_parser.y"
6747 <    {
6748 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
6749 < }
6750 <    break;
6751 <
6752 <  case 512:
6753 <
6754 < /* Line 1806 of yacc.c  */
6755 < #line 2901 "ircd_parser.y"
6756 <    {
6757 <  ConfigFileEntry.burst_away = yylval.number;
6758 < }
6759 <    break;
6760 <
6761 <  case 513:
6762 <
6763 < /* Line 1806 of yacc.c  */
6764 < #line 2906 "ircd_parser.y"
6765 <    {
6766 <  ConfigFileEntry.use_whois_actually = yylval.number;
6767 < }
6768 <    break;
6769 <
6770 <  case 514:
6771 <
6772 < /* Line 1806 of yacc.c  */
6773 < #line 2911 "ircd_parser.y"
6774 <    {
6775 <  GlobalSetOptions.rejecttime = yylval.number;
5671 >  if (block_state.rpass.buf[0])
5672 >    conf->reason = xstrdup(block_state.rpass.buf);
5673 >  else
5674 >    conf->reason = xstrdup(CONF_NOREASON);
5675   }
5676 + #line 5677 "conf_parser.c" /* yacc.c:1646  */
5677      break;
5678  
5679 <  case 515:
5680 <
6781 < /* Line 1806 of yacc.c  */
6782 < #line 2916 "ircd_parser.y"
5679 >  case 465:
5680 > #line 2510 "conf_parser.y" /* yacc.c:1646  */
5681      {
5682 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
5682 >  if (conf_parser_ctx.pass == 2)
5683 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5684   }
5685 + #line 5686 "conf_parser.c" /* yacc.c:1646  */
5686      break;
5687  
5688 <  case 516:
5689 <
6790 < /* Line 1806 of yacc.c  */
6791 < #line 2921 "ircd_parser.y"
5688 >  case 466:
5689 > #line 2516 "conf_parser.y" /* yacc.c:1646  */
5690      {
5691 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
5691 >  if (conf_parser_ctx.pass == 2)
5692 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5693   }
5694 + #line 5695 "conf_parser.c" /* yacc.c:1646  */
5695      break;
5696  
5697    case 517:
5698 <
6799 < /* Line 1806 of yacc.c  */
6800 < #line 2926 "ircd_parser.y"
5698 > #line 2578 "conf_parser.y" /* yacc.c:1646  */
5699      {
5700 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
5700 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5701   }
5702 + #line 5703 "conf_parser.c" /* yacc.c:1646  */
5703      break;
5704  
5705    case 518:
5706 <
6808 < /* Line 1806 of yacc.c  */
6809 < #line 2931 "ircd_parser.y"
5706 > #line 2583 "conf_parser.y" /* yacc.c:1646  */
5707      {
5708 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
5708 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5709   }
5710 + #line 5711 "conf_parser.c" /* yacc.c:1646  */
5711      break;
5712  
5713    case 519:
5714 <
6817 < /* Line 1806 of yacc.c  */
6818 < #line 2936 "ircd_parser.y"
5714 > #line 2588 "conf_parser.y" /* yacc.c:1646  */
5715      {
5716 <  ConfigFileEntry.disable_remote = yylval.number;
5716 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5717   }
5718 + #line 5719 "conf_parser.c" /* yacc.c:1646  */
5719      break;
5720  
5721    case 520:
5722 <
6826 < /* Line 1806 of yacc.c  */
6827 < #line 2941 "ircd_parser.y"
5722 > #line 2593 "conf_parser.y" /* yacc.c:1646  */
5723      {
5724 <  ConfigFileEntry.failed_oper_notice = yylval.number;
5724 >  if (conf_parser_ctx.pass == 2)
5725 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5726   }
5727 + #line 5728 "conf_parser.c" /* yacc.c:1646  */
5728      break;
5729  
5730    case 521:
5731 <
6835 < /* Line 1806 of yacc.c  */
6836 < #line 2946 "ircd_parser.y"
5731 > #line 2599 "conf_parser.y" /* yacc.c:1646  */
5732      {
5733 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5733 >  ConfigGeneral.dline_min_cidr = (yyvsp[-1].number);
5734   }
5735 + #line 5736 "conf_parser.c" /* yacc.c:1646  */
5736      break;
5737  
5738    case 522:
5739 <
6844 < /* Line 1806 of yacc.c  */
6845 < #line 2951 "ircd_parser.y"
5739 > #line 2604 "conf_parser.y" /* yacc.c:1646  */
5740      {
5741 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5741 >  ConfigGeneral.dline_min_cidr6 = (yyvsp[-1].number);
5742   }
5743 + #line 5744 "conf_parser.c" /* yacc.c:1646  */
5744      break;
5745  
5746    case 523:
5747 <
6853 < /* Line 1806 of yacc.c  */
6854 < #line 2956 "ircd_parser.y"
5747 > #line 2609 "conf_parser.y" /* yacc.c:1646  */
5748      {
5749 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5749 >  ConfigGeneral.kline_min_cidr = (yyvsp[-1].number);
5750   }
5751 + #line 5752 "conf_parser.c" /* yacc.c:1646  */
5752      break;
5753  
5754    case 524:
5755 <
6862 < /* Line 1806 of yacc.c  */
6863 < #line 2961 "ircd_parser.y"
5755 > #line 2614 "conf_parser.y" /* yacc.c:1646  */
5756      {
5757 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5757 >  ConfigGeneral.kline_min_cidr6 = (yyvsp[-1].number);
5758   }
5759 + #line 5760 "conf_parser.c" /* yacc.c:1646  */
5760      break;
5761  
5762    case 525:
5763 <
6871 < /* Line 1806 of yacc.c  */
6872 < #line 2966 "ircd_parser.y"
5763 > #line 2619 "conf_parser.y" /* yacc.c:1646  */
5764      {
5765 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5765 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5766   }
5767 + #line 5768 "conf_parser.c" /* yacc.c:1646  */
5768      break;
5769  
5770    case 526:
5771 <
6880 < /* Line 1806 of yacc.c  */
6881 < #line 2971 "ircd_parser.y"
5771 > #line 2624 "conf_parser.y" /* yacc.c:1646  */
5772      {
5773 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5773 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5774   }
5775 + #line 5776 "conf_parser.c" /* yacc.c:1646  */
5776      break;
5777  
5778    case 527:
5779 <
6889 < /* Line 1806 of yacc.c  */
6890 < #line 2976 "ircd_parser.y"
5779 > #line 2629 "conf_parser.y" /* yacc.c:1646  */
5780      {
5781 <  if (conf_parser_ctx.pass == 2)
6893 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
5781 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5782   }
5783 + #line 5784 "conf_parser.c" /* yacc.c:1646  */
5784      break;
5785  
5786    case 528:
5787 <
6899 < /* Line 1806 of yacc.c  */
6900 < #line 2982 "ircd_parser.y"
5787 > #line 2634 "conf_parser.y" /* yacc.c:1646  */
5788      {
5789 <  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 <  }
5789 >  ConfigGeneral.failed_oper_notice = yylval.number;
5790   }
5791 + #line 5792 "conf_parser.c" /* yacc.c:1646  */
5792      break;
5793  
5794    case 529:
5795 <
6914 < /* Line 1806 of yacc.c  */
6915 < #line 2993 "ircd_parser.y"
5795 > #line 2639 "conf_parser.y" /* yacc.c:1646  */
5796      {
5797 <  ConfigFileEntry.kline_with_reason = yylval.number;
5797 >  ConfigGeneral.anti_nick_flood = yylval.number;
5798   }
5799 + #line 5800 "conf_parser.c" /* yacc.c:1646  */
5800      break;
5801  
5802    case 530:
5803 <
6923 < /* Line 1806 of yacc.c  */
6924 < #line 2998 "ircd_parser.y"
5803 > #line 2644 "conf_parser.y" /* yacc.c:1646  */
5804      {
5805 <  if (conf_parser_ctx.pass == 2)
6927 <  {
6928 <    MyFree(ConfigFileEntry.kline_reason);
6929 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
6930 <  }
5805 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5806   }
5807 + #line 5808 "conf_parser.c" /* yacc.c:1646  */
5808      break;
5809  
5810    case 531:
5811 <
6936 < /* Line 1806 of yacc.c  */
6937 < #line 3007 "ircd_parser.y"
5811 > #line 2649 "conf_parser.y" /* yacc.c:1646  */
5812      {
5813 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5813 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5814   }
5815 + #line 5816 "conf_parser.c" /* yacc.c:1646  */
5816      break;
5817  
5818    case 532:
5819 <
6945 < /* Line 1806 of yacc.c  */
6946 < #line 3012 "ircd_parser.y"
5819 > #line 2654 "conf_parser.y" /* yacc.c:1646  */
5820      {
5821 <  ConfigFileEntry.warn_no_nline = yylval.number;
5821 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5822   }
5823 + #line 5824 "conf_parser.c" /* yacc.c:1646  */
5824      break;
5825  
5826    case 533:
5827 <
6954 < /* Line 1806 of yacc.c  */
6955 < #line 3017 "ircd_parser.y"
5827 > #line 2659 "conf_parser.y" /* yacc.c:1646  */
5828      {
5829 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5829 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5830   }
5831 + #line 5832 "conf_parser.c" /* yacc.c:1646  */
5832      break;
5833  
5834    case 534:
5835 <
6963 < /* Line 1806 of yacc.c  */
6964 < #line 3022 "ircd_parser.y"
5835 > #line 2664 "conf_parser.y" /* yacc.c:1646  */
5836      {
5837 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5837 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5838   }
5839 + #line 5840 "conf_parser.c" /* yacc.c:1646  */
5840      break;
5841  
5842    case 535:
5843 <
6972 < /* Line 1806 of yacc.c  */
6973 < #line 3027 "ircd_parser.y"
5843 > #line 2669 "conf_parser.y" /* yacc.c:1646  */
5844      {
5845 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5845 >  if (conf_parser_ctx.pass == 2)
5846 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5847   }
5848 + #line 5849 "conf_parser.c" /* yacc.c:1646  */
5849      break;
5850  
5851    case 536:
5852 <
6981 < /* Line 1806 of yacc.c  */
6982 < #line 3032 "ircd_parser.y"
5852 > #line 2675 "conf_parser.y" /* yacc.c:1646  */
5853      {
5854 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5854 >  ConfigGeneral.invisible_on_connect = yylval.number;
5855   }
5856 + #line 5857 "conf_parser.c" /* yacc.c:1646  */
5857      break;
5858  
5859    case 537:
5860 <
6990 < /* Line 1806 of yacc.c  */
6991 < #line 3035 "ircd_parser.y"
5860 > #line 2680 "conf_parser.y" /* yacc.c:1646  */
5861      {
5862 <  ConfigFileEntry.stats_k_oper_only = 1;
5862 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5863   }
5864 + #line 5865 "conf_parser.c" /* yacc.c:1646  */
5865      break;
5866  
5867    case 538:
5868 <
6999 < /* Line 1806 of yacc.c  */
7000 < #line 3040 "ircd_parser.y"
5868 > #line 2685 "conf_parser.y" /* yacc.c:1646  */
5869      {
5870 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5870 >  ConfigGeneral.stats_e_disabled = yylval.number;
5871   }
5872 + #line 5873 "conf_parser.c" /* yacc.c:1646  */
5873      break;
5874  
5875    case 539:
5876 <
7008 < /* Line 1806 of yacc.c  */
7009 < #line 3043 "ircd_parser.y"
5876 > #line 2690 "conf_parser.y" /* yacc.c:1646  */
5877      {
5878 <  ConfigFileEntry.stats_i_oper_only = 1;
5878 >  ConfigGeneral.stats_m_oper_only = yylval.number;
5879   }
5880 + #line 5881 "conf_parser.c" /* yacc.c:1646  */
5881      break;
5882  
5883    case 540:
5884 <
7017 < /* Line 1806 of yacc.c  */
7018 < #line 3048 "ircd_parser.y"
5884 > #line 2695 "conf_parser.y" /* yacc.c:1646  */
5885      {
5886 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5886 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5887   }
5888 + #line 5889 "conf_parser.c" /* yacc.c:1646  */
5889      break;
5890  
5891    case 541:
5892 <
7026 < /* Line 1806 of yacc.c  */
7027 < #line 3053 "ircd_parser.y"
5892 > #line 2700 "conf_parser.y" /* yacc.c:1646  */
5893      {
5894 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5894 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5895   }
5896 + #line 5897 "conf_parser.c" /* yacc.c:1646  */
5897      break;
5898  
5899    case 542:
5900 <
7035 < /* Line 1806 of yacc.c  */
7036 < #line 3058 "ircd_parser.y"
5900 > #line 2705 "conf_parser.y" /* yacc.c:1646  */
5901      {
5902 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5902 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5903   }
5904 + #line 5905 "conf_parser.c" /* yacc.c:1646  */
5905      break;
5906  
5907    case 543:
5908 <
7044 < /* Line 1806 of yacc.c  */
7045 < #line 3063 "ircd_parser.y"
5908 > #line 2710 "conf_parser.y" /* yacc.c:1646  */
5909      {
5910 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5910 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5911   }
5912 + #line 5913 "conf_parser.c" /* yacc.c:1646  */
5913      break;
5914  
5915    case 544:
5916 <
7053 < /* Line 1806 of yacc.c  */
7054 < #line 3068 "ircd_parser.y"
5916 > #line 2713 "conf_parser.y" /* yacc.c:1646  */
5917      {
5918 <  ConfigFileEntry.short_motd = yylval.number;
5918 >  ConfigGeneral.stats_k_oper_only = 1;
5919   }
5920 + #line 5921 "conf_parser.c" /* yacc.c:1646  */
5921      break;
5922  
5923    case 545:
5924 <
7062 < /* Line 1806 of yacc.c  */
7063 < #line 3073 "ircd_parser.y"
5924 > #line 2718 "conf_parser.y" /* yacc.c:1646  */
5925      {
5926 <  ConfigFileEntry.no_oper_flood = yylval.number;
5926 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5927   }
5928 + #line 5929 "conf_parser.c" /* yacc.c:1646  */
5929      break;
5930  
5931    case 546:
5932 <
7071 < /* Line 1806 of yacc.c  */
7072 < #line 3078 "ircd_parser.y"
5932 > #line 2721 "conf_parser.y" /* yacc.c:1646  */
5933      {
5934 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5934 >  ConfigGeneral.stats_i_oper_only = 1;
5935   }
5936 + #line 5937 "conf_parser.c" /* yacc.c:1646  */
5937      break;
5938  
5939    case 547:
5940 <
7080 < /* Line 1806 of yacc.c  */
7081 < #line 3083 "ircd_parser.y"
5940 > #line 2726 "conf_parser.y" /* yacc.c:1646  */
5941      {
5942 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5942 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5943   }
5944 + #line 5945 "conf_parser.c" /* yacc.c:1646  */
5945      break;
5946  
5947    case 548:
5948 <
7089 < /* Line 1806 of yacc.c  */
7090 < #line 3088 "ircd_parser.y"
5948 > #line 2731 "conf_parser.y" /* yacc.c:1646  */
5949      {
5950 <  if (conf_parser_ctx.pass == 2)
7093 <  {
7094 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
7095 <      yylval.string[LOCALE_LENGTH-1] = '\0';
7096 <
7097 <    set_locale(yylval.string);
7098 <  }
5950 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5951   }
5952 + #line 5953 "conf_parser.c" /* yacc.c:1646  */
5953      break;
5954  
5955    case 549:
5956 <
7104 < /* Line 1806 of yacc.c  */
7105 < #line 3099 "ircd_parser.y"
5956 > #line 2736 "conf_parser.y" /* yacc.c:1646  */
5957      {
5958 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
5958 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5959   }
5960 + #line 5961 "conf_parser.c" /* yacc.c:1646  */
5961      break;
5962  
5963    case 550:
5964 <
7113 < /* Line 1806 of yacc.c  */
7114 < #line 3104 "ircd_parser.y"
5964 > #line 2741 "conf_parser.y" /* yacc.c:1646  */
5965      {
5966 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
5966 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5967   }
5968 + #line 5969 "conf_parser.c" /* yacc.c:1646  */
5969      break;
5970  
5971    case 551:
5972 <
7122 < /* Line 1806 of yacc.c  */
7123 < #line 3109 "ircd_parser.y"
5972 > #line 2746 "conf_parser.y" /* yacc.c:1646  */
5973      {
5974 <  if (conf_parser_ctx.pass == 2)
7126 <  {
7127 <    MyFree(ConfigFileEntry.servlink_path);
7128 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
7129 <  }
5974 >  ConfigGeneral.short_motd = yylval.number;
5975   }
5976 + #line 5977 "conf_parser.c" /* yacc.c:1646  */
5977      break;
5978  
5979    case 552:
5980 <
7135 < /* Line 1806 of yacc.c  */
7136 < #line 3118 "ircd_parser.y"
5980 > #line 2751 "conf_parser.y" /* yacc.c:1646  */
5981      {
5982 < #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
5982 >  ConfigGeneral.no_oper_flood = yylval.number;
5983   }
5984 + #line 5985 "conf_parser.c" /* yacc.c:1646  */
5985      break;
5986  
5987    case 553:
5988 <
7171 < /* Line 1806 of yacc.c  */
7172 < #line 3150 "ircd_parser.y"
5988 > #line 2756 "conf_parser.y" /* yacc.c:1646  */
5989      {
5990 <  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 <  }
5990 >  ConfigGeneral.oper_pass_resv = yylval.number;
5991   }
5992 + #line 5993 "conf_parser.c" /* yacc.c:1646  */
5993      break;
5994  
5995    case 554:
5996 <
7193 < /* Line 1806 of yacc.c  */
7194 < #line 3168 "ircd_parser.y"
5996 > #line 2761 "conf_parser.y" /* yacc.c:1646  */
5997      {
5998 <  ConfigFileEntry.use_egd = yylval.number;
5998 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
5999   }
6000 + #line 6001 "conf_parser.c" /* yacc.c:1646  */
6001      break;
6002  
6003    case 555:
6004 <
7202 < /* Line 1806 of yacc.c  */
7203 < #line 3173 "ircd_parser.y"
6004 > #line 2766 "conf_parser.y" /* yacc.c:1646  */
6005      {
6006 <  if (conf_parser_ctx.pass == 2)
7206 <  {
7207 <    MyFree(ConfigFileEntry.egdpool_path);
7208 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
7209 <  }
6006 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
6007   }
6008 + #line 6009 "conf_parser.c" /* yacc.c:1646  */
6009      break;
6010  
6011    case 556:
6012 <
7215 < /* Line 1806 of yacc.c  */
7216 < #line 3182 "ircd_parser.y"
6012 > #line 2771 "conf_parser.y" /* yacc.c:1646  */
6013      {
6014 <  if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
7219 <  {
7220 <    MyFree(ConfigFileEntry.service_name);
7221 <    DupString(ConfigFileEntry.service_name, yylval.string);
7222 <  }
6014 >  ConfigGeneral.ping_cookie = yylval.number;
6015   }
6016 + #line 6017 "conf_parser.c" /* yacc.c:1646  */
6017      break;
6018  
6019    case 557:
6020 <
7228 < /* Line 1806 of yacc.c  */
7229 < #line 3191 "ircd_parser.y"
6020 > #line 2776 "conf_parser.y" /* yacc.c:1646  */
6021      {
6022 <  ConfigFileEntry.ping_cookie = yylval.number;
6022 >  ConfigGeneral.disable_auth = yylval.number;
6023   }
6024 + #line 6025 "conf_parser.c" /* yacc.c:1646  */
6025      break;
6026  
6027    case 558:
6028 <
7237 < /* Line 1806 of yacc.c  */
7238 < #line 3196 "ircd_parser.y"
6028 > #line 2781 "conf_parser.y" /* yacc.c:1646  */
6029      {
6030 <  ConfigFileEntry.disable_auth = yylval.number;
6030 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
6031   }
6032 + #line 6033 "conf_parser.c" /* yacc.c:1646  */
6033      break;
6034  
6035    case 559:
6036 <
7246 < /* Line 1806 of yacc.c  */
7247 < #line 3201 "ircd_parser.y"
6036 > #line 2786 "conf_parser.y" /* yacc.c:1646  */
6037      {
6038 <  ConfigFileEntry.throttle_time = yylval.number;
6038 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6039   }
6040 + #line 6041 "conf_parser.c" /* yacc.c:1646  */
6041      break;
6042  
6043    case 560:
6044 <
7255 < /* Line 1806 of yacc.c  */
7256 < #line 3206 "ircd_parser.y"
6044 > #line 2791 "conf_parser.y" /* yacc.c:1646  */
6045      {
6046 <  ConfigFileEntry.oper_umodes = 0;
6046 >  ConfigGeneral.oper_umodes = 0;
6047   }
6048 + #line 6049 "conf_parser.c" /* yacc.c:1646  */
6049      break;
6050  
6051    case 564:
6052 <
7264 < /* Line 1806 of yacc.c  */
7265 < #line 3212 "ircd_parser.y"
6052 > #line 2797 "conf_parser.y" /* yacc.c:1646  */
6053      {
6054 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
6054 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6055   }
6056 + #line 6057 "conf_parser.c" /* yacc.c:1646  */
6057      break;
6058  
6059    case 565:
6060 <
7273 < /* Line 1806 of yacc.c  */
7274 < #line 3215 "ircd_parser.y"
6060 > #line 2800 "conf_parser.y" /* yacc.c:1646  */
6061      {
6062 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6062 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6063   }
6064 + #line 6065 "conf_parser.c" /* yacc.c:1646  */
6065      break;
6066  
6067    case 566:
6068 <
7282 < /* Line 1806 of yacc.c  */
7283 < #line 3218 "ircd_parser.y"
6068 > #line 2803 "conf_parser.y" /* yacc.c:1646  */
6069      {
6070 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
6070 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6071   }
6072 + #line 6073 "conf_parser.c" /* yacc.c:1646  */
6073      break;
6074  
6075    case 567:
6076 <
7291 < /* Line 1806 of yacc.c  */
7292 < #line 3221 "ircd_parser.y"
6076 > #line 2806 "conf_parser.y" /* yacc.c:1646  */
6077      {
6078 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6078 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6079   }
6080 + #line 6081 "conf_parser.c" /* yacc.c:1646  */
6081      break;
6082  
6083    case 568:
6084 <
7300 < /* Line 1806 of yacc.c  */
7301 < #line 3224 "ircd_parser.y"
6084 > #line 2809 "conf_parser.y" /* yacc.c:1646  */
6085      {
6086 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6086 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6087   }
6088 + #line 6089 "conf_parser.c" /* yacc.c:1646  */
6089      break;
6090  
6091    case 569:
6092 <
7309 < /* Line 1806 of yacc.c  */
7310 < #line 3227 "ircd_parser.y"
6092 > #line 2812 "conf_parser.y" /* yacc.c:1646  */
6093      {
6094 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6094 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6095   }
6096 + #line 6097 "conf_parser.c" /* yacc.c:1646  */
6097      break;
6098  
6099    case 570:
6100 <
7318 < /* Line 1806 of yacc.c  */
7319 < #line 3230 "ircd_parser.y"
6100 > #line 2815 "conf_parser.y" /* yacc.c:1646  */
6101      {
6102 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6102 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6103   }
6104 + #line 6105 "conf_parser.c" /* yacc.c:1646  */
6105      break;
6106  
6107    case 571:
6108 <
7327 < /* Line 1806 of yacc.c  */
7328 < #line 3233 "ircd_parser.y"
6108 > #line 2818 "conf_parser.y" /* yacc.c:1646  */
6109      {
6110 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6110 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6111   }
6112 + #line 6113 "conf_parser.c" /* yacc.c:1646  */
6113      break;
6114  
6115    case 572:
6116 <
7336 < /* Line 1806 of yacc.c  */
7337 < #line 3236 "ircd_parser.y"
6116 > #line 2821 "conf_parser.y" /* yacc.c:1646  */
6117      {
6118 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6118 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6119   }
6120 + #line 6121 "conf_parser.c" /* yacc.c:1646  */
6121      break;
6122  
6123    case 573:
6124 <
7345 < /* Line 1806 of yacc.c  */
7346 < #line 3239 "ircd_parser.y"
6124 > #line 2824 "conf_parser.y" /* yacc.c:1646  */
6125      {
6126 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6126 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6127   }
6128 + #line 6129 "conf_parser.c" /* yacc.c:1646  */
6129      break;
6130  
6131    case 574:
6132 <
7354 < /* Line 1806 of yacc.c  */
7355 < #line 3242 "ircd_parser.y"
6132 > #line 2827 "conf_parser.y" /* yacc.c:1646  */
6133      {
6134 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6134 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6135   }
6136 + #line 6137 "conf_parser.c" /* yacc.c:1646  */
6137      break;
6138  
6139    case 575:
6140 <
7363 < /* Line 1806 of yacc.c  */
7364 < #line 3245 "ircd_parser.y"
6140 > #line 2830 "conf_parser.y" /* yacc.c:1646  */
6141      {
6142 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6142 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6143   }
6144 + #line 6145 "conf_parser.c" /* yacc.c:1646  */
6145      break;
6146  
6147    case 576:
6148 <
7372 < /* Line 1806 of yacc.c  */
7373 < #line 3248 "ircd_parser.y"
6148 > #line 2833 "conf_parser.y" /* yacc.c:1646  */
6149      {
6150 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6150 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6151   }
6152 + #line 6153 "conf_parser.c" /* yacc.c:1646  */
6153      break;
6154  
6155    case 577:
6156 <
7381 < /* Line 1806 of yacc.c  */
7382 < #line 3251 "ircd_parser.y"
6156 > #line 2836 "conf_parser.y" /* yacc.c:1646  */
6157      {
6158 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6158 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6159   }
6160 + #line 6161 "conf_parser.c" /* yacc.c:1646  */
6161      break;
6162  
6163    case 578:
6164 <
7390 < /* Line 1806 of yacc.c  */
7391 < #line 3254 "ircd_parser.y"
6164 > #line 2839 "conf_parser.y" /* yacc.c:1646  */
6165      {
6166 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6166 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6167   }
6168 + #line 6169 "conf_parser.c" /* yacc.c:1646  */
6169      break;
6170  
6171    case 579:
6172 <
7399 < /* Line 1806 of yacc.c  */
7400 < #line 3257 "ircd_parser.y"
6172 > #line 2842 "conf_parser.y" /* yacc.c:1646  */
6173      {
6174 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6174 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6175   }
6176 + #line 6177 "conf_parser.c" /* yacc.c:1646  */
6177      break;
6178  
6179    case 580:
6180 <
7408 < /* Line 1806 of yacc.c  */
7409 < #line 3260 "ircd_parser.y"
6180 > #line 2845 "conf_parser.y" /* yacc.c:1646  */
6181      {
6182 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6182 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6183   }
6184 + #line 6185 "conf_parser.c" /* yacc.c:1646  */
6185      break;
6186  
6187    case 581:
6188 <
7417 < /* Line 1806 of yacc.c  */
7418 < #line 3263 "ircd_parser.y"
6188 > #line 2848 "conf_parser.y" /* yacc.c:1646  */
6189      {
6190 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6190 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6191   }
6192 + #line 6193 "conf_parser.c" /* yacc.c:1646  */
6193      break;
6194  
6195    case 582:
6196 <
7426 < /* Line 1806 of yacc.c  */
7427 < #line 3266 "ircd_parser.y"
6196 > #line 2851 "conf_parser.y" /* yacc.c:1646  */
6197      {
6198 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6198 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6199   }
6200 + #line 6201 "conf_parser.c" /* yacc.c:1646  */
6201      break;
6202  
6203    case 583:
6204 <
7435 < /* Line 1806 of yacc.c  */
7436 < #line 3271 "ircd_parser.y"
6204 > #line 2854 "conf_parser.y" /* yacc.c:1646  */
6205      {
6206 <  ConfigFileEntry.oper_only_umodes = 0;
6206 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6207   }
6208 + #line 6209 "conf_parser.c" /* yacc.c:1646  */
6209      break;
6210  
6211 <  case 587:
6212 <
7444 < /* Line 1806 of yacc.c  */
7445 < #line 3277 "ircd_parser.y"
6211 >  case 584:
6212 > #line 2857 "conf_parser.y" /* yacc.c:1646  */
6213      {
6214 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6214 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6215   }
6216 + #line 6217 "conf_parser.c" /* yacc.c:1646  */
6217      break;
6218  
6219 <  case 588:
6220 <
7453 < /* Line 1806 of yacc.c  */
7454 < #line 3280 "ircd_parser.y"
6219 >  case 585:
6220 > #line 2860 "conf_parser.y" /* yacc.c:1646  */
6221      {
6222 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6222 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6223   }
6224 + #line 6225 "conf_parser.c" /* yacc.c:1646  */
6225      break;
6226  
6227 <  case 589:
6228 <
7462 < /* Line 1806 of yacc.c  */
7463 < #line 3283 "ircd_parser.y"
6227 >  case 586:
6228 > #line 2865 "conf_parser.y" /* yacc.c:1646  */
6229      {
6230 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6230 >  ConfigGeneral.oper_only_umodes = 0;
6231   }
6232 + #line 6233 "conf_parser.c" /* yacc.c:1646  */
6233      break;
6234  
6235    case 590:
6236 <
7471 < /* Line 1806 of yacc.c  */
7472 < #line 3286 "ircd_parser.y"
6236 > #line 2871 "conf_parser.y" /* yacc.c:1646  */
6237      {
6238 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6238 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6239   }
6240 + #line 6241 "conf_parser.c" /* yacc.c:1646  */
6241      break;
6242  
6243    case 591:
6244 <
7480 < /* Line 1806 of yacc.c  */
7481 < #line 3289 "ircd_parser.y"
6244 > #line 2874 "conf_parser.y" /* yacc.c:1646  */
6245      {
6246 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6246 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6247   }
6248 + #line 6249 "conf_parser.c" /* yacc.c:1646  */
6249      break;
6250  
6251    case 592:
6252 <
6253 < /* Line 1806 of yacc.c  */
6254 < #line 3292 "ircd_parser.y"
7491 <    {
7492 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
6252 > #line 2877 "conf_parser.y" /* yacc.c:1646  */
6253 >    {
6254 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6255   }
6256 + #line 6257 "conf_parser.c" /* yacc.c:1646  */
6257      break;
6258  
6259    case 593:
6260 <
7498 < /* Line 1806 of yacc.c  */
7499 < #line 3295 "ircd_parser.y"
6260 > #line 2880 "conf_parser.y" /* yacc.c:1646  */
6261      {
6262 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6262 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6263   }
6264 + #line 6265 "conf_parser.c" /* yacc.c:1646  */
6265      break;
6266  
6267    case 594:
6268 <
7507 < /* Line 1806 of yacc.c  */
7508 < #line 3298 "ircd_parser.y"
6268 > #line 2883 "conf_parser.y" /* yacc.c:1646  */
6269      {
6270 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6270 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6271   }
6272 + #line 6273 "conf_parser.c" /* yacc.c:1646  */
6273      break;
6274  
6275    case 595:
6276 <
7516 < /* Line 1806 of yacc.c  */
7517 < #line 3301 "ircd_parser.y"
6276 > #line 2886 "conf_parser.y" /* yacc.c:1646  */
6277      {
6278 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6278 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6279   }
6280 + #line 6281 "conf_parser.c" /* yacc.c:1646  */
6281      break;
6282  
6283    case 596:
6284 <
7525 < /* Line 1806 of yacc.c  */
7526 < #line 3304 "ircd_parser.y"
6284 > #line 2889 "conf_parser.y" /* yacc.c:1646  */
6285      {
6286 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6286 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6287   }
6288 + #line 6289 "conf_parser.c" /* yacc.c:1646  */
6289      break;
6290  
6291    case 597:
6292 <
7534 < /* Line 1806 of yacc.c  */
7535 < #line 3307 "ircd_parser.y"
6292 > #line 2892 "conf_parser.y" /* yacc.c:1646  */
6293      {
6294 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6294 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6295   }
6296 + #line 6297 "conf_parser.c" /* yacc.c:1646  */
6297      break;
6298  
6299    case 598:
6300 <
7543 < /* Line 1806 of yacc.c  */
7544 < #line 3310 "ircd_parser.y"
6300 > #line 2895 "conf_parser.y" /* yacc.c:1646  */
6301      {
6302 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6302 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6303   }
6304 + #line 6305 "conf_parser.c" /* yacc.c:1646  */
6305      break;
6306  
6307    case 599:
6308 <
7552 < /* Line 1806 of yacc.c  */
7553 < #line 3313 "ircd_parser.y"
6308 > #line 2898 "conf_parser.y" /* yacc.c:1646  */
6309      {
6310 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6310 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6311   }
6312 + #line 6313 "conf_parser.c" /* yacc.c:1646  */
6313      break;
6314  
6315    case 600:
6316 <
7561 < /* Line 1806 of yacc.c  */
7562 < #line 3316 "ircd_parser.y"
6316 > #line 2901 "conf_parser.y" /* yacc.c:1646  */
6317      {
6318 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6318 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6319   }
6320 + #line 6321 "conf_parser.c" /* yacc.c:1646  */
6321      break;
6322  
6323    case 601:
6324 <
7570 < /* Line 1806 of yacc.c  */
7571 < #line 3319 "ircd_parser.y"
6324 > #line 2904 "conf_parser.y" /* yacc.c:1646  */
6325      {
6326 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6326 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6327   }
6328 + #line 6329 "conf_parser.c" /* yacc.c:1646  */
6329      break;
6330  
6331    case 602:
6332 <
7579 < /* Line 1806 of yacc.c  */
7580 < #line 3322 "ircd_parser.y"
6332 > #line 2907 "conf_parser.y" /* yacc.c:1646  */
6333      {
6334 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6334 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6335   }
6336 + #line 6337 "conf_parser.c" /* yacc.c:1646  */
6337      break;
6338  
6339    case 603:
6340 <
7588 < /* Line 1806 of yacc.c  */
7589 < #line 3325 "ircd_parser.y"
6340 > #line 2910 "conf_parser.y" /* yacc.c:1646  */
6341      {
6342 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6342 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6343   }
6344 + #line 6345 "conf_parser.c" /* yacc.c:1646  */
6345      break;
6346  
6347    case 604:
6348 <
7597 < /* Line 1806 of yacc.c  */
7598 < #line 3328 "ircd_parser.y"
6348 > #line 2913 "conf_parser.y" /* yacc.c:1646  */
6349      {
6350 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6350 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6351   }
6352 + #line 6353 "conf_parser.c" /* yacc.c:1646  */
6353      break;
6354  
6355    case 605:
6356 <
7606 < /* Line 1806 of yacc.c  */
7607 < #line 3331 "ircd_parser.y"
6356 > #line 2916 "conf_parser.y" /* yacc.c:1646  */
6357      {
6358 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6358 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6359   }
6360 + #line 6361 "conf_parser.c" /* yacc.c:1646  */
6361      break;
6362  
6363    case 606:
6364 <
7615 < /* Line 1806 of yacc.c  */
7616 < #line 3336 "ircd_parser.y"
6364 > #line 2919 "conf_parser.y" /* yacc.c:1646  */
6365      {
6366 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6366 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6367   }
6368 + #line 6369 "conf_parser.c" /* yacc.c:1646  */
6369      break;
6370  
6371    case 607:
6372 <
7624 < /* Line 1806 of yacc.c  */
7625 < #line 3341 "ircd_parser.y"
6372 > #line 2922 "conf_parser.y" /* yacc.c:1646  */
6373      {
6374 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
6374 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6375   }
6376 + #line 6377 "conf_parser.c" /* yacc.c:1646  */
6377      break;
6378  
6379    case 608:
6380 <
7633 < /* Line 1806 of yacc.c  */
7634 < #line 3346 "ircd_parser.y"
6380 > #line 2925 "conf_parser.y" /* yacc.c:1646  */
6381      {
6382 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
6382 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6383   }
6384 + #line 6385 "conf_parser.c" /* yacc.c:1646  */
6385      break;
6386  
6387    case 609:
6388 <
7642 < /* Line 1806 of yacc.c  */
7643 < #line 3351 "ircd_parser.y"
6388 > #line 2928 "conf_parser.y" /* yacc.c:1646  */
6389      {
6390 <  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
6390 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6391   }
6392 + #line 6393 "conf_parser.c" /* yacc.c:1646  */
6393      break;
6394  
6395    case 610:
6396 <
7651 < /* Line 1806 of yacc.c  */
7652 < #line 3360 "ircd_parser.y"
6396 > #line 2933 "conf_parser.y" /* yacc.c:1646  */
6397      {
6398 <  if (conf_parser_ctx.pass == 2)
7655 <  {
7656 <    yy_conf = make_conf_item(GDENY_TYPE);
7657 <    yy_aconf = map_to_conf(yy_conf);
7658 <  }
6398 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6399   }
6400 + #line 6401 "conf_parser.c" /* yacc.c:1646  */
6401      break;
6402  
6403    case 611:
6404 <
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"
7687 <    {
7688 <  if (conf_parser_ctx.pass == 2)
7689 <    ConfigFileEntry.glines = yylval.number;
7690 < }
7691 <    break;
7692 <
7693 <  case 622:
7694 <
7695 < /* Line 1806 of yacc.c  */
7696 < #line 3399 "ircd_parser.y"
7697 <    {
7698 <  if (conf_parser_ctx.pass == 2)
7699 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
7700 < }
7701 <    break;
7702 <
7703 <  case 623:
7704 <
7705 < /* Line 1806 of yacc.c  */
7706 < #line 3405 "ircd_parser.y"
7707 <    {
7708 <  if (conf_parser_ctx.pass == 2)
7709 <    ConfigFileEntry.gline_logging = 0;
7710 < }
7711 <    break;
7712 <
7713 <  case 627:
7714 <
7715 < /* Line 1806 of yacc.c  */
7716 < #line 3411 "ircd_parser.y"
7717 <    {
7718 <  if (conf_parser_ctx.pass == 2)
7719 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
7720 < }
7721 <    break;
7722 <
7723 <  case 628:
7724 <
7725 < /* Line 1806 of yacc.c  */
7726 < #line 3415 "ircd_parser.y"
7727 <    {
7728 <  if (conf_parser_ctx.pass == 2)
7729 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
7730 < }
7731 <    break;
7732 <
7733 <  case 629:
7734 <
7735 < /* Line 1806 of yacc.c  */
7736 < #line 3421 "ircd_parser.y"
7737 <    {
7738 <  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)
6404 > #line 2938 "conf_parser.y" /* yacc.c:1646  */
6405      {
6406 <      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 <  }
6406 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6407   }
6408 + #line 6409 "conf_parser.c" /* yacc.c:1646  */
6409      break;
6410  
6411 <  case 630:
6412 <
7773 < /* Line 1806 of yacc.c  */
7774 < #line 3455 "ircd_parser.y"
6411 >  case 612:
6412 > #line 2943 "conf_parser.y" /* yacc.c:1646  */
6413      {
6414 <  if (conf_parser_ctx.pass == 2)  
7777 <  {
7778 <    MyFree(yy_conf->name);
7779 <    DupString(yy_conf->name, yylval.string);
7780 <  }
6414 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6415   }
6416 + #line 6417 "conf_parser.c" /* yacc.c:1646  */
6417      break;
6418  
6419    case 631:
6420 <
7786 < /* Line 1806 of yacc.c  */
7787 < #line 3464 "ircd_parser.y"
7788 <    {
7789 <  if (conf_parser_ctx.pass == 2)
7790 <    yy_aconf->flags = 0;
7791 < }
7792 <    break;
7793 <
7794 <  case 632:
7795 <
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"
6420 > #line 2972 "conf_parser.y" /* yacc.c:1646  */
6421      {
6422    ConfigChannel.disable_fake_channels = yylval.number;
6423   }
6424 + #line 6425 "conf_parser.c" /* yacc.c:1646  */
6425      break;
6426  
6427 <  case 660:
6428 <
7875 < /* Line 1806 of yacc.c  */
7876 < #line 3548 "ircd_parser.y"
7877 <    {
7878 <  ConfigChannel.restrict_channels = yylval.number;
7879 < }
7880 <    break;
7881 <
7882 <  case 661:
7883 <
7884 < /* Line 1806 of yacc.c  */
7885 < #line 3553 "ircd_parser.y"
7886 <    {
7887 <  ConfigChannel.disable_local_channels = yylval.number;
7888 < }
7889 <    break;
7890 <
7891 <  case 662:
7892 <
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"
6427 >  case 632:
6428 > #line 2977 "conf_parser.y" /* yacc.c:1646  */
6429      {
6430 <  ConfigChannel.use_invex = yylval.number;
6430 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6431   }
6432 + #line 6433 "conf_parser.c" /* yacc.c:1646  */
6433      break;
6434  
6435 <  case 664:
6436 <
7911 < /* Line 1806 of yacc.c  */
7912 < #line 3568 "ircd_parser.y"
6435 >  case 633:
6436 > #line 2982 "conf_parser.y" /* yacc.c:1646  */
6437      {
6438 <  ConfigChannel.use_knock = yylval.number;
6438 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6439   }
6440 + #line 6441 "conf_parser.c" /* yacc.c:1646  */
6441      break;
6442  
6443 <  case 665:
6444 <
7920 < /* Line 1806 of yacc.c  */
7921 < #line 3573 "ircd_parser.y"
6443 >  case 634:
6444 > #line 2987 "conf_parser.y" /* yacc.c:1646  */
6445      {
6446 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
6446 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6447   }
6448 + #line 6449 "conf_parser.c" /* yacc.c:1646  */
6449      break;
6450  
6451 <  case 666:
6452 <
7929 < /* Line 1806 of yacc.c  */
7930 < #line 3578 "ircd_parser.y"
6451 >  case 635:
6452 > #line 2992 "conf_parser.y" /* yacc.c:1646  */
6453      {
6454 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
6454 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6455   }
6456 + #line 6457 "conf_parser.c" /* yacc.c:1646  */
6457      break;
6458  
6459 <  case 667:
6460 <
7938 < /* Line 1806 of yacc.c  */
7939 < #line 3583 "ircd_parser.y"
6459 >  case 636:
6460 > #line 2997 "conf_parser.y" /* yacc.c:1646  */
6461      {
6462 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
6462 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6463   }
6464 + #line 6465 "conf_parser.c" /* yacc.c:1646  */
6465      break;
6466  
6467 <  case 668:
6468 <
7947 < /* Line 1806 of yacc.c  */
7948 < #line 3588 "ircd_parser.y"
6467 >  case 637:
6468 > #line 3002 "conf_parser.y" /* yacc.c:1646  */
6469      {
6470 <  ConfigChannel.quiet_on_ban = yylval.number;
6470 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6471   }
6472 + #line 6473 "conf_parser.c" /* yacc.c:1646  */
6473      break;
6474  
6475 <  case 669:
6476 <
7956 < /* Line 1806 of yacc.c  */
7957 < #line 3593 "ircd_parser.y"
6475 >  case 638:
6476 > #line 3007 "conf_parser.y" /* yacc.c:1646  */
6477      {
6478 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
6478 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6479   }
6480 + #line 6481 "conf_parser.c" /* yacc.c:1646  */
6481      break;
6482  
6483 <  case 670:
6484 <
7965 < /* Line 1806 of yacc.c  */
7966 < #line 3598 "ircd_parser.y"
6483 >  case 639:
6484 > #line 3012 "conf_parser.y" /* yacc.c:1646  */
6485      {
6486 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
6486 >  ConfigChannel.default_split_user_count = (yyvsp[-1].number);
6487   }
6488 + #line 6489 "conf_parser.c" /* yacc.c:1646  */
6489      break;
6490  
6491 <  case 671:
6492 <
7974 < /* Line 1806 of yacc.c  */
7975 < #line 3603 "ircd_parser.y"
6491 >  case 640:
6492 > #line 3017 "conf_parser.y" /* yacc.c:1646  */
6493      {
6494 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
6494 >  ConfigChannel.default_split_server_count = (yyvsp[-1].number);
6495   }
6496 + #line 6497 "conf_parser.c" /* yacc.c:1646  */
6497      break;
6498  
6499 <  case 672:
6500 <
7983 < /* Line 1806 of yacc.c  */
7984 < #line 3608 "ircd_parser.y"
6499 >  case 641:
6500 > #line 3022 "conf_parser.y" /* yacc.c:1646  */
6501      {
6502    ConfigChannel.no_create_on_split = yylval.number;
6503   }
6504 + #line 6505 "conf_parser.c" /* yacc.c:1646  */
6505      break;
6506  
6507 <  case 673:
6508 <
7992 < /* Line 1806 of yacc.c  */
7993 < #line 3613 "ircd_parser.y"
6507 >  case 642:
6508 > #line 3027 "conf_parser.y" /* yacc.c:1646  */
6509      {
6510    ConfigChannel.no_join_on_split = yylval.number;
6511   }
6512 + #line 6513 "conf_parser.c" /* yacc.c:1646  */
6513      break;
6514  
6515 <  case 674:
6516 <
8001 < /* Line 1806 of yacc.c  */
8002 < #line 3618 "ircd_parser.y"
6515 >  case 643:
6516 > #line 3032 "conf_parser.y" /* yacc.c:1646  */
6517      {
6518 <  ConfigChannel.burst_topicwho = yylval.number;
6518 >  ConfigChannel.default_join_flood_count = yylval.number;
6519   }
6520 + #line 6521 "conf_parser.c" /* yacc.c:1646  */
6521      break;
6522  
6523 <  case 675:
6524 <
8010 < /* Line 1806 of yacc.c  */
8011 < #line 3623 "ircd_parser.y"
6523 >  case 644:
6524 > #line 3037 "conf_parser.y" /* yacc.c:1646  */
6525      {
6526 <  GlobalSetOptions.joinfloodcount = yylval.number;
6526 >  ConfigChannel.default_join_flood_time = (yyvsp[-1].number);
6527   }
6528 + #line 6529 "conf_parser.c" /* yacc.c:1646  */
6529      break;
6530  
6531 <  case 676:
6532 <
8019 < /* Line 1806 of yacc.c  */
8020 < #line 3628 "ircd_parser.y"
6531 >  case 657:
6532 > #line 3059 "conf_parser.y" /* yacc.c:1646  */
6533      {
6534 <  GlobalSetOptions.joinfloodtime = yylval.number;
6534 >  if (conf_parser_ctx.pass == 2)
6535 >    ConfigServerHide.flatten_links = yylval.number;
6536   }
6537 + #line 6538 "conf_parser.c" /* yacc.c:1646  */
6538      break;
6539  
6540 <  case 688:
6541 <
8028 < /* Line 1806 of yacc.c  */
8029 < #line 3647 "ircd_parser.y"
6540 >  case 658:
6541 > #line 3065 "conf_parser.y" /* yacc.c:1646  */
6542      {
6543    if (conf_parser_ctx.pass == 2)
6544 <    ConfigServerHide.flatten_links = yylval.number;
6544 >    ConfigServerHide.disable_remote_commands = yylval.number;
6545   }
6546 + #line 6547 "conf_parser.c" /* yacc.c:1646  */
6547      break;
6548  
6549 <  case 689:
6550 <
8038 < /* Line 1806 of yacc.c  */
8039 < #line 3653 "ircd_parser.y"
6549 >  case 659:
6550 > #line 3071 "conf_parser.y" /* yacc.c:1646  */
6551      {
6552    if (conf_parser_ctx.pass == 2)
6553      ConfigServerHide.hide_servers = yylval.number;
6554   }
6555 + #line 6556 "conf_parser.c" /* yacc.c:1646  */
6556      break;
6557  
6558 <  case 690:
6558 >  case 660:
6559 > #line 3077 "conf_parser.y" /* yacc.c:1646  */
6560 >    {
6561 >  if (conf_parser_ctx.pass == 2)
6562 >    ConfigServerHide.hide_services = yylval.number;
6563 > }
6564 > #line 6565 "conf_parser.c" /* yacc.c:1646  */
6565 >    break;
6566  
6567 < /* Line 1806 of yacc.c  */
6568 < #line 3659 "ircd_parser.y"
6567 >  case 661:
6568 > #line 3083 "conf_parser.y" /* yacc.c:1646  */
6569      {
6570    if (conf_parser_ctx.pass == 2)
6571    {
6572      MyFree(ConfigServerHide.hidden_name);
6573 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6573 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6574    }
6575   }
6576 + #line 6577 "conf_parser.c" /* yacc.c:1646  */
6577      break;
6578  
6579 <  case 691:
6580 <
8061 < /* Line 1806 of yacc.c  */
8062 < #line 3668 "ircd_parser.y"
6579 >  case 662:
6580 > #line 3092 "conf_parser.y" /* yacc.c:1646  */
6581      {
6582    if (conf_parser_ctx.pass == 2)
6583    {
6584 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6584 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6585      {
6586 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6586 >      event_write_links_file.when = (yyvsp[-1].number);
6587 >      event_addish(&event_write_links_file, NULL);
6588        ConfigServerHide.links_disabled = 0;
6589      }
6590  
6591 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6591 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6592    }
6593   }
6594 + #line 6595 "conf_parser.c" /* yacc.c:1646  */
6595      break;
6596  
6597 <  case 692:
6598 <
8079 < /* Line 1806 of yacc.c  */
8080 < #line 3682 "ircd_parser.y"
6597 >  case 663:
6598 > #line 3107 "conf_parser.y" /* yacc.c:1646  */
6599      {
6600    if (conf_parser_ctx.pass == 2)
6601      ConfigServerHide.hidden = yylval.number;
6602   }
6603 + #line 6604 "conf_parser.c" /* yacc.c:1646  */
6604      break;
6605  
6606 <  case 693:
6607 <
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"
6606 >  case 664:
6607 > #line 3113 "conf_parser.y" /* yacc.c:1646  */
6608      {
6609    if (conf_parser_ctx.pass == 2)
6610      ConfigServerHide.hide_server_ips = yylval.number;
6611   }
6612 + #line 6613 "conf_parser.c" /* yacc.c:1646  */
6613      break;
6614  
6615  
6616 <
8109 < /* Line 1806 of yacc.c  */
8110 < #line 8111 "ircd_parser.c"
6616 > #line 6617 "conf_parser.c" /* yacc.c:1646  */
6617        default: break;
6618      }
6619    /* User semantic actions sometimes alter yychar, and that requires
# Line 8129 | Line 6635 | yyreduce:
6635  
6636    *++yyvsp = yyval;
6637  
6638 <  /* Now `shift' the result of the reduction.  Determine what state
6638 >  /* Now 'shift' the result of the reduction.  Determine what state
6639       that goes to, based on the state we popped back to and the rule
6640       number reduced by.  */
6641  
# Line 8144 | Line 6650 | yyreduce:
6650    goto yynewstate;
6651  
6652  
6653 < /*------------------------------------.
6654 < | yyerrlab -- here on detecting error |
6655 < `------------------------------------*/
6653 > /*--------------------------------------.
6654 > | yyerrlab -- here on detecting error.  |
6655 > `--------------------------------------*/
6656   yyerrlab:
6657    /* Make sure we have latest lookahead translation.  See comments at
6658       user semantic actions for why this is necessary.  */
# Line 8197 | Line 6703 | yyerrlab:
6703    if (yyerrstatus == 3)
6704      {
6705        /* If just tried and failed to reuse lookahead token after an
6706 <         error, discard it.  */
6706 >         error, discard it.  */
6707  
6708        if (yychar <= YYEOF)
6709 <        {
6710 <          /* Return failure if at end of input.  */
6711 <          if (yychar == YYEOF)
6712 <            YYABORT;
6713 <        }
6709 >        {
6710 >          /* Return failure if at end of input.  */
6711 >          if (yychar == YYEOF)
6712 >            YYABORT;
6713 >        }
6714        else
6715 <        {
6716 <          yydestruct ("Error: discarding",
6717 <                      yytoken, &yylval);
6718 <          yychar = YYEMPTY;
6719 <        }
6715 >        {
6716 >          yydestruct ("Error: discarding",
6717 >                      yytoken, &yylval);
6718 >          yychar = YYEMPTY;
6719 >        }
6720      }
6721  
6722    /* Else will try to reuse lookahead token after shifting the error
# Line 8229 | Line 6735 | yyerrorlab:
6735    if (/*CONSTCOND*/ 0)
6736       goto yyerrorlab;
6737  
6738 <  /* Do not reclaim the symbols of the rule which action triggered
6738 >  /* Do not reclaim the symbols of the rule whose action triggered
6739       this YYERROR.  */
6740    YYPOPSTACK (yylen);
6741    yylen = 0;
# Line 8242 | Line 6748 | yyerrorlab:
6748   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6749   `-------------------------------------------------------------*/
6750   yyerrlab1:
6751 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6751 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6752  
6753    for (;;)
6754      {
6755        yyn = yypact[yystate];
6756        if (!yypact_value_is_default (yyn))
6757 <        {
6758 <          yyn += YYTERROR;
6759 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6760 <            {
6761 <              yyn = yytable[yyn];
6762 <              if (0 < yyn)
6763 <                break;
6764 <            }
6765 <        }
6757 >        {
6758 >          yyn += YYTERROR;
6759 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6760 >            {
6761 >              yyn = yytable[yyn];
6762 >              if (0 < yyn)
6763 >                break;
6764 >            }
6765 >        }
6766  
6767        /* Pop the current state because it cannot handle the error token.  */
6768        if (yyssp == yyss)
6769 <        YYABORT;
6769 >        YYABORT;
6770  
6771  
6772        yydestruct ("Error: popping",
6773 <                  yystos[yystate], yyvsp);
6773 >                  yystos[yystate], yyvsp);
6774        YYPOPSTACK (1);
6775        yystate = *yyssp;
6776        YY_STACK_PRINT (yyss, yyssp);
6777      }
6778  
6779 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6780    *++yyvsp = yylval;
6781 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6782  
6783  
6784    /* Shift the error token.  */
# Line 8294 | Line 6802 | yyabortlab:
6802    yyresult = 1;
6803    goto yyreturn;
6804  
6805 < #if !defined(yyoverflow) || YYERROR_VERBOSE
6805 > #if !defined yyoverflow || YYERROR_VERBOSE
6806   /*-------------------------------------------------.
6807   | yyexhaustedlab -- memory exhaustion comes here.  |
6808   `-------------------------------------------------*/
# Line 8313 | Line 6821 | yyreturn:
6821        yydestruct ("Cleanup: discarding lookahead",
6822                    yytoken, &yylval);
6823      }
6824 <  /* Do not reclaim the symbols of the rule which action triggered
6824 >  /* Do not reclaim the symbols of the rule whose action triggered
6825       this YYABORT or YYACCEPT.  */
6826    YYPOPSTACK (yylen);
6827    YY_STACK_PRINT (yyss, yyssp);
6828    while (yyssp != yyss)
6829      {
6830        yydestruct ("Cleanup: popping",
6831 <                  yystos[*yyssp], yyvsp);
6831 >                  yystos[*yyssp], yyvsp);
6832        YYPOPSTACK (1);
6833      }
6834   #ifndef yyoverflow
# Line 8331 | Line 6839 | yyreturn:
6839    if (yymsg != yymsgbuf)
6840      YYSTACK_FREE (yymsg);
6841   #endif
6842 <  /* Make sure YYID is used.  */
8335 <  return YYID (yyresult);
6842 >  return yyresult;
6843   }
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 6162 by michael, Thu Jun 18 10:56:46 2015 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

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