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-7.3/src/ircd_parser.c (file contents), Revision 1119 by michael, Fri Jan 7 22:01:47 2011 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (file contents), Revision 4967 by michael, Mon Dec 1 14:34:29 2014 UTC

# Line 1 | Line 1
1 < /* A Bison parser, made by GNU Bison 2.4.3.  */
1 > /* A Bison parser, made by GNU Bison 3.0.2.  */
2 >
3 > /* Bison implementation for Yacc-like parsers in C
4 >
5 >   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
6  
3 /* Skeleton implementation for Bison's Yacc-like parsers in C
4  
5      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
6   2009, 2010 Free Software Foundation, Inc.
7  
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 27 | 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 45 | Line 44
44   #define YYBISON 1
45  
46   /* Bison version.  */
47 < #define YYBISON_VERSION "2.4.3"
47 > #define YYBISON_VERSION "3.0.2"
48  
49   /* Skeleton name.  */
50   #define YYSKELETON_NAME "yacc.c"
# Line 59 | Line 58
58   /* Pull parsers.  */
59   #define YYPULL 1
60  
62 /* Using locations.  */
63 #define YYLSP_NEEDED 0
61  
62  
63  
64   /* Copy the first part of user declarations.  */
65 <
69 < /* Line 189 of yacc.c  */
70 < #line 25 "ircd_parser.y"
65 > #line 28 "conf_parser.y" /* yacc.c:339  */
66  
67  
68   #define YY_NO_UNPUT
# Line 78 | Line 73
73   #include "stdinc.h"
74   #include "ircd.h"
75   #include "list.h"
76 < #include "s_conf.h"
76 > #include "conf.h"
77 > #include "conf_class.h"
78 > #include "conf_pseudo.h"
79   #include "event.h"
80 < #include "s_log.h"
80 > #include "log.h"
81   #include "client.h"     /* for UMODE_ALL only */
82   #include "irc_string.h"
86 #include "irc_getaddrinfo.h"
87 #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;
105 < static struct ConfItem *yy_conf = NULL;
106 < static struct AccessItem *yy_aconf = NULL;
107 < static struct MatchItem *yy_match_item = NULL;
108 < static struct ClassItem *yy_class = NULL;
109 < static char *yy_class_name = NULL;
110 <
111 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
112 < static dlink_list hub_conf_list  = { NULL, NULL, 0 };
113 < static dlink_list leaf_conf_list = { NULL, NULL, 0 };
114 < static unsigned int listener_flags = 0;
115 < static unsigned int regex_ban = 0;
116 < static char userbuf[IRCD_BUFSIZE];
117 < static char hostbuf[IRCD_BUFSIZE];
118 < static char reasonbuf[REASONLEN + 1];
119 < static char gecos_name[REALLEN * 4];
120 <
121 < static char *resv_reason = NULL;
122 < static char *listener_address = NULL;
123 < static int not_atom = 0;
101 > #include "rsa.h"
102  
103 < struct CollectItem
126 < {
127 <  dlink_node node;
128 <  char *name;
129 <  char *user;
130 <  char *host;
131 <  char *passwd;
132 <  int  port;
133 <  int  flags;
134 < #ifdef HAVE_LIBCRYPTO
135 <  char *rsa_public_key_file;
136 <  RSA *rsa_public_key;
137 < #endif
138 < };
103 > int yylex(void);
104  
105 < static void
141 < 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 >    class,
129 >    target,
130 >    prepend,
131 >    command;
132 >
133 >  struct
134 >  {
135 >    unsigned int value;
136 >  } flags,
137 >    modes,
138 >    size,
139 >    type,
140 >    port,
141 >    aftype,
142 >    ping_freq,
143 >    max_perip,
144 >    con_freq,
145 >    min_idle,
146 >    max_idle,
147 >    max_total,
148 >    max_global,
149 >    max_local,
150 >    max_ident,
151 >    max_sendq,
152 >    max_recvq,
153 >    max_channels,
154 >    cidr_bitlen_ipv4,
155 >    cidr_bitlen_ipv6,
156 >    number_per_cidr;
157 > } block_state;
158  
159   static void
160 < unhook_hub_leaf_confs(void)
160 > reset_block_state(void)
161   {
162 <  dlink_node *ptr;
157 <  dlink_node *next_ptr;
158 <  struct CollectItem *yy_hconf;
159 <  struct CollectItem *yy_lconf;
162 >  dlink_node *node = NULL, *node_next = NULL;
163  
164 <  DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
164 >  DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
165    {
166 <    yy_hconf = ptr->data;
167 <    dlinkDelete(&yy_hconf->node, &hub_conf_list);
168 <    free_collect_item(yy_hconf);
166 >    MyFree(node->data);
167 >    dlinkDelete(node, &block_state.mask.list);
168 >    free_dlink_node(node);
169    }
170  
171 <  DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
171 >  DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
172    {
173 <    yy_lconf = ptr->data;
174 <    dlinkDelete(&yy_lconf->node, &leaf_conf_list);
175 <    free_collect_item(yy_lconf);
173 >    MyFree(node->data);
174 >    dlinkDelete(node, &block_state.leaf.list);
175 >    free_dlink_node(node);
176    }
174 }
177  
178 +  DLINK_FOREACH_SAFE(node, node_next, block_state.hub.list.head)
179 +  {
180 +    MyFree(node->data);
181 +    dlinkDelete(node, &block_state.hub.list);
182 +    free_dlink_node(node);
183 +  }
184  
185 +  memset(&block_state, 0, sizeof(block_state));
186 + }
187  
178 /* Line 189 of yacc.c  */
179 #line 180 "ircd_parser.c"
188  
189 < /* Enabling traces.  */
190 < #ifndef YYDEBUG
191 < # define YYDEBUG 0
192 < #endif
189 > #line 190 "conf_parser.c" /* yacc.c:339  */
190 >
191 > # ifndef YY_NULLPTR
192 > #  if defined __cplusplus && 201103L <= __cplusplus
193 > #   define YY_NULLPTR nullptr
194 > #  else
195 > #   define YY_NULLPTR 0
196 > #  endif
197 > # endif
198  
199   /* Enabling verbose error messages.  */
200   #ifdef YYERROR_VERBOSE
# Line 191 | Line 204 | unhook_hub_leaf_confs(void)
204   # define YYERROR_VERBOSE 0
205   #endif
206  
207 < /* Enabling the token table.  */
208 < #ifndef YYTOKEN_TABLE
209 < # define YYTOKEN_TABLE 0
207 > /* In a future release of Bison, this section will be replaced
208 >   by #include "y.tab.h".  */
209 > #ifndef YY_YY_CONF_PARSER_H_INCLUDED
210 > # define YY_YY_CONF_PARSER_H_INCLUDED
211 > /* Debug traces.  */
212 > #ifndef YYDEBUG
213 > # define YYDEBUG 0
214 > #endif
215 > #if YYDEBUG
216 > extern int yydebug;
217   #endif
218  
219 <
200 < /* Tokens.  */
219 > /* Token type.  */
220   #ifndef YYTOKENTYPE
221   # define YYTOKENTYPE
222 <   /* Put the tokens into the symbol table, so that GDB and other debuggers
223 <      know about them.  */
224 <   enum yytokentype {
225 <     ACCEPT_PASSWORD = 258,
226 <     ACTION = 259,
227 <     ADMIN = 260,
228 <     AFTYPE = 261,
229 <     T_ALLOW = 262,
230 <     ANTI_NICK_FLOOD = 263,
231 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 264,
232 <     AUTOCONN = 265,
233 <     T_BLOCK = 266,
234 <     BURST_AWAY = 267,
235 <     BURST_TOPICWHO = 268,
236 <     BYTES = 269,
237 <     KBYTES = 270,
238 <     MBYTES = 271,
239 <     GBYTES = 272,
240 <     TBYTES = 273,
241 <     CALLER_ID_WAIT = 274,
242 <     CAN_FLOOD = 275,
243 <     CAN_IDLE = 276,
244 <     CHANNEL = 277,
245 <     CIDR_BITLEN_IPV4 = 278,
246 <     CIDR_BITLEN_IPV6 = 279,
247 <     CIPHER_PREFERENCE = 280,
248 <     CLASS = 281,
249 <     COMPRESSED = 282,
250 <     COMPRESSION_LEVEL = 283,
251 <     CONNECT = 284,
252 <     CONNECTFREQ = 285,
253 <     CRYPTLINK = 286,
254 <     DEFAULT_CIPHER_PREFERENCE = 287,
255 <     DEFAULT_FLOODCOUNT = 288,
256 <     DEFAULT_SPLIT_SERVER_COUNT = 289,
257 <     DEFAULT_SPLIT_USER_COUNT = 290,
258 <     DENY = 291,
259 <     DESCRIPTION = 292,
260 <     DIE = 293,
261 <     DISABLE_AUTH = 294,
262 <     DISABLE_FAKE_CHANNELS = 295,
263 <     DISABLE_HIDDEN = 296,
264 <     DISABLE_LOCAL_CHANNELS = 297,
265 <     DISABLE_REMOTE_COMMANDS = 298,
266 <     DOTS_IN_IDENT = 299,
267 <     DURATION = 300,
268 <     EGDPOOL_PATH = 301,
269 <     EMAIL = 302,
270 <     ENABLE = 303,
271 <     ENCRYPTED = 304,
272 <     EXCEED_LIMIT = 305,
273 <     EXEMPT = 306,
274 <     FAILED_OPER_NOTICE = 307,
275 <     IRCD_FLAGS = 308,
276 <     FLATTEN_LINKS = 309,
277 <     FFAILED_OPERLOG = 310,
278 <     FKILLLOG = 311,
279 <     FKLINELOG = 312,
280 <     FGLINELOG = 313,
281 <     FIOERRLOG = 314,
282 <     FOPERLOG = 315,
283 <     FOPERSPYLOG = 316,
284 <     FUSERLOG = 317,
285 <     GECOS = 318,
286 <     GENERAL = 319,
287 <     GLINE = 320,
288 <     GLINES = 321,
289 <     GLINE_EXEMPT = 322,
290 <     GLINE_LOG = 323,
291 <     GLINE_TIME = 324,
292 <     GLINE_MIN_CIDR = 325,
293 <     GLINE_MIN_CIDR6 = 326,
294 <     GLOBAL_KILL = 327,
295 <     IRCD_AUTH = 328,
296 <     NEED_IDENT = 329,
297 <     HAVENT_READ_CONF = 330,
298 <     HIDDEN = 331,
299 <     HIDDEN_ADMIN = 332,
300 <     HIDDEN_NAME = 333,
301 <     HIDDEN_OPER = 334,
302 <     HIDE_SERVER_IPS = 335,
303 <     HIDE_SERVERS = 336,
304 <     HIDE_SPOOF_IPS = 337,
305 <     HOST = 338,
306 <     HUB = 339,
307 <     HUB_MASK = 340,
308 <     IDLETIME = 341,
309 <     IGNORE_BOGUS_TS = 342,
310 <     INVISIBLE_ON_CONNECT = 343,
311 <     IP = 344,
312 <     KILL = 345,
313 <     KILL_CHASE_TIME_LIMIT = 346,
314 <     KLINE = 347,
315 <     KLINE_EXEMPT = 348,
316 <     KLINE_REASON = 349,
317 <     KLINE_WITH_REASON = 350,
318 <     KNOCK_DELAY = 351,
319 <     KNOCK_DELAY_CHANNEL = 352,
320 <     LEAF_MASK = 353,
321 <     LINKS_DELAY = 354,
322 <     LISTEN = 355,
323 <     T_LOG = 356,
324 <     LOGGING = 357,
325 <     LOG_LEVEL = 358,
326 <     MAX_ACCEPT = 359,
327 <     MAX_BANS = 360,
328 <     MAX_CHANS_PER_USER = 361,
329 <     MAX_GLOBAL = 362,
330 <     MAX_IDENT = 363,
331 <     MAX_LOCAL = 364,
332 <     MAX_NICK_CHANGES = 365,
333 <     MAX_NICK_TIME = 366,
334 <     MAX_NUMBER = 367,
335 <     MAX_TARGETS = 368,
336 <     MAX_WATCH = 369,
337 <     MESSAGE_LOCALE = 370,
338 <     MIN_NONWILDCARD = 371,
339 <     MIN_NONWILDCARD_SIMPLE = 372,
340 <     MODULE = 373,
341 <     MODULES = 374,
342 <     NAME = 375,
343 <     NEED_PASSWORD = 376,
344 <     NETWORK_DESC = 377,
345 <     NETWORK_NAME = 378,
346 <     NICK = 379,
347 <     NICK_CHANGES = 380,
348 <     NO_CREATE_ON_SPLIT = 381,
349 <     NO_JOIN_ON_SPLIT = 382,
350 <     NO_OPER_FLOOD = 383,
351 <     NO_TILDE = 384,
352 <     NOT = 385,
353 <     NUMBER = 386,
354 <     NUMBER_PER_IDENT = 387,
355 <     NUMBER_PER_CIDR = 388,
356 <     NUMBER_PER_IP = 389,
357 <     NUMBER_PER_IP_GLOBAL = 390,
358 <     OPERATOR = 391,
359 <     OPERS_BYPASS_CALLERID = 392,
360 <     OPER_LOG = 393,
361 <     OPER_ONLY_UMODES = 394,
362 <     OPER_PASS_RESV = 395,
363 <     OPER_SPY_T = 396,
364 <     OPER_UMODES = 397,
365 <     JOIN_FLOOD_COUNT = 398,
366 <     JOIN_FLOOD_TIME = 399,
367 <     PACE_WAIT = 400,
368 <     PACE_WAIT_SIMPLE = 401,
369 <     PASSWORD = 402,
370 <     PATH = 403,
371 <     PING_COOKIE = 404,
372 <     PING_TIME = 405,
373 <     PING_WARNING = 406,
374 <     PORT = 407,
375 <     QSTRING = 408,
376 <     QUIET_ON_BAN = 409,
377 <     REASON = 410,
378 <     REDIRPORT = 411,
379 <     REDIRSERV = 412,
380 <     REGEX_T = 413,
381 <     REHASH = 414,
382 <     TREJECT_HOLD_TIME = 415,
383 <     REMOTE = 416,
384 <     REMOTEBAN = 417,
385 <     RESTRICT_CHANNELS = 418,
386 <     RESTRICTED = 419,
387 <     RSA_PRIVATE_KEY_FILE = 420,
388 <     RSA_PUBLIC_KEY_FILE = 421,
389 <     SSL_CERTIFICATE_FILE = 422,
390 <     T_SSL_CONNECTION_METHOD = 423,
391 <     T_SSLV3 = 424,
392 <     T_TLSV1 = 425,
393 <     RESV = 426,
394 <     RESV_EXEMPT = 427,
395 <     SECONDS = 428,
396 <     MINUTES = 429,
397 <     HOURS = 430,
398 <     DAYS = 431,
399 <     WEEKS = 432,
400 <     SENDQ = 433,
401 <     SEND_PASSWORD = 434,
402 <     SERVERHIDE = 435,
403 <     SERVERINFO = 436,
404 <     SERVLINK_PATH = 437,
405 <     IRCD_SID = 438,
406 <     TKLINE_EXPIRE_NOTICES = 439,
407 <     T_SHARED = 440,
408 <     T_CLUSTER = 441,
409 <     TYPE = 442,
410 <     SHORT_MOTD = 443,
411 <     SILENT = 444,
412 <     SPOOF = 445,
413 <     SPOOF_NOTICE = 446,
414 <     STATS_E_DISABLED = 447,
415 <     STATS_I_OPER_ONLY = 448,
416 <     STATS_K_OPER_ONLY = 449,
417 <     STATS_O_OPER_ONLY = 450,
418 <     STATS_P_OPER_ONLY = 451,
419 <     TBOOL = 452,
420 <     TMASKED = 453,
421 <     T_REJECT = 454,
422 <     TS_MAX_DELTA = 455,
423 <     TS_WARN_DELTA = 456,
424 <     TWODOTS = 457,
425 <     T_ALL = 458,
426 <     T_BOTS = 459,
427 <     T_SOFTCALLERID = 460,
428 <     T_CALLERID = 461,
429 <     T_CCONN = 462,
430 <     T_CCONN_FULL = 463,
431 <     T_CLIENT_FLOOD = 464,
432 <     T_DEAF = 465,
433 <     T_DEBUG = 466,
434 <     T_DRONE = 467,
435 <     T_EXTERNAL = 468,
436 <     T_FULL = 469,
437 <     T_INVISIBLE = 470,
438 <     T_IPV4 = 471,
439 <     T_IPV6 = 472,
440 <     T_LOCOPS = 473,
441 <     T_LOGPATH = 474,
442 <     T_L_CRIT = 475,
443 <     T_L_DEBUG = 476,
444 <     T_L_ERROR = 477,
445 <     T_L_INFO = 478,
446 <     T_L_NOTICE = 479,
447 <     T_L_TRACE = 480,
448 <     T_L_WARN = 481,
449 <     T_MAX_CLIENTS = 482,
450 <     T_NCHANGE = 483,
451 <     T_OPERWALL = 484,
452 <     T_REJ = 485,
453 <     T_SERVER = 486,
454 <     T_SERVNOTICE = 487,
455 <     T_SKILL = 488,
437 <     T_SPY = 489,
438 <     T_SSL = 490,
439 <     T_UMODES = 491,
440 <     T_UNAUTH = 492,
441 <     T_UNRESV = 493,
442 <     T_UNXLINE = 494,
443 <     T_WALLOP = 495,
444 <     THROTTLE_TIME = 496,
445 <     TOPICBURST = 497,
446 <     TRUE_NO_OPER_FLOOD = 498,
447 <     TKLINE = 499,
448 <     TXLINE = 500,
449 <     TRESV = 501,
450 <     UNKLINE = 502,
451 <     USER = 503,
452 <     USE_EGD = 504,
453 <     USE_EXCEPT = 505,
454 <     USE_INVEX = 506,
455 <     USE_KNOCK = 507,
456 <     USE_LOGGING = 508,
457 <     USE_WHOIS_ACTUALLY = 509,
458 <     VHOST = 510,
459 <     VHOST6 = 511,
460 <     XLINE = 512,
461 <     WARN = 513,
462 <     WARN_NO_NLINE = 514
463 <   };
222 >  enum yytokentype
223 >  {
224 >    ACCEPT_PASSWORD = 258,
225 >    ADMIN = 259,
226 >    AFTYPE = 260,
227 >    ANTI_NICK_FLOOD = 261,
228 >    ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
229 >    AUTOCONN = 263,
230 >    AWAY_COUNT = 264,
231 >    AWAY_TIME = 265,
232 >    BYTES = 266,
233 >    KBYTES = 267,
234 >    MBYTES = 268,
235 >    CALLER_ID_WAIT = 269,
236 >    CAN_FLOOD = 270,
237 >    CHANNEL = 271,
238 >    CIDR_BITLEN_IPV4 = 272,
239 >    CIDR_BITLEN_IPV6 = 273,
240 >    CLASS = 274,
241 >    CONNECT = 275,
242 >    CONNECTFREQ = 276,
243 >    CYCLE_ON_HOST_CHANGE = 277,
244 >    DEFAULT_FLOODCOUNT = 278,
245 >    DEFAULT_SPLIT_SERVER_COUNT = 279,
246 >    DEFAULT_SPLIT_USER_COUNT = 280,
247 >    DENY = 281,
248 >    DESCRIPTION = 282,
249 >    DIE = 283,
250 >    DISABLE_AUTH = 284,
251 >    DISABLE_FAKE_CHANNELS = 285,
252 >    DISABLE_REMOTE_COMMANDS = 286,
253 >    DOTS_IN_IDENT = 287,
254 >    EGDPOOL_PATH = 288,
255 >    EMAIL = 289,
256 >    ENCRYPTED = 290,
257 >    EXCEED_LIMIT = 291,
258 >    EXEMPT = 292,
259 >    FAILED_OPER_NOTICE = 293,
260 >    FLATTEN_LINKS = 294,
261 >    GECOS = 295,
262 >    GENERAL = 296,
263 >    GLINE = 297,
264 >    GLINE_DURATION = 298,
265 >    GLINE_ENABLE = 299,
266 >    GLINE_EXEMPT = 300,
267 >    GLINE_MIN_CIDR = 301,
268 >    GLINE_MIN_CIDR6 = 302,
269 >    GLINE_REQUEST_DURATION = 303,
270 >    GLOBAL_KILL = 304,
271 >    HAVENT_READ_CONF = 305,
272 >    HIDDEN = 306,
273 >    HIDDEN_NAME = 307,
274 >    HIDE_CHANS = 308,
275 >    HIDE_IDLE = 309,
276 >    HIDE_IDLE_FROM_OPERS = 310,
277 >    HIDE_SERVER_IPS = 311,
278 >    HIDE_SERVERS = 312,
279 >    HIDE_SERVICES = 313,
280 >    HIDE_SPOOF_IPS = 314,
281 >    HOST = 315,
282 >    HUB = 316,
283 >    HUB_MASK = 317,
284 >    IGNORE_BOGUS_TS = 318,
285 >    INVISIBLE_ON_CONNECT = 319,
286 >    INVITE_CLIENT_COUNT = 320,
287 >    INVITE_CLIENT_TIME = 321,
288 >    IP = 322,
289 >    IRCD_AUTH = 323,
290 >    IRCD_FLAGS = 324,
291 >    IRCD_SID = 325,
292 >    JOIN_FLOOD_COUNT = 326,
293 >    JOIN_FLOOD_TIME = 327,
294 >    KILL = 328,
295 >    KILL_CHASE_TIME_LIMIT = 329,
296 >    KLINE = 330,
297 >    KLINE_EXEMPT = 331,
298 >    KNOCK_CLIENT_COUNT = 332,
299 >    KNOCK_CLIENT_TIME = 333,
300 >    KNOCK_DELAY_CHANNEL = 334,
301 >    LEAF_MASK = 335,
302 >    LINKS_DELAY = 336,
303 >    LISTEN = 337,
304 >    MASK = 338,
305 >    MAX_ACCEPT = 339,
306 >    MAX_BANS = 340,
307 >    MAX_CHANNELS = 341,
308 >    MAX_GLOBAL = 342,
309 >    MAX_IDENT = 343,
310 >    MAX_IDLE = 344,
311 >    MAX_LOCAL = 345,
312 >    MAX_NICK_CHANGES = 346,
313 >    MAX_NICK_LENGTH = 347,
314 >    MAX_NICK_TIME = 348,
315 >    MAX_NUMBER = 349,
316 >    MAX_TARGETS = 350,
317 >    MAX_TOPIC_LENGTH = 351,
318 >    MAX_WATCH = 352,
319 >    MIN_IDLE = 353,
320 >    MIN_NONWILDCARD = 354,
321 >    MIN_NONWILDCARD_SIMPLE = 355,
322 >    MODULE = 356,
323 >    MODULES = 357,
324 >    MOTD = 358,
325 >    NAME = 359,
326 >    NEED_IDENT = 360,
327 >    NEED_PASSWORD = 361,
328 >    NETWORK_DESC = 362,
329 >    NETWORK_NAME = 363,
330 >    NICK = 364,
331 >    NO_CREATE_ON_SPLIT = 365,
332 >    NO_JOIN_ON_SPLIT = 366,
333 >    NO_OPER_FLOOD = 367,
334 >    NO_TILDE = 368,
335 >    NUMBER = 369,
336 >    NUMBER_PER_CIDR = 370,
337 >    NUMBER_PER_IP = 371,
338 >    OPER_ONLY_UMODES = 372,
339 >    OPER_PASS_RESV = 373,
340 >    OPER_UMODES = 374,
341 >    OPERATOR = 375,
342 >    OPERS_BYPASS_CALLERID = 376,
343 >    PACE_WAIT = 377,
344 >    PACE_WAIT_SIMPLE = 378,
345 >    PASSWORD = 379,
346 >    PATH = 380,
347 >    PING_COOKIE = 381,
348 >    PING_TIME = 382,
349 >    PORT = 383,
350 >    QSTRING = 384,
351 >    RANDOM_IDLE = 385,
352 >    REASON = 386,
353 >    REDIRPORT = 387,
354 >    REDIRSERV = 388,
355 >    REHASH = 389,
356 >    REMOTE = 390,
357 >    REMOTEBAN = 391,
358 >    RESV = 392,
359 >    RESV_EXEMPT = 393,
360 >    RSA_PRIVATE_KEY_FILE = 394,
361 >    RSA_PUBLIC_KEY_FILE = 395,
362 >    SECONDS = 396,
363 >    MINUTES = 397,
364 >    HOURS = 398,
365 >    DAYS = 399,
366 >    WEEKS = 400,
367 >    MONTHS = 401,
368 >    YEARS = 402,
369 >    SEND_PASSWORD = 403,
370 >    SENDQ = 404,
371 >    SERVERHIDE = 405,
372 >    SERVERINFO = 406,
373 >    SHORT_MOTD = 407,
374 >    SPOOF = 408,
375 >    SPOOF_NOTICE = 409,
376 >    SQUIT = 410,
377 >    SSL_CERTIFICATE_FILE = 411,
378 >    SSL_CERTIFICATE_FINGERPRINT = 412,
379 >    SSL_CONNECTION_REQUIRED = 413,
380 >    SSL_DH_ELLIPTIC_CURVE = 414,
381 >    SSL_DH_PARAM_FILE = 415,
382 >    SSL_MESSAGE_DIGEST_ALGORITHM = 416,
383 >    STATS_E_DISABLED = 417,
384 >    STATS_I_OPER_ONLY = 418,
385 >    STATS_K_OPER_ONLY = 419,
386 >    STATS_O_OPER_ONLY = 420,
387 >    STATS_P_OPER_ONLY = 421,
388 >    STATS_U_OPER_ONLY = 422,
389 >    T_ALL = 423,
390 >    T_BOTS = 424,
391 >    T_CALLERID = 425,
392 >    T_CCONN = 426,
393 >    T_COMMAND = 427,
394 >    T_CLUSTER = 428,
395 >    T_DEAF = 429,
396 >    T_DEBUG = 430,
397 >    T_DLINE = 431,
398 >    T_EXTERNAL = 432,
399 >    T_FARCONNECT = 433,
400 >    T_FILE = 434,
401 >    T_FULL = 435,
402 >    T_GLOBOPS = 436,
403 >    T_INVISIBLE = 437,
404 >    T_IPV4 = 438,
405 >    T_IPV6 = 439,
406 >    T_LOCOPS = 440,
407 >    T_LOG = 441,
408 >    T_MAX_CLIENTS = 442,
409 >    T_NCHANGE = 443,
410 >    T_NONONREG = 444,
411 >    T_PREPEND = 445,
412 >    T_PSEUDO = 446,
413 >    T_RECVQ = 447,
414 >    T_REJ = 448,
415 >    T_RESTART = 449,
416 >    T_SERVER = 450,
417 >    T_SERVICE = 451,
418 >    T_SERVNOTICE = 452,
419 >    T_SET = 453,
420 >    T_SHARED = 454,
421 >    T_SIZE = 455,
422 >    T_SKILL = 456,
423 >    T_SOFTCALLERID = 457,
424 >    T_SPY = 458,
425 >    T_SSL = 459,
426 >    T_SSL_CIPHER_LIST = 460,
427 >    T_TARGET = 461,
428 >    T_UMODES = 462,
429 >    T_UNAUTH = 463,
430 >    T_UNDLINE = 464,
431 >    T_UNLIMITED = 465,
432 >    T_UNRESV = 466,
433 >    T_UNXLINE = 467,
434 >    T_WALLOP = 468,
435 >    T_WALLOPS = 469,
436 >    T_WEBIRC = 470,
437 >    TBOOL = 471,
438 >    THROTTLE_COUNT = 472,
439 >    THROTTLE_TIME = 473,
440 >    TKLINE_EXPIRE_NOTICES = 474,
441 >    TMASKED = 475,
442 >    TRUE_NO_OPER_FLOOD = 476,
443 >    TS_MAX_DELTA = 477,
444 >    TS_WARN_DELTA = 478,
445 >    TWODOTS = 479,
446 >    TYPE = 480,
447 >    UNKLINE = 481,
448 >    USE_EGD = 482,
449 >    USE_LOGGING = 483,
450 >    USER = 484,
451 >    VHOST = 485,
452 >    VHOST6 = 486,
453 >    WARN_NO_CONNECT_BLOCK = 487,
454 >    XLINE = 488
455 >  };
456   #endif
457   /* Tokens.  */
458   #define ACCEPT_PASSWORD 258
459 < #define ACTION 259
460 < #define ADMIN 260
461 < #define AFTYPE 261
462 < #define T_ALLOW 262
463 < #define ANTI_NICK_FLOOD 263
464 < #define ANTI_SPAM_EXIT_MESSAGE_TIME 264
465 < #define AUTOCONN 265
466 < #define T_BLOCK 266
467 < #define BURST_AWAY 267
468 < #define BURST_TOPICWHO 268
469 < #define BYTES 269
470 < #define KBYTES 270
471 < #define MBYTES 271
472 < #define GBYTES 272
473 < #define TBYTES 273
474 < #define CALLER_ID_WAIT 274
475 < #define CAN_FLOOD 275
476 < #define CAN_IDLE 276
477 < #define CHANNEL 277
478 < #define CIDR_BITLEN_IPV4 278
479 < #define CIDR_BITLEN_IPV6 279
480 < #define CIPHER_PREFERENCE 280
481 < #define CLASS 281
482 < #define COMPRESSED 282
483 < #define COMPRESSION_LEVEL 283
484 < #define CONNECT 284
485 < #define CONNECTFREQ 285
486 < #define CRYPTLINK 286
487 < #define DEFAULT_CIPHER_PREFERENCE 287
488 < #define DEFAULT_FLOODCOUNT 288
489 < #define DEFAULT_SPLIT_SERVER_COUNT 289
490 < #define DEFAULT_SPLIT_USER_COUNT 290
491 < #define DENY 291
492 < #define DESCRIPTION 292
493 < #define DIE 293
494 < #define DISABLE_AUTH 294
495 < #define DISABLE_FAKE_CHANNELS 295
496 < #define DISABLE_HIDDEN 296
497 < #define DISABLE_LOCAL_CHANNELS 297
498 < #define DISABLE_REMOTE_COMMANDS 298
499 < #define DOTS_IN_IDENT 299
500 < #define DURATION 300
501 < #define EGDPOOL_PATH 301
502 < #define EMAIL 302
503 < #define ENABLE 303
504 < #define ENCRYPTED 304
505 < #define EXCEED_LIMIT 305
506 < #define EXEMPT 306
507 < #define FAILED_OPER_NOTICE 307
508 < #define IRCD_FLAGS 308
509 < #define FLATTEN_LINKS 309
510 < #define FFAILED_OPERLOG 310
511 < #define FKILLLOG 311
512 < #define FKLINELOG 312
513 < #define FGLINELOG 313
514 < #define FIOERRLOG 314
515 < #define FOPERLOG 315
516 < #define FOPERSPYLOG 316
517 < #define FUSERLOG 317
518 < #define GECOS 318
519 < #define GENERAL 319
520 < #define GLINE 320
521 < #define GLINES 321
522 < #define GLINE_EXEMPT 322
523 < #define GLINE_LOG 323
524 < #define GLINE_TIME 324
525 < #define GLINE_MIN_CIDR 325
526 < #define GLINE_MIN_CIDR6 326
527 < #define GLOBAL_KILL 327
528 < #define IRCD_AUTH 328
529 < #define NEED_IDENT 329
530 < #define HAVENT_READ_CONF 330
531 < #define HIDDEN 331
532 < #define HIDDEN_ADMIN 332
533 < #define HIDDEN_NAME 333
534 < #define HIDDEN_OPER 334
535 < #define HIDE_SERVER_IPS 335
536 < #define HIDE_SERVERS 336
537 < #define HIDE_SPOOF_IPS 337
538 < #define HOST 338
539 < #define HUB 339
540 < #define HUB_MASK 340
541 < #define IDLETIME 341
542 < #define IGNORE_BOGUS_TS 342
543 < #define INVISIBLE_ON_CONNECT 343
544 < #define IP 344
545 < #define KILL 345
546 < #define KILL_CHASE_TIME_LIMIT 346
547 < #define KLINE 347
548 < #define KLINE_EXEMPT 348
549 < #define KLINE_REASON 349
550 < #define KLINE_WITH_REASON 350
551 < #define KNOCK_DELAY 351
552 < #define KNOCK_DELAY_CHANNEL 352
553 < #define LEAF_MASK 353
554 < #define LINKS_DELAY 354
555 < #define LISTEN 355
556 < #define T_LOG 356
557 < #define LOGGING 357
558 < #define LOG_LEVEL 358
559 < #define MAX_ACCEPT 359
560 < #define MAX_BANS 360
561 < #define MAX_CHANS_PER_USER 361
562 < #define MAX_GLOBAL 362
563 < #define MAX_IDENT 363
564 < #define MAX_LOCAL 364
565 < #define MAX_NICK_CHANGES 365
566 < #define MAX_NICK_TIME 366
567 < #define MAX_NUMBER 367
568 < #define MAX_TARGETS 368
569 < #define MAX_WATCH 369
570 < #define MESSAGE_LOCALE 370
571 < #define MIN_NONWILDCARD 371
572 < #define MIN_NONWILDCARD_SIMPLE 372
573 < #define MODULE 373
574 < #define MODULES 374
575 < #define NAME 375
576 < #define NEED_PASSWORD 376
577 < #define NETWORK_DESC 377
578 < #define NETWORK_NAME 378
579 < #define NICK 379
580 < #define NICK_CHANGES 380
581 < #define NO_CREATE_ON_SPLIT 381
582 < #define NO_JOIN_ON_SPLIT 382
583 < #define NO_OPER_FLOOD 383
584 < #define NO_TILDE 384
585 < #define NOT 385
586 < #define NUMBER 386
587 < #define NUMBER_PER_IDENT 387
588 < #define NUMBER_PER_CIDR 388
589 < #define NUMBER_PER_IP 389
590 < #define NUMBER_PER_IP_GLOBAL 390
591 < #define OPERATOR 391
592 < #define OPERS_BYPASS_CALLERID 392
593 < #define OPER_LOG 393
594 < #define OPER_ONLY_UMODES 394
595 < #define OPER_PASS_RESV 395
596 < #define OPER_SPY_T 396
597 < #define OPER_UMODES 397
598 < #define JOIN_FLOOD_COUNT 398
599 < #define JOIN_FLOOD_TIME 399
600 < #define PACE_WAIT 400
601 < #define PACE_WAIT_SIMPLE 401
602 < #define PASSWORD 402
603 < #define PATH 403
604 < #define PING_COOKIE 404
605 < #define PING_TIME 405
606 < #define PING_WARNING 406
607 < #define PORT 407
608 < #define QSTRING 408
609 < #define QUIET_ON_BAN 409
610 < #define REASON 410
611 < #define REDIRPORT 411
612 < #define REDIRSERV 412
613 < #define REGEX_T 413
614 < #define REHASH 414
615 < #define TREJECT_HOLD_TIME 415
616 < #define REMOTE 416
617 < #define REMOTEBAN 417
618 < #define RESTRICT_CHANNELS 418
619 < #define RESTRICTED 419
620 < #define RSA_PRIVATE_KEY_FILE 420
621 < #define RSA_PUBLIC_KEY_FILE 421
622 < #define SSL_CERTIFICATE_FILE 422
623 < #define T_SSL_CONNECTION_METHOD 423
624 < #define T_SSLV3 424
625 < #define T_TLSV1 425
626 < #define RESV 426
627 < #define RESV_EXEMPT 427
628 < #define SECONDS 428
629 < #define MINUTES 429
630 < #define HOURS 430
631 < #define DAYS 431
632 < #define WEEKS 432
633 < #define SENDQ 433
634 < #define SEND_PASSWORD 434
635 < #define SERVERHIDE 435
636 < #define SERVERINFO 436
637 < #define SERVLINK_PATH 437
638 < #define IRCD_SID 438
639 < #define TKLINE_EXPIRE_NOTICES 439
640 < #define T_SHARED 440
641 < #define T_CLUSTER 441
642 < #define TYPE 442
643 < #define SHORT_MOTD 443
644 < #define SILENT 444
645 < #define SPOOF 445
646 < #define SPOOF_NOTICE 446
647 < #define STATS_E_DISABLED 447
648 < #define STATS_I_OPER_ONLY 448
649 < #define STATS_K_OPER_ONLY 449
650 < #define STATS_O_OPER_ONLY 450
651 < #define STATS_P_OPER_ONLY 451
652 < #define TBOOL 452
653 < #define TMASKED 453
654 < #define T_REJECT 454
655 < #define TS_MAX_DELTA 455
656 < #define TS_WARN_DELTA 456
657 < #define TWODOTS 457
658 < #define T_ALL 458
659 < #define T_BOTS 459
660 < #define T_SOFTCALLERID 460
661 < #define T_CALLERID 461
662 < #define T_CCONN 462
663 < #define T_CCONN_FULL 463
664 < #define T_CLIENT_FLOOD 464
665 < #define T_DEAF 465
666 < #define T_DEBUG 466
667 < #define T_DRONE 467
668 < #define T_EXTERNAL 468
669 < #define T_FULL 469
670 < #define T_INVISIBLE 470
671 < #define T_IPV4 471
672 < #define T_IPV6 472
673 < #define T_LOCOPS 473
674 < #define T_LOGPATH 474
675 < #define T_L_CRIT 475
676 < #define T_L_DEBUG 476
677 < #define T_L_ERROR 477
678 < #define T_L_INFO 478
679 < #define T_L_NOTICE 479
680 < #define T_L_TRACE 480
681 < #define T_L_WARN 481
682 < #define T_MAX_CLIENTS 482
683 < #define T_NCHANGE 483
684 < #define T_OPERWALL 484
685 < #define T_REJ 485
686 < #define T_SERVER 486
687 < #define T_SERVNOTICE 487
688 < #define T_SKILL 488
697 < #define T_SPY 489
698 < #define T_SSL 490
699 < #define T_UMODES 491
700 < #define T_UNAUTH 492
701 < #define T_UNRESV 493
702 < #define T_UNXLINE 494
703 < #define T_WALLOP 495
704 < #define THROTTLE_TIME 496
705 < #define TOPICBURST 497
706 < #define TRUE_NO_OPER_FLOOD 498
707 < #define TKLINE 499
708 < #define TXLINE 500
709 < #define TRESV 501
710 < #define UNKLINE 502
711 < #define USER 503
712 < #define USE_EGD 504
713 < #define USE_EXCEPT 505
714 < #define USE_INVEX 506
715 < #define USE_KNOCK 507
716 < #define USE_LOGGING 508
717 < #define USE_WHOIS_ACTUALLY 509
718 < #define VHOST 510
719 < #define VHOST6 511
720 < #define XLINE 512
721 < #define WARN 513
722 < #define WARN_NO_NLINE 514
723 <
724 <
725 <
459 > #define ADMIN 259
460 > #define AFTYPE 260
461 > #define ANTI_NICK_FLOOD 261
462 > #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
463 > #define AUTOCONN 263
464 > #define AWAY_COUNT 264
465 > #define AWAY_TIME 265
466 > #define BYTES 266
467 > #define KBYTES 267
468 > #define MBYTES 268
469 > #define CALLER_ID_WAIT 269
470 > #define CAN_FLOOD 270
471 > #define CHANNEL 271
472 > #define CIDR_BITLEN_IPV4 272
473 > #define CIDR_BITLEN_IPV6 273
474 > #define CLASS 274
475 > #define CONNECT 275
476 > #define CONNECTFREQ 276
477 > #define CYCLE_ON_HOST_CHANGE 277
478 > #define DEFAULT_FLOODCOUNT 278
479 > #define DEFAULT_SPLIT_SERVER_COUNT 279
480 > #define DEFAULT_SPLIT_USER_COUNT 280
481 > #define DENY 281
482 > #define DESCRIPTION 282
483 > #define DIE 283
484 > #define DISABLE_AUTH 284
485 > #define DISABLE_FAKE_CHANNELS 285
486 > #define DISABLE_REMOTE_COMMANDS 286
487 > #define DOTS_IN_IDENT 287
488 > #define EGDPOOL_PATH 288
489 > #define EMAIL 289
490 > #define ENCRYPTED 290
491 > #define EXCEED_LIMIT 291
492 > #define EXEMPT 292
493 > #define FAILED_OPER_NOTICE 293
494 > #define FLATTEN_LINKS 294
495 > #define GECOS 295
496 > #define GENERAL 296
497 > #define GLINE 297
498 > #define GLINE_DURATION 298
499 > #define GLINE_ENABLE 299
500 > #define GLINE_EXEMPT 300
501 > #define GLINE_MIN_CIDR 301
502 > #define GLINE_MIN_CIDR6 302
503 > #define GLINE_REQUEST_DURATION 303
504 > #define GLOBAL_KILL 304
505 > #define HAVENT_READ_CONF 305
506 > #define HIDDEN 306
507 > #define HIDDEN_NAME 307
508 > #define HIDE_CHANS 308
509 > #define HIDE_IDLE 309
510 > #define HIDE_IDLE_FROM_OPERS 310
511 > #define HIDE_SERVER_IPS 311
512 > #define HIDE_SERVERS 312
513 > #define HIDE_SERVICES 313
514 > #define HIDE_SPOOF_IPS 314
515 > #define HOST 315
516 > #define HUB 316
517 > #define HUB_MASK 317
518 > #define IGNORE_BOGUS_TS 318
519 > #define INVISIBLE_ON_CONNECT 319
520 > #define INVITE_CLIENT_COUNT 320
521 > #define INVITE_CLIENT_TIME 321
522 > #define IP 322
523 > #define IRCD_AUTH 323
524 > #define IRCD_FLAGS 324
525 > #define IRCD_SID 325
526 > #define JOIN_FLOOD_COUNT 326
527 > #define JOIN_FLOOD_TIME 327
528 > #define KILL 328
529 > #define KILL_CHASE_TIME_LIMIT 329
530 > #define KLINE 330
531 > #define KLINE_EXEMPT 331
532 > #define KNOCK_CLIENT_COUNT 332
533 > #define KNOCK_CLIENT_TIME 333
534 > #define KNOCK_DELAY_CHANNEL 334
535 > #define LEAF_MASK 335
536 > #define LINKS_DELAY 336
537 > #define LISTEN 337
538 > #define MASK 338
539 > #define MAX_ACCEPT 339
540 > #define MAX_BANS 340
541 > #define MAX_CHANNELS 341
542 > #define MAX_GLOBAL 342
543 > #define MAX_IDENT 343
544 > #define MAX_IDLE 344
545 > #define MAX_LOCAL 345
546 > #define MAX_NICK_CHANGES 346
547 > #define MAX_NICK_LENGTH 347
548 > #define MAX_NICK_TIME 348
549 > #define MAX_NUMBER 349
550 > #define MAX_TARGETS 350
551 > #define MAX_TOPIC_LENGTH 351
552 > #define MAX_WATCH 352
553 > #define MIN_IDLE 353
554 > #define MIN_NONWILDCARD 354
555 > #define MIN_NONWILDCARD_SIMPLE 355
556 > #define MODULE 356
557 > #define MODULES 357
558 > #define MOTD 358
559 > #define NAME 359
560 > #define NEED_IDENT 360
561 > #define NEED_PASSWORD 361
562 > #define NETWORK_DESC 362
563 > #define NETWORK_NAME 363
564 > #define NICK 364
565 > #define NO_CREATE_ON_SPLIT 365
566 > #define NO_JOIN_ON_SPLIT 366
567 > #define NO_OPER_FLOOD 367
568 > #define NO_TILDE 368
569 > #define NUMBER 369
570 > #define NUMBER_PER_CIDR 370
571 > #define NUMBER_PER_IP 371
572 > #define OPER_ONLY_UMODES 372
573 > #define OPER_PASS_RESV 373
574 > #define OPER_UMODES 374
575 > #define OPERATOR 375
576 > #define OPERS_BYPASS_CALLERID 376
577 > #define PACE_WAIT 377
578 > #define PACE_WAIT_SIMPLE 378
579 > #define PASSWORD 379
580 > #define PATH 380
581 > #define PING_COOKIE 381
582 > #define PING_TIME 382
583 > #define PORT 383
584 > #define QSTRING 384
585 > #define RANDOM_IDLE 385
586 > #define REASON 386
587 > #define REDIRPORT 387
588 > #define REDIRSERV 388
589 > #define REHASH 389
590 > #define REMOTE 390
591 > #define REMOTEBAN 391
592 > #define RESV 392
593 > #define RESV_EXEMPT 393
594 > #define RSA_PRIVATE_KEY_FILE 394
595 > #define RSA_PUBLIC_KEY_FILE 395
596 > #define SECONDS 396
597 > #define MINUTES 397
598 > #define HOURS 398
599 > #define DAYS 399
600 > #define WEEKS 400
601 > #define MONTHS 401
602 > #define YEARS 402
603 > #define SEND_PASSWORD 403
604 > #define SENDQ 404
605 > #define SERVERHIDE 405
606 > #define SERVERINFO 406
607 > #define SHORT_MOTD 407
608 > #define SPOOF 408
609 > #define SPOOF_NOTICE 409
610 > #define SQUIT 410
611 > #define SSL_CERTIFICATE_FILE 411
612 > #define SSL_CERTIFICATE_FINGERPRINT 412
613 > #define SSL_CONNECTION_REQUIRED 413
614 > #define SSL_DH_ELLIPTIC_CURVE 414
615 > #define SSL_DH_PARAM_FILE 415
616 > #define SSL_MESSAGE_DIGEST_ALGORITHM 416
617 > #define STATS_E_DISABLED 417
618 > #define STATS_I_OPER_ONLY 418
619 > #define STATS_K_OPER_ONLY 419
620 > #define STATS_O_OPER_ONLY 420
621 > #define STATS_P_OPER_ONLY 421
622 > #define STATS_U_OPER_ONLY 422
623 > #define T_ALL 423
624 > #define T_BOTS 424
625 > #define T_CALLERID 425
626 > #define T_CCONN 426
627 > #define T_COMMAND 427
628 > #define T_CLUSTER 428
629 > #define T_DEAF 429
630 > #define T_DEBUG 430
631 > #define T_DLINE 431
632 > #define T_EXTERNAL 432
633 > #define T_FARCONNECT 433
634 > #define T_FILE 434
635 > #define T_FULL 435
636 > #define T_GLOBOPS 436
637 > #define T_INVISIBLE 437
638 > #define T_IPV4 438
639 > #define T_IPV6 439
640 > #define T_LOCOPS 440
641 > #define T_LOG 441
642 > #define T_MAX_CLIENTS 442
643 > #define T_NCHANGE 443
644 > #define T_NONONREG 444
645 > #define T_PREPEND 445
646 > #define T_PSEUDO 446
647 > #define T_RECVQ 447
648 > #define T_REJ 448
649 > #define T_RESTART 449
650 > #define T_SERVER 450
651 > #define T_SERVICE 451
652 > #define T_SERVNOTICE 452
653 > #define T_SET 453
654 > #define T_SHARED 454
655 > #define T_SIZE 455
656 > #define T_SKILL 456
657 > #define T_SOFTCALLERID 457
658 > #define T_SPY 458
659 > #define T_SSL 459
660 > #define T_SSL_CIPHER_LIST 460
661 > #define T_TARGET 461
662 > #define T_UMODES 462
663 > #define T_UNAUTH 463
664 > #define T_UNDLINE 464
665 > #define T_UNLIMITED 465
666 > #define T_UNRESV 466
667 > #define T_UNXLINE 467
668 > #define T_WALLOP 468
669 > #define T_WALLOPS 469
670 > #define T_WEBIRC 470
671 > #define TBOOL 471
672 > #define THROTTLE_COUNT 472
673 > #define THROTTLE_TIME 473
674 > #define TKLINE_EXPIRE_NOTICES 474
675 > #define TMASKED 475
676 > #define TRUE_NO_OPER_FLOOD 476
677 > #define TS_MAX_DELTA 477
678 > #define TS_WARN_DELTA 478
679 > #define TWODOTS 479
680 > #define TYPE 480
681 > #define UNKLINE 481
682 > #define USE_EGD 482
683 > #define USE_LOGGING 483
684 > #define USER 484
685 > #define VHOST 485
686 > #define VHOST6 486
687 > #define WARN_NO_CONNECT_BLOCK 487
688 > #define XLINE 488
689  
690 + /* Value type.  */
691   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
692 < typedef union YYSTYPE
692 > typedef union YYSTYPE YYSTYPE;
693 > union YYSTYPE
694   {
695 <
731 < /* Line 214 of yacc.c  */
732 < #line 132 "ircd_parser.y"
695 > #line 152 "conf_parser.y" /* yacc.c:355  */
696  
697    int number;
698    char *string;
699  
700 <
701 <
739 < /* Line 214 of yacc.c  */
740 < #line 741 "ircd_parser.c"
741 < } YYSTYPE;
700 > #line 701 "conf_parser.c" /* yacc.c:355  */
701 > };
702   # define YYSTYPE_IS_TRIVIAL 1
743 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
703   # define YYSTYPE_IS_DECLARED 1
704   #endif
705  
706  
707 < /* Copy the second part of user declarations.  */
707 > extern YYSTYPE yylval;
708  
709 + int yyparse (void);
710 +
711 + #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
712  
713 < /* Line 264 of yacc.c  */
714 < #line 753 "ircd_parser.c"
713 > /* Copy the second part of user declarations.  */
714 >
715 > #line 716 "conf_parser.c" /* yacc.c:358  */
716  
717   #ifdef short
718   # undef short
# Line 763 | Line 726 | typedef unsigned char yytype_uint8;
726  
727   #ifdef YYTYPE_INT8
728   typedef YYTYPE_INT8 yytype_int8;
766 #elif (defined __STDC__ || defined __C99__FUNC__ \
767     || defined __cplusplus || defined _MSC_VER)
768 typedef signed char yytype_int8;
729   #else
730 < typedef short int yytype_int8;
730 > typedef signed char yytype_int8;
731   #endif
732  
733   #ifdef YYTYPE_UINT16
# Line 787 | Line 747 | typedef short int yytype_int16;
747   #  define YYSIZE_T __SIZE_TYPE__
748   # elif defined size_t
749   #  define YYSIZE_T size_t
750 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
791 <     || defined __cplusplus || defined _MSC_VER)
750 > # elif ! defined YYSIZE_T
751   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
752   #  define YYSIZE_T size_t
753   # else
# Line 802 | Line 761 | typedef short int yytype_int16;
761   # if defined YYENABLE_NLS && YYENABLE_NLS
762   #  if ENABLE_NLS
763   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
764 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
764 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
765   #  endif
766   # endif
767   # ifndef YY_
768 < #  define YY_(msgid) msgid
768 > #  define YY_(Msgid) Msgid
769 > # endif
770 > #endif
771 >
772 > #ifndef YY_ATTRIBUTE
773 > # if (defined __GNUC__                                               \
774 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
775 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
776 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
777 > # else
778 > #  define YY_ATTRIBUTE(Spec) /* empty */
779 > # endif
780 > #endif
781 >
782 > #ifndef YY_ATTRIBUTE_PURE
783 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
784 > #endif
785 >
786 > #ifndef YY_ATTRIBUTE_UNUSED
787 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
788 > #endif
789 >
790 > #if !defined _Noreturn \
791 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
792 > # if defined _MSC_VER && 1200 <= _MSC_VER
793 > #  define _Noreturn __declspec (noreturn)
794 > # else
795 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
796   # endif
797   #endif
798  
799   /* Suppress unused-variable warnings by "using" E.  */
800   #if ! defined lint || defined __GNUC__
801 < # define YYUSE(e) ((void) (e))
801 > # define YYUSE(E) ((void) (E))
802   #else
803 < # define YYUSE(e) /* empty */
803 > # define YYUSE(E) /* empty */
804   #endif
805  
806 < /* Identity function, used to suppress warnings about constant conditions.  */
807 < #ifndef lint
808 < # define YYID(n) (n)
809 < #else
810 < #if (defined __STDC__ || defined __C99__FUNC__ \
811 <     || defined __cplusplus || defined _MSC_VER)
812 < static int
813 < YYID (int yyi)
806 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
807 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
808 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
809 >    _Pragma ("GCC diagnostic push") \
810 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
811 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
812 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
813 >    _Pragma ("GCC diagnostic pop")
814   #else
815 < static int
830 < YYID (yyi)
831 <    int yyi;
815 > # define YY_INITIAL_VALUE(Value) Value
816   #endif
817 < {
818 <  return yyi;
819 < }
817 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
818 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
819 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
820   #endif
821 + #ifndef YY_INITIAL_VALUE
822 + # define YY_INITIAL_VALUE(Value) /* Nothing. */
823 + #endif
824 +
825  
826   #if ! defined yyoverflow || YYERROR_VERBOSE
827  
# Line 852 | Line 840 | YYID (yyi)
840   #    define alloca _alloca
841   #   else
842   #    define YYSTACK_ALLOC alloca
843 < #    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
856 <     || defined __cplusplus || defined _MSC_VER)
843 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
844   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
845 < #     ifndef _STDLIB_H
846 < #      define _STDLIB_H 1
845 >      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
846 > #     ifndef EXIT_SUCCESS
847 > #      define EXIT_SUCCESS 0
848   #     endif
849   #    endif
850   #   endif
# Line 864 | Line 852 | YYID (yyi)
852   # endif
853  
854   # ifdef YYSTACK_ALLOC
855 <   /* Pacify GCC's `empty if-body' warning.  */
856 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
855 >   /* Pacify GCC's 'empty if-body' warning.  */
856 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
857   #  ifndef YYSTACK_ALLOC_MAXIMUM
858      /* The OS might guarantee only one guard page at the bottom of the stack,
859         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 879 | Line 867 | YYID (yyi)
867   #  ifndef YYSTACK_ALLOC_MAXIMUM
868   #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
869   #  endif
870 < #  if (defined __cplusplus && ! defined _STDLIB_H \
870 > #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
871         && ! ((defined YYMALLOC || defined malloc) \
872 <             && (defined YYFREE || defined free)))
872 >             && (defined YYFREE || defined free)))
873   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
874 < #   ifndef _STDLIB_H
875 < #    define _STDLIB_H 1
874 > #   ifndef EXIT_SUCCESS
875 > #    define EXIT_SUCCESS 0
876   #   endif
877   #  endif
878   #  ifndef YYMALLOC
879   #   define YYMALLOC malloc
880 < #   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
893 <     || defined __cplusplus || defined _MSC_VER)
880 > #   if ! defined malloc && ! defined EXIT_SUCCESS
881   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
882   #   endif
883   #  endif
884   #  ifndef YYFREE
885   #   define YYFREE free
886 < #   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
900 <     || defined __cplusplus || defined _MSC_VER)
886 > #   if ! defined free && ! defined EXIT_SUCCESS
887   void free (void *); /* INFRINGES ON USER NAME SPACE */
888   #   endif
889   #  endif
# Line 907 | Line 893 | void free (void *); /* INFRINGES ON USER
893  
894   #if (! defined yyoverflow \
895       && (! defined __cplusplus \
896 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
896 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
897  
898   /* A type that is properly aligned for any stack member.  */
899   union yyalloc
# Line 925 | Line 911 | union yyalloc
911       ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
912        + YYSTACK_GAP_MAXIMUM)
913  
914 < /* Copy COUNT objects from FROM to TO.  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)))
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))
943 < #  endif
944 < # endif
914 > # define YYCOPY_NEEDED 1
915  
916   /* Relocate STACK from its old location to the new one.  The
917     local variables YYSIZE and YYSTACKSIZE give the old and new number of
918     elements in the stack, and YYPTR gives the new location of the
919     stack.  Advance YYPTR to a properly aligned location for the next
920     stack.  */
921 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
922 <    do                                                                  \
923 <      {                                                                 \
924 <        YYSIZE_T yynewbytes;                                            \
925 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
926 <        Stack = &yyptr->Stack_alloc;                                    \
927 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
928 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
929 <      }                                                                 \
930 <    while (YYID (0))
921 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
922 >    do                                                                  \
923 >      {                                                                 \
924 >        YYSIZE_T yynewbytes;                                            \
925 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
926 >        Stack = &yyptr->Stack_alloc;                                    \
927 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
928 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
929 >      }                                                                 \
930 >    while (0)
931  
932   #endif
933  
934 + #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
935 + /* Copy COUNT objects from SRC to DST.  The source and destination do
936 +   not overlap.  */
937 + # ifndef YYCOPY
938 + #  if defined __GNUC__ && 1 < __GNUC__
939 + #   define YYCOPY(Dst, Src, Count) \
940 +      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
941 + #  else
942 + #   define YYCOPY(Dst, Src, Count)              \
943 +      do                                        \
944 +        {                                       \
945 +          YYSIZE_T yyi;                         \
946 +          for (yyi = 0; yyi < (Count); yyi++)   \
947 +            (Dst)[yyi] = (Src)[yyi];            \
948 +        }                                       \
949 +      while (0)
950 + #  endif
951 + # endif
952 + #endif /* !YYCOPY_NEEDED */
953 +
954   /* YYFINAL -- State number of the termination state.  */
955   #define YYFINAL  2
956   /* YYLAST -- Last index in YYTABLE.  */
957 < #define YYLAST   1258
957 > #define YYLAST   1311
958  
959   /* YYNTOKENS -- Number of terminals.  */
960 < #define YYNTOKENS  265
960 > #define YYNTOKENS  240
961   /* YYNNTS -- Number of nonterminals.  */
962 < #define YYNNTS  318
962 > #define YYNNTS  297
963   /* YYNRULES -- Number of rules.  */
964 < #define YYNRULES  687
965 < /* YYNRULES -- Number of states.  */
966 < #define YYNSTATES  1354
964 > #define YYNRULES  667
965 > /* YYNSTATES -- Number of states.  */
966 > #define YYNSTATES  1319
967  
968 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
968 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
969 >   by yylex, with out-of-bounds checking.  */
970   #define YYUNDEFTOK  2
971 < #define YYMAXUTOK   514
971 > #define YYMAXUTOK   488
972  
973 < #define YYTRANSLATE(YYX)                                                \
973 > #define YYTRANSLATE(YYX)                                                \
974    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
975  
976 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
977 < static const yytype_uint16 yytranslate[] =
976 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
977 >   as returned by yylex, without out-of-bounds checking.  */
978 > static const yytype_uint8 yytranslate[] =
979   {
980         0,     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,   264,     2,     2,     2,     2,     2,
985 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   260,
986 <       2,   263,     2,     2,     2,     2,     2,     2,     2,     2,
984 >       2,     2,     2,     2,   238,     2,     2,     2,     2,     2,
985 >       2,     2,     2,     2,     2,     2,     2,     2,   239,   234,
986 >       2,   237,     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,
989         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
990         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
991         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
992 <       2,     2,     2,   262,     2,   261,     2,     2,     2,     2,
992 >       2,     2,     2,   236,     2,   235,     2,     2,     2,     2,
993         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
994         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
995         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 1033 | Line 1025 | static const yytype_uint16 yytranslate[]
1025       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1026       205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1027       215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1028 <     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
1037 <     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
1038 <     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
1039 <     255,   256,   257,   258,   259
1028 >     225,   226,   227,   228,   229,   230,   231,   232,   233
1029   };
1030  
1031   #if YYDEBUG
1032 < /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
1044 <   YYRHS.  */
1045 < static const yytype_uint16 yyprhs[] =
1046 < {
1047 <       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
1048 <      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
1049 <      39,    41,    43,    45,    47,    50,    53,    54,    56,    59,
1050 <      63,    67,    71,    75,    79,    80,    82,    85,    89,    93,
1051 <      97,   103,   106,   108,   110,   112,   115,   120,   125,   131,
1052 <     134,   136,   138,   140,   142,   144,   146,   148,   150,   152,
1053 <     154,   156,   158,   160,   163,   164,   170,   174,   176,   178,
1054 <     180,   185,   190,   195,   200,   205,   210,   215,   220,   225,
1055 <     230,   235,   241,   244,   246,   248,   250,   252,   255,   260,
1056 <     265,   270,   276,   279,   281,   283,   285,   287,   289,   291,
1057 <     293,   295,   297,   299,   301,   303,   305,   308,   313,   318,
1058 <     323,   328,   333,   338,   343,   348,   353,   358,   363,   368,
1059 <     373,   378,   383,   388,   393,   398,   399,   407,   408,   410,
1060 <     413,   415,   417,   419,   421,   423,   425,   427,   429,   431,
1061 <     434,   439,   441,   446,   451,   456,   461,   466,   467,   473,
1062 <     477,   479,   481,   483,   485,   487,   489,   491,   493,   495,
1063 <     497,   499,   501,   503,   505,   507,   509,   511,   513,   515,
1064 <     517,   518,   524,   528,   530,   531,   535,   536,   539,   541,
1065 <     543,   545,   547,   549,   551,   553,   555,   557,   559,   561,
1066 <     563,   565,   567,   569,   571,   572,   580,   581,   583,   586,
1067 <     588,   590,   592,   594,   596,   598,   600,   602,   604,   606,
1068 <     608,   610,   612,   614,   617,   622,   624,   629,   634,   639,
1069 <     644,   649,   654,   659,   664,   669,   674,   679,   684,   685,
1070 <     692,   693,   699,   703,   705,   707,   709,   711,   714,   716,
1071 <     718,   720,   722,   724,   727,   728,   734,   738,   740,   742,
1072 <     746,   751,   756,   757,   764,   767,   769,   771,   773,   775,
1073 <     777,   779,   781,   783,   785,   788,   793,   798,   803,   808,
1074 <     809,   815,   819,   821,   822,   826,   827,   830,   832,   834,
1075 <     836,   838,   840,   842,   844,   846,   848,   850,   855,   860,
1076 <     865,   866,   873,   876,   878,   880,   882,   884,   887,   892,
1077 <     897,   902,   903,   910,   913,   915,   917,   919,   921,   924,
1078 <     929,   934,   935,   941,   945,   947,   949,   951,   953,   955,
1079 <     957,   959,   961,   963,   965,   967,   969,   970,   977,   980,
1080 <     982,   984,   986,   989,   994,   995,  1001,  1005,  1007,  1009,
1081 <    1011,  1013,  1015,  1017,  1019,  1021,  1023,  1025,  1027,  1029,
1082 <    1030,  1038,  1039,  1041,  1044,  1046,  1048,  1050,  1052,  1054,
1083 <    1056,  1058,  1060,  1062,  1064,  1066,  1068,  1070,  1072,  1074,
1084 <    1077,  1082,  1084,  1089,  1094,  1099,  1104,  1109,  1114,  1119,
1085 <    1120,  1126,  1130,  1132,  1133,  1137,  1138,  1141,  1143,  1145,
1086 <    1147,  1149,  1151,  1156,  1161,  1166,  1171,  1176,  1181,  1182,
1087 <    1189,  1190,  1196,  1200,  1202,  1204,  1207,  1209,  1211,  1213,
1088 <    1215,  1217,  1222,  1227,  1228,  1235,  1238,  1240,  1242,  1244,
1089 <    1246,  1251,  1256,  1262,  1265,  1267,  1269,  1271,  1276,  1277,
1090 <    1284,  1285,  1291,  1295,  1297,  1299,  1302,  1304,  1306,  1308,
1091 <    1310,  1312,  1317,  1322,  1328,  1331,  1333,  1335,  1337,  1339,
1092 <    1341,  1343,  1345,  1347,  1349,  1351,  1353,  1355,  1357,  1359,
1093 <    1361,  1363,  1365,  1367,  1369,  1371,  1373,  1375,  1377,  1379,
1094 <    1381,  1383,  1385,  1387,  1389,  1391,  1393,  1395,  1397,  1399,
1095 <    1401,  1403,  1405,  1407,  1409,  1411,  1413,  1415,  1417,  1419,
1096 <    1421,  1423,  1425,  1427,  1429,  1431,  1433,  1435,  1437,  1439,
1097 <    1441,  1443,  1445,  1450,  1455,  1460,  1465,  1470,  1475,  1480,
1098 <    1485,  1490,  1495,  1500,  1505,  1510,  1515,  1520,  1525,  1530,
1099 <    1535,  1540,  1545,  1550,  1555,  1560,  1565,  1570,  1575,  1580,
1100 <    1585,  1590,  1595,  1600,  1605,  1610,  1615,  1620,  1625,  1630,
1101 <    1635,  1640,  1645,  1650,  1655,  1660,  1665,  1670,  1675,  1680,
1102 <    1685,  1690,  1695,  1700,  1701,  1707,  1711,  1713,  1715,  1717,
1103 <    1719,  1721,  1723,  1725,  1727,  1729,  1731,  1733,  1735,  1737,
1104 <    1739,  1741,  1743,  1745,  1747,  1749,  1751,  1752,  1758,  1762,
1105 <    1764,  1766,  1768,  1770,  1772,  1774,  1776,  1778,  1780,  1782,
1106 <    1784,  1786,  1788,  1790,  1792,  1794,  1796,  1798,  1800,  1802,
1107 <    1807,  1812,  1817,  1822,  1823,  1830,  1833,  1835,  1837,  1839,
1108 <    1841,  1843,  1845,  1847,  1849,  1854,  1859,  1860,  1866,  1870,
1109 <    1872,  1874,  1876,  1881,  1886,  1887,  1893,  1897,  1899,  1901,
1110 <    1903,  1909,  1912,  1914,  1916,  1918,  1920,  1922,  1924,  1926,
1111 <    1928,  1930,  1932,  1934,  1936,  1938,  1940,  1942,  1944,  1946,
1112 <    1948,  1950,  1952,  1957,  1962,  1967,  1972,  1977,  1982,  1987,
1113 <    1992,  1997,  2002,  2007,  2012,  2017,  2022,  2027,  2032,  2037,
1114 <    2042,  2048,  2051,  2053,  2055,  2057,  2059,  2061,  2063,  2065,
1115 <    2067,  2069,  2074,  2079,  2084,  2089,  2094,  2099
1116 < };
1117 <
1118 < /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
1119 < static const yytype_int16 yyrhs[] =
1120 < {
1121 <     266,     0,    -1,    -1,   266,   267,    -1,   295,    -1,   301,
1122 <      -1,   316,    -1,   552,    -1,   339,    -1,   358,    -1,   372,
1123 <      -1,   277,    -1,   573,    -1,   390,    -1,   397,    -1,   407,
1124 <      -1,   416,    -1,   442,    -1,   452,    -1,   458,    -1,   472,
1125 <      -1,   536,    -1,   462,    -1,   272,    -1,     1,   260,    -1,
1126 <       1,   261,    -1,    -1,   269,    -1,   131,   268,    -1,   131,
1127 <     173,   268,    -1,   131,   174,   268,    -1,   131,   175,   268,
1128 <      -1,   131,   176,   268,    -1,   131,   177,   268,    -1,    -1,
1129 <     271,    -1,   131,   270,    -1,   131,    14,   270,    -1,   131,
1130 <      15,   270,    -1,   131,    16,   270,    -1,   119,   262,   273,
1131 <     261,   260,    -1,   273,   274,    -1,   274,    -1,   275,    -1,
1132 <     276,    -1,     1,   260,    -1,   118,   263,   153,   260,    -1,
1133 <     148,   263,   153,   260,    -1,   181,   262,   278,   261,   260,
1134 <      -1,   278,   279,    -1,   279,    -1,   286,    -1,   291,    -1,
1135 <     294,    -1,   288,    -1,   289,    -1,   290,    -1,   293,    -1,
1136 <     285,    -1,   292,    -1,   287,    -1,   284,    -1,   280,    -1,
1137 <       1,   260,    -1,    -1,   168,   281,   263,   282,   260,    -1,
1138 <     282,   264,   283,    -1,   283,    -1,   169,    -1,   170,    -1,
1139 <     167,   263,   153,   260,    -1,   165,   263,   153,   260,    -1,
1140 <     120,   263,   153,   260,    -1,   183,   263,   153,   260,    -1,
1141 <      37,   263,   153,   260,    -1,   123,   263,   153,   260,    -1,
1142 <     122,   263,   153,   260,    -1,   255,   263,   153,   260,    -1,
1143 <     256,   263,   153,   260,    -1,   227,   263,   131,   260,    -1,
1144 <      84,   263,   197,   260,    -1,     5,   262,   296,   261,   260,
1145 <      -1,   296,   297,    -1,   297,    -1,   298,    -1,   300,    -1,
1146 <     299,    -1,     1,   260,    -1,   120,   263,   153,   260,    -1,
1147 <      47,   263,   153,   260,    -1,    37,   263,   153,   260,    -1,
1148 <     102,   262,   302,   261,   260,    -1,   302,   303,    -1,   303,
1149 <      -1,   304,    -1,   305,    -1,   314,    -1,   315,    -1,   306,
1150 <      -1,   308,    -1,   310,    -1,   311,    -1,   313,    -1,   309,
1151 <      -1,   312,    -1,   307,    -1,     1,   260,    -1,   219,   263,
1152 <     153,   260,    -1,   138,   263,   153,   260,    -1,    62,   263,
1153 <     153,   260,    -1,    55,   263,   153,   260,    -1,    60,   263,
1154 <     153,   260,    -1,    61,   263,   153,   260,    -1,    58,   263,
1155 <     153,   260,    -1,    57,   263,   153,   260,    -1,    59,   263,
1156 <     153,   260,    -1,    56,   263,   153,   260,    -1,   103,   263,
1157 <     220,   260,    -1,   103,   263,   222,   260,    -1,   103,   263,
1158 <     226,   260,    -1,   103,   263,   224,   260,    -1,   103,   263,
1159 <     225,   260,    -1,   103,   263,   223,   260,    -1,   103,   263,
1160 <     221,   260,    -1,   253,   263,   197,   260,    -1,    -1,   136,
1161 <     317,   318,   262,   319,   261,   260,    -1,    -1,   322,    -1,
1162 <     319,   320,    -1,   320,    -1,   321,    -1,   323,    -1,   324,
1163 <      -1,   328,    -1,   327,    -1,   325,    -1,   326,    -1,   332,
1164 <      -1,     1,   260,    -1,   120,   263,   153,   260,    -1,   153,
1165 <      -1,   248,   263,   153,   260,    -1,   147,   263,   153,   260,
1166 <      -1,    49,   263,   197,   260,    -1,   166,   263,   153,   260,
1167 <      -1,    26,   263,   153,   260,    -1,    -1,   236,   329,   263,
1168 <     330,   260,    -1,   330,   264,   331,    -1,   331,    -1,   204,
1169 <      -1,   207,    -1,   208,    -1,   210,    -1,   211,    -1,   214,
1170 <      -1,   233,    -1,   228,    -1,   230,    -1,   237,    -1,   234,
1171 <      -1,   213,    -1,   229,    -1,   232,    -1,   215,    -1,   240,
1172 <      -1,   205,    -1,   206,    -1,   218,    -1,    -1,    53,   333,
1173 <     263,   334,   260,    -1,   334,   264,   335,    -1,   335,    -1,
1174 <      -1,   130,   336,   338,    -1,    -1,   337,   338,    -1,    72,
1175 <      -1,   161,    -1,    92,    -1,   247,    -1,   257,    -1,    65,
1176 <      -1,    38,    -1,   159,    -1,     5,    -1,    77,    -1,   125,
1177 <      -1,   229,    -1,   141,    -1,    79,    -1,   162,    -1,    49,
1178 <      -1,    -1,    26,   340,   341,   262,   342,   261,   260,    -1,
1179 <      -1,   345,    -1,   342,   343,    -1,   343,    -1,   344,    -1,
1180 <     355,    -1,   356,    -1,   346,    -1,   347,    -1,   357,    -1,
1181 <     348,    -1,   349,    -1,   350,    -1,   351,    -1,   352,    -1,
1182 <     353,    -1,   354,    -1,     1,   260,    -1,   120,   263,   153,
1183 <     260,    -1,   153,    -1,   150,   263,   269,   260,    -1,   151,
1184 <     263,   269,   260,    -1,   134,   263,   131,   260,    -1,    30,
1185 <     263,   269,   260,    -1,   112,   263,   131,   260,    -1,   107,
1186 <     263,   131,   260,    -1,   109,   263,   131,   260,    -1,   108,
1187 <     263,   131,   260,    -1,   178,   263,   271,   260,    -1,    23,
1188 <     263,   131,   260,    -1,    24,   263,   131,   260,    -1,   133,
1189 <     263,   131,   260,    -1,    -1,   100,   359,   262,   364,   261,
1190 <     260,    -1,    -1,    53,   361,   263,   362,   260,    -1,   362,
1191 <     264,   363,    -1,   363,    -1,   235,    -1,    76,    -1,   231,
1192 <      -1,   364,   365,    -1,   365,    -1,   366,    -1,   360,    -1,
1193 <     370,    -1,   371,    -1,     1,   260,    -1,    -1,   152,   263,
1194 <     368,   367,   260,    -1,   368,   264,   369,    -1,   369,    -1,
1195 <     131,    -1,   131,   202,   131,    -1,    89,   263,   153,   260,
1196 <      -1,    83,   263,   153,   260,    -1,    -1,    73,   373,   262,
1197 <     374,   261,   260,    -1,   374,   375,    -1,   375,    -1,   376,
1198 <      -1,   377,    -1,   378,    -1,   380,    -1,   387,    -1,   388,
1199 <      -1,   389,    -1,   379,    -1,     1,   260,    -1,   248,   263,
1200 <     153,   260,    -1,   147,   263,   153,   260,    -1,    26,   263,
1201 <     153,   260,    -1,    49,   263,   197,   260,    -1,    -1,    53,
1202 <     381,   263,   382,   260,    -1,   382,   264,   383,    -1,   383,
1203 <      -1,    -1,   130,   384,   386,    -1,    -1,   385,   386,    -1,
1204 <     191,    -1,    50,    -1,    93,    -1,    74,    -1,    20,    -1,
1205 <      21,    -1,   129,    -1,    67,    -1,   172,    -1,   121,    -1,
1206 <     190,   263,   153,   260,    -1,   157,   263,   153,   260,    -1,
1207 <     156,   263,   131,   260,    -1,    -1,   171,   391,   262,   392,
1208 <     261,   260,    -1,   392,   393,    -1,   393,    -1,   394,    -1,
1209 <     395,    -1,   396,    -1,     1,   260,    -1,   155,   263,   153,
1210 <     260,    -1,    22,   263,   153,   260,    -1,   124,   263,   153,
1211 <     260,    -1,    -1,   185,   398,   262,   399,   261,   260,    -1,
1212 <     399,   400,    -1,   400,    -1,   401,    -1,   402,    -1,   403,
1213 <      -1,     1,   260,    -1,   120,   263,   153,   260,    -1,   248,
1214 <     263,   153,   260,    -1,    -1,   187,   404,   263,   405,   260,
1215 <      -1,   405,   264,   406,    -1,   406,    -1,    92,    -1,   244,
1216 <      -1,   247,    -1,   257,    -1,   245,    -1,   239,    -1,   171,
1217 <      -1,   246,    -1,   238,    -1,   218,    -1,   203,    -1,    -1,
1218 <     186,   408,   262,   409,   261,   260,    -1,   409,   410,    -1,
1219 <     410,    -1,   411,    -1,   412,    -1,     1,   260,    -1,   120,
1220 <     263,   153,   260,    -1,    -1,   187,   413,   263,   414,   260,
1221 <      -1,   414,   264,   415,    -1,   415,    -1,    92,    -1,   244,
1222 <      -1,   247,    -1,   257,    -1,   245,    -1,   239,    -1,   171,
1223 <      -1,   246,    -1,   238,    -1,   218,    -1,   203,    -1,    -1,
1224 <      29,   417,   418,   262,   419,   261,   260,    -1,    -1,   422,
1225 <      -1,   419,   420,    -1,   420,    -1,   421,    -1,   423,    -1,
1226 <     424,    -1,   425,    -1,   426,    -1,   428,    -1,   427,    -1,
1227 <     429,    -1,   438,    -1,   439,    -1,   440,    -1,   437,    -1,
1228 <     436,    -1,   441,    -1,     1,   260,    -1,   120,   263,   153,
1229 <     260,    -1,   153,    -1,    83,   263,   153,   260,    -1,   255,
1230 <     263,   153,   260,    -1,   179,   263,   153,   260,    -1,     3,
1231 <     263,   153,   260,    -1,   152,   263,   131,   260,    -1,     6,
1232 <     263,   216,   260,    -1,     6,   263,   217,   260,    -1,    -1,
1233 <      53,   430,   263,   431,   260,    -1,   431,   264,   432,    -1,
1234 <     432,    -1,    -1,   130,   433,   435,    -1,    -1,   434,   435,
1235 <      -1,    27,    -1,    31,    -1,    10,    -1,    12,    -1,   242,
1236 <      -1,   166,   263,   153,   260,    -1,    49,   263,   197,   260,
1237 <      -1,    85,   263,   153,   260,    -1,    98,   263,   153,   260,
1238 <      -1,    26,   263,   153,   260,    -1,    25,   263,   153,   260,
1239 <      -1,    -1,    90,   443,   262,   448,   261,   260,    -1,    -1,
1240 <     187,   445,   263,   446,   260,    -1,   446,   264,   447,    -1,
1241 <     447,    -1,   158,    -1,   448,   449,    -1,   449,    -1,   450,
1242 <      -1,   451,    -1,   444,    -1,     1,    -1,   248,   263,   153,
1243 <     260,    -1,   155,   263,   153,   260,    -1,    -1,    36,   453,
1244 <     262,   454,   261,   260,    -1,   454,   455,    -1,   455,    -1,
1245 <     456,    -1,   457,    -1,     1,    -1,    89,   263,   153,   260,
1246 <      -1,   155,   263,   153,   260,    -1,    51,   262,   459,   261,
1247 <     260,    -1,   459,   460,    -1,   460,    -1,   461,    -1,     1,
1248 <      -1,    89,   263,   153,   260,    -1,    -1,    63,   463,   262,
1249 <     468,   261,   260,    -1,    -1,   187,   465,   263,   466,   260,
1250 <      -1,   466,   264,   467,    -1,   467,    -1,   158,    -1,   468,
1251 <     469,    -1,   469,    -1,   470,    -1,   471,    -1,   464,    -1,
1252 <       1,    -1,   120,   263,   153,   260,    -1,   155,   263,   153,
1253 <     260,    -1,    64,   262,   473,   261,   260,    -1,   473,   474,
1254 <      -1,   474,    -1,   483,    -1,   484,    -1,   486,    -1,   487,
1255 <      -1,   488,    -1,   489,    -1,   490,    -1,   491,    -1,   492,
1256 <      -1,   493,    -1,   482,    -1,   495,    -1,   496,    -1,   497,
1257 <      -1,   498,    -1,   514,    -1,   500,    -1,   502,    -1,   504,
1258 <      -1,   503,    -1,   507,    -1,   501,    -1,   508,    -1,   509,
1259 <      -1,   510,    -1,   511,    -1,   513,    -1,   512,    -1,   528,
1260 <      -1,   515,    -1,   519,    -1,   520,    -1,   524,    -1,   505,
1261 <      -1,   506,    -1,   534,    -1,   532,    -1,   533,    -1,   516,
1262 <      -1,   485,    -1,   517,    -1,   518,    -1,   535,    -1,   523,
1263 <      -1,   494,    -1,   521,    -1,   522,    -1,   478,    -1,   481,
1264 <      -1,   476,    -1,   477,    -1,   479,    -1,   480,    -1,   499,
1265 <      -1,   475,    -1,     1,    -1,   114,   263,   131,   260,    -1,
1266 <      70,   263,   131,   260,    -1,    71,   263,   131,   260,    -1,
1267 <      12,   263,   197,   260,    -1,   254,   263,   197,   260,    -1,
1268 <     160,   263,   269,   260,    -1,   184,   263,   197,   260,    -1,
1269 <      91,   263,   269,   260,    -1,    82,   263,   197,   260,    -1,
1270 <      87,   263,   197,   260,    -1,    43,   263,   197,   260,    -1,
1271 <      52,   263,   197,   260,    -1,     8,   263,   197,   260,    -1,
1272 <     111,   263,   269,   260,    -1,   110,   263,   131,   260,    -1,
1273 <     104,   263,   131,   260,    -1,     9,   263,   269,   260,    -1,
1274 <     201,   263,   269,   260,    -1,   200,   263,   269,   260,    -1,
1275 <      75,   263,   131,   260,    -1,    95,   263,   197,   260,    -1,
1276 <      94,   263,   153,   260,    -1,    88,   263,   197,   260,    -1,
1277 <     259,   263,   197,   260,    -1,   192,   263,   197,   260,    -1,
1278 <     195,   263,   197,   260,    -1,   196,   263,   197,   260,    -1,
1279 <     194,   263,   197,   260,    -1,   194,   263,   198,   260,    -1,
1280 <     193,   263,   197,   260,    -1,   193,   263,   198,   260,    -1,
1281 <     145,   263,   269,   260,    -1,    19,   263,   269,   260,    -1,
1282 <     137,   263,   197,   260,    -1,   146,   263,   269,   260,    -1,
1283 <     188,   263,   197,   260,    -1,   128,   263,   197,   260,    -1,
1284 <     243,   263,   197,   260,    -1,   140,   263,   197,   260,    -1,
1285 <     115,   263,   153,   260,    -1,    86,   263,   269,   260,    -1,
1286 <      44,   263,   131,   260,    -1,   113,   263,   131,   260,    -1,
1287 <     182,   263,   153,   260,    -1,    32,   263,   153,   260,    -1,
1288 <      28,   263,   131,   260,    -1,   249,   263,   197,   260,    -1,
1289 <      46,   263,   153,   260,    -1,   149,   263,   197,   260,    -1,
1290 <      39,   263,   197,   260,    -1,   241,   263,   269,   260,    -1,
1291 <      -1,   142,   525,   263,   526,   260,    -1,   526,   264,   527,
1292 <      -1,   527,    -1,   204,    -1,   207,    -1,   208,    -1,   210,
1293 <      -1,   211,    -1,   214,    -1,   233,    -1,   228,    -1,   230,
1294 <      -1,   237,    -1,   234,    -1,   213,    -1,   229,    -1,   232,
1295 <      -1,   215,    -1,   240,    -1,   205,    -1,   206,    -1,   218,
1296 <      -1,    -1,   139,   529,   263,   530,   260,    -1,   530,   264,
1297 <     531,    -1,   531,    -1,   204,    -1,   207,    -1,   208,    -1,
1298 <     210,    -1,   211,    -1,   214,    -1,   233,    -1,   228,    -1,
1299 <     230,    -1,   237,    -1,   234,    -1,   213,    -1,   229,    -1,
1300 <     232,    -1,   215,    -1,   240,    -1,   205,    -1,   206,    -1,
1301 <     218,    -1,   116,   263,   131,   260,    -1,   117,   263,   131,
1302 <     260,    -1,    33,   263,   131,   260,    -1,   209,   263,   271,
1303 <     260,    -1,    -1,    66,   537,   262,   538,   261,   260,    -1,
1304 <     538,   539,    -1,   539,    -1,   540,    -1,   541,    -1,   542,
1305 <      -1,   546,    -1,   547,    -1,   548,    -1,     1,    -1,    48,
1306 <     263,   197,   260,    -1,    45,   263,   269,   260,    -1,    -1,
1307 <     102,   543,   263,   544,   260,    -1,   544,   264,   545,    -1,
1308 <     545,    -1,   199,    -1,    11,    -1,   248,   263,   153,   260,
1309 <      -1,   120,   263,   153,   260,    -1,    -1,     4,   549,   263,
1310 <     550,   260,    -1,   550,   264,   551,    -1,   551,    -1,   199,
1311 <      -1,    11,    -1,    22,   262,   553,   261,   260,    -1,   553,
1312 <     554,    -1,   554,    -1,   557,    -1,   558,    -1,   559,    -1,
1313 <     560,    -1,   565,    -1,   561,    -1,   562,    -1,   563,    -1,
1314 <     564,    -1,   566,    -1,   567,    -1,   568,    -1,   556,    -1,
1315 <     569,    -1,   570,    -1,   571,    -1,   572,    -1,   555,    -1,
1316 <       1,    -1,    40,   263,   197,   260,    -1,   163,   263,   197,
1317 <     260,    -1,    42,   263,   197,   260,    -1,   250,   263,   197,
1318 <     260,    -1,   251,   263,   197,   260,    -1,   252,   263,   197,
1319 <     260,    -1,    96,   263,   269,   260,    -1,    97,   263,   269,
1320 <     260,    -1,   106,   263,   131,   260,    -1,   154,   263,   197,
1321 <     260,    -1,   105,   263,   131,   260,    -1,    35,   263,   131,
1322 <     260,    -1,    34,   263,   131,   260,    -1,   126,   263,   197,
1323 <     260,    -1,   127,   263,   197,   260,    -1,    13,   263,   197,
1324 <     260,    -1,   143,   263,   131,   260,    -1,   144,   263,   269,
1325 <     260,    -1,   180,   262,   574,   261,   260,    -1,   574,   575,
1326 <      -1,   575,    -1,   576,    -1,   577,    -1,   579,    -1,   581,
1327 <      -1,   580,    -1,   578,    -1,   582,    -1,     1,    -1,    54,
1328 <     263,   197,   260,    -1,    81,   263,   197,   260,    -1,    78,
1329 <     263,   153,   260,    -1,    99,   263,   269,   260,    -1,    76,
1330 <     263,   197,   260,    -1,    41,   263,   197,   260,    -1,    80,
1331 <     263,   197,   260,    -1
1332 < };
1333 <
1334 < /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
1032 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1033   static const yytype_uint16 yyrline[] =
1034   {
1035 <       0,   395,   395,   396,   399,   400,   401,   402,   403,   404,
1036 <     405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
1037 <     415,   416,   417,   418,   419,   420,   424,   424,   425,   429,
1038 <     433,   437,   441,   445,   451,   451,   452,   453,   454,   455,
1039 <     462,   465,   465,   466,   466,   466,   468,   476,   485,   487,
1040 <     487,   488,   488,   489,   489,   490,   490,   491,   492,   492,
1041 <     493,   493,   494,   495,   499,   498,   517,   517,   518,   524,
1042 <     532,   566,   626,   641,   656,   665,   679,   688,   716,   746,
1043 <     769,   778,   780,   780,   781,   781,   782,   782,   784,   793,
1044 <     802,   815,   817,   818,   820,   820,   821,   822,   822,   823,
1045 <     823,   824,   824,   825,   825,   826,   827,   829,   833,   837,
1046 <     844,   851,   858,   865,   872,   879,   886,   893,   897,   901,
1047 <     905,   909,   913,   917,   923,   933,   932,  1026,  1026,  1027,
1048 <    1027,  1028,  1028,  1028,  1029,  1029,  1029,  1030,  1030,  1030,
1049 <    1032,  1044,  1056,  1090,  1102,  1113,  1155,  1165,  1164,  1170,
1050 <    1170,  1171,  1175,  1179,  1183,  1187,  1191,  1195,  1199,  1203,
1051 <    1207,  1211,  1215,  1219,  1223,  1227,  1231,  1235,  1239,  1243,
1052 <    1250,  1249,  1253,  1253,  1254,  1254,  1255,  1255,  1257,  1264,
1053 <    1271,  1278,  1285,  1292,  1299,  1306,  1313,  1320,  1327,  1334,
1054 <    1341,  1348,  1355,  1362,  1376,  1375,  1425,  1425,  1427,  1427,
1055 <    1428,  1429,  1429,  1430,  1431,  1432,  1433,  1434,  1435,  1436,
1056 <    1437,  1438,  1439,  1440,  1442,  1451,  1460,  1466,  1472,  1478,
1057 <    1484,  1490,  1496,  1502,  1508,  1514,  1520,  1526,  1536,  1535,
1058 <    1552,  1551,  1556,  1556,  1557,  1561,  1565,  1573,  1573,  1574,
1059 <    1574,  1574,  1574,  1574,  1576,  1576,  1578,  1578,  1580,  1594,
1060 <    1614,  1623,  1636,  1635,  1704,  1704,  1705,  1705,  1705,  1705,
1061 <    1706,  1706,  1706,  1707,  1707,  1709,  1746,  1759,  1768,  1780,
1062 <    1779,  1783,  1783,  1784,  1784,  1785,  1785,  1787,  1794,  1801,
1063 <    1808,  1815,  1822,  1829,  1836,  1843,  1850,  1860,  1879,  1889,
1064 <    1903,  1902,  1918,  1918,  1919,  1919,  1919,  1919,  1921,  1930,
1065 <    1945,  1959,  1958,  1974,  1974,  1975,  1975,  1975,  1975,  1977,
1066 <    1986,  2009,  2008,  2014,  2014,  2015,  2019,  2023,  2027,  2031,
1067 <    2035,  2039,  2043,  2047,  2051,  2055,  2065,  2064,  2081,  2081,
1068 <    2082,  2082,  2082,  2084,  2091,  2090,  2096,  2096,  2097,  2101,
1069 <    2105,  2109,  2113,  2117,  2121,  2125,  2129,  2133,  2137,  2147,
1070 <    2146,  2292,  2292,  2293,  2293,  2294,  2294,  2294,  2295,  2295,
1071 <    2296,  2296,  2297,  2297,  2297,  2298,  2298,  2299,  2299,  2300,
1072 <    2302,  2314,  2326,  2335,  2361,  2379,  2397,  2403,  2407,  2416,
1073 <    2415,  2419,  2419,  2420,  2420,  2421,  2421,  2423,  2434,  2441,
1074 <    2448,  2455,  2465,  2506,  2517,  2530,  2543,  2552,  2588,  2587,
1075 <    2651,  2650,  2654,  2654,  2655,  2661,  2661,  2662,  2662,  2662,
1076 <    2662,  2664,  2683,  2693,  2692,  2715,  2715,  2716,  2716,  2716,
1077 <    2718,  2724,  2733,  2735,  2735,  2736,  2736,  2738,  2757,  2756,
1078 <    2804,  2803,  2807,  2807,  2808,  2814,  2814,  2815,  2815,  2815,
1079 <    2815,  2817,  2823,  2832,  2835,  2835,  2836,  2836,  2837,  2837,
1080 <    2838,  2838,  2839,  2839,  2840,  2840,  2841,  2841,  2842,  2842,
1081 <    2843,  2843,  2844,  2844,  2845,  2845,  2846,  2846,  2847,  2847,
1082 <    2848,  2848,  2849,  2849,  2850,  2850,  2851,  2851,  2852,  2852,
1083 <    2853,  2853,  2854,  2854,  2855,  2855,  2856,  2857,  2857,  2858,
1084 <    2858,  2859,  2860,  2860,  2861,  2861,  2862,  2862,  2863,  2863,
1085 <    2864,  2865,  2868,  2873,  2878,  2883,  2888,  2893,  2898,  2903,
1086 <    2908,  2913,  2918,  2923,  2928,  2933,  2938,  2943,  2948,  2953,
1087 <    2958,  2964,  2975,  2980,  2989,  2994,  2999,  3004,  3009,  3014,
1088 <    3017,  3022,  3025,  3030,  3035,  3040,  3045,  3050,  3055,  3060,
1089 <    3065,  3070,  3081,  3086,  3091,  3096,  3105,  3137,  3155,  3160,
1090 <    3169,  3174,  3179,  3185,  3184,  3189,  3189,  3190,  3193,  3196,
1091 <    3199,  3202,  3205,  3208,  3211,  3214,  3217,  3220,  3223,  3226,
1092 <    3229,  3232,  3235,  3238,  3241,  3244,  3250,  3249,  3254,  3254,
1093 <    3255,  3258,  3261,  3264,  3267,  3270,  3273,  3276,  3279,  3282,
1094 <    3285,  3288,  3291,  3294,  3297,  3300,  3303,  3306,  3309,  3314,
1095 <    3319,  3324,  3329,  3339,  3338,  3362,  3362,  3363,  3364,  3365,
1096 <    3366,  3367,  3368,  3369,  3371,  3377,  3384,  3383,  3388,  3388,
1097 <    3389,  3393,  3399,  3433,  3443,  3442,  3492,  3492,  3493,  3497,
1098 <    3506,  3509,  3509,  3510,  3510,  3511,  3511,  3512,  3512,  3513,
1099 <    3513,  3514,  3514,  3515,  3516,  3516,  3517,  3517,  3518,  3518,
1100 <    3519,  3519,  3521,  3526,  3531,  3536,  3541,  3546,  3551,  3556,
1101 <    3561,  3566,  3571,  3576,  3581,  3586,  3591,  3596,  3601,  3606,
1404 <    3614,  3617,  3617,  3618,  3618,  3619,  3620,  3621,  3621,  3622,
1405 <    3623,  3625,  3631,  3637,  3646,  3660,  3666,  3672
1035 >       0,   389,   389,   390,   393,   394,   395,   396,   397,   398,
1036 >     399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
1037 >     409,   410,   411,   412,   413,   414,   415,   416,   420,   420,
1038 >     421,   422,   423,   424,   425,   426,   427,   428,   431,   431,
1039 >     432,   433,   434,   435,   442,   445,   445,   446,   446,   446,
1040 >     448,   454,   461,   463,   463,   464,   465,   466,   467,   468,
1041 >     469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
1042 >     479,   480,   481,   484,   524,   582,   611,   619,   633,   661,
1043 >     676,   691,   701,   715,   724,   752,   780,   805,   827,   849,
1044 >     858,   860,   860,   861,   862,   863,   864,   866,   875,   884,
1045 >     897,   896,   914,   914,   915,   915,   915,   917,   923,   933,
1046 >     932,   951,   951,   952,   952,   952,   952,   952,   954,   960,
1047 >     966,   972,   995,   996,   996,   998,   998,   999,  1001,  1008,
1048 >    1008,  1021,  1022,  1024,  1024,  1025,  1025,  1027,  1035,  1038,
1049 >    1044,  1043,  1049,  1049,  1050,  1054,  1058,  1062,  1066,  1070,
1050 >    1074,  1078,  1082,  1093,  1092,  1178,  1178,  1179,  1180,  1181,
1051 >    1182,  1183,  1184,  1185,  1186,  1187,  1188,  1189,  1191,  1197,
1052 >    1203,  1209,  1220,  1226,  1232,  1243,  1250,  1249,  1255,  1255,
1053 >    1256,  1260,  1264,  1268,  1272,  1276,  1280,  1284,  1288,  1292,
1054 >    1296,  1300,  1304,  1308,  1312,  1316,  1320,  1324,  1328,  1332,
1055 >    1336,  1340,  1347,  1346,  1352,  1352,  1353,  1357,  1361,  1365,
1056 >    1369,  1373,  1377,  1381,  1385,  1389,  1393,  1397,  1401,  1405,
1057 >    1409,  1413,  1417,  1421,  1425,  1429,  1433,  1437,  1441,  1452,
1058 >    1451,  1513,  1513,  1514,  1515,  1516,  1517,  1518,  1519,  1520,
1059 >    1521,  1522,  1523,  1524,  1525,  1526,  1526,  1527,  1528,  1529,
1060 >    1530,  1532,  1538,  1544,  1550,  1556,  1562,  1568,  1574,  1580,
1061 >    1586,  1592,  1599,  1605,  1611,  1617,  1626,  1636,  1635,  1641,
1062 >    1641,  1642,  1646,  1657,  1656,  1663,  1662,  1667,  1667,  1668,
1063 >    1672,  1676,  1682,  1682,  1683,  1683,  1683,  1683,  1683,  1685,
1064 >    1685,  1687,  1687,  1689,  1702,  1719,  1725,  1735,  1734,  1776,
1065 >    1776,  1777,  1778,  1779,  1780,  1781,  1782,  1783,  1784,  1785,
1066 >    1787,  1793,  1799,  1805,  1817,  1816,  1822,  1822,  1823,  1827,
1067 >    1831,  1835,  1839,  1843,  1847,  1851,  1855,  1859,  1865,  1879,
1068 >    1888,  1902,  1901,  1916,  1916,  1917,  1917,  1917,  1917,  1919,
1069 >    1925,  1931,  1941,  1943,  1943,  1944,  1944,  1946,  1962,  1961,
1070 >    1986,  1986,  1987,  1987,  1987,  1987,  1989,  1995,  2015,  2014,
1071 >    2020,  2020,  2021,  2025,  2029,  2033,  2037,  2041,  2045,  2049,
1072 >    2053,  2057,  2067,  2066,  2087,  2087,  2088,  2088,  2088,  2090,
1073 >    2097,  2096,  2102,  2102,  2103,  2107,  2111,  2115,  2119,  2123,
1074 >    2127,  2131,  2135,  2139,  2149,  2148,  2220,  2220,  2221,  2222,
1075 >    2223,  2224,  2225,  2226,  2227,  2228,  2229,  2230,  2231,  2232,
1076 >    2233,  2234,  2235,  2237,  2243,  2249,  2255,  2268,  2281,  2287,
1077 >    2293,  2297,  2304,  2303,  2308,  2308,  2309,  2313,  2319,  2330,
1078 >    2336,  2342,  2348,  2364,  2363,  2389,  2389,  2390,  2390,  2390,
1079 >    2392,  2412,  2422,  2421,  2448,  2448,  2449,  2449,  2449,  2451,
1080 >    2457,  2466,  2468,  2468,  2469,  2469,  2471,  2489,  2488,  2511,
1081 >    2511,  2512,  2512,  2512,  2514,  2520,  2529,  2532,  2532,  2533,
1082 >    2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,
1083 >    2544,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,  2553,
1084 >    2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,  2562,  2563,
1085 >    2564,  2565,  2566,  2567,  2568,  2569,  2570,  2571,  2572,  2573,
1086 >    2574,  2575,  2576,  2577,  2578,  2579,  2580,  2581,  2584,  2589,
1087 >    2594,  2599,  2605,  2611,  2617,  2623,  2628,  2633,  2638,  2643,
1088 >    2648,  2653,  2658,  2663,  2668,  2673,  2678,  2683,  2689,  2700,
1089 >    2705,  2710,  2715,  2720,  2725,  2730,  2733,  2738,  2741,  2746,
1090 >    2751,  2756,  2761,  2766,  2771,  2776,  2781,  2786,  2791,  2796,
1091 >    2801,  2806,  2811,  2817,  2816,  2821,  2821,  2822,  2825,  2828,
1092 >    2831,  2834,  2837,  2840,  2843,  2846,  2849,  2852,  2855,  2858,
1093 >    2861,  2864,  2867,  2870,  2873,  2876,  2879,  2882,  2885,  2891,
1094 >    2890,  2895,  2895,  2896,  2899,  2902,  2905,  2908,  2911,  2914,
1095 >    2917,  2920,  2923,  2926,  2929,  2932,  2935,  2938,  2941,  2944,
1096 >    2947,  2950,  2953,  2958,  2963,  2968,  2977,  2980,  2980,  2981,
1097 >    2982,  2983,  2984,  2985,  2986,  2987,  2988,  2989,  2990,  2991,
1098 >    2992,  2993,  2994,  2995,  2997,  3002,  3007,  3012,  3017,  3022,
1099 >    3027,  3032,  3037,  3042,  3047,  3052,  3057,  3062,  3070,  3073,
1100 >    3073,  3074,  3075,  3076,  3077,  3078,  3079,  3080,  3081,  3082,
1101 >    3084,  3090,  3096,  3102,  3108,  3117,  3132,  3138
1102   };
1103   #endif
1104  
1105 < #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
1105 > #if YYDEBUG || YYERROR_VERBOSE || 0
1106   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
1107     First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
1108   static const char *const yytname[] =
1109   {
1110 <  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ACTION", "ADMIN",
1111 <  "AFTYPE", "T_ALLOW", "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME",
1112 <  "AUTOCONN", "T_BLOCK", "BURST_AWAY", "BURST_TOPICWHO", "BYTES", "KBYTES",
1113 <  "MBYTES", "GBYTES", "TBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CAN_IDLE",
1114 <  "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CIPHER_PREFERENCE",
1419 <  "CLASS", "COMPRESSED", "COMPRESSION_LEVEL", "CONNECT", "CONNECTFREQ",
1420 <  "CRYPTLINK", "DEFAULT_CIPHER_PREFERENCE", "DEFAULT_FLOODCOUNT",
1110 >  "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1111 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1112 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1113 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1114 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1115    "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1116    "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1117 <  "DISABLE_HIDDEN", "DISABLE_LOCAL_CHANNELS", "DISABLE_REMOTE_COMMANDS",
1424 <  "DOTS_IN_IDENT", "DURATION", "EGDPOOL_PATH", "EMAIL", "ENABLE",
1117 >  "DISABLE_REMOTE_COMMANDS", "DOTS_IN_IDENT", "EGDPOOL_PATH", "EMAIL",
1118    "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1119 <  "IRCD_FLAGS", "FLATTEN_LINKS", "FFAILED_OPERLOG", "FKILLLOG",
1120 <  "FKLINELOG", "FGLINELOG", "FIOERRLOG", "FOPERLOG", "FOPERSPYLOG",
1121 <  "FUSERLOG", "GECOS", "GENERAL", "GLINE", "GLINES", "GLINE_EXEMPT",
1122 <  "GLINE_LOG", "GLINE_TIME", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1123 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1124 <  "HIDDEN_ADMIN", "HIDDEN_NAME", "HIDDEN_OPER", "HIDE_SERVER_IPS",
1125 <  "HIDE_SERVERS", "HIDE_SPOOF_IPS", "HOST", "HUB", "HUB_MASK", "IDLETIME",
1126 <  "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT", "IP", "KILL",
1127 <  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KLINE_REASON",
1128 <  "KLINE_WITH_REASON", "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK",
1129 <  "LINKS_DELAY", "LISTEN", "T_LOG", "LOGGING", "LOG_LEVEL", "MAX_ACCEPT",
1130 <  "MAX_BANS", "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1131 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1132 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1133 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1134 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1119 >  "FLATTEN_LINKS", "GECOS", "GENERAL", "GLINE", "GLINE_DURATION",
1120 >  "GLINE_ENABLE", "GLINE_EXEMPT", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1121 >  "GLINE_REQUEST_DURATION", "GLOBAL_KILL", "HAVENT_READ_CONF", "HIDDEN",
1122 >  "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE", "HIDE_IDLE_FROM_OPERS",
1123 >  "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SERVICES", "HIDE_SPOOF_IPS",
1124 >  "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT",
1125 >  "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME", "IP", "IRCD_AUTH",
1126 >  "IRCD_FLAGS", "IRCD_SID", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "KILL",
1127 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KNOCK_CLIENT_COUNT",
1128 >  "KNOCK_CLIENT_TIME", "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY",
1129 >  "LISTEN", "MASK", "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL",
1130 >  "MAX_IDENT", "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES",
1131 >  "MAX_NICK_LENGTH", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1132 >  "MAX_TOPIC_LENGTH", "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD",
1133 >  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "MOTD", "NAME",
1134 >  "NEED_IDENT", "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK",
1135    "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1136 <  "NOT", "NUMBER", "NUMBER_PER_IDENT", "NUMBER_PER_CIDR", "NUMBER_PER_IP",
1137 <  "NUMBER_PER_IP_GLOBAL", "OPERATOR", "OPERS_BYPASS_CALLERID", "OPER_LOG",
1138 <  "OPER_ONLY_UMODES", "OPER_PASS_RESV", "OPER_SPY_T", "OPER_UMODES",
1139 <  "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "PACE_WAIT", "PACE_WAIT_SIMPLE",
1140 <  "PASSWORD", "PATH", "PING_COOKIE", "PING_TIME", "PING_WARNING", "PORT",
1141 <  "QSTRING", "QUIET_ON_BAN", "REASON", "REDIRPORT", "REDIRSERV", "REGEX_T",
1142 <  "REHASH", "TREJECT_HOLD_TIME", "REMOTE", "REMOTEBAN",
1143 <  "RESTRICT_CHANNELS", "RESTRICTED", "RSA_PRIVATE_KEY_FILE",
1144 <  "RSA_PUBLIC_KEY_FILE", "SSL_CERTIFICATE_FILE", "T_SSL_CONNECTION_METHOD",
1145 <  "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT", "SECONDS", "MINUTES",
1146 <  "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD", "SERVERHIDE",
1147 <  "SERVERINFO", "SERVLINK_PATH", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1148 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SILENT", "SPOOF",
1149 <  "SPOOF_NOTICE", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1150 <  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL",
1151 <  "TMASKED", "T_REJECT", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS",
1152 <  "T_ALL", "T_BOTS", "T_SOFTCALLERID", "T_CALLERID", "T_CCONN",
1153 <  "T_CCONN_FULL", "T_CLIENT_FLOOD", "T_DEAF", "T_DEBUG", "T_DRONE",
1154 <  "T_EXTERNAL", "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS",
1155 <  "T_LOGPATH", "T_L_CRIT", "T_L_DEBUG", "T_L_ERROR", "T_L_INFO",
1156 <  "T_L_NOTICE", "T_L_TRACE", "T_L_WARN", "T_MAX_CLIENTS", "T_NCHANGE",
1157 <  "T_OPERWALL", "T_REJ", "T_SERVER", "T_SERVNOTICE", "T_SKILL", "T_SPY",
1158 <  "T_SSL", "T_UMODES", "T_UNAUTH", "T_UNRESV", "T_UNXLINE", "T_WALLOP",
1159 <  "THROTTLE_TIME", "TOPICBURST", "TRUE_NO_OPER_FLOOD", "TKLINE", "TXLINE",
1160 <  "TRESV", "UNKLINE", "USER", "USE_EGD", "USE_EXCEPT", "USE_INVEX",
1161 <  "USE_KNOCK", "USE_LOGGING", "USE_WHOIS_ACTUALLY", "VHOST", "VHOST6",
1162 <  "XLINE", "WARN", "WARN_NO_NLINE", "';'", "'}'", "'{'", "'='", "','",
1163 <  "$accept", "conf", "conf_item", "timespec_", "timespec", "sizespec_",
1164 <  "sizespec", "modules_entry", "modules_items", "modules_item",
1165 <  "modules_module", "modules_path", "serverinfo_entry", "serverinfo_items",
1166 <  "serverinfo_item", "serverinfo_ssl_connection_method", "$@1",
1167 <  "method_types", "method_type_item", "serverinfo_ssl_certificate_file",
1475 <  "serverinfo_rsa_private_key_file", "serverinfo_name", "serverinfo_sid",
1136 >  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES",
1137 >  "OPER_PASS_RESV", "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID",
1138 >  "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
1139 >  "PING_TIME", "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT",
1140 >  "REDIRSERV", "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1141 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1142 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1143 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1144 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1145 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1146 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1147 >  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY",
1148 >  "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN",
1149 >  "T_COMMAND", "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
1150 >  "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4",
1151 >  "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE",
1152 >  "T_NONONREG", "T_PREPEND", "T_PSEUDO", "T_RECVQ", "T_REJ", "T_RESTART",
1153 >  "T_SERVER", "T_SERVICE", "T_SERVNOTICE", "T_SET", "T_SHARED", "T_SIZE",
1154 >  "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", "T_SSL_CIPHER_LIST",
1155 >  "T_TARGET", "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED",
1156 >  "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS", "T_WEBIRC", "TBOOL",
1157 >  "THROTTLE_COUNT", "THROTTLE_TIME", "TKLINE_EXPIRE_NOTICES", "TMASKED",
1158 >  "TRUE_NO_OPER_FLOOD", "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "TYPE",
1159 >  "UNKLINE", "USE_EGD", "USE_LOGGING", "USER", "VHOST", "VHOST6",
1160 >  "WARN_NO_CONNECT_BLOCK", "XLINE", "';'", "'}'", "'{'", "'='", "','",
1161 >  "':'", "$accept", "conf", "conf_item", "timespec_", "timespec",
1162 >  "sizespec_", "sizespec", "modules_entry", "modules_items",
1163 >  "modules_item", "modules_module", "modules_path", "serverinfo_entry",
1164 >  "serverinfo_items", "serverinfo_item", "serverinfo_ssl_certificate_file",
1165 >  "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1166 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1167 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1168    "serverinfo_description", "serverinfo_network_name",
1169    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1170 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1171 <  "admin_item", "admin_name", "admin_email", "admin_description",
1172 <  "logging_entry", "logging_items", "logging_item", "logging_path",
1173 <  "logging_oper_log", "logging_fuserlog", "logging_ffailed_operlog",
1174 <  "logging_foperlog", "logging_foperspylog", "logging_fglinelog",
1175 <  "logging_fklinelog", "logging_ioerrlog", "logging_killlog",
1176 <  "logging_log_level", "logging_use_logging", "oper_entry", "$@2",
1177 <  "oper_name_b", "oper_items", "oper_item", "oper_name", "oper_name_t",
1178 <  "oper_user", "oper_password", "oper_encrypted",
1179 <  "oper_rsa_public_key_file", "oper_class", "oper_umodes", "$@3",
1180 <  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@4",
1181 <  "oper_flags_items", "oper_flags_item", "$@5", "$@6",
1182 <  "oper_flags_item_atom", "class_entry", "$@7", "class_name_b",
1183 <  "class_items", "class_item", "class_name", "class_name_t",
1184 <  "class_ping_time", "class_ping_warning", "class_number_per_ip",
1185 <  "class_connectfreq", "class_max_number", "class_max_global",
1186 <  "class_max_local", "class_max_ident", "class_sendq",
1170 >  "serverinfo_max_clients", "serverinfo_max_nick_length",
1171 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1172 >  "admin_items", "admin_item", "admin_name", "admin_email",
1173 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1174 >  "motd_mask", "motd_file", "pseudo_entry", "$@2", "pseudo_items",
1175 >  "pseudo_item", "pseudo_command", "pseudo_name", "pseudo_prepend",
1176 >  "pseudo_target", "logging_entry", "logging_items", "logging_item",
1177 >  "logging_use_logging", "logging_file_entry", "$@3", "logging_file_items",
1178 >  "logging_file_item", "logging_file_name", "logging_file_size",
1179 >  "logging_file_type", "$@4", "logging_file_type_items",
1180 >  "logging_file_type_item", "oper_entry", "$@5", "oper_items", "oper_item",
1181 >  "oper_name", "oper_user", "oper_password", "oper_encrypted",
1182 >  "oper_rsa_public_key_file", "oper_ssl_certificate_fingerprint",
1183 >  "oper_ssl_connection_required", "oper_class", "oper_umodes", "$@6",
1184 >  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@7",
1185 >  "oper_flags_items", "oper_flags_item", "class_entry", "$@8",
1186 >  "class_items", "class_item", "class_name", "class_ping_time",
1187 >  "class_number_per_ip", "class_connectfreq", "class_max_channels",
1188 >  "class_max_number", "class_max_global", "class_max_local",
1189 >  "class_max_ident", "class_sendq", "class_recvq",
1190    "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1191 <  "class_number_per_cidr", "listen_entry", "$@8", "listen_flags", "$@9",
1192 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1193 <  "listen_port", "$@10", "port_items", "port_item", "listen_address",
1194 <  "listen_host", "auth_entry", "$@11", "auth_items", "auth_item",
1195 <  "auth_user", "auth_passwd", "auth_class", "auth_encrypted", "auth_flags",
1196 <  "$@12", "auth_flags_items", "auth_flags_item", "$@13", "$@14",
1197 <  "auth_flags_item_atom", "auth_spoof", "auth_redir_serv",
1191 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1192 >  "class_flags", "$@9", "class_flags_items", "class_flags_item",
1193 >  "listen_entry", "$@10", "listen_flags", "$@11", "listen_flags_items",
1194 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1195 >  "$@12", "port_items", "port_item", "listen_address", "listen_host",
1196 >  "auth_entry", "$@13", "auth_items", "auth_item", "auth_user",
1197 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@14",
1198 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1199    "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1200 <  "resv_creason", "resv_channel", "resv_nick", "shared_entry", "$@16",
1200 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1201 >  "service_items", "service_item", "service_name", "shared_entry", "$@16",
1202    "shared_items", "shared_item", "shared_name", "shared_user",
1203    "shared_type", "$@17", "shared_types", "shared_type_item",
1204    "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1205    "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1206 <  "connect_entry", "$@20", "connect_name_b", "connect_items",
1207 <  "connect_item", "connect_name", "connect_name_t", "connect_host",
1208 <  "connect_vhost", "connect_send_password", "connect_accept_password",
1206 >  "connect_entry", "$@20", "connect_items", "connect_item", "connect_name",
1207 >  "connect_host", "connect_vhost", "connect_send_password",
1208 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1209    "connect_port", "connect_aftype", "connect_flags", "$@21",
1210 <  "connect_flags_items", "connect_flags_item", "$@22", "$@23",
1211 <  "connect_flags_item_atom", "connect_rsa_public_key_file",
1212 <  "connect_encrypted", "connect_hub_mask", "connect_leaf_mask",
1213 <  "connect_class", "connect_cipher_preference", "kill_entry", "$@24",
1517 <  "kill_type", "$@25", "kill_type_items", "kill_type_item", "kill_items",
1518 <  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@26",
1210 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1211 >  "connect_hub_mask", "connect_leaf_mask", "connect_class",
1212 >  "connect_ssl_cipher_list", "kill_entry", "$@22", "kill_items",
1213 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@23",
1214    "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1215 <  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@27",
1521 <  "gecos_flags", "$@28", "gecos_flags_items", "gecos_flags_item",
1215 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@24",
1216    "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1217 <  "general_entry", "general_items", "general_item", "general_max_watch",
1218 <  "general_gline_min_cidr", "general_gline_min_cidr6",
1219 <  "general_burst_away", "general_use_whois_actually",
1220 <  "general_reject_hold_time", "general_tkline_expire_notices",
1221 <  "general_kill_chase_time_limit", "general_hide_spoof_ips",
1222 <  "general_ignore_bogus_ts", "general_disable_remote_commands",
1217 >  "general_entry", "general_items", "general_item", "general_away_count",
1218 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1219 >  "general_gline_enable", "general_gline_duration",
1220 >  "general_gline_request_duration", "general_gline_min_cidr",
1221 >  "general_gline_min_cidr6", "general_tkline_expire_notices",
1222 >  "general_kill_chase_time_limit", "general_ignore_bogus_ts",
1223    "general_failed_oper_notice", "general_anti_nick_flood",
1224    "general_max_nick_time", "general_max_nick_changes",
1225    "general_max_accept", "general_anti_spam_exit_message_time",
1226    "general_ts_warn_delta", "general_ts_max_delta",
1227 <  "general_havent_read_conf", "general_kline_with_reason",
1228 <  "general_kline_reason", "general_invisible_on_connect",
1535 <  "general_warn_no_nline", "general_stats_e_disabled",
1227 >  "general_havent_read_conf", "general_invisible_on_connect",
1228 >  "general_warn_no_connect_block", "general_stats_e_disabled",
1229    "general_stats_o_oper_only", "general_stats_P_oper_only",
1230 <  "general_stats_k_oper_only", "general_stats_i_oper_only",
1231 <  "general_pace_wait", "general_caller_id_wait",
1232 <  "general_opers_bypass_callerid", "general_pace_wait_simple",
1233 <  "general_short_motd", "general_no_oper_flood",
1234 <  "general_true_no_oper_flood", "general_oper_pass_resv",
1235 <  "general_message_locale", "general_idletime", "general_dots_in_ident",
1236 <  "general_max_targets", "general_servlink_path",
1237 <  "general_default_cipher_preference", "general_compression_level",
1238 <  "general_use_egd", "general_egdpool_path", "general_ping_cookie",
1239 <  "general_disable_auth", "general_throttle_time", "general_oper_umodes",
1547 <  "$@29", "umode_oitems", "umode_oitem", "general_oper_only_umodes",
1548 <  "$@30", "umode_items", "umode_item", "general_min_nonwildcard",
1230 >  "general_stats_u_oper_only", "general_stats_k_oper_only",
1231 >  "general_stats_i_oper_only", "general_pace_wait",
1232 >  "general_caller_id_wait", "general_opers_bypass_callerid",
1233 >  "general_pace_wait_simple", "general_short_motd",
1234 >  "general_no_oper_flood", "general_true_no_oper_flood",
1235 >  "general_oper_pass_resv", "general_dots_in_ident", "general_max_targets",
1236 >  "general_ping_cookie", "general_disable_auth", "general_throttle_count",
1237 >  "general_throttle_time", "general_oper_umodes", "$@25", "umode_oitems",
1238 >  "umode_oitem", "general_oper_only_umodes", "$@26", "umode_items",
1239 >  "umode_item", "general_min_nonwildcard",
1240    "general_min_nonwildcard_simple", "general_default_floodcount",
1550  "general_client_flood", "gline_entry", "$@31", "gline_items",
1551  "gline_item", "gline_enable", "gline_duration", "gline_logging", "$@32",
1552  "gline_logging_types", "gline_logging_type_item", "gline_user",
1553  "gline_server", "gline_action", "$@33", "gdeny_types", "gdeny_type_item",
1241    "channel_entry", "channel_items", "channel_item",
1242 <  "channel_disable_fake_channels", "channel_restrict_channels",
1243 <  "channel_disable_local_channels", "channel_use_except",
1244 <  "channel_use_invex", "channel_use_knock", "channel_knock_delay",
1245 <  "channel_knock_delay_channel", "channel_max_chans_per_user",
1559 <  "channel_quiet_on_ban", "channel_max_bans",
1242 >  "channel_disable_fake_channels", "channel_invite_client_count",
1243 >  "channel_invite_client_time", "channel_knock_client_count",
1244 >  "channel_knock_client_time", "channel_knock_delay_channel",
1245 >  "channel_max_channels", "channel_max_bans",
1246    "channel_default_split_user_count", "channel_default_split_server_count",
1247    "channel_no_create_on_split", "channel_no_join_on_split",
1248 <  "channel_burst_topicwho", "channel_jflood_count", "channel_jflood_time",
1249 <  "serverhide_entry", "serverhide_items", "serverhide_item",
1250 <  "serverhide_flatten_links", "serverhide_hide_servers",
1251 <  "serverhide_hidden_name", "serverhide_links_delay", "serverhide_hidden",
1252 <  "serverhide_disable_hidden", "serverhide_hide_server_ips", 0
1248 >  "channel_jflood_count", "channel_jflood_time", "serverhide_entry",
1249 >  "serverhide_items", "serverhide_item", "serverhide_flatten_links",
1250 >  "serverhide_disable_remote_commands", "serverhide_hide_servers",
1251 >  "serverhide_hide_services", "serverhide_hidden_name",
1252 >  "serverhide_links_delay", "serverhide_hidden",
1253 >  "serverhide_hide_server_ips", YY_NULLPTR
1254   };
1255   #endif
1256  
1257   # ifdef YYPRINT
1258 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1259 <   token YYLEX-NUM.  */
1258 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1259 >   (internal) symbol number NUM (which must be that of a token).  */
1260   static const yytype_uint16 yytoknum[] =
1261   {
1262         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1595 | Line 1282 | static const yytype_uint16 yytoknum[] =
1282       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1283       465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1284       475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1285 <     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
1599 <     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
1600 <     505,   506,   507,   508,   509,   510,   511,   512,   513,   514,
1601 <      59,   125,   123,    61,    44
1285 >     485,   486,   487,   488,    59,   125,   123,    61,    44,    58
1286   };
1287   # endif
1288  
1289 < /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
1606 < static const yytype_uint16 yyr1[] =
1607 < {
1608 <       0,   265,   266,   266,   267,   267,   267,   267,   267,   267,
1609 <     267,   267,   267,   267,   267,   267,   267,   267,   267,   267,
1610 <     267,   267,   267,   267,   267,   267,   268,   268,   269,   269,
1611 <     269,   269,   269,   269,   270,   270,   271,   271,   271,   271,
1612 <     272,   273,   273,   274,   274,   274,   275,   276,   277,   278,
1613 <     278,   279,   279,   279,   279,   279,   279,   279,   279,   279,
1614 <     279,   279,   279,   279,   281,   280,   282,   282,   283,   283,
1615 <     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
1616 <     294,   295,   296,   296,   297,   297,   297,   297,   298,   299,
1617 <     300,   301,   302,   302,   303,   303,   303,   303,   303,   303,
1618 <     303,   303,   303,   303,   303,   303,   303,   304,   305,   306,
1619 <     307,   308,   309,   310,   311,   312,   313,   314,   314,   314,
1620 <     314,   314,   314,   314,   315,   317,   316,   318,   318,   319,
1621 <     319,   320,   320,   320,   320,   320,   320,   320,   320,   320,
1622 <     321,   322,   323,   324,   325,   326,   327,   329,   328,   330,
1623 <     330,   331,   331,   331,   331,   331,   331,   331,   331,   331,
1624 <     331,   331,   331,   331,   331,   331,   331,   331,   331,   331,
1625 <     333,   332,   334,   334,   336,   335,   337,   335,   338,   338,
1626 <     338,   338,   338,   338,   338,   338,   338,   338,   338,   338,
1627 <     338,   338,   338,   338,   340,   339,   341,   341,   342,   342,
1628 <     343,   343,   343,   343,   343,   343,   343,   343,   343,   343,
1629 <     343,   343,   343,   343,   344,   345,   346,   347,   348,   349,
1630 <     350,   351,   352,   353,   354,   355,   356,   357,   359,   358,
1631 <     361,   360,   362,   362,   363,   363,   363,   364,   364,   365,
1632 <     365,   365,   365,   365,   367,   366,   368,   368,   369,   369,
1633 <     370,   371,   373,   372,   374,   374,   375,   375,   375,   375,
1634 <     375,   375,   375,   375,   375,   376,   377,   378,   379,   381,
1635 <     380,   382,   382,   384,   383,   385,   383,   386,   386,   386,
1636 <     386,   386,   386,   386,   386,   386,   386,   387,   388,   389,
1637 <     391,   390,   392,   392,   393,   393,   393,   393,   394,   395,
1638 <     396,   398,   397,   399,   399,   400,   400,   400,   400,   401,
1639 <     402,   404,   403,   405,   405,   406,   406,   406,   406,   406,
1640 <     406,   406,   406,   406,   406,   406,   408,   407,   409,   409,
1641 <     410,   410,   410,   411,   413,   412,   414,   414,   415,   415,
1642 <     415,   415,   415,   415,   415,   415,   415,   415,   415,   417,
1643 <     416,   418,   418,   419,   419,   420,   420,   420,   420,   420,
1644 <     420,   420,   420,   420,   420,   420,   420,   420,   420,   420,
1645 <     421,   422,   423,   424,   425,   426,   427,   428,   428,   430,
1646 <     429,   431,   431,   433,   432,   434,   432,   435,   435,   435,
1647 <     435,   435,   436,   437,   438,   439,   440,   441,   443,   442,
1648 <     445,   444,   446,   446,   447,   448,   448,   449,   449,   449,
1649 <     449,   450,   451,   453,   452,   454,   454,   455,   455,   455,
1650 <     456,   457,   458,   459,   459,   460,   460,   461,   463,   462,
1651 <     465,   464,   466,   466,   467,   468,   468,   469,   469,   469,
1652 <     469,   470,   471,   472,   473,   473,   474,   474,   474,   474,
1653 <     474,   474,   474,   474,   474,   474,   474,   474,   474,   474,
1654 <     474,   474,   474,   474,   474,   474,   474,   474,   474,   474,
1655 <     474,   474,   474,   474,   474,   474,   474,   474,   474,   474,
1656 <     474,   474,   474,   474,   474,   474,   474,   474,   474,   474,
1657 <     474,   474,   474,   474,   474,   474,   474,   474,   474,   474,
1658 <     474,   474,   475,   476,   477,   478,   479,   480,   481,   482,
1659 <     483,   484,   485,   486,   487,   488,   489,   490,   491,   492,
1660 <     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
1661 <     502,   503,   503,   504,   505,   506,   507,   508,   509,   510,
1662 <     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
1663 <     521,   522,   523,   525,   524,   526,   526,   527,   527,   527,
1664 <     527,   527,   527,   527,   527,   527,   527,   527,   527,   527,
1665 <     527,   527,   527,   527,   527,   527,   529,   528,   530,   530,
1666 <     531,   531,   531,   531,   531,   531,   531,   531,   531,   531,
1667 <     531,   531,   531,   531,   531,   531,   531,   531,   531,   532,
1668 <     533,   534,   535,   537,   536,   538,   538,   539,   539,   539,
1669 <     539,   539,   539,   539,   540,   541,   543,   542,   544,   544,
1670 <     545,   545,   546,   547,   549,   548,   550,   550,   551,   551,
1671 <     552,   553,   553,   554,   554,   554,   554,   554,   554,   554,
1672 <     554,   554,   554,   554,   554,   554,   554,   554,   554,   554,
1673 <     554,   554,   555,   556,   557,   558,   559,   560,   561,   562,
1674 <     563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
1675 <     573,   574,   574,   575,   575,   575,   575,   575,   575,   575,
1676 <     575,   576,   577,   578,   579,   580,   581,   582
1677 < };
1289 > #define YYPACT_NINF -1083
1290  
1291 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1292 < static const yytype_uint8 yyr2[] =
1291 > #define yypact_value_is_default(Yystate) \
1292 >  (!!((Yystate) == (-1083)))
1293 >
1294 > #define YYTABLE_NINF -130
1295 >
1296 > #define yytable_value_is_error(Yytable_value) \
1297 >  0
1298 >
1299 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1300 >     STATE-NUM.  */
1301 > static const yytype_int16 yypact[] =
1302   {
1303 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1304 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1305 <       1,     1,     1,     1,     2,     2,     0,     1,     2,     3,
1306 <       3,     3,     3,     3,     0,     1,     2,     3,     3,     3,
1307 <       5,     2,     1,     1,     1,     2,     4,     4,     5,     2,
1308 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1309 <       1,     1,     1,     2,     0,     5,     3,     1,     1,     1,
1310 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1311 <       4,     5,     2,     1,     1,     1,     1,     2,     4,     4,
1312 <       4,     5,     2,     1,     1,     1,     1,     1,     1,     1,
1313 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     4,
1314 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1315 <       4,     4,     4,     4,     4,     0,     7,     0,     1,     2,
1316 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
1317 <       4,     1,     4,     4,     4,     4,     4,     0,     5,     3,
1318 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1319 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1320 <       0,     5,     3,     1,     0,     3,     0,     2,     1,     1,
1321 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1322 <       1,     1,     1,     1,     0,     7,     0,     1,     2,     1,
1323 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1324 <       1,     1,     1,     2,     4,     1,     4,     4,     4,     4,
1325 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     6,
1326 <       0,     5,     3,     1,     1,     1,     1,     2,     1,     1,
1327 <       1,     1,     1,     2,     0,     5,     3,     1,     1,     3,
1328 <       4,     4,     0,     6,     2,     1,     1,     1,     1,     1,
1329 <       1,     1,     1,     1,     2,     4,     4,     4,     4,     0,
1330 <       5,     3,     1,     0,     3,     0,     2,     1,     1,     1,
1331 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1332 <       0,     6,     2,     1,     1,     1,     1,     2,     4,     4,
1333 <       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
1334 <       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
1335 <       1,     1,     1,     1,     1,     1,     0,     6,     2,     1,
1336 <       1,     1,     2,     4,     0,     5,     3,     1,     1,     1,
1337 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
1338 <       7,     0,     1,     2,     1,     1,     1,     1,     1,     1,
1339 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
1340 <       4,     1,     4,     4,     4,     4,     4,     4,     4,     0,
1341 <       5,     3,     1,     0,     3,     0,     2,     1,     1,     1,
1342 <       1,     1,     4,     4,     4,     4,     4,     4,     0,     6,
1343 <       0,     5,     3,     1,     1,     2,     1,     1,     1,     1,
1344 <       1,     4,     4,     0,     6,     2,     1,     1,     1,     1,
1345 <       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
1346 <       0,     5,     3,     1,     1,     2,     1,     1,     1,     1,
1347 <       1,     4,     4,     5,     2,     1,     1,     1,     1,     1,
1348 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1349 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1350 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1351 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1352 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1353 <       1,     1,     4,     4,     4,     4,     4,     4,     4,     4,
1354 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1355 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1356 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1357 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1358 <       4,     4,     4,     0,     5,     3,     1,     1,     1,     1,
1359 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1360 <       1,     1,     1,     1,     1,     1,     0,     5,     3,     1,
1361 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1362 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     4,
1363 <       4,     4,     4,     0,     6,     2,     1,     1,     1,     1,
1364 <       1,     1,     1,     1,     4,     4,     0,     5,     3,     1,
1365 <       1,     1,     4,     4,     0,     5,     3,     1,     1,     1,
1366 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1367 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1368 <       1,     1,     4,     4,     4,     4,     4,     4,     4,     4,
1369 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1370 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1371 <       1,     4,     4,     4,     4,     4,     4,     4
1303 >   -1083,   639, -1083,  -184,  -226,  -207, -1083, -1083, -1083,  -202,
1304 >   -1083,  -197, -1083, -1083, -1083,  -194, -1083, -1083, -1083,  -191,
1305 >    -179, -1083,  -155, -1083,  -153, -1083, -1083, -1083, -1083, -1083,
1306 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1307 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1308 >   -1083,   283,   909,  -152,  -147,  -146,    10,  -138,   395,  -126,
1309 >    -112,   -79,   212,   -59,   -52,   -33,   355,   376,   -21,    13,
1310 >      -2,     2,    50,    38,    28,    65,    68,    25, -1083, -1083,
1311 >   -1083, -1083, -1083,    82,    97,    98,    99,   115,   122,   128,
1312 >     138,   139,   141,   143,   145,   146,   147,   229, -1083, -1083,
1313 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1314 >   -1083, -1083, -1083,   630,   566,    15, -1083,   148,    32, -1083,
1315 >   -1083,    91, -1083,   152,   153,   154,   155,   156,   158,   160,
1316 >     161,   163,   171,   173,   177,   179,   182,   183,   185,   188,
1317 >     189,   191,   194,   197,   198,   203,   207,   211,   223,   224,
1318 >   -1083,   225, -1083,   233,   234,   237,   238,   240,   241,   244,
1319 >     245,   248,   254,   256,   259,   261,   262,   263,   264,   265,
1320 >     266,   126, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1321 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1322 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1323 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1324 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1325 >   -1083,   297,    29,    19,    94,   267,   268,    36, -1083, -1083,
1326 >   -1083,     8,   529,   284, -1083,   269,   271,   272,   282,   285,
1327 >     286,   288,   291,     4, -1083, -1083, -1083, -1083, -1083, -1083,
1328 >   -1083, -1083, -1083,   129,   292,   294,   296,   301,   302,   303,
1329 >     304,   306,   308,   309,   313,   314,   315,   316,   318,   331,
1330 >     335,    46, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1331 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1332 >      71,   215,   336,    22, -1083, -1083, -1083,   103,    14, -1083,
1333 >     337,    62, -1083, -1083,    11, -1083,   358,   391,   405,   232,
1334 >   -1083,   442,   461,   360,   463,   464,   465,   464,   466,   464,
1335 >     464,   468,   470,   367,   370,   353, -1083,   354,   352,   357,
1336 >     359, -1083,   363,   365,   371,   372,   373,   374,   378,   384,
1337 >     385,   388,   393,   397,   399,     7, -1083, -1083, -1083, -1083,
1338 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1339 >   -1083, -1083, -1083, -1083,   356,   400,   401,   404,   407,   412,
1340 >     415, -1083,   419,   420,   424,   425,   427,   429,   431,   319,
1341 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1342 >   -1083, -1083, -1083, -1083, -1083, -1083,   434,   435,    20, -1083,
1343 >   -1083, -1083,   462,   361, -1083, -1083,   436,   437,    77, -1083,
1344 >   -1083, -1083,   381,   464,   478,   464,   464,   416,   490,   426,
1345 >     561,   472,   464,   475,   563,   578,   464,   579,   480,   482,
1346 >     464,   586,   587,   464,   589,   590,   591,   592,   492,   473,
1347 >     493,   474,   497,   464,   464,   499,   509,   510,  -189,  -172,
1348 >     515,   516,   517,   621,   464,   521,   523,   464,   464,   524,
1349 >     513, -1083,   514,   506,   507, -1083,   512,   518,   519,   525,
1350 >     526,    35, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1351 >   -1083, -1083,   527,   528,    40, -1083, -1083, -1083,   520,   531,
1352 >     532, -1083,   533, -1083,    52, -1083, -1083, -1083, -1083, -1083,
1353 >     622,   623,   538, -1083,   539,   537,   540,    45, -1083, -1083,
1354 >   -1083,   541,   543,   544, -1083,   545,   546,   547,   548,   549,
1355 >   -1083,   550,    39, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1356 >   -1083, -1083, -1083, -1083,   554,   555,   556,   557,    31, -1083,
1357 >   -1083, -1083, -1083,   534,   562,   575,   624,   581,   582,   588,
1358 >     464,   569, -1083, -1083,   632,   598,   637,   646,   681,   678,
1359 >     686,   688,   689,   694,   697,   698,   700,   717,   707,   708,
1360 >     711,   607, -1083,   608,   606, -1083,    48, -1083, -1083, -1083,
1361 >   -1083,   633,   614, -1083,    75,   618,   620,   625,   626,   629,
1362 >      21, -1083, -1083, -1083, -1083, -1083,   726,   634, -1083,   636,
1363 >     638, -1083,   643,    74, -1083, -1083, -1083, -1083,   640,   642,
1364 >     647, -1083,   648,   654,   658,   661,   227,   663,   665,   666,
1365 >     668,   672,   673,   674,   682,   687,   691, -1083, -1083,   745,
1366 >     753,   464,   675,   757,   801,   809,   464,   812,   813,   464,
1367 >     731,   814,   816,   464,   818,   818,   701, -1083, -1083,   807,
1368 >    -118,   808,   722,   811,   819,   704,   820,   821,   828,   822,
1369 >     823,   824,   825,   709, -1083,   827,   830,   728, -1083,   729,
1370 >   -1083,   831,   835,   732, -1083,   733,   736,   737,   739,   742,
1371 >     743,   744,   748,   749,   750,   751,   755,   756,   758,   759,
1372 >     762,   763,   764,   765,   766,   767,   768,   769,   770,   771,
1373 >     772,   773,   716,   774,   631,   775,   776,   777,   778,   779,
1374 >     780,   781,   782,   783,   784,   787,   788,   789,   790,   791,
1375 >     792,   793,   794,   795,   796, -1083, -1083,   836,   815,   754,
1376 >     840,   918,   904,   905,   906,   802, -1083,   908,   910,   804,
1377 >   -1083, -1083,   911,   912,   805,   929,   810, -1083,   817,   826,
1378 >   -1083, -1083,   916,   917,   829, -1083, -1083,   919,   833,   832,
1379 >     921,   923,   924,   925,   839,   834,   927,   838, -1083, -1083,
1380 >     928,   930,   932,   841, -1083,   842,   843,   844,   845,   846,
1381 >     847,   848,   849, -1083,   850,   851,   852,   853,   854,   855,
1382 >     856,   857,   858,   859,   860,   861,   862,   863,   864,   865,
1383 >     866, -1083, -1083,   933,   837,   867, -1083,   868, -1083,    79,
1384 >   -1083,   935,   936,   937,   938,   869, -1083,   870, -1083, -1083,
1385 >     939,   871,   941,   872, -1083, -1083, -1083, -1083, -1083, -1083,
1386 >   -1083, -1083,   464,   464,   464,   464,   464,   464,   464, -1083,
1387 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1388 >   -1083,   873,   875,   876,     9,   877,   878,   879,   880,   881,
1389 >     882,   883,   884,   885,   886,   887,   250,   888,   889, -1083,
1390 >     890,   891,   892,   893,   894,   895,   896,     5,   897,   898,
1391 >     899,   900,   901,   902,   903, -1083,   907,   913, -1083, -1083,
1392 >     914,   915, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1393 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1394 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1395 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1396 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1397 >    -167, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1398 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1399 >   -1083, -1083, -1083, -1083, -1083,   -40, -1083, -1083, -1083, -1083,
1400 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1401 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083,   920,   922,   584,
1402 >     926,   931,   934,   940,   942, -1083,   943,   944, -1083,   945,
1403 >     946,   -13,   721,   124, -1083, -1083, -1083, -1083,   947,   948,
1404 >   -1083,   949,   950,   469,   951,   952,   953,   954,   955,   676,
1405 >     956, -1083,   957,   958,   959, -1083, -1083, -1083, -1083, -1083,
1406 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1407 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1408 >   -1083,   960,   735, -1083, -1083,   961,   962,   963, -1083,   125,
1409 >   -1083, -1083, -1083, -1083,   964,   967,   968,   969, -1083, -1083,
1410 >     970,   746,   971, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1411 >   -1083, -1083, -1083, -1083, -1083, -1083,   -22, -1083, -1083, -1083,
1412 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,   818,
1413 >     818,   818, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1414 >   -1083, -1083, -1083, -1083, -1083,   -20, -1083, -1083, -1083, -1083,
1415 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,   716,
1416 >   -1083,   631, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1417 >   -1083, -1083, -1083, -1083,    -6, -1083, -1083, -1083, -1083, -1083,
1418 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,    -3, -1083,
1419 >     991,   929,   972, -1083, -1083, -1083, -1083, -1083,   973, -1083,
1420 >   -1083,   974, -1083, -1083, -1083, -1083,   975, -1083, -1083, -1083,
1421 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083,    93, -1083, -1083,
1422 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1423 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1424 >   -1083, -1083, -1083, -1083, -1083, -1083,    95, -1083, -1083, -1083,
1425 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1426 >   -1083, -1083, -1083,   108, -1083, -1083,  1009,   -45,   978,   976,
1427 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1428 >   -1083, -1083, -1083, -1083, -1083, -1083,   117, -1083, -1083, -1083,
1429 >       9, -1083, -1083, -1083, -1083,     5, -1083, -1083, -1083,   584,
1430 >   -1083,   -13, -1083, -1083, -1083,  1004,  1005,  1007, -1083,   469,
1431 >   -1083,   676, -1083,   735,   977,   982,   983,   390, -1083, -1083,
1432 >     746, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1433 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1434 >   -1083, -1083, -1083,   119, -1083, -1083, -1083,   390, -1083
1435   };
1436  
1437 < /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
1438 <   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
1439 <   means the default is an error.  */
1437 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1438 >     Performed when YYTABLE does not specify something else to do.  Zero
1439 >     means the default is an error.  */
1440   static const yytype_uint16 yydefact[] =
1441   {
1442 <       2,     0,     1,     0,     0,     0,   194,   349,   413,     0,
1443 <     428,     0,   603,   252,   398,   228,     0,     0,   125,   290,
1444 <       0,     0,   301,   326,     3,    23,    11,     4,     5,     6,
1445 <       8,     9,    10,    13,    14,    15,    16,    17,    18,    19,
1446 <      22,    20,    21,     7,    12,    24,    25,     0,     0,   196,
1447 <     351,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1764 <       0,   127,     0,     0,     0,     0,     0,     0,     0,     0,
1765 <       0,     0,    83,    84,    86,    85,   651,     0,     0,     0,
1442 >       2,     0,     1,     0,     0,     0,   229,   394,   442,     0,
1443 >     457,     0,   297,   433,   273,     0,   100,   153,   331,     0,
1444 >       0,   372,     0,   109,     0,   348,     3,    23,    11,     4,
1445 >      24,    25,     5,     6,     8,     9,    10,    13,    14,    15,
1446 >      16,    17,    18,    19,    20,    22,    21,     7,    12,    26,
1447 >      27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1448         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1449 <       0,     0,     0,     0,     0,     0,   632,   650,   645,   633,
1450 <     634,   635,   636,   638,   639,   640,   641,   637,   642,   643,
1451 <     644,   646,   647,   648,   649,   215,     0,   197,   371,     0,
1452 <     352,     0,   426,     0,     0,   424,   425,     0,   501,     0,
1449 >       0,     0,     0,     0,     0,     0,     0,     0,    92,    93,
1450 >      95,    94,   633,     0,     0,     0,     0,     0,     0,     0,
1451 >       0,     0,     0,     0,     0,     0,     0,     0,   618,   632,
1452 >     620,   621,   622,   623,   624,   625,   619,   626,   627,   628,
1453 >     629,   630,   631,     0,     0,     0,   455,     0,     0,   453,
1454 >     454,     0,   517,     0,     0,     0,     0,     0,     0,     0,
1455         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1456         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1457 +     589,     0,   563,     0,     0,     0,     0,     0,     0,     0,
1458         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1459 <       0,   576,     0,   553,     0,     0,     0,     0,     0,     0,
1459 >       0,     0,   468,   469,   470,   515,   516,   509,   510,   511,
1460 >     512,   513,   508,   480,   471,   472,   473,   474,   475,   476,
1461 >     477,   478,   479,   505,   481,   482,   514,   484,   489,   490,
1462 >     485,   487,   486,   498,   499,   488,   491,   492,   493,   494,
1463 >     483,   496,   506,   507,   503,   504,   497,   495,   501,   502,
1464 >     500,     0,     0,     0,     0,     0,     0,     0,    46,    47,
1465 >      48,     0,     0,     0,   659,     0,     0,     0,     0,     0,
1466 >       0,     0,     0,     0,   650,   651,   652,   653,   654,   657,
1467 >     655,   656,   658,     0,     0,     0,     0,     0,     0,     0,
1468         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1469 <       0,     0,     0,     0,     0,   445,   500,   495,   496,   493,
1470 <     497,   498,   494,   456,   446,   447,   485,   448,   449,   450,
1471 <     451,   452,   453,   454,   455,   490,   457,   458,   459,   460,
1472 <     499,   462,   467,   463,   465,   464,   479,   480,   466,   468,
1473 <     469,   470,   471,   473,   472,   461,   475,   484,   486,   487,
1474 <     476,   477,   491,   492,   489,   478,   474,   482,   483,   481,
1475 <     488,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1476 <       0,     0,     0,     0,     0,     0,     0,     0,     0,    93,
1477 <      94,    95,    98,   105,    99,   103,   100,   101,   104,   102,
1478 <      96,    97,     0,     0,     0,     0,    42,    43,    44,   141,
1479 <       0,   128,     0,   680,     0,     0,     0,     0,     0,     0,
1480 <       0,     0,   672,   673,   674,   678,   675,   677,   676,   679,
1481 <       0,     0,     0,     0,     0,     0,     0,     0,    64,     0,
1482 <       0,     0,     0,     0,    50,    62,    61,    58,    51,    60,
1483 <      54,    55,    56,    52,    59,    57,    53,     0,     0,    87,
1791 <       0,     0,     0,     0,    82,     0,     0,     0,     0,     0,
1469 >       0,     0,    54,    69,    66,    64,    70,    71,    65,    55,
1470 >      68,    58,    59,    60,    56,    67,    61,    62,    63,    57,
1471 >       0,     0,     0,     0,   124,   125,   126,     0,     0,   346,
1472 >       0,     0,   344,   345,     0,    96,     0,     0,     0,     0,
1473 >      91,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1474 >       0,     0,     0,     0,     0,     0,   617,     0,     0,     0,
1475 >       0,   267,     0,     0,     0,     0,     0,     0,     0,     0,
1476 >       0,     0,     0,     0,     0,     0,   232,   233,   236,   238,
1477 >     239,   240,   241,   242,   243,   244,   245,   246,   234,   235,
1478 >     237,   247,   248,   249,     0,     0,     0,     0,     0,     0,
1479 >       0,   422,     0,     0,     0,     0,     0,     0,     0,     0,
1480 >     397,   398,   399,   400,   401,   402,   403,   405,   404,   407,
1481 >     411,   408,   409,   410,   406,   448,     0,     0,     0,   445,
1482 >     446,   447,     0,     0,   452,   463,     0,     0,     0,   460,
1483 >     461,   462,     0,     0,     0,     0,     0,     0,     0,     0,
1484         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1793       0,     0,     0,     0,   631,     0,     0,   419,     0,     0,
1794       0,   416,   417,   418,     0,     0,   423,   440,     0,     0,
1795     430,   439,     0,   436,   437,   438,     0,     0,     0,     0,
1485         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1486         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1487         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1488 +       0,   467,     0,     0,     0,   314,     0,     0,     0,     0,
1489 +       0,     0,   300,   301,   302,   303,   308,   304,   305,   306,
1490 +     307,   439,     0,     0,     0,   436,   437,   438,     0,     0,
1491 +       0,   275,     0,   285,     0,   283,   284,   286,   287,    49,
1492 +       0,     0,     0,    45,     0,     0,     0,     0,   103,   104,
1493 +     105,     0,     0,     0,   202,     0,     0,     0,     0,     0,
1494 +     176,     0,     0,   156,   157,   158,   159,   162,   163,   164,
1495 +     165,   161,   160,   166,     0,     0,     0,     0,     0,   334,
1496 +     335,   336,   337,     0,     0,     0,     0,     0,     0,     0,
1497 +       0,     0,   649,    72,     0,     0,     0,     0,     0,     0,
1498         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1499 +       0,     0,    53,     0,     0,   380,     0,   375,   376,   377,
1500 +     127,     0,     0,   123,     0,     0,     0,     0,     0,     0,
1501 +       0,   112,   113,   115,   114,   116,     0,     0,   343,     0,
1502 +       0,   358,     0,     0,   351,   352,   353,   354,     0,     0,
1503 +       0,    90,     0,     0,     0,     0,    28,     0,     0,     0,
1504 +       0,     0,     0,     0,     0,     0,     0,   616,   250,     0,
1505         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1506 <       0,     0,   444,   613,   624,     0,     0,   616,     0,     0,
1802 <       0,   606,   607,   608,   609,   610,   611,   612,     0,     0,
1803 <       0,   269,     0,     0,     0,     0,     0,     0,   255,   256,
1804 <     257,   258,   263,   259,   260,   261,   262,   410,     0,   400,
1805 <       0,   409,     0,   406,   407,   408,     0,   230,     0,     0,
1806 <       0,   240,     0,   238,   239,   241,   242,   106,     0,     0,
1506 >       0,     0,     0,     0,     0,     0,     0,   231,   412,     0,
1507         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1508 <       0,    92,    45,     0,     0,     0,    41,     0,     0,     0,
1509 <       0,     0,     0,   293,   294,   295,   296,     0,     0,     0,
1810 <       0,     0,     0,     0,     0,   671,    63,     0,     0,     0,
1508 >       0,     0,     0,     0,   396,     0,     0,     0,   444,     0,
1509 >     451,     0,     0,     0,   459,     0,     0,     0,     0,     0,
1510         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1812      49,     0,     0,   311,     0,     0,   304,   305,   306,   307,
1813       0,     0,   334,     0,   329,   330,   331,     0,     0,     0,
1814      81,     0,     0,     0,     0,     0,    26,     0,     0,     0,
1511         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1816     630,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1817       0,     0,     0,     0,     0,     0,   199,   200,   203,   204,
1818     206,   207,   208,   209,   210,   211,   212,   201,   202,   205,
1819       0,     0,     0,     0,     0,     0,   379,     0,     0,     0,
1820       0,     0,     0,     0,     0,     0,   354,   355,   356,   357,
1821     358,   359,   361,   360,   362,   367,   366,   363,   364,   365,
1822     368,     0,     0,     0,   415,     0,   422,     0,     0,     0,
1823       0,   435,     0,     0,     0,     0,     0,     0,     0,     0,
1512         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1513         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1514 +       0,     0,     0,     0,     0,   466,   309,     0,     0,     0,
1515 +       0,     0,     0,     0,     0,     0,   299,     0,     0,     0,
1516 +     435,   288,     0,     0,     0,     0,     0,   282,     0,     0,
1517 +      44,   106,     0,     0,     0,   102,   167,     0,     0,     0,
1518 +       0,     0,     0,     0,     0,     0,     0,     0,   155,   338,
1519 +       0,     0,     0,     0,   333,     0,     0,     0,     0,     0,
1520 +       0,     0,     0,   648,     0,     0,     0,     0,     0,     0,
1521         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1522 +       0,    52,   378,     0,     0,     0,   374,     0,   122,     0,
1523 +     117,     0,     0,     0,     0,     0,   111,     0,   342,   355,
1524 +       0,     0,     0,     0,   350,    99,    98,    97,   643,   642,
1525 +     634,   635,    28,    28,    28,    28,    28,    28,    28,    30,
1526 +      29,   636,   646,   647,   637,   638,   639,   641,   640,   644,
1527 +     645,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1528 +       0,     0,     0,     0,     0,     0,    38,     0,     0,   230,
1529         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1530 <       0,     0,     0,    34,     0,     0,     0,     0,     0,     0,
1531 <     443,     0,     0,     0,     0,     0,     0,     0,   605,   264,
1532 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   254,
1533 <       0,     0,     0,     0,   405,   243,     0,     0,     0,     0,
1534 <       0,   237,     0,     0,     0,     0,     0,     0,     0,     0,
1535 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1536 <      91,     0,     0,    40,     0,     0,     0,   170,     0,     0,
1537 <       0,   147,     0,     0,   130,   131,   132,   133,   136,   137,
1538 <     135,   134,   138,   297,     0,     0,     0,     0,   292,     0,
1539 <       0,     0,     0,     0,     0,     0,   670,     0,     0,     0,
1540 <       0,     0,     0,     0,     0,     0,     0,     0,     0,    48,
1541 <     308,     0,     0,     0,     0,   303,   332,     0,     0,     0,
1542 <     328,    90,    89,    88,   667,   664,   663,   652,   654,    26,
1543 <      26,    26,    26,    26,    28,    27,   658,   659,   662,   660,
1544 <     665,   666,   668,   669,   661,   653,   655,   656,   657,   213,
1545 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1546 <       0,     0,     0,     0,   198,   369,     0,     0,     0,     0,
1547 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1548 <       0,   353,     0,     0,   414,   427,     0,     0,     0,   429,
1549 <     514,   518,   505,   534,   547,   546,   601,   551,   512,   543,
1550 <     549,   513,   503,   504,   521,   510,   542,   511,   524,   509,
1551 <     523,   522,   517,   516,   515,   544,   502,   541,   599,   600,
1552 <     538,   535,   580,   596,   597,   581,   582,   583,   584,   591,
1553 <     585,   594,   598,   587,   592,   588,   593,   586,   590,   589,
1554 <     595,     0,   579,   540,   557,   573,   574,   558,   559,   560,
1555 <     561,   568,   562,   571,   575,   564,   569,   565,   570,   563,
1556 <     567,   566,   572,     0,   556,   533,   536,   550,   507,   545,
1557 <     508,   537,   526,   531,   532,   529,   530,   527,   528,   520,
1558 <     519,    34,    34,    34,    36,    35,   602,   552,   539,   548,
1559 <     506,   525,     0,     0,     0,     0,     0,     0,   604,     0,
1560 <       0,   275,     0,     0,     0,     0,     0,   253,     0,     0,
1561 <       0,   399,     0,     0,     0,   248,   244,   247,   229,   110,
1562 <     116,   114,   113,   115,   111,   112,   109,   117,   123,   118,
1563 <     122,   120,   121,   119,   108,   107,   124,    46,    47,   139,
1564 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   129,
1565 <       0,     0,     0,   291,   686,   681,   685,   683,   687,   682,
1566 <     684,    74,    80,    72,    76,    75,    71,    70,    68,    69,
1567 <       0,    67,    73,    79,    77,    78,     0,     0,     0,   302,
1568 <       0,     0,   327,    29,    30,    31,    32,    33,     0,     0,
1569 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1570 <       0,   195,     0,     0,     0,     0,     0,     0,   385,     0,
1571 <       0,     0,     0,     0,     0,     0,     0,   350,   420,   421,
1572 <     441,   442,   434,     0,   433,   577,     0,   554,     0,    37,
1573 <      38,    39,   629,   628,     0,   627,   615,   614,   621,   620,
1872 <       0,   619,   623,   622,   267,   268,   273,     0,   272,     0,
1873 <     266,   289,   288,   287,   265,   412,   404,     0,   403,   411,
1874 <     235,   236,   234,     0,   233,   251,   250,     0,     0,     0,
1875 <       0,     0,   176,     0,     0,     0,     0,     0,   126,   299,
1876 <     300,   298,    65,     0,   309,   315,   321,   325,   324,   323,
1877 <     320,   316,   319,   322,   317,   318,     0,   314,   310,   333,
1878 <     338,   344,   348,   347,   346,   343,   339,   342,   345,   340,
1879 <     341,     0,   337,   225,   226,   219,   221,   223,   222,   220,
1880 <     214,   227,   218,   216,   217,   224,   375,   377,   378,   397,
1881 <     396,   393,   383,     0,   382,     0,   372,   394,   395,   370,
1882 <     376,   392,   374,   373,   431,     0,   578,   555,   625,     0,
1883 <     617,     0,     0,   270,   275,   281,   282,   278,   284,   280,
1884 <     279,   286,   283,   285,   277,   276,   401,     0,   231,     0,
1885 <     249,   246,   245,   146,   144,   174,     0,   173,     0,   140,
1886 <     143,   145,   151,   167,   168,   152,   153,   154,   155,   162,
1887 <     156,   165,   169,   158,   163,   159,   164,   157,   161,   160,
1888 <     166,     0,   150,   142,    66,   312,     0,   335,     0,     0,
1889 <     380,   385,   389,   390,   387,   388,   391,   386,   432,   626,
1890 <     618,   274,   271,   402,   232,     0,   171,   176,   186,   184,
1891 <     193,   183,   178,   187,   191,   180,   188,   190,   185,   179,
1892 <     192,   189,   181,   182,   177,   148,     0,   313,   336,   384,
1893 <     381,   175,   172,   149
1530 >       0,     0,     0,     0,     0,   395,     0,     0,   443,   456,
1531 >       0,     0,   458,   531,   535,   518,   519,   550,   521,   615,
1532 >     560,   557,   530,   523,   522,   525,   526,   524,   538,   529,
1533 >     539,   528,   534,   533,   532,   558,   520,   613,   614,   554,
1534 >     599,   593,   609,   594,   595,   596,   604,   612,   597,   606,
1535 >     610,   600,   611,   601,   605,   598,   608,   603,   602,   607,
1536 >       0,   592,   556,   572,   573,   574,   567,   585,   568,   569,
1537 >     570,   580,   588,   571,   582,   586,   576,   587,   577,   581,
1538 >     575,   584,   579,   578,   583,     0,   566,   551,   549,   552,
1539 >     559,   553,   541,   547,   548,   545,   546,   542,   543,   544,
1540 >     561,   562,   527,   555,   537,   536,   540,     0,     0,     0,
1541 >       0,     0,     0,     0,     0,   298,     0,     0,   434,     0,
1542 >       0,     0,   293,   289,   292,   274,    50,    51,     0,     0,
1543 >     101,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1544 >       0,   154,     0,     0,     0,   332,   661,   660,   666,   664,
1545 >     667,   662,   663,   665,    81,    89,    80,    87,    88,    79,
1546 >      83,    82,    74,    73,    78,    75,    77,    86,    76,    84,
1547 >      85,     0,     0,   373,   128,     0,     0,     0,   140,     0,
1548 >     132,   133,   135,   134,     0,     0,     0,     0,   110,   347,
1549 >       0,     0,     0,   349,    31,    32,    33,    34,    35,    36,
1550 >      37,   262,   263,   254,   272,   271,     0,   270,   255,   257,
1551 >     259,   266,   258,   256,   265,   251,   264,   253,   252,    38,
1552 >      38,    38,    40,    39,   260,   261,   417,   420,   421,   431,
1553 >     428,   414,   429,   426,   427,     0,   425,   430,   413,   419,
1554 >     416,   418,   432,   415,   449,   450,   464,   465,   590,     0,
1555 >     564,     0,   312,   313,   322,   319,   324,   320,   321,   327,
1556 >     323,   325,   318,   326,     0,   317,   311,   330,   329,   328,
1557 >     310,   441,   440,   296,   295,   280,   281,   279,     0,   278,
1558 >       0,     0,     0,   107,   108,   175,   171,   222,   209,   219,
1559 >     218,   207,   212,   228,   221,   226,   211,   214,   223,   225,
1560 >     220,   227,   215,   217,   224,   213,   216,     0,   205,   168,
1561 >     170,   172,   173,   174,   185,   186,   187,   180,   198,   181,
1562 >     182,   183,   193,   201,   184,   195,   199,   189,   200,   190,
1563 >     194,   188,   197,   192,   191,   196,     0,   179,   169,   341,
1564 >     339,   340,   379,   384,   390,   393,   386,   392,   387,   391,
1565 >     389,   385,   388,     0,   383,   136,     0,     0,     0,     0,
1566 >     131,   119,   118,   120,   121,   356,   362,   368,   371,   364,
1567 >     370,   365,   369,   367,   363,   366,     0,   361,   357,   268,
1568 >       0,    41,    42,    43,   423,     0,   591,   565,   315,     0,
1569 >     276,     0,   294,   291,   290,     0,     0,     0,   203,     0,
1570 >     177,     0,   381,     0,     0,     0,     0,     0,   130,   359,
1571 >       0,   269,   424,   316,   277,   208,   206,   210,   204,   178,
1572 >     382,   137,   139,   138,   146,   151,   150,   145,   148,   152,
1573 >     149,   144,   147,     0,   143,   360,   141,     0,   142
1574   };
1575  
1576 < /* YYDEFGOTO[NTERM-NUM].  */
1576 >  /* YYPGOTO[NTERM-NUM].  */
1577 > static const yytype_int16 yypgoto[] =
1578 > {
1579 >   -1083, -1083, -1083,  -381,  -313, -1082,  -644, -1083, -1083,   980,
1580 >   -1083, -1083, -1083, -1083,   874, -1083, -1083, -1083, -1083, -1083,
1581 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1582 >   -1083, -1083, -1083, -1083,   981, -1083, -1083, -1083, -1083, -1083,
1583 >   -1083,   644, -1083, -1083, -1083, -1083, -1083,   457, -1083, -1083,
1584 >   -1083, -1083, -1083, -1083,   965, -1083, -1083, -1083, -1083,    84,
1585 >   -1083, -1083, -1083, -1083, -1083,  -244, -1083, -1083, -1083,   628,
1586 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1587 >   -1083,  -137, -1083, -1083, -1083,  -133, -1083, -1083, -1083,   966,
1588 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1589 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,  -108,
1590 >   -1083, -1083, -1083, -1083, -1083,  -116, -1083,   659, -1083, -1083,
1591 >   -1083,    -4, -1083, -1083, -1083, -1083, -1083,   690, -1083, -1083,
1592 >   -1083, -1083, -1083, -1083, -1083,  -111, -1083, -1083, -1083, -1083,
1593 >   -1083, -1083,   635, -1083, -1083, -1083, -1083, -1083,   979, -1083,
1594 >   -1083, -1083, -1083,   559, -1083, -1083, -1083, -1083, -1083,  -131,
1595 >   -1083, -1083, -1083,   593, -1083, -1083, -1083, -1083,  -120, -1083,
1596 >   -1083, -1083,   785, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1597 >   -1083, -1083, -1083, -1083,   -99, -1083, -1083, -1083, -1083, -1083,
1598 >   -1083, -1083, -1083,   683, -1083, -1083, -1083, -1083, -1083,   798,
1599 >   -1083, -1083, -1083, -1083,  1052, -1083, -1083, -1083, -1083,   800,
1600 >   -1083, -1083, -1083, -1083,  1000, -1083, -1083, -1083, -1083, -1083,
1601 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1602 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1603 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1604 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1605 >   -1083,    41, -1083, -1083, -1083,    80, -1083, -1083, -1083, -1083,
1606 >   -1083,  1078, -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,
1607 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083, -1083,   984, -1083,
1608 >   -1083, -1083, -1083, -1083, -1083, -1083, -1083
1609 > };
1610 >
1611 >  /* YYDEFGOTO[NTERM-NUM].  */
1612   static const yytype_int16 yydefgoto[] =
1613   {
1614 <      -1,     1,    24,   834,   835,   984,   985,    25,   275,   276,
1615 <     277,   278,    26,   313,   314,   315,   534,  1070,  1071,   316,
1616 <     317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
1617 <      27,    71,    72,    73,    74,    75,    28,   258,   259,   260,
1618 <     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
1619 <     271,    29,    61,   280,   773,   774,   775,   281,   776,   777,
1620 <     778,   779,   780,   781,  1046,  1301,  1302,   782,  1042,  1276,
1621 <    1277,  1325,  1278,  1344,    30,    49,   116,   595,   596,   597,
1622 <     117,   598,   599,   600,   601,   602,   603,   604,   605,   606,
1623 <     607,   608,   609,    31,    58,   481,   736,  1163,  1164,   482,
1624 <     483,   484,  1169,  1016,  1017,   485,   486,    32,    56,   457,
1625 <     458,   459,   460,   461,   462,   463,   722,  1147,  1148,  1252,
1626 <    1149,  1265,   464,   465,   466,    33,    62,   512,   513,   514,
1627 <     515,   516,    34,    65,   545,   546,   547,   548,   549,   812,
1628 <    1196,  1197,    35,    66,   553,   554,   555,   556,   818,  1211,
1629 <    1212,    36,    50,   119,   625,   626,   627,   120,   628,   629,
1630 <     630,   631,   632,   633,   634,   871,  1233,  1234,  1309,  1235,
1631 <    1317,   635,   636,   637,   638,   639,   640,    37,    57,   471,
1632 <     731,  1157,  1158,   472,   473,   474,   475,    38,    51,   360,
1633 <     361,   362,   363,    39,   124,   125,   126,    40,    53,   371,
1634 <     649,  1123,  1124,   372,   373,   374,   375,    41,   184,   185,
1635 <     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
1636 <     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
1637 <     206,   207,   208,   209,   210,   211,   212,   213,   214,   215,
1638 <     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
1639 <     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
1640 <     410,   963,   964,   236,   408,   941,   942,   237,   238,   239,
1926 <     240,    42,    55,   440,   441,   442,   443,   444,   714,  1140,
1927 <    1141,   445,   446,   447,   711,  1134,  1135,    43,    95,    96,
1614 >      -1,     1,    26,   839,   840,  1102,  1103,    27,   227,   228,
1615 >     229,   230,    28,   271,   272,   273,   274,   275,   276,   277,
1616 >     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
1617 >     288,   289,    29,    77,    78,    79,    80,    81,    30,    63,
1618 >     507,   508,   509,   510,    31,    70,   590,   591,   592,   593,
1619 >     594,   595,    32,   293,   294,   295,   296,   297,  1059,  1060,
1620 >    1061,  1062,  1063,  1238,  1313,  1314,    33,    64,   522,   523,
1621 >     524,   525,   526,   527,   528,   529,   530,   531,   532,   765,
1622 >    1216,  1217,   533,   759,  1187,  1188,    34,    53,   345,   346,
1623 >     347,   348,   349,   350,   351,   352,   353,   354,   355,   356,
1624 >     357,   358,   359,   360,   361,   362,   363,   632,  1086,  1087,
1625 >      35,    61,   493,   744,  1158,  1159,   494,   495,   496,  1162,
1626 >    1003,  1004,   497,   498,    36,    59,   471,   472,   473,   474,
1627 >     475,   476,   477,   729,  1144,  1145,   478,   479,   480,    37,
1628 >      65,   538,   539,   540,   541,   542,    38,   301,   302,   303,
1629 >      39,    72,   603,   604,   605,   606,   607,   821,  1256,  1257,
1630 >      40,    68,   576,   577,   578,   579,   804,  1233,  1234,    41,
1631 >      54,   379,   380,   381,   382,   383,   384,   385,   386,   387,
1632 >     388,   389,   655,  1115,  1116,   390,   391,   392,   393,   394,
1633 >      42,    60,   484,   485,   486,   487,    43,    55,   398,   399,
1634 >     400,   401,    44,   118,   119,   120,    45,    57,   408,   409,
1635 >     410,   411,    46,   171,   172,   173,   174,   175,   176,   177,
1636 >     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
1637 >     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
1638 >     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
1639 >     208,   209,   210,   211,   212,   213,   214,   215,   216,   441,
1640 >     965,   966,   217,   439,   940,   941,   218,   219,   220,    47,
1641        97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
1642 <     107,   108,   109,   110,   111,   112,   113,   114,    44,   291,
1643 <     292,   293,   294,   295,   296,   297,   298,   299
1642 >     107,   108,   109,   110,   111,   112,    48,   243,   244,   245,
1643 >     246,   247,   248,   249,   250,   251,   252
1644   };
1645  
1646 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1647 <   STATE-NUM.  */
1648 < #define YYPACT_NINF -949
1649 < static const yytype_int16 yypact[] =
1646 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1647 >     positive, shift that token.  If negative, reduce the rule whose
1648 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1649 > static const yytype_int16 yytable[] =
1650   {
1651 <    -949,   670,  -949,  -256,  -248,  -245,  -949,  -949,  -949,  -212,
1652 <    -949,  -205,  -949,  -949,  -949,  -949,  -189,  -183,  -949,  -949,
1653 <    -154,  -152,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1654 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1655 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,    22,   642,  -127,
1656 <     -31,  -132,     5,  -125,   415,  -119,   -98,   -89,   -86,   578,
1657 <      14,    -8,   -75,   664,   313,   -74,   -61,   -45,   -46,   -37,
1658 <     -23,    31,  -949,  -949,  -949,  -949,  -949,   -22,    15,    30,
1659 <      33,    41,    42,    47,    48,    50,    61,    62,    70,    78,
1660 <      79,    80,    86,    90,    93,    94,  -949,  -949,  -949,  -949,
1661 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1662 <    -949,  -949,  -949,  -949,  -949,  -949,   -44,  -949,  -949,    89,
1663 <    -949,    20,  -949,    99,     2,  -949,  -949,   140,  -949,   100,
1664 <     104,   106,   111,   113,   115,   122,   123,   126,   127,   128,
1665 <     129,   131,   133,   135,   136,   137,   145,   147,   148,   151,
1666 <     155,   156,   157,   159,   163,   165,   167,   169,   174,   175,
1667 <     177,  -949,   178,  -949,   186,   187,   188,   193,   194,   197,
1668 <     199,   200,   205,   206,   209,   210,   211,   212,   213,   214,
1669 <     219,   220,   225,   228,    10,  -949,  -949,  -949,  -949,  -949,
1670 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1671 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1672 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1673 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1674 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1675 <    -949,   364,   308,    92,   318,    17,   229,   230,   231,   232,
1676 <     236,   237,   241,   242,   244,   245,   248,   250,   226,  -949,
1677 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1678 <    -949,  -949,    63,   251,   252,    60,  -949,  -949,  -949,  -949,
1679 <     182,  -949,    24,  -949,   253,   254,   255,   260,   270,   271,
1680 <     272,   192,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1681 <      72,   273,   274,   275,   276,   279,   281,   282,  -949,   285,
1682 <     286,   287,   288,   132,  -949,  -949,  -949,  -949,  -949,  -949,
1683 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,   183,   102,  -949,
1684 <     222,   293,   336,   299,  -949,   198,   431,   432,   368,   369,
1685 <     436,   436,   440,   441,   376,   379,   446,   436,   381,   390,
1686 <     391,   392,   393,   332,  -949,   726,   521,  -949,   330,   331,
1687 <      76,  -949,  -949,  -949,   442,   338,  -949,  -949,   333,   337,
1688 <    -949,  -949,    57,  -949,  -949,  -949,   404,   436,   408,   436,
1689 <     482,   461,   486,   423,   424,   491,   470,   429,   496,   497,
1690 <     498,   434,   436,   445,   447,   436,   493,   450,   517,   518,
1691 <     436,   522,   523,   499,   526,   528,   463,   464,   400,   469,
1692 <     405,   436,   436,   475,   436,   514,   488,   489,   492,  -131,
1693 <    -110,   494,   501,   436,   436,   548,   436,   504,   505,   506,
1694 <     510,   428,  -949,  -949,  -949,   420,   427,  -949,   430,   448,
1695 <     112,  -949,  -949,  -949,  -949,  -949,  -949,  -949,   435,   454,
1696 <     457,  -949,   459,   462,   465,   466,   467,   118,  -949,  -949,
1697 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,   468,  -949,
1698 <     472,  -949,    74,  -949,  -949,  -949,   449,  -949,   474,   483,
1699 <     490,  -949,    29,  -949,  -949,  -949,  -949,  -949,   555,   557,
1700 <     560,   571,   573,   579,   599,   601,   360,   602,   604,   561,
1701 <     502,  -949,  -949,   608,   611,   507,  -949,   305,   511,   503,
1702 <     512,   515,   152,  -949,  -949,  -949,  -949,   568,   577,   580,
1703 <     626,   583,   584,   436,   524,  -949,  -949,   634,   586,   637,
1704 <     638,   639,   640,   641,   532,   646,   672,   648,   651,   547,
1705 <    -949,   551,   549,  -949,   550,    69,  -949,  -949,  -949,  -949,
1706 <     558,   556,  -949,    75,  -949,  -949,  -949,   562,   563,   564,
1707 <    -949,   565,   566,   569,   572,   576,   207,   582,   587,   588,
1708 <     589,   592,   593,   594,   597,   598,   603,   607,   609,   610,
1709 <    -949,   615,   574,   581,   605,   616,   617,   618,   619,   620,
1710 <     622,   623,   624,   625,   628,   116,  -949,  -949,  -949,  -949,
1711 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1712 <     629,   632,   645,   649,   650,   652,  -949,   653,   654,   655,
1713 <     656,   660,   665,   667,   668,   160,  -949,  -949,  -949,  -949,
1714 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1715 <    -949,   675,   686,   678,  -949,   681,  -949,   687,   690,   682,
1716 <     688,  -949,   689,   691,   693,   694,   695,   696,   700,   704,
1717 <     705,   707,   708,   715,   718,   722,   723,   725,   727,   728,
1718 <     730,   731,   732,   733,   737,   741,   742,   744,   745,   747,
1719 <     748,   749,   750,   751,   692,   752,   729,   753,   754,   755,
1720 <     756,   757,   758,   759,   760,   761,   762,   763,   764,   765,
1721 <     767,   768,   769,    49,   770,   771,   772,   773,   774,   775,
1722 <    -949,   683,   436,   712,   776,   709,   711,   777,  -949,  -949,
1723 <     797,   714,   778,   799,   783,   833,   836,   873,   780,  -949,
1724 <     883,   779,   885,   784,  -949,  -949,   782,   890,   893,   796,
1725 <     787,  -949,   788,   789,   790,   791,   792,   793,   794,   795,
1726 <     798,   800,   801,   802,   803,   804,   805,   806,   807,   808,
1727 <    -949,   809,   810,  -949,   811,   812,   813,  -949,   814,   815,
1728 <     816,  -949,   817,   181,  -949,  -949,  -949,  -949,  -949,  -949,
1729 <    -949,  -949,  -949,  -949,   903,   904,   906,   821,  -949,   822,
1730 <     823,   824,   825,   826,   827,   828,  -949,   829,   830,   831,
1731 <     832,   834,   835,   837,   -80,   838,   839,   840,   841,  -949,
1732 <    -949,   919,   842,   920,   843,  -949,  -949,   921,   844,   846,
1733 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,   436,
1734 <     436,   436,   436,   436,  -949,  -949,  -949,  -949,  -949,  -949,
1735 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1736 <     962,   965,   436,   971,   973,   977,   978,   957,   980,   981,
1737 <     436,   436,   548,   853,  -949,  -949,   961,  -117,   963,   964,
1738 <     918,   855,   966,   967,   968,   969,   992,   972,   974,   975,
1739 <     864,  -949,   866,   869,  -949,  -949,   870,   871,   662,  -949,
1740 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1741 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1742 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1743 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1744 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1745 <    -949,  -244,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1746 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1747 <    -949,  -949,  -949,  -236,  -949,  -949,  -949,  -949,  -949,  -949,
1748 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1749 <    -949,   548,   548,   548,  -949,  -949,  -949,  -949,  -949,  -949,
1750 <    -949,  -949,    -3,   872,   874,    -2,   875,   876,  -949,   877,
1751 <     878,  1003,   879,   880,   881,   882,   884,  -949,   886,   703,
1752 <     887,  -949,   -63,   888,   889,   676,   891,  -949,  -949,  -949,
1753 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1754 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1755 <     990,   948,   894,   997,   998,   999,   895,  1000,   896,  -949,
1756 <     899,   900,   901,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1757 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1758 <    -224,  -949,  -949,  -949,  -949,  -949,   902,   570,   905,  -949,
1759 <     907,   627,  -949,  -949,  -949,  -949,  -949,  -949,   908,   909,
1760 <     910,   911,   912,   913,   914,   915,   916,   917,   922,   923,
1761 <     924,  -949,   925,   926,   927,   928,   929,   930,  1024,   931,
1762 <     932,   933,   934,   935,   936,   937,   938,  -949,  -949,  -949,
1763 <    -949,  -949,  -949,  -219,  -949,  -949,   692,  -949,   729,  -949,
1764 <    -949,  -949,  -949,  -949,  -216,  -949,  -949,  -949,  -949,  -949,
1765 <    -213,  -949,  -949,  -949,  -949,  -949,  -949,  -158,  -949,   630,
1766 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -149,  -949,  -949,
1767 <    -949,  -949,  -949,  -129,  -949,  -949,  -949,  1032,   796,   939,
1768 <     940,   941,  1034,   942,   943,   944,   766,   945,  -949,  -949,
1769 <    -949,  -949,  -949,   -80,  -949,  -949,  -949,  -949,  -949,  -949,
1770 <    -949,  -949,  -949,  -949,  -949,  -949,  -106,  -949,  -949,  -949,
1771 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1772 <    -949,   -25,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1773 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1774 <    -949,  -949,  -949,    38,  -949,     0,  -949,  -949,  -949,  -949,
1775 <    -949,  -949,  -949,  -949,  -949,   662,  -949,  -949,  -949,    -3,
1776 <    -949,    -2,   630,  -949,  1003,  -949,  -949,  -949,  -949,  -949,
1777 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,   703,  -949,   -63,
1778 <    -949,  -949,  -949,  -949,  -949,  -949,    56,  -949,   553,  -949,
1779 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1780 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1781 <    -949,    88,  -949,  -949,  -949,  -949,   570,  -949,   627,     0,
1782 <    -949,  1024,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
2070 <    -949,  -949,  -949,  -949,  -949,   553,  -949,  1034,  -949,  -949,
2071 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
2072 <    -949,  -949,  -949,  -949,  -949,  -949,   766,  -949,  -949,  -949,
2073 <    -949,  -949,  -949,  -949
1651 >     867,   868,   617,   299,   619,   234,   621,   622,   327,   504,
1652 >      51,   116,   599,  1113,   291,   585,   395,  1261,  1262,  1263,
1653 >     488,   395,   585,   291,   328,   329,    73,   711,   330,    52,
1654 >     481,   712,   534,   116,    56,   235,   462,   224,  1155,    58,
1655 >     511,   481,    62,   236,   713,    66,   504,   253,   714,   573,
1656 >      49,    50,    74,   488,   463,   237,   238,    67,   512,    75,
1657 >     239,   240,   241,   299,  1084,   871,   872,  1128,   535,   866,
1658 >     464,  1129,   573,   254,   513,   599,   331,   117,   405,   489,
1659 >    1055,    69,   396,    71,   113,   242,   490,   396,   491,   114,
1660 >     115,   505,   405,   332,   333,   334,   335,   336,   121,   117,
1661 >     676,   337,   678,   679,   465,   338,   300,   255,   514,   685,
1662 >     221,   339,   489,   689,   536,   600,   256,   693,   586,   490,
1663 >     696,   491,   340,   341,   222,   586,  1055,   122,   505,    76,
1664 >     706,   707,   123,   124,   342,   125,   126,   225,   257,  1085,
1665 >     127,   719,   258,   515,   722,   723,   397,   492,   128,   129,
1666 >     259,   397,   574,   260,   261,   130,   343,   223,   131,   466,
1667 >     482,   226,   537,   516,   132,  1285,   300,   467,   468,   133,
1668 >     134,   482,   135,   136,   137,   574,   138,   231,   600,   517,
1669 >     492,   406,  1156,  1056,   232,   262,   587,   506,   469,   139,
1670 >     140,  1157,  -129,   587,  1130,   406,   518,   519,  1131,   344,
1671 >     141,  -129,   263,   233,   588,   264,   265,   266,   407,  1114,
1672 >     142,   588,  1259,   224,  1264,   290,  1260,   143,  1265,   144,
1673 >     589,   145,   407,   146,   506,   147,   148,   589,  1268,  1056,
1674 >      82,  1270,  1269,   267,   298,  1271,   601,   782,   149,   551,
1675 >     602,   292,   646,   150,   151,   152,   520,   153,   154,   155,
1676 >     292,   268,   156,    83,    84,   667,   815,   582,   483,    85,
1677 >     309,  1099,  1100,  1101,   470,   306,   773,   403,   521,   483,
1678 >     735,   502,   305,   575,   767,   739,   269,   270,   157,  1057,
1679 >     754,   571,   584,   805,    73,   534,   304,   746,   158,   159,
1680 >     160,   161,   162,   163,    86,    87,   575,   597,   462,   601,
1681 >      88,    89,   307,   602,  1058,   308,    90,    91,    92,   823,
1682 >      74,   809,   673,   225,    93,    94,   463,    75,   853,   311,
1683 >     364,   535,   365,   858,   366,  1057,   861,  1278,   499,  1280,
1684 >     865,  1279,   464,  1281,   312,   313,   314,   226,   367,    95,
1685 >      96,   616,  1282,   164,   165,   166,  1283,   167,   168,   169,
1686 >    1058,  1289,   315,  1316,   368,  1290,   234,  1317,   170,   316,
1687 >    1239,   460,  1161,   553,   866,   317,   465,   536,   832,   833,
1688 >     834,   835,   836,   837,   838,   318,   319,   253,   320,   369,
1689 >     321,   370,   322,   323,   324,   402,   235,    76,   371,   412,
1690 >     413,   414,   415,   416,   236,   417,   122,   418,   419,   372,
1691 >     420,   123,   124,   254,   125,   126,   237,   238,   421,   127,
1692 >     422,   239,   240,   241,   423,   537,   424,   128,   129,   425,
1693 >     426,   466,   427,   373,   130,   428,   429,   131,   430,   467,
1694 >     468,   431,  1304,   132,   432,   433,   242,   255,   133,   134,
1695 >     434,   135,   136,   137,   435,   138,   256,   374,   436,   580,
1696 >     469,  1074,  1075,  1076,  1077,  1078,  1079,  1080,   139,   140,
1697 >     437,   438,   440,  1305,   325,  1306,   611,   375,   257,   141,
1698 >     442,   443,   258,  1167,   444,   445,   376,   446,   447,   142,
1699 >     259,   448,   449,   260,   261,   450,   143,   608,   144,  1168,
1700 >     145,   451,   146,   452,   147,   148,   453,  1169,   454,   455,
1701 >     456,   457,   458,   459,   500,   501,   543,   149,   544,   545,
1702 >    1307,  1170,   150,   151,   152,   262,   153,   154,   155,   546,
1703 >     609,   156,   547,   548,   377,   549,   470,  1308,   550,   554,
1704 >     511,   555,   263,   556,   610,   264,   265,   266,   557,   558,
1705 >     559,   560,  1171,   561,  1172,   562,   563,   157,   512,   378,
1706 >     564,   565,   566,   567,   663,   568,   612,   158,   159,   160,
1707 >     161,   162,   163,   267,   513,  1309,  1310,   364,   569,   365,
1708 >    1173,   366,   570,   581,   596,   613,   614,   615,   616,   618,
1709 >     620,   268,   623,   625,   624,   367,   626,   627,   628,   629,
1710 >     648,   669,   677,  1286,   630,   670,   631,   675,   514,  1134,
1711 >     633,   368,   634,  1174,   681,  1175,   269,   270,   635,   636,
1712 >     637,   638,   164,   165,   166,   639,   167,   168,   169,  1311,
1713 >    1135,   640,   641,  1312,  1176,   642,   369,   170,   370,  1136,
1714 >     643,   327,   680,   515,   644,   371,   645,   649,   650,     2,
1715 >       3,   651,   682,     4,   652,  1177,   372,   328,   329,   653,
1716 >    1178,   330,   654,   516,  1179,     5,   656,   657,     6,     7,
1717 >    1137,   658,   659,  1180,   660,     8,   661,  1181,   662,   517,
1718 >     373,   665,   666,   671,   672,   683,     9,   687,  1182,    10,
1719 >      11,  1183,   943,  1184,   944,   945,   518,   519,   684,  1138,
1720 >    1139,   686,   688,   690,   374,  1185,   691,  1140,   692,   331,
1721 >     694,   695,  1186,   697,   698,   699,   700,    12,   701,   703,
1722 >     702,   704,    13,   705,   375,   708,   332,   333,   334,   335,
1723 >     336,    14,  1141,   376,   337,   709,   710,  1194,   338,  1195,
1724 >    1196,   715,   716,   717,   339,   718,   520,   720,  1142,   721,
1725 >     724,    15,    16,   727,   728,   340,   341,   725,   726,   730,
1726 >     775,   748,   749,   778,   741,   731,   732,   342,   521,    17,
1727 >     787,   784,   733,   734,   737,   738,   786,   920,   742,   743,
1728 >     745,   377,   750,   751,   752,   756,    18,   753,   776,   343,
1729 >     757,   758,   760,   761,   762,   763,   764,   766,   769,    19,
1730 >      20,   777,   770,   771,   772,   788,   378,   779,   780,  1143,
1731 >     946,   947,   948,   783,   781,   949,   950,   789,   951,   952,
1732 >    1223,   953,    21,   954,   785,   790,   955,   791,   792,   956,
1733 >     957,  1246,   344,   793,   958,    22,   794,   795,   959,   796,
1734 >      23,   797,   960,   961,   962,    24,   798,   799,    25,   963,
1735 >     800,   801,   802,   803,   964,  1197,  1198,  1199,   808,   807,
1736 >    1200,  1201,   810,  1202,  1203,   817,  1204,   811,  1205,   851,
1737 >     862,  1206,   812,   813,  1207,  1208,   814,   852,   818,  1209,
1738 >     819,   855,  1224,  1210,   825,   820,   826,  1211,  1212,  1213,
1739 >     822,   827,   828,  1247,  1214,   921,   922,   923,   829,  1215,
1740 >     924,   925,   830,   926,   927,   831,   928,   841,   929,   842,
1741 >     843,   930,   844,  1225,   931,   932,   845,   846,   847,   933,
1742 >      82,  1226,   854,   934,  1248,   856,   848,   935,   936,   937,
1743 >    1227,   849,  1249,   857,   938,   850,   859,   860,   863,   939,
1744 >     864,  1250,   866,    83,    84,   869,   870,   873,   874,    85,
1745 >     875,   877,   880,   885,  1228,  1160,  1229,  1230,   876,   878,
1746 >     879,   881,   882,   883,   884,  1251,   886,  1252,  1253,   887,
1747 >     890,  1231,   888,   889,   891,   987,   892,   893,  1232,   990,
1748 >     894,   895,  1254,   896,    86,    87,   897,   898,   899,  1255,
1749 >      88,    89,   900,   901,   902,   903,    90,    91,    92,   904,
1750 >     905,   989,   906,   907,    93,    94,   908,   909,   910,   911,
1751 >     912,   913,   914,   915,   916,   917,   918,   919,   942,   967,
1752 >     968,   969,   970,   971,   972,   973,   974,   975,   976,    95,
1753 >      96,   977,   978,   979,   980,   981,   982,   983,   984,   985,
1754 >     986,   988,   991,   992,   993,   994,   995,   996,   998,   997,
1755 >     999,  1000,  1001,  1002,  1005,  1008,  1009,   816,  1011,  1012,
1756 >    1014,  1006,  1015,  1016,  1017,  1018,  1020,  1022,   310,  1023,
1757 >    1007,  1024,  1051,  1010,  1064,  1065,  1066,  1067,  1070,  1013,
1758 >    1072,  1019,  1021,  1318,  1052,  1025,  1026,  1027,  1028,  1029,
1759 >    1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,  1038,  1039,
1760 >    1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,
1761 >    1050,  1053,  1054,  1068,  1069,  1272,  1073,  1081,  1071,  1082,
1762 >    1083,  1088,  1089,  1090,  1091,  1092,  1093,  1094,  1095,  1096,
1763 >    1097,  1098,  1104,  1105,  1106,  1107,  1108,  1109,  1110,  1111,
1764 >    1112,  1117,  1118,  1119,  1120,  1121,  1122,  1123,  1284,  1295,
1765 >    1296,  1124,  1297,  1240,  1299,   572,  1298,  1125,  1126,  1127,
1766 >     768,   755,  1291,   747,  1132,  1294,  1133,  1273,  1293,  1315,
1767 >    1146,   736,   824,  1300,   664,  1147,  1292,   740,  1148,   806,
1768 >     404,   461,  1267,   774,  1149,   326,  1150,  1151,  1152,  1153,
1769 >    1154,  1163,  1164,  1165,  1166,  1189,  1190,  1191,  1192,  1193,
1770 >    1218,  1219,  1220,  1221,  1222,  1235,   668,     0,  1241,  1236,
1771 >    1237,  1242,  1243,  1244,  1245,  1258,  1274,   503,   674,  1266,
1772 >    1288,  1301,  1275,  1276,  1277,  1287,  1302,  1303,     0,     0,
1773 >       0,     0,     0,     0,     0,     0,     0,   552,     0,     0,
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,   583,     0,
1777 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1778 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1779 >     598,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1780 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1781 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1782 >       0,   647
1783   };
1784  
1785 < /* YYPGOTO[NTERM-NUM].  */
2077 < static const yytype_int16 yypgoto[] =
1785 > static const yytype_int16 yycheck[] =
1786   {
1787 <    -949,  -949,  -949,  -427,  -340,  -948,  -423,  -949,  -949,   946,
1788 <    -949,  -949,  -949,  -949,   865,  -949,  -949,  -949,  -293,  -949,
1789 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1790 <    -949,  -949,  1095,  -949,  -949,  -949,  -949,  -949,   643,  -949,
1791 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1792 <    -949,  -949,  -949,  -949,  -949,   406,  -949,  -949,  -949,  -949,
1793 <    -949,  -949,  -949,  -949,  -949,  -949,  -166,  -949,  -949,  -949,
1794 <    -146,  -949,  -949,  -118,  -949,  -949,  -949,  -949,   613,  -949,
1795 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1796 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,   -60,  -949,
1797 <     724,  -949,  -949,  -949,    43,  -949,  -949,  -949,  -949,  -949,
1798 <     781,  -949,  -949,  -949,  -949,  -949,  -949,  -949,   -42,  -949,
1799 <    -949,   -39,  -949,  -949,  -949,  -949,  -949,  -949,   698,  -949,
1800 <    -949,  -949,  -949,  -949,  -949,   669,  -949,  -949,  -949,  -949,
1801 <    -949,   -91,  -949,  -949,  -949,   663,  -949,  -949,  -949,  -949,
1802 <     -90,  -949,  -949,  -949,  -949,   595,  -949,  -949,  -949,  -949,
1803 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,   -94,  -949,  -949,
1804 <     -87,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1805 <    -949,  -949,   -48,  -949,   785,  -949,  -949,  -949,  -949,  -949,
1806 <     863,  -949,  -949,  -949,  -949,  1100,  -949,  -949,  -949,  -949,
1807 <    -949,  -949,   -20,  -949,   854,  -949,  -949,  -949,  -949,  1043,
1808 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1809 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1810 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1811 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1812 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1813 <    -949,  -949,   101,  -949,  -949,  -949,   105,  -949,  -949,  -949,
1814 <    -949,  -949,  -949,  -949,   818,  -949,  -949,  -949,  -949,  -949,
1815 <     -21,  -949,  -949,  -949,  -949,  -949,   -17,  -949,  -949,  1133,
1816 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1817 <    -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,  -949,
1818 <     949,  -949,  -949,  -949,  -949,  -949,  -949,  -949
1787 >     644,   645,   315,     1,   317,     1,   319,   320,     1,     1,
1788 >     236,     1,     1,     8,     1,     1,     1,  1099,  1100,  1101,
1789 >       1,     1,     1,     1,    17,    18,     1,   216,    21,   236,
1790 >       1,   220,     1,     1,   236,    31,     1,     1,    51,   236,
1791 >       1,     1,   236,    39,   216,   236,     1,     1,   220,     1,
1792 >     234,   235,    27,     1,    19,    51,    52,   236,    19,    34,
1793 >      56,    57,    58,     1,    55,   183,   184,   234,    37,   114,
1794 >      35,   238,     1,    27,    35,     1,    69,    67,     1,    60,
1795 >       1,   236,    67,   236,   236,    81,    67,    67,    69,   236,
1796 >     236,    83,     1,    86,    87,    88,    89,    90,   236,    67,
1797 >     413,    94,   415,   416,    69,    98,   104,    61,    69,   422,
1798 >     236,   104,    60,   426,    83,   104,    70,   430,   104,    67,
1799 >     433,    69,   115,   116,   236,   104,     1,     1,    83,   104,
1800 >     443,   444,     6,     7,   127,     9,    10,   101,    92,   130,
1801 >      14,   454,    96,   104,   457,   458,   131,   128,    22,    23,
1802 >     104,   131,   104,   107,   108,    29,   149,   236,    32,   124,
1803 >     131,   125,   131,   124,    38,   210,   104,   132,   133,    43,
1804 >      44,   131,    46,    47,    48,   104,    50,   236,   104,   140,
1805 >     128,   104,   195,   104,   236,   139,   172,   179,   153,    63,
1806 >      64,   204,   179,   172,   234,   104,   157,   158,   238,   192,
1807 >      74,   179,   156,   236,   190,   159,   160,   161,   131,   204,
1808 >      84,   190,   234,     1,   234,   236,   238,    91,   238,    93,
1809 >     206,    95,   131,    97,   179,    99,   100,   206,   234,   104,
1810 >       1,   234,   238,   187,   236,   238,   225,   550,   112,   235,
1811 >     229,   228,   235,   117,   118,   119,   207,   121,   122,   123,
1812 >     228,   205,   126,    24,    25,   235,   235,   235,   229,    30,
1813 >     235,    11,    12,    13,   229,   237,   235,   235,   229,   229,
1814 >     235,   235,   234,   225,   235,   235,   230,   231,   152,   200,
1815 >     235,   235,   179,   235,     1,     1,   236,   235,   162,   163,
1816 >     164,   165,   166,   167,    65,    66,   225,   235,     1,   225,
1817 >      71,    72,   237,   229,   225,   237,    77,    78,    79,   235,
1818 >      27,   236,   235,   101,    85,    86,    19,    34,   631,   237,
1819 >       1,    37,     3,   636,     5,   200,   639,   234,   234,   234,
1820 >     643,   238,    35,   238,   237,   237,   237,   125,    19,   110,
1821 >     111,   114,   234,   217,   218,   219,   238,   221,   222,   223,
1822 >     225,   234,   237,   234,    35,   238,     1,   238,   232,   237,
1823 >     235,   235,   238,   234,   114,   237,    69,    83,   141,   142,
1824 >     143,   144,   145,   146,   147,   237,   237,     1,   237,    60,
1825 >     237,    62,   237,   237,   237,   237,    31,   104,    69,   237,
1826 >     237,   237,   237,   237,    39,   237,     1,   237,   237,    80,
1827 >     237,     6,     7,    27,     9,    10,    51,    52,   237,    14,
1828 >     237,    56,    57,    58,   237,   131,   237,    22,    23,   237,
1829 >     237,   124,   237,   104,    29,   237,   237,    32,   237,   132,
1830 >     133,   237,    42,    38,   237,   237,    81,    61,    43,    44,
1831 >     237,    46,    47,    48,   237,    50,    70,   128,   237,   234,
1832 >     153,   832,   833,   834,   835,   836,   837,   838,    63,    64,
1833 >     237,   237,   237,    73,   235,    75,   234,   148,    92,    74,
1834 >     237,   237,    96,     4,   237,   237,   157,   237,   237,    84,
1835 >     104,   237,   237,   107,   108,   237,    91,   129,    93,    20,
1836 >      95,   237,    97,   237,    99,   100,   237,    28,   237,   237,
1837 >     237,   237,   237,   237,   237,   237,   237,   112,   237,   237,
1838 >     120,    42,   117,   118,   119,   139,   121,   122,   123,   237,
1839 >     129,   126,   237,   237,   205,   237,   229,   137,   237,   237,
1840 >       1,   237,   156,   237,   129,   159,   160,   161,   237,   237,
1841 >     237,   237,    73,   237,    75,   237,   237,   152,    19,   230,
1842 >     237,   237,   237,   237,   235,   237,   114,   162,   163,   164,
1843 >     165,   166,   167,   187,    35,   175,   176,     1,   237,     3,
1844 >     101,     5,   237,   237,   237,   114,   216,   114,   114,   114,
1845 >     114,   205,   114,   216,   114,    19,   216,   234,   234,   237,
1846 >     234,   129,   114,  1237,   237,   234,   237,   216,    69,    15,
1847 >     237,    35,   237,   134,   114,   136,   230,   231,   237,   237,
1848 >     237,   237,   217,   218,   219,   237,   221,   222,   223,   229,
1849 >      36,   237,   237,   233,   155,   237,    60,   232,    62,    45,
1850 >     237,     1,   216,   104,   237,    69,   237,   237,   237,     0,
1851 >       1,   237,   216,     4,   237,   176,    80,    17,    18,   237,
1852 >     181,    21,   237,   124,   185,    16,   237,   237,    19,    20,
1853 >      76,   237,   237,   194,   237,    26,   237,   198,   237,   140,
1854 >     104,   237,   237,   237,   237,   114,    37,   114,   209,    40,
1855 >      41,   212,    51,   214,    53,    54,   157,   158,   216,   105,
1856 >     106,   216,   114,   114,   128,   226,   216,   113,   216,    69,
1857 >     114,   114,   233,   114,   114,   114,   114,    68,   216,   216,
1858 >     237,   237,    73,   216,   148,   216,    86,    87,    88,    89,
1859 >      90,    82,   138,   157,    94,   216,   216,    51,    98,    53,
1860 >      54,   216,   216,   216,   104,   114,   207,   216,   154,   216,
1861 >     216,   102,   103,   237,   237,   115,   116,   234,   234,   237,
1862 >     216,   129,   129,   129,   234,   237,   237,   127,   229,   120,
1863 >     114,   129,   237,   237,   237,   237,   129,    51,   237,   237,
1864 >     237,   205,   234,   234,   237,   234,   137,   237,   216,   149,
1865 >     237,   237,   237,   237,   237,   237,   237,   237,   234,   150,
1866 >     151,   216,   237,   237,   237,   114,   230,   216,   216,   215,
1867 >     169,   170,   171,   234,   216,   174,   175,   129,   177,   178,
1868 >      75,   180,   173,   182,   216,   129,   185,   129,   129,   188,
1869 >     189,    75,   192,   129,   193,   186,   129,   129,   197,   129,
1870 >     191,   114,   201,   202,   203,   196,   129,   129,   199,   208,
1871 >     129,   234,   234,   237,   213,   169,   170,   171,   234,   216,
1872 >     174,   175,   234,   177,   178,   129,   180,   237,   182,   114,
1873 >     129,   185,   237,   237,   188,   189,   237,   114,   234,   193,
1874 >     234,   114,   137,   197,   234,   237,   234,   201,   202,   203,
1875 >     237,   234,   234,   137,   208,   169,   170,   171,   234,   213,
1876 >     174,   175,   234,   177,   178,   234,   180,   234,   182,   234,
1877 >     234,   185,   234,   168,   188,   189,   234,   234,   234,   193,
1878 >       1,   176,   237,   197,   168,   114,   234,   201,   202,   203,
1879 >     185,   234,   176,   114,   208,   234,   114,   114,   114,   213,
1880 >     114,   185,   114,    24,    25,   234,   129,   129,   216,    30,
1881 >     129,   237,   114,   234,   209,   224,   211,   212,   129,   129,
1882 >     129,   129,   129,   129,   129,   209,   129,   211,   212,   129,
1883 >     129,   226,   234,   234,   129,   129,   234,   234,   233,   129,
1884 >     234,   234,   226,   234,    65,    66,   234,   234,   234,   233,
1885 >      71,    72,   234,   234,   234,   234,    77,    78,    79,   234,
1886 >     234,   237,   234,   234,    85,    86,   234,   234,   234,   234,
1887 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1888 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   110,
1889 >     111,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1890 >     234,   216,   114,   129,   129,   129,   234,   129,   234,   129,
1891 >     129,   129,   237,   114,   234,   129,   129,   590,   129,   216,
1892 >     129,   234,   129,   129,   129,   216,   129,   129,    77,   129,
1893 >     234,   129,   129,   234,   129,   129,   129,   129,   129,   237,
1894 >     129,   237,   234,  1317,   237,   234,   234,   234,   234,   234,
1895 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1896 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1897 >     234,   234,   234,   234,   234,   114,   234,   234,   237,   234,
1898 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1899 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1900 >     234,   234,   234,   234,   234,   234,   234,   234,   129,   135,
1901 >     135,   234,   135,  1059,  1281,   271,  1279,   234,   234,   234,
1902 >     522,   507,  1260,   494,   234,  1271,   234,  1161,  1269,  1290,
1903 >     234,   471,   603,  1283,   379,   234,  1265,   484,   234,   576,
1904 >     118,   171,  1131,   538,   234,    97,   234,   234,   234,   234,
1905 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1906 >     234,   234,   234,   234,   234,   234,   398,    -1,   234,   237,
1907 >     237,   234,   234,   234,   234,   234,   234,   227,   408,  1129,
1908 >     234,   234,   239,   239,   239,   237,   234,   234,    -1,    -1,
1909 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,   243,    -1,    -1,
1910 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1911 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1912 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   293,    -1,
1913 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1914 >      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1915 >     301,    -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 >      -1,   345
1919   };
1920  
1921 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1922 <   positive, shift that token.  If negative, reduce the rule which
1923 <   number is the opposite.  If zero, do what YYDEFACT says.
2116 <   If YYTABLE_NINF, syntax error.  */
2117 < #define YYTABLE_NINF -1
2118 < static const yytype_uint16 yytable[] =
1921 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1922 >     symbol of state STATE-NUM.  */
1923 > static const yytype_uint16 yystos[] =
1924   {
1925 <     567,   568,   704,   122,    45,    46,   122,   574,  1132,  1138,
1926 <    1312,   128,  1313,  1160,    47,   272,  1125,    48,   129,   130,
1927 <    1126,   357,   131,    67,  1127,   508,   115,  1314,  1128,   132,
1928 <     476,  1315,    67,  1129,  1130,  1131,  1182,   653,   133,   655,
1929 <    1183,  1244,   134,   135,  1248,  1245,   509,  1250,  1249,   136,
1930 <      52,  1251,   668,   137,   138,   671,   139,    54,   367,    68,
1931 <     676,   272,   140,   981,   982,   983,   695,   696,    68,    69,
1932 <     541,   687,   688,    59,   690,   467,   550,   357,    69,    60,
1933 <     141,   142,   477,   701,   702,   143,   705,   697,   698,  1068,
1934 <    1069,   123,   144,   467,   123,    76,   145,   146,   147,  1103,
1935 <    1104,   148,  1253,   550,   149,   150,  1254,    77,    63,   358,
1936 <      64,  1266,   478,   433,   151,  1267,   434,   581,   479,   448,
1937 <     152,   153,   118,   154,   155,   156,   157,   158,    78,    79,
1938 <     121,  1268,   273,   300,    80,  1269,    81,   127,   159,   582,
1939 <     583,   367,    70,   241,   449,   279,   584,   160,   510,   161,
1940 <     162,    70,   163,   508,  1305,   164,   165,   435,  1306,   166,
1941 <     436,   610,   274,   611,   242,   358,   612,   450,  1161,   301,
1942 <     167,   451,  1162,   243,   509,   359,   244,   368,   273,   511,
1943 <     703,   480,   764,   795,   541,   613,   614,   282,   327,   542,
1944 <      82,    83,   168,   283,   169,   551,  1133,  1139,   170,    84,
1945 <      85,   328,   171,   172,   173,   174,   175,   765,   274,   615,
1946 <     176,   177,   369,   616,   437,   329,   302,   330,   355,   178,
1947 <      86,    87,   551,   585,   586,   587,   331,   245,   588,   468,
1948 <     766,   359,   438,   284,   767,  1307,   589,    88,    89,  1308,
1949 <     332,   335,  1316,   617,   370,   618,   285,   468,    90,   590,
1950 <     591,   179,   303,   180,   304,   305,   543,    91,   619,   181,
1951 <     368,   469,   552,   365,   182,   452,   592,   593,   286,   183,
1952 <     287,   431,   288,   289,   453,   454,   510,   487,   336,   469,
1953 <     620,   246,   247,   248,   249,   250,   251,   252,   253,   552,
1954 <     740,   290,   333,   337,   594,   369,   338,   306,  1310,   307,
1955 <     308,   768,  1311,   542,   339,   340,   764,   511,   455,   448,
1956 <     341,   342,   621,   343,   300,   309,  1326,   544,   650,   476,
1957 <    1327,   505,   470,   502,   344,   345,   622,   370,   769,   254,
1958 <     814,   765,   526,   346,   449,   733,   819,   643,   566,   623,
1959 <     470,   347,   348,   349,    92,    93,    94,   770,  1345,   350,
1960 <     301,   356,  1346,   351,   766,   353,   352,   450,   767,   310,
1961 <     439,   451,   364,   376,   255,   433,   456,   377,   434,   378,
1962 <     543,   477,   993,   717,   379,   557,   380,   863,   381,   728,
1963 <     829,   830,   831,   832,   833,   382,   383,   311,   312,   384,
1964 <     385,   386,   387,   539,   388,   561,   389,   302,   390,   391,
1965 <     392,   478,  1083,  1084,  1085,  1086,  1087,   479,   393,   435,
1966 <     394,   395,   436,   787,   396,   624,   128,   771,   397,   398,
1967 <     399,   880,   400,   129,   130,   768,   401,   131,   402,   772,
1968 <     403,   544,   404,   303,   132,   304,   305,   405,   406,  1100,
1969 <     407,   409,  1048,   133,   507,   256,   558,   134,   135,   411,
1970 <     412,   413,   769,   524,   136,   452,   414,   415,   137,   138,
1971 <     416,   139,   417,   418,   453,   454,   437,   140,   419,   420,
1972 <     480,   770,   421,   422,   423,   424,   425,   426,   306,   257,
1973 <     307,   308,   427,   428,   438,   141,   142,   500,   429,   559,
1974 <     143,   430,   488,   489,   490,   491,   309,   144,   455,   492,
1975 <     493,   145,   146,   147,   494,   495,   148,   496,   497,   149,
1976 <     150,   498,  1090,   499,   503,   504,   517,   518,   519,   151,
1977 <    1098,  1099,   610,   520,   611,   152,   153,   612,   154,   155,
1978 <     156,   157,   158,   521,   522,   523,   527,   528,   529,   530,
1979 <     310,   771,   531,   159,   532,   533,   613,   614,   535,   536,
1980 <     537,   538,   160,   772,   161,   162,   456,   163,  1328,   560,
1981 <     164,   165,   562,   563,   166,   564,   565,   566,   311,   312,
1982 <     615,   569,   570,   571,   616,   167,   572,   573,   575,   245,
1983 <     750,   751,   752,   753,   754,   755,   756,   576,   577,   578,
1984 <     579,  1329,   580,   641,   642,   645,   647,   168,   646,   169,
1985 <     648,   652,  1330,   170,   617,   654,   618,   171,   172,   173,
1986 <     174,   175,   439,   656,   657,   176,   177,   658,  1331,   619,
1987 <     659,   660,   661,   662,   178,  1332,   663,   664,   665,   666,
1988 <    1333,   667,  1334,   246,   247,   248,   249,   250,   251,   252,
1989 <     253,   620,   669,    76,   670,  1335,   672,   673,   674,   675,
1990 <    1255,  1256,   679,   677,   678,    77,   179,   680,   180,   681,
1991 <     682,   683,  1185,   684,   181,   283,   685,   691,   686,   182,
1992 <       2,     3,   689,   621,   183,     4,    78,    79,  1336,   703,
1993 <    1257,   254,    80,   712,    81,   692,   693,   622,   710,   694,
1994 <     713,   699,     5,   715,  1337,   719,     6,  1258,   700,     7,
1995 <     623,   706,   707,   708,  1259,   284,     8,   709,   742,   735,
1996 <     743,   716,  1338,   744,  1339,  1340,   255,   720,   285,  1200,
1997 <     721,     9,   723,  1260,   745,   724,   746,   581,   725,   726,
1998 <     727,   730,   747,    10,    11,   732,    12,   737,    82,    83,
1999 <     286,  1186,   287,    13,   288,   289,   738,    84,    85,   582,
2000 <     583,  1261,   748,   739,   749,   757,   584,   758,   759,  1262,
2001 <      14,   761,   760,   290,   762,   789,   784,   763,    86,    87,
2002 <      15,   783,    16,  1187,   790,   785,   624,   791,   786,   792,
2003 <     793,   794,  1341,   798,   796,    88,    89,   797,  1188,    17,
2004 <     799,   800,   801,   802,   803,   804,    90,   256,  1201,   805,
2005 <    1342,   807,  1263,   806,   808,    91,    18,   809,  1189,  1190,
2006 <    1343,   810,   811,   813,  1191,  1192,  1193,  1194,   816,   817,
2007 <    1122,  1264,   821,   822,   823,   824,   825,  1195,   882,   826,
2008 <    1202,   257,   827,   585,   586,   587,   828,   850,   588,   883,
2009 <     886,    19,   836,   887,   851,  1203,   589,   837,   838,   839,
2010 <      20,    21,   840,   841,   842,    22,    23,   843,   844,   590,
2011 <     591,  1156,   996,   845,   997,  1204,  1205,   846,   852,   847,
2012 <     848,  1206,  1207,  1208,  1209,   849,   592,   593,  1167,   853,
2013 <     854,   855,   856,   857,  1210,   858,   859,   860,   861,   865,
2014 <    1304,   862,    92,    93,    94,   866,   922,   923,   924,   925,
2015 <     926,   501,   927,   928,   594,   929,   930,   931,   867,   994,
2016 <     932,  1000,   868,   869,  1003,   870,   872,   873,   874,   875,
2017 <     933,   934,   935,   876,   936,   937,   938,  1015,   877,   939,
2018 <     878,   879,   940,   944,   945,   946,   947,   948,   884,   949,
2019 <     950,   885,   951,   952,   953,   888,   992,   954,   889,   890,
2020 <     999,   891,  1002,   892,   893,   894,   895,   955,   956,   957,
2021 <     896,   958,   959,   960,   897,   898,   961,   899,   900,   962,
2022 <    1282,  1283,  1284,  1285,  1286,   901,  1287,  1288,   902,  1289,
2023 <    1290,  1291,   903,   904,  1292,   905,  1004,   906,   907,  1005,
2024 <     908,   909,   910,   911,  1293,  1294,  1295,   912,  1296,  1297,
2025 <    1298,   913,   914,  1299,   915,   916,  1300,   917,   918,   919,
2026 <     920,   921,   943,   965,   966,   967,   968,   969,   970,   971,
2027 <     972,   973,   974,   975,   976,   977,  1006,   978,   979,   980,
2028 <     986,   987,   988,   989,   990,   991,  1008,   998,  1010,   995,
2029 <    1007,  1001,  1009,  1013,  1011,  1012,  1014,  1018,  1019,  1020,
2030 <    1021,  1022,  1023,  1024,  1025,  1026,  1050,  1051,  1027,  1052,
2031 <    1028,  1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,
2032 <    1038,  1039,  1076,  1078,  1080,  1040,  1041,  1043,  1044,  1045,
2033 <    1047,  1053,  1054,  1055,  1056,  1057,  1058,  1059,  1060,  1061,
2034 <    1062,  1063,  1064,  1088,  1065,  1066,  1089,  1067,  1072,  1073,
2035 <    1074,  1075,  1091,  1079,  1092,  1077,  1082,  1081,  1093,  1094,
2036 <    1095,  1096,  1097,  1101,  1102,  1107,  1105,  1106,  1108,  1109,
2037 <    1110,  1111,  1112,  1113,  1117,  1114,  1118,  1115,  1116,  1119,
2038 <    1120,  1121,  1136,  1146,  1137,  1142,  1143,  1144,  1145,  1150,
2039 <    1151,  1152,  1153,  1170,  1154,  1171,  1155,  1159,  1165,  1166,
2040 <    1173,  1174,  1175,  1177,  1232,  1168,  1178,  1172,  1176,  1179,
2041 <    1180,  1181,  1184,  1270,  1275,  1198,   334,  1199,  1213,  1214,
2042 <    1215,  1216,  1217,  1218,  1219,  1220,  1221,  1222,   540,  1049,
2043 <    1353,  1352,  1223,  1224,  1225,  1226,  1227,  1228,  1229,  1230,
2044 <    1231,  1236,  1237,  1238,  1239,  1240,  1241,  1242,  1243,  1272,
2045 <    1273,  1274,  1279,  1280,  1281,  1303,   741,  1351,   864,  1324,
2046 <     788,  1271,  1322,  1321,   815,  1347,   820,  1350,  1348,  1323,
2047 <     881,   506,  1349,   644,   366,  1318,   651,   432,   354,  1247,
2048 <    1320,  1246,  1319,     0,     0,     0,     0,     0,   729,     0,
2049 <     525,     0,     0,     0,     0,     0,     0,     0,     0,     0,
2050 <       0,     0,     0,     0,     0,     0,     0,   734,   718
1925 >       0,   241,     0,     1,     4,    16,    19,    20,    26,    37,
1926 >      40,    41,    68,    73,    82,   102,   103,   120,   137,   150,
1927 >     151,   173,   186,   191,   196,   199,   242,   247,   252,   272,
1928 >     278,   284,   292,   306,   326,   350,   364,   379,   386,   390,
1929 >     400,   409,   430,   436,   442,   446,   452,   509,   526,   234,
1930 >     235,   236,   236,   327,   410,   437,   236,   447,   236,   365,
1931 >     431,   351,   236,   279,   307,   380,   236,   236,   401,   236,
1932 >     285,   236,   391,     1,    27,    34,   104,   273,   274,   275,
1933 >     276,   277,     1,    24,    25,    30,    65,    66,    71,    72,
1934 >      77,    78,    79,    85,    86,   110,   111,   510,   511,   512,
1935 >     513,   514,   515,   516,   517,   518,   519,   520,   521,   522,
1936 >     523,   524,   525,   236,   236,   236,     1,    67,   443,   444,
1937 >     445,   236,     1,     6,     7,     9,    10,    14,    22,    23,
1938 >      29,    32,    38,    43,    44,    46,    47,    48,    50,    63,
1939 >      64,    74,    84,    91,    93,    95,    97,    99,   100,   112,
1940 >     117,   118,   119,   121,   122,   123,   126,   152,   162,   163,
1941 >     164,   165,   166,   167,   217,   218,   219,   221,   222,   223,
1942 >     232,   453,   454,   455,   456,   457,   458,   459,   460,   461,
1943 >     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
1944 >     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
1945 >     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
1946 >     492,   493,   494,   495,   496,   497,   498,   502,   506,   507,
1947 >     508,   236,   236,   236,     1,   101,   125,   248,   249,   250,
1948 >     251,   236,   236,   236,     1,    31,    39,    51,    52,    56,
1949 >      57,    58,    81,   527,   528,   529,   530,   531,   532,   533,
1950 >     534,   535,   536,     1,    27,    61,    70,    92,    96,   104,
1951 >     107,   108,   139,   156,   159,   160,   161,   187,   205,   230,
1952 >     231,   253,   254,   255,   256,   257,   258,   259,   260,   261,
1953 >     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
1954 >     236,     1,   228,   293,   294,   295,   296,   297,   236,     1,
1955 >     104,   387,   388,   389,   236,   234,   237,   237,   237,   235,
1956 >     274,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1957 >     237,   237,   237,   237,   237,   235,   511,     1,    17,    18,
1958 >      21,    69,    86,    87,    88,    89,    90,    94,    98,   104,
1959 >     115,   116,   127,   149,   192,   328,   329,   330,   331,   332,
1960 >     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
1961 >     343,   344,   345,   346,     1,     3,     5,    19,    35,    60,
1962 >      62,    69,    80,   104,   128,   148,   157,   205,   230,   411,
1963 >     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
1964 >     425,   426,   427,   428,   429,     1,    67,   131,   438,   439,
1965 >     440,   441,   237,   235,   444,     1,   104,   131,   448,   449,
1966 >     450,   451,   237,   237,   237,   237,   237,   237,   237,   237,
1967 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1968 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   503,
1969 >     237,   499,   237,   237,   237,   237,   237,   237,   237,   237,
1970 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1971 >     235,   454,     1,    19,    35,    69,   124,   132,   133,   153,
1972 >     229,   366,   367,   368,   369,   370,   371,   372,   376,   377,
1973 >     378,     1,   131,   229,   432,   433,   434,   435,     1,    60,
1974 >      67,    69,   128,   352,   356,   357,   358,   362,   363,   234,
1975 >     237,   237,   235,   249,     1,    83,   179,   280,   281,   282,
1976 >     283,     1,    19,    35,    69,   104,   124,   140,   157,   158,
1977 >     207,   229,   308,   309,   310,   311,   312,   313,   314,   315,
1978 >     316,   317,   318,   322,     1,    37,    83,   131,   381,   382,
1979 >     383,   384,   385,   237,   237,   237,   237,   237,   237,   237,
1980 >     237,   235,   528,   234,   237,   237,   237,   237,   237,   237,
1981 >     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
1982 >     237,   235,   254,     1,   104,   225,   402,   403,   404,   405,
1983 >     234,   237,   235,   294,   179,     1,   104,   172,   190,   206,
1984 >     286,   287,   288,   289,   290,   291,   237,   235,   388,     1,
1985 >     104,   225,   229,   392,   393,   394,   395,   396,   129,   129,
1986 >     129,   234,   114,   114,   216,   114,   114,   244,   114,   244,
1987 >     114,   244,   244,   114,   114,   216,   216,   234,   234,   237,
1988 >     237,   237,   347,   237,   237,   237,   237,   237,   237,   237,
1989 >     237,   237,   237,   237,   237,   237,   235,   329,   234,   237,
1990 >     237,   237,   237,   237,   237,   422,   237,   237,   237,   237,
1991 >     237,   237,   237,   235,   412,   237,   237,   235,   439,   129,
1992 >     234,   237,   237,   235,   449,   216,   244,   114,   244,   244,
1993 >     216,   114,   216,   114,   216,   244,   216,   114,   114,   244,
1994 >     114,   216,   216,   244,   114,   114,   244,   114,   114,   114,
1995 >     114,   216,   237,   216,   237,   216,   244,   244,   216,   216,
1996 >     216,   216,   220,   216,   220,   216,   216,   216,   114,   244,
1997 >     216,   216,   244,   244,   216,   234,   234,   237,   237,   373,
1998 >     237,   237,   237,   237,   237,   235,   367,   237,   237,   235,
1999 >     433,   234,   237,   237,   353,   237,   235,   357,   129,   129,
2000 >     234,   234,   237,   237,   235,   281,   234,   237,   237,   323,
2001 >     237,   237,   237,   237,   237,   319,   237,   235,   309,   234,
2002 >     237,   237,   237,   235,   382,   216,   216,   216,   129,   216,
2003 >     216,   216,   244,   234,   129,   216,   129,   114,   114,   129,
2004 >     129,   129,   129,   129,   129,   129,   129,   114,   129,   129,
2005 >     129,   234,   234,   237,   406,   235,   403,   216,   234,   236,
2006 >     234,   237,   237,   237,   237,   235,   287,   129,   234,   234,
2007 >     237,   397,   237,   235,   393,   234,   234,   234,   234,   234,
2008 >     234,   234,   141,   142,   143,   144,   145,   146,   147,   243,
2009 >     244,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2010 >     234,   114,   114,   244,   237,   114,   114,   114,   244,   114,
2011 >     114,   244,   129,   114,   114,   244,   114,   246,   246,   234,
2012 >     129,   183,   184,   129,   216,   129,   129,   237,   129,   129,
2013 >     114,   129,   129,   129,   129,   234,   129,   129,   234,   234,
2014 >     129,   129,   234,   234,   234,   234,   234,   234,   234,   234,
2015 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2016 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2017 >      51,   169,   170,   171,   174,   175,   177,   178,   180,   182,
2018 >     185,   188,   189,   193,   197,   201,   202,   203,   208,   213,
2019 >     504,   505,   234,    51,    53,    54,   169,   170,   171,   174,
2020 >     175,   177,   178,   180,   182,   185,   188,   189,   193,   197,
2021 >     201,   202,   203,   208,   213,   500,   501,   234,   234,   234,
2022 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2023 >     234,   234,   234,   234,   234,   234,   234,   129,   216,   237,
2024 >     129,   114,   129,   129,   129,   234,   129,   129,   234,   129,
2025 >     129,   237,   114,   360,   361,   234,   234,   234,   129,   129,
2026 >     234,   129,   216,   237,   129,   129,   129,   129,   216,   237,
2027 >     129,   234,   129,   129,   129,   234,   234,   234,   234,   234,
2028 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2029 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   234,
2030 >     234,   129,   237,   234,   234,     1,   104,   200,   225,   298,
2031 >     299,   300,   301,   302,   129,   129,   129,   129,   234,   234,
2032 >     129,   237,   129,   234,   243,   243,   243,   243,   243,   243,
2033 >     243,   234,   234,   234,    55,   130,   348,   349,   234,   234,
2034 >     234,   234,   234,   234,   234,   234,   234,   234,   234,    11,
2035 >      12,    13,   245,   246,   234,   234,   234,   234,   234,   234,
2036 >     234,   234,   234,     8,   204,   423,   424,   234,   234,   234,
2037 >     234,   234,   234,   234,   234,   234,   234,   234,   234,   238,
2038 >     234,   238,   234,   234,    15,    36,    45,    76,   105,   106,
2039 >     113,   138,   154,   215,   374,   375,   234,   234,   234,   234,
2040 >     234,   234,   234,   234,   234,    51,   195,   204,   354,   355,
2041 >     224,   238,   359,   234,   234,   234,   234,     4,    20,    28,
2042 >      42,    73,    75,   101,   134,   136,   155,   176,   181,   185,
2043 >     194,   198,   209,   212,   214,   226,   233,   324,   325,   234,
2044 >     234,   234,   234,   234,    51,    53,    54,   169,   170,   171,
2045 >     174,   175,   177,   178,   180,   182,   185,   188,   189,   193,
2046 >     197,   201,   202,   203,   208,   213,   320,   321,   234,   234,
2047 >     234,   234,   234,    75,   137,   168,   176,   185,   209,   211,
2048 >     212,   226,   233,   407,   408,   234,   237,   237,   303,   235,
2049 >     299,   234,   234,   234,   234,   234,    75,   137,   168,   176,
2050 >     185,   209,   211,   212,   226,   233,   398,   399,   234,   234,
2051 >     238,   245,   245,   245,   234,   238,   505,   501,   234,   238,
2052 >     234,   238,   114,   361,   234,   239,   239,   239,   234,   238,
2053 >     234,   238,   234,   238,   129,   210,   246,   237,   234,   234,
2054 >     238,   349,   424,   375,   355,   135,   135,   135,   325,   321,
2055 >     408,   234,   234,   234,    42,    73,    75,   120,   137,   175,
2056 >     176,   229,   233,   304,   305,   399,   234,   238,   305
2057   };
2058  
2059 < static const yytype_int16 yycheck[] =
2059 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2060 > static const yytype_uint16 yyr1[] =
2061   {
2062 <     340,   341,   425,     1,   260,   261,     1,   347,    11,    11,
2063 <      10,     1,    12,    76,   262,     1,   260,   262,     8,     9,
2064 <     264,     1,    12,     1,   260,     1,   153,    27,   264,    19,
2065 <       1,    31,     1,   981,   982,   983,   260,   377,    28,   379,
2066 <     264,   260,    32,    33,   260,   264,    22,   260,   264,    39,
2067 <     262,   264,   392,    43,    44,   395,    46,   262,     1,    37,
2068 <     400,     1,    52,    14,    15,    16,   197,   198,    37,    47,
2069 <       1,   411,   412,   262,   414,     1,     1,     1,    47,   262,
2070 <      70,    71,    53,   423,   424,    75,   426,   197,   198,   169,
2071 <     170,    89,    82,     1,    89,     1,    86,    87,    88,   216,
2072 <     217,    91,   260,     1,    94,    95,   264,    13,   262,    89,
2073 <     262,   260,    83,     1,   104,   264,     4,     1,    89,     1,
2074 <     110,   111,   153,   113,   114,   115,   116,   117,    34,    35,
2075 <     262,   260,   118,     1,    40,   264,    42,   262,   128,    23,
2076 <      24,     1,   120,   262,    26,   153,    30,   137,   124,   139,
2077 <     140,   120,   142,     1,   260,   145,   146,    45,   264,   149,
2078 <      48,     1,   148,     3,   262,    89,     6,    49,   231,    37,
2079 <     160,    53,   235,   262,    22,   155,   262,   120,   118,   155,
2080 <     131,   152,     1,   523,     1,    25,    26,   262,   262,   120,
2081 <      96,    97,   182,     1,   184,   120,   199,   199,   188,   105,
2082 <     106,   262,   192,   193,   194,   195,   196,    26,   148,    49,
2083 <     200,   201,   155,    53,   102,   260,    84,   263,   262,   209,
2084 <     126,   127,   120,   107,   108,   109,   263,     1,   112,   155,
2085 <      49,   155,   120,    41,    53,   260,   120,   143,   144,   264,
2086 <     263,   263,   242,    83,   187,    85,    54,   155,   154,   133,
2087 <     134,   241,   120,   243,   122,   123,   187,   163,    98,   249,
2088 <     120,   187,   187,   261,   254,   147,   150,   151,    76,   259,
2089 <      78,   261,    80,    81,   156,   157,   124,   260,   263,   187,
2090 <     120,    55,    56,    57,    58,    59,    60,    61,    62,   187,
2091 <     261,    99,   261,   263,   178,   155,   263,   165,   260,   167,
2092 <     168,   120,   264,   120,   263,   263,     1,   155,   190,     1,
2093 <     263,   263,   152,   263,     1,   183,   260,   248,   261,     1,
2094 <     264,   261,   248,   260,   263,   263,   166,   187,   147,   103,
2095 <     261,    26,   260,   263,    26,   261,   261,   261,   131,   179,
2096 <     248,   263,   263,   263,   250,   251,   252,   166,   260,   263,
2097 <      37,   262,   264,   263,    49,   261,   263,    49,    53,   227,
2098 <     248,    53,   263,   263,   138,     1,   248,   263,     4,   263,
2099 <     187,    53,   712,   261,   263,   153,   263,   261,   263,   261,
2100 <     173,   174,   175,   176,   177,   263,   263,   255,   256,   263,
2101 <     263,   263,   263,   261,   263,   197,   263,    84,   263,   263,
2102 <     263,    83,   829,   830,   831,   832,   833,    89,   263,    45,
2103 <     263,   263,    48,   261,   263,   255,     1,   236,   263,   263,
2104 <     263,   261,   263,     8,     9,   120,   263,    12,   263,   248,
2105 <     263,   248,   263,   120,    19,   122,   123,   263,   263,   862,
2106 <     263,   263,   261,    28,   262,   219,   153,    32,    33,   263,
2107 <     263,   263,   147,   261,    39,   147,   263,   263,    43,    44,
2108 <     263,    46,   263,   263,   156,   157,   102,    52,   263,   263,
2109 <     152,   166,   263,   263,   263,   263,   263,   263,   165,   253,
2110 <     167,   168,   263,   263,   120,    70,    71,   261,   263,   153,
2111 <      75,   263,   263,   263,   263,   263,   183,    82,   190,   263,
2112 <     263,    86,    87,    88,   263,   263,    91,   263,   263,    94,
2113 <      95,   263,   852,   263,   263,   263,   263,   263,   263,   104,
2114 <     860,   861,     1,   263,     3,   110,   111,     6,   113,   114,
2115 <     115,   116,   117,   263,   263,   263,   263,   263,   263,   263,
2116 <     227,   236,   263,   128,   263,   263,    25,    26,   263,   263,
2117 <     263,   263,   137,   248,   139,   140,   248,   142,     5,   260,
2118 <     145,   146,   131,   131,   149,   197,   197,   131,   255,   256,
2119 <      49,   131,   131,   197,    53,   160,   197,   131,   197,     1,
2120 <     220,   221,   222,   223,   224,   225,   226,   197,   197,   197,
2121 <     197,    38,   260,   263,   263,   153,   263,   182,   260,   184,
2122 <     263,   197,    49,   188,    83,   197,    85,   192,   193,   194,
2123 <     195,   196,   248,   131,   153,   200,   201,   131,    65,    98,
2124 <     197,   197,   131,   153,   209,    72,   197,   131,   131,   131,
2125 <      77,   197,    79,    55,    56,    57,    58,    59,    60,    61,
2126 <      62,   120,   197,     1,   197,    92,   153,   197,   131,   131,
2127 <      20,    21,   153,   131,   131,    13,   241,   131,   243,   131,
2128 <     197,   197,    92,   263,   249,     1,   197,   153,   263,   254,
2317 <       0,     1,   197,   152,   259,     5,    34,    35,   125,   131,
2318 <      50,   103,    40,   263,    42,   197,   197,   166,   260,   197,
2319 <     263,   197,    22,   263,   141,   260,    26,    67,   197,    29,
2320 <     179,   197,   197,   197,    74,    41,    36,   197,   153,   260,
2321 <     153,   263,   159,   153,   161,   162,   138,   263,    54,    92,
2322 <     263,    51,   263,    93,   153,   263,   153,     1,   263,   263,
2323 <     263,   263,   153,    63,    64,   263,    66,   263,    96,    97,
2324 <      76,   171,    78,    73,    80,    81,   263,   105,   106,    23,
2325 <      24,   121,   153,   263,   153,   153,    30,   153,   197,   129,
2326 <      90,   153,   260,    99,   153,   197,   263,   260,   126,   127,
2327 <     100,   260,   102,   203,   197,   263,   255,   197,   263,   153,
2328 <     197,   197,   229,   197,   260,   143,   144,   153,   218,   119,
2329 <     153,   153,   153,   153,   153,   263,   154,   219,   171,   153,
2330 <     247,   153,   172,   131,   153,   163,   136,   260,   238,   239,
2331 <     257,   260,   263,   263,   244,   245,   246,   247,   260,   263,
2332 <     158,   191,   260,   260,   260,   260,   260,   257,   153,   260,
2333 <     203,   253,   260,   107,   108,   109,   260,   263,   112,   153,
2334 <     153,   171,   260,   153,   263,   218,   120,   260,   260,   260,
2335 <     180,   181,   260,   260,   260,   185,   186,   260,   260,   133,
2336 <     134,   158,   153,   260,   153,   238,   239,   260,   263,   260,
2337 <     260,   244,   245,   246,   247,   260,   150,   151,   202,   263,
2338 <     263,   263,   263,   263,   257,   263,   263,   263,   263,   260,
2339 <    1183,   263,   250,   251,   252,   263,   204,   205,   206,   207,
2340 <     208,   258,   210,   211,   178,   213,   214,   215,   263,   197,
2341 <     218,   197,   263,   263,   131,   263,   263,   263,   263,   263,
2342 <     228,   229,   230,   263,   232,   233,   234,   131,   263,   237,
2343 <     263,   263,   240,   204,   205,   206,   207,   208,   260,   210,
2344 <     211,   260,   213,   214,   215,   263,   263,   218,   260,   260,
2345 <     153,   260,   153,   260,   260,   260,   260,   228,   229,   230,
2346 <     260,   232,   233,   234,   260,   260,   237,   260,   260,   240,
2347 <     204,   205,   206,   207,   208,   260,   210,   211,   260,   213,
2348 <     214,   215,   260,   260,   218,   260,   153,   260,   260,   153,
2349 <     260,   260,   260,   260,   228,   229,   230,   260,   232,   233,
2350 <     234,   260,   260,   237,   260,   260,   240,   260,   260,   260,
2351 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2352 <     260,   260,   260,   260,   260,   260,   153,   260,   260,   260,
2353 <     260,   260,   260,   260,   260,   260,   153,   260,   153,   263,
2354 <     260,   263,   263,   153,   260,   263,   153,   260,   260,   260,
2355 <     260,   260,   260,   260,   260,   260,   153,   153,   260,   153,
2356 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2357 <     260,   260,   153,   153,   153,   263,   263,   263,   263,   263,
2358 <     263,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2359 <     260,   260,   260,   131,   260,   260,   131,   260,   260,   260,
2360 <     260,   260,   131,   260,   131,   263,   260,   263,   131,   131,
2361 <     153,   131,   131,   260,   153,   197,   153,   153,   263,   153,
2362 <     153,   153,   153,   131,   260,   153,   260,   153,   153,   260,
2363 <     260,   260,   260,   130,   260,   260,   260,   260,   260,   260,
2364 <     260,   260,   260,   153,   260,   197,   260,   260,   260,   260,
2365 <     153,   153,   153,   153,   130,   264,   260,   263,   263,   260,
2366 <     260,   260,   260,   131,   130,   260,    71,   260,   260,   260,
2367 <     260,   260,   260,   260,   260,   260,   260,   260,   313,   773,
2368 <    1346,  1327,   260,   260,   260,   260,   260,   260,   260,   260,
2369 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2370 <     260,   260,   260,   260,   260,   260,   482,  1325,   595,  1269,
2371 <     512,  1168,  1254,  1252,   545,  1306,   553,  1311,  1308,  1267,
2372 <     625,   275,  1309,   360,   124,  1245,   372,   184,    95,  1128,
2373 <    1251,  1126,  1249,    -1,    -1,    -1,    -1,    -1,   457,    -1,
2374 <     291,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
2375 <      -1,    -1,    -1,    -1,    -1,    -1,    -1,   472,   440
2062 >       0,   240,   241,   241,   242,   242,   242,   242,   242,   242,
2063 >     242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
2064 >     242,   242,   242,   242,   242,   242,   242,   242,   243,   243,
2065 >     244,   244,   244,   244,   244,   244,   244,   244,   245,   245,
2066 >     246,   246,   246,   246,   247,   248,   248,   249,   249,   249,
2067 >     250,   251,   252,   253,   253,   254,   254,   254,   254,   254,
2068 >     254,   254,   254,   254,   254,   254,   254,   254,   254,   254,
2069 >     254,   254,   254,   255,   256,   257,   258,   259,   260,   261,
2070 >     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
2071 >     272,   273,   273,   274,   274,   274,   274,   275,   276,   277,
2072 >     279,   278,   280,   280,   281,   281,   281,   282,   283,   285,
2073 >     284,   286,   286,   287,   287,   287,   287,   287,   288,   289,
2074 >     290,   291,   292,   293,   293,   294,   294,   294,   295,   297,
2075 >     296,   298,   298,   299,   299,   299,   299,   300,   301,   301,
2076 >     303,   302,   304,   304,   305,   305,   305,   305,   305,   305,
2077 >     305,   305,   305,   307,   306,   308,   308,   309,   309,   309,
2078 >     309,   309,   309,   309,   309,   309,   309,   309,   310,   311,
2079 >     312,   313,   314,   315,   316,   317,   319,   318,   320,   320,
2080 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2081 >     321,   321,   321,   321,   321,   321,   321,   321,   321,   321,
2082 >     321,   321,   323,   322,   324,   324,   325,   325,   325,   325,
2083 >     325,   325,   325,   325,   325,   325,   325,   325,   325,   325,
2084 >     325,   325,   325,   325,   325,   325,   325,   325,   325,   327,
2085 >     326,   328,   328,   329,   329,   329,   329,   329,   329,   329,
2086 >     329,   329,   329,   329,   329,   329,   329,   329,   329,   329,
2087 >     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
2088 >     339,   340,   341,   342,   343,   344,   345,   347,   346,   348,
2089 >     348,   349,   349,   351,   350,   353,   352,   354,   354,   355,
2090 >     355,   355,   356,   356,   357,   357,   357,   357,   357,   359,
2091 >     358,   360,   360,   361,   361,   362,   363,   365,   364,   366,
2092 >     366,   367,   367,   367,   367,   367,   367,   367,   367,   367,
2093 >     368,   369,   370,   371,   373,   372,   374,   374,   375,   375,
2094 >     375,   375,   375,   375,   375,   375,   375,   375,   376,   377,
2095 >     378,   380,   379,   381,   381,   382,   382,   382,   382,   383,
2096 >     384,   385,   386,   387,   387,   388,   388,   389,   391,   390,
2097 >     392,   392,   393,   393,   393,   393,   394,   395,   397,   396,
2098 >     398,   398,   399,   399,   399,   399,   399,   399,   399,   399,
2099 >     399,   399,   401,   400,   402,   402,   403,   403,   403,   404,
2100 >     406,   405,   407,   407,   408,   408,   408,   408,   408,   408,
2101 >     408,   408,   408,   408,   410,   409,   411,   411,   412,   412,
2102 >     412,   412,   412,   412,   412,   412,   412,   412,   412,   412,
2103 >     412,   412,   412,   413,   414,   415,   416,   417,   418,   419,
2104 >     420,   420,   422,   421,   423,   423,   424,   424,   425,   426,
2105 >     427,   428,   429,   431,   430,   432,   432,   433,   433,   433,
2106 >     434,   435,   437,   436,   438,   438,   439,   439,   439,   440,
2107 >     441,   442,   443,   443,   444,   444,   445,   447,   446,   448,
2108 >     448,   449,   449,   449,   450,   451,   452,   453,   453,   454,
2109 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2110 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2111 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2112 >     454,   454,   454,   454,   454,   454,   454,   454,   454,   454,
2113 >     454,   454,   454,   454,   454,   454,   454,   454,   455,   456,
2114 >     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
2115 >     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
2116 >     477,   478,   479,   480,   481,   482,   482,   483,   483,   484,
2117 >     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
2118 >     495,   496,   497,   499,   498,   500,   500,   501,   501,   501,
2119 >     501,   501,   501,   501,   501,   501,   501,   501,   501,   501,
2120 >     501,   501,   501,   501,   501,   501,   501,   501,   501,   503,
2121 >     502,   504,   504,   505,   505,   505,   505,   505,   505,   505,
2122 >     505,   505,   505,   505,   505,   505,   505,   505,   505,   505,
2123 >     505,   505,   505,   506,   507,   508,   509,   510,   510,   511,
2124 >     511,   511,   511,   511,   511,   511,   511,   511,   511,   511,
2125 >     511,   511,   511,   511,   512,   513,   514,   515,   516,   517,
2126 >     518,   519,   520,   521,   522,   523,   524,   525,   526,   527,
2127 >     527,   528,   528,   528,   528,   528,   528,   528,   528,   528,
2128 >     529,   530,   531,   532,   533,   534,   535,   536
2129   };
2130  
2131 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
2132 <   symbol of state STATE-NUM.  */
2380 < static const yytype_uint16 yystos[] =
2131 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2132 > static const yytype_uint8 yyr2[] =
2133   {
2134 <       0,   266,     0,     1,     5,    22,    26,    29,    36,    51,
2135 <      63,    64,    66,    73,    90,   100,   102,   119,   136,   171,
2136 <     180,   181,   185,   186,   267,   272,   277,   295,   301,   316,
2137 <     339,   358,   372,   390,   397,   407,   416,   442,   452,   458,
2138 <     462,   472,   536,   552,   573,   260,   261,   262,   262,   340,
2139 <     417,   453,   262,   463,   262,   537,   373,   443,   359,   262,
2140 <     262,   317,   391,   262,   262,   398,   408,     1,    37,    47,
2141 <     120,   296,   297,   298,   299,   300,     1,    13,    34,    35,
2142 <      40,    42,    96,    97,   105,   106,   126,   127,   143,   144,
2143 <     154,   163,   250,   251,   252,   553,   554,   555,   556,   557,
2144 <     558,   559,   560,   561,   562,   563,   564,   565,   566,   567,
2145 <     568,   569,   570,   571,   572,   153,   341,   345,   153,   418,
2146 <     422,   262,     1,    89,   459,   460,   461,   262,     1,     8,
2147 <       9,    12,    19,    28,    32,    33,    39,    43,    44,    46,
2148 <      52,    70,    71,    75,    82,    86,    87,    88,    91,    94,
2149 <      95,   104,   110,   111,   113,   114,   115,   116,   117,   128,
2150 <     137,   139,   140,   142,   145,   146,   149,   160,   182,   184,
2151 <     188,   192,   193,   194,   195,   196,   200,   201,   209,   241,
2152 <     243,   249,   254,   259,   473,   474,   475,   476,   477,   478,
2153 <     479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
2154 <     489,   490,   491,   492,   493,   494,   495,   496,   497,   498,
2155 <     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
2156 <     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
2157 <     519,   520,   521,   522,   523,   524,   528,   532,   533,   534,
2158 <     535,   262,   262,   262,   262,     1,    55,    56,    57,    58,
2159 <      59,    60,    61,    62,   103,   138,   219,   253,   302,   303,
2160 <     304,   305,   306,   307,   308,   309,   310,   311,   312,   313,
2161 <     314,   315,     1,   118,   148,   273,   274,   275,   276,   153,
2162 <     318,   322,   262,     1,    41,    54,    76,    78,    80,    81,
2163 <      99,   574,   575,   576,   577,   578,   579,   580,   581,   582,
2164 <       1,    37,    84,   120,   122,   123,   165,   167,   168,   183,
2165 <     227,   255,   256,   278,   279,   280,   284,   285,   286,   287,
2166 <     288,   289,   290,   291,   292,   293,   294,   262,   262,   260,
2167 <     263,   263,   263,   261,   297,   263,   263,   263,   263,   263,
2168 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2169 <     263,   263,   263,   261,   554,   262,   262,     1,    89,   155,
2170 <     454,   455,   456,   457,   263,   261,   460,     1,   120,   155,
2171 <     187,   464,   468,   469,   470,   471,   263,   263,   263,   263,
2172 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2173 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2174 <     263,   263,   263,   263,   263,   263,   263,   263,   529,   263,
2175 <     525,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2176 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2177 <     263,   261,   474,     1,     4,    45,    48,   102,   120,   248,
2178 <     538,   539,   540,   541,   542,   546,   547,   548,     1,    26,
2179 <      49,    53,   147,   156,   157,   190,   248,   374,   375,   376,
2180 <     377,   378,   379,   380,   387,   388,   389,     1,   155,   187,
2181 <     248,   444,   448,   449,   450,   451,     1,    53,    83,    89,
2182 <     152,   360,   364,   365,   366,   370,   371,   260,   263,   263,
2183 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2184 <     261,   303,   260,   263,   263,   261,   274,   262,     1,    22,
2185 <     124,   155,   392,   393,   394,   395,   396,   263,   263,   263,
2186 <     263,   263,   263,   263,   261,   575,   260,   263,   263,   263,
2187 <     263,   263,   263,   263,   281,   263,   263,   263,   263,   261,
2188 <     279,     1,   120,   187,   248,   399,   400,   401,   402,   403,
2189 <       1,   120,   187,   409,   410,   411,   412,   153,   153,   153,
2190 <     260,   197,   131,   131,   197,   197,   131,   269,   269,   131,
2191 <     131,   197,   197,   131,   269,   197,   197,   197,   197,   197,
2192 <     260,     1,    23,    24,    30,   107,   108,   109,   112,   120,
2193 <     133,   134,   150,   151,   178,   342,   343,   344,   346,   347,
2194 <     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
2195 <       1,     3,     6,    25,    26,    49,    53,    83,    85,    98,
2196 <     120,   152,   166,   179,   255,   419,   420,   421,   423,   424,
2197 <     425,   426,   427,   428,   429,   436,   437,   438,   439,   440,
2198 <     441,   263,   263,   261,   455,   153,   260,   263,   263,   465,
2199 <     261,   469,   197,   269,   197,   269,   131,   153,   131,   197,
2200 <     197,   131,   153,   197,   131,   131,   131,   197,   269,   197,
2449 <     197,   269,   153,   197,   131,   131,   269,   131,   131,   153,
2450 <     131,   131,   197,   197,   263,   197,   263,   269,   269,   197,
2451 <     269,   153,   197,   197,   197,   197,   198,   197,   198,   197,
2452 <     197,   269,   269,   131,   271,   269,   197,   197,   197,   197,
2453 <     260,   549,   263,   263,   543,   263,   263,   261,   539,   260,
2454 <     263,   263,   381,   263,   263,   263,   263,   263,   261,   375,
2455 <     263,   445,   263,   261,   449,   260,   361,   263,   263,   263,
2456 <     261,   365,   153,   153,   153,   153,   153,   153,   153,   153,
2457 <     220,   221,   222,   223,   224,   225,   226,   153,   153,   197,
2458 <     260,   153,   153,   260,     1,    26,    49,    53,   120,   147,
2459 <     166,   236,   248,   319,   320,   321,   323,   324,   325,   326,
2460 <     327,   328,   332,   260,   263,   263,   263,   261,   393,   197,
2461 <     197,   197,   153,   197,   197,   269,   260,   153,   197,   153,
2462 <     153,   153,   153,   153,   263,   153,   131,   153,   153,   260,
2463 <     260,   263,   404,   263,   261,   400,   260,   263,   413,   261,
2464 <     410,   260,   260,   260,   260,   260,   260,   260,   260,   173,
2465 <     174,   175,   176,   177,   268,   269,   260,   260,   260,   260,
2466 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2467 <     263,   263,   263,   263,   263,   263,   263,   263,   263,   263,
2468 <     263,   263,   263,   261,   343,   260,   263,   263,   263,   263,
2469 <     263,   430,   263,   263,   263,   263,   263,   263,   263,   263,
2470 <     261,   420,   153,   153,   260,   260,   153,   153,   263,   260,
2471 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2472 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2473 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2474 <     260,   260,   204,   205,   206,   207,   208,   210,   211,   213,
2475 <     214,   215,   218,   228,   229,   230,   232,   233,   234,   237,
2476 <     240,   530,   531,   260,   204,   205,   206,   207,   208,   210,
2477 <     211,   213,   214,   215,   218,   228,   229,   230,   232,   233,
2478 <     234,   237,   240,   526,   527,   260,   260,   260,   260,   260,
2479 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2480 <     260,    14,    15,    16,   270,   271,   260,   260,   260,   260,
2481 <     260,   260,   263,   269,   197,   263,   153,   153,   260,   153,
2482 <     197,   263,   153,   131,   153,   153,   153,   260,   153,   263,
2483 <     153,   260,   263,   153,   153,   131,   368,   369,   260,   260,
2484 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2485 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2486 <     263,   263,   333,   263,   263,   263,   329,   263,   261,   320,
2487 <     153,   153,   153,   260,   260,   260,   260,   260,   260,   260,
2488 <     260,   260,   260,   260,   260,   260,   260,   260,   169,   170,
2489 <     282,   283,   260,   260,   260,   260,   153,   263,   153,   260,
2490 <     153,   263,   260,   268,   268,   268,   268,   268,   131,   131,
2491 <     269,   131,   131,   131,   131,   153,   131,   131,   269,   269,
2492 <     271,   260,   153,   216,   217,   153,   153,   197,   263,   153,
2493 <     153,   153,   153,   131,   153,   153,   153,   260,   260,   260,
2494 <     260,   260,   158,   466,   467,   260,   264,   260,   264,   270,
2495 <     270,   270,    11,   199,   550,   551,   260,   260,    11,   199,
2496 <     544,   545,   260,   260,   260,   260,   130,   382,   383,   385,
2497 <     260,   260,   260,   260,   260,   260,   158,   446,   447,   260,
2498 <      76,   231,   235,   362,   363,   260,   260,   202,   264,   367,
2499 <     153,   197,   263,   153,   153,   153,   263,   153,   260,   260,
2500 <     260,   260,   260,   264,   260,    92,   171,   203,   218,   238,
2501 <     239,   244,   245,   246,   247,   257,   405,   406,   260,   260,
2502 <      92,   171,   203,   218,   238,   239,   244,   245,   246,   247,
2503 <     257,   414,   415,   260,   260,   260,   260,   260,   260,   260,
2504 <     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
2505 <     260,   260,   130,   431,   432,   434,   260,   260,   260,   260,
2506 <     260,   260,   260,   260,   260,   264,   531,   527,   260,   264,
2507 <     260,   264,   384,   260,   264,    20,    21,    50,    67,    74,
2508 <      93,   121,   129,   172,   191,   386,   260,   264,   260,   264,
2509 <     131,   369,   260,   260,   260,   130,   334,   335,   337,   260,
2510 <     260,   260,   204,   205,   206,   207,   208,   210,   211,   213,
2511 <     214,   215,   218,   228,   229,   230,   232,   233,   234,   237,
2512 <     240,   330,   331,   260,   283,   260,   264,   260,   264,   433,
2513 <     260,   264,    10,    12,    27,    31,   242,   435,   467,   551,
2514 <     545,   386,   383,   447,   363,   336,   260,   264,     5,    38,
2515 <      49,    65,    72,    77,    79,    92,   125,   141,   159,   161,
2516 <     162,   229,   247,   257,   338,   260,   264,   406,   415,   435,
2517 <     432,   338,   335,   331
2134 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2135 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2136 >       1,     1,     1,     1,     1,     1,     2,     2,     0,     1,
2137 >       2,     3,     3,     3,     3,     3,     3,     3,     0,     1,
2138 >       2,     3,     3,     3,     5,     2,     1,     1,     1,     2,
2139 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2140 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2141 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2142 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2143 >       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2144 >       0,     6,     2,     1,     1,     1,     2,     4,     4,     0,
2145 >       6,     2,     1,     1,     1,     1,     1,     2,     4,     4,
2146 >       4,     4,     5,     2,     1,     1,     1,     2,     4,     0,
2147 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2148 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2149 >       1,     1,     1,     0,     6,     2,     1,     1,     1,     1,
2150 >       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
2151 >       4,     4,     4,     4,     4,     4,     0,     5,     3,     1,
2152 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2153 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2154 >       1,     1,     0,     5,     3,     1,     3,     1,     3,     1,
2155 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2156 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2157 >       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
2158 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2159 >       2,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2160 >       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
2161 >       1,     1,     1,     0,     6,     0,     5,     3,     1,     1,
2162 >       1,     1,     2,     1,     1,     1,     1,     1,     2,     0,
2163 >       5,     3,     1,     1,     3,     4,     4,     0,     6,     2,
2164 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
2165 >       4,     4,     4,     4,     0,     5,     3,     1,     1,     1,
2166 >       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
2167 >       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
2168 >       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
2169 >       2,     1,     1,     1,     1,     2,     4,     4,     0,     5,
2170 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2171 >       1,     1,     0,     6,     2,     1,     1,     1,     2,     4,
2172 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2173 >       1,     1,     1,     1,     0,     6,     2,     1,     1,     1,
2174 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2175 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2176 >       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
2177 >       4,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2178 >       4,     4,     0,     6,     2,     1,     1,     1,     1,     4,
2179 >       4,     5,     2,     1,     1,     1,     4,     0,     6,     2,
2180 >       1,     1,     1,     1,     4,     4,     5,     2,     1,     1,
2181 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2182 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2183 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2184 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2185 >       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
2186 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2187 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2188 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2189 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2190 >       4,     4,     4,     0,     5,     3,     1,     1,     1,     1,
2191 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2192 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2193 >       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
2194 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2195 >       1,     1,     1,     4,     4,     4,     5,     2,     1,     1,
2196 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2197 >       1,     1,     1,     1,     4,     4,     4,     4,     4,     4,
2198 >       4,     4,     4,     4,     4,     4,     4,     4,     5,     2,
2199 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2200 >       4,     4,     4,     4,     4,     4,     4,     4
2201   };
2202  
2520 #define yyerrok         (yyerrstatus = 0)
2521 #define yyclearin       (yychar = YYEMPTY)
2522 #define YYEMPTY         (-2)
2523 #define YYEOF           0
2524
2525 #define YYACCEPT        goto yyacceptlab
2526 #define YYABORT         goto yyabortlab
2527 #define YYERROR         goto yyerrorlab
2528
2529
2530 /* Like YYERROR except do call yyerror.  This remains here temporarily
2531   to ease the transition to the new meaning of YYERROR, for GCC.
2532   Once GCC version 2 has supplanted version 1, this can go.  However,
2533   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
2534   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
2535   discussed.  */
2536
2537 #define YYFAIL          goto yyerrlab
2538 #if defined YYFAIL
2539  /* This is here to suppress warnings from the GCC cpp's
2540     -Wunused-macros.  Normally we don't worry about that warning, but
2541     some users do, and we want to make it easy for users to remove
2542     YYFAIL uses, which will produce warnings from Bison 2.5.  */
2543 #endif
2544
2545 #define YYRECOVERING()  (!!yyerrstatus)
2546
2547 #define YYBACKUP(Token, Value)                                  \
2548 do                                                              \
2549  if (yychar == YYEMPTY && yylen == 1)                          \
2550    {                                                           \
2551      yychar = (Token);                                         \
2552      yylval = (Value);                                         \
2553      yytoken = YYTRANSLATE (yychar);                           \
2554      YYPOPSTACK (1);                                           \
2555      goto yybackup;                                            \
2556    }                                                           \
2557  else                                                          \
2558    {                                                           \
2559      yyerror (YY_("syntax error: cannot back up")); \
2560      YYERROR;                                                  \
2561    }                                                           \
2562 while (YYID (0))
2563
2564
2565 #define YYTERROR        1
2566 #define YYERRCODE       256
2567
2568
2569 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
2570   If N is 0, then set CURRENT to the empty location which ends
2571   the previous symbol: RHS[0] (always defined).  */
2572
2573 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
2574 #ifndef YYLLOC_DEFAULT
2575 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
2576    do                                                                  \
2577      if (YYID (N))                                                    \
2578        {                                                               \
2579          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
2580          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
2581          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
2582          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
2583        }                                                               \
2584      else                                                              \
2585        {                                                               \
2586          (Current).first_line   = (Current).last_line   =              \
2587            YYRHSLOC (Rhs, 0).last_line;                                \
2588          (Current).first_column = (Current).last_column =              \
2589            YYRHSLOC (Rhs, 0).last_column;                              \
2590        }                                                               \
2591    while (YYID (0))
2592 #endif
2203  
2204 + #define yyerrok         (yyerrstatus = 0)
2205 + #define yyclearin       (yychar = YYEMPTY)
2206 + #define YYEMPTY         (-2)
2207 + #define YYEOF           0
2208 +
2209 + #define YYACCEPT        goto yyacceptlab
2210 + #define YYABORT         goto yyabortlab
2211 + #define YYERROR         goto yyerrorlab
2212  
2595 /* YY_LOCATION_PRINT -- Print the location on the stream.
2596   This macro was not mandated originally: define only if we know
2597   we won't break user code: when these are the locations we know.  */
2213  
2214 < #ifndef YY_LOCATION_PRINT
2600 < # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
2601 < #  define YY_LOCATION_PRINT(File, Loc)                  \
2602 <     fprintf (File, "%d.%d-%d.%d",                      \
2603 <              (Loc).first_line, (Loc).first_column,     \
2604 <              (Loc).last_line,  (Loc).last_column)
2605 < # else
2606 < #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2607 < # endif
2608 < #endif
2214 > #define YYRECOVERING()  (!!yyerrstatus)
2215  
2216 + #define YYBACKUP(Token, Value)                                  \
2217 + do                                                              \
2218 +  if (yychar == YYEMPTY)                                        \
2219 +    {                                                           \
2220 +      yychar = (Token);                                         \
2221 +      yylval = (Value);                                         \
2222 +      YYPOPSTACK (yylen);                                       \
2223 +      yystate = *yyssp;                                         \
2224 +      goto yybackup;                                            \
2225 +    }                                                           \
2226 +  else                                                          \
2227 +    {                                                           \
2228 +      yyerror (YY_("syntax error: cannot back up")); \
2229 +      YYERROR;                                                  \
2230 +    }                                                           \
2231 + while (0)
2232 +
2233 + /* Error token number */
2234 + #define YYTERROR        1
2235 + #define YYERRCODE       256
2236  
2611 /* YYLEX -- calling `yylex' with the right arguments.  */
2237  
2613 #ifdef YYLEX_PARAM
2614 # define YYLEX yylex (YYLEX_PARAM)
2615 #else
2616 # define YYLEX yylex ()
2617 #endif
2238  
2239   /* Enable debugging if requested.  */
2240   #if YYDEBUG
# Line 2624 | Line 2244 | while (YYID (0))
2244   #  define YYFPRINTF fprintf
2245   # endif
2246  
2247 < # define YYDPRINTF(Args)                        \
2248 < do {                                            \
2249 <  if (yydebug)                                  \
2250 <    YYFPRINTF Args;                             \
2251 < } while (YYID (0))
2632 <
2633 < # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2634 < do {                                                                      \
2635 <  if (yydebug)                                                            \
2636 <    {                                                                     \
2637 <      YYFPRINTF (stderr, "%s ", Title);                                   \
2638 <      yy_symbol_print (stderr,                                            \
2639 <                  Type, Value); \
2640 <      YYFPRINTF (stderr, "\n");                                           \
2641 <    }                                                                     \
2642 < } while (YYID (0))
2247 > # define YYDPRINTF(Args)                        \
2248 > do {                                            \
2249 >  if (yydebug)                                  \
2250 >    YYFPRINTF Args;                             \
2251 > } while (0)
2252  
2253 + /* This macro is provided for backward compatibility. */
2254 + #ifndef YY_LOCATION_PRINT
2255 + # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2256 + #endif
2257  
2645 /*--------------------------------.
2646 | Print this symbol on YYOUTPUT.  |
2647 `--------------------------------*/
2258  
2259 < /*ARGSUSED*/
2260 < #if (defined __STDC__ || defined __C99__FUNC__ \
2261 <     || defined __cplusplus || defined _MSC_VER)
2259 > # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2260 > do {                                                                      \
2261 >  if (yydebug)                                                            \
2262 >    {                                                                     \
2263 >      YYFPRINTF (stderr, "%s ", Title);                                   \
2264 >      yy_symbol_print (stderr,                                            \
2265 >                  Type, Value); \
2266 >      YYFPRINTF (stderr, "\n");                                           \
2267 >    }                                                                     \
2268 > } while (0)
2269 >
2270 >
2271 > /*----------------------------------------.
2272 > | Print this symbol's value on YYOUTPUT.  |
2273 > `----------------------------------------*/
2274 >
2275   static void
2276   yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2654 #else
2655 static void
2656 yy_symbol_value_print (yyoutput, yytype, yyvaluep)
2657    FILE *yyoutput;
2658    int yytype;
2659    YYSTYPE const * const yyvaluep;
2660 #endif
2277   {
2278 +  FILE *yyo = yyoutput;
2279 +  YYUSE (yyo);
2280    if (!yyvaluep)
2281      return;
2282   # ifdef YYPRINT
2283    if (yytype < YYNTOKENS)
2284      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2667 # else
2668  YYUSE (yyoutput);
2285   # endif
2286 <  switch (yytype)
2671 <    {
2672 <      default:
2673 <        break;
2674 <    }
2286 >  YYUSE (yytype);
2287   }
2288  
2289  
# Line 2679 | Line 2291 | yy_symbol_value_print (yyoutput, yytype,
2291   | Print this symbol on YYOUTPUT.  |
2292   `--------------------------------*/
2293  
2682 #if (defined __STDC__ || defined __C99__FUNC__ \
2683     || defined __cplusplus || defined _MSC_VER)
2294   static void
2295   yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2686 #else
2687 static void
2688 yy_symbol_print (yyoutput, yytype, yyvaluep)
2689    FILE *yyoutput;
2690    int yytype;
2691    YYSTYPE const * const yyvaluep;
2692 #endif
2296   {
2297 <  if (yytype < YYNTOKENS)
2298 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2696 <  else
2697 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2297 >  YYFPRINTF (yyoutput, "%s %s (",
2298 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2299  
2300    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2301    YYFPRINTF (yyoutput, ")");
# Line 2705 | Line 2306 | yy_symbol_print (yyoutput, yytype, yyval
2306   | TOP (included).                                                   |
2307   `------------------------------------------------------------------*/
2308  
2708 #if (defined __STDC__ || defined __C99__FUNC__ \
2709     || defined __cplusplus || defined _MSC_VER)
2309   static void
2310   yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
2712 #else
2713 static void
2714 yy_stack_print (yybottom, yytop)
2715    yytype_int16 *yybottom;
2716    yytype_int16 *yytop;
2717 #endif
2311   {
2312    YYFPRINTF (stderr, "Stack now");
2313    for (; yybottom <= yytop; yybottom++)
# Line 2725 | Line 2318 | yy_stack_print (yybottom, yytop)
2318    YYFPRINTF (stderr, "\n");
2319   }
2320  
2321 < # define YY_STACK_PRINT(Bottom, Top)                            \
2322 < do {                                                            \
2323 <  if (yydebug)                                                  \
2324 <    yy_stack_print ((Bottom), (Top));                           \
2325 < } while (YYID (0))
2321 > # define YY_STACK_PRINT(Bottom, Top)                            \
2322 > do {                                                            \
2323 >  if (yydebug)                                                  \
2324 >    yy_stack_print ((Bottom), (Top));                           \
2325 > } while (0)
2326  
2327  
2328   /*------------------------------------------------.
2329   | Report that the YYRULE is going to be reduced.  |
2330   `------------------------------------------------*/
2331  
2739 #if (defined __STDC__ || defined __C99__FUNC__ \
2740     || defined __cplusplus || defined _MSC_VER)
2332   static void
2333 < yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
2743 < #else
2744 < static void
2745 < yy_reduce_print (yyvsp, yyrule)
2746 <    YYSTYPE *yyvsp;
2747 <    int yyrule;
2748 < #endif
2333 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2334   {
2335 +  unsigned long int yylno = yyrline[yyrule];
2336    int yynrhs = yyr2[yyrule];
2337    int yyi;
2752  unsigned long int yylno = yyrline[yyrule];
2338    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2339 <             yyrule - 1, yylno);
2339 >             yyrule - 1, yylno);
2340    /* The symbols being reduced.  */
2341    for (yyi = 0; yyi < yynrhs; yyi++)
2342      {
2343        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2344 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2345 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2346 <                                       );
2344 >      yy_symbol_print (stderr,
2345 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2346 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2347 >                                              );
2348        YYFPRINTF (stderr, "\n");
2349      }
2350   }
2351  
2352 < # define YY_REDUCE_PRINT(Rule)          \
2353 < do {                                    \
2354 <  if (yydebug)                          \
2355 <    yy_reduce_print (yyvsp, Rule); \
2356 < } while (YYID (0))
2352 > # define YY_REDUCE_PRINT(Rule)          \
2353 > do {                                    \
2354 >  if (yydebug)                          \
2355 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2356 > } while (0)
2357  
2358   /* Nonzero means print parse trace.  It is left uninitialized so that
2359     multiple parsers can coexist.  */
# Line 2781 | Line 2367 | int yydebug;
2367  
2368  
2369   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2370 < #ifndef YYINITDEPTH
2370 > #ifndef YYINITDEPTH
2371   # define YYINITDEPTH 200
2372   #endif
2373  
# Line 2796 | Line 2382 | int yydebug;
2382   # define YYMAXDEPTH 10000
2383   #endif
2384  
2799
2385  
2386   #if YYERROR_VERBOSE
2387  
# Line 2805 | Line 2390 | int yydebug;
2390   #   define yystrlen strlen
2391   #  else
2392   /* Return the length of YYSTR.  */
2808 #if (defined __STDC__ || defined __C99__FUNC__ \
2809     || defined __cplusplus || defined _MSC_VER)
2393   static YYSIZE_T
2394   yystrlen (const char *yystr)
2812 #else
2813 static YYSIZE_T
2814 yystrlen (yystr)
2815    const char *yystr;
2816 #endif
2395   {
2396    YYSIZE_T yylen;
2397    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2829 | Line 2407 | yystrlen (yystr)
2407   #  else
2408   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2409     YYDEST.  */
2832 #if (defined __STDC__ || defined __C99__FUNC__ \
2833     || defined __cplusplus || defined _MSC_VER)
2410   static char *
2411   yystpcpy (char *yydest, const char *yysrc)
2836 #else
2837 static char *
2838 yystpcpy (yydest, yysrc)
2839    char *yydest;
2840    const char *yysrc;
2841 #endif
2412   {
2413    char *yyd = yydest;
2414    const char *yys = yysrc;
# Line 2868 | Line 2438 | yytnamerr (char *yyres, const char *yyst
2438        char const *yyp = yystr;
2439  
2440        for (;;)
2441 <        switch (*++yyp)
2442 <          {
2443 <          case '\'':
2444 <          case ',':
2445 <            goto do_not_strip_quotes;
2446 <
2447 <          case '\\':
2448 <            if (*++yyp != '\\')
2449 <              goto do_not_strip_quotes;
2450 <            /* Fall through.  */
2451 <          default:
2452 <            if (yyres)
2453 <              yyres[yyn] = *yyp;
2454 <            yyn++;
2455 <            break;
2456 <
2457 <          case '"':
2458 <            if (yyres)
2459 <              yyres[yyn] = '\0';
2460 <            return yyn;
2461 <          }
2441 >        switch (*++yyp)
2442 >          {
2443 >          case '\'':
2444 >          case ',':
2445 >            goto do_not_strip_quotes;
2446 >
2447 >          case '\\':
2448 >            if (*++yyp != '\\')
2449 >              goto do_not_strip_quotes;
2450 >            /* Fall through.  */
2451 >          default:
2452 >            if (yyres)
2453 >              yyres[yyn] = *yyp;
2454 >            yyn++;
2455 >            break;
2456 >
2457 >          case '"':
2458 >            if (yyres)
2459 >              yyres[yyn] = '\0';
2460 >            return yyn;
2461 >          }
2462      do_not_strip_quotes: ;
2463      }
2464  
# Line 2899 | Line 2469 | yytnamerr (char *yyres, const char *yyst
2469   }
2470   # endif
2471  
2472 < /* Copy into YYRESULT an error message about the unexpected token
2473 <   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
2474 <   including the terminating null byte.  If YYRESULT is null, do not
2475 <   copy anything; just return the number of bytes that would be
2476 <   copied.  As a special case, return 0 if an ordinary "syntax error"
2477 <   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
2478 <   size calculation.  */
2479 < static YYSIZE_T
2480 < yysyntax_error (char *yyresult, int yystate, int yychar)
2472 > /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
2473 >   about the unexpected token YYTOKEN for the state stack whose top is
2474 >   YYSSP.
2475 >
2476 >   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
2477 >   not large enough to hold the message.  In that case, also set
2478 >   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
2479 >   required number of bytes is too large to store.  */
2480 > static int
2481 > yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2482 >                yytype_int16 *yyssp, int yytoken)
2483   {
2484 <  int yyn = yypact[yystate];
2484 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2485 >  YYSIZE_T yysize = yysize0;
2486 >  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2487 >  /* Internationalized format string. */
2488 >  const char *yyformat = YY_NULLPTR;
2489 >  /* Arguments of yyformat. */
2490 >  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2491 >  /* Number of reported tokens (one for the "unexpected", one per
2492 >     "expected"). */
2493 >  int yycount = 0;
2494 >
2495 >  /* There are many possibilities here to consider:
2496 >     - If this state is a consistent state with a default action, then
2497 >       the only way this function was invoked is if the default action
2498 >       is an error action.  In that case, don't check for expected
2499 >       tokens because there are none.
2500 >     - The only way there can be no lookahead present (in yychar) is if
2501 >       this state is a consistent state with a default action.  Thus,
2502 >       detecting the absence of a lookahead is sufficient to determine
2503 >       that there is no unexpected or expected token to report.  In that
2504 >       case, just report a simple "syntax error".
2505 >     - Don't assume there isn't a lookahead just because this state is a
2506 >       consistent state with a default action.  There might have been a
2507 >       previous inconsistent state, consistent state with a non-default
2508 >       action, or user semantic action that manipulated yychar.
2509 >     - Of course, the expected token list depends on states to have
2510 >       correct lookahead information, and it depends on the parser not
2511 >       to perform extra reductions after fetching a lookahead from the
2512 >       scanner and before detecting a syntax error.  Thus, state merging
2513 >       (from LALR or IELR) and default reductions corrupt the expected
2514 >       token list.  However, the list is correct for canonical LR with
2515 >       one exception: it will still contain any token that will not be
2516 >       accepted due to an error action in a later state.
2517 >  */
2518 >  if (yytoken != YYEMPTY)
2519 >    {
2520 >      int yyn = yypact[*yyssp];
2521 >      yyarg[yycount++] = yytname[yytoken];
2522 >      if (!yypact_value_is_default (yyn))
2523 >        {
2524 >          /* Start YYX at -YYN if negative to avoid negative indexes in
2525 >             YYCHECK.  In other words, skip the first -YYN actions for
2526 >             this state because they are default actions.  */
2527 >          int yyxbegin = yyn < 0 ? -yyn : 0;
2528 >          /* Stay within bounds of both yycheck and yytname.  */
2529 >          int yychecklim = YYLAST - yyn + 1;
2530 >          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
2531 >          int yyx;
2532 >
2533 >          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
2534 >            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
2535 >                && !yytable_value_is_error (yytable[yyx + yyn]))
2536 >              {
2537 >                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
2538 >                  {
2539 >                    yycount = 1;
2540 >                    yysize = yysize0;
2541 >                    break;
2542 >                  }
2543 >                yyarg[yycount++] = yytname[yyx];
2544 >                {
2545 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2546 >                  if (! (yysize <= yysize1
2547 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2548 >                    return 2;
2549 >                  yysize = yysize1;
2550 >                }
2551 >              }
2552 >        }
2553 >    }
2554  
2555 <  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
2915 <    return 0;
2916 <  else
2555 >  switch (yycount)
2556      {
2557 <      int yytype = YYTRANSLATE (yychar);
2558 <      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
2559 <      YYSIZE_T yysize = yysize0;
2560 <      YYSIZE_T yysize1;
2561 <      int yysize_overflow = 0;
2562 <      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2563 <      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2564 <      int yyx;
2565 <
2566 < # if 0
2567 <      /* This is so xgettext sees the translatable formats that are
2568 <         constructed on the fly.  */
2569 <      YY_("syntax error, unexpected %s");
2570 <      YY_("syntax error, unexpected %s, expecting %s");
2571 <      YY_("syntax error, unexpected %s, expecting %s or %s");
2572 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
2573 <      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
2574 < # endif
2575 <      char *yyfmt;
2576 <      char const *yyf;
2577 <      static char const yyunexpected[] = "syntax error, unexpected %s";
2578 <      static char const yyexpecting[] = ", expecting %s";
2579 <      static char const yyor[] = " or %s";
2580 <      char yyformat[sizeof yyunexpected
2581 <                    + sizeof yyexpecting - 1
2582 <                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
2583 <                       * (sizeof yyor - 1))];
2945 <      char const *yyprefix = yyexpecting;
2946 <
2947 <      /* Start YYX at -YYN if negative to avoid negative indexes in
2948 <         YYCHECK.  */
2949 <      int yyxbegin = yyn < 0 ? -yyn : 0;
2950 <
2951 <      /* Stay within bounds of both yycheck and yytname.  */
2952 <      int yychecklim = YYLAST - yyn + 1;
2953 <      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
2954 <      int yycount = 1;
2955 <
2956 <      yyarg[0] = yytname[yytype];
2957 <      yyfmt = yystpcpy (yyformat, yyunexpected);
2958 <
2959 <      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
2960 <        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
2961 <          {
2962 <            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
2963 <              {
2964 <                yycount = 1;
2965 <                yysize = yysize0;
2966 <                yyformat[sizeof yyunexpected - 1] = '\0';
2967 <                break;
2968 <              }
2969 <            yyarg[yycount++] = yytname[yyx];
2970 <            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
2971 <            yysize_overflow |= (yysize1 < yysize);
2972 <            yysize = yysize1;
2973 <            yyfmt = yystpcpy (yyfmt, yyprefix);
2974 <            yyprefix = yyor;
2975 <          }
2976 <
2977 <      yyf = YY_(yyformat);
2978 <      yysize1 = yysize + yystrlen (yyf);
2979 <      yysize_overflow |= (yysize1 < yysize);
2980 <      yysize = yysize1;
2981 <
2982 <      if (yysize_overflow)
2983 <        return YYSIZE_MAXIMUM;
2984 <
2985 <      if (yyresult)
2986 <        {
2987 <          /* Avoid sprintf, as that infringes on the user's name space.
2988 <             Don't have undefined behavior even if the translation
2989 <             produced a string with the wrong number of "%s"s.  */
2990 <          char *yyp = yyresult;
2991 <          int yyi = 0;
2992 <          while ((*yyp = *yyf) != '\0')
2993 <            {
2994 <              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
2995 <                {
2996 <                  yyp += yytnamerr (yyp, yyarg[yyi++]);
2997 <                  yyf += 2;
2998 <                }
2999 <              else
3000 <                {
3001 <                  yyp++;
3002 <                  yyf++;
3003 <                }
3004 <            }
3005 <        }
3006 <      return yysize;
2557 > # define YYCASE_(N, S)                      \
2558 >      case N:                               \
2559 >        yyformat = S;                       \
2560 >      break
2561 >      YYCASE_(0, YY_("syntax error"));
2562 >      YYCASE_(1, YY_("syntax error, unexpected %s"));
2563 >      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
2564 >      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
2565 >      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
2566 >      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
2567 > # undef YYCASE_
2568 >    }
2569 >
2570 >  {
2571 >    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2572 >    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2573 >      return 2;
2574 >    yysize = yysize1;
2575 >  }
2576 >
2577 >  if (*yymsg_alloc < yysize)
2578 >    {
2579 >      *yymsg_alloc = 2 * yysize;
2580 >      if (! (yysize <= *yymsg_alloc
2581 >             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
2582 >        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
2583 >      return 1;
2584      }
2585 +
2586 +  /* Avoid sprintf, as that infringes on the user's name space.
2587 +     Don't have undefined behavior even if the translation
2588 +     produced a string with the wrong number of "%s"s.  */
2589 +  {
2590 +    char *yyp = *yymsg;
2591 +    int yyi = 0;
2592 +    while ((*yyp = *yyformat) != '\0')
2593 +      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
2594 +        {
2595 +          yyp += yytnamerr (yyp, yyarg[yyi++]);
2596 +          yyformat += 2;
2597 +        }
2598 +      else
2599 +        {
2600 +          yyp++;
2601 +          yyformat++;
2602 +        }
2603 +  }
2604 +  return 0;
2605   }
2606   #endif /* YYERROR_VERBOSE */
3010
2607  
2608   /*-----------------------------------------------.
2609   | Release the memory associated to this symbol.  |
2610   `-----------------------------------------------*/
2611  
3016 /*ARGSUSED*/
3017 #if (defined __STDC__ || defined __C99__FUNC__ \
3018     || defined __cplusplus || defined _MSC_VER)
2612   static void
2613   yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
3021 #else
3022 static void
3023 yydestruct (yymsg, yytype, yyvaluep)
3024    const char *yymsg;
3025    int yytype;
3026    YYSTYPE *yyvaluep;
3027 #endif
2614   {
2615    YYUSE (yyvaluep);
3030
2616    if (!yymsg)
2617      yymsg = "Deleting";
2618    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2619  
2620 <  switch (yytype)
2621 <    {
2622 <
3038 <      default:
3039 <        break;
3040 <    }
2620 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2621 >  YYUSE (yytype);
2622 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2623   }
2624  
2625 < /* Prevent warnings from -Wmissing-prototypes.  */
3044 < #ifdef YYPARSE_PARAM
3045 < #if defined __STDC__ || defined __cplusplus
3046 < int yyparse (void *YYPARSE_PARAM);
3047 < #else
3048 < int yyparse ();
3049 < #endif
3050 < #else /* ! YYPARSE_PARAM */
3051 < #if defined __STDC__ || defined __cplusplus
3052 < int yyparse (void);
3053 < #else
3054 < int yyparse ();
3055 < #endif
3056 < #endif /* ! YYPARSE_PARAM */
2625 >
2626  
2627  
2628   /* The lookahead symbol.  */
# Line 3061 | Line 2630 | int yychar;
2630  
2631   /* The semantic value of the lookahead symbol.  */
2632   YYSTYPE yylval;
3064
2633   /* Number of syntax errors so far.  */
2634   int yynerrs;
2635  
2636  
2637 + /*----------.
2638 + | yyparse.  |
2639 + `----------*/
2640  
3070 /*-------------------------.
3071 | yyparse or yypush_parse.  |
3072 `-------------------------*/
3073
3074 #ifdef YYPARSE_PARAM
3075 #if (defined __STDC__ || defined __C99__FUNC__ \
3076     || defined __cplusplus || defined _MSC_VER)
3077 int
3078 yyparse (void *YYPARSE_PARAM)
3079 #else
3080 int
3081 yyparse (YYPARSE_PARAM)
3082    void *YYPARSE_PARAM;
3083 #endif
3084 #else /* ! YYPARSE_PARAM */
3085 #if (defined __STDC__ || defined __C99__FUNC__ \
3086     || defined __cplusplus || defined _MSC_VER)
2641   int
2642   yyparse (void)
3089 #else
3090 int
3091 yyparse ()
3092
3093 #endif
3094 #endif
2643   {
3096
3097
2644      int yystate;
2645      /* Number of tokens to shift before error messages enabled.  */
2646      int yyerrstatus;
2647  
2648      /* The stacks and their tools:
2649 <       `yyss': related to states.
2650 <       `yyvs': related to semantic values.
2649 >       'yyss': related to states.
2650 >       'yyvs': related to semantic values.
2651  
2652 <       Refer to the stacks thru separate pointers, to allow yyoverflow
2652 >       Refer to the stacks through separate pointers, to allow yyoverflow
2653         to reallocate them elsewhere.  */
2654  
2655      /* The state stack.  */
# Line 3121 | Line 2667 | yyparse ()
2667    int yyn;
2668    int yyresult;
2669    /* Lookahead token as an internal (translated) token number.  */
2670 <  int yytoken;
2670 >  int yytoken = 0;
2671    /* The variables used to return semantic value and location from the
2672       action routines.  */
2673    YYSTYPE yyval;
# Line 3139 | Line 2685 | yyparse ()
2685       Keep to zero when no symbol should be popped.  */
2686    int yylen = 0;
2687  
2688 <  yytoken = 0;
2689 <  yyss = yyssa;
3144 <  yyvs = yyvsa;
2688 >  yyssp = yyss = yyssa;
2689 >  yyvsp = yyvs = yyvsa;
2690    yystacksize = YYINITDEPTH;
2691  
2692    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 3150 | Line 2695 | yyparse ()
2695    yyerrstatus = 0;
2696    yynerrs = 0;
2697    yychar = YYEMPTY; /* Cause a token to be read.  */
3153
3154  /* Initialize stack pointers.
3155     Waste one element of value and location stack
3156     so that they stay on the same level as the state stack.
3157     The wasted elements are never initialized.  */
3158  yyssp = yyss;
3159  yyvsp = yyvs;
3160
2698    goto yysetstate;
2699  
2700   /*------------------------------------------------------------.
# Line 3178 | Line 2715 | yyparse ()
2715  
2716   #ifdef yyoverflow
2717        {
2718 <        /* Give user a chance to reallocate the stack.  Use copies of
2719 <           these so that the &'s don't force the real ones into
2720 <           memory.  */
2721 <        YYSTYPE *yyvs1 = yyvs;
2722 <        yytype_int16 *yyss1 = yyss;
2723 <
2724 <        /* Each stack pointer address is followed by the size of the
2725 <           data in use in that stack, in bytes.  This used to be a
2726 <           conditional around just the two extra args, but that might
2727 <           be undefined if yyoverflow is a macro.  */
2728 <        yyoverflow (YY_("memory exhausted"),
2729 <                    &yyss1, yysize * sizeof (*yyssp),
2730 <                    &yyvs1, yysize * sizeof (*yyvsp),
2731 <                    &yystacksize);
2718 >        /* Give user a chance to reallocate the stack.  Use copies of
2719 >           these so that the &'s don't force the real ones into
2720 >           memory.  */
2721 >        YYSTYPE *yyvs1 = yyvs;
2722 >        yytype_int16 *yyss1 = yyss;
2723 >
2724 >        /* Each stack pointer address is followed by the size of the
2725 >           data in use in that stack, in bytes.  This used to be a
2726 >           conditional around just the two extra args, but that might
2727 >           be undefined if yyoverflow is a macro.  */
2728 >        yyoverflow (YY_("memory exhausted"),
2729 >                    &yyss1, yysize * sizeof (*yyssp),
2730 >                    &yyvs1, yysize * sizeof (*yyvsp),
2731 >                    &yystacksize);
2732  
2733 <        yyss = yyss1;
2734 <        yyvs = yyvs1;
2733 >        yyss = yyss1;
2734 >        yyvs = yyvs1;
2735        }
2736   #else /* no yyoverflow */
2737   # ifndef YYSTACK_RELOCATE
# Line 3202 | Line 2739 | yyparse ()
2739   # else
2740        /* Extend the stack our own way.  */
2741        if (YYMAXDEPTH <= yystacksize)
2742 <        goto yyexhaustedlab;
2742 >        goto yyexhaustedlab;
2743        yystacksize *= 2;
2744        if (YYMAXDEPTH < yystacksize)
2745 <        yystacksize = YYMAXDEPTH;
2745 >        yystacksize = YYMAXDEPTH;
2746  
2747        {
2748 <        yytype_int16 *yyss1 = yyss;
2749 <        union yyalloc *yyptr =
2750 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2751 <        if (! yyptr)
2752 <          goto yyexhaustedlab;
2753 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2754 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2748 >        yytype_int16 *yyss1 = yyss;
2749 >        union yyalloc *yyptr =
2750 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2751 >        if (! yyptr)
2752 >          goto yyexhaustedlab;
2753 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2754 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2755   #  undef YYSTACK_RELOCATE
2756 <        if (yyss1 != yyssa)
2757 <          YYSTACK_FREE (yyss1);
2756 >        if (yyss1 != yyssa)
2757 >          YYSTACK_FREE (yyss1);
2758        }
2759   # endif
2760   #endif /* no yyoverflow */
# Line 3226 | Line 2763 | yyparse ()
2763        yyvsp = yyvs + yysize - 1;
2764  
2765        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2766 <                  (unsigned long int) yystacksize));
2766 >                  (unsigned long int) yystacksize));
2767  
2768        if (yyss + yystacksize - 1 <= yyssp)
2769 <        YYABORT;
2769 >        YYABORT;
2770      }
2771  
2772    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3249 | Line 2786 | yybackup:
2786  
2787    /* First try to decide what to do without reference to lookahead token.  */
2788    yyn = yypact[yystate];
2789 <  if (yyn == YYPACT_NINF)
2789 >  if (yypact_value_is_default (yyn))
2790      goto yydefault;
2791  
2792    /* Not known => get a lookahead token if don't already have one.  */
# Line 3258 | Line 2795 | yybackup:
2795    if (yychar == YYEMPTY)
2796      {
2797        YYDPRINTF ((stderr, "Reading a token: "));
2798 <      yychar = YYLEX;
2798 >      yychar = yylex ();
2799      }
2800  
2801    if (yychar <= YYEOF)
# Line 3280 | Line 2817 | yybackup:
2817    yyn = yytable[yyn];
2818    if (yyn <= 0)
2819      {
2820 <      if (yyn == 0 || yyn == YYTABLE_NINF)
2821 <        goto yyerrlab;
2820 >      if (yytable_value_is_error (yyn))
2821 >        goto yyerrlab;
2822        yyn = -yyn;
2823        goto yyreduce;
2824      }
# Line 3298 | Line 2835 | yybackup:
2835    yychar = YYEMPTY;
2836  
2837    yystate = yyn;
2838 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2839    *++yyvsp = yylval;
2840 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2841  
2842    goto yynewstate;
2843  
# Line 3321 | Line 2860 | yyreduce:
2860    yylen = yyr2[yyn];
2861  
2862    /* If YYLEN is nonzero, implement the default value of the action:
2863 <     `$$ = $1'.
2863 >     '$$ = $1'.
2864  
2865       Otherwise, the following line sets YYVAL to garbage.
2866       This behavior is undocumented and Bison
# Line 3334 | Line 2873 | yyreduce:
2873    YY_REDUCE_PRINT (yyn);
2874    switch (yyn)
2875      {
2876 <        case 26:
2877 <
3339 < /* Line 1464 of yacc.c  */
3340 < #line 424 "ircd_parser.y"
2876 >        case 28:
2877 > #line 420 "conf_parser.y" /* yacc.c:1646  */
2878      { (yyval.number) = 0; }
2879 <    break;
3343 <
3344 <  case 28:
3345 <
3346 < /* Line 1464 of yacc.c  */
3347 < #line 426 "ircd_parser.y"
3348 <    {
3349 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3350 <                }
3351 <    break;
3352 <
3353 <  case 29:
3354 <
3355 < /* Line 1464 of yacc.c  */
3356 < #line 430 "ircd_parser.y"
3357 <    {
3358 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3359 <                }
2879 > #line 2880 "conf_parser.c" /* yacc.c:1646  */
2880      break;
2881  
2882    case 30:
2883 <
2884 < /* Line 1464 of yacc.c  */
2885 < #line 434 "ircd_parser.y"
3366 <    {
3367 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3368 <                }
2883 > #line 421 "conf_parser.y" /* yacc.c:1646  */
2884 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2885 > #line 2886 "conf_parser.c" /* yacc.c:1646  */
2886      break;
2887  
2888    case 31:
2889 <
2890 < /* Line 1464 of yacc.c  */
2891 < #line 438 "ircd_parser.y"
3375 <    {
3376 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3377 <                }
2889 > #line 422 "conf_parser.y" /* yacc.c:1646  */
2890 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2891 > #line 2892 "conf_parser.c" /* yacc.c:1646  */
2892      break;
2893  
2894    case 32:
2895 <
2896 < /* Line 1464 of yacc.c  */
2897 < #line 442 "ircd_parser.y"
3384 <    {
3385 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3386 <                }
2895 > #line 423 "conf_parser.y" /* yacc.c:1646  */
2896 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2897 > #line 2898 "conf_parser.c" /* yacc.c:1646  */
2898      break;
2899  
2900    case 33:
2901 <
2902 < /* Line 1464 of yacc.c  */
2903 < #line 446 "ircd_parser.y"
3393 <    {
3394 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3395 <                }
2901 > #line 424 "conf_parser.y" /* yacc.c:1646  */
2902 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2903 > #line 2904 "conf_parser.c" /* yacc.c:1646  */
2904      break;
2905  
2906    case 34:
2907 + #line 425 "conf_parser.y" /* yacc.c:1646  */
2908 +    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2909 + #line 2910 "conf_parser.c" /* yacc.c:1646  */
2910 +    break;
2911  
2912 < /* Line 1464 of yacc.c  */
2913 < #line 451 "ircd_parser.y"
2914 <    { (yyval.number) = 0; }
2912 >  case 35:
2913 > #line 426 "conf_parser.y" /* yacc.c:1646  */
2914 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2915 > #line 2916 "conf_parser.c" /* yacc.c:1646  */
2916      break;
2917  
2918    case 36:
2919 <
2920 < /* Line 1464 of yacc.c  */
2921 < #line 452 "ircd_parser.y"
3409 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2919 > #line 427 "conf_parser.y" /* yacc.c:1646  */
2920 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2921 > #line 2922 "conf_parser.c" /* yacc.c:1646  */
2922      break;
2923  
2924    case 37:
2925 <
2926 < /* Line 1464 of yacc.c  */
2927 < #line 453 "ircd_parser.y"
3416 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2925 > #line 428 "conf_parser.y" /* yacc.c:1646  */
2926 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2927 > #line 2928 "conf_parser.c" /* yacc.c:1646  */
2928      break;
2929  
2930    case 38:
2931 + #line 431 "conf_parser.y" /* yacc.c:1646  */
2932 +    { (yyval.number) = 0; }
2933 + #line 2934 "conf_parser.c" /* yacc.c:1646  */
2934 +    break;
2935  
2936 < /* Line 1464 of yacc.c  */
2937 < #line 454 "ircd_parser.y"
2938 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2936 >  case 40:
2937 > #line 432 "conf_parser.y" /* yacc.c:1646  */
2938 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2939 > #line 2940 "conf_parser.c" /* yacc.c:1646  */
2940      break;
2941  
2942 <  case 39:
2942 >  case 41:
2943 > #line 433 "conf_parser.y" /* yacc.c:1646  */
2944 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2945 > #line 2946 "conf_parser.c" /* yacc.c:1646  */
2946 >    break;
2947  
2948 < /* Line 1464 of yacc.c  */
2949 < #line 455 "ircd_parser.y"
2950 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2948 >  case 42:
2949 > #line 434 "conf_parser.y" /* yacc.c:1646  */
2950 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2951 > #line 2952 "conf_parser.c" /* yacc.c:1646  */
2952      break;
2953  
2954 <  case 46:
2954 >  case 43:
2955 > #line 435 "conf_parser.y" /* yacc.c:1646  */
2956 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2957 > #line 2958 "conf_parser.c" /* yacc.c:1646  */
2958 >    break;
2959  
2960 < /* Line 1464 of yacc.c  */
2961 < #line 469 "ircd_parser.y"
2960 >  case 50:
2961 > #line 449 "conf_parser.y" /* yacc.c:1646  */
2962      {
3438 #ifndef STATIC_MODULES /* NOOP in the static case */
2963    if (conf_parser_ctx.pass == 2)
2964      add_conf_module(libio_basename(yylval.string));
3441 #endif
2965   }
2966 + #line 2967 "conf_parser.c" /* yacc.c:1646  */
2967      break;
2968  
2969 <  case 47:
2970 <
3447 < /* Line 1464 of yacc.c  */
3448 < #line 477 "ircd_parser.y"
2969 >  case 51:
2970 > #line 455 "conf_parser.y" /* yacc.c:1646  */
2971      {
3450 #ifndef STATIC_MODULES
2972    if (conf_parser_ctx.pass == 2)
2973      mod_add_path(yylval.string);
3453 #endif
2974   }
2975 + #line 2976 "conf_parser.c" /* yacc.c:1646  */
2976      break;
2977  
2978 <  case 64:
2979 <
3459 < /* Line 1464 of yacc.c  */
3460 < #line 499 "ircd_parser.y"
2978 >  case 73:
2979 > #line 485 "conf_parser.y" /* yacc.c:1646  */
2980      {
2981   #ifdef HAVE_LIBCRYPTO
2982 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
2983 <    ServerInfo.tls_version = 0;
2982 >  if (conf_parser_ctx.pass == 2)
2983 >  {
2984 >    if (!ConfigServerInfo.rsa_private_key_file)
2985 >    {
2986 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2987 >      break;
2988 >    }
2989 >
2990 >    if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
2991 >        SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
2992 >    {
2993 >      report_crypto_errors();
2994 >      conf_error_report("Could not open/read certificate file");
2995 >      break;
2996 >    }
2997 >
2998 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2999 >                                    SSL_FILETYPE_PEM) <= 0 ||
3000 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
3001 >                                    SSL_FILETYPE_PEM) <= 0)
3002 >    {
3003 >      report_crypto_errors();
3004 >      conf_error_report("Could not read RSA private key");
3005 >      break;
3006 >    }
3007 >
3008 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
3009 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
3010 >    {
3011 >      report_crypto_errors();
3012 >      conf_error_report("Could not read RSA private key");
3013 >      break;
3014 >    }
3015 >  }
3016   #endif
3017   }
3018 + #line 3019 "conf_parser.c" /* yacc.c:1646  */
3019      break;
3020  
3021 <  case 65:
3022 <
3471 < /* Line 1464 of yacc.c  */
3472 < #line 505 "ircd_parser.y"
3021 >  case 74:
3022 > #line 525 "conf_parser.y" /* yacc.c:1646  */
3023      {
3024   #ifdef HAVE_LIBCRYPTO
3025 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3025 >  BIO *file = NULL;
3026 >
3027 >  if (conf_parser_ctx.pass != 1)
3028 >    break;
3029 >
3030 >  if (ConfigServerInfo.rsa_private_key)
3031    {
3032 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_SSLV3))
3033 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
3479 <    if (!(ServerInfo.tls_version & CONF_SERVER_INFO_TLS_VERSION_TLSV1))
3480 <      SSL_CTX_set_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
3032 >    RSA_free(ConfigServerInfo.rsa_private_key);
3033 >    ConfigServerInfo.rsa_private_key = NULL;
3034    }
3035 < #endif
3036 < }
3035 >
3036 >  if (ConfigServerInfo.rsa_private_key_file)
3037 >  {
3038 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3039 >    ConfigServerInfo.rsa_private_key_file = NULL;
3040 >  }
3041 >
3042 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3043 >
3044 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3045 >  {
3046 >    conf_error_report("File open failed, ignoring");
3047      break;
3048 +  }
3049  
3050 <  case 68:
3050 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3051  
3052 < /* Line 1464 of yacc.c  */
3053 < #line 519 "ircd_parser.y"
3054 <    {
3055 < #ifdef HAVE_LIBCRYPTO
3056 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3057 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_SSLV3;
3494 < #endif
3495 < }
3052 >  BIO_set_close(file, BIO_CLOSE);
3053 >  BIO_free(file);
3054 >
3055 >  if (ConfigServerInfo.rsa_private_key == NULL)
3056 >  {
3057 >    conf_error_report("Couldn't extract key, ignoring");
3058      break;
3059 +  }
3060  
3061 <  case 69:
3061 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3062 >  {
3063 >    RSA_free(ConfigServerInfo.rsa_private_key);
3064 >    ConfigServerInfo.rsa_private_key = NULL;
3065  
3066 < /* Line 1464 of yacc.c  */
3067 < #line 525 "ircd_parser.y"
3068 <    {
3069 < #ifdef HAVE_LIBCRYPTO
3070 <  if (conf_parser_ctx.boot && conf_parser_ctx.pass == 2)
3071 <    ServerInfo.tls_version |= CONF_SERVER_INFO_TLS_VERSION_TLSV1;
3066 >    conf_error_report("Invalid key, ignoring");
3067 >    break;
3068 >  }
3069 >
3070 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3071 >  {
3072 >    RSA_free(ConfigServerInfo.rsa_private_key);
3073 >    ConfigServerInfo.rsa_private_key = NULL;
3074 >
3075 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3076 >  }
3077   #endif
3078   }
3079 + #line 3080 "conf_parser.c" /* yacc.c:1646  */
3080      break;
3081  
3082 <  case 70:
3083 <
3512 < /* Line 1464 of yacc.c  */
3513 < #line 533 "ircd_parser.y"
3082 >  case 75:
3083 > #line 583 "conf_parser.y" /* yacc.c:1646  */
3084      {
3085   #ifdef HAVE_LIBCRYPTO
3086 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3086 >  if (conf_parser_ctx.pass == 2)
3087    {
3088 <    if (!ServerInfo.rsa_private_key_file)
3519 <    {
3520 <      yyerror("No rsa_private_key_file specified, SSL disabled");
3521 <      break;
3522 <    }
3088 >    BIO *file = BIO_new_file(yylval.string, "r");
3089  
3090 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
3525 <                                     SSL_FILETYPE_PEM) <= 0)
3090 >    if (file)
3091      {
3092 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3528 <      break;
3529 <    }
3092 >      DH *dh = PEM_read_bio_DHparams(file, NULL, NULL, NULL);
3093  
3094 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
3532 <                                    SSL_FILETYPE_PEM) <= 0)
3533 <    {
3534 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3535 <      break;
3536 <    }
3094 >      BIO_free(file);
3095  
3096 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx))
3097 <    {
3098 <      yyerror(ERR_lib_error_string(ERR_get_error()));
3099 <      break;
3096 >      if (dh)
3097 >      {
3098 >        if (DH_size(dh) < 128)
3099 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3100 >        else
3101 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3102 >
3103 >        DH_free(dh);
3104 >      }
3105      }
3106 +    else
3107 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3108    }
3109   #endif
3110   }
3111 + #line 3112 "conf_parser.c" /* yacc.c:1646  */
3112      break;
3113  
3114 <  case 71:
3115 <
3550 < /* Line 1464 of yacc.c  */
3551 < #line 567 "ircd_parser.y"
3114 >  case 76:
3115 > #line 612 "conf_parser.y" /* yacc.c:1646  */
3116      {
3117   #ifdef HAVE_LIBCRYPTO
3118 <  if (conf_parser_ctx.pass == 1)
3119 <  {
3120 <    BIO *file;
3118 >  if (conf_parser_ctx.pass == 2)
3119 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3120 > #endif
3121 > }
3122 > #line 3123 "conf_parser.c" /* yacc.c:1646  */
3123 >    break;
3124  
3125 <    if (ServerInfo.rsa_private_key)
3125 >  case 77:
3126 > #line 620 "conf_parser.y" /* yacc.c:1646  */
3127      {
3128 <      RSA_free(ServerInfo.rsa_private_key);
3129 <      ServerInfo.rsa_private_key = NULL;
3130 <    }
3131 <
3564 <    if (ServerInfo.rsa_private_key_file)
3128 > #ifdef HAVE_LIBCRYPTO
3129 >  if (conf_parser_ctx.pass == 2)
3130 >  {
3131 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3132      {
3133 <      MyFree(ServerInfo.rsa_private_key_file);
3134 <      ServerInfo.rsa_private_key_file = NULL;
3133 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3134 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3135      }
3136 +  }
3137 + #endif
3138 + }
3139 + #line 3140 "conf_parser.c" /* yacc.c:1646  */
3140 +    break;
3141  
3142 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3143 <
3572 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3142 >  case 78:
3143 > #line 634 "conf_parser.y" /* yacc.c:1646  */
3144      {
3145 <      yyerror("File open failed, ignoring");
3146 <      break;
3147 <    }
3148 <
3578 <    ServerInfo.rsa_private_key = (RSA *)PEM_read_bio_RSAPrivateKey(file, NULL,
3579 <      0, NULL);
3580 <
3581 <    BIO_set_close(file, BIO_CLOSE);
3582 <    BIO_free(file);
3145 > #ifdef HAVE_LIBCRYPTO
3146 > #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
3147 >  int nid = 0;
3148 >  EC_KEY *key = NULL;
3149  
3150 <    if (ServerInfo.rsa_private_key == NULL)
3150 >  if (conf_parser_ctx.pass == 2)
3151 >  {
3152 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3153      {
3154 <      yyerror("Couldn't extract key, ignoring");
3155 <      break;
3154 >        conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
3155 >        break;
3156      }
3157  
3158 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3158 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3159      {
3160 <      RSA_free(ServerInfo.rsa_private_key);
3593 <      ServerInfo.rsa_private_key = NULL;
3594 <
3595 <      yyerror("Invalid key, ignoring");
3160 >      conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
3161        break;
3162      }
3163  
3164 <    /* require 2048 bit (256 byte) key */
3165 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3166 <    {
3167 <      RSA_free(ServerInfo.rsa_private_key);
3603 <      ServerInfo.rsa_private_key = NULL;
3604 <
3605 <      yyerror("Not a 2048 bit key, ignoring");
3606 <    }
3607 <  }
3164 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3165 >    EC_KEY_free(key);
3166 > }
3167 > #endif
3168   #endif
3169   }
3170 + #line 3171 "conf_parser.c" /* yacc.c:1646  */
3171      break;
3172  
3173 <  case 72:
3174 <
3614 < /* Line 1464 of yacc.c  */
3615 < #line 627 "ircd_parser.y"
3173 >  case 79:
3174 > #line 662 "conf_parser.y" /* yacc.c:1646  */
3175      {
3176    /* this isn't rehashable */
3177 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
3177 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3178    {
3179      if (valid_servname(yylval.string))
3180 <      DupString(ServerInfo.name, yylval.string);
3180 >      ConfigServerInfo.name = xstrdup(yylval.string);
3181      else
3182      {
3183 <      ilog(L_ERROR, "Ignoring serverinfo::name -- invalid name. Aborting.");
3183 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3184        exit(0);
3185      }
3186    }
3187   }
3188 + #line 3189 "conf_parser.c" /* yacc.c:1646  */
3189      break;
3190  
3191 <  case 73:
3192 <
3633 < /* Line 1464 of yacc.c  */
3634 < #line 642 "ircd_parser.y"
3191 >  case 80:
3192 > #line 677 "conf_parser.y" /* yacc.c:1646  */
3193      {
3194    /* this isn't rehashable */
3195 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3195 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3196    {
3197      if (valid_sid(yylval.string))
3198 <      DupString(ServerInfo.sid, yylval.string);
3198 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3199      else
3200      {
3201 <      ilog(L_ERROR, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
3201 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3202        exit(0);
3203      }
3204    }
3205   }
3206 + #line 3207 "conf_parser.c" /* yacc.c:1646  */
3207      break;
3208  
3209 <  case 74:
3210 <
3652 < /* Line 1464 of yacc.c  */
3653 < #line 657 "ircd_parser.y"
3209 >  case 81:
3210 > #line 692 "conf_parser.y" /* yacc.c:1646  */
3211      {
3212    if (conf_parser_ctx.pass == 2)
3213    {
3214 <    MyFree(ServerInfo.description);
3215 <    DupString(ServerInfo.description,yylval.string);
3214 >    MyFree(ConfigServerInfo.description);
3215 >    ConfigServerInfo.description = xstrdup(yylval.string);
3216 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
3217    }
3218   }
3219 + #line 3220 "conf_parser.c" /* yacc.c:1646  */
3220      break;
3221  
3222 <  case 75:
3223 <
3665 < /* Line 1464 of yacc.c  */
3666 < #line 666 "ircd_parser.y"
3222 >  case 82:
3223 > #line 702 "conf_parser.y" /* yacc.c:1646  */
3224      {
3225    if (conf_parser_ctx.pass == 2)
3226    {
3227      char *p;
3228  
3229 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3230 <      p = '\0';
3229 >    if ((p = strchr(yylval.string, ' ')))
3230 >      *p = '\0';
3231  
3232 <    MyFree(ServerInfo.network_name);
3233 <    DupString(ServerInfo.network_name, yylval.string);
3232 >    MyFree(ConfigServerInfo.network_name);
3233 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3234    }
3235   }
3236 + #line 3237 "conf_parser.c" /* yacc.c:1646  */
3237      break;
3238  
3239 <  case 76:
3240 <
3683 < /* Line 1464 of yacc.c  */
3684 < #line 680 "ircd_parser.y"
3239 >  case 83:
3240 > #line 716 "conf_parser.y" /* yacc.c:1646  */
3241      {
3242 <  if (conf_parser_ctx.pass == 2)
3687 <  {
3688 <    MyFree(ServerInfo.network_desc);
3689 <    DupString(ServerInfo.network_desc, yylval.string);
3690 <  }
3691 < }
3242 >  if (conf_parser_ctx.pass != 2)
3243      break;
3244  
3245 <  case 77:
3245 >  MyFree(ConfigServerInfo.network_desc);
3246 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3247 > }
3248 > #line 3249 "conf_parser.c" /* yacc.c:1646  */
3249 >    break;
3250  
3251 < /* Line 1464 of yacc.c  */
3252 < #line 689 "ircd_parser.y"
3251 >  case 84:
3252 > #line 725 "conf_parser.y" /* yacc.c:1646  */
3253      {
3254    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3255    {
# Line 3706 | Line 3261 | yyreduce:
3261      hints.ai_socktype = SOCK_STREAM;
3262      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3263  
3264 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3265 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
3264 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3265 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3266      else
3267      {
3268 <      assert(res != NULL);
3268 >      assert(res);
3269  
3270 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3271 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3272 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3273 <      irc_freeaddrinfo(res);
3270 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3271 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3272 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3273 >      freeaddrinfo(res);
3274  
3275 <      ServerInfo.specific_ipv4_vhost = 1;
3275 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3276      }
3277    }
3278   }
3279 + #line 3280 "conf_parser.c" /* yacc.c:1646  */
3280      break;
3281  
3282 <  case 78:
3283 <
3728 < /* Line 1464 of yacc.c  */
3729 < #line 717 "ircd_parser.y"
3282 >  case 85:
3283 > #line 753 "conf_parser.y" /* yacc.c:1646  */
3284      {
3731 #ifdef IPV6
3285    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3286    {
3287      struct addrinfo hints, *res;
# Line 3739 | Line 3292 | yyreduce:
3292      hints.ai_socktype = SOCK_STREAM;
3293      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
3294  
3295 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
3296 <      ilog(L_ERROR, "Invalid netmask for server vhost6(%s)", yylval.string);
3295 >    if (getaddrinfo(yylval.string, NULL, &hints, &res))
3296 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3297      else
3298      {
3299 <      assert(res != NULL);
3299 >      assert(res);
3300  
3301 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3302 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3303 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3304 <      irc_freeaddrinfo(res);
3301 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3302 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3303 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3304 >      freeaddrinfo(res);
3305  
3306 <      ServerInfo.specific_ipv6_vhost = 1;
3306 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3307      }
3308    }
3756 #endif
3309   }
3310 + #line 3311 "conf_parser.c" /* yacc.c:1646  */
3311      break;
3312  
3313 <  case 79:
3314 <
3762 < /* Line 1464 of yacc.c  */
3763 < #line 747 "ircd_parser.y"
3313 >  case 86:
3314 > #line 781 "conf_parser.y" /* yacc.c:1646  */
3315      {
3316 <  if (conf_parser_ctx.pass == 2)
3316 >  if (conf_parser_ctx.pass != 2)
3317 >    break;
3318 >
3319 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3320    {
3321 <    recalc_fdlimit(NULL);
3321 >    char buf[IRCD_BUFSIZE] = "";
3322  
3323 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3324 <    {
3325 <      char buf[IRCD_BUFSIZE];
3326 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3327 <      yyerror(buf);
3328 <    }
3329 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3330 <    {
3331 <      char buf[IRCD_BUFSIZE];
3332 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3333 <      yyerror(buf);
3780 <    }
3781 <    else
3782 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3323 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3324 >    conf_error_report(buf);
3325 >    ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
3326 >  }
3327 >  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3328 >  {
3329 >    char buf[IRCD_BUFSIZE] = "";
3330 >
3331 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3332 >    conf_error_report(buf);
3333 >    ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
3334    }
3335 +  else
3336 +    ConfigServerInfo.max_clients = (yyvsp[-1].number);
3337   }
3338 + #line 3339 "conf_parser.c" /* yacc.c:1646  */
3339      break;
3340  
3341 <  case 80:
3342 <
3789 < /* Line 1464 of yacc.c  */
3790 < #line 770 "ircd_parser.y"
3341 >  case 87:
3342 > #line 806 "conf_parser.y" /* yacc.c:1646  */
3343      {
3344 <  if (conf_parser_ctx.pass == 2)
3345 <    ServerInfo.hub = yylval.number;
3344 >  if (conf_parser_ctx.pass != 2)
3345 >    break;
3346 >
3347 >  if ((yyvsp[-1].number) < 9)
3348 >  {
3349 >    conf_error_report("max_nick_length too low, setting to 9");
3350 >    ConfigServerInfo.max_nick_length = 9;
3351 >  }
3352 >  else if ((yyvsp[-1].number) > NICKLEN)
3353 >  {
3354 >    char buf[IRCD_BUFSIZE] = "";
3355 >
3356 >    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3357 >    conf_error_report(buf);
3358 >    ConfigServerInfo.max_nick_length = NICKLEN;
3359 >  }
3360 >  else
3361 >    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3362   }
3363 + #line 3364 "conf_parser.c" /* yacc.c:1646  */
3364      break;
3365  
3366    case 88:
3367 <
3799 < /* Line 1464 of yacc.c  */
3800 < #line 785 "ircd_parser.y"
3367 > #line 828 "conf_parser.y" /* yacc.c:1646  */
3368      {
3369 <  if (conf_parser_ctx.pass == 2)
3369 >  if (conf_parser_ctx.pass != 2)
3370 >    break;
3371 >
3372 >  if ((yyvsp[-1].number) < 80)
3373 >  {
3374 >    conf_error_report("max_topic_length too low, setting to 80");
3375 >    ConfigServerInfo.max_topic_length = 80;
3376 >  }
3377 >  else if ((yyvsp[-1].number) > TOPICLEN)
3378    {
3379 <    MyFree(AdminInfo.name);
3380 <    DupString(AdminInfo.name, yylval.string);
3379 >    char buf[IRCD_BUFSIZE] = "";
3380 >
3381 >    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3382 >    conf_error_report(buf);
3383 >    ConfigServerInfo.max_topic_length = TOPICLEN;
3384    }
3385 +  else
3386 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3387   }
3388 + #line 3389 "conf_parser.c" /* yacc.c:1646  */
3389      break;
3390  
3391    case 89:
3392 <
3812 < /* Line 1464 of yacc.c  */
3813 < #line 794 "ircd_parser.y"
3392 > #line 850 "conf_parser.y" /* yacc.c:1646  */
3393      {
3394    if (conf_parser_ctx.pass == 2)
3395 <  {
3817 <    MyFree(AdminInfo.email);
3818 <    DupString(AdminInfo.email, yylval.string);
3819 <  }
3395 >    ConfigServerInfo.hub = yylval.number;
3396   }
3397 + #line 3398 "conf_parser.c" /* yacc.c:1646  */
3398      break;
3399  
3400 <  case 90:
3401 <
3825 < /* Line 1464 of yacc.c  */
3826 < #line 803 "ircd_parser.y"
3400 >  case 97:
3401 > #line 867 "conf_parser.y" /* yacc.c:1646  */
3402      {
3403 <  if (conf_parser_ctx.pass == 2)
3829 <  {
3830 <    MyFree(AdminInfo.description);
3831 <    DupString(AdminInfo.description, yylval.string);
3832 <  }
3833 < }
3403 >  if (conf_parser_ctx.pass != 2)
3404      break;
3405  
3406 <  case 107:
3406 >  MyFree(ConfigAdminInfo.name);
3407 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3408 > }
3409 > #line 3410 "conf_parser.c" /* yacc.c:1646  */
3410 >    break;
3411  
3412 < /* Line 1464 of yacc.c  */
3413 < #line 830 "ircd_parser.y"
3412 >  case 98:
3413 > #line 876 "conf_parser.y" /* yacc.c:1646  */
3414      {
3415 <                        }
3415 >  if (conf_parser_ctx.pass != 2)
3416      break;
3417  
3418 <  case 108:
3418 >  MyFree(ConfigAdminInfo.email);
3419 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3420 > }
3421 > #line 3422 "conf_parser.c" /* yacc.c:1646  */
3422 >    break;
3423  
3424 < /* Line 1464 of yacc.c  */
3425 < #line 834 "ircd_parser.y"
3424 >  case 99:
3425 > #line 885 "conf_parser.y" /* yacc.c:1646  */
3426      {
3427 <                        }
3427 >  if (conf_parser_ctx.pass != 2)
3428      break;
3429  
3430 <  case 109:
3430 >  MyFree(ConfigAdminInfo.description);
3431 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3432 > }
3433 > #line 3434 "conf_parser.c" /* yacc.c:1646  */
3434 >    break;
3435  
3436 < /* Line 1464 of yacc.c  */
3437 < #line 838 "ircd_parser.y"
3436 >  case 100:
3437 > #line 897 "conf_parser.y" /* yacc.c:1646  */
3438      {
3439    if (conf_parser_ctx.pass == 2)
3440 <    strlcpy(ConfigLoggingEntry.userlog, yylval.string,
3859 <            sizeof(ConfigLoggingEntry.userlog));
3440 >    reset_block_state();
3441   }
3442 + #line 3443 "conf_parser.c" /* yacc.c:1646  */
3443      break;
3444  
3445 <  case 110:
3445 >  case 101:
3446 > #line 901 "conf_parser.y" /* yacc.c:1646  */
3447 >    {
3448 >  dlink_node *node = NULL;
3449  
3450 < /* Line 1464 of yacc.c  */
3451 < #line 845 "ircd_parser.y"
3450 >  if (conf_parser_ctx.pass != 2)
3451 >    break;
3452 >
3453 >  if (!block_state.file.buf[0])
3454 >    break;
3455 >
3456 >  DLINK_FOREACH(node, block_state.mask.list.head)
3457 >    motd_add(node->data, block_state.file.buf);
3458 > }
3459 > #line 3460 "conf_parser.c" /* yacc.c:1646  */
3460 >    break;
3461 >
3462 >  case 107:
3463 > #line 918 "conf_parser.y" /* yacc.c:1646  */
3464      {
3465    if (conf_parser_ctx.pass == 2)
3466 <    strlcpy(ConfigLoggingEntry.failed_operlog, yylval.string,
3870 <            sizeof(ConfigLoggingEntry.failed_operlog));
3466 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3467   }
3468 + #line 3469 "conf_parser.c" /* yacc.c:1646  */
3469      break;
3470  
3471 <  case 111:
3472 <
3876 < /* Line 1464 of yacc.c  */
3877 < #line 852 "ircd_parser.y"
3471 >  case 108:
3472 > #line 924 "conf_parser.y" /* yacc.c:1646  */
3473      {
3474    if (conf_parser_ctx.pass == 2)
3475 <    strlcpy(ConfigLoggingEntry.operlog, yylval.string,
3881 <            sizeof(ConfigLoggingEntry.operlog));
3475 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3476   }
3477 + #line 3478 "conf_parser.c" /* yacc.c:1646  */
3478      break;
3479  
3480 <  case 112:
3481 <
3887 < /* Line 1464 of yacc.c  */
3888 < #line 859 "ircd_parser.y"
3480 >  case 109:
3481 > #line 933 "conf_parser.y" /* yacc.c:1646  */
3482      {
3483    if (conf_parser_ctx.pass == 2)
3484 <    strlcpy(ConfigLoggingEntry.operspylog, yylval.string,
3892 <            sizeof(ConfigLoggingEntry.operspylog));
3484 >    reset_block_state();
3485   }
3486 + #line 3487 "conf_parser.c" /* yacc.c:1646  */
3487 +    break;
3488 +
3489 +  case 110:
3490 + #line 937 "conf_parser.y" /* yacc.c:1646  */
3491 +    {
3492 +  if (conf_parser_ctx.pass != 2)
3493 +    break;
3494 +
3495 +  if (!block_state.command.buf[0] ||
3496 +      !block_state.name.buf[0] ||
3497 +      !block_state.nick.buf[0] ||
3498 +      !block_state.host.buf[0])
3499      break;
3500  
3501 <  case 113:
3501 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
3502 >                  block_state.prepend.buf, block_state.command.buf);
3503 > }
3504 > #line 3505 "conf_parser.c" /* yacc.c:1646  */
3505 >    break;
3506  
3507 < /* Line 1464 of yacc.c  */
3508 < #line 866 "ircd_parser.y"
3507 >  case 118:
3508 > #line 955 "conf_parser.y" /* yacc.c:1646  */
3509      {
3510    if (conf_parser_ctx.pass == 2)
3511 <    strlcpy(ConfigLoggingEntry.glinelog, yylval.string,
3903 <            sizeof(ConfigLoggingEntry.glinelog));
3511 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
3512   }
3513 + #line 3514 "conf_parser.c" /* yacc.c:1646  */
3514      break;
3515  
3516 <  case 114:
3517 <
3909 < /* Line 1464 of yacc.c  */
3910 < #line 873 "ircd_parser.y"
3516 >  case 119:
3517 > #line 961 "conf_parser.y" /* yacc.c:1646  */
3518      {
3519    if (conf_parser_ctx.pass == 2)
3520 <    strlcpy(ConfigLoggingEntry.klinelog, yylval.string,
3914 <            sizeof(ConfigLoggingEntry.klinelog));
3520 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3521   }
3522 + #line 3523 "conf_parser.c" /* yacc.c:1646  */
3523      break;
3524  
3525 <  case 115:
3525 >  case 120:
3526 > #line 967 "conf_parser.y" /* yacc.c:1646  */
3527 >    {
3528 >  if (conf_parser_ctx.pass == 2)
3529 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
3530 > }
3531 > #line 3532 "conf_parser.c" /* yacc.c:1646  */
3532 >    break;
3533  
3534 < /* Line 1464 of yacc.c  */
3535 < #line 880 "ircd_parser.y"
3534 >  case 121:
3535 > #line 973 "conf_parser.y" /* yacc.c:1646  */
3536      {
3537    if (conf_parser_ctx.pass == 2)
3538 <    strlcpy(ConfigLoggingEntry.ioerrlog, yylval.string,
3539 <            sizeof(ConfigLoggingEntry.ioerrlog));
3538 >  {
3539 >    struct split_nuh_item nuh;
3540 >
3541 >    nuh.nuhmask  = yylval.string;
3542 >    nuh.nickptr  = NULL;
3543 >    nuh.userptr  = block_state.user.buf;
3544 >    nuh.hostptr  = block_state.host.buf;
3545 >    nuh.nicksize = 0;
3546 >    nuh.usersize = sizeof(block_state.nick.buf);
3547 >    nuh.hostsize = sizeof(block_state.host.buf);
3548 >    split_nuh(&nuh);
3549 >
3550 >    strlcpy(block_state.nick.buf, nuh.userptr, sizeof(block_state.nick.buf));
3551 >    strlcpy(block_state.host.buf, nuh.hostptr, sizeof(block_state.host.buf));
3552 >  }
3553   }
3554 + #line 3555 "conf_parser.c" /* yacc.c:1646  */
3555      break;
3556  
3557 <  case 116:
3557 >  case 128:
3558 > #line 1002 "conf_parser.y" /* yacc.c:1646  */
3559 >    {
3560 >  if (conf_parser_ctx.pass == 2)
3561 >    ConfigLog.use_logging = yylval.number;
3562 > }
3563 > #line 3564 "conf_parser.c" /* yacc.c:1646  */
3564 >    break;
3565  
3566 < /* Line 1464 of yacc.c  */
3567 < #line 887 "ircd_parser.y"
3566 >  case 129:
3567 > #line 1008 "conf_parser.y" /* yacc.c:1646  */
3568      {
3569    if (conf_parser_ctx.pass == 2)
3570 <    strlcpy(ConfigLoggingEntry.killlog, yylval.string,
3936 <            sizeof(ConfigLoggingEntry.killlog));
3570 >    reset_block_state();
3571   }
3572 + #line 3573 "conf_parser.c" /* yacc.c:1646  */
3573      break;
3574  
3575 <  case 117:
3575 >  case 130:
3576 > #line 1012 "conf_parser.y" /* yacc.c:1646  */
3577 >    {
3578 >  if (conf_parser_ctx.pass != 2)
3579 >    break;
3580  
3581 < /* Line 1464 of yacc.c  */
3582 < #line 894 "ircd_parser.y"
3583 <    {
3945 <  if (conf_parser_ctx.pass == 2)
3946 <    set_log_level(L_CRIT);
3581 >  if (block_state.type.value && block_state.file.buf[0])
3582 >    log_set_file(block_state.type.value, block_state.size.value,
3583 >                 block_state.file.buf);
3584   }
3585 + #line 3586 "conf_parser.c" /* yacc.c:1646  */
3586      break;
3587  
3588 <  case 118:
3588 >  case 137:
3589 > #line 1028 "conf_parser.y" /* yacc.c:1646  */
3590 >    {
3591 >  if (conf_parser_ctx.pass != 2)
3592 >    break;
3593 >
3594 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3595 > }
3596 > #line 3597 "conf_parser.c" /* yacc.c:1646  */
3597 >    break;
3598  
3599 < /* Line 1464 of yacc.c  */
3600 < #line 898 "ircd_parser.y"
3599 >  case 138:
3600 > #line 1036 "conf_parser.y" /* yacc.c:1646  */
3601      {
3602 <  if (conf_parser_ctx.pass == 2)
3956 <    set_log_level(L_ERROR);
3602 >  block_state.size.value = (yyvsp[-1].number);
3603   }
3604 + #line 3605 "conf_parser.c" /* yacc.c:1646  */
3605      break;
3606  
3607 <  case 119:
3607 >  case 139:
3608 > #line 1039 "conf_parser.y" /* yacc.c:1646  */
3609 >    {
3610 >  block_state.size.value = 0;
3611 > }
3612 > #line 3613 "conf_parser.c" /* yacc.c:1646  */
3613 >    break;
3614  
3615 < /* Line 1464 of yacc.c  */
3616 < #line 902 "ircd_parser.y"
3615 >  case 140:
3616 > #line 1044 "conf_parser.y" /* yacc.c:1646  */
3617      {
3618    if (conf_parser_ctx.pass == 2)
3619 <    set_log_level(L_WARN);
3619 >    block_state.type.value = 0;
3620   }
3621 + #line 3622 "conf_parser.c" /* yacc.c:1646  */
3622      break;
3623  
3624 <  case 120:
3625 <
3972 < /* Line 1464 of yacc.c  */
3973 < #line 906 "ircd_parser.y"
3624 >  case 144:
3625 > #line 1051 "conf_parser.y" /* yacc.c:1646  */
3626      {
3627    if (conf_parser_ctx.pass == 2)
3628 <    set_log_level(L_NOTICE);
3628 >    block_state.type.value = LOG_TYPE_USER;
3629   }
3630 + #line 3631 "conf_parser.c" /* yacc.c:1646  */
3631      break;
3632  
3633 <  case 121:
3634 <
3982 < /* Line 1464 of yacc.c  */
3983 < #line 910 "ircd_parser.y"
3633 >  case 145:
3634 > #line 1055 "conf_parser.y" /* yacc.c:1646  */
3635      {
3636    if (conf_parser_ctx.pass == 2)
3637 <    set_log_level(L_TRACE);
3637 >    block_state.type.value = LOG_TYPE_OPER;
3638   }
3639 + #line 3640 "conf_parser.c" /* yacc.c:1646  */
3640      break;
3641  
3642 <  case 122:
3643 <
3992 < /* Line 1464 of yacc.c  */
3993 < #line 914 "ircd_parser.y"
3642 >  case 146:
3643 > #line 1059 "conf_parser.y" /* yacc.c:1646  */
3644      {
3645    if (conf_parser_ctx.pass == 2)
3646 <    set_log_level(L_INFO);
3646 >    block_state.type.value = LOG_TYPE_GLINE;
3647   }
3648 + #line 3649 "conf_parser.c" /* yacc.c:1646  */
3649      break;
3650  
3651 <  case 123:
3652 <
4002 < /* Line 1464 of yacc.c  */
4003 < #line 918 "ircd_parser.y"
3651 >  case 147:
3652 > #line 1063 "conf_parser.y" /* yacc.c:1646  */
3653      {
3654    if (conf_parser_ctx.pass == 2)
3655 <    set_log_level(L_DEBUG);
3655 >    block_state.type.value = LOG_TYPE_XLINE;
3656   }
3657 + #line 3658 "conf_parser.c" /* yacc.c:1646  */
3658      break;
3659  
3660 <  case 124:
3661 <
4012 < /* Line 1464 of yacc.c  */
4013 < #line 924 "ircd_parser.y"
3660 >  case 148:
3661 > #line 1067 "conf_parser.y" /* yacc.c:1646  */
3662      {
3663    if (conf_parser_ctx.pass == 2)
3664 <    ConfigLoggingEntry.use_logging = yylval.number;
3664 >    block_state.type.value = LOG_TYPE_RESV;
3665   }
3666 + #line 3667 "conf_parser.c" /* yacc.c:1646  */
3667      break;
3668  
3669 <  case 125:
3669 >  case 149:
3670 > #line 1071 "conf_parser.y" /* yacc.c:1646  */
3671 >    {
3672 >  if (conf_parser_ctx.pass == 2)
3673 >    block_state.type.value = LOG_TYPE_DLINE;
3674 > }
3675 > #line 3676 "conf_parser.c" /* yacc.c:1646  */
3676 >    break;
3677  
3678 < /* Line 1464 of yacc.c  */
3679 < #line 933 "ircd_parser.y"
3678 >  case 150:
3679 > #line 1075 "conf_parser.y" /* yacc.c:1646  */
3680      {
3681    if (conf_parser_ctx.pass == 2)
3682 <  {
4027 <    yy_conf = make_conf_item(OPER_TYPE);
4028 <    yy_aconf = map_to_conf(yy_conf);
4029 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
4030 <  }
4031 <  else
4032 <  {
4033 <    MyFree(class_name);
4034 <    class_name = NULL;
4035 <  }
3682 >    block_state.type.value = LOG_TYPE_KLINE;
3683   }
3684 + #line 3685 "conf_parser.c" /* yacc.c:1646  */
3685      break;
3686  
3687 <  case 126:
3687 >  case 151:
3688 > #line 1079 "conf_parser.y" /* yacc.c:1646  */
3689 >    {
3690 >  if (conf_parser_ctx.pass == 2)
3691 >    block_state.type.value = LOG_TYPE_KILL;
3692 > }
3693 > #line 3694 "conf_parser.c" /* yacc.c:1646  */
3694 >    break;
3695  
3696 < /* Line 1464 of yacc.c  */
3697 < #line 946 "ircd_parser.y"
3696 >  case 152:
3697 > #line 1083 "conf_parser.y" /* yacc.c:1646  */
3698      {
3699    if (conf_parser_ctx.pass == 2)
3700 <  {
3701 <    struct CollectItem *yy_tmp;
3702 <    dlink_node *ptr;
3703 <    dlink_node *next_ptr;
3700 >    block_state.type.value = LOG_TYPE_DEBUG;
3701 > }
3702 > #line 3703 "conf_parser.c" /* yacc.c:1646  */
3703 >    break;
3704  
3705 <    conf_add_class_to_conf(yy_conf, class_name);
3705 >  case 153:
3706 > #line 1093 "conf_parser.y" /* yacc.c:1646  */
3707 >    {
3708 >  if (conf_parser_ctx.pass != 2)
3709 >    break;
3710  
3711 <    /* Now, make sure there is a copy of the "base" given oper
3712 <     * block in each of the collected copies
3713 <     */
3711 >  reset_block_state();
3712 >  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3713 > }
3714 > #line 3715 "conf_parser.c" /* yacc.c:1646  */
3715 >    break;
3716  
3717 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3717 >  case 154:
3718 > #line 1100 "conf_parser.y" /* yacc.c:1646  */
3719      {
3720 <      struct AccessItem *new_aconf;
4059 <      struct ConfItem *new_conf;
4060 <      yy_tmp = ptr->data;
3720 >  dlink_node *node = NULL;
3721  
3722 <      new_conf = make_conf_item(OPER_TYPE);
3723 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
3722 >  if (conf_parser_ctx.pass != 2)
3723 >    break;
3724  
3725 <      new_aconf->flags = yy_aconf->flags;
3725 >  if (!block_state.name.buf[0])
3726 >    break;
3727 > #ifdef HAVE_LIBCRYPTO
3728 >  if (!block_state.file.buf[0] &&
3729 >      !block_state.rpass.buf[0])
3730 >    break;
3731 > #else
3732 >  if (!block_state.rpass.buf[0])
3733 >    break;
3734 > #endif
3735  
3736 <      if (yy_conf->name != NULL)
3737 <        DupString(new_conf->name, yy_conf->name);
3738 <      if (yy_tmp->user != NULL)
3739 <        DupString(new_aconf->user, yy_tmp->user);
4071 <      else
4072 <        DupString(new_aconf->user, "*");
4073 <      if (yy_tmp->host != NULL)
4074 <        DupString(new_aconf->host, yy_tmp->host);
4075 <      else
4076 <        DupString(new_aconf->host, "*");
4077 <      conf_add_class_to_conf(new_conf, class_name);
4078 <      if (yy_aconf->passwd != NULL)
4079 <        DupString(new_aconf->passwd, yy_aconf->passwd);
3736 >  DLINK_FOREACH(node, block_state.mask.list.head)
3737 >  {
3738 >    struct MaskItem *conf = NULL;
3739 >    struct split_nuh_item nuh;
3740  
3741 <      new_aconf->port = yy_aconf->port;
3742 < #ifdef HAVE_LIBCRYPTO
3743 <      if (yy_aconf->rsa_public_key_file != NULL)
3744 <      {
3745 <        BIO *file;
3741 >    nuh.nuhmask  = node->data;
3742 >    nuh.nickptr  = NULL;
3743 >    nuh.userptr  = block_state.user.buf;
3744 >    nuh.hostptr  = block_state.host.buf;
3745 >    nuh.nicksize = 0;
3746 >    nuh.usersize = sizeof(block_state.user.buf);
3747 >    nuh.hostsize = sizeof(block_state.host.buf);
3748 >    split_nuh(&nuh);
3749  
3750 <        DupString(new_aconf->rsa_public_key_file,
3751 <                  yy_aconf->rsa_public_key_file);
3750 >    conf         = conf_make(CONF_OPER);
3751 >    conf->name   = xstrdup(block_state.name.buf);
3752 >    conf->user   = xstrdup(block_state.user.buf);
3753 >    conf->host   = xstrdup(block_state.host.buf);
3754 >
3755 >    if (block_state.cert.buf[0])
3756 >      conf->certfp = xstrdup(block_state.cert.buf);
3757 >
3758 >    if (block_state.rpass.buf[0])
3759 >      conf->passwd = xstrdup(block_state.rpass.buf);
3760 >
3761 >    conf->flags = block_state.flags.value;
3762 >    conf->modes = block_state.modes.value;
3763 >    conf->port  = block_state.port.value;
3764 >    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3765  
3766 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
4091 <        new_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file,
4092 <                                                           NULL, 0, NULL);
4093 <        BIO_set_close(file, BIO_CLOSE);
4094 <        BIO_free(file);
4095 <      }
4096 < #endif
3766 >    conf_add_class_to_conf(conf, block_state.class.buf);
3767  
3768   #ifdef HAVE_LIBCRYPTO
3769 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
3770 <          && yy_tmp->host)
3771 < #else
3772 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
3773 < #endif
3769 >    if (block_state.file.buf[0])
3770 >    {
3771 >      BIO *file = NULL;
3772 >      RSA *pkey = NULL;
3773 >
3774 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3775        {
3776 <        conf_add_class_to_conf(new_conf, class_name);
3777 <        if (yy_tmp->name != NULL)
4107 <          DupString(new_conf->name, yy_tmp->name);
3776 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3777 >        break;
3778        }
3779  
3780 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
3781 <      free_collect_item(yy_tmp);
3782 <    }
3783 <
3784 <    yy_conf = NULL;
3785 <    yy_aconf = NULL;
3786 <
3780 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3781 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3782 >      else
3783 >      {
3784 >        if (RSA_size(pkey) > 128)
3785 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3786 >        else
3787 >          conf->rsa_public_key = pkey;
3788 >      }
3789  
3790 <    MyFree(class_name);
3791 <    class_name = NULL;
3790 >      BIO_set_close(file, BIO_CLOSE);
3791 >      BIO_free(file);
3792 >    }
3793 > #endif /* HAVE_LIBCRYPTO */
3794    }
3795   }
3796 + #line 3797 "conf_parser.c" /* yacc.c:1646  */
3797      break;
3798  
3799 <  case 140:
3800 <
4126 < /* Line 1464 of yacc.c  */
4127 < #line 1033 "ircd_parser.y"
3799 >  case 168:
3800 > #line 1192 "conf_parser.y" /* yacc.c:1646  */
3801      {
3802    if (conf_parser_ctx.pass == 2)
3803 <  {
4131 <    if (strlen(yylval.string) > OPERNICKLEN)
4132 <      yylval.string[OPERNICKLEN] = '\0';
4133 <
4134 <    MyFree(yy_conf->name);
4135 <    DupString(yy_conf->name, yylval.string);
4136 <  }
3803 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3804   }
3805 + #line 3806 "conf_parser.c" /* yacc.c:1646  */
3806      break;
3807  
3808 <  case 141:
3809 <
4142 < /* Line 1464 of yacc.c  */
4143 < #line 1045 "ircd_parser.y"
3808 >  case 169:
3809 > #line 1198 "conf_parser.y" /* yacc.c:1646  */
3810      {
3811    if (conf_parser_ctx.pass == 2)
3812 <  {
4147 <    if (strlen(yylval.string) > OPERNICKLEN)
4148 <      yylval.string[OPERNICKLEN] = '\0';
4149 <
4150 <    MyFree(yy_conf->name);
4151 <    DupString(yy_conf->name, yylval.string);
4152 <  }
3812 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3813   }
3814 + #line 3815 "conf_parser.c" /* yacc.c:1646  */
3815      break;
3816  
3817 <  case 142:
3818 <
4158 < /* Line 1464 of yacc.c  */
4159 < #line 1057 "ircd_parser.y"
3817 >  case 170:
3818 > #line 1204 "conf_parser.y" /* yacc.c:1646  */
3819      {
3820    if (conf_parser_ctx.pass == 2)
3821 <  {
3822 <    struct split_nuh_item nuh;
3823 <
3824 <    nuh.nuhmask  = yylval.string;
4166 <    nuh.nickptr  = NULL;
4167 <    nuh.userptr  = userbuf;
4168 <    nuh.hostptr  = hostbuf;
3821 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3822 > }
3823 > #line 3824 "conf_parser.c" /* yacc.c:1646  */
3824 >    break;
3825  
3826 <    nuh.nicksize = 0;
3827 <    nuh.usersize = sizeof(userbuf);
3828 <    nuh.hostsize = sizeof(hostbuf);
3826 >  case 171:
3827 > #line 1210 "conf_parser.y" /* yacc.c:1646  */
3828 >    {
3829 >  if (conf_parser_ctx.pass != 2)
3830 >    break;
3831  
3832 <    split_nuh(&nuh);
3832 >  if (yylval.number)
3833 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3834 >  else
3835 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3836 > }
3837 > #line 3838 "conf_parser.c" /* yacc.c:1646  */
3838 >    break;
3839  
3840 <    if (yy_aconf->user == NULL)
3840 >  case 172:
3841 > #line 1221 "conf_parser.y" /* yacc.c:1646  */
3842      {
3843 <      DupString(yy_aconf->user, userbuf);
3844 <      DupString(yy_aconf->host, hostbuf);
3845 <    }
3846 <    else
3843 >  if (conf_parser_ctx.pass == 2)
3844 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3845 > }
3846 > #line 3847 "conf_parser.c" /* yacc.c:1646  */
3847 >    break;
3848 >
3849 >  case 173:
3850 > #line 1227 "conf_parser.y" /* yacc.c:1646  */
3851      {
3852 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3852 >  if (conf_parser_ctx.pass == 2)
3853 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3854 > }
3855 > #line 3856 "conf_parser.c" /* yacc.c:1646  */
3856 >    break;
3857  
3858 <      DupString(yy_tmp->user, userbuf);
3859 <      DupString(yy_tmp->host, hostbuf);
3858 >  case 174:
3859 > #line 1233 "conf_parser.y" /* yacc.c:1646  */
3860 >    {
3861 >  if (conf_parser_ctx.pass != 2)
3862 >    break;
3863  
3864 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3865 <    }
3866 <  }
3864 >  if (yylval.number)
3865 >    block_state.flags.value |= CONF_FLAGS_SSL;
3866 >  else
3867 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3868   }
3869 + #line 3870 "conf_parser.c" /* yacc.c:1646  */
3870      break;
3871  
3872 <  case 143:
3873 <
4196 < /* Line 1464 of yacc.c  */
4197 < #line 1091 "ircd_parser.y"
3872 >  case 175:
3873 > #line 1244 "conf_parser.y" /* yacc.c:1646  */
3874      {
3875    if (conf_parser_ctx.pass == 2)
3876 <  {
4201 <    if (yy_aconf->passwd != NULL)
4202 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4203 <
4204 <    MyFree(yy_aconf->passwd);
4205 <    DupString(yy_aconf->passwd, yylval.string);
4206 <  }
3876 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3877   }
3878 + #line 3879 "conf_parser.c" /* yacc.c:1646  */
3879      break;
3880  
3881 <  case 144:
3882 <
4212 < /* Line 1464 of yacc.c  */
4213 < #line 1103 "ircd_parser.y"
3881 >  case 176:
3882 > #line 1250 "conf_parser.y" /* yacc.c:1646  */
3883      {
3884    if (conf_parser_ctx.pass == 2)
3885 <  {
4217 <    if (yylval.number)
4218 <      SetConfEncrypted(yy_aconf);
4219 <    else
4220 <      ClearConfEncrypted(yy_aconf);
4221 <  }
3885 >    block_state.modes.value = 0;
3886   }
3887 + #line 3888 "conf_parser.c" /* yacc.c:1646  */
3888      break;
3889  
3890 <  case 145:
3891 <
4227 < /* Line 1464 of yacc.c  */
4228 < #line 1114 "ircd_parser.y"
3890 >  case 180:
3891 > #line 1257 "conf_parser.y" /* yacc.c:1646  */
3892      {
4230 #ifdef HAVE_LIBCRYPTO
3893    if (conf_parser_ctx.pass == 2)
3894 <  {
3895 <    BIO *file;
3894 >    block_state.modes.value |= UMODE_BOTS;
3895 > }
3896 > #line 3897 "conf_parser.c" /* yacc.c:1646  */
3897 >    break;
3898  
3899 <    if (yy_aconf->rsa_public_key != NULL)
3899 >  case 181:
3900 > #line 1261 "conf_parser.y" /* yacc.c:1646  */
3901      {
3902 <      RSA_free(yy_aconf->rsa_public_key);
3903 <      yy_aconf->rsa_public_key = NULL;
3904 <    }
3902 >  if (conf_parser_ctx.pass == 2)
3903 >    block_state.modes.value |= UMODE_CCONN;
3904 > }
3905 > #line 3906 "conf_parser.c" /* yacc.c:1646  */
3906 >    break;
3907  
3908 <    if (yy_aconf->rsa_public_key_file != NULL)
3908 >  case 182:
3909 > #line 1265 "conf_parser.y" /* yacc.c:1646  */
3910      {
3911 <      MyFree(yy_aconf->rsa_public_key_file);
3912 <      yy_aconf->rsa_public_key_file = NULL;
3913 <    }
3914 <
3915 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
4248 <    file = BIO_new_file(yylval.string, "r");
3911 >  if (conf_parser_ctx.pass == 2)
3912 >    block_state.modes.value |= UMODE_DEAF;
3913 > }
3914 > #line 3915 "conf_parser.c" /* yacc.c:1646  */
3915 >    break;
3916  
3917 <    if (file == NULL)
3917 >  case 183:
3918 > #line 1269 "conf_parser.y" /* yacc.c:1646  */
3919      {
3920 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
3921 <      break;
3922 <    }
3923 <
3924 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
3920 >  if (conf_parser_ctx.pass == 2)
3921 >    block_state.modes.value |= UMODE_DEBUG;
3922 > }
3923 > #line 3924 "conf_parser.c" /* yacc.c:1646  */
3924 >    break;
3925  
3926 <    if (yy_aconf->rsa_public_key == NULL)
3926 >  case 184:
3927 > #line 1273 "conf_parser.y" /* yacc.c:1646  */
3928      {
3929 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
3930 <      break;
4262 <    }
4263 <
4264 <    BIO_set_close(file, BIO_CLOSE);
4265 <    BIO_free(file);
4266 <  }
4267 < #endif /* HAVE_LIBCRYPTO */
3929 >  if (conf_parser_ctx.pass == 2)
3930 >    block_state.modes.value |= UMODE_FULL;
3931   }
3932 + #line 3933 "conf_parser.c" /* yacc.c:1646  */
3933      break;
3934  
3935 <  case 146:
3936 <
4273 < /* Line 1464 of yacc.c  */
4274 < #line 1156 "ircd_parser.y"
3935 >  case 185:
3936 > #line 1277 "conf_parser.y" /* yacc.c:1646  */
3937      {
3938    if (conf_parser_ctx.pass == 2)
3939 <  {
4278 <    MyFree(class_name);
4279 <    DupString(class_name, yylval.string);
4280 <  }
3939 >    block_state.modes.value |= UMODE_HIDDEN;
3940   }
3941 + #line 3942 "conf_parser.c" /* yacc.c:1646  */
3942      break;
3943  
3944 <  case 147:
3945 <
4286 < /* Line 1464 of yacc.c  */
4287 < #line 1165 "ircd_parser.y"
3944 >  case 186:
3945 > #line 1281 "conf_parser.y" /* yacc.c:1646  */
3946      {
3947    if (conf_parser_ctx.pass == 2)
3948 <    yy_aconf->modes = 0;
3948 >    block_state.modes.value |= UMODE_HIDECHANS;
3949   }
3950 + #line 3951 "conf_parser.c" /* yacc.c:1646  */
3951      break;
3952  
3953 <  case 151:
3954 <
4296 < /* Line 1464 of yacc.c  */
4297 < #line 1172 "ircd_parser.y"
3953 >  case 187:
3954 > #line 1285 "conf_parser.y" /* yacc.c:1646  */
3955      {
3956    if (conf_parser_ctx.pass == 2)
3957 <    yy_aconf->modes |= UMODE_BOTS;
3957 >    block_state.modes.value |= UMODE_HIDEIDLE;
3958   }
3959 + #line 3960 "conf_parser.c" /* yacc.c:1646  */
3960      break;
3961  
3962 <  case 152:
3963 <
4306 < /* Line 1464 of yacc.c  */
4307 < #line 1176 "ircd_parser.y"
3962 >  case 188:
3963 > #line 1289 "conf_parser.y" /* yacc.c:1646  */
3964      {
3965    if (conf_parser_ctx.pass == 2)
3966 <    yy_aconf->modes |= UMODE_CCONN;
3966 >    block_state.modes.value |= UMODE_SKILL;
3967   }
3968 + #line 3969 "conf_parser.c" /* yacc.c:1646  */
3969      break;
3970  
3971 <  case 153:
3972 <
4316 < /* Line 1464 of yacc.c  */
4317 < #line 1180 "ircd_parser.y"
3971 >  case 189:
3972 > #line 1293 "conf_parser.y" /* yacc.c:1646  */
3973      {
3974    if (conf_parser_ctx.pass == 2)
3975 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3975 >    block_state.modes.value |= UMODE_NCHANGE;
3976   }
3977 + #line 3978 "conf_parser.c" /* yacc.c:1646  */
3978      break;
3979  
3980 <  case 154:
3981 <
4326 < /* Line 1464 of yacc.c  */
4327 < #line 1184 "ircd_parser.y"
3980 >  case 190:
3981 > #line 1297 "conf_parser.y" /* yacc.c:1646  */
3982      {
3983    if (conf_parser_ctx.pass == 2)
3984 <    yy_aconf->modes |= UMODE_DEAF;
3984 >    block_state.modes.value |= UMODE_REJ;
3985   }
3986 + #line 3987 "conf_parser.c" /* yacc.c:1646  */
3987      break;
3988  
3989 <  case 155:
3990 <
4336 < /* Line 1464 of yacc.c  */
4337 < #line 1188 "ircd_parser.y"
3989 >  case 191:
3990 > #line 1301 "conf_parser.y" /* yacc.c:1646  */
3991      {
3992    if (conf_parser_ctx.pass == 2)
3993 <    yy_aconf->modes |= UMODE_DEBUG;
3993 >    block_state.modes.value |= UMODE_UNAUTH;
3994   }
3995 + #line 3996 "conf_parser.c" /* yacc.c:1646  */
3996      break;
3997  
3998 <  case 156:
3999 <
4346 < /* Line 1464 of yacc.c  */
4347 < #line 1192 "ircd_parser.y"
3998 >  case 192:
3999 > #line 1305 "conf_parser.y" /* yacc.c:1646  */
4000      {
4001    if (conf_parser_ctx.pass == 2)
4002 <    yy_aconf->modes |= UMODE_FULL;
4002 >    block_state.modes.value |= UMODE_SPY;
4003   }
4004 + #line 4005 "conf_parser.c" /* yacc.c:1646  */
4005      break;
4006  
4007 <  case 157:
4008 <
4356 < /* Line 1464 of yacc.c  */
4357 < #line 1196 "ircd_parser.y"
4007 >  case 193:
4008 > #line 1309 "conf_parser.y" /* yacc.c:1646  */
4009      {
4010    if (conf_parser_ctx.pass == 2)
4011 <    yy_aconf->modes |= UMODE_SKILL;
4011 >    block_state.modes.value |= UMODE_EXTERNAL;
4012   }
4013 + #line 4014 "conf_parser.c" /* yacc.c:1646  */
4014      break;
4015  
4016 <  case 158:
4017 <
4366 < /* Line 1464 of yacc.c  */
4367 < #line 1200 "ircd_parser.y"
4016 >  case 194:
4017 > #line 1313 "conf_parser.y" /* yacc.c:1646  */
4018      {
4019    if (conf_parser_ctx.pass == 2)
4020 <    yy_aconf->modes |= UMODE_NCHANGE;
4020 >    block_state.modes.value |= UMODE_SERVNOTICE;
4021   }
4022 + #line 4023 "conf_parser.c" /* yacc.c:1646  */
4023      break;
4024  
4025 <  case 159:
4026 <
4376 < /* Line 1464 of yacc.c  */
4377 < #line 1204 "ircd_parser.y"
4025 >  case 195:
4026 > #line 1317 "conf_parser.y" /* yacc.c:1646  */
4027      {
4028    if (conf_parser_ctx.pass == 2)
4029 <    yy_aconf->modes |= UMODE_REJ;
4029 >    block_state.modes.value |= UMODE_INVISIBLE;
4030   }
4031 + #line 4032 "conf_parser.c" /* yacc.c:1646  */
4032      break;
4033  
4034 <  case 160:
4035 <
4386 < /* Line 1464 of yacc.c  */
4387 < #line 1208 "ircd_parser.y"
4034 >  case 196:
4035 > #line 1321 "conf_parser.y" /* yacc.c:1646  */
4036      {
4037    if (conf_parser_ctx.pass == 2)
4038 <    yy_aconf->modes |= UMODE_UNAUTH;
4038 >    block_state.modes.value |= UMODE_WALLOP;
4039   }
4040 + #line 4041 "conf_parser.c" /* yacc.c:1646  */
4041      break;
4042  
4043 <  case 161:
4044 <
4396 < /* Line 1464 of yacc.c  */
4397 < #line 1212 "ircd_parser.y"
4043 >  case 197:
4044 > #line 1325 "conf_parser.y" /* yacc.c:1646  */
4045      {
4046    if (conf_parser_ctx.pass == 2)
4047 <    yy_aconf->modes |= UMODE_SPY;
4047 >    block_state.modes.value |= UMODE_SOFTCALLERID;
4048   }
4049 + #line 4050 "conf_parser.c" /* yacc.c:1646  */
4050      break;
4051  
4052 <  case 162:
4053 <
4406 < /* Line 1464 of yacc.c  */
4407 < #line 1216 "ircd_parser.y"
4052 >  case 198:
4053 > #line 1329 "conf_parser.y" /* yacc.c:1646  */
4054      {
4055    if (conf_parser_ctx.pass == 2)
4056 <    yy_aconf->modes |= UMODE_EXTERNAL;
4056 >    block_state.modes.value |= UMODE_CALLERID;
4057   }
4058 + #line 4059 "conf_parser.c" /* yacc.c:1646  */
4059      break;
4060  
4061 <  case 163:
4062 <
4416 < /* Line 1464 of yacc.c  */
4417 < #line 1220 "ircd_parser.y"
4061 >  case 199:
4062 > #line 1333 "conf_parser.y" /* yacc.c:1646  */
4063      {
4064    if (conf_parser_ctx.pass == 2)
4065 <    yy_aconf->modes |= UMODE_OPERWALL;
4065 >    block_state.modes.value |= UMODE_LOCOPS;
4066   }
4067 + #line 4068 "conf_parser.c" /* yacc.c:1646  */
4068      break;
4069  
4070 <  case 164:
4071 <
4426 < /* Line 1464 of yacc.c  */
4427 < #line 1224 "ircd_parser.y"
4070 >  case 200:
4071 > #line 1337 "conf_parser.y" /* yacc.c:1646  */
4072      {
4073    if (conf_parser_ctx.pass == 2)
4074 <    yy_aconf->modes |= UMODE_SERVNOTICE;
4074 >    block_state.modes.value |= UMODE_REGONLY;
4075   }
4076 + #line 4077 "conf_parser.c" /* yacc.c:1646  */
4077      break;
4078  
4079 <  case 165:
4080 <
4436 < /* Line 1464 of yacc.c  */
4437 < #line 1228 "ircd_parser.y"
4079 >  case 201:
4080 > #line 1341 "conf_parser.y" /* yacc.c:1646  */
4081      {
4082    if (conf_parser_ctx.pass == 2)
4083 <    yy_aconf->modes |= UMODE_INVISIBLE;
4083 >    block_state.modes.value |= UMODE_FARCONNECT;
4084   }
4085 + #line 4086 "conf_parser.c" /* yacc.c:1646  */
4086      break;
4087  
4088 <  case 166:
4089 <
4446 < /* Line 1464 of yacc.c  */
4447 < #line 1232 "ircd_parser.y"
4088 >  case 202:
4089 > #line 1347 "conf_parser.y" /* yacc.c:1646  */
4090      {
4091    if (conf_parser_ctx.pass == 2)
4092 <    yy_aconf->modes |= UMODE_WALLOP;
4092 >    block_state.port.value = 0;
4093   }
4094 + #line 4095 "conf_parser.c" /* yacc.c:1646  */
4095      break;
4096  
4097 <  case 167:
4098 <
4456 < /* Line 1464 of yacc.c  */
4457 < #line 1236 "ircd_parser.y"
4097 >  case 206:
4098 > #line 1354 "conf_parser.y" /* yacc.c:1646  */
4099      {
4100    if (conf_parser_ctx.pass == 2)
4101 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
4101 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4102   }
4103 + #line 4104 "conf_parser.c" /* yacc.c:1646  */
4104      break;
4105  
4106 <  case 168:
4107 <
4466 < /* Line 1464 of yacc.c  */
4467 < #line 1240 "ircd_parser.y"
4106 >  case 207:
4107 > #line 1358 "conf_parser.y" /* yacc.c:1646  */
4108      {
4109    if (conf_parser_ctx.pass == 2)
4110 <    yy_aconf->modes |= UMODE_CALLERID;
4110 >    block_state.port.value |= OPER_FLAG_KILL;
4111   }
4112 + #line 4113 "conf_parser.c" /* yacc.c:1646  */
4113      break;
4114  
4115 <  case 169:
4116 <
4476 < /* Line 1464 of yacc.c  */
4477 < #line 1244 "ircd_parser.y"
4115 >  case 208:
4116 > #line 1362 "conf_parser.y" /* yacc.c:1646  */
4117      {
4118    if (conf_parser_ctx.pass == 2)
4119 <    yy_aconf->modes |= UMODE_LOCOPS;
4119 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4120   }
4121 + #line 4122 "conf_parser.c" /* yacc.c:1646  */
4122      break;
4123  
4124 <  case 170:
4125 <
4486 < /* Line 1464 of yacc.c  */
4487 < #line 1250 "ircd_parser.y"
4124 >  case 209:
4125 > #line 1366 "conf_parser.y" /* yacc.c:1646  */
4126      {
4127 +  if (conf_parser_ctx.pass == 2)
4128 +    block_state.port.value |= OPER_FLAG_CONNECT;
4129   }
4130 + #line 4131 "conf_parser.c" /* yacc.c:1646  */
4131      break;
4132  
4133 <  case 174:
4134 <
4135 < /* Line 1464 of yacc.c  */
4136 < #line 1254 "ircd_parser.y"
4137 <    { not_atom = 1; }
4133 >  case 210:
4134 > #line 1370 "conf_parser.y" /* yacc.c:1646  */
4135 >    {
4136 >  if (conf_parser_ctx.pass == 2)
4137 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4138 > }
4139 > #line 4140 "conf_parser.c" /* yacc.c:1646  */
4140      break;
4141  
4142 <  case 176:
4143 <
4144 < /* Line 1464 of yacc.c  */
4145 < #line 1255 "ircd_parser.y"
4146 <    { not_atom = 0; }
4142 >  case 211:
4143 > #line 1374 "conf_parser.y" /* yacc.c:1646  */
4144 >    {
4145 >  if (conf_parser_ctx.pass == 2)
4146 >    block_state.port.value |= OPER_FLAG_SQUIT;
4147 > }
4148 > #line 4149 "conf_parser.c" /* yacc.c:1646  */
4149      break;
4150  
4151 <  case 178:
4152 <
4508 < /* Line 1464 of yacc.c  */
4509 < #line 1258 "ircd_parser.y"
4151 >  case 212:
4152 > #line 1378 "conf_parser.y" /* yacc.c:1646  */
4153      {
4154    if (conf_parser_ctx.pass == 2)
4155 <  {
4513 <    if (not_atom)yy_aconf->port &= ~OPER_FLAG_GLOBAL_KILL;
4514 <    else yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4515 <  }
4155 >    block_state.port.value |= OPER_FLAG_KLINE;
4156   }
4157 + #line 4158 "conf_parser.c" /* yacc.c:1646  */
4158      break;
4159  
4160 <  case 179:
4161 <
4521 < /* Line 1464 of yacc.c  */
4522 < #line 1265 "ircd_parser.y"
4160 >  case 213:
4161 > #line 1382 "conf_parser.y" /* yacc.c:1646  */
4162      {
4163    if (conf_parser_ctx.pass == 2)
4164 <  {
4526 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTE;
4527 <    else yy_aconf->port |= OPER_FLAG_REMOTE;
4528 <  }
4164 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4165   }
4166 + #line 4167 "conf_parser.c" /* yacc.c:1646  */
4167      break;
4168  
4169 <  case 180:
4170 <
4534 < /* Line 1464 of yacc.c  */
4535 < #line 1272 "ircd_parser.y"
4169 >  case 214:
4170 > #line 1386 "conf_parser.y" /* yacc.c:1646  */
4171      {
4172    if (conf_parser_ctx.pass == 2)
4173 <  {
4539 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_K;
4540 <    else yy_aconf->port |= OPER_FLAG_K;
4541 <  }
4173 >    block_state.port.value |= OPER_FLAG_DLINE;
4174   }
4175 + #line 4176 "conf_parser.c" /* yacc.c:1646  */
4176      break;
4177  
4178 <  case 181:
4179 <
4547 < /* Line 1464 of yacc.c  */
4548 < #line 1279 "ircd_parser.y"
4178 >  case 215:
4179 > #line 1390 "conf_parser.y" /* yacc.c:1646  */
4180      {
4181    if (conf_parser_ctx.pass == 2)
4182 <  {
4552 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_UNKLINE;
4553 <    else yy_aconf->port |= OPER_FLAG_UNKLINE;
4554 <  }
4182 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4183   }
4184 + #line 4185 "conf_parser.c" /* yacc.c:1646  */
4185      break;
4186  
4187 <  case 182:
4188 <
4560 < /* Line 1464 of yacc.c  */
4561 < #line 1286 "ircd_parser.y"
4187 >  case 216:
4188 > #line 1394 "conf_parser.y" /* yacc.c:1646  */
4189      {
4190    if (conf_parser_ctx.pass == 2)
4191 <  {
4565 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_X;
4566 <    else yy_aconf->port |= OPER_FLAG_X;
4567 <  }
4191 >    block_state.port.value |= OPER_FLAG_XLINE;
4192   }
4193 + #line 4194 "conf_parser.c" /* yacc.c:1646  */
4194      break;
4195  
4196 <  case 183:
4197 <
4573 < /* Line 1464 of yacc.c  */
4574 < #line 1293 "ircd_parser.y"
4196 >  case 217:
4197 > #line 1398 "conf_parser.y" /* yacc.c:1646  */
4198      {
4199    if (conf_parser_ctx.pass == 2)
4200 <  {
4578 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_GLINE;
4579 <    else yy_aconf->port |= OPER_FLAG_GLINE;
4580 <  }
4200 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4201   }
4202 + #line 4203 "conf_parser.c" /* yacc.c:1646  */
4203      break;
4204  
4205 <  case 184:
4206 <
4586 < /* Line 1464 of yacc.c  */
4587 < #line 1300 "ircd_parser.y"
4205 >  case 218:
4206 > #line 1402 "conf_parser.y" /* yacc.c:1646  */
4207      {
4208    if (conf_parser_ctx.pass == 2)
4209 <  {
4591 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_DIE;
4592 <    else yy_aconf->port |= OPER_FLAG_DIE;
4593 <  }
4209 >    block_state.port.value |= OPER_FLAG_GLINE;
4210   }
4211 + #line 4212 "conf_parser.c" /* yacc.c:1646  */
4212      break;
4213  
4214 <  case 185:
4215 <
4599 < /* Line 1464 of yacc.c  */
4600 < #line 1307 "ircd_parser.y"
4214 >  case 219:
4215 > #line 1406 "conf_parser.y" /* yacc.c:1646  */
4216      {
4217    if (conf_parser_ctx.pass == 2)
4218 <  {
4604 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REHASH;
4605 <    else yy_aconf->port |= OPER_FLAG_REHASH;
4606 <  }
4218 >    block_state.port.value |= OPER_FLAG_DIE;
4219   }
4220 + #line 4221 "conf_parser.c" /* yacc.c:1646  */
4221      break;
4222  
4223 <  case 186:
4224 <
4612 < /* Line 1464 of yacc.c  */
4613 < #line 1314 "ircd_parser.y"
4223 >  case 220:
4224 > #line 1410 "conf_parser.y" /* yacc.c:1646  */
4225      {
4226    if (conf_parser_ctx.pass == 2)
4227 <  {
4617 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_ADMIN;
4618 <    else yy_aconf->port |= OPER_FLAG_ADMIN;
4619 <  }
4227 >    block_state.port.value |= OPER_FLAG_RESTART;
4228   }
4229 + #line 4230 "conf_parser.c" /* yacc.c:1646  */
4230      break;
4231  
4232 <  case 187:
4233 <
4625 < /* Line 1464 of yacc.c  */
4626 < #line 1321 "ircd_parser.y"
4232 >  case 221:
4233 > #line 1414 "conf_parser.y" /* yacc.c:1646  */
4234      {
4235    if (conf_parser_ctx.pass == 2)
4236 <  {
4630 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_ADMIN;
4631 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_ADMIN;
4632 <  }
4236 >    block_state.port.value |= OPER_FLAG_REHASH;
4237   }
4238 + #line 4239 "conf_parser.c" /* yacc.c:1646  */
4239      break;
4240  
4241 <  case 188:
4242 <
4638 < /* Line 1464 of yacc.c  */
4639 < #line 1328 "ircd_parser.y"
4241 >  case 222:
4242 > #line 1418 "conf_parser.y" /* yacc.c:1646  */
4243      {
4244    if (conf_parser_ctx.pass == 2)
4245 <  {
4643 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_N;
4644 <    else yy_aconf->port |= OPER_FLAG_N;
4645 <  }
4245 >    block_state.port.value |= OPER_FLAG_ADMIN;
4246   }
4247 + #line 4248 "conf_parser.c" /* yacc.c:1646  */
4248      break;
4249  
4250 <  case 189:
4251 <
4651 < /* Line 1464 of yacc.c  */
4652 < #line 1335 "ircd_parser.y"
4250 >  case 223:
4251 > #line 1422 "conf_parser.y" /* yacc.c:1646  */
4252      {
4253    if (conf_parser_ctx.pass == 2)
4254 <  {
4656 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPERWALL;
4657 <    else yy_aconf->port |= OPER_FLAG_OPERWALL;
4658 <  }
4254 >    block_state.port.value |= OPER_FLAG_GLOBOPS;
4255   }
4256 + #line 4257 "conf_parser.c" /* yacc.c:1646  */
4257      break;
4258  
4259 <  case 190:
4260 <
4664 < /* Line 1464 of yacc.c  */
4665 < #line 1342 "ircd_parser.y"
4259 >  case 224:
4260 > #line 1426 "conf_parser.y" /* yacc.c:1646  */
4261      {
4262    if (conf_parser_ctx.pass == 2)
4263 <  {
4669 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_OPER_SPY;
4670 <    else yy_aconf->port |= OPER_FLAG_OPER_SPY;
4671 <  }
4263 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4264   }
4265 + #line 4266 "conf_parser.c" /* yacc.c:1646  */
4266      break;
4267  
4268 <  case 191:
4269 <
4677 < /* Line 1464 of yacc.c  */
4678 < #line 1349 "ircd_parser.y"
4268 >  case 225:
4269 > #line 1430 "conf_parser.y" /* yacc.c:1646  */
4270      {
4271    if (conf_parser_ctx.pass == 2)
4272 <  {
4682 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_HIDDEN_OPER;
4683 <    else yy_aconf->port |= OPER_FLAG_HIDDEN_OPER;
4684 <  }
4272 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4273   }
4274 + #line 4275 "conf_parser.c" /* yacc.c:1646  */
4275      break;
4276  
4277 <  case 192:
4278 <
4690 < /* Line 1464 of yacc.c  */
4691 < #line 1356 "ircd_parser.y"
4277 >  case 226:
4278 > #line 1434 "conf_parser.y" /* yacc.c:1646  */
4279      {
4280    if (conf_parser_ctx.pass == 2)
4281 <  {
4695 <    if (not_atom) yy_aconf->port &= ~OPER_FLAG_REMOTEBAN;
4696 <    else yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4697 <  }
4281 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4282   }
4283 + #line 4284 "conf_parser.c" /* yacc.c:1646  */
4284      break;
4285  
4286 <  case 193:
4287 <
4703 < /* Line 1464 of yacc.c  */
4704 < #line 1363 "ircd_parser.y"
4286 >  case 227:
4287 > #line 1438 "conf_parser.y" /* yacc.c:1646  */
4288      {
4289    if (conf_parser_ctx.pass == 2)
4290 <  {
4708 <    if (not_atom) ClearConfEncrypted(yy_aconf);
4709 <    else SetConfEncrypted(yy_aconf);
4710 <  }
4290 >    block_state.port.value |= OPER_FLAG_SET;
4291   }
4292 + #line 4293 "conf_parser.c" /* yacc.c:1646  */
4293      break;
4294  
4295 <  case 194:
4296 <
4716 < /* Line 1464 of yacc.c  */
4717 < #line 1376 "ircd_parser.y"
4295 >  case 228:
4296 > #line 1442 "conf_parser.y" /* yacc.c:1646  */
4297      {
4298 <  if (conf_parser_ctx.pass == 1)
4299 <  {
4721 <    yy_conf = make_conf_item(CLASS_TYPE);
4722 <    yy_class = map_to_conf(yy_conf);
4723 <  }
4298 >  if (conf_parser_ctx.pass == 2)
4299 >    block_state.port.value |= OPER_FLAG_MODULE;
4300   }
4301 + #line 4302 "conf_parser.c" /* yacc.c:1646  */
4302      break;
4303  
4304 <  case 195:
4305 <
4729 < /* Line 1464 of yacc.c  */
4730 < #line 1383 "ircd_parser.y"
4304 >  case 229:
4305 > #line 1452 "conf_parser.y" /* yacc.c:1646  */
4306      {
4307 <  if (conf_parser_ctx.pass == 1)
4308 <  {
4734 <    struct ConfItem *cconf = NULL;
4735 <    struct ClassItem *class = NULL;
4307 >  if (conf_parser_ctx.pass != 1)
4308 >    break;
4309  
4310 <    if (yy_class_name == NULL)
4738 <      delete_conf_item(yy_conf);
4739 <    else
4740 <    {
4741 <      cconf = find_exact_name_conf(CLASS_TYPE, yy_class_name, NULL, NULL);
4310 >  reset_block_state();
4311  
4312 <      if (cconf != NULL)                /* The class existed already */
4313 <      {
4314 <        int user_count = 0;
4312 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4313 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4314 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4315 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4316 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4317 > }
4318 > #line 4319 "conf_parser.c" /* yacc.c:1646  */
4319 >    break;
4320  
4321 <        rebuild_cidr_class(cconf, yy_class);
4321 >  case 230:
4322 > #line 1464 "conf_parser.y" /* yacc.c:1646  */
4323 >    {
4324 >  struct ClassItem *class = NULL;
4325  
4326 <        class = map_to_conf(cconf);
4326 >  if (conf_parser_ctx.pass != 1)
4327 >    break;
4328  
4329 <        user_count = class->curr_user_count;
4330 <        memcpy(class, yy_class, sizeof(*class));
4753 <        class->curr_user_count = user_count;
4754 <        class->active = 1;
4329 >  if (!block_state.class.buf[0])
4330 >    break;
4331  
4332 <        delete_conf_item(yy_conf);
4332 >  if (!(class = class_find(block_state.class.buf, 0)))
4333 >    class = class_make();
4334  
4335 <        MyFree(cconf->name);            /* Allows case change of class name */
4336 <        cconf->name = yy_class_name;
4337 <      }
4338 <      else      /* Brand new class */
4339 <      {
4340 <        MyFree(yy_conf->name);          /* just in case it was allocated */
4341 <        yy_conf->name = yy_class_name;
4342 <        yy_class->active = 1;
4343 <      }
4344 <    }
4335 >  class->active = 1;
4336 >  MyFree(class->name);
4337 >  class->name = xstrdup(block_state.class.buf);
4338 >  class->ping_freq = block_state.ping_freq.value;
4339 >  class->max_perip = block_state.max_perip.value;
4340 >  class->con_freq = block_state.con_freq.value;
4341 >  class->max_total = block_state.max_total.value;
4342 >  class->max_global = block_state.max_global.value;
4343 >  class->max_local = block_state.max_local.value;
4344 >  class->max_ident = block_state.max_ident.value;
4345 >  class->max_sendq = block_state.max_sendq.value;
4346 >  class->max_recvq = block_state.max_recvq.value;
4347 >  class->max_channels = block_state.max_channels.value;
4348  
4349 <    yy_class_name = NULL;
4349 >  if (block_state.min_idle.value > block_state.max_idle.value)
4350 >  {
4351 >    block_state.min_idle.value = 0;
4352 >    block_state.max_idle.value = 0;
4353 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4354    }
4355 +
4356 +  class->flags = block_state.flags.value;
4357 +  class->min_idle = block_state.min_idle.value;
4358 +  class->max_idle = block_state.max_idle.value;
4359 +
4360 +  if (class->number_per_cidr && block_state.number_per_cidr.value)
4361 +    if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
4362 +        (class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
4363 +      if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
4364 +          (class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
4365 +        rebuild_cidr_list(class);
4366 +
4367 +  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4368 +  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4369 +  class->number_per_cidr = block_state.number_per_cidr.value;
4370   }
4371 + #line 4372 "conf_parser.c" /* yacc.c:1646  */
4372      break;
4373  
4374 <  case 214:
4375 <
4776 < /* Line 1464 of yacc.c  */
4777 < #line 1443 "ircd_parser.y"
4374 >  case 251:
4375 > #line 1533 "conf_parser.y" /* yacc.c:1646  */
4376      {
4377    if (conf_parser_ctx.pass == 1)
4378 <  {
4781 <    MyFree(yy_class_name);
4782 <    DupString(yy_class_name, yylval.string);
4783 <  }
4378 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4379   }
4380 + #line 4381 "conf_parser.c" /* yacc.c:1646  */
4381      break;
4382  
4383 <  case 215:
4384 <
4789 < /* Line 1464 of yacc.c  */
4790 < #line 1452 "ircd_parser.y"
4383 >  case 252:
4384 > #line 1539 "conf_parser.y" /* yacc.c:1646  */
4385      {
4386    if (conf_parser_ctx.pass == 1)
4387 <  {
4794 <    MyFree(yy_class_name);
4795 <    DupString(yy_class_name, yylval.string);
4796 <  }
4387 >    block_state.ping_freq.value = (yyvsp[-1].number);
4388   }
4389 + #line 4390 "conf_parser.c" /* yacc.c:1646  */
4390      break;
4391  
4392 <  case 216:
4393 <
4802 < /* Line 1464 of yacc.c  */
4803 < #line 1461 "ircd_parser.y"
4392 >  case 253:
4393 > #line 1545 "conf_parser.y" /* yacc.c:1646  */
4394      {
4395    if (conf_parser_ctx.pass == 1)
4396 <    PingFreq(yy_class) = (yyvsp[(3) - (4)].number);
4396 >    block_state.max_perip.value = (yyvsp[-1].number);
4397   }
4398 + #line 4399 "conf_parser.c" /* yacc.c:1646  */
4399      break;
4400  
4401 <  case 217:
4402 <
4812 < /* Line 1464 of yacc.c  */
4813 < #line 1467 "ircd_parser.y"
4401 >  case 254:
4402 > #line 1551 "conf_parser.y" /* yacc.c:1646  */
4403      {
4404    if (conf_parser_ctx.pass == 1)
4405 <    PingWarning(yy_class) = (yyvsp[(3) - (4)].number);
4405 >    block_state.con_freq.value = (yyvsp[-1].number);
4406   }
4407 + #line 4408 "conf_parser.c" /* yacc.c:1646  */
4408      break;
4409  
4410 <  case 218:
4411 <
4822 < /* Line 1464 of yacc.c  */
4823 < #line 1473 "ircd_parser.y"
4410 >  case 255:
4411 > #line 1557 "conf_parser.y" /* yacc.c:1646  */
4412      {
4413    if (conf_parser_ctx.pass == 1)
4414 <    MaxPerIp(yy_class) = (yyvsp[(3) - (4)].number);
4414 >    block_state.max_channels.value = (yyvsp[-1].number);
4415   }
4416 + #line 4417 "conf_parser.c" /* yacc.c:1646  */
4417      break;
4418  
4419 <  case 219:
4420 <
4832 < /* Line 1464 of yacc.c  */
4833 < #line 1479 "ircd_parser.y"
4419 >  case 256:
4420 > #line 1563 "conf_parser.y" /* yacc.c:1646  */
4421      {
4422    if (conf_parser_ctx.pass == 1)
4423 <    ConFreq(yy_class) = (yyvsp[(3) - (4)].number);
4423 >    block_state.max_total.value = (yyvsp[-1].number);
4424   }
4425 + #line 4426 "conf_parser.c" /* yacc.c:1646  */
4426      break;
4427  
4428 <  case 220:
4429 <
4842 < /* Line 1464 of yacc.c  */
4843 < #line 1485 "ircd_parser.y"
4428 >  case 257:
4429 > #line 1569 "conf_parser.y" /* yacc.c:1646  */
4430      {
4431    if (conf_parser_ctx.pass == 1)
4432 <    MaxTotal(yy_class) = (yyvsp[(3) - (4)].number);
4432 >    block_state.max_global.value = (yyvsp[-1].number);
4433   }
4434 + #line 4435 "conf_parser.c" /* yacc.c:1646  */
4435      break;
4436  
4437 <  case 221:
4438 <
4852 < /* Line 1464 of yacc.c  */
4853 < #line 1491 "ircd_parser.y"
4437 >  case 258:
4438 > #line 1575 "conf_parser.y" /* yacc.c:1646  */
4439      {
4440    if (conf_parser_ctx.pass == 1)
4441 <    MaxGlobal(yy_class) = (yyvsp[(3) - (4)].number);
4441 >    block_state.max_local.value = (yyvsp[-1].number);
4442   }
4443 + #line 4444 "conf_parser.c" /* yacc.c:1646  */
4444      break;
4445  
4446 <  case 222:
4447 <
4862 < /* Line 1464 of yacc.c  */
4863 < #line 1497 "ircd_parser.y"
4446 >  case 259:
4447 > #line 1581 "conf_parser.y" /* yacc.c:1646  */
4448      {
4449    if (conf_parser_ctx.pass == 1)
4450 <    MaxLocal(yy_class) = (yyvsp[(3) - (4)].number);
4450 >    block_state.max_ident.value = (yyvsp[-1].number);
4451   }
4452 + #line 4453 "conf_parser.c" /* yacc.c:1646  */
4453      break;
4454  
4455 <  case 223:
4456 <
4872 < /* Line 1464 of yacc.c  */
4873 < #line 1503 "ircd_parser.y"
4455 >  case 260:
4456 > #line 1587 "conf_parser.y" /* yacc.c:1646  */
4457      {
4458    if (conf_parser_ctx.pass == 1)
4459 <    MaxIdent(yy_class) = (yyvsp[(3) - (4)].number);
4459 >    block_state.max_sendq.value = (yyvsp[-1].number);
4460   }
4461 + #line 4462 "conf_parser.c" /* yacc.c:1646  */
4462      break;
4463  
4464 <  case 224:
4465 <
4882 < /* Line 1464 of yacc.c  */
4883 < #line 1509 "ircd_parser.y"
4464 >  case 261:
4465 > #line 1593 "conf_parser.y" /* yacc.c:1646  */
4466      {
4467    if (conf_parser_ctx.pass == 1)
4468 <    MaxSendq(yy_class) = (yyvsp[(3) - (4)].number);
4468 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4469 >      block_state.max_recvq.value = (yyvsp[-1].number);
4470   }
4471 + #line 4472 "conf_parser.c" /* yacc.c:1646  */
4472      break;
4473  
4474 <  case 225:
4475 <
4892 < /* Line 1464 of yacc.c  */
4893 < #line 1515 "ircd_parser.y"
4474 >  case 262:
4475 > #line 1600 "conf_parser.y" /* yacc.c:1646  */
4476      {
4477    if (conf_parser_ctx.pass == 1)
4478 <    CidrBitlenIPV4(yy_class) = (yyvsp[(3) - (4)].number);
4478 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4479   }
4480 + #line 4481 "conf_parser.c" /* yacc.c:1646  */
4481      break;
4482  
4483 <  case 226:
4484 <
4902 < /* Line 1464 of yacc.c  */
4903 < #line 1521 "ircd_parser.y"
4483 >  case 263:
4484 > #line 1606 "conf_parser.y" /* yacc.c:1646  */
4485      {
4486    if (conf_parser_ctx.pass == 1)
4487 <    CidrBitlenIPV6(yy_class) = (yyvsp[(3) - (4)].number);
4487 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4488   }
4489 + #line 4490 "conf_parser.c" /* yacc.c:1646  */
4490      break;
4491  
4492 <  case 227:
4493 <
4912 < /* Line 1464 of yacc.c  */
4913 < #line 1527 "ircd_parser.y"
4492 >  case 264:
4493 > #line 1612 "conf_parser.y" /* yacc.c:1646  */
4494      {
4495    if (conf_parser_ctx.pass == 1)
4496 <    NumberPerCidr(yy_class) = (yyvsp[(3) - (4)].number);
4496 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4497   }
4498 + #line 4499 "conf_parser.c" /* yacc.c:1646  */
4499      break;
4500  
4501 <  case 228:
4502 <
4922 < /* Line 1464 of yacc.c  */
4923 < #line 1536 "ircd_parser.y"
4501 >  case 265:
4502 > #line 1618 "conf_parser.y" /* yacc.c:1646  */
4503      {
4504 <  if (conf_parser_ctx.pass == 2)
4926 <  {
4927 <    listener_address = NULL;
4928 <    listener_flags = 0;
4929 <  }
4930 < }
4504 >  if (conf_parser_ctx.pass != 1)
4505      break;
4506  
4507 <  case 229:
4507 >  block_state.min_idle.value = (yyvsp[-1].number);
4508 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4509 > }
4510 > #line 4511 "conf_parser.c" /* yacc.c:1646  */
4511 >    break;
4512  
4513 < /* Line 1464 of yacc.c  */
4514 < #line 1543 "ircd_parser.y"
4513 >  case 266:
4514 > #line 1627 "conf_parser.y" /* yacc.c:1646  */
4515      {
4516 <  if (conf_parser_ctx.pass == 2)
4517 <  {
4518 <    MyFree(listener_address);
4519 <    listener_address = NULL;
4520 <  }
4516 >  if (conf_parser_ctx.pass != 1)
4517 >    break;
4518 >
4519 >  block_state.max_idle.value = (yyvsp[-1].number);
4520 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4521   }
4522 + #line 4523 "conf_parser.c" /* yacc.c:1646  */
4523      break;
4524  
4525 <  case 230:
4525 >  case 267:
4526 > #line 1636 "conf_parser.y" /* yacc.c:1646  */
4527 >    {
4528 >  if (conf_parser_ctx.pass == 1)
4529 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4530 > }
4531 > #line 4532 "conf_parser.c" /* yacc.c:1646  */
4532 >    break;
4533  
4534 < /* Line 1464 of yacc.c  */
4535 < #line 1552 "ircd_parser.y"
4534 >  case 271:
4535 > #line 1643 "conf_parser.y" /* yacc.c:1646  */
4536      {
4537 <  listener_flags = 0;
4537 >  if (conf_parser_ctx.pass == 1)
4538 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4539   }
4540 + #line 4541 "conf_parser.c" /* yacc.c:1646  */
4541      break;
4542  
4543 <  case 234:
4543 >  case 272:
4544 > #line 1647 "conf_parser.y" /* yacc.c:1646  */
4545 >    {
4546 >  if (conf_parser_ctx.pass == 1)
4547 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4548 > }
4549 > #line 4550 "conf_parser.c" /* yacc.c:1646  */
4550 >    break;
4551  
4552 < /* Line 1464 of yacc.c  */
4553 < #line 1558 "ircd_parser.y"
4552 >  case 273:
4553 > #line 1657 "conf_parser.y" /* yacc.c:1646  */
4554      {
4555    if (conf_parser_ctx.pass == 2)
4556 <    listener_flags |= LISTENER_SSL;
4556 >    reset_block_state();
4557   }
4558 + #line 4559 "conf_parser.c" /* yacc.c:1646  */
4559      break;
4560  
4561 <  case 235:
4561 >  case 275:
4562 > #line 1663 "conf_parser.y" /* yacc.c:1646  */
4563 >    {
4564 >  block_state.flags.value = 0;
4565 > }
4566 > #line 4567 "conf_parser.c" /* yacc.c:1646  */
4567 >    break;
4568  
4569 < /* Line 1464 of yacc.c  */
4570 < #line 1562 "ircd_parser.y"
4569 >  case 279:
4570 > #line 1669 "conf_parser.y" /* yacc.c:1646  */
4571      {
4572    if (conf_parser_ctx.pass == 2)
4573 <    listener_flags |= LISTENER_HIDDEN;
4573 >    block_state.flags.value |= LISTENER_SSL;
4574   }
4575 + #line 4576 "conf_parser.c" /* yacc.c:1646  */
4576      break;
4577  
4578 <  case 236:
4579 <
4977 < /* Line 1464 of yacc.c  */
4978 < #line 1566 "ircd_parser.y"
4578 >  case 280:
4579 > #line 1673 "conf_parser.y" /* yacc.c:1646  */
4580      {
4581    if (conf_parser_ctx.pass == 2)
4582 <    listener_flags |= LISTENER_SERVER;
4582 >    block_state.flags.value |= LISTENER_HIDDEN;
4583   }
4584 + #line 4585 "conf_parser.c" /* yacc.c:1646  */
4585      break;
4586  
4587 <  case 244:
4588 <
4589 < /* Line 1464 of yacc.c  */
4590 < #line 1576 "ircd_parser.y"
4591 <    { listener_flags = 0; }
4587 >  case 281:
4588 > #line 1677 "conf_parser.y" /* yacc.c:1646  */
4589 >    {
4590 >  if (conf_parser_ctx.pass == 2)
4591 >   block_state.flags.value |= LISTENER_SERVER;
4592 > }
4593 > #line 4594 "conf_parser.c" /* yacc.c:1646  */
4594      break;
4595  
4596 <  case 248:
4596 >  case 289:
4597 > #line 1685 "conf_parser.y" /* yacc.c:1646  */
4598 >    { block_state.flags.value = 0; }
4599 > #line 4600 "conf_parser.c" /* yacc.c:1646  */
4600 >    break;
4601  
4602 < /* Line 1464 of yacc.c  */
4603 < #line 1581 "ircd_parser.y"
4602 >  case 293:
4603 > #line 1690 "conf_parser.y" /* yacc.c:1646  */
4604      {
4605    if (conf_parser_ctx.pass == 2)
4606    {
4607 <    if ((listener_flags & LISTENER_SSL))
4608 < #ifdef HAVE_LIBCRYPTO
4609 <      if (!ServerInfo.server_ctx)
4607 > #ifndef HAVE_LIBCRYPTO
4608 >    if (block_state.flags.value & LISTENER_SSL)
4609 >    {
4610 >      conf_error_report("SSL not available - port closed");
4611 >      break;
4612 >    }
4613   #endif
4614 <      {
5004 <        yyerror("SSL not available - port closed");
5005 <        break;
5006 <      }
5007 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
4614 >    add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4615    }
4616   }
4617 + #line 4618 "conf_parser.c" /* yacc.c:1646  */
4618      break;
4619  
4620 <  case 249:
4621 <
5014 < /* Line 1464 of yacc.c  */
5015 < #line 1595 "ircd_parser.y"
4620 >  case 294:
4621 > #line 1703 "conf_parser.y" /* yacc.c:1646  */
4622      {
4623    if (conf_parser_ctx.pass == 2)
4624    {
4625 <    int i;
4626 <
4627 <    if ((listener_flags & LISTENER_SSL))
4628 < #ifdef HAVE_LIBCRYPTO
4629 <      if (!ServerInfo.server_ctx)
4625 > #ifndef HAVE_LIBCRYPTO
4626 >    if (block_state.flags.value & LISTENER_SSL)
4627 >    {
4628 >      conf_error_report("SSL not available - port closed");
4629 >      break;
4630 >    }
4631   #endif
5025      {
5026        yyerror("SSL not available - port closed");
5027        break;
5028      }
4632  
4633 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
4634 <      add_listener(i, listener_address, listener_flags);
4633 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4634 >      add_listener(i, block_state.addr.buf, block_state.flags.value);
4635    }
4636   }
4637 + #line 4638 "conf_parser.c" /* yacc.c:1646  */
4638      break;
4639  
4640 <  case 250:
4641 <
5038 < /* Line 1464 of yacc.c  */
5039 < #line 1615 "ircd_parser.y"
4640 >  case 295:
4641 > #line 1720 "conf_parser.y" /* yacc.c:1646  */
4642      {
4643    if (conf_parser_ctx.pass == 2)
4644 <  {
5043 <    MyFree(listener_address);
5044 <    DupString(listener_address, yylval.string);
5045 <  }
4644 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4645   }
4646 + #line 4647 "conf_parser.c" /* yacc.c:1646  */
4647      break;
4648  
4649 <  case 251:
4650 <
5051 < /* Line 1464 of yacc.c  */
5052 < #line 1624 "ircd_parser.y"
4649 >  case 296:
4650 > #line 1726 "conf_parser.y" /* yacc.c:1646  */
4651      {
4652    if (conf_parser_ctx.pass == 2)
4653 <  {
5056 <    MyFree(listener_address);
5057 <    DupString(listener_address, yylval.string);
5058 <  }
4653 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4654   }
4655 + #line 4656 "conf_parser.c" /* yacc.c:1646  */
4656      break;
4657  
4658 <  case 252:
4659 <
5064 < /* Line 1464 of yacc.c  */
5065 < #line 1636 "ircd_parser.y"
4658 >  case 297:
4659 > #line 1735 "conf_parser.y" /* yacc.c:1646  */
4660      {
4661    if (conf_parser_ctx.pass == 2)
4662 <  {
5069 <    yy_conf = make_conf_item(CLIENT_TYPE);
5070 <    yy_aconf = map_to_conf(yy_conf);
5071 <  }
5072 <  else
5073 <  {
5074 <    MyFree(class_name);
5075 <    class_name = NULL;
5076 <  }
4662 >    reset_block_state();
4663   }
4664 + #line 4665 "conf_parser.c" /* yacc.c:1646  */
4665      break;
4666  
4667 <  case 253:
4668 <
5082 < /* Line 1464 of yacc.c  */
5083 < #line 1648 "ircd_parser.y"
5084 <    {
5085 <  if (conf_parser_ctx.pass == 2)
5086 <  {
5087 <    struct CollectItem *yy_tmp = NULL;
5088 <    dlink_node *ptr = NULL, *next_ptr = NULL;
5089 <
5090 <    if (yy_aconf->user && yy_aconf->host)
5091 <    {
5092 <      conf_add_class_to_conf(yy_conf, class_name);
5093 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
5094 <    }
5095 <    else
5096 <      delete_conf_item(yy_conf);
5097 <
5098 <    /* copy over settings from first struct */
5099 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
4667 >  case 298:
4668 > #line 1739 "conf_parser.y" /* yacc.c:1646  */
4669      {
4670 <      struct AccessItem *new_aconf;
5102 <      struct ConfItem *new_conf;
5103 <
5104 <      new_conf = make_conf_item(CLIENT_TYPE);
5105 <      new_aconf = map_to_conf(new_conf);
5106 <
5107 <      yy_tmp = ptr->data;
5108 <
5109 <      assert(yy_tmp->user && yy_tmp->host);
4670 >  dlink_node *node = NULL;
4671  
4672 <      if (yy_aconf->passwd != NULL)
5112 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5113 <      if (yy_conf->name != NULL)
5114 <        DupString(new_conf->name, yy_conf->name);
5115 <      if (yy_aconf->passwd != NULL)
5116 <        DupString(new_aconf->passwd, yy_aconf->passwd);
5117 <
5118 <      new_aconf->flags = yy_aconf->flags;
5119 <      new_aconf->port  = yy_aconf->port;
5120 <
5121 <      DupString(new_aconf->user, yy_tmp->user);
5122 <      collapse(new_aconf->user);
5123 <
5124 <      DupString(new_aconf->host, yy_tmp->host);
5125 <      collapse(new_aconf->host);
5126 <
5127 <      conf_add_class_to_conf(new_conf, class_name);
5128 <      add_conf_by_address(CONF_CLIENT, new_aconf);
5129 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
5130 <      free_collect_item(yy_tmp);
5131 <    }
5132 <
5133 <    MyFree(class_name);
5134 <    class_name = NULL;
5135 <    yy_conf = NULL;
5136 <    yy_aconf = NULL;
5137 <  }
5138 < }
4672 >  if (conf_parser_ctx.pass != 2)
4673      break;
4674  
4675 <  case 265:
5142 <
5143 < /* Line 1464 of yacc.c  */
5144 < #line 1710 "ircd_parser.y"
5145 <    {
5146 <  if (conf_parser_ctx.pass == 2)
4675 >  DLINK_FOREACH(node, block_state.mask.list.head)
4676    {
4677 <    struct CollectItem *yy_tmp = NULL;
4677 >    struct MaskItem *conf = NULL;
4678      struct split_nuh_item nuh;
4679  
4680 <    nuh.nuhmask  = yylval.string;
4680 >    nuh.nuhmask  = node->data;
4681      nuh.nickptr  = NULL;
4682 <    nuh.userptr  = userbuf;
4683 <    nuh.hostptr  = hostbuf;
5155 <
4682 >    nuh.userptr  = block_state.user.buf;
4683 >    nuh.hostptr  = block_state.host.buf;
4684      nuh.nicksize = 0;
4685 <    nuh.usersize = sizeof(userbuf);
4686 <    nuh.hostsize = sizeof(hostbuf);
5159 <
4685 >    nuh.usersize = sizeof(block_state.user.buf);
4686 >    nuh.hostsize = sizeof(block_state.host.buf);
4687      split_nuh(&nuh);
4688  
4689 <    if (yy_aconf->user == NULL)
4690 <    {
4691 <      DupString(yy_aconf->user, userbuf);
5165 <      DupString(yy_aconf->host, hostbuf);
5166 <    }
5167 <    else
5168 <    {
5169 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4689 >    conf        = conf_make(CONF_CLIENT);
4690 >    conf->user  = xstrdup(block_state.user.buf);
4691 >    conf->host  = xstrdup(block_state.host.buf);
4692  
4693 <      DupString(yy_tmp->user, userbuf);
4694 <      DupString(yy_tmp->host, hostbuf);
4693 >    if (block_state.rpass.buf[0])
4694 >      conf->passwd = xstrdup(block_state.rpass.buf);
4695 >    if (block_state.name.buf[0])
4696 >      conf->name = xstrdup(block_state.name.buf);
4697  
4698 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4699 <    }
4698 >    conf->flags = block_state.flags.value;
4699 >    conf->port  = block_state.port.value;
4700 >
4701 >    conf_add_class_to_conf(conf, block_state.class.buf);
4702 >    add_conf_by_address(CONF_CLIENT, conf);
4703    }
4704   }
4705 + #line 4706 "conf_parser.c" /* yacc.c:1646  */
4706      break;
4707  
4708 <  case 266:
4709 <
5182 < /* Line 1464 of yacc.c  */
5183 < #line 1747 "ircd_parser.y"
4708 >  case 310:
4709 > #line 1788 "conf_parser.y" /* yacc.c:1646  */
4710      {
4711    if (conf_parser_ctx.pass == 2)
4712 <  {
5187 <    /* be paranoid */
5188 <    if (yy_aconf->passwd != NULL)
5189 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
5190 <
5191 <    MyFree(yy_aconf->passwd);
5192 <    DupString(yy_aconf->passwd, yylval.string);
5193 <  }
4712 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4713   }
4714 + #line 4715 "conf_parser.c" /* yacc.c:1646  */
4715      break;
4716  
4717 <  case 267:
4718 <
5199 < /* Line 1464 of yacc.c  */
5200 < #line 1760 "ircd_parser.y"
4717 >  case 311:
4718 > #line 1794 "conf_parser.y" /* yacc.c:1646  */
4719      {
4720    if (conf_parser_ctx.pass == 2)
4721 <  {
5204 <    MyFree(class_name);
5205 <    DupString(class_name, yylval.string);
5206 <  }
4721 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4722   }
4723 + #line 4724 "conf_parser.c" /* yacc.c:1646  */
4724      break;
4725  
4726 <  case 268:
4726 >  case 312:
4727 > #line 1800 "conf_parser.y" /* yacc.c:1646  */
4728 >    {
4729 >  if (conf_parser_ctx.pass == 2)
4730 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4731 > }
4732 > #line 4733 "conf_parser.c" /* yacc.c:1646  */
4733 >    break;
4734  
4735 < /* Line 1464 of yacc.c  */
4736 < #line 1769 "ircd_parser.y"
4735 >  case 313:
4736 > #line 1806 "conf_parser.y" /* yacc.c:1646  */
4737      {
4738    if (conf_parser_ctx.pass == 2)
4739    {
4740      if (yylval.number)
4741 <      SetConfEncrypted(yy_aconf);
4741 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4742      else
4743 <      ClearConfEncrypted(yy_aconf);
4743 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4744    }
4745   }
4746 + #line 4747 "conf_parser.c" /* yacc.c:1646  */
4747      break;
4748  
4749 <  case 269:
4750 <
5227 < /* Line 1464 of yacc.c  */
5228 < #line 1780 "ircd_parser.y"
4749 >  case 314:
4750 > #line 1817 "conf_parser.y" /* yacc.c:1646  */
4751      {
4752 +  if (conf_parser_ctx.pass == 2)
4753 +    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4754   }
4755 + #line 4756 "conf_parser.c" /* yacc.c:1646  */
4756      break;
4757  
4758 <  case 273:
4759 <
4760 < /* Line 1464 of yacc.c  */
4761 < #line 1784 "ircd_parser.y"
4762 <    { not_atom = 1; }
4763 <    break;
4764 <
5240 <  case 275:
5241 <
5242 < /* Line 1464 of yacc.c  */
5243 < #line 1785 "ircd_parser.y"
5244 <    { not_atom = 0; }
4758 >  case 318:
4759 > #line 1824 "conf_parser.y" /* yacc.c:1646  */
4760 >    {
4761 >  if (conf_parser_ctx.pass == 2)
4762 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4763 > }
4764 > #line 4765 "conf_parser.c" /* yacc.c:1646  */
4765      break;
4766  
4767 <  case 277:
4768 <
5249 < /* Line 1464 of yacc.c  */
5250 < #line 1788 "ircd_parser.y"
4767 >  case 319:
4768 > #line 1828 "conf_parser.y" /* yacc.c:1646  */
4769      {
4770    if (conf_parser_ctx.pass == 2)
4771 <  {
5254 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_SPOOF_NOTICE;
5255 <    else yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
5256 <  }
4771 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4772   }
4773 + #line 4774 "conf_parser.c" /* yacc.c:1646  */
4774      break;
4775  
4776 <  case 278:
4777 <
5262 < /* Line 1464 of yacc.c  */
5263 < #line 1795 "ircd_parser.y"
4776 >  case 320:
4777 > #line 1832 "conf_parser.y" /* yacc.c:1646  */
4778      {
4779    if (conf_parser_ctx.pass == 2)
4780 <  {
5267 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NOLIMIT;
5268 <    else yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
5269 <  }
4780 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4781   }
4782 + #line 4783 "conf_parser.c" /* yacc.c:1646  */
4783      break;
4784  
4785 <  case 279:
4786 <
5275 < /* Line 1464 of yacc.c  */
5276 < #line 1802 "ircd_parser.y"
4785 >  case 321:
4786 > #line 1836 "conf_parser.y" /* yacc.c:1646  */
4787      {
4788    if (conf_parser_ctx.pass == 2)
4789 <  {
5280 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTKLINE;
5281 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
5282 <  }
4789 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4790   }
4791 + #line 4792 "conf_parser.c" /* yacc.c:1646  */
4792      break;
4793  
4794 <  case 280:
4795 <
5288 < /* Line 1464 of yacc.c  */
5289 < #line 1809 "ircd_parser.y"
4794 >  case 322:
4795 > #line 1840 "conf_parser.y" /* yacc.c:1646  */
4796      {
4797    if (conf_parser_ctx.pass == 2)
4798 <  {
5293 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_IDENTD;
5294 <    else yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
5295 <  }
4798 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4799   }
4800 + #line 4801 "conf_parser.c" /* yacc.c:1646  */
4801      break;
4802  
4803 <  case 281:
4804 <
5301 < /* Line 1464 of yacc.c  */
5302 < #line 1816 "ircd_parser.y"
4803 >  case 323:
4804 > #line 1844 "conf_parser.y" /* yacc.c:1646  */
4805      {
4806    if (conf_parser_ctx.pass == 2)
4807 <  {
5306 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_CAN_FLOOD;
5307 <    else yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
5308 <  }
4807 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4808   }
4809 + #line 4810 "conf_parser.c" /* yacc.c:1646  */
4810      break;
4811  
4812 <  case 282:
4813 <
5314 < /* Line 1464 of yacc.c  */
5315 < #line 1823 "ircd_parser.y"
4812 >  case 324:
4813 > #line 1848 "conf_parser.y" /* yacc.c:1646  */
4814      {
4815    if (conf_parser_ctx.pass == 2)
4816 <  {
5319 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_IDLE_LINED;
5320 <    else yy_aconf->flags |= CONF_FLAGS_IDLE_LINED;
5321 <  }
4816 >    block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
4817   }
4818 + #line 4819 "conf_parser.c" /* yacc.c:1646  */
4819      break;
4820  
4821 <  case 283:
4822 <
5327 < /* Line 1464 of yacc.c  */
5328 < #line 1830 "ircd_parser.y"
4821 >  case 325:
4822 > #line 1852 "conf_parser.y" /* yacc.c:1646  */
4823      {
4824    if (conf_parser_ctx.pass == 2)
4825 <  {
5332 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NO_TILDE;
5333 <    else yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
5334 <  }
4825 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4826   }
4827 + #line 4828 "conf_parser.c" /* yacc.c:1646  */
4828      break;
4829  
4830 <  case 284:
4831 <
5340 < /* Line 1464 of yacc.c  */
5341 < #line 1837 "ircd_parser.y"
4830 >  case 326:
4831 > #line 1856 "conf_parser.y" /* yacc.c:1646  */
4832      {
4833    if (conf_parser_ctx.pass == 2)
4834 <  {
5345 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTGLINE;
5346 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
5347 <  }
4834 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4835   }
4836 + #line 4837 "conf_parser.c" /* yacc.c:1646  */
4837      break;
4838  
4839 <  case 285:
4840 <
5353 < /* Line 1464 of yacc.c  */
5354 < #line 1844 "ircd_parser.y"
4839 >  case 327:
4840 > #line 1860 "conf_parser.y" /* yacc.c:1646  */
4841      {
4842    if (conf_parser_ctx.pass == 2)
4843 <  {
5358 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_EXEMPTRESV;
5359 <    else yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
5360 <  }
4843 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4844   }
4845 + #line 4846 "conf_parser.c" /* yacc.c:1646  */
4846      break;
4847  
4848 <  case 286:
4849 <
5366 < /* Line 1464 of yacc.c  */
5367 < #line 1851 "ircd_parser.y"
4848 >  case 328:
4849 > #line 1866 "conf_parser.y" /* yacc.c:1646  */
4850      {
4851 <  if (conf_parser_ctx.pass == 2)
4851 >  if (conf_parser_ctx.pass != 2)
4852 >    break;
4853 >
4854 >  if (valid_hostname(yylval.string))
4855    {
4856 <    if (not_atom) yy_aconf->flags &= ~CONF_FLAGS_NEED_PASSWORD;
4857 <    else yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
4856 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4857 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4858    }
4859 +  else
4860 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4861   }
4862 + #line 4863 "conf_parser.c" /* yacc.c:1646  */
4863      break;
4864  
4865 <  case 287:
4866 <
5379 < /* Line 1464 of yacc.c  */
5380 < #line 1861 "ircd_parser.y"
4865 >  case 329:
4866 > #line 1880 "conf_parser.y" /* yacc.c:1646  */
4867      {
4868 <  if (conf_parser_ctx.pass == 2)
4869 <  {
5384 <    MyFree(yy_conf->name);
4868 >  if (conf_parser_ctx.pass != 2)
4869 >    break;
4870  
4871 <    if (strlen(yylval.string) < HOSTLEN)
4872 <    {    
5388 <      DupString(yy_conf->name, yylval.string);
5389 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
5390 <    }
5391 <    else
5392 <    {
5393 <      ilog(L_ERROR, "Spoofs must be less than %d..ignoring it", HOSTLEN);
5394 <      yy_conf->name = NULL;
5395 <    }
5396 <  }
4871 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4872 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4873   }
4874 + #line 4875 "conf_parser.c" /* yacc.c:1646  */
4875      break;
4876  
4877 <  case 288:
4878 <
5402 < /* Line 1464 of yacc.c  */
5403 < #line 1880 "ircd_parser.y"
4877 >  case 330:
4878 > #line 1889 "conf_parser.y" /* yacc.c:1646  */
4879      {
4880 <  if (conf_parser_ctx.pass == 2)
5406 <  {
5407 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5408 <    MyFree(yy_conf->name);
5409 <    DupString(yy_conf->name, yylval.string);
5410 <  }
5411 < }
4880 >  if (conf_parser_ctx.pass != 2)
4881      break;
4882  
4883 <  case 289:
4883 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4884 >  block_state.port.value = (yyvsp[-1].number);
4885 > }
4886 > #line 4887 "conf_parser.c" /* yacc.c:1646  */
4887 >    break;
4888  
4889 < /* Line 1464 of yacc.c  */
4890 < #line 1890 "ircd_parser.y"
4889 >  case 331:
4890 > #line 1902 "conf_parser.y" /* yacc.c:1646  */
4891      {
4892 <  if (conf_parser_ctx.pass == 2)
5420 <  {
5421 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
5422 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5423 <  }
5424 < }
4892 >  if (conf_parser_ctx.pass != 2)
4893      break;
4894  
4895 <  case 290:
4895 >  reset_block_state();
4896 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4897 > }
4898 > #line 4899 "conf_parser.c" /* yacc.c:1646  */
4899 >    break;
4900  
4901 < /* Line 1464 of yacc.c  */
4902 < #line 1903 "ircd_parser.y"
4901 >  case 332:
4902 > #line 1909 "conf_parser.y" /* yacc.c:1646  */
4903      {
4904 <  if (conf_parser_ctx.pass == 2)
5433 <  {
5434 <    MyFree(resv_reason);
5435 <    resv_reason = NULL;
5436 <  }
5437 < }
4904 >  if (conf_parser_ctx.pass != 2)
4905      break;
4906  
4907 <  case 291:
4907 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4908 > }
4909 > #line 4910 "conf_parser.c" /* yacc.c:1646  */
4910 >    break;
4911  
4912 < /* Line 1464 of yacc.c  */
4913 < #line 1910 "ircd_parser.y"
4912 >  case 339:
4913 > #line 1920 "conf_parser.y" /* yacc.c:1646  */
4914      {
4915    if (conf_parser_ctx.pass == 2)
4916 <  {
5447 <    MyFree(resv_reason);
5448 <    resv_reason = NULL;
5449 <  }
4916 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4917   }
4918 + #line 4919 "conf_parser.c" /* yacc.c:1646  */
4919      break;
4920  
4921 <  case 298:
4922 <
5455 < /* Line 1464 of yacc.c  */
5456 < #line 1922 "ircd_parser.y"
4921 >  case 340:
4922 > #line 1926 "conf_parser.y" /* yacc.c:1646  */
4923      {
4924    if (conf_parser_ctx.pass == 2)
4925 <  {
5460 <    MyFree(resv_reason);
5461 <    DupString(resv_reason, yylval.string);
5462 <  }
4925 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4926   }
4927 + #line 4928 "conf_parser.c" /* yacc.c:1646  */
4928      break;
4929  
4930 <  case 299:
4931 <
5468 < /* Line 1464 of yacc.c  */
5469 < #line 1931 "ircd_parser.y"
4930 >  case 341:
4931 > #line 1932 "conf_parser.y" /* yacc.c:1646  */
4932      {
4933    if (conf_parser_ctx.pass == 2)
4934 <  {
5473 <    if (IsChanPrefix(*yylval.string))
5474 <    {
5475 <      char def_reason[] = "No reason";
5476 <
5477 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5478 <    }
5479 <  }
5480 <  /* ignore it for now.. but we really should make a warning if
5481 <   * its an erroneous name --fl_ */
4934 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4935   }
4936 + #line 4937 "conf_parser.c" /* yacc.c:1646  */
4937      break;
4938  
4939 <  case 300:
4940 <
5487 < /* Line 1464 of yacc.c  */
5488 < #line 1946 "ircd_parser.y"
4939 >  case 347:
4940 > #line 1947 "conf_parser.y" /* yacc.c:1646  */
4941      {
4942 <  if (conf_parser_ctx.pass == 2)
4943 <  {
5492 <    char def_reason[] = "No reason";
4942 >  if (conf_parser_ctx.pass != 2)
4943 >    break;
4944  
4945 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
4945 >  if (valid_servname(yylval.string))
4946 >  {
4947 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4948 >    conf->name = xstrdup(yylval.string);
4949    }
4950   }
4951 + #line 4952 "conf_parser.c" /* yacc.c:1646  */
4952      break;
4953  
4954 <  case 301:
4955 <
5501 < /* Line 1464 of yacc.c  */
5502 < #line 1959 "ircd_parser.y"
4954 >  case 348:
4955 > #line 1962 "conf_parser.y" /* yacc.c:1646  */
4956      {
4957 <  if (conf_parser_ctx.pass == 2)
5505 <  {
5506 <    yy_conf = make_conf_item(ULINE_TYPE);
5507 <    yy_match_item = map_to_conf(yy_conf);
5508 <    yy_match_item->action = SHARED_ALL;
5509 <  }
5510 < }
4957 >  if (conf_parser_ctx.pass != 2)
4958      break;
4959  
4960 <  case 302:
4960 >  reset_block_state();
4961  
4962 < /* Line 1464 of yacc.c  */
4963 < #line 1967 "ircd_parser.y"
4964 <    {
4965 <  if (conf_parser_ctx.pass == 2)
5519 <  {
5520 <    yy_conf = NULL;
5521 <  }
4962 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4963 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4964 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4965 >  block_state.flags.value = SHARED_ALL;
4966   }
4967 + #line 4968 "conf_parser.c" /* yacc.c:1646  */
4968 +    break;
4969 +
4970 +  case 349:
4971 + #line 1973 "conf_parser.y" /* yacc.c:1646  */
4972 +    {
4973 +  struct MaskItem *conf = NULL;
4974 +
4975 +  if (conf_parser_ctx.pass != 2)
4976      break;
4977  
4978 <  case 309:
4978 >  conf = conf_make(CONF_ULINE);
4979 >  conf->flags = block_state.flags.value;
4980 >  conf->name = xstrdup(block_state.name.buf);
4981 >  conf->user = xstrdup(block_state.user.buf);
4982 >  conf->host = xstrdup(block_state.host.buf);
4983 > }
4984 > #line 4985 "conf_parser.c" /* yacc.c:1646  */
4985 >    break;
4986  
4987 < /* Line 1464 of yacc.c  */
4988 < #line 1978 "ircd_parser.y"
4987 >  case 356:
4988 > #line 1990 "conf_parser.y" /* yacc.c:1646  */
4989      {
4990    if (conf_parser_ctx.pass == 2)
4991 <  {
5532 <    MyFree(yy_conf->name);
5533 <    DupString(yy_conf->name, yylval.string);
5534 <  }
4991 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4992   }
4993 + #line 4994 "conf_parser.c" /* yacc.c:1646  */
4994      break;
4995  
4996 <  case 310:
4997 <
5540 < /* Line 1464 of yacc.c  */
5541 < #line 1987 "ircd_parser.y"
4996 >  case 357:
4997 > #line 1996 "conf_parser.y" /* yacc.c:1646  */
4998      {
4999    if (conf_parser_ctx.pass == 2)
5000    {
# Line 5546 | Line 5002 | yyreduce:
5002  
5003      nuh.nuhmask  = yylval.string;
5004      nuh.nickptr  = NULL;
5005 <    nuh.userptr  = userbuf;
5006 <    nuh.hostptr  = hostbuf;
5005 >    nuh.userptr  = block_state.user.buf;
5006 >    nuh.hostptr  = block_state.host.buf;
5007  
5008      nuh.nicksize = 0;
5009 <    nuh.usersize = sizeof(userbuf);
5010 <    nuh.hostsize = sizeof(hostbuf);
5009 >    nuh.usersize = sizeof(block_state.user.buf);
5010 >    nuh.hostsize = sizeof(block_state.host.buf);
5011  
5012      split_nuh(&nuh);
5557
5558    DupString(yy_match_item->user, userbuf);
5559    DupString(yy_match_item->host, hostbuf);
5013    }
5014   }
5015 + #line 5016 "conf_parser.c" /* yacc.c:1646  */
5016      break;
5017  
5018 <  case 311:
5019 <
5566 < /* Line 1464 of yacc.c  */
5567 < #line 2009 "ircd_parser.y"
5018 >  case 358:
5019 > #line 2015 "conf_parser.y" /* yacc.c:1646  */
5020      {
5021    if (conf_parser_ctx.pass == 2)
5022 <    yy_match_item->action = 0;
5022 >    block_state.flags.value = 0;
5023   }
5024 + #line 5025 "conf_parser.c" /* yacc.c:1646  */
5025      break;
5026  
5027 <  case 315:
5028 <
5576 < /* Line 1464 of yacc.c  */
5577 < #line 2016 "ircd_parser.y"
5027 >  case 362:
5028 > #line 2022 "conf_parser.y" /* yacc.c:1646  */
5029      {
5030    if (conf_parser_ctx.pass == 2)
5031 <    yy_match_item->action |= SHARED_KLINE;
5031 >    block_state.flags.value |= SHARED_KLINE;
5032   }
5033 + #line 5034 "conf_parser.c" /* yacc.c:1646  */
5034      break;
5035  
5036 <  case 316:
5037 <
5586 < /* Line 1464 of yacc.c  */
5587 < #line 2020 "ircd_parser.y"
5036 >  case 363:
5037 > #line 2026 "conf_parser.y" /* yacc.c:1646  */
5038      {
5039    if (conf_parser_ctx.pass == 2)
5040 <    yy_match_item->action |= SHARED_TKLINE;
5040 >    block_state.flags.value |= SHARED_UNKLINE;
5041   }
5042 + #line 5043 "conf_parser.c" /* yacc.c:1646  */
5043      break;
5044  
5045 <  case 317:
5046 <
5596 < /* Line 1464 of yacc.c  */
5597 < #line 2024 "ircd_parser.y"
5045 >  case 364:
5046 > #line 2030 "conf_parser.y" /* yacc.c:1646  */
5047      {
5048    if (conf_parser_ctx.pass == 2)
5049 <    yy_match_item->action |= SHARED_UNKLINE;
5049 >    block_state.flags.value |= SHARED_DLINE;
5050   }
5051 + #line 5052 "conf_parser.c" /* yacc.c:1646  */
5052      break;
5053  
5054 <  case 318:
5055 <
5606 < /* Line 1464 of yacc.c  */
5607 < #line 2028 "ircd_parser.y"
5054 >  case 365:
5055 > #line 2034 "conf_parser.y" /* yacc.c:1646  */
5056      {
5057    if (conf_parser_ctx.pass == 2)
5058 <    yy_match_item->action |= SHARED_XLINE;
5058 >    block_state.flags.value |= SHARED_UNDLINE;
5059   }
5060 + #line 5061 "conf_parser.c" /* yacc.c:1646  */
5061      break;
5062  
5063 <  case 319:
5064 <
5616 < /* Line 1464 of yacc.c  */
5617 < #line 2032 "ircd_parser.y"
5063 >  case 366:
5064 > #line 2038 "conf_parser.y" /* yacc.c:1646  */
5065      {
5066    if (conf_parser_ctx.pass == 2)
5067 <    yy_match_item->action |= SHARED_TXLINE;
5067 >    block_state.flags.value |= SHARED_XLINE;
5068   }
5069 + #line 5070 "conf_parser.c" /* yacc.c:1646  */
5070      break;
5071  
5072 <  case 320:
5073 <
5626 < /* Line 1464 of yacc.c  */
5627 < #line 2036 "ircd_parser.y"
5072 >  case 367:
5073 > #line 2042 "conf_parser.y" /* yacc.c:1646  */
5074      {
5075    if (conf_parser_ctx.pass == 2)
5076 <    yy_match_item->action |= SHARED_UNXLINE;
5076 >    block_state.flags.value |= SHARED_UNXLINE;
5077   }
5078 + #line 5079 "conf_parser.c" /* yacc.c:1646  */
5079      break;
5080  
5081 <  case 321:
5082 <
5636 < /* Line 1464 of yacc.c  */
5637 < #line 2040 "ircd_parser.y"
5081 >  case 368:
5082 > #line 2046 "conf_parser.y" /* yacc.c:1646  */
5083      {
5084    if (conf_parser_ctx.pass == 2)
5085 <    yy_match_item->action |= SHARED_RESV;
5085 >    block_state.flags.value |= SHARED_RESV;
5086   }
5087 + #line 5088 "conf_parser.c" /* yacc.c:1646  */
5088      break;
5089  
5090 <  case 322:
5091 <
5646 < /* Line 1464 of yacc.c  */
5647 < #line 2044 "ircd_parser.y"
5090 >  case 369:
5091 > #line 2050 "conf_parser.y" /* yacc.c:1646  */
5092      {
5093    if (conf_parser_ctx.pass == 2)
5094 <    yy_match_item->action |= SHARED_TRESV;
5094 >    block_state.flags.value |= SHARED_UNRESV;
5095   }
5096 + #line 5097 "conf_parser.c" /* yacc.c:1646  */
5097      break;
5098  
5099 <  case 323:
5100 <
5656 < /* Line 1464 of yacc.c  */
5657 < #line 2048 "ircd_parser.y"
5099 >  case 370:
5100 > #line 2054 "conf_parser.y" /* yacc.c:1646  */
5101      {
5102    if (conf_parser_ctx.pass == 2)
5103 <    yy_match_item->action |= SHARED_UNRESV;
5103 >    block_state.flags.value |= SHARED_LOCOPS;
5104   }
5105 + #line 5106 "conf_parser.c" /* yacc.c:1646  */
5106      break;
5107  
5108 <  case 324:
5109 <
5666 < /* Line 1464 of yacc.c  */
5667 < #line 2052 "ircd_parser.y"
5108 >  case 371:
5109 > #line 2058 "conf_parser.y" /* yacc.c:1646  */
5110      {
5111    if (conf_parser_ctx.pass == 2)
5112 <    yy_match_item->action |= SHARED_LOCOPS;
5112 >    block_state.flags.value = SHARED_ALL;
5113   }
5114 + #line 5115 "conf_parser.c" /* yacc.c:1646  */
5115      break;
5116  
5117 <  case 325:
5118 <
5676 < /* Line 1464 of yacc.c  */
5677 < #line 2056 "ircd_parser.y"
5117 >  case 372:
5118 > #line 2067 "conf_parser.y" /* yacc.c:1646  */
5119      {
5120 <  if (conf_parser_ctx.pass == 2)
5680 <    yy_match_item->action = SHARED_ALL;
5681 < }
5120 >  if (conf_parser_ctx.pass != 2)
5121      break;
5122  
5123 <  case 326:
5123 >  reset_block_state();
5124  
5125 < /* Line 1464 of yacc.c  */
5126 < #line 2065 "ircd_parser.y"
5688 <    {
5689 <  if (conf_parser_ctx.pass == 2)
5690 <  {
5691 <    yy_conf = make_conf_item(CLUSTER_TYPE);
5692 <    yy_conf->flags = SHARED_ALL;
5693 <  }
5125 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5126 >  block_state.flags.value = SHARED_ALL;
5127   }
5128 + #line 5129 "conf_parser.c" /* yacc.c:1646  */
5129      break;
5130  
5131 <  case 327:
5132 <
5699 < /* Line 1464 of yacc.c  */
5700 < #line 2072 "ircd_parser.y"
5131 >  case 373:
5132 > #line 2076 "conf_parser.y" /* yacc.c:1646  */
5133      {
5134 <  if (conf_parser_ctx.pass == 2)
5703 <  {
5704 <    if (yy_conf->name == NULL)
5705 <      DupString(yy_conf->name, "*");
5706 <    yy_conf = NULL;
5707 <  }
5708 < }
5709 <    break;
5710 <
5711 <  case 333:
5134 >  struct MaskItem *conf = NULL;
5135  
5136 < /* Line 1464 of yacc.c  */
5714 < #line 2085 "ircd_parser.y"
5715 <    {
5716 <  if (conf_parser_ctx.pass == 2)
5717 <    DupString(yy_conf->name, yylval.string);
5718 < }
5136 >  if (conf_parser_ctx.pass != 2)
5137      break;
5138  
5139 <  case 334:
5140 <
5141 < /* Line 1464 of yacc.c  */
5724 < #line 2091 "ircd_parser.y"
5725 <    {
5726 <  if (conf_parser_ctx.pass == 2)
5727 <    yy_conf->flags = 0;
5139 >  conf = conf_make(CONF_CLUSTER);
5140 >  conf->flags = block_state.flags.value;
5141 >  conf->name = xstrdup(block_state.name.buf);
5142   }
5143 + #line 5144 "conf_parser.c" /* yacc.c:1646  */
5144      break;
5145  
5146 <  case 338:
5147 <
5733 < /* Line 1464 of yacc.c  */
5734 < #line 2098 "ircd_parser.y"
5146 >  case 379:
5147 > #line 2091 "conf_parser.y" /* yacc.c:1646  */
5148      {
5149    if (conf_parser_ctx.pass == 2)
5150 <    yy_conf->flags |= SHARED_KLINE;
5150 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5151   }
5152 + #line 5153 "conf_parser.c" /* yacc.c:1646  */
5153      break;
5154  
5155 <  case 339:
5156 <
5743 < /* Line 1464 of yacc.c  */
5744 < #line 2102 "ircd_parser.y"
5155 >  case 380:
5156 > #line 2097 "conf_parser.y" /* yacc.c:1646  */
5157      {
5158    if (conf_parser_ctx.pass == 2)
5159 <    yy_conf->flags |= SHARED_TKLINE;
5159 >    block_state.flags.value = 0;
5160   }
5161 + #line 5162 "conf_parser.c" /* yacc.c:1646  */
5162      break;
5163  
5164 <  case 340:
5165 <
5753 < /* Line 1464 of yacc.c  */
5754 < #line 2106 "ircd_parser.y"
5164 >  case 384:
5165 > #line 2104 "conf_parser.y" /* yacc.c:1646  */
5166      {
5167    if (conf_parser_ctx.pass == 2)
5168 <    yy_conf->flags |= SHARED_UNKLINE;
5168 >    block_state.flags.value |= SHARED_KLINE;
5169   }
5170 + #line 5171 "conf_parser.c" /* yacc.c:1646  */
5171      break;
5172  
5173 <  case 341:
5174 <
5763 < /* Line 1464 of yacc.c  */
5764 < #line 2110 "ircd_parser.y"
5173 >  case 385:
5174 > #line 2108 "conf_parser.y" /* yacc.c:1646  */
5175      {
5176    if (conf_parser_ctx.pass == 2)
5177 <    yy_conf->flags |= SHARED_XLINE;
5177 >    block_state.flags.value |= SHARED_UNKLINE;
5178   }
5179 + #line 5180 "conf_parser.c" /* yacc.c:1646  */
5180      break;
5181  
5182 <  case 342:
5183 <
5773 < /* Line 1464 of yacc.c  */
5774 < #line 2114 "ircd_parser.y"
5182 >  case 386:
5183 > #line 2112 "conf_parser.y" /* yacc.c:1646  */
5184      {
5185    if (conf_parser_ctx.pass == 2)
5186 <    yy_conf->flags |= SHARED_TXLINE;
5186 >    block_state.flags.value |= SHARED_DLINE;
5187   }
5188 + #line 5189 "conf_parser.c" /* yacc.c:1646  */
5189      break;
5190  
5191 <  case 343:
5192 <
5783 < /* Line 1464 of yacc.c  */
5784 < #line 2118 "ircd_parser.y"
5191 >  case 387:
5192 > #line 2116 "conf_parser.y" /* yacc.c:1646  */
5193      {
5194    if (conf_parser_ctx.pass == 2)
5195 <    yy_conf->flags |= SHARED_UNXLINE;
5195 >    block_state.flags.value |= SHARED_UNDLINE;
5196   }
5197 + #line 5198 "conf_parser.c" /* yacc.c:1646  */
5198      break;
5199  
5200 <  case 344:
5201 <
5793 < /* Line 1464 of yacc.c  */
5794 < #line 2122 "ircd_parser.y"
5200 >  case 388:
5201 > #line 2120 "conf_parser.y" /* yacc.c:1646  */
5202      {
5203    if (conf_parser_ctx.pass == 2)
5204 <    yy_conf->flags |= SHARED_RESV;
5204 >    block_state.flags.value |= SHARED_XLINE;
5205   }
5206 + #line 5207 "conf_parser.c" /* yacc.c:1646  */
5207      break;
5208  
5209 <  case 345:
5210 <
5803 < /* Line 1464 of yacc.c  */
5804 < #line 2126 "ircd_parser.y"
5209 >  case 389:
5210 > #line 2124 "conf_parser.y" /* yacc.c:1646  */
5211      {
5212    if (conf_parser_ctx.pass == 2)
5213 <    yy_conf->flags |= SHARED_TRESV;
5213 >    block_state.flags.value |= SHARED_UNXLINE;
5214   }
5215 + #line 5216 "conf_parser.c" /* yacc.c:1646  */
5216      break;
5217  
5218 <  case 346:
5219 <
5813 < /* Line 1464 of yacc.c  */
5814 < #line 2130 "ircd_parser.y"
5218 >  case 390:
5219 > #line 2128 "conf_parser.y" /* yacc.c:1646  */
5220      {
5221    if (conf_parser_ctx.pass == 2)
5222 <    yy_conf->flags |= SHARED_UNRESV;
5222 >    block_state.flags.value |= SHARED_RESV;
5223   }
5224 + #line 5225 "conf_parser.c" /* yacc.c:1646  */
5225      break;
5226  
5227 <  case 347:
5228 <
5823 < /* Line 1464 of yacc.c  */
5824 < #line 2134 "ircd_parser.y"
5227 >  case 391:
5228 > #line 2132 "conf_parser.y" /* yacc.c:1646  */
5229      {
5230    if (conf_parser_ctx.pass == 2)
5231 <    yy_conf->flags |= SHARED_LOCOPS;
5231 >    block_state.flags.value |= SHARED_UNRESV;
5232   }
5233 + #line 5234 "conf_parser.c" /* yacc.c:1646  */
5234      break;
5235  
5236 <  case 348:
5237 <
5833 < /* Line 1464 of yacc.c  */
5834 < #line 2138 "ircd_parser.y"
5236 >  case 392:
5237 > #line 2136 "conf_parser.y" /* yacc.c:1646  */
5238      {
5239    if (conf_parser_ctx.pass == 2)
5240 <    yy_conf->flags = SHARED_ALL;
5240 >    block_state.flags.value |= SHARED_LOCOPS;
5241   }
5242 + #line 5243 "conf_parser.c" /* yacc.c:1646  */
5243      break;
5244  
5245 <  case 349:
5246 <
5843 < /* Line 1464 of yacc.c  */
5844 < #line 2147 "ircd_parser.y"
5245 >  case 393:
5246 > #line 2140 "conf_parser.y" /* yacc.c:1646  */
5247      {
5248    if (conf_parser_ctx.pass == 2)
5249 <  {
5848 <    yy_conf = make_conf_item(SERVER_TYPE);
5849 <    yy_aconf = (struct AccessItem *)map_to_conf(yy_conf);
5850 <    yy_aconf->passwd = NULL;
5851 <    /* defaults */
5852 <    yy_aconf->port = PORTNUM;
5853 <
5854 <    if (ConfigFileEntry.burst_away)
5855 <      yy_aconf->flags = CONF_FLAGS_BURST_AWAY;
5856 <  }
5857 <  else
5858 <  {
5859 <    MyFree(class_name);
5860 <    class_name = NULL;
5861 <  }
5249 >    block_state.flags.value = SHARED_ALL;
5250   }
5251 + #line 5252 "conf_parser.c" /* yacc.c:1646  */
5252      break;
5253  
5254 <  case 350:
5255 <
5867 < /* Line 1464 of yacc.c  */
5868 < #line 2165 "ircd_parser.y"
5254 >  case 394:
5255 > #line 2149 "conf_parser.y" /* yacc.c:1646  */
5256      {
5870  if (conf_parser_ctx.pass == 2)
5871  {
5872    struct CollectItem *yy_hconf=NULL;
5873    struct CollectItem *yy_lconf=NULL;
5874    dlink_node *ptr;
5875    dlink_node *next_ptr;
5876 #ifdef HAVE_LIBCRYPTO
5877    if (yy_aconf->host &&
5878        ((yy_aconf->passwd && yy_aconf->spasswd) ||
5879         (yy_aconf->rsa_public_key && IsConfCryptLink(yy_aconf))))
5880 #else /* !HAVE_LIBCRYPTO */
5881      if (yy_aconf->host && !IsConfCryptLink(yy_aconf) &&
5882          yy_aconf->passwd && yy_aconf->spasswd)
5883 #endif /* !HAVE_LIBCRYPTO */
5884        {
5885          if (conf_add_server(yy_conf, class_name) == -1)
5886          {
5887            delete_conf_item(yy_conf);
5888            yy_conf = NULL;
5889            yy_aconf = NULL;
5890          }
5891        }
5892        else
5893        {
5894          /* Even if yy_conf ->name is NULL
5895           * should still unhook any hub/leaf confs still pending
5896           */
5897          unhook_hub_leaf_confs();
5257  
5258 <          if (yy_conf->name != NULL)
5259 <          {
5901 < #ifndef HAVE_LIBCRYPTO
5902 <            if (IsConfCryptLink(yy_aconf))
5903 <              yyerror("Ignoring connect block -- no OpenSSL support");
5904 < #else
5905 <            if (IsConfCryptLink(yy_aconf) && !yy_aconf->rsa_public_key)
5906 <              yyerror("Ignoring connect block -- missing key");
5907 < #endif
5908 <            if (yy_aconf->host == NULL)
5909 <              yyerror("Ignoring connect block -- missing host");
5910 <            else if (!IsConfCryptLink(yy_aconf) &&
5911 <                    (!yy_aconf->passwd || !yy_aconf->spasswd))
5912 <              yyerror("Ignoring connect block -- missing password");
5913 <          }
5914 <
5915 <
5916 <          /* XXX
5917 <           * This fixes a try_connections() core (caused by invalid class_ptr
5918 <           * pointers) reported by metalrock. That's an ugly fix, but there
5919 <           * is currently no better way. The entire config subsystem needs an
5920 <           * rewrite ASAP. make_conf_item() shouldn't really add things onto
5921 <           * a doubly linked list immediately without any sanity checks!  -Michael
5922 <           */
5923 <          delete_conf_item(yy_conf);
5924 <
5925 <          yy_aconf = NULL;
5926 <          yy_conf = NULL;
5927 <        }
5928 <
5929 <      /*
5930 <       * yy_conf is still pointing at the server that is having
5931 <       * a connect block built for it. This means, y_aconf->name
5932 <       * points to the actual irc name this server will be known as.
5933 <       * Now this new server has a set or even just one hub_mask (or leaf_mask)
5934 <       * given in the link list at yy_hconf. Fill in the HUB confs
5935 <       * from this link list now.
5936 <       */        
5937 <      DLINK_FOREACH_SAFE(ptr, next_ptr, hub_conf_list.head)
5938 <      {
5939 <        struct ConfItem *new_hub_conf;
5940 <        struct MatchItem *match_item;
5941 <
5942 <        yy_hconf = ptr->data;
5943 <
5944 <        /* yy_conf == NULL is a fatal error for this connect block! */
5945 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5946 <        {
5947 <          new_hub_conf = make_conf_item(HUB_TYPE);
5948 <          match_item = (struct MatchItem *)map_to_conf(new_hub_conf);
5949 <          DupString(new_hub_conf->name, yy_conf->name);
5950 <          if (yy_hconf->user != NULL)
5951 <            DupString(match_item->user, yy_hconf->user);
5952 <          else
5953 <            DupString(match_item->user, "*");
5954 <          if (yy_hconf->host != NULL)
5955 <            DupString(match_item->host, yy_hconf->host);
5956 <          else
5957 <            DupString(match_item->host, "*");
5958 <        }
5959 <        dlinkDelete(&yy_hconf->node, &hub_conf_list);
5960 <        free_collect_item(yy_hconf);
5961 <      }
5962 <
5963 <      /* Ditto for the LEAF confs */
5964 <
5965 <      DLINK_FOREACH_SAFE(ptr, next_ptr, leaf_conf_list.head)
5966 <      {
5967 <        struct ConfItem *new_leaf_conf;
5968 <        struct MatchItem *match_item;
5969 <
5970 <        yy_lconf = ptr->data;
5258 >  if (conf_parser_ctx.pass != 2)
5259 >    break;
5260  
5261 <        if ((yy_conf != NULL) && (yy_conf->name != NULL))
5262 <        {
5263 <          new_leaf_conf = make_conf_item(LEAF_TYPE);
5975 <          match_item = (struct MatchItem *)map_to_conf(new_leaf_conf);
5976 <          DupString(new_leaf_conf->name, yy_conf->name);
5977 <          if (yy_lconf->user != NULL)
5978 <            DupString(match_item->user, yy_lconf->user);
5979 <          else
5980 <            DupString(match_item->user, "*");
5981 <          if (yy_lconf->host != NULL)
5982 <            DupString(match_item->host, yy_lconf->host);
5983 <          else
5984 <            DupString(match_item->host, "*");
5985 <        }
5986 <        dlinkDelete(&yy_lconf->node, &leaf_conf_list);
5987 <        free_collect_item(yy_lconf);
5988 <      }
5989 <      MyFree(class_name);
5990 <      class_name = NULL;
5991 <      yy_conf = NULL;
5992 <      yy_aconf = NULL;
5993 <  }
5261 >  reset_block_state();
5262 >  block_state.aftype.value = AF_INET;
5263 >  block_state.port.value = PORTNUM;
5264   }
5265 + #line 5266 "conf_parser.c" /* yacc.c:1646  */
5266      break;
5267  
5268 <  case 370:
5269 <
5999 < /* Line 1464 of yacc.c  */
6000 < #line 2303 "ircd_parser.y"
5268 >  case 395:
5269 > #line 2158 "conf_parser.y" /* yacc.c:1646  */
5270      {
5271 <  if (conf_parser_ctx.pass == 2)
5272 <  {
6004 <    if (yy_conf->name != NULL)
6005 <      yyerror("Multiple connect name entry");
5271 >  struct MaskItem *conf = NULL;
5272 >  struct addrinfo hints, *res;
5273  
5274 <    MyFree(yy_conf->name);
6008 <    DupString(yy_conf->name, yylval.string);
6009 <  }
6010 < }
5274 >  if (conf_parser_ctx.pass != 2)
5275      break;
5276  
5277 <  case 371:
5277 >  if (!block_state.name.buf[0] ||
5278 >      !block_state.host.buf[0])
5279 >    break;
5280  
5281 < /* Line 1464 of yacc.c  */
5282 < #line 2315 "ircd_parser.y"
5283 <    {
6018 <  if (conf_parser_ctx.pass == 2)
6019 <  {
6020 <    if (yy_conf->name != NULL)
6021 <      yyerror("Multiple connect name entry");
5281 >  if (!block_state.rpass.buf[0] ||
5282 >      !block_state.spass.buf[0])
5283 >    break;
5284  
5285 <    MyFree(yy_conf->name);
5286 <    DupString(yy_conf->name, yylval.string);
6025 <  }
6026 < }
5285 >  if (has_wildcards(block_state.name.buf) ||
5286 >      has_wildcards(block_state.host.buf))
5287      break;
5288  
5289 <  case 372:
5289 >  conf = conf_make(CONF_SERVER);
5290 >  conf->port = block_state.port.value;
5291 >  conf->flags = block_state.flags.value;
5292 >  conf->aftype = block_state.aftype.value;
5293 >  conf->host = xstrdup(block_state.host.buf);
5294 >  conf->name = xstrdup(block_state.name.buf);
5295 >  conf->passwd = xstrdup(block_state.rpass.buf);
5296 >  conf->spasswd = xstrdup(block_state.spass.buf);
5297  
5298 < /* Line 1464 of yacc.c  */
5299 < #line 2327 "ircd_parser.y"
6033 <    {
6034 <  if (conf_parser_ctx.pass == 2)
6035 <  {
6036 <    MyFree(yy_aconf->host);
6037 <    DupString(yy_aconf->host, yylval.string);
6038 <  }
6039 < }
6040 <    break;
5298 >  if (block_state.cert.buf[0])
5299 >    conf->certfp = xstrdup(block_state.cert.buf);
5300  
5301 <  case 373:
5301 >  if (block_state.ciph.buf[0])
5302 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5303  
5304 < /* Line 1464 of yacc.c  */
5305 < #line 2336 "ircd_parser.y"
6046 <    {
6047 <  if (conf_parser_ctx.pass == 2)
6048 <  {
6049 <    struct addrinfo hints, *res;
5304 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5305 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5306  
5307 +  if (block_state.bind.buf[0])
5308 +  {
5309      memset(&hints, 0, sizeof(hints));
5310  
5311      hints.ai_family   = AF_UNSPEC;
5312      hints.ai_socktype = SOCK_STREAM;
5313      hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5314  
5315 <    if (irc_getaddrinfo(yylval.string, NULL, &hints, &res))
5316 <      ilog(L_ERROR, "Invalid netmask for server vhost(%s)", yylval.string);
5315 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5316 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5317      else
5318      {
5319 <      assert(res != NULL);
5319 >      assert(res);
5320  
5321 <      memcpy(&yy_aconf->my_ipnum, res->ai_addr, res->ai_addrlen);
5322 <      yy_aconf->my_ipnum.ss.ss_family = res->ai_family;
5323 <      yy_aconf->my_ipnum.ss_len = res->ai_addrlen;
5324 <      irc_freeaddrinfo(res);
5321 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5322 >      conf->bind.ss.ss_family = res->ai_family;
5323 >      conf->bind.ss_len = res->ai_addrlen;
5324 >      freeaddrinfo(res);
5325      }
5326    }
6069 }
6070    break;
6071
6072  case 374:
5327  
5328 < /* Line 1464 of yacc.c  */
5329 < #line 2362 "ircd_parser.y"
6076 <    {
6077 <  if (conf_parser_ctx.pass == 2)
6078 <  {
6079 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6080 <      yyerror("Server passwords cannot begin with a colon");
6081 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6082 <      yyerror("Server passwords cannot contain spaces");
6083 <    else {
6084 <      if (yy_aconf->spasswd != NULL)
6085 <        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
6086 <
6087 <      MyFree(yy_aconf->spasswd);
6088 <      DupString(yy_aconf->spasswd, yylval.string);
6089 <    }
6090 <  }
5328 >  conf_add_class_to_conf(conf, block_state.class.buf);
5329 >  lookup_confhost(conf);
5330   }
5331 + #line 5332 "conf_parser.c" /* yacc.c:1646  */
5332      break;
5333  
5334 <  case 375:
5335 <
6096 < /* Line 1464 of yacc.c  */
6097 < #line 2380 "ircd_parser.y"
5334 >  case 413:
5335 > #line 2238 "conf_parser.y" /* yacc.c:1646  */
5336      {
5337    if (conf_parser_ctx.pass == 2)
5338 <  {
6101 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
6102 <      yyerror("Server passwords cannot begin with a colon");
6103 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
6104 <      yyerror("Server passwords cannot contain spaces");
6105 <    else {
6106 <      if (yy_aconf->passwd != NULL)
6107 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
6108 <
6109 <      MyFree(yy_aconf->passwd);
6110 <      DupString(yy_aconf->passwd, yylval.string);
6111 <    }
6112 <  }
5338 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5339   }
5340 + #line 5341 "conf_parser.c" /* yacc.c:1646  */
5341      break;
5342  
5343 <  case 376:
5344 <
6118 < /* Line 1464 of yacc.c  */
6119 < #line 2398 "ircd_parser.y"
5343 >  case 414:
5344 > #line 2244 "conf_parser.y" /* yacc.c:1646  */
5345      {
5346    if (conf_parser_ctx.pass == 2)
5347 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5347 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5348   }
5349 + #line 5350 "conf_parser.c" /* yacc.c:1646  */
5350      break;
5351  
5352 <  case 377:
5353 <
6128 < /* Line 1464 of yacc.c  */
6129 < #line 2404 "ircd_parser.y"
5352 >  case 415:
5353 > #line 2250 "conf_parser.y" /* yacc.c:1646  */
5354      {
5355    if (conf_parser_ctx.pass == 2)
5356 <    yy_aconf->aftype = AF_INET;
5356 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5357   }
5358 + #line 5359 "conf_parser.c" /* yacc.c:1646  */
5359      break;
5360  
5361 <  case 378:
5362 <
6138 < /* Line 1464 of yacc.c  */
6139 < #line 2408 "ircd_parser.y"
5361 >  case 416:
5362 > #line 2256 "conf_parser.y" /* yacc.c:1646  */
5363      {
5364 < #ifdef IPV6
6142 <  if (conf_parser_ctx.pass == 2)
6143 <    yy_aconf->aftype = AF_INET6;
6144 < #endif
6145 < }
5364 >  if (conf_parser_ctx.pass != 2)
5365      break;
5366  
5367 <  case 379:
5368 <
5369 < /* Line 1464 of yacc.c  */
5370 < #line 2416 "ircd_parser.y"
5371 <    {
5367 >  if ((yyvsp[-1].string)[0] == ':')
5368 >    conf_error_report("Server passwords cannot begin with a colon");
5369 >  else if (strchr((yyvsp[-1].string), ' '))
5370 >    conf_error_report("Server passwords cannot contain spaces");
5371 >  else
5372 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5373   }
5374 + #line 5375 "conf_parser.c" /* yacc.c:1646  */
5375      break;
5376  
5377 <  case 383:
5378 <
5379 < /* Line 1464 of yacc.c  */
5380 < #line 2420 "ircd_parser.y"
6160 <    { not_atom = 1; }
5377 >  case 417:
5378 > #line 2269 "conf_parser.y" /* yacc.c:1646  */
5379 >    {
5380 >  if (conf_parser_ctx.pass != 2)
5381      break;
5382  
5383 <  case 385:
5384 <
5385 < /* Line 1464 of yacc.c  */
5386 < #line 2421 "ircd_parser.y"
5387 <    { not_atom = 0; }
5383 >  if ((yyvsp[-1].string)[0] == ':')
5384 >    conf_error_report("Server passwords cannot begin with a colon");
5385 >  else if (strchr((yyvsp[-1].string), ' '))
5386 >    conf_error_report("Server passwords cannot contain spaces");
5387 >  else
5388 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5389 > }
5390 > #line 5391 "conf_parser.c" /* yacc.c:1646  */
5391      break;
5392  
5393 <  case 387:
5394 <
6172 < /* Line 1464 of yacc.c  */
6173 < #line 2424 "ircd_parser.y"
5393 >  case 418:
5394 > #line 2282 "conf_parser.y" /* yacc.c:1646  */
5395      {
5396    if (conf_parser_ctx.pass == 2)
5397 < #ifndef HAVE_LIBZ
6177 <    yyerror("Ignoring flags = compressed; -- no zlib support");
6178 < #else
6179 < {
6180 <   if (not_atom)ClearConfCompressed(yy_aconf);
6181 <   else SetConfCompressed(yy_aconf);
6182 < }
6183 < #endif
5397 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5398   }
5399 + #line 5400 "conf_parser.c" /* yacc.c:1646  */
5400      break;
5401  
5402 <  case 388:
5403 <
6189 < /* Line 1464 of yacc.c  */
6190 < #line 2435 "ircd_parser.y"
5402 >  case 419:
5403 > #line 2288 "conf_parser.y" /* yacc.c:1646  */
5404      {
5405    if (conf_parser_ctx.pass == 2)
5406 <  {
6194 <    if (not_atom)ClearConfCryptLink(yy_aconf);
6195 <    else SetConfCryptLink(yy_aconf);
6196 <  }
5406 >    block_state.port.value = (yyvsp[-1].number);
5407   }
5408 + #line 5409 "conf_parser.c" /* yacc.c:1646  */
5409      break;
5410  
5411 <  case 389:
5412 <
6202 < /* Line 1464 of yacc.c  */
6203 < #line 2442 "ircd_parser.y"
5411 >  case 420:
5412 > #line 2294 "conf_parser.y" /* yacc.c:1646  */
5413      {
5414    if (conf_parser_ctx.pass == 2)
5415 <  {
6207 <    if (not_atom)ClearConfAllowAutoConn(yy_aconf);
6208 <    else SetConfAllowAutoConn(yy_aconf);
6209 <  }
5415 >    block_state.aftype.value = AF_INET;
5416   }
5417 + #line 5418 "conf_parser.c" /* yacc.c:1646  */
5418      break;
5419  
5420 <  case 390:
5421 <
6215 < /* Line 1464 of yacc.c  */
6216 < #line 2449 "ircd_parser.y"
5420 >  case 421:
5421 > #line 2298 "conf_parser.y" /* yacc.c:1646  */
5422      {
5423    if (conf_parser_ctx.pass == 2)
5424 <  {
6220 <    if (not_atom)ClearConfAwayBurst(yy_aconf);
6221 <    else SetConfAwayBurst(yy_aconf);
6222 <  }
5424 >    block_state.aftype.value = AF_INET6;
5425   }
5426 + #line 5427 "conf_parser.c" /* yacc.c:1646  */
5427      break;
5428  
5429 <  case 391:
5430 <
6228 < /* Line 1464 of yacc.c  */
6229 < #line 2456 "ircd_parser.y"
5429 >  case 422:
5430 > #line 2304 "conf_parser.y" /* yacc.c:1646  */
5431      {
5432 <  if (conf_parser_ctx.pass == 2)
6232 <  {
6233 <    if (not_atom)ClearConfTopicBurst(yy_aconf);
6234 <    else SetConfTopicBurst(yy_aconf);
6235 <  }
5432 >  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5433   }
5434 + #line 5435 "conf_parser.c" /* yacc.c:1646  */
5435      break;
5436  
5437 <  case 392:
5438 <
6241 < /* Line 1464 of yacc.c  */
6242 < #line 2466 "ircd_parser.y"
5437 >  case 426:
5438 > #line 2310 "conf_parser.y" /* yacc.c:1646  */
5439      {
6244 #ifdef HAVE_LIBCRYPTO
5440    if (conf_parser_ctx.pass == 2)
5441 <  {
5442 <    BIO *file;
5443 <
5444 <    if (yy_aconf->rsa_public_key != NULL)
6250 <    {
6251 <      RSA_free(yy_aconf->rsa_public_key);
6252 <      yy_aconf->rsa_public_key = NULL;
6253 <    }
6254 <
6255 <    if (yy_aconf->rsa_public_key_file != NULL)
6256 <    {
6257 <      MyFree(yy_aconf->rsa_public_key_file);
6258 <      yy_aconf->rsa_public_key_file = NULL;
6259 <    }
6260 <
6261 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
6262 <
6263 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
6264 <    {
6265 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
6266 <      break;
6267 <    }
6268 <
6269 <    yy_aconf->rsa_public_key = (RSA *)PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
5441 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5442 > }
5443 > #line 5444 "conf_parser.c" /* yacc.c:1646  */
5444 >    break;
5445  
5446 <    if (yy_aconf->rsa_public_key == NULL)
5446 >  case 427:
5447 > #line 2314 "conf_parser.y" /* yacc.c:1646  */
5448      {
5449 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
5450 <      break;
6275 <    }
6276 <      
6277 <    BIO_set_close(file, BIO_CLOSE);
6278 <    BIO_free(file);
6279 <  }
6280 < #endif /* HAVE_LIBCRYPTO */
5449 >  if (conf_parser_ctx.pass == 2)
5450 >    block_state.flags.value |= CONF_FLAGS_SSL;
5451   }
5452 + #line 5453 "conf_parser.c" /* yacc.c:1646  */
5453      break;
5454  
5455 <  case 393:
5456 <
6286 < /* Line 1464 of yacc.c  */
6287 < #line 2507 "ircd_parser.y"
5455 >  case 428:
5456 > #line 2320 "conf_parser.y" /* yacc.c:1646  */
5457      {
5458    if (conf_parser_ctx.pass == 2)
5459    {
5460      if (yylval.number)
5461 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
5461 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5462      else
5463 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
5463 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5464    }
5465   }
5466 + #line 5467 "conf_parser.c" /* yacc.c:1646  */
5467      break;
5468  
5469 <  case 394:
5470 <
6301 < /* Line 1464 of yacc.c  */
6302 < #line 2518 "ircd_parser.y"
5469 >  case 429:
5470 > #line 2331 "conf_parser.y" /* yacc.c:1646  */
5471      {
5472    if (conf_parser_ctx.pass == 2)
5473 <  {
6306 <    struct CollectItem *yy_tmp;
6307 <
6308 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6309 <    DupString(yy_tmp->host, yylval.string);
6310 <    DupString(yy_tmp->user, "*");
6311 <    dlinkAdd(yy_tmp, &yy_tmp->node, &hub_conf_list);
6312 <  }
5473 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5474   }
5475 + #line 5476 "conf_parser.c" /* yacc.c:1646  */
5476      break;
5477  
5478 <  case 395:
5479 <
6318 < /* Line 1464 of yacc.c  */
6319 < #line 2531 "ircd_parser.y"
5478 >  case 430:
5479 > #line 2337 "conf_parser.y" /* yacc.c:1646  */
5480      {
5481    if (conf_parser_ctx.pass == 2)
5482 <  {
6323 <    struct CollectItem *yy_tmp;
6324 <
6325 <    yy_tmp = (struct CollectItem *)MyMalloc(sizeof(struct CollectItem));
6326 <    DupString(yy_tmp->host, yylval.string);
6327 <    DupString(yy_tmp->user, "*");
6328 <    dlinkAdd(yy_tmp, &yy_tmp->node, &leaf_conf_list);
6329 <  }
5482 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5483   }
5484 + #line 5485 "conf_parser.c" /* yacc.c:1646  */
5485      break;
5486  
5487 <  case 396:
5488 <
6335 < /* Line 1464 of yacc.c  */
6336 < #line 2544 "ircd_parser.y"
5487 >  case 431:
5488 > #line 2343 "conf_parser.y" /* yacc.c:1646  */
5489      {
5490    if (conf_parser_ctx.pass == 2)
5491 <  {
6340 <    MyFree(class_name);
6341 <    DupString(class_name, yylval.string);
6342 <  }
5491 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5492   }
5493 + #line 5494 "conf_parser.c" /* yacc.c:1646  */
5494      break;
5495  
5496 <  case 397:
5497 <
6348 < /* Line 1464 of yacc.c  */
6349 < #line 2553 "ircd_parser.y"
5496 >  case 432:
5497 > #line 2349 "conf_parser.y" /* yacc.c:1646  */
5498      {
5499   #ifdef HAVE_LIBCRYPTO
5500    if (conf_parser_ctx.pass == 2)
5501 <  {
6354 <    struct EncCapability *ecap;
6355 <    const char *cipher_name;
6356 <    int found = 0;
6357 <
6358 <    yy_aconf->cipher_preference = NULL;
6359 <    cipher_name = yylval.string;
6360 <
6361 <    for (ecap = CipherTable; ecap->name; ecap++)
6362 <    {
6363 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
6364 <          (ecap->cap & CAP_ENC_MASK))
6365 <      {
6366 <        yy_aconf->cipher_preference = ecap;
6367 <        found = 1;
6368 <        break;
6369 <      }
6370 <    }
6371 <
6372 <    if (!found)
6373 <      yyerror("Invalid cipher");
6374 <  }
5501 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5502   #else
5503    if (conf_parser_ctx.pass == 2)
5504 <    yyerror("Ignoring cipher_preference -- no OpenSSL support");
5504 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5505   #endif
5506   }
5507 + #line 5508 "conf_parser.c" /* yacc.c:1646  */
5508      break;
5509  
5510 <  case 398:
5511 <
6384 < /* Line 1464 of yacc.c  */
6385 < #line 2588 "ircd_parser.y"
5510 >  case 433:
5511 > #line 2364 "conf_parser.y" /* yacc.c:1646  */
5512      {
5513    if (conf_parser_ctx.pass == 2)
5514 <  {
6389 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
6390 <    regex_ban = 0;
6391 <  }
5514 >    reset_block_state();
5515   }
5516 + #line 5517 "conf_parser.c" /* yacc.c:1646  */
5517      break;
5518  
5519 <  case 399:
5520 <
6397 < /* Line 1464 of yacc.c  */
6398 < #line 2595 "ircd_parser.y"
6399 <    {
6400 <  if (conf_parser_ctx.pass == 2)
6401 <  {
6402 <    if (userbuf[0] && hostbuf[0])
5519 >  case 434:
5520 > #line 2368 "conf_parser.y" /* yacc.c:1646  */
5521      {
5522 <      if (regex_ban)
6405 <      {
6406 < #ifdef HAVE_LIBPCRE
6407 <        void *exp_user = NULL;
6408 <        void *exp_host = NULL;
6409 <        const char *errptr = NULL;
6410 <
6411 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
6412 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
6413 <        {
6414 <          ilog(L_ERROR, "Failed to add regular expression based K-Line: %s",
6415 <               errptr);
6416 <          break;
6417 <        }
6418 <
6419 <        yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
6420 <        yy_aconf->regexuser = exp_user;
6421 <        yy_aconf->regexhost = exp_host;
6422 <
6423 <        DupString(yy_aconf->user, userbuf);
6424 <        DupString(yy_aconf->host, hostbuf);
6425 <
6426 <        if (reasonbuf[0])
6427 <          DupString(yy_aconf->reason, reasonbuf);
6428 <        else
6429 <          DupString(yy_aconf->reason, "No reason");
6430 < #else
6431 <        ilog(L_ERROR, "Failed to add regular expression based K-Line: no PCRE support");
6432 <        break;
6433 < #endif
6434 <      }
6435 <      else
6436 <      {
6437 <        yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
5522 >  struct MaskItem *conf = NULL;
5523  
5524 <        DupString(yy_aconf->user, userbuf);
6440 <        DupString(yy_aconf->host, hostbuf);
6441 <
6442 <        if (reasonbuf[0])
6443 <          DupString(yy_aconf->reason, reasonbuf);
6444 <        else
6445 <          DupString(yy_aconf->reason, "No reason");
6446 <        add_conf_by_address(CONF_KILL, yy_aconf);
6447 <      }
6448 <    }
6449 <
6450 <    yy_aconf = NULL;
6451 <  }
6452 < }
5524 >  if (conf_parser_ctx.pass != 2)
5525      break;
5526  
5527 <  case 400:
5528 <
6457 < /* Line 1464 of yacc.c  */
6458 < #line 2651 "ircd_parser.y"
6459 <    {
6460 < }
5527 >  if (!block_state.user.buf[0] ||
5528 >      !block_state.host.buf[0])
5529      break;
5530  
5531 <  case 404:
5531 >  conf = conf_make(CONF_KLINE);
5532 >  conf->user = xstrdup(block_state.user.buf);
5533 >  conf->host = xstrdup(block_state.host.buf);
5534  
5535 < /* Line 1464 of yacc.c  */
5536 < #line 2656 "ircd_parser.y"
5537 <    {
5538 <  if (conf_parser_ctx.pass == 2)
5539 <    regex_ban = 1;
5535 >  if (block_state.rpass.buf[0])
5536 >    conf->reason = xstrdup(block_state.rpass.buf);
5537 >  else
5538 >    conf->reason = xstrdup(CONF_NOREASON);
5539 >  add_conf_by_address(CONF_KLINE, conf);
5540   }
5541 + #line 5542 "conf_parser.c" /* yacc.c:1646  */
5542      break;
5543  
5544 <  case 411:
5545 <
6475 < /* Line 1464 of yacc.c  */
6476 < #line 2665 "ircd_parser.y"
5544 >  case 440:
5545 > #line 2393 "conf_parser.y" /* yacc.c:1646  */
5546      {
5547 +
5548    if (conf_parser_ctx.pass == 2)
5549    {
5550      struct split_nuh_item nuh;
5551  
5552      nuh.nuhmask  = yylval.string;
5553      nuh.nickptr  = NULL;
5554 <    nuh.userptr  = userbuf;
5555 <    nuh.hostptr  = hostbuf;
5554 >    nuh.userptr  = block_state.user.buf;
5555 >    nuh.hostptr  = block_state.host.buf;
5556  
5557      nuh.nicksize = 0;
5558 <    nuh.usersize = sizeof(userbuf);
5559 <    nuh.hostsize = sizeof(hostbuf);
5558 >    nuh.usersize = sizeof(block_state.user.buf);
5559 >    nuh.hostsize = sizeof(block_state.host.buf);
5560  
5561      split_nuh(&nuh);
5562    }
5563   }
5564 + #line 5565 "conf_parser.c" /* yacc.c:1646  */
5565      break;
5566  
5567 <  case 412:
5568 <
6498 < /* Line 1464 of yacc.c  */
6499 < #line 2684 "ircd_parser.y"
5567 >  case 441:
5568 > #line 2413 "conf_parser.y" /* yacc.c:1646  */
5569      {
5570    if (conf_parser_ctx.pass == 2)
5571 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5571 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5572   }
5573 + #line 5574 "conf_parser.c" /* yacc.c:1646  */
5574      break;
5575  
5576 <  case 413:
5577 <
6508 < /* Line 1464 of yacc.c  */
6509 < #line 2693 "ircd_parser.y"
5576 >  case 442:
5577 > #line 2422 "conf_parser.y" /* yacc.c:1646  */
5578      {
5579    if (conf_parser_ctx.pass == 2)
5580 <    hostbuf[0] = reasonbuf[0] = '\0';
5580 >    reset_block_state();
5581   }
5582 + #line 5583 "conf_parser.c" /* yacc.c:1646  */
5583      break;
5584  
5585 <  case 414:
5586 <
6518 < /* Line 1464 of yacc.c  */
6519 < #line 2697 "ircd_parser.y"
5585 >  case 443:
5586 > #line 2426 "conf_parser.y" /* yacc.c:1646  */
5587      {
5588 <  if (conf_parser_ctx.pass == 2)
6522 <  {
6523 <    if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
6524 <    {
6525 <      yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
6526 <      DupString(yy_aconf->host, hostbuf);
5588 >  struct MaskItem *conf = NULL;
5589  
5590 <      if (reasonbuf[0])
6529 <        DupString(yy_aconf->reason, reasonbuf);
6530 <      else
6531 <        DupString(yy_aconf->reason, "No reason");
6532 <      add_conf_by_address(CONF_DLINE, yy_aconf);
6533 <      yy_aconf = NULL;
6534 <    }
6535 <  }
6536 < }
5590 >  if (conf_parser_ctx.pass != 2)
5591      break;
5592  
5593 <  case 420:
6540 <
6541 < /* Line 1464 of yacc.c  */
6542 < #line 2719 "ircd_parser.y"
6543 <    {
6544 <  if (conf_parser_ctx.pass == 2)
6545 <    strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
6546 < }
5593 >  if (!block_state.addr.buf[0])
5594      break;
5595  
5596 <  case 421:
5596 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5597 >  {
5598 >    conf = conf_make(CONF_DLINE);
5599 >    conf->host = xstrdup(block_state.addr.buf);
5600  
5601 < /* Line 1464 of yacc.c  */
5602 < #line 2725 "ircd_parser.y"
5603 <    {
5604 <  if (conf_parser_ctx.pass == 2)
5605 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5601 >    if (block_state.rpass.buf[0])
5602 >      conf->reason = xstrdup(block_state.rpass.buf);
5603 >    else
5604 >      conf->reason = xstrdup(CONF_NOREASON);
5605 >    add_conf_by_address(CONF_DLINE, conf);
5606 >  }
5607   }
5608 + #line 5609 "conf_parser.c" /* yacc.c:1646  */
5609      break;
5610  
5611 <  case 427:
5612 <
6561 < /* Line 1464 of yacc.c  */
6562 < #line 2739 "ircd_parser.y"
5611 >  case 449:
5612 > #line 2452 "conf_parser.y" /* yacc.c:1646  */
5613      {
5614    if (conf_parser_ctx.pass == 2)
5615 <  {
6566 <    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
6567 <    {
6568 <      yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
6569 <      DupString(yy_aconf->host, yylval.string);
6570 <
6571 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
6572 <      yy_aconf = NULL;
6573 <    }
6574 <  }
5615 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5616   }
5617 + #line 5618 "conf_parser.c" /* yacc.c:1646  */
5618      break;
5619  
5620 <  case 428:
5621 <
6580 < /* Line 1464 of yacc.c  */
6581 < #line 2757 "ircd_parser.y"
5620 >  case 450:
5621 > #line 2458 "conf_parser.y" /* yacc.c:1646  */
5622      {
5623    if (conf_parser_ctx.pass == 2)
5624 <  {
6585 <    regex_ban = 0;
6586 <    reasonbuf[0] = gecos_name[0] = '\0';
6587 <  }
5624 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5625   }
5626 + #line 5627 "conf_parser.c" /* yacc.c:1646  */
5627      break;
5628  
5629 <  case 429:
5630 <
6593 < /* Line 1464 of yacc.c  */
6594 < #line 2764 "ircd_parser.y"
5629 >  case 456:
5630 > #line 2472 "conf_parser.y" /* yacc.c:1646  */
5631      {
5632    if (conf_parser_ctx.pass == 2)
5633    {
5634 <    if (gecos_name[0])
5634 >    if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5635      {
5636 <      if (regex_ban)
5637 <      {
6602 < #ifdef HAVE_LIBPCRE
6603 <        void *exp_p = NULL;
6604 <        const char *errptr = NULL;
6605 <
6606 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
6607 <        {
6608 <          ilog(L_ERROR, "Failed to add regular expression based X-Line: %s",
6609 <               errptr);
6610 <          break;
6611 <        }
6612 <
6613 <        yy_conf = make_conf_item(RXLINE_TYPE);
6614 <        yy_conf->regexpname = exp_p;
6615 < #else
6616 <        ilog(L_ERROR, "Failed to add regular expression based X-Line: no PCRE support");
6617 <        break;
6618 < #endif
6619 <      }
6620 <      else
6621 <        yy_conf = make_conf_item(XLINE_TYPE);
6622 <
6623 <      yy_match_item = map_to_conf(yy_conf);
6624 <      DupString(yy_conf->name, gecos_name);
5636 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5637 >      conf->host = xstrdup(yylval.string);
5638  
5639 <      if (reasonbuf[0])
6627 <        DupString(yy_match_item->reason, reasonbuf);
6628 <      else
6629 <        DupString(yy_match_item->reason, "No reason");
5639 >      add_conf_by_address(CONF_EXEMPT, conf);
5640      }
5641    }
5642   }
5643 + #line 5644 "conf_parser.c" /* yacc.c:1646  */
5644      break;
5645  
5646 <  case 430:
5647 <
6637 < /* Line 1464 of yacc.c  */
6638 < #line 2804 "ircd_parser.y"
6639 <    {
6640 < }
6641 <    break;
6642 <
6643 <  case 434:
6644 <
6645 < /* Line 1464 of yacc.c  */
6646 < #line 2809 "ircd_parser.y"
6647 <    {
6648 <  if (conf_parser_ctx.pass == 2)
6649 <    regex_ban = 1;
6650 < }
6651 <    break;
6652 <
6653 <  case 441:
6654 <
6655 < /* Line 1464 of yacc.c  */
6656 < #line 2818 "ircd_parser.y"
6657 <    {
6658 <  if (conf_parser_ctx.pass == 2)
6659 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
6660 < }
6661 <    break;
6662 <
6663 <  case 442:
6664 <
6665 < /* Line 1464 of yacc.c  */
6666 < #line 2824 "ircd_parser.y"
5646 >  case 457:
5647 > #line 2489 "conf_parser.y" /* yacc.c:1646  */
5648      {
5649    if (conf_parser_ctx.pass == 2)
5650 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5650 >    reset_block_state();
5651   }
5652 + #line 5653 "conf_parser.c" /* yacc.c:1646  */
5653      break;
5654  
5655 <  case 502:
5656 <
6675 < /* Line 1464 of yacc.c  */
6676 < #line 2869 "ircd_parser.y"
5655 >  case 458:
5656 > #line 2493 "conf_parser.y" /* yacc.c:1646  */
5657      {
5658 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
6679 < }
6680 <    break;
6681 <
6682 <  case 503:
5658 >  struct MaskItem *conf = NULL;
5659  
5660 < /* Line 1464 of yacc.c  */
6685 < #line 2874 "ircd_parser.y"
6686 <    {
6687 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
6688 < }
5660 >  if (conf_parser_ctx.pass != 2)
5661      break;
5662  
5663 <  case 504:
6692 <
6693 < /* Line 1464 of yacc.c  */
6694 < #line 2879 "ircd_parser.y"
6695 <    {
6696 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
6697 < }
5663 >  if (!block_state.name.buf[0])
5664      break;
5665  
5666 <  case 505:
5667 <
6702 < /* Line 1464 of yacc.c  */
6703 < #line 2884 "ircd_parser.y"
6704 <    {
6705 <  ConfigFileEntry.burst_away = yylval.number;
6706 < }
6707 <    break;
5666 >  conf = conf_make(CONF_XLINE);
5667 >  conf->name = xstrdup(block_state.name.buf);
5668  
5669 <  case 506:
5670 <
5671 < /* Line 1464 of yacc.c  */
5672 < #line 2889 "ircd_parser.y"
6713 <    {
6714 <  ConfigFileEntry.use_whois_actually = yylval.number;
6715 < }
6716 <    break;
6717 <
6718 <  case 507:
6719 <
6720 < /* Line 1464 of yacc.c  */
6721 < #line 2894 "ircd_parser.y"
6722 <    {
6723 <  GlobalSetOptions.rejecttime = yylval.number;
6724 < }
6725 <    break;
6726 <
6727 <  case 508:
6728 <
6729 < /* Line 1464 of yacc.c  */
6730 < #line 2899 "ircd_parser.y"
6731 <    {
6732 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
6733 < }
6734 <    break;
6735 <
6736 <  case 509:
6737 <
6738 < /* Line 1464 of yacc.c  */
6739 < #line 2904 "ircd_parser.y"
6740 <    {
6741 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
6742 < }
6743 <    break;
6744 <
6745 <  case 510:
6746 <
6747 < /* Line 1464 of yacc.c  */
6748 < #line 2909 "ircd_parser.y"
6749 <    {
6750 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
6751 < }
6752 <    break;
6753 <
6754 <  case 511:
6755 <
6756 < /* Line 1464 of yacc.c  */
6757 < #line 2914 "ircd_parser.y"
6758 <    {
6759 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
6760 < }
6761 <    break;
6762 <
6763 <  case 512:
6764 <
6765 < /* Line 1464 of yacc.c  */
6766 < #line 2919 "ircd_parser.y"
6767 <    {
6768 <  ConfigFileEntry.disable_remote = yylval.number;
6769 < }
6770 <    break;
6771 <
6772 <  case 513:
6773 <
6774 < /* Line 1464 of yacc.c  */
6775 < #line 2924 "ircd_parser.y"
6776 <    {
6777 <  ConfigFileEntry.failed_oper_notice = yylval.number;
6778 < }
6779 <    break;
6780 <
6781 <  case 514:
6782 <
6783 < /* Line 1464 of yacc.c  */
6784 < #line 2929 "ircd_parser.y"
6785 <    {
6786 <  ConfigFileEntry.anti_nick_flood = yylval.number;
6787 < }
6788 <    break;
6789 <
6790 <  case 515:
6791 <
6792 < /* Line 1464 of yacc.c  */
6793 < #line 2934 "ircd_parser.y"
6794 <    {
6795 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5669 >  if (block_state.rpass.buf[0])
5670 >    conf->reason = xstrdup(block_state.rpass.buf);
5671 >  else
5672 >    conf->reason = xstrdup(CONF_NOREASON);
5673   }
5674 + #line 5675 "conf_parser.c" /* yacc.c:1646  */
5675      break;
5676  
5677 <  case 516:
5678 <
6801 < /* Line 1464 of yacc.c  */
6802 < #line 2939 "ircd_parser.y"
5677 >  case 464:
5678 > #line 2515 "conf_parser.y" /* yacc.c:1646  */
5679      {
5680 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5680 >  if (conf_parser_ctx.pass == 2)
5681 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5682   }
5683 + #line 5684 "conf_parser.c" /* yacc.c:1646  */
5684      break;
5685  
5686 <  case 517:
5687 <
6810 < /* Line 1464 of yacc.c  */
6811 < #line 2944 "ircd_parser.y"
5686 >  case 465:
5687 > #line 2521 "conf_parser.y" /* yacc.c:1646  */
5688      {
5689 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5689 >  if (conf_parser_ctx.pass == 2)
5690 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5691   }
5692 + #line 5693 "conf_parser.c" /* yacc.c:1646  */
5693      break;
5694  
5695    case 518:
5696 <
6819 < /* Line 1464 of yacc.c  */
6820 < #line 2949 "ircd_parser.y"
5696 > #line 2585 "conf_parser.y" /* yacc.c:1646  */
5697      {
5698 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5698 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5699   }
5700 + #line 5701 "conf_parser.c" /* yacc.c:1646  */
5701      break;
5702  
5703    case 519:
5704 <
6828 < /* Line 1464 of yacc.c  */
6829 < #line 2954 "ircd_parser.y"
5704 > #line 2590 "conf_parser.y" /* yacc.c:1646  */
5705      {
5706 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5706 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5707   }
5708 + #line 5709 "conf_parser.c" /* yacc.c:1646  */
5709      break;
5710  
5711    case 520:
5712 <
6837 < /* Line 1464 of yacc.c  */
6838 < #line 2959 "ircd_parser.y"
5712 > #line 2595 "conf_parser.y" /* yacc.c:1646  */
5713      {
5714 <  if (conf_parser_ctx.pass == 2)
6841 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
5714 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5715   }
5716 + #line 5717 "conf_parser.c" /* yacc.c:1646  */
5717      break;
5718  
5719    case 521:
5720 <
6847 < /* Line 1464 of yacc.c  */
6848 < #line 2965 "ircd_parser.y"
5720 > #line 2600 "conf_parser.y" /* yacc.c:1646  */
5721      {
5722 <  if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
5723 <  {
6852 <    ilog(L_CRIT, "You haven't read your config file properly.");
6853 <    ilog(L_CRIT, "There is a line in the example conf that will kill your server if not removed.");
6854 <    ilog(L_CRIT, "Consider actually reading/editing the conf file, and removing this line.");
6855 <    exit(0);
6856 <  }
5722 >  if (conf_parser_ctx.pass == 2)
5723 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5724   }
5725 + #line 5726 "conf_parser.c" /* yacc.c:1646  */
5726      break;
5727  
5728    case 522:
5729 <
6862 < /* Line 1464 of yacc.c  */
6863 < #line 2976 "ircd_parser.y"
5729 > #line 2606 "conf_parser.y" /* yacc.c:1646  */
5730      {
5731 <  ConfigFileEntry.kline_with_reason = yylval.number;
5731 >  if (conf_parser_ctx.pass == 2)
5732 >    ConfigGeneral.glines = yylval.number;
5733   }
5734 + #line 5735 "conf_parser.c" /* yacc.c:1646  */
5735      break;
5736  
5737    case 523:
5738 <
6871 < /* Line 1464 of yacc.c  */
6872 < #line 2981 "ircd_parser.y"
5738 > #line 2612 "conf_parser.y" /* yacc.c:1646  */
5739      {
5740    if (conf_parser_ctx.pass == 2)
5741 <  {
6876 <    MyFree(ConfigFileEntry.kline_reason);
6877 <    DupString(ConfigFileEntry.kline_reason, yylval.string);
6878 <  }
5741 >    ConfigGeneral.gline_time = (yyvsp[-1].number);
5742   }
5743 + #line 5744 "conf_parser.c" /* yacc.c:1646  */
5744      break;
5745  
5746    case 524:
5747 <
6884 < /* Line 1464 of yacc.c  */
6885 < #line 2990 "ircd_parser.y"
5747 > #line 2618 "conf_parser.y" /* yacc.c:1646  */
5748      {
5749 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5749 >  if (conf_parser_ctx.pass == 2)
5750 >    ConfigGeneral.gline_request_time = (yyvsp[-1].number);
5751   }
5752 + #line 5753 "conf_parser.c" /* yacc.c:1646  */
5753      break;
5754  
5755    case 525:
5756 <
6893 < /* Line 1464 of yacc.c  */
6894 < #line 2995 "ircd_parser.y"
5756 > #line 2624 "conf_parser.y" /* yacc.c:1646  */
5757      {
5758 <  ConfigFileEntry.warn_no_nline = yylval.number;
5758 >  ConfigGeneral.gline_min_cidr = (yyvsp[-1].number);
5759   }
5760 + #line 5761 "conf_parser.c" /* yacc.c:1646  */
5761      break;
5762  
5763    case 526:
5764 <
6902 < /* Line 1464 of yacc.c  */
6903 < #line 3000 "ircd_parser.y"
5764 > #line 2629 "conf_parser.y" /* yacc.c:1646  */
5765      {
5766 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5766 >  ConfigGeneral.gline_min_cidr6 = (yyvsp[-1].number);
5767   }
5768 + #line 5769 "conf_parser.c" /* yacc.c:1646  */
5769      break;
5770  
5771    case 527:
5772 <
6911 < /* Line 1464 of yacc.c  */
6912 < #line 3005 "ircd_parser.y"
5772 > #line 2634 "conf_parser.y" /* yacc.c:1646  */
5773      {
5774 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5774 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5775   }
5776 + #line 5777 "conf_parser.c" /* yacc.c:1646  */
5777      break;
5778  
5779    case 528:
5780 <
6920 < /* Line 1464 of yacc.c  */
6921 < #line 3010 "ircd_parser.y"
5780 > #line 2639 "conf_parser.y" /* yacc.c:1646  */
5781      {
5782 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5782 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5783   }
5784 + #line 5785 "conf_parser.c" /* yacc.c:1646  */
5785      break;
5786  
5787    case 529:
5788 <
6929 < /* Line 1464 of yacc.c  */
6930 < #line 3015 "ircd_parser.y"
5788 > #line 2644 "conf_parser.y" /* yacc.c:1646  */
5789      {
5790 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5790 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5791   }
5792 + #line 5793 "conf_parser.c" /* yacc.c:1646  */
5793      break;
5794  
5795    case 530:
5796 <
6938 < /* Line 1464 of yacc.c  */
6939 < #line 3018 "ircd_parser.y"
5796 > #line 2649 "conf_parser.y" /* yacc.c:1646  */
5797      {
5798 <  ConfigFileEntry.stats_k_oper_only = 1;
5798 >  ConfigGeneral.failed_oper_notice = yylval.number;
5799   }
5800 + #line 5801 "conf_parser.c" /* yacc.c:1646  */
5801      break;
5802  
5803    case 531:
5804 <
6947 < /* Line 1464 of yacc.c  */
6948 < #line 3023 "ircd_parser.y"
5804 > #line 2654 "conf_parser.y" /* yacc.c:1646  */
5805      {
5806 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5806 >  ConfigGeneral.anti_nick_flood = yylval.number;
5807   }
5808 + #line 5809 "conf_parser.c" /* yacc.c:1646  */
5809      break;
5810  
5811    case 532:
5812 <
6956 < /* Line 1464 of yacc.c  */
6957 < #line 3026 "ircd_parser.y"
5812 > #line 2659 "conf_parser.y" /* yacc.c:1646  */
5813      {
5814 <  ConfigFileEntry.stats_i_oper_only = 1;
5814 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5815   }
5816 + #line 5817 "conf_parser.c" /* yacc.c:1646  */
5817      break;
5818  
5819    case 533:
5820 <
6965 < /* Line 1464 of yacc.c  */
6966 < #line 3031 "ircd_parser.y"
5820 > #line 2664 "conf_parser.y" /* yacc.c:1646  */
5821      {
5822 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5822 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5823   }
5824 + #line 5825 "conf_parser.c" /* yacc.c:1646  */
5825      break;
5826  
5827    case 534:
5828 <
6974 < /* Line 1464 of yacc.c  */
6975 < #line 3036 "ircd_parser.y"
5828 > #line 2669 "conf_parser.y" /* yacc.c:1646  */
5829      {
5830 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5830 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5831   }
5832 + #line 5833 "conf_parser.c" /* yacc.c:1646  */
5833      break;
5834  
5835    case 535:
5836 <
6983 < /* Line 1464 of yacc.c  */
6984 < #line 3041 "ircd_parser.y"
5836 > #line 2674 "conf_parser.y" /* yacc.c:1646  */
5837      {
5838 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5838 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5839   }
5840 + #line 5841 "conf_parser.c" /* yacc.c:1646  */
5841      break;
5842  
5843    case 536:
5844 <
6992 < /* Line 1464 of yacc.c  */
6993 < #line 3046 "ircd_parser.y"
5844 > #line 2679 "conf_parser.y" /* yacc.c:1646  */
5845      {
5846 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5846 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5847   }
5848 + #line 5849 "conf_parser.c" /* yacc.c:1646  */
5849      break;
5850  
5851    case 537:
5852 <
7001 < /* Line 1464 of yacc.c  */
7002 < #line 3051 "ircd_parser.y"
5852 > #line 2684 "conf_parser.y" /* yacc.c:1646  */
5853      {
5854 <  ConfigFileEntry.short_motd = yylval.number;
5854 >  if (conf_parser_ctx.pass == 2)
5855 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5856   }
5857 + #line 5858 "conf_parser.c" /* yacc.c:1646  */
5858      break;
5859  
5860    case 538:
5861 <
7010 < /* Line 1464 of yacc.c  */
7011 < #line 3056 "ircd_parser.y"
5861 > #line 2690 "conf_parser.y" /* yacc.c:1646  */
5862      {
5863 <  ConfigFileEntry.no_oper_flood = yylval.number;
5863 >  if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
5864 >  {
5865 >    ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
5866 >    ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
5867 >    ilog(LOG_TYPE_IRCD, "Consider actually reading/editing the conf file, and removing this line.");
5868 >    exit(0);
5869 >  }
5870   }
5871 + #line 5872 "conf_parser.c" /* yacc.c:1646  */
5872      break;
5873  
5874    case 539:
5875 <
7019 < /* Line 1464 of yacc.c  */
7020 < #line 3061 "ircd_parser.y"
5875 > #line 2701 "conf_parser.y" /* yacc.c:1646  */
5876      {
5877 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5877 >  ConfigGeneral.invisible_on_connect = yylval.number;
5878   }
5879 + #line 5880 "conf_parser.c" /* yacc.c:1646  */
5880      break;
5881  
5882    case 540:
5883 <
7028 < /* Line 1464 of yacc.c  */
7029 < #line 3066 "ircd_parser.y"
5883 > #line 2706 "conf_parser.y" /* yacc.c:1646  */
5884      {
5885 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5885 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5886   }
5887 + #line 5888 "conf_parser.c" /* yacc.c:1646  */
5888      break;
5889  
5890    case 541:
5891 <
7037 < /* Line 1464 of yacc.c  */
7038 < #line 3071 "ircd_parser.y"
5891 > #line 2711 "conf_parser.y" /* yacc.c:1646  */
5892      {
5893 <  if (conf_parser_ctx.pass == 2)
7041 <  {
7042 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
7043 <      yylval.string[LOCALE_LENGTH-1] = '\0';
7044 <
7045 <    set_locale(yylval.string);
7046 <  }
5893 >  ConfigGeneral.stats_e_disabled = yylval.number;
5894   }
5895 + #line 5896 "conf_parser.c" /* yacc.c:1646  */
5896      break;
5897  
5898    case 542:
5899 <
7052 < /* Line 1464 of yacc.c  */
7053 < #line 3082 "ircd_parser.y"
5899 > #line 2716 "conf_parser.y" /* yacc.c:1646  */
5900      {
5901 <  ConfigFileEntry.idletime = (yyvsp[(3) - (4)].number);
5901 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5902   }
5903 + #line 5904 "conf_parser.c" /* yacc.c:1646  */
5904      break;
5905  
5906    case 543:
5907 <
7061 < /* Line 1464 of yacc.c  */
7062 < #line 3087 "ircd_parser.y"
5907 > #line 2721 "conf_parser.y" /* yacc.c:1646  */
5908      {
5909 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
5909 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5910   }
5911 + #line 5912 "conf_parser.c" /* yacc.c:1646  */
5912      break;
5913  
5914    case 544:
5915 <
7070 < /* Line 1464 of yacc.c  */
7071 < #line 3092 "ircd_parser.y"
5915 > #line 2726 "conf_parser.y" /* yacc.c:1646  */
5916      {
5917 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
5917 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5918   }
5919 + #line 5920 "conf_parser.c" /* yacc.c:1646  */
5920      break;
5921  
5922    case 545:
5923 <
7079 < /* Line 1464 of yacc.c  */
7080 < #line 3097 "ircd_parser.y"
5923 > #line 2731 "conf_parser.y" /* yacc.c:1646  */
5924      {
5925 <  if (conf_parser_ctx.pass == 2)
7083 <  {
7084 <    MyFree(ConfigFileEntry.servlink_path);
7085 <    DupString(ConfigFileEntry.servlink_path, yylval.string);
7086 <  }
5925 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5926   }
5927 + #line 5928 "conf_parser.c" /* yacc.c:1646  */
5928      break;
5929  
5930    case 546:
5931 <
7092 < /* Line 1464 of yacc.c  */
7093 < #line 3106 "ircd_parser.y"
5931 > #line 2734 "conf_parser.y" /* yacc.c:1646  */
5932      {
5933 < #ifdef HAVE_LIBCRYPTO
7096 <  if (conf_parser_ctx.pass == 2)
7097 <  {
7098 <    struct EncCapability *ecap;
7099 <    const char *cipher_name;
7100 <    int found = 0;
7101 <
7102 <    ConfigFileEntry.default_cipher_preference = NULL;
7103 <    cipher_name = yylval.string;
7104 <
7105 <    for (ecap = CipherTable; ecap->name; ecap++)
7106 <    {
7107 <      if ((irccmp(ecap->name, cipher_name) == 0) &&
7108 <          (ecap->cap & CAP_ENC_MASK))
7109 <      {
7110 <        ConfigFileEntry.default_cipher_preference = ecap;
7111 <        found = 1;
7112 <        break;
7113 <      }
7114 <    }
7115 <
7116 <    if (!found)
7117 <      yyerror("Invalid cipher");
7118 <  }
7119 < #else
7120 <  if (conf_parser_ctx.pass == 2)
7121 <    yyerror("Ignoring default_cipher_preference -- no OpenSSL support");
7122 < #endif
5933 >  ConfigGeneral.stats_k_oper_only = 1;
5934   }
5935 + #line 5936 "conf_parser.c" /* yacc.c:1646  */
5936      break;
5937  
5938    case 547:
5939 <
7128 < /* Line 1464 of yacc.c  */
7129 < #line 3138 "ircd_parser.y"
5939 > #line 2739 "conf_parser.y" /* yacc.c:1646  */
5940      {
5941 <  if (conf_parser_ctx.pass == 2)
7132 <  {
7133 <    ConfigFileEntry.compression_level = (yyvsp[(3) - (4)].number);
7134 < #ifndef HAVE_LIBZ
7135 <    yyerror("Ignoring compression_level -- no zlib support");
7136 < #else
7137 <    if ((ConfigFileEntry.compression_level < 1) ||
7138 <        (ConfigFileEntry.compression_level > 9))
7139 <    {
7140 <      yyerror("Ignoring invalid compression_level, using default");
7141 <      ConfigFileEntry.compression_level = 0;
7142 <    }
7143 < #endif
7144 <  }
5941 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5942   }
5943 + #line 5944 "conf_parser.c" /* yacc.c:1646  */
5944      break;
5945  
5946    case 548:
5947 <
7150 < /* Line 1464 of yacc.c  */
7151 < #line 3156 "ircd_parser.y"
5947 > #line 2742 "conf_parser.y" /* yacc.c:1646  */
5948      {
5949 <  ConfigFileEntry.use_egd = yylval.number;
5949 >  ConfigGeneral.stats_i_oper_only = 1;
5950   }
5951 + #line 5952 "conf_parser.c" /* yacc.c:1646  */
5952      break;
5953  
5954    case 549:
5955 <
7159 < /* Line 1464 of yacc.c  */
7160 < #line 3161 "ircd_parser.y"
5955 > #line 2747 "conf_parser.y" /* yacc.c:1646  */
5956      {
5957 <  if (conf_parser_ctx.pass == 2)
7163 <  {
7164 <    MyFree(ConfigFileEntry.egdpool_path);
7165 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
7166 <  }
5957 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5958   }
5959 + #line 5960 "conf_parser.c" /* yacc.c:1646  */
5960      break;
5961  
5962    case 550:
5963 <
7172 < /* Line 1464 of yacc.c  */
7173 < #line 3170 "ircd_parser.y"
5963 > #line 2752 "conf_parser.y" /* yacc.c:1646  */
5964      {
5965 <  ConfigFileEntry.ping_cookie = yylval.number;
5965 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5966   }
5967 + #line 5968 "conf_parser.c" /* yacc.c:1646  */
5968      break;
5969  
5970    case 551:
5971 <
7181 < /* Line 1464 of yacc.c  */
7182 < #line 3175 "ircd_parser.y"
5971 > #line 2757 "conf_parser.y" /* yacc.c:1646  */
5972      {
5973 <  ConfigFileEntry.disable_auth = yylval.number;
5973 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5974   }
5975 + #line 5976 "conf_parser.c" /* yacc.c:1646  */
5976      break;
5977  
5978    case 552:
5979 <
7190 < /* Line 1464 of yacc.c  */
7191 < #line 3180 "ircd_parser.y"
5979 > #line 2762 "conf_parser.y" /* yacc.c:1646  */
5980      {
5981 <  ConfigFileEntry.throttle_time = yylval.number;
5981 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5982   }
5983 + #line 5984 "conf_parser.c" /* yacc.c:1646  */
5984      break;
5985  
5986    case 553:
5987 <
7199 < /* Line 1464 of yacc.c  */
7200 < #line 3185 "ircd_parser.y"
5987 > #line 2767 "conf_parser.y" /* yacc.c:1646  */
5988      {
5989 <  ConfigFileEntry.oper_umodes = 0;
5989 >  ConfigGeneral.short_motd = yylval.number;
5990   }
5991 + #line 5992 "conf_parser.c" /* yacc.c:1646  */
5992      break;
5993  
5994 <  case 557:
5995 <
7208 < /* Line 1464 of yacc.c  */
7209 < #line 3191 "ircd_parser.y"
5994 >  case 554:
5995 > #line 2772 "conf_parser.y" /* yacc.c:1646  */
5996      {
5997 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
5997 >  ConfigGeneral.no_oper_flood = yylval.number;
5998   }
5999 + #line 6000 "conf_parser.c" /* yacc.c:1646  */
6000      break;
6001  
6002 <  case 558:
6003 <
7217 < /* Line 1464 of yacc.c  */
7218 < #line 3194 "ircd_parser.y"
6002 >  case 555:
6003 > #line 2777 "conf_parser.y" /* yacc.c:1646  */
6004      {
6005 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6005 >  ConfigGeneral.true_no_oper_flood = yylval.number;
6006   }
6007 + #line 6008 "conf_parser.c" /* yacc.c:1646  */
6008      break;
6009  
6010 <  case 559:
6011 <
7226 < /* Line 1464 of yacc.c  */
7227 < #line 3197 "ircd_parser.y"
6010 >  case 556:
6011 > #line 2782 "conf_parser.y" /* yacc.c:1646  */
6012      {
6013 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
6013 >  ConfigGeneral.oper_pass_resv = yylval.number;
6014   }
6015 + #line 6016 "conf_parser.c" /* yacc.c:1646  */
6016      break;
6017  
6018 <  case 560:
6019 <
7235 < /* Line 1464 of yacc.c  */
7236 < #line 3200 "ircd_parser.y"
6018 >  case 557:
6019 > #line 2787 "conf_parser.y" /* yacc.c:1646  */
6020      {
6021 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6021 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
6022   }
6023 + #line 6024 "conf_parser.c" /* yacc.c:1646  */
6024      break;
6025  
6026 <  case 561:
6027 <
7244 < /* Line 1464 of yacc.c  */
7245 < #line 3203 "ircd_parser.y"
6026 >  case 558:
6027 > #line 2792 "conf_parser.y" /* yacc.c:1646  */
6028      {
6029 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6029 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
6030   }
6031 + #line 6032 "conf_parser.c" /* yacc.c:1646  */
6032      break;
6033  
6034 <  case 562:
6035 <
7253 < /* Line 1464 of yacc.c  */
7254 < #line 3206 "ircd_parser.y"
6034 >  case 559:
6035 > #line 2797 "conf_parser.y" /* yacc.c:1646  */
6036      {
6037 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6037 >  ConfigGeneral.ping_cookie = yylval.number;
6038   }
6039 + #line 6040 "conf_parser.c" /* yacc.c:1646  */
6040      break;
6041  
6042 <  case 563:
6043 <
7262 < /* Line 1464 of yacc.c  */
7263 < #line 3209 "ircd_parser.y"
6042 >  case 560:
6043 > #line 2802 "conf_parser.y" /* yacc.c:1646  */
6044      {
6045 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6045 >  ConfigGeneral.disable_auth = yylval.number;
6046   }
6047 + #line 6048 "conf_parser.c" /* yacc.c:1646  */
6048      break;
6049  
6050 <  case 564:
6051 <
7271 < /* Line 1464 of yacc.c  */
7272 < #line 3212 "ircd_parser.y"
6050 >  case 561:
6051 > #line 2807 "conf_parser.y" /* yacc.c:1646  */
6052      {
6053 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6053 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
6054   }
6055 + #line 6056 "conf_parser.c" /* yacc.c:1646  */
6056      break;
6057  
6058 <  case 565:
6059 <
7280 < /* Line 1464 of yacc.c  */
7281 < #line 3215 "ircd_parser.y"
6058 >  case 562:
6059 > #line 2812 "conf_parser.y" /* yacc.c:1646  */
6060      {
6061 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6061 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6062   }
6063 + #line 6064 "conf_parser.c" /* yacc.c:1646  */
6064      break;
6065  
6066 <  case 566:
6067 <
7289 < /* Line 1464 of yacc.c  */
7290 < #line 3218 "ircd_parser.y"
6066 >  case 563:
6067 > #line 2817 "conf_parser.y" /* yacc.c:1646  */
6068      {
6069 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6069 >  ConfigGeneral.oper_umodes = 0;
6070   }
6071 + #line 6072 "conf_parser.c" /* yacc.c:1646  */
6072      break;
6073  
6074    case 567:
6075 <
7298 < /* Line 1464 of yacc.c  */
7299 < #line 3221 "ircd_parser.y"
6075 > #line 2823 "conf_parser.y" /* yacc.c:1646  */
6076      {
6077 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6077 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6078   }
6079 + #line 6080 "conf_parser.c" /* yacc.c:1646  */
6080      break;
6081  
6082    case 568:
6083 <
7307 < /* Line 1464 of yacc.c  */
7308 < #line 3224 "ircd_parser.y"
6083 > #line 2826 "conf_parser.y" /* yacc.c:1646  */
6084      {
6085 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6085 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6086   }
6087 + #line 6088 "conf_parser.c" /* yacc.c:1646  */
6088      break;
6089  
6090    case 569:
6091 <
7316 < /* Line 1464 of yacc.c  */
7317 < #line 3227 "ircd_parser.y"
6091 > #line 2829 "conf_parser.y" /* yacc.c:1646  */
6092      {
6093 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6093 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6094   }
6095 + #line 6096 "conf_parser.c" /* yacc.c:1646  */
6096      break;
6097  
6098    case 570:
6099 <
7325 < /* Line 1464 of yacc.c  */
7326 < #line 3230 "ircd_parser.y"
6099 > #line 2832 "conf_parser.y" /* yacc.c:1646  */
6100      {
6101 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6101 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6102   }
6103 + #line 6104 "conf_parser.c" /* yacc.c:1646  */
6104      break;
6105  
6106    case 571:
6107 <
7334 < /* Line 1464 of yacc.c  */
7335 < #line 3233 "ircd_parser.y"
6107 > #line 2835 "conf_parser.y" /* yacc.c:1646  */
6108      {
6109 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6109 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6110   }
6111 + #line 6112 "conf_parser.c" /* yacc.c:1646  */
6112      break;
6113  
6114    case 572:
6115 <
7343 < /* Line 1464 of yacc.c  */
7344 < #line 3236 "ircd_parser.y"
6115 > #line 2838 "conf_parser.y" /* yacc.c:1646  */
6116      {
6117 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6117 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6118   }
6119 + #line 6120 "conf_parser.c" /* yacc.c:1646  */
6120      break;
6121  
6122    case 573:
6123 <
7352 < /* Line 1464 of yacc.c  */
7353 < #line 3239 "ircd_parser.y"
6123 > #line 2841 "conf_parser.y" /* yacc.c:1646  */
6124      {
6125 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6125 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6126   }
6127 + #line 6128 "conf_parser.c" /* yacc.c:1646  */
6128      break;
6129  
6130    case 574:
6131 <
7361 < /* Line 1464 of yacc.c  */
7362 < #line 3242 "ircd_parser.y"
6131 > #line 2844 "conf_parser.y" /* yacc.c:1646  */
6132      {
6133 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6133 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6134   }
6135 + #line 6136 "conf_parser.c" /* yacc.c:1646  */
6136      break;
6137  
6138    case 575:
6139 <
7370 < /* Line 1464 of yacc.c  */
7371 < #line 3245 "ircd_parser.y"
6139 > #line 2847 "conf_parser.y" /* yacc.c:1646  */
6140      {
6141 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6141 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6142   }
6143 + #line 6144 "conf_parser.c" /* yacc.c:1646  */
6144      break;
6145  
6146    case 576:
6147 <
7379 < /* Line 1464 of yacc.c  */
7380 < #line 3250 "ircd_parser.y"
6147 > #line 2850 "conf_parser.y" /* yacc.c:1646  */
6148      {
6149 <  ConfigFileEntry.oper_only_umodes = 0;
6149 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6150   }
6151 + #line 6152 "conf_parser.c" /* yacc.c:1646  */
6152      break;
6153  
6154 <  case 580:
6155 <
7388 < /* Line 1464 of yacc.c  */
7389 < #line 3256 "ircd_parser.y"
6154 >  case 577:
6155 > #line 2853 "conf_parser.y" /* yacc.c:1646  */
6156      {
6157 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6157 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6158   }
6159 + #line 6160 "conf_parser.c" /* yacc.c:1646  */
6160      break;
6161  
6162 <  case 581:
6163 <
7397 < /* Line 1464 of yacc.c  */
7398 < #line 3259 "ircd_parser.y"
6162 >  case 578:
6163 > #line 2856 "conf_parser.y" /* yacc.c:1646  */
6164      {
6165 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6165 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6166   }
6167 + #line 6168 "conf_parser.c" /* yacc.c:1646  */
6168      break;
6169  
6170 <  case 582:
6171 <
7406 < /* Line 1464 of yacc.c  */
7407 < #line 3262 "ircd_parser.y"
6170 >  case 579:
6171 > #line 2859 "conf_parser.y" /* yacc.c:1646  */
6172      {
6173 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6173 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6174   }
6175 + #line 6176 "conf_parser.c" /* yacc.c:1646  */
6176      break;
6177  
6178 <  case 583:
6179 <
7415 < /* Line 1464 of yacc.c  */
7416 < #line 3265 "ircd_parser.y"
6178 >  case 580:
6179 > #line 2862 "conf_parser.y" /* yacc.c:1646  */
6180      {
6181 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6181 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6182   }
6183 + #line 6184 "conf_parser.c" /* yacc.c:1646  */
6184      break;
6185  
6186 <  case 584:
6187 <
7424 < /* Line 1464 of yacc.c  */
7425 < #line 3268 "ircd_parser.y"
6186 >  case 581:
6187 > #line 2865 "conf_parser.y" /* yacc.c:1646  */
6188      {
6189 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6189 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6190   }
6191 + #line 6192 "conf_parser.c" /* yacc.c:1646  */
6192      break;
6193  
6194 <  case 585:
6195 <
6196 < /* Line 1464 of yacc.c  */
6197 < #line 3271 "ircd_parser.y"
7435 <    {
7436 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
6194 >  case 582:
6195 > #line 2868 "conf_parser.y" /* yacc.c:1646  */
6196 >    {
6197 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6198   }
6199 + #line 6200 "conf_parser.c" /* yacc.c:1646  */
6200      break;
6201  
6202 <  case 586:
6203 <
7442 < /* Line 1464 of yacc.c  */
7443 < #line 3274 "ircd_parser.y"
6202 >  case 583:
6203 > #line 2871 "conf_parser.y" /* yacc.c:1646  */
6204      {
6205 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6205 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6206   }
6207 + #line 6208 "conf_parser.c" /* yacc.c:1646  */
6208      break;
6209  
6210 <  case 587:
6211 <
7451 < /* Line 1464 of yacc.c  */
7452 < #line 3277 "ircd_parser.y"
6210 >  case 584:
6211 > #line 2874 "conf_parser.y" /* yacc.c:1646  */
6212      {
6213 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6213 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6214   }
6215 + #line 6216 "conf_parser.c" /* yacc.c:1646  */
6216      break;
6217  
6218 <  case 588:
6219 <
7460 < /* Line 1464 of yacc.c  */
7461 < #line 3280 "ircd_parser.y"
6218 >  case 585:
6219 > #line 2877 "conf_parser.y" /* yacc.c:1646  */
6220      {
6221 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6221 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6222   }
6223 + #line 6224 "conf_parser.c" /* yacc.c:1646  */
6224      break;
6225  
6226 <  case 589:
6227 <
7469 < /* Line 1464 of yacc.c  */
7470 < #line 3283 "ircd_parser.y"
6226 >  case 586:
6227 > #line 2880 "conf_parser.y" /* yacc.c:1646  */
6228      {
6229 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6229 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6230   }
6231 + #line 6232 "conf_parser.c" /* yacc.c:1646  */
6232      break;
6233  
6234 <  case 590:
6235 <
7478 < /* Line 1464 of yacc.c  */
7479 < #line 3286 "ircd_parser.y"
6234 >  case 587:
6235 > #line 2883 "conf_parser.y" /* yacc.c:1646  */
6236      {
6237 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6237 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6238   }
6239 + #line 6240 "conf_parser.c" /* yacc.c:1646  */
6240      break;
6241  
6242 <  case 591:
6243 <
7487 < /* Line 1464 of yacc.c  */
7488 < #line 3289 "ircd_parser.y"
6242 >  case 588:
6243 > #line 2886 "conf_parser.y" /* yacc.c:1646  */
6244      {
6245 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6245 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6246   }
6247 + #line 6248 "conf_parser.c" /* yacc.c:1646  */
6248      break;
6249  
6250 <  case 592:
6251 <
7496 < /* Line 1464 of yacc.c  */
7497 < #line 3292 "ircd_parser.y"
6250 >  case 589:
6251 > #line 2891 "conf_parser.y" /* yacc.c:1646  */
6252      {
6253 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6253 >  ConfigGeneral.oper_only_umodes = 0;
6254   }
6255 + #line 6256 "conf_parser.c" /* yacc.c:1646  */
6256      break;
6257  
6258    case 593:
6259 <
7505 < /* Line 1464 of yacc.c  */
7506 < #line 3295 "ircd_parser.y"
6259 > #line 2897 "conf_parser.y" /* yacc.c:1646  */
6260      {
6261 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6261 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6262   }
6263 + #line 6264 "conf_parser.c" /* yacc.c:1646  */
6264      break;
6265  
6266    case 594:
6267 <
7514 < /* Line 1464 of yacc.c  */
7515 < #line 3298 "ircd_parser.y"
6267 > #line 2900 "conf_parser.y" /* yacc.c:1646  */
6268      {
6269 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6269 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6270   }
6271 + #line 6272 "conf_parser.c" /* yacc.c:1646  */
6272      break;
6273  
6274    case 595:
6275 <
7523 < /* Line 1464 of yacc.c  */
7524 < #line 3301 "ircd_parser.y"
6275 > #line 2903 "conf_parser.y" /* yacc.c:1646  */
6276      {
6277 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6277 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6278   }
6279 + #line 6280 "conf_parser.c" /* yacc.c:1646  */
6280      break;
6281  
6282    case 596:
6283 <
7532 < /* Line 1464 of yacc.c  */
7533 < #line 3304 "ircd_parser.y"
6283 > #line 2906 "conf_parser.y" /* yacc.c:1646  */
6284      {
6285 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6285 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6286   }
6287 + #line 6288 "conf_parser.c" /* yacc.c:1646  */
6288      break;
6289  
6290    case 597:
6291 <
7541 < /* Line 1464 of yacc.c  */
7542 < #line 3307 "ircd_parser.y"
6291 > #line 2909 "conf_parser.y" /* yacc.c:1646  */
6292      {
6293 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6293 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6294   }
6295 + #line 6296 "conf_parser.c" /* yacc.c:1646  */
6296      break;
6297  
6298    case 598:
6299 <
7550 < /* Line 1464 of yacc.c  */
7551 < #line 3310 "ircd_parser.y"
6299 > #line 2912 "conf_parser.y" /* yacc.c:1646  */
6300      {
6301 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6301 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6302   }
6303 + #line 6304 "conf_parser.c" /* yacc.c:1646  */
6304      break;
6305  
6306    case 599:
6307 <
7559 < /* Line 1464 of yacc.c  */
7560 < #line 3315 "ircd_parser.y"
6307 > #line 2915 "conf_parser.y" /* yacc.c:1646  */
6308      {
6309 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6309 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6310   }
6311 + #line 6312 "conf_parser.c" /* yacc.c:1646  */
6312      break;
6313  
6314    case 600:
6315 <
7568 < /* Line 1464 of yacc.c  */
7569 < #line 3320 "ircd_parser.y"
6315 > #line 2918 "conf_parser.y" /* yacc.c:1646  */
6316      {
6317 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
6317 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6318   }
6319 + #line 6320 "conf_parser.c" /* yacc.c:1646  */
6320      break;
6321  
6322    case 601:
6323 <
7577 < /* Line 1464 of yacc.c  */
7578 < #line 3325 "ircd_parser.y"
6323 > #line 2921 "conf_parser.y" /* yacc.c:1646  */
6324      {
6325 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
6325 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6326   }
6327 + #line 6328 "conf_parser.c" /* yacc.c:1646  */
6328      break;
6329  
6330    case 602:
6331 <
7586 < /* Line 1464 of yacc.c  */
7587 < #line 3330 "ircd_parser.y"
6331 > #line 2924 "conf_parser.y" /* yacc.c:1646  */
6332      {
6333 <  ConfigFileEntry.client_flood = (yyvsp[(3) - (4)].number);
6333 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6334   }
6335 + #line 6336 "conf_parser.c" /* yacc.c:1646  */
6336      break;
6337  
6338    case 603:
6339 <
7595 < /* Line 1464 of yacc.c  */
7596 < #line 3339 "ircd_parser.y"
6339 > #line 2927 "conf_parser.y" /* yacc.c:1646  */
6340      {
6341 <  if (conf_parser_ctx.pass == 2)
7599 <  {
7600 <    yy_conf = make_conf_item(GDENY_TYPE);
7601 <    yy_aconf = map_to_conf(yy_conf);
7602 <  }
6341 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6342   }
6343 + #line 6344 "conf_parser.c" /* yacc.c:1646  */
6344      break;
6345  
6346    case 604:
6347 <
7608 < /* Line 1464 of yacc.c  */
7609 < #line 3346 "ircd_parser.y"
6347 > #line 2930 "conf_parser.y" /* yacc.c:1646  */
6348      {
6349 <  if (conf_parser_ctx.pass == 2)
7612 <  {
7613 <    /*
7614 <     * since we re-allocate yy_conf/yy_aconf after the end of action=, at the
7615 <     * end we will have one extra, so we should free it.
7616 <     */
7617 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
7618 <    {
7619 <      delete_conf_item(yy_conf);
7620 <      yy_conf = NULL;
7621 <      yy_aconf = NULL;
7622 <    }
7623 <  }
6349 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6350   }
6351 + #line 6352 "conf_parser.c" /* yacc.c:1646  */
6352      break;
6353  
6354 <  case 614:
6355 <
7629 < /* Line 1464 of yacc.c  */
7630 < #line 3372 "ircd_parser.y"
6354 >  case 605:
6355 > #line 2933 "conf_parser.y" /* yacc.c:1646  */
6356      {
6357 <  if (conf_parser_ctx.pass == 2)
7633 <    ConfigFileEntry.glines = yylval.number;
6357 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6358   }
6359 + #line 6360 "conf_parser.c" /* yacc.c:1646  */
6360      break;
6361  
6362 <  case 615:
6363 <
7639 < /* Line 1464 of yacc.c  */
7640 < #line 3378 "ircd_parser.y"
6362 >  case 606:
6363 > #line 2936 "conf_parser.y" /* yacc.c:1646  */
6364      {
6365 <  if (conf_parser_ctx.pass == 2)
7643 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
6365 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6366   }
6367 + #line 6368 "conf_parser.c" /* yacc.c:1646  */
6368      break;
6369  
6370 <  case 616:
6371 <
7649 < /* Line 1464 of yacc.c  */
7650 < #line 3384 "ircd_parser.y"
6370 >  case 607:
6371 > #line 2939 "conf_parser.y" /* yacc.c:1646  */
6372      {
6373 <  if (conf_parser_ctx.pass == 2)
7653 <    ConfigFileEntry.gline_logging = 0;
6373 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6374   }
6375 + #line 6376 "conf_parser.c" /* yacc.c:1646  */
6376      break;
6377  
6378 <  case 620:
6379 <
7659 < /* Line 1464 of yacc.c  */
7660 < #line 3390 "ircd_parser.y"
6378 >  case 608:
6379 > #line 2942 "conf_parser.y" /* yacc.c:1646  */
6380      {
6381 <  if (conf_parser_ctx.pass == 2)
7663 <    ConfigFileEntry.gline_logging |= GDENY_REJECT;
6381 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6382   }
6383 + #line 6384 "conf_parser.c" /* yacc.c:1646  */
6384      break;
6385  
6386 <  case 621:
6387 <
7669 < /* Line 1464 of yacc.c  */
7670 < #line 3394 "ircd_parser.y"
6386 >  case 609:
6387 > #line 2945 "conf_parser.y" /* yacc.c:1646  */
6388      {
6389 <  if (conf_parser_ctx.pass == 2)
7673 <    ConfigFileEntry.gline_logging |= GDENY_BLOCK;
6389 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6390   }
6391 + #line 6392 "conf_parser.c" /* yacc.c:1646  */
6392      break;
6393  
6394 <  case 622:
6395 <
7679 < /* Line 1464 of yacc.c  */
7680 < #line 3400 "ircd_parser.y"
7681 <    {
7682 <  if (conf_parser_ctx.pass == 2)
7683 <  {
7684 <    struct split_nuh_item nuh;
7685 <
7686 <    nuh.nuhmask  = yylval.string;
7687 <    nuh.nickptr  = NULL;
7688 <    nuh.userptr  = userbuf;
7689 <    nuh.hostptr  = hostbuf;
7690 <
7691 <    nuh.nicksize = 0;
7692 <    nuh.usersize = sizeof(userbuf);
7693 <    nuh.hostsize = sizeof(hostbuf);
7694 <
7695 <    split_nuh(&nuh);
7696 <
7697 <    if (yy_aconf->user == NULL)
7698 <    {
7699 <      DupString(yy_aconf->user, userbuf);
7700 <      DupString(yy_aconf->host, hostbuf);
7701 <    }
7702 <    else
6394 >  case 610:
6395 > #line 2948 "conf_parser.y" /* yacc.c:1646  */
6396      {
6397 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
7705 <
7706 <      DupString(yy_tmp->user, userbuf);
7707 <      DupString(yy_tmp->host, hostbuf);
7708 <
7709 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
7710 <    }
7711 <  }
6397 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6398   }
6399 + #line 6400 "conf_parser.c" /* yacc.c:1646  */
6400      break;
6401  
6402 <  case 623:
6403 <
7717 < /* Line 1464 of yacc.c  */
7718 < #line 3434 "ircd_parser.y"
6402 >  case 611:
6403 > #line 2951 "conf_parser.y" /* yacc.c:1646  */
6404      {
6405 <  if (conf_parser_ctx.pass == 2)  
7721 <  {
7722 <    MyFree(yy_conf->name);
7723 <    DupString(yy_conf->name, yylval.string);
7724 <  }
6405 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6406   }
6407 + #line 6408 "conf_parser.c" /* yacc.c:1646  */
6408      break;
6409  
6410 <  case 624:
6411 <
7730 < /* Line 1464 of yacc.c  */
7731 < #line 3443 "ircd_parser.y"
6410 >  case 612:
6411 > #line 2954 "conf_parser.y" /* yacc.c:1646  */
6412      {
6413 <  if (conf_parser_ctx.pass == 2)
7734 <    yy_aconf->flags = 0;
6413 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6414   }
6415 + #line 6416 "conf_parser.c" /* yacc.c:1646  */
6416      break;
6417  
6418 <  case 625:
6419 <
7740 < /* Line 1464 of yacc.c  */
7741 < #line 3447 "ircd_parser.y"
6418 >  case 613:
6419 > #line 2959 "conf_parser.y" /* yacc.c:1646  */
6420      {
6421 <  if (conf_parser_ctx.pass == 2)
7744 <  {
7745 <    struct CollectItem *yy_tmp = NULL;
7746 <    dlink_node *ptr, *next_ptr;
7747 <
7748 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
7749 <    {
7750 <      struct AccessItem *new_aconf;
7751 <      struct ConfItem *new_conf;
7752 <
7753 <      yy_tmp = ptr->data;
7754 <      new_conf = make_conf_item(GDENY_TYPE);
7755 <      new_aconf = map_to_conf(new_conf);
7756 <
7757 <      new_aconf->flags = yy_aconf->flags;
7758 <
7759 <      if (yy_conf->name != NULL)
7760 <        DupString(new_conf->name, yy_conf->name);
7761 <      else
7762 <        DupString(new_conf->name, "*");
7763 <      if (yy_aconf->user != NULL)
7764 <         DupString(new_aconf->user, yy_tmp->user);
7765 <      else  
7766 <        DupString(new_aconf->user, "*");
7767 <      if (yy_aconf->host != NULL)
7768 <        DupString(new_aconf->host, yy_tmp->host);
7769 <      else
7770 <        DupString(new_aconf->host, "*");
7771 <
7772 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
7773 <    }
7774 <
7775 <    /*
7776 <     * In case someone has fed us with more than one action= after user/name
7777 <     * which would leak memory  -Michael
7778 <     */
7779 <    if (yy_conf->name == NULL || yy_aconf->user == NULL)
7780 <      delete_conf_item(yy_conf);
7781 <
7782 <    yy_conf = make_conf_item(GDENY_TYPE);
7783 <    yy_aconf = map_to_conf(yy_conf);
7784 <  }
6421 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6422   }
6423 + #line 6424 "conf_parser.c" /* yacc.c:1646  */
6424      break;
6425  
6426 <  case 628:
6427 <
7790 < /* Line 1464 of yacc.c  */
7791 < #line 3494 "ircd_parser.y"
6426 >  case 614:
6427 > #line 2964 "conf_parser.y" /* yacc.c:1646  */
6428      {
6429 <  if (conf_parser_ctx.pass == 2)
7794 <    yy_aconf->flags |= GDENY_REJECT;
6429 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6430   }
6431 + #line 6432 "conf_parser.c" /* yacc.c:1646  */
6432      break;
6433  
6434 <  case 629:
6435 <
7800 < /* Line 1464 of yacc.c  */
7801 < #line 3498 "ircd_parser.y"
6434 >  case 615:
6435 > #line 2969 "conf_parser.y" /* yacc.c:1646  */
6436      {
6437 <  if (conf_parser_ctx.pass == 2)
7804 <    yy_aconf->flags |= GDENY_BLOCK;
6437 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6438   }
6439 + #line 6440 "conf_parser.c" /* yacc.c:1646  */
6440      break;
6441  
6442 <  case 652:
6443 <
7810 < /* Line 1464 of yacc.c  */
7811 < #line 3522 "ircd_parser.y"
6442 >  case 634:
6443 > #line 2998 "conf_parser.y" /* yacc.c:1646  */
6444      {
6445    ConfigChannel.disable_fake_channels = yylval.number;
6446   }
6447 + #line 6448 "conf_parser.c" /* yacc.c:1646  */
6448      break;
6449  
6450 <  case 653:
6451 <
7819 < /* Line 1464 of yacc.c  */
7820 < #line 3527 "ircd_parser.y"
6450 >  case 635:
6451 > #line 3003 "conf_parser.y" /* yacc.c:1646  */
6452      {
6453 <  ConfigChannel.restrict_channels = yylval.number;
6453 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6454   }
6455 + #line 6456 "conf_parser.c" /* yacc.c:1646  */
6456      break;
6457  
6458 <  case 654:
6459 <
7828 < /* Line 1464 of yacc.c  */
7829 < #line 3532 "ircd_parser.y"
6458 >  case 636:
6459 > #line 3008 "conf_parser.y" /* yacc.c:1646  */
6460      {
6461 <  ConfigChannel.disable_local_channels = yylval.number;
6461 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6462   }
6463 + #line 6464 "conf_parser.c" /* yacc.c:1646  */
6464      break;
6465  
6466 <  case 655:
6467 <
7837 < /* Line 1464 of yacc.c  */
7838 < #line 3537 "ircd_parser.y"
6466 >  case 637:
6467 > #line 3013 "conf_parser.y" /* yacc.c:1646  */
6468      {
6469 <  ConfigChannel.use_except = yylval.number;
6469 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6470   }
6471 + #line 6472 "conf_parser.c" /* yacc.c:1646  */
6472      break;
6473  
6474 <  case 656:
6475 <
7846 < /* Line 1464 of yacc.c  */
7847 < #line 3542 "ircd_parser.y"
6474 >  case 638:
6475 > #line 3018 "conf_parser.y" /* yacc.c:1646  */
6476      {
6477 <  ConfigChannel.use_invex = yylval.number;
6477 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6478   }
6479 + #line 6480 "conf_parser.c" /* yacc.c:1646  */
6480      break;
6481  
6482 <  case 657:
6483 <
7855 < /* Line 1464 of yacc.c  */
7856 < #line 3547 "ircd_parser.y"
6482 >  case 639:
6483 > #line 3023 "conf_parser.y" /* yacc.c:1646  */
6484      {
6485 <  ConfigChannel.use_knock = yylval.number;
6485 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6486   }
6487 + #line 6488 "conf_parser.c" /* yacc.c:1646  */
6488      break;
6489  
6490 <  case 658:
6491 <
7864 < /* Line 1464 of yacc.c  */
7865 < #line 3552 "ircd_parser.y"
6490 >  case 640:
6491 > #line 3028 "conf_parser.y" /* yacc.c:1646  */
6492      {
6493 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
6493 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6494   }
6495 + #line 6496 "conf_parser.c" /* yacc.c:1646  */
6496      break;
6497  
6498 <  case 659:
6499 <
7873 < /* Line 1464 of yacc.c  */
7874 < #line 3557 "ircd_parser.y"
6498 >  case 641:
6499 > #line 3033 "conf_parser.y" /* yacc.c:1646  */
6500      {
6501 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
6501 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6502   }
6503 + #line 6504 "conf_parser.c" /* yacc.c:1646  */
6504      break;
6505  
6506 <  case 660:
6507 <
7882 < /* Line 1464 of yacc.c  */
7883 < #line 3562 "ircd_parser.y"
7884 <    {
7885 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
7886 < }
7887 <    break;
7888 <
7889 <  case 661:
7890 <
7891 < /* Line 1464 of yacc.c  */
7892 < #line 3567 "ircd_parser.y"
6506 >  case 642:
6507 > #line 3038 "conf_parser.y" /* yacc.c:1646  */
6508      {
6509 <  ConfigChannel.quiet_on_ban = yylval.number;
6509 >  ConfigChannel.default_split_user_count = (yyvsp[-1].number);
6510   }
6511 + #line 6512 "conf_parser.c" /* yacc.c:1646  */
6512      break;
6513  
6514 <  case 662:
6515 <
7900 < /* Line 1464 of yacc.c  */
7901 < #line 3572 "ircd_parser.y"
6514 >  case 643:
6515 > #line 3043 "conf_parser.y" /* yacc.c:1646  */
6516      {
6517 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
6517 >  ConfigChannel.default_split_server_count = (yyvsp[-1].number);
6518   }
6519 + #line 6520 "conf_parser.c" /* yacc.c:1646  */
6520      break;
6521  
6522 <  case 663:
6523 <
7909 < /* Line 1464 of yacc.c  */
7910 < #line 3577 "ircd_parser.y"
7911 <    {
7912 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
7913 < }
7914 <    break;
7915 <
7916 <  case 664:
7917 <
7918 < /* Line 1464 of yacc.c  */
7919 < #line 3582 "ircd_parser.y"
7920 <    {
7921 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
7922 < }
7923 <    break;
7924 <
7925 <  case 665:
7926 <
7927 < /* Line 1464 of yacc.c  */
7928 < #line 3587 "ircd_parser.y"
6522 >  case 644:
6523 > #line 3048 "conf_parser.y" /* yacc.c:1646  */
6524      {
6525    ConfigChannel.no_create_on_split = yylval.number;
6526   }
6527 + #line 6528 "conf_parser.c" /* yacc.c:1646  */
6528      break;
6529  
6530 <  case 666:
6531 <
7936 < /* Line 1464 of yacc.c  */
7937 < #line 3592 "ircd_parser.y"
6530 >  case 645:
6531 > #line 3053 "conf_parser.y" /* yacc.c:1646  */
6532      {
6533    ConfigChannel.no_join_on_split = yylval.number;
6534   }
6535 + #line 6536 "conf_parser.c" /* yacc.c:1646  */
6536      break;
6537  
6538 <  case 667:
6539 <
7945 < /* Line 1464 of yacc.c  */
7946 < #line 3597 "ircd_parser.y"
6538 >  case 646:
6539 > #line 3058 "conf_parser.y" /* yacc.c:1646  */
6540      {
6541 <  ConfigChannel.burst_topicwho = yylval.number;
6541 >  GlobalSetOptions.joinfloodcount = yylval.number;
6542   }
6543 + #line 6544 "conf_parser.c" /* yacc.c:1646  */
6544      break;
6545  
6546 <  case 668:
6547 <
7954 < /* Line 1464 of yacc.c  */
7955 < #line 3602 "ircd_parser.y"
6546 >  case 647:
6547 > #line 3063 "conf_parser.y" /* yacc.c:1646  */
6548      {
6549 <  GlobalSetOptions.joinfloodcount = yylval.number;
6549 >  GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
6550   }
6551 + #line 6552 "conf_parser.c" /* yacc.c:1646  */
6552      break;
6553  
6554 <  case 669:
6555 <
7963 < /* Line 1464 of yacc.c  */
7964 < #line 3607 "ircd_parser.y"
6554 >  case 660:
6555 > #line 3085 "conf_parser.y" /* yacc.c:1646  */
6556      {
6557 <  GlobalSetOptions.joinfloodtime = yylval.number;
6557 >  if (conf_parser_ctx.pass == 2)
6558 >    ConfigServerHide.flatten_links = yylval.number;
6559   }
6560 + #line 6561 "conf_parser.c" /* yacc.c:1646  */
6561      break;
6562  
6563 <  case 681:
6564 <
7972 < /* Line 1464 of yacc.c  */
7973 < #line 3626 "ircd_parser.y"
6563 >  case 661:
6564 > #line 3091 "conf_parser.y" /* yacc.c:1646  */
6565      {
6566    if (conf_parser_ctx.pass == 2)
6567 <    ConfigServerHide.flatten_links = yylval.number;
6567 >    ConfigServerHide.disable_remote_commands = yylval.number;
6568   }
6569 + #line 6570 "conf_parser.c" /* yacc.c:1646  */
6570      break;
6571  
6572 <  case 682:
6573 <
7982 < /* Line 1464 of yacc.c  */
7983 < #line 3632 "ircd_parser.y"
6572 >  case 662:
6573 > #line 3097 "conf_parser.y" /* yacc.c:1646  */
6574      {
6575    if (conf_parser_ctx.pass == 2)
6576      ConfigServerHide.hide_servers = yylval.number;
6577   }
6578 + #line 6579 "conf_parser.c" /* yacc.c:1646  */
6579      break;
6580  
6581 <  case 683:
6581 >  case 663:
6582 > #line 3103 "conf_parser.y" /* yacc.c:1646  */
6583 >    {
6584 >  if (conf_parser_ctx.pass == 2)
6585 >    ConfigServerHide.hide_services = yylval.number;
6586 > }
6587 > #line 6588 "conf_parser.c" /* yacc.c:1646  */
6588 >    break;
6589  
6590 < /* Line 1464 of yacc.c  */
6591 < #line 3638 "ircd_parser.y"
6590 >  case 664:
6591 > #line 3109 "conf_parser.y" /* yacc.c:1646  */
6592      {
6593    if (conf_parser_ctx.pass == 2)
6594    {
6595      MyFree(ConfigServerHide.hidden_name);
6596 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6596 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6597    }
6598   }
6599 + #line 6600 "conf_parser.c" /* yacc.c:1646  */
6600      break;
6601  
6602 <  case 684:
6603 <
8005 < /* Line 1464 of yacc.c  */
8006 < #line 3647 "ircd_parser.y"
6602 >  case 665:
6603 > #line 3118 "conf_parser.y" /* yacc.c:1646  */
6604      {
6605    if (conf_parser_ctx.pass == 2)
6606    {
6607 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6607 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6608      {
6609 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6609 >      event_write_links_file.when = (yyvsp[-1].number);
6610 >      event_addish(&event_write_links_file, NULL);
6611        ConfigServerHide.links_disabled = 0;
6612      }
6613  
6614 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6614 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6615    }
6616   }
6617 + #line 6618 "conf_parser.c" /* yacc.c:1646  */
6618      break;
6619  
6620 <  case 685:
6621 <
8023 < /* Line 1464 of yacc.c  */
8024 < #line 3661 "ircd_parser.y"
6620 >  case 666:
6621 > #line 3133 "conf_parser.y" /* yacc.c:1646  */
6622      {
6623    if (conf_parser_ctx.pass == 2)
6624      ConfigServerHide.hidden = yylval.number;
6625   }
6626 + #line 6627 "conf_parser.c" /* yacc.c:1646  */
6627      break;
6628  
6629 <  case 686:
6630 <
8033 < /* Line 1464 of yacc.c  */
8034 < #line 3667 "ircd_parser.y"
8035 <    {
8036 <  if (conf_parser_ctx.pass == 2)
8037 <    ConfigServerHide.disable_hidden = yylval.number;
8038 < }
8039 <    break;
8040 <
8041 <  case 687:
8042 <
8043 < /* Line 1464 of yacc.c  */
8044 < #line 3673 "ircd_parser.y"
6629 >  case 667:
6630 > #line 3139 "conf_parser.y" /* yacc.c:1646  */
6631      {
6632    if (conf_parser_ctx.pass == 2)
6633      ConfigServerHide.hide_server_ips = yylval.number;
6634   }
6635 + #line 6636 "conf_parser.c" /* yacc.c:1646  */
6636      break;
6637  
6638  
6639 <
8053 < /* Line 1464 of yacc.c  */
8054 < #line 8055 "ircd_parser.c"
6639 > #line 6640 "conf_parser.c" /* yacc.c:1646  */
6640        default: break;
6641      }
6642 +  /* User semantic actions sometimes alter yychar, and that requires
6643 +     that yytoken be updated with the new translation.  We take the
6644 +     approach of translating immediately before every use of yytoken.
6645 +     One alternative is translating here after every semantic action,
6646 +     but that translation would be missed if the semantic action invokes
6647 +     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
6648 +     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
6649 +     incorrect destructor might then be invoked immediately.  In the
6650 +     case of YYERROR or YYBACKUP, subsequent parser actions might lead
6651 +     to an incorrect destructor call or verbose syntax error message
6652 +     before the lookahead is translated.  */
6653    YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
6654  
6655    YYPOPSTACK (yylen);
# Line 8062 | Line 6658 | yyreduce:
6658  
6659    *++yyvsp = yyval;
6660  
6661 <  /* Now `shift' the result of the reduction.  Determine what state
6661 >  /* Now 'shift' the result of the reduction.  Determine what state
6662       that goes to, based on the state we popped back to and the rule
6663       number reduced by.  */
6664  
# Line 8077 | Line 6673 | yyreduce:
6673    goto yynewstate;
6674  
6675  
6676 < /*------------------------------------.
6677 < | yyerrlab -- here on detecting error |
6678 < `------------------------------------*/
6676 > /*--------------------------------------.
6677 > | yyerrlab -- here on detecting error.  |
6678 > `--------------------------------------*/
6679   yyerrlab:
6680 +  /* Make sure we have latest lookahead translation.  See comments at
6681 +     user semantic actions for why this is necessary.  */
6682 +  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
6683 +
6684    /* If not already recovering from an error, report this error.  */
6685    if (!yyerrstatus)
6686      {
# Line 8088 | Line 6688 | yyerrlab:
6688   #if ! YYERROR_VERBOSE
6689        yyerror (YY_("syntax error"));
6690   #else
6691 + # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
6692 +                                        yyssp, yytoken)
6693        {
6694 <        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
6695 <        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
6696 <          {
6697 <            YYSIZE_T yyalloc = 2 * yysize;
6698 <            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
6699 <              yyalloc = YYSTACK_ALLOC_MAXIMUM;
6700 <            if (yymsg != yymsgbuf)
6701 <              YYSTACK_FREE (yymsg);
6702 <            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
6703 <            if (yymsg)
6704 <              yymsg_alloc = yyalloc;
6705 <            else
6706 <              {
6707 <                yymsg = yymsgbuf;
6708 <                yymsg_alloc = sizeof yymsgbuf;
6709 <              }
6710 <          }
6711 <
6712 <        if (0 < yysize && yysize <= yymsg_alloc)
6713 <          {
6714 <            (void) yysyntax_error (yymsg, yystate, yychar);
6715 <            yyerror (yymsg);
6716 <          }
6717 <        else
6718 <          {
8117 <            yyerror (YY_("syntax error"));
8118 <            if (yysize != 0)
8119 <              goto yyexhaustedlab;
8120 <          }
6694 >        char const *yymsgp = YY_("syntax error");
6695 >        int yysyntax_error_status;
6696 >        yysyntax_error_status = YYSYNTAX_ERROR;
6697 >        if (yysyntax_error_status == 0)
6698 >          yymsgp = yymsg;
6699 >        else if (yysyntax_error_status == 1)
6700 >          {
6701 >            if (yymsg != yymsgbuf)
6702 >              YYSTACK_FREE (yymsg);
6703 >            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
6704 >            if (!yymsg)
6705 >              {
6706 >                yymsg = yymsgbuf;
6707 >                yymsg_alloc = sizeof yymsgbuf;
6708 >                yysyntax_error_status = 2;
6709 >              }
6710 >            else
6711 >              {
6712 >                yysyntax_error_status = YYSYNTAX_ERROR;
6713 >                yymsgp = yymsg;
6714 >              }
6715 >          }
6716 >        yyerror (yymsgp);
6717 >        if (yysyntax_error_status == 2)
6718 >          goto yyexhaustedlab;
6719        }
6720 + # undef YYSYNTAX_ERROR
6721   #endif
6722      }
6723  
# Line 8127 | Line 6726 | yyerrlab:
6726    if (yyerrstatus == 3)
6727      {
6728        /* If just tried and failed to reuse lookahead token after an
6729 <         error, discard it.  */
6729 >         error, discard it.  */
6730  
6731        if (yychar <= YYEOF)
6732 <        {
6733 <          /* Return failure if at end of input.  */
6734 <          if (yychar == YYEOF)
6735 <            YYABORT;
6736 <        }
6732 >        {
6733 >          /* Return failure if at end of input.  */
6734 >          if (yychar == YYEOF)
6735 >            YYABORT;
6736 >        }
6737        else
6738 <        {
6739 <          yydestruct ("Error: discarding",
6740 <                      yytoken, &yylval);
6741 <          yychar = YYEMPTY;
6742 <        }
6738 >        {
6739 >          yydestruct ("Error: discarding",
6740 >                      yytoken, &yylval);
6741 >          yychar = YYEMPTY;
6742 >        }
6743      }
6744  
6745    /* Else will try to reuse lookahead token after shifting the error
# Line 8159 | Line 6758 | yyerrorlab:
6758    if (/*CONSTCOND*/ 0)
6759       goto yyerrorlab;
6760  
6761 <  /* Do not reclaim the symbols of the rule which action triggered
6761 >  /* Do not reclaim the symbols of the rule whose action triggered
6762       this YYERROR.  */
6763    YYPOPSTACK (yylen);
6764    yylen = 0;
# Line 8172 | Line 6771 | yyerrorlab:
6771   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6772   `-------------------------------------------------------------*/
6773   yyerrlab1:
6774 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6774 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6775  
6776    for (;;)
6777      {
6778        yyn = yypact[yystate];
6779 <      if (yyn != YYPACT_NINF)
6780 <        {
6781 <          yyn += YYTERROR;
6782 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6783 <            {
6784 <              yyn = yytable[yyn];
6785 <              if (0 < yyn)
6786 <                break;
6787 <            }
6788 <        }
6779 >      if (!yypact_value_is_default (yyn))
6780 >        {
6781 >          yyn += YYTERROR;
6782 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6783 >            {
6784 >              yyn = yytable[yyn];
6785 >              if (0 < yyn)
6786 >                break;
6787 >            }
6788 >        }
6789  
6790        /* Pop the current state because it cannot handle the error token.  */
6791        if (yyssp == yyss)
6792 <        YYABORT;
6792 >        YYABORT;
6793  
6794  
6795        yydestruct ("Error: popping",
6796 <                  yystos[yystate], yyvsp);
6796 >                  yystos[yystate], yyvsp);
6797        YYPOPSTACK (1);
6798        yystate = *yyssp;
6799        YY_STACK_PRINT (yyss, yyssp);
6800      }
6801  
6802 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6803    *++yyvsp = yylval;
6804 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6805  
6806  
6807    /* Shift the error token.  */
# Line 8224 | Line 6825 | yyabortlab:
6825    yyresult = 1;
6826    goto yyreturn;
6827  
6828 < #if !defined(yyoverflow) || YYERROR_VERBOSE
6828 > #if !defined yyoverflow || YYERROR_VERBOSE
6829   /*-------------------------------------------------.
6830   | yyexhaustedlab -- memory exhaustion comes here.  |
6831   `-------------------------------------------------*/
# Line 8236 | Line 6837 | yyexhaustedlab:
6837  
6838   yyreturn:
6839    if (yychar != YYEMPTY)
6840 <     yydestruct ("Cleanup: discarding lookahead",
6841 <                 yytoken, &yylval);
6842 <  /* Do not reclaim the symbols of the rule which action triggered
6840 >    {
6841 >      /* Make sure we have latest lookahead translation.  See comments at
6842 >         user semantic actions for why this is necessary.  */
6843 >      yytoken = YYTRANSLATE (yychar);
6844 >      yydestruct ("Cleanup: discarding lookahead",
6845 >                  yytoken, &yylval);
6846 >    }
6847 >  /* Do not reclaim the symbols of the rule whose action triggered
6848       this YYABORT or YYACCEPT.  */
6849    YYPOPSTACK (yylen);
6850    YY_STACK_PRINT (yyss, yyssp);
6851    while (yyssp != yyss)
6852      {
6853        yydestruct ("Cleanup: popping",
6854 <                  yystos[*yyssp], yyvsp);
6854 >                  yystos[*yyssp], yyvsp);
6855        YYPOPSTACK (1);
6856      }
6857   #ifndef yyoverflow
# Line 8256 | Line 6862 | yyreturn:
6862    if (yymsg != yymsgbuf)
6863      YYSTACK_FREE (yymsg);
6864   #endif
6865 <  /* Make sure YYID is used.  */
8260 <  return YYID (yyresult);
6865 >  return yyresult;
6866   }
8262
8263
8264

Comparing:
ircd-hybrid-7.3/src/ircd_parser.c (property svn:keywords), Revision 1119 by michael, Fri Jan 7 22:01:47 2011 UTC vs.
ircd-hybrid/trunk/src/conf_parser.c (property svn:keywords), Revision 4967 by michael, Mon Dec 1 14:34:29 2014 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

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