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

Comparing:
ircd-hybrid-8/src/conf_parser.c (file contents), Revision 1549 by michael, Mon Oct 1 18:11:11 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf_parser.c (file contents), Revision 4988 by michael, Mon Dec 8 20:04:42 2014 UTC

# Line 1 | Line 1
1 < /* A Bison parser, made by GNU Bison 2.6.2.  */
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-2012 Free Software Foundation, Inc.
6 <  
4 >
5 >   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
6 >
7     This program is free software: you can redistribute it and/or modify
8     it under the terms of the GNU General Public License as published by
9     the Free Software Foundation, either version 3 of the License, or
10     (at your option) any later version.
11 <  
11 >
12     This program is distributed in the hope that it will be useful,
13     but WITHOUT ANY WARRANTY; without even the implied warranty of
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     GNU General Public License for more details.
16 <  
16 >
17     You should have received a copy of the GNU General Public License
18     along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
19  
# Line 26 | Line 26
26     special exception, which will cause the skeleton and the resulting
27     Bison output files to be licensed under the GNU General Public
28     License without this special exception.
29 <  
29 >
30     This special exception was added by the Free Software Foundation in
31     version 2.2 of Bison.  */
32  
# Line 44 | Line 44
44   #define YYBISON 1
45  
46   /* Bison version.  */
47 < #define YYBISON_VERSION "2.6.2"
47 > #define YYBISON_VERSION "3.0.2"
48  
49   /* Skeleton name.  */
50   #define YYSKELETON_NAME "yacc.c"
# Line 62 | Line 62
62  
63  
64   /* Copy the first part of user declarations.  */
65 < /* Line 336 of yacc.c  */
66 < #line 25 "conf_parser.y"
65 > #line 28 "conf_parser.y" /* yacc.c:339  */
66  
67  
68   #define YY_NO_UNPUT
# Line 75 | Line 74
74   #include "ircd.h"
75   #include "list.h"
76   #include "conf.h"
77 + #include "conf_class.h"
78 + #include "conf_pseudo.h"
79   #include "event.h"
80   #include "log.h"
81   #include "client.h"     /* for UMODE_ALL only */
82   #include "irc_string.h"
82 #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>
# Line 97 | Line 98
98   #include <openssl/dh.h>
99   #endif
100  
101 < int yylex(void);
101 > #include "rsa.h"
102  
103 < static char *class_name = NULL;
103 < static struct ConfItem *yy_conf = NULL;
104 < static struct AccessItem *yy_aconf = NULL;
105 < static struct MatchItem *yy_match_item = NULL;
106 < static struct ClassItem *yy_class = NULL;
107 < static char *yy_class_name = NULL;
108 <
109 < static dlink_list col_conf_list  = { NULL, NULL, 0 };
110 < static unsigned int listener_flags = 0;
111 < static unsigned int regex_ban = 0;
112 < static char userbuf[IRCD_BUFSIZE];
113 < static char hostbuf[IRCD_BUFSIZE];
114 < static char reasonbuf[REASONLEN + 1];
115 < static char gecos_name[REALLEN * 4];
116 < static char lfile[IRCD_BUFSIZE];
117 < static unsigned int ltype = 0;
118 < static unsigned int lsize = 0;
119 < static char *resv_reason = NULL;
120 < static char *listener_address = NULL;
103 > int yylex(void);
104  
105 < struct CollectItem
105 > static struct
106   {
107 <  dlink_node node;
108 <  char *name;
109 <  char *user;
110 <  char *host;
111 <  char *passwd;
112 <  int  port;
113 <  int  flags;
114 < #ifdef HAVE_LIBCRYPTO
115 <  char *rsa_public_key_file;
116 <  RSA *rsa_public_key;
117 < #endif
118 < };
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 < free_collect_item(struct CollectItem *item)
160 > reset_block_state(void)
161   {
162 <  MyFree(item->name);
163 <  MyFree(item->user);
164 <  MyFree(item->host);
165 <  MyFree(item->passwd);
166 < #ifdef HAVE_LIBCRYPTO
167 <  MyFree(item->rsa_public_key_file);
168 < #endif
169 <  MyFree(item);
162 >  dlink_node *node = NULL, *node_next = NULL;
163 >
164 >  DLINK_FOREACH_SAFE(node, node_next, block_state.mask.list.head)
165 >  {
166 >    MyFree(node->data);
167 >    dlinkDelete(node, &block_state.mask.list);
168 >    free_dlink_node(node);
169 >  }
170 >
171 >  DLINK_FOREACH_SAFE(node, node_next, block_state.leaf.list.head)
172 >  {
173 >    MyFree(node->data);
174 >    dlinkDelete(node, &block_state.leaf.list);
175 >    free_dlink_node(node);
176 >  }
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  
188  
189 < /* Line 336 of yacc.c  */
152 < #line 153 "conf_parser.c"
189 > #line 190 "conf_parser.c" /* yacc.c:339  */
190  
191 < # ifndef YY_NULL
191 > # ifndef YY_NULLPTR
192   #  if defined __cplusplus && 201103L <= __cplusplus
193 < #   define YY_NULL nullptr
193 > #   define YY_NULLPTR nullptr
194   #  else
195 < #   define YY_NULL 0
195 > #   define YY_NULLPTR 0
196   #  endif
197   # endif
198  
# Line 169 | Line 206 | free_collect_item(struct CollectItem *it
206  
207   /* In a future release of Bison, this section will be replaced
208     by #include "y.tab.h".  */
209 < #ifndef YY_Y_TAB_H
210 < # define YY_Y_TAB_H
211 < /* Enabling traces.  */
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
# Line 179 | Line 216 | free_collect_item(struct CollectItem *it
216   extern int yydebug;
217   #endif
218  
219 < /* 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 <     ADMIN = 259,
227 <     AFTYPE = 260,
228 <     ANTI_NICK_FLOOD = 261,
229 <     ANTI_SPAM_EXIT_MESSAGE_TIME = 262,
230 <     AUTOCONN = 263,
231 <     BYTES = 264,
232 <     KBYTES = 265,
233 <     MBYTES = 266,
234 <     CALLER_ID_WAIT = 267,
235 <     CAN_FLOOD = 268,
236 <     CHANNEL = 269,
237 <     CIDR_BITLEN_IPV4 = 270,
238 <     CIDR_BITLEN_IPV6 = 271,
239 <     CLASS = 272,
240 <     CONNECT = 273,
241 <     CONNECTFREQ = 274,
242 <     DEFAULT_FLOODCOUNT = 275,
243 <     DEFAULT_SPLIT_SERVER_COUNT = 276,
244 <     DEFAULT_SPLIT_USER_COUNT = 277,
245 <     DENY = 278,
246 <     DESCRIPTION = 279,
247 <     DIE = 280,
248 <     DISABLE_AUTH = 281,
249 <     DISABLE_FAKE_CHANNELS = 282,
250 <     DISABLE_REMOTE_COMMANDS = 283,
251 <     DOTS_IN_IDENT = 284,
252 <     EGDPOOL_PATH = 285,
253 <     EMAIL = 286,
254 <     ENCRYPTED = 287,
255 <     EXCEED_LIMIT = 288,
256 <     EXEMPT = 289,
257 <     FAILED_OPER_NOTICE = 290,
258 <     IRCD_FLAGS = 291,
259 <     FLATTEN_LINKS = 292,
260 <     GECOS = 293,
261 <     GENERAL = 294,
262 <     GLINE = 295,
263 <     GLINE_DURATION = 296,
264 <     GLINE_ENABLE = 297,
265 <     GLINE_EXEMPT = 298,
266 <     GLINE_REQUEST_DURATION = 299,
267 <     GLINE_MIN_CIDR = 300,
268 <     GLINE_MIN_CIDR6 = 301,
269 <     GLOBAL_KILL = 302,
270 <     IRCD_AUTH = 303,
271 <     NEED_IDENT = 304,
272 <     HAVENT_READ_CONF = 305,
273 <     HIDDEN = 306,
274 <     HIDDEN_NAME = 307,
275 <     HIDE_SERVER_IPS = 308,
276 <     HIDE_SERVERS = 309,
277 <     HIDE_SPOOF_IPS = 310,
278 <     HOST = 311,
279 <     HUB = 312,
280 <     HUB_MASK = 313,
281 <     IGNORE_BOGUS_TS = 314,
282 <     INVISIBLE_ON_CONNECT = 315,
283 <     IP = 316,
284 <     KILL = 317,
285 <     KILL_CHASE_TIME_LIMIT = 318,
286 <     KLINE = 319,
287 <     KLINE_EXEMPT = 320,
288 <     KNOCK_DELAY = 321,
289 <     KNOCK_DELAY_CHANNEL = 322,
290 <     LEAF_MASK = 323,
291 <     LINKS_DELAY = 324,
292 <     LISTEN = 325,
293 <     T_LOG = 326,
294 <     MAX_ACCEPT = 327,
295 <     MAX_BANS = 328,
296 <     MAX_CHANS_PER_OPER = 329,
297 <     MAX_CHANS_PER_USER = 330,
298 <     MAX_GLOBAL = 331,
299 <     MAX_IDENT = 332,
300 <     MAX_LOCAL = 333,
301 <     MAX_NICK_CHANGES = 334,
302 <     MAX_NICK_TIME = 335,
303 <     MAX_NUMBER = 336,
304 <     MAX_TARGETS = 337,
305 <     MAX_WATCH = 338,
306 <     MESSAGE_LOCALE = 339,
307 <     MIN_NONWILDCARD = 340,
308 <     MIN_NONWILDCARD_SIMPLE = 341,
309 <     MODULE = 342,
310 <     MODULES = 343,
311 <     NAME = 344,
312 <     NEED_PASSWORD = 345,
313 <     NETWORK_DESC = 346,
314 <     NETWORK_NAME = 347,
315 <     NICK = 348,
316 <     NICK_CHANGES = 349,
317 <     NO_CREATE_ON_SPLIT = 350,
318 <     NO_JOIN_ON_SPLIT = 351,
319 <     NO_OPER_FLOOD = 352,
320 <     NO_TILDE = 353,
321 <     NUMBER = 354,
322 <     NUMBER_PER_CIDR = 355,
323 <     NUMBER_PER_IP = 356,
324 <     OPERATOR = 357,
325 <     OPERS_BYPASS_CALLERID = 358,
326 <     OPER_ONLY_UMODES = 359,
327 <     OPER_PASS_RESV = 360,
328 <     OPER_SPY_T = 361,
329 <     OPER_UMODES = 362,
330 <     JOIN_FLOOD_COUNT = 363,
331 <     JOIN_FLOOD_TIME = 364,
332 <     PACE_WAIT = 365,
333 <     PACE_WAIT_SIMPLE = 366,
334 <     PASSWORD = 367,
335 <     PATH = 368,
336 <     PING_COOKIE = 369,
337 <     PING_TIME = 370,
338 <     PING_WARNING = 371,
339 <     PORT = 372,
340 <     QSTRING = 373,
341 <     QUIET_ON_BAN = 374,
342 <     REASON = 375,
343 <     REDIRPORT = 376,
344 <     REDIRSERV = 377,
345 <     REGEX_T = 378,
346 <     REHASH = 379,
347 <     REMOTE = 380,
348 <     REMOTEBAN = 381,
349 <     RESTRICT_CHANNELS = 382,
350 <     RSA_PRIVATE_KEY_FILE = 383,
351 <     RSA_PUBLIC_KEY_FILE = 384,
352 <     SSL_CERTIFICATE_FILE = 385,
353 <     SSL_DH_PARAM_FILE = 386,
354 <     T_SSL_CLIENT_METHOD = 387,
355 <     T_SSL_SERVER_METHOD = 388,
356 <     T_SSLV3 = 389,
357 <     T_TLSV1 = 390,
358 <     RESV = 391,
359 <     RESV_EXEMPT = 392,
360 <     SECONDS = 393,
361 <     MINUTES = 394,
362 <     HOURS = 395,
363 <     DAYS = 396,
364 <     WEEKS = 397,
365 <     SENDQ = 398,
366 <     SEND_PASSWORD = 399,
367 <     SERVERHIDE = 400,
368 <     SERVERINFO = 401,
369 <     IRCD_SID = 402,
370 <     TKLINE_EXPIRE_NOTICES = 403,
371 <     T_SHARED = 404,
372 <     T_CLUSTER = 405,
373 <     TYPE = 406,
374 <     SHORT_MOTD = 407,
375 <     SPOOF = 408,
376 <     SPOOF_NOTICE = 409,
377 <     STATS_E_DISABLED = 410,
378 <     STATS_I_OPER_ONLY = 411,
379 <     STATS_K_OPER_ONLY = 412,
380 <     STATS_O_OPER_ONLY = 413,
381 <     STATS_P_OPER_ONLY = 414,
382 <     TBOOL = 415,
383 <     TMASKED = 416,
384 <     TS_MAX_DELTA = 417,
385 <     TS_WARN_DELTA = 418,
386 <     TWODOTS = 419,
387 <     T_ALL = 420,
388 <     T_BOTS = 421,
389 <     T_SOFTCALLERID = 422,
390 <     T_CALLERID = 423,
391 <     T_CCONN = 424,
392 <     T_CCONN_FULL = 425,
393 <     T_SSL_CIPHER_LIST = 426,
394 <     T_DEAF = 427,
395 <     T_DEBUG = 428,
396 <     T_DLINE = 429,
397 <     T_EXTERNAL = 430,
398 <     T_FULL = 431,
399 <     T_INVISIBLE = 432,
400 <     T_IPV4 = 433,
401 <     T_IPV6 = 434,
402 <     T_LOCOPS = 435,
403 <     T_MAX_CLIENTS = 436,
404 <     T_NCHANGE = 437,
405 <     T_OPERWALL = 438,
406 <     T_RECVQ = 439,
407 <     T_REJ = 440,
408 <     T_SERVER = 441,
409 <     T_SERVNOTICE = 442,
410 <     T_SET = 443,
411 <     T_SKILL = 444,
412 <     T_SPY = 445,
413 <     T_SSL = 446,
414 <     T_UMODES = 447,
415 <     T_UNAUTH = 448,
416 <     T_UNDLINE = 449,
417 <     T_UNLIMITED = 450,
418 <     T_UNRESV = 451,
419 <     T_UNXLINE = 452,
420 <     T_GLOBOPS = 453,
421 <     T_WALLOP = 454,
422 <     T_RESTART = 455,
423 <     T_SERVICE = 456,
424 <     T_SERVICES_NAME = 457,
425 <     THROTTLE_TIME = 458,
426 <     TRUE_NO_OPER_FLOOD = 459,
427 <     UNKLINE = 460,
428 <     USER = 461,
429 <     USE_EGD = 462,
430 <     USE_LOGGING = 463,
431 <     VHOST = 464,
432 <     VHOST6 = 465,
433 <     XLINE = 466,
434 <     WARN_NO_NLINE = 467,
435 <     T_SIZE = 468,
436 <     T_FILE = 469
437 <   };
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 >    TS_MAX_DELTA = 476,
443 >    TS_WARN_DELTA = 477,
444 >    TWODOTS = 478,
445 >    TYPE = 479,
446 >    UNKLINE = 480,
447 >    USE_EGD = 481,
448 >    USE_LOGGING = 482,
449 >    USER = 483,
450 >    VHOST = 484,
451 >    VHOST6 = 485,
452 >    WARN_NO_CONNECT_BLOCK = 486,
453 >    XLINE = 487
454 >  };
455   #endif
456   /* Tokens.  */
457   #define ACCEPT_PASSWORD 258
# Line 406 | Line 460 | extern int yydebug;
460   #define ANTI_NICK_FLOOD 261
461   #define ANTI_SPAM_EXIT_MESSAGE_TIME 262
462   #define AUTOCONN 263
463 < #define BYTES 264
464 < #define KBYTES 265
465 < #define MBYTES 266
466 < #define CALLER_ID_WAIT 267
467 < #define CAN_FLOOD 268
468 < #define CHANNEL 269
469 < #define CIDR_BITLEN_IPV4 270
470 < #define CIDR_BITLEN_IPV6 271
471 < #define CLASS 272
472 < #define CONNECT 273
473 < #define CONNECTFREQ 274
474 < #define DEFAULT_FLOODCOUNT 275
475 < #define DEFAULT_SPLIT_SERVER_COUNT 276
476 < #define DEFAULT_SPLIT_USER_COUNT 277
477 < #define DENY 278
478 < #define DESCRIPTION 279
479 < #define DIE 280
480 < #define DISABLE_AUTH 281
481 < #define DISABLE_FAKE_CHANNELS 282
482 < #define DISABLE_REMOTE_COMMANDS 283
483 < #define DOTS_IN_IDENT 284
484 < #define EGDPOOL_PATH 285
485 < #define EMAIL 286
486 < #define ENCRYPTED 287
487 < #define EXCEED_LIMIT 288
488 < #define EXEMPT 289
489 < #define FAILED_OPER_NOTICE 290
490 < #define IRCD_FLAGS 291
491 < #define FLATTEN_LINKS 292
492 < #define GECOS 293
493 < #define GENERAL 294
494 < #define GLINE 295
495 < #define GLINE_DURATION 296
496 < #define GLINE_ENABLE 297
497 < #define GLINE_EXEMPT 298
498 < #define GLINE_REQUEST_DURATION 299
499 < #define GLINE_MIN_CIDR 300
500 < #define GLINE_MIN_CIDR6 301
501 < #define GLOBAL_KILL 302
502 < #define IRCD_AUTH 303
503 < #define NEED_IDENT 304
463 > #define AWAY_COUNT 264
464 > #define AWAY_TIME 265
465 > #define BYTES 266
466 > #define KBYTES 267
467 > #define MBYTES 268
468 > #define CALLER_ID_WAIT 269
469 > #define CAN_FLOOD 270
470 > #define CHANNEL 271
471 > #define CIDR_BITLEN_IPV4 272
472 > #define CIDR_BITLEN_IPV6 273
473 > #define CLASS 274
474 > #define CONNECT 275
475 > #define CONNECTFREQ 276
476 > #define CYCLE_ON_HOST_CHANGE 277
477 > #define DEFAULT_FLOODCOUNT 278
478 > #define DEFAULT_SPLIT_SERVER_COUNT 279
479 > #define DEFAULT_SPLIT_USER_COUNT 280
480 > #define DENY 281
481 > #define DESCRIPTION 282
482 > #define DIE 283
483 > #define DISABLE_AUTH 284
484 > #define DISABLE_FAKE_CHANNELS 285
485 > #define DISABLE_REMOTE_COMMANDS 286
486 > #define DOTS_IN_IDENT 287
487 > #define EGDPOOL_PATH 288
488 > #define EMAIL 289
489 > #define ENCRYPTED 290
490 > #define EXCEED_LIMIT 291
491 > #define EXEMPT 292
492 > #define FAILED_OPER_NOTICE 293
493 > #define FLATTEN_LINKS 294
494 > #define GECOS 295
495 > #define GENERAL 296
496 > #define GLINE 297
497 > #define GLINE_DURATION 298
498 > #define GLINE_ENABLE 299
499 > #define GLINE_EXEMPT 300
500 > #define GLINE_MIN_CIDR 301
501 > #define GLINE_MIN_CIDR6 302
502 > #define GLINE_REQUEST_DURATION 303
503 > #define GLOBAL_KILL 304
504   #define HAVENT_READ_CONF 305
505   #define HIDDEN 306
506   #define HIDDEN_NAME 307
507 < #define HIDE_SERVER_IPS 308
508 < #define HIDE_SERVERS 309
509 < #define HIDE_SPOOF_IPS 310
510 < #define HOST 311
511 < #define HUB 312
512 < #define HUB_MASK 313
513 < #define IGNORE_BOGUS_TS 314
514 < #define INVISIBLE_ON_CONNECT 315
515 < #define IP 316
516 < #define KILL 317
517 < #define KILL_CHASE_TIME_LIMIT 318
518 < #define KLINE 319
519 < #define KLINE_EXEMPT 320
520 < #define KNOCK_DELAY 321
521 < #define KNOCK_DELAY_CHANNEL 322
522 < #define LEAF_MASK 323
523 < #define LINKS_DELAY 324
524 < #define LISTEN 325
525 < #define T_LOG 326
526 < #define MAX_ACCEPT 327
527 < #define MAX_BANS 328
528 < #define MAX_CHANS_PER_OPER 329
529 < #define MAX_CHANS_PER_USER 330
530 < #define MAX_GLOBAL 331
531 < #define MAX_IDENT 332
532 < #define MAX_LOCAL 333
533 < #define MAX_NICK_CHANGES 334
534 < #define MAX_NICK_TIME 335
535 < #define MAX_NUMBER 336
536 < #define MAX_TARGETS 337
537 < #define MAX_WATCH 338
538 < #define MESSAGE_LOCALE 339
539 < #define MIN_NONWILDCARD 340
540 < #define MIN_NONWILDCARD_SIMPLE 341
541 < #define MODULE 342
542 < #define MODULES 343
543 < #define NAME 344
544 < #define NEED_PASSWORD 345
545 < #define NETWORK_DESC 346
546 < #define NETWORK_NAME 347
547 < #define NICK 348
548 < #define NICK_CHANGES 349
549 < #define NO_CREATE_ON_SPLIT 350
550 < #define NO_JOIN_ON_SPLIT 351
551 < #define NO_OPER_FLOOD 352
552 < #define NO_TILDE 353
553 < #define NUMBER 354
554 < #define NUMBER_PER_CIDR 355
555 < #define NUMBER_PER_IP 356
556 < #define OPERATOR 357
557 < #define OPERS_BYPASS_CALLERID 358
558 < #define OPER_ONLY_UMODES 359
559 < #define OPER_PASS_RESV 360
560 < #define OPER_SPY_T 361
561 < #define OPER_UMODES 362
562 < #define JOIN_FLOOD_COUNT 363
563 < #define JOIN_FLOOD_TIME 364
564 < #define PACE_WAIT 365
565 < #define PACE_WAIT_SIMPLE 366
566 < #define PASSWORD 367
567 < #define PATH 368
568 < #define PING_COOKIE 369
569 < #define PING_TIME 370
570 < #define PING_WARNING 371
571 < #define PORT 372
572 < #define QSTRING 373
573 < #define QUIET_ON_BAN 374
574 < #define REASON 375
575 < #define REDIRPORT 376
576 < #define REDIRSERV 377
577 < #define REGEX_T 378
578 < #define REHASH 379
579 < #define REMOTE 380
580 < #define REMOTEBAN 381
581 < #define RESTRICT_CHANNELS 382
582 < #define RSA_PRIVATE_KEY_FILE 383
583 < #define RSA_PUBLIC_KEY_FILE 384
584 < #define SSL_CERTIFICATE_FILE 385
585 < #define SSL_DH_PARAM_FILE 386
586 < #define T_SSL_CLIENT_METHOD 387
587 < #define T_SSL_SERVER_METHOD 388
588 < #define T_SSLV3 389
589 < #define T_TLSV1 390
590 < #define RESV 391
591 < #define RESV_EXEMPT 392
592 < #define SECONDS 393
593 < #define MINUTES 394
594 < #define HOURS 395
595 < #define DAYS 396
596 < #define WEEKS 397
597 < #define SENDQ 398
598 < #define SEND_PASSWORD 399
599 < #define SERVERHIDE 400
600 < #define SERVERINFO 401
601 < #define IRCD_SID 402
602 < #define TKLINE_EXPIRE_NOTICES 403
603 < #define T_SHARED 404
604 < #define T_CLUSTER 405
605 < #define TYPE 406
507 > #define HIDE_CHANS 308
508 > #define HIDE_IDLE 309
509 > #define HIDE_IDLE_FROM_OPERS 310
510 > #define HIDE_SERVER_IPS 311
511 > #define HIDE_SERVERS 312
512 > #define HIDE_SERVICES 313
513 > #define HIDE_SPOOF_IPS 314
514 > #define HOST 315
515 > #define HUB 316
516 > #define HUB_MASK 317
517 > #define IGNORE_BOGUS_TS 318
518 > #define INVISIBLE_ON_CONNECT 319
519 > #define INVITE_CLIENT_COUNT 320
520 > #define INVITE_CLIENT_TIME 321
521 > #define IP 322
522 > #define IRCD_AUTH 323
523 > #define IRCD_FLAGS 324
524 > #define IRCD_SID 325
525 > #define JOIN_FLOOD_COUNT 326
526 > #define JOIN_FLOOD_TIME 327
527 > #define KILL 328
528 > #define KILL_CHASE_TIME_LIMIT 329
529 > #define KLINE 330
530 > #define KLINE_EXEMPT 331
531 > #define KNOCK_CLIENT_COUNT 332
532 > #define KNOCK_CLIENT_TIME 333
533 > #define KNOCK_DELAY_CHANNEL 334
534 > #define LEAF_MASK 335
535 > #define LINKS_DELAY 336
536 > #define LISTEN 337
537 > #define MASK 338
538 > #define MAX_ACCEPT 339
539 > #define MAX_BANS 340
540 > #define MAX_CHANNELS 341
541 > #define MAX_GLOBAL 342
542 > #define MAX_IDENT 343
543 > #define MAX_IDLE 344
544 > #define MAX_LOCAL 345
545 > #define MAX_NICK_CHANGES 346
546 > #define MAX_NICK_LENGTH 347
547 > #define MAX_NICK_TIME 348
548 > #define MAX_NUMBER 349
549 > #define MAX_TARGETS 350
550 > #define MAX_TOPIC_LENGTH 351
551 > #define MAX_WATCH 352
552 > #define MIN_IDLE 353
553 > #define MIN_NONWILDCARD 354
554 > #define MIN_NONWILDCARD_SIMPLE 355
555 > #define MODULE 356
556 > #define MODULES 357
557 > #define MOTD 358
558 > #define NAME 359
559 > #define NEED_IDENT 360
560 > #define NEED_PASSWORD 361
561 > #define NETWORK_DESC 362
562 > #define NETWORK_NAME 363
563 > #define NICK 364
564 > #define NO_CREATE_ON_SPLIT 365
565 > #define NO_JOIN_ON_SPLIT 366
566 > #define NO_OPER_FLOOD 367
567 > #define NO_TILDE 368
568 > #define NUMBER 369
569 > #define NUMBER_PER_CIDR 370
570 > #define NUMBER_PER_IP 371
571 > #define OPER_ONLY_UMODES 372
572 > #define OPER_PASS_RESV 373
573 > #define OPER_UMODES 374
574 > #define OPERATOR 375
575 > #define OPERS_BYPASS_CALLERID 376
576 > #define PACE_WAIT 377
577 > #define PACE_WAIT_SIMPLE 378
578 > #define PASSWORD 379
579 > #define PATH 380
580 > #define PING_COOKIE 381
581 > #define PING_TIME 382
582 > #define PORT 383
583 > #define QSTRING 384
584 > #define RANDOM_IDLE 385
585 > #define REASON 386
586 > #define REDIRPORT 387
587 > #define REDIRSERV 388
588 > #define REHASH 389
589 > #define REMOTE 390
590 > #define REMOTEBAN 391
591 > #define RESV 392
592 > #define RESV_EXEMPT 393
593 > #define RSA_PRIVATE_KEY_FILE 394
594 > #define RSA_PUBLIC_KEY_FILE 395
595 > #define SECONDS 396
596 > #define MINUTES 397
597 > #define HOURS 398
598 > #define DAYS 399
599 > #define WEEKS 400
600 > #define MONTHS 401
601 > #define YEARS 402
602 > #define SEND_PASSWORD 403
603 > #define SENDQ 404
604 > #define SERVERHIDE 405
605 > #define SERVERINFO 406
606   #define SHORT_MOTD 407
607   #define SPOOF 408
608   #define SPOOF_NOTICE 409
609 < #define STATS_E_DISABLED 410
610 < #define STATS_I_OPER_ONLY 411
611 < #define STATS_K_OPER_ONLY 412
612 < #define STATS_O_OPER_ONLY 413
613 < #define STATS_P_OPER_ONLY 414
614 < #define TBOOL 415
615 < #define TMASKED 416
616 < #define TS_MAX_DELTA 417
617 < #define TS_WARN_DELTA 418
618 < #define TWODOTS 419
619 < #define T_ALL 420
620 < #define T_BOTS 421
621 < #define T_SOFTCALLERID 422
622 < #define T_CALLERID 423
623 < #define T_CCONN 424
624 < #define T_CCONN_FULL 425
625 < #define T_SSL_CIPHER_LIST 426
626 < #define T_DEAF 427
627 < #define T_DEBUG 428
628 < #define T_DLINE 429
629 < #define T_EXTERNAL 430
630 < #define T_FULL 431
631 < #define T_INVISIBLE 432
632 < #define T_IPV4 433
633 < #define T_IPV6 434
634 < #define T_LOCOPS 435
635 < #define T_MAX_CLIENTS 436
636 < #define T_NCHANGE 437
637 < #define T_OPERWALL 438
638 < #define T_RECVQ 439
639 < #define T_REJ 440
640 < #define T_SERVER 441
641 < #define T_SERVNOTICE 442
642 < #define T_SET 443
643 < #define T_SKILL 444
644 < #define T_SPY 445
645 < #define T_SSL 446
646 < #define T_UMODES 447
647 < #define T_UNAUTH 448
648 < #define T_UNDLINE 449
649 < #define T_UNLIMITED 450
650 < #define T_UNRESV 451
651 < #define T_UNXLINE 452
652 < #define T_GLOBOPS 453
653 < #define T_WALLOP 454
654 < #define T_RESTART 455
655 < #define T_SERVICE 456
656 < #define T_SERVICES_NAME 457
657 < #define THROTTLE_TIME 458
658 < #define TRUE_NO_OPER_FLOOD 459
659 < #define UNKLINE 460
660 < #define USER 461
661 < #define USE_EGD 462
662 < #define USE_LOGGING 463
663 < #define VHOST 464
664 < #define VHOST6 465
665 < #define XLINE 466
666 < #define WARN_NO_NLINE 467
667 < #define T_SIZE 468
668 < #define T_FILE 469
669 <
670 <
609 > #define SQUIT 410
610 > #define SSL_CERTIFICATE_FILE 411
611 > #define SSL_CERTIFICATE_FINGERPRINT 412
612 > #define SSL_CONNECTION_REQUIRED 413
613 > #define SSL_DH_ELLIPTIC_CURVE 414
614 > #define SSL_DH_PARAM_FILE 415
615 > #define SSL_MESSAGE_DIGEST_ALGORITHM 416
616 > #define STATS_E_DISABLED 417
617 > #define STATS_I_OPER_ONLY 418
618 > #define STATS_K_OPER_ONLY 419
619 > #define STATS_O_OPER_ONLY 420
620 > #define STATS_P_OPER_ONLY 421
621 > #define STATS_U_OPER_ONLY 422
622 > #define T_ALL 423
623 > #define T_BOTS 424
624 > #define T_CALLERID 425
625 > #define T_CCONN 426
626 > #define T_COMMAND 427
627 > #define T_CLUSTER 428
628 > #define T_DEAF 429
629 > #define T_DEBUG 430
630 > #define T_DLINE 431
631 > #define T_EXTERNAL 432
632 > #define T_FARCONNECT 433
633 > #define T_FILE 434
634 > #define T_FULL 435
635 > #define T_GLOBOPS 436
636 > #define T_INVISIBLE 437
637 > #define T_IPV4 438
638 > #define T_IPV6 439
639 > #define T_LOCOPS 440
640 > #define T_LOG 441
641 > #define T_MAX_CLIENTS 442
642 > #define T_NCHANGE 443
643 > #define T_NONONREG 444
644 > #define T_PREPEND 445
645 > #define T_PSEUDO 446
646 > #define T_RECVQ 447
647 > #define T_REJ 448
648 > #define T_RESTART 449
649 > #define T_SERVER 450
650 > #define T_SERVICE 451
651 > #define T_SERVNOTICE 452
652 > #define T_SET 453
653 > #define T_SHARED 454
654 > #define T_SIZE 455
655 > #define T_SKILL 456
656 > #define T_SOFTCALLERID 457
657 > #define T_SPY 458
658 > #define T_SSL 459
659 > #define T_SSL_CIPHER_LIST 460
660 > #define T_TARGET 461
661 > #define T_UMODES 462
662 > #define T_UNAUTH 463
663 > #define T_UNDLINE 464
664 > #define T_UNLIMITED 465
665 > #define T_UNRESV 466
666 > #define T_UNXLINE 467
667 > #define T_WALLOP 468
668 > #define T_WALLOPS 469
669 > #define T_WEBIRC 470
670 > #define TBOOL 471
671 > #define THROTTLE_COUNT 472
672 > #define THROTTLE_TIME 473
673 > #define TKLINE_EXPIRE_NOTICES 474
674 > #define TMASKED 475
675 > #define TS_MAX_DELTA 476
676 > #define TS_WARN_DELTA 477
677 > #define TWODOTS 478
678 > #define TYPE 479
679 > #define UNKLINE 480
680 > #define USE_EGD 481
681 > #define USE_LOGGING 482
682 > #define USER 483
683 > #define VHOST 484
684 > #define VHOST6 485
685 > #define WARN_NO_CONNECT_BLOCK 486
686 > #define XLINE 487
687  
688 + /* Value type.  */
689   #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
690 < typedef union YYSTYPE
690 > typedef union YYSTYPE YYSTYPE;
691 > union YYSTYPE
692   {
693 < /* Line 350 of yacc.c  */
622 < #line 110 "conf_parser.y"
693 > #line 152 "conf_parser.y" /* yacc.c:355  */
694  
695    int number;
696    char *string;
697  
698 <
699 < /* Line 350 of yacc.c  */
629 < #line 630 "conf_parser.c"
630 < } YYSTYPE;
698 > #line 699 "conf_parser.c" /* yacc.c:355  */
699 > };
700   # define YYSTYPE_IS_TRIVIAL 1
632 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
701   # define YYSTYPE_IS_DECLARED 1
702   #endif
703  
704 +
705   extern YYSTYPE yylval;
706  
638 #ifdef YYPARSE_PARAM
639 #if defined __STDC__ || defined __cplusplus
640 int yyparse (void *YYPARSE_PARAM);
641 #else
642 int yyparse ();
643 #endif
644 #else /* ! YYPARSE_PARAM */
645 #if defined __STDC__ || defined __cplusplus
707   int yyparse (void);
647 #else
648 int yyparse ();
649 #endif
650 #endif /* ! YYPARSE_PARAM */
708  
709 < #endif /* !YY_Y_TAB_H  */
709 > #endif /* !YY_YY_CONF_PARSER_H_INCLUDED  */
710  
711   /* Copy the second part of user declarations.  */
712  
713 < /* Line 353 of yacc.c  */
657 < #line 658 "conf_parser.c"
713 > #line 714 "conf_parser.c" /* yacc.c:358  */
714  
715   #ifdef short
716   # undef short
# Line 668 | Line 724 | typedef unsigned char yytype_uint8;
724  
725   #ifdef YYTYPE_INT8
726   typedef YYTYPE_INT8 yytype_int8;
671 #elif (defined __STDC__ || defined __C99__FUNC__ \
672     || defined __cplusplus || defined _MSC_VER)
673 typedef signed char yytype_int8;
727   #else
728 < typedef short int yytype_int8;
728 > typedef signed char yytype_int8;
729   #endif
730  
731   #ifdef YYTYPE_UINT16
# Line 692 | Line 745 | typedef short int yytype_int16;
745   #  define YYSIZE_T __SIZE_TYPE__
746   # elif defined size_t
747   #  define YYSIZE_T size_t
748 < # elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
696 <     || defined __cplusplus || defined _MSC_VER)
748 > # elif ! defined YYSIZE_T
749   #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
750   #  define YYSIZE_T size_t
751   # else
# Line 707 | Line 759 | typedef short int yytype_int16;
759   # if defined YYENABLE_NLS && YYENABLE_NLS
760   #  if ENABLE_NLS
761   #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
762 < #   define YY_(msgid) dgettext ("bison-runtime", msgid)
762 > #   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
763   #  endif
764   # endif
765   # ifndef YY_
766 < #  define YY_(msgid) msgid
766 > #  define YY_(Msgid) Msgid
767 > # endif
768 > #endif
769 >
770 > #ifndef YY_ATTRIBUTE
771 > # if (defined __GNUC__                                               \
772 >      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
773 >     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
774 > #  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
775 > # else
776 > #  define YY_ATTRIBUTE(Spec) /* empty */
777 > # endif
778 > #endif
779 >
780 > #ifndef YY_ATTRIBUTE_PURE
781 > # define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
782 > #endif
783 >
784 > #ifndef YY_ATTRIBUTE_UNUSED
785 > # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
786 > #endif
787 >
788 > #if !defined _Noreturn \
789 >     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
790 > # if defined _MSC_VER && 1200 <= _MSC_VER
791 > #  define _Noreturn __declspec (noreturn)
792 > # else
793 > #  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
794   # endif
795   #endif
796  
797   /* Suppress unused-variable warnings by "using" E.  */
798   #if ! defined lint || defined __GNUC__
799 < # define YYUSE(e) ((void) (e))
799 > # define YYUSE(E) ((void) (E))
800   #else
801 < # define YYUSE(e) /* empty */
801 > # define YYUSE(E) /* empty */
802   #endif
803  
804 < /* Identity function, used to suppress warnings about constant conditions.  */
805 < #ifndef lint
806 < # define YYID(n) (n)
807 < #else
808 < #if (defined __STDC__ || defined __C99__FUNC__ \
809 <     || defined __cplusplus || defined _MSC_VER)
810 < static int
811 < YYID (int yyi)
804 > #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
805 > /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
806 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
807 >    _Pragma ("GCC diagnostic push") \
808 >    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
809 >    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
810 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END \
811 >    _Pragma ("GCC diagnostic pop")
812   #else
813 < static int
735 < YYID (yyi)
736 <    int yyi;
813 > # define YY_INITIAL_VALUE(Value) Value
814   #endif
815 < {
816 <  return yyi;
817 < }
815 > #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
816 > # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
817 > # define YY_IGNORE_MAYBE_UNINITIALIZED_END
818 > #endif
819 > #ifndef YY_INITIAL_VALUE
820 > # define YY_INITIAL_VALUE(Value) /* Nothing. */
821   #endif
822  
823 +
824   #if ! defined yyoverflow || YYERROR_VERBOSE
825  
826   /* The parser invokes alloca or malloc; define the necessary symbols.  */
# Line 757 | Line 838 | YYID (yyi)
838   #    define alloca _alloca
839   #   else
840   #    define YYSTACK_ALLOC alloca
841 < #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
761 <     || defined __cplusplus || defined _MSC_VER)
841 > #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
842   #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
843        /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
844   #     ifndef EXIT_SUCCESS
# Line 770 | Line 850 | YYID (yyi)
850   # endif
851  
852   # ifdef YYSTACK_ALLOC
853 <   /* Pacify GCC's `empty if-body' warning.  */
854 < #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
853 >   /* Pacify GCC's 'empty if-body' warning.  */
854 > #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
855   #  ifndef YYSTACK_ALLOC_MAXIMUM
856      /* The OS might guarantee only one guard page at the bottom of the stack,
857         and a page size can be as small as 4096 bytes.  So we cannot safely
# Line 787 | Line 867 | YYID (yyi)
867   #  endif
868   #  if (defined __cplusplus && ! defined EXIT_SUCCESS \
869         && ! ((defined YYMALLOC || defined malloc) \
870 <             && (defined YYFREE || defined free)))
870 >             && (defined YYFREE || defined free)))
871   #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
872   #   ifndef EXIT_SUCCESS
873   #    define EXIT_SUCCESS 0
# Line 795 | Line 875 | YYID (yyi)
875   #  endif
876   #  ifndef YYMALLOC
877   #   define YYMALLOC malloc
878 < #   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
799 <     || defined __cplusplus || defined _MSC_VER)
878 > #   if ! defined malloc && ! defined EXIT_SUCCESS
879   void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
880   #   endif
881   #  endif
882   #  ifndef YYFREE
883   #   define YYFREE free
884 < #   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
806 <     || defined __cplusplus || defined _MSC_VER)
884 > #   if ! defined free && ! defined EXIT_SUCCESS
885   void free (void *); /* INFRINGES ON USER NAME SPACE */
886   #   endif
887   #  endif
# Line 813 | Line 891 | void free (void *); /* INFRINGES ON USER
891  
892   #if (! defined yyoverflow \
893       && (! defined __cplusplus \
894 <         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
894 >         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
895  
896   /* A type that is properly aligned for any stack member.  */
897   union yyalloc
# Line 838 | Line 916 | union yyalloc
916     elements in the stack, and YYPTR gives the new location of the
917     stack.  Advance YYPTR to a properly aligned location for the next
918     stack.  */
919 < # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
920 <    do                                                                  \
921 <      {                                                                 \
922 <        YYSIZE_T yynewbytes;                                            \
923 <        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
924 <        Stack = &yyptr->Stack_alloc;                                    \
925 <        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
926 <        yyptr += yynewbytes / sizeof (*yyptr);                          \
927 <      }                                                                 \
928 <    while (YYID (0))
919 > # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
920 >    do                                                                  \
921 >      {                                                                 \
922 >        YYSIZE_T yynewbytes;                                            \
923 >        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
924 >        Stack = &yyptr->Stack_alloc;                                    \
925 >        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
926 >        yyptr += yynewbytes / sizeof (*yyptr);                          \
927 >      }                                                                 \
928 >    while (0)
929  
930   #endif
931  
# Line 866 | Line 944 | union yyalloc
944            for (yyi = 0; yyi < (Count); yyi++)   \
945              (Dst)[yyi] = (Src)[yyi];            \
946          }                                       \
947 <      while (YYID (0))
947 >      while (0)
948   #  endif
949   # endif
950   #endif /* !YYCOPY_NEEDED */
# Line 874 | Line 952 | union yyalloc
952   /* YYFINAL -- State number of the termination state.  */
953   #define YYFINAL  2
954   /* YYLAST -- Last index in YYTABLE.  */
955 < #define YYLAST   1206
955 > #define YYLAST   1265
956  
957   /* YYNTOKENS -- Number of terminals.  */
958 < #define YYNTOKENS  220
958 > #define YYNTOKENS  239
959   /* YYNNTS -- Number of nonterminals.  */
960 < #define YYNNTS  283
960 > #define YYNNTS  296
961   /* YYNRULES -- Number of rules.  */
962 < #define YYNRULES  627
963 < /* YYNRULES -- Number of states.  */
964 < #define YYNSTATES  1228
962 > #define YYNRULES  665
963 > /* YYNSTATES -- Number of states.  */
964 > #define YYNSTATES  1314
965  
966 < /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
966 > /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
967 >   by yylex, with out-of-bounds checking.  */
968   #define YYUNDEFTOK  2
969 < #define YYMAXUTOK   469
969 > #define YYMAXUTOK   487
970  
971 < #define YYTRANSLATE(YYX)                                                \
971 > #define YYTRANSLATE(YYX)                                                \
972    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
973  
974 < /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
974 > /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
975 >   as returned by yylex, without out-of-bounds checking.  */
976   static const yytype_uint8 yytranslate[] =
977   {
978         0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
979         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
980         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
981         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
982 <       2,     2,     2,     2,   219,     2,     2,     2,     2,     2,
983 <       2,     2,     2,     2,     2,     2,     2,     2,     2,   215,
984 <       2,   218,     2,     2,     2,     2,     2,     2,     2,     2,
982 >       2,     2,     2,     2,   237,     2,     2,     2,     2,     2,
983 >       2,     2,     2,     2,     2,     2,     2,     2,   238,   233,
984 >       2,   236,     2,     2,     2,     2,     2,     2,     2,     2,
985         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
986         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
987         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
988         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
989         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
990 <       2,     2,     2,   217,     2,   216,     2,     2,     2,     2,
990 >       2,     2,     2,   235,     2,   234,     2,     2,     2,     2,
991         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
992         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
993         2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
# Line 941 | Line 1021 | static const yytype_uint8 yytranslate[]
1021       175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
1022       185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
1023       195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
1024 <     205,   206,   207,   208,   209,   210,   211,   212,   213,   214
1024 >     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
1025 >     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
1026 >     225,   226,   227,   228,   229,   230,   231,   232
1027   };
1028  
1029   #if YYDEBUG
1030 < /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
949 <   YYRHS.  */
950 < static const yytype_uint16 yyprhs[] =
951 < {
952 <       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
953 <      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
954 <      39,    41,    43,    45,    47,    50,    53,    54,    56,    59,
955 <      63,    67,    71,    75,    79,    80,    82,    85,    89,    93,
956 <      97,   103,   106,   108,   110,   112,   115,   120,   125,   131,
957 <     134,   136,   138,   140,   142,   144,   146,   148,   150,   152,
958 <     154,   156,   158,   160,   162,   164,   166,   169,   174,   179,
959 <     183,   185,   187,   189,   193,   195,   197,   199,   204,   209,
960 <     214,   219,   224,   229,   234,   239,   244,   249,   254,   259,
961 <     264,   270,   273,   275,   277,   279,   281,   284,   289,   294,
962 <     299,   305,   308,   310,   312,   314,   317,   322,   323,   330,
963 <     333,   335,   337,   339,   341,   344,   349,   354,   359,   360,
964 <     366,   370,   372,   374,   376,   378,   380,   382,   384,   386,
965 <     387,   394,   397,   399,   401,   403,   405,   407,   409,   411,
966 <     413,   415,   418,   423,   428,   433,   438,   443,   448,   449,
967 <     455,   459,   461,   463,   465,   467,   469,   471,   473,   475,
968 <     477,   479,   481,   483,   485,   487,   489,   491,   493,   495,
969 <     497,   499,   501,   502,   508,   512,   514,   516,   518,   520,
970 <     522,   524,   526,   528,   530,   532,   534,   536,   538,   540,
971 <     542,   544,   546,   548,   550,   552,   553,   560,   563,   565,
972 <     567,   569,   571,   573,   575,   577,   579,   581,   583,   585,
973 <     587,   589,   591,   593,   596,   601,   606,   611,   616,   621,
974 <     626,   631,   636,   641,   646,   651,   656,   661,   666,   667,
975 <     674,   675,   681,   685,   687,   689,   691,   693,   696,   698,
976 <     700,   702,   704,   706,   709,   710,   716,   720,   722,   724,
977 <     728,   733,   738,   739,   746,   749,   751,   753,   755,   757,
978 <     759,   761,   763,   765,   767,   770,   775,   780,   785,   790,
979 <     791,   797,   801,   803,   805,   807,   809,   811,   813,   815,
980 <     817,   819,   821,   826,   831,   836,   837,   844,   847,   849,
981 <     851,   853,   855,   858,   863,   868,   873,   879,   882,   884,
982 <     886,   888,   893,   894,   901,   904,   906,   908,   910,   912,
983 <     915,   920,   925,   926,   932,   936,   938,   940,   942,   944,
984 <     946,   948,   950,   952,   954,   956,   958,   959,   966,   969,
985 <     971,   973,   975,   978,   983,   984,   990,   994,   996,   998,
986 <    1000,  1002,  1004,  1006,  1008,  1010,  1012,  1014,  1016,  1017,
987 <    1024,  1027,  1029,  1031,  1033,  1035,  1037,  1039,  1041,  1043,
988 <    1045,  1047,  1049,  1051,  1053,  1055,  1058,  1063,  1068,  1073,
989 <    1078,  1083,  1088,  1093,  1098,  1099,  1105,  1109,  1111,  1113,
990 <    1115,  1120,  1125,  1130,  1135,  1140,  1141,  1148,  1149,  1155,
991 <    1159,  1161,  1163,  1166,  1168,  1170,  1172,  1174,  1176,  1181,
992 <    1186,  1187,  1194,  1197,  1199,  1201,  1203,  1205,  1210,  1215,
993 <    1221,  1224,  1226,  1228,  1230,  1235,  1236,  1243,  1244,  1250,
994 <    1254,  1256,  1258,  1261,  1263,  1265,  1267,  1269,  1271,  1276,
995 <    1281,  1287,  1290,  1292,  1294,  1296,  1298,  1300,  1302,  1304,
996 <    1306,  1308,  1310,  1312,  1314,  1316,  1318,  1320,  1322,  1324,
997 <    1326,  1328,  1330,  1332,  1334,  1336,  1338,  1340,  1342,  1344,
998 <    1346,  1348,  1350,  1352,  1354,  1356,  1358,  1360,  1362,  1364,
999 <    1366,  1368,  1370,  1372,  1374,  1376,  1378,  1380,  1382,  1384,
1000 <    1386,  1388,  1390,  1392,  1397,  1402,  1407,  1412,  1417,  1422,
1001 <    1427,  1432,  1437,  1442,  1447,  1452,  1457,  1462,  1467,  1472,
1002 <    1477,  1482,  1487,  1492,  1497,  1502,  1507,  1512,  1517,  1522,
1003 <    1527,  1532,  1537,  1542,  1547,  1552,  1557,  1562,  1567,  1572,
1004 <    1577,  1582,  1587,  1592,  1597,  1602,  1607,  1612,  1617,  1622,
1005 <    1623,  1629,  1633,  1635,  1637,  1639,  1641,  1643,  1645,  1647,
1006 <    1649,  1651,  1653,  1655,  1657,  1659,  1661,  1663,  1665,  1667,
1007 <    1669,  1671,  1673,  1675,  1676,  1682,  1686,  1688,  1690,  1692,
1008 <    1694,  1696,  1698,  1700,  1702,  1704,  1706,  1708,  1710,  1712,
1009 <    1714,  1716,  1718,  1720,  1722,  1724,  1726,  1728,  1733,  1738,
1010 <    1743,  1749,  1752,  1754,  1756,  1758,  1760,  1762,  1764,  1766,
1011 <    1768,  1770,  1772,  1774,  1776,  1778,  1780,  1782,  1784,  1789,
1012 <    1794,  1799,  1804,  1809,  1814,  1819,  1824,  1829,  1834,  1839,
1013 <    1844,  1849,  1854,  1860,  1863,  1865,  1867,  1869,  1871,  1873,
1014 <    1875,  1877,  1879,  1884,  1889,  1894,  1899,  1904
1015 < };
1016 <
1017 < /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
1018 < static const yytype_int16 yyrhs[] =
1019 < {
1020 <     221,     0,    -1,    -1,   221,   222,    -1,   254,    -1,   260,
1021 <      -1,   274,    -1,   477,    -1,   292,    -1,   310,    -1,   324,
1022 <      -1,   232,    -1,   494,    -1,   339,    -1,   346,    -1,   350,
1023 <      -1,   360,    -1,   369,    -1,   389,    -1,   399,    -1,   405,
1024 <      -1,   419,    -1,   409,    -1,   227,    -1,     1,   215,    -1,
1025 <       1,   216,    -1,    -1,   224,    -1,    99,   223,    -1,    99,
1026 <     138,   223,    -1,    99,   139,   223,    -1,    99,   140,   223,
1027 <      -1,    99,   141,   223,    -1,    99,   142,   223,    -1,    -1,
1028 <     226,    -1,    99,   225,    -1,    99,     9,   225,    -1,    99,
1029 <      10,   225,    -1,    99,    11,   225,    -1,    88,   217,   228,
1030 <     216,   215,    -1,   228,   229,    -1,   229,    -1,   230,    -1,
1031 <     231,    -1,     1,   215,    -1,    87,   218,   118,   215,    -1,
1032 <     113,   218,   118,   215,    -1,   146,   217,   233,   216,   215,
1033 <      -1,   233,   234,    -1,   234,    -1,   245,    -1,   250,    -1,
1034 <     253,    -1,   247,    -1,   248,    -1,   249,    -1,   252,    -1,
1035 <     243,    -1,   242,    -1,   251,    -1,   246,    -1,   241,    -1,
1036 <     235,    -1,   236,    -1,   244,    -1,     1,   215,    -1,   132,
1037 <     218,   237,   215,    -1,   133,   218,   239,   215,    -1,   237,
1038 <     219,   238,    -1,   238,    -1,   134,    -1,   135,    -1,   239,
1039 <     219,   240,    -1,   240,    -1,   134,    -1,   135,    -1,   130,
1040 <     218,   118,   215,    -1,   128,   218,   118,   215,    -1,   131,
1041 <     218,   118,   215,    -1,   171,   218,   118,   215,    -1,    89,
1042 <     218,   118,   215,    -1,   147,   218,   118,   215,    -1,    24,
1043 <     218,   118,   215,    -1,    92,   218,   118,   215,    -1,    91,
1044 <     218,   118,   215,    -1,   209,   218,   118,   215,    -1,   210,
1045 <     218,   118,   215,    -1,   181,   218,    99,   215,    -1,    57,
1046 <     218,   160,   215,    -1,     4,   217,   255,   216,   215,    -1,
1047 <     255,   256,    -1,   256,    -1,   257,    -1,   259,    -1,   258,
1048 <      -1,     1,   215,    -1,    89,   218,   118,   215,    -1,    31,
1049 <     218,   118,   215,    -1,    24,   218,   118,   215,    -1,    71,
1050 <     217,   261,   216,   215,    -1,   261,   262,    -1,   262,    -1,
1051 <     263,    -1,   264,    -1,     1,   215,    -1,   208,   218,   160,
1052 <     215,    -1,    -1,   265,   214,   217,   266,   216,   215,    -1,
1053 <     266,   267,    -1,   267,    -1,   268,    -1,   270,    -1,   269,
1054 <      -1,     1,   215,    -1,    89,   218,   118,   215,    -1,   213,
1055 <     218,   226,   215,    -1,   213,   218,   195,   215,    -1,    -1,
1056 <     151,   271,   218,   272,   215,    -1,   272,   219,   273,    -1,
1057 <     273,    -1,   206,    -1,   102,    -1,    40,    -1,   174,    -1,
1058 <      64,    -1,    62,    -1,   173,    -1,    -1,   102,   275,   217,
1059 <     276,   216,   215,    -1,   276,   277,    -1,   277,    -1,   278,
1060 <      -1,   279,    -1,   280,    -1,   284,    -1,   283,    -1,   281,
1061 <      -1,   282,    -1,   288,    -1,     1,   215,    -1,    89,   218,
1062 <     118,   215,    -1,   206,   218,   118,   215,    -1,   112,   218,
1063 <     118,   215,    -1,    32,   218,   160,   215,    -1,   129,   218,
1064 <     118,   215,    -1,    17,   218,   118,   215,    -1,    -1,   192,
1065 <     285,   218,   286,   215,    -1,   286,   219,   287,    -1,   287,
1066 <      -1,   166,    -1,   169,    -1,   170,    -1,   172,    -1,   173,
1067 <      -1,   176,    -1,    51,    -1,   189,    -1,   182,    -1,   185,
1068 <      -1,   193,    -1,   190,    -1,   175,    -1,   183,    -1,   187,
1069 <      -1,   177,    -1,   199,    -1,   167,    -1,   168,    -1,   180,
1070 <      -1,    -1,    36,   289,   218,   290,   215,    -1,   290,   219,
1071 <     291,    -1,   291,    -1,    47,    -1,   125,    -1,    64,    -1,
1072 <     205,    -1,   174,    -1,   194,    -1,   211,    -1,    40,    -1,
1073 <      25,    -1,   200,    -1,   124,    -1,     4,    -1,    94,    -1,
1074 <     183,    -1,   198,    -1,   106,    -1,   126,    -1,   188,    -1,
1075 <      87,    -1,    -1,    17,   293,   217,   294,   216,   215,    -1,
1076 <     294,   295,    -1,   295,    -1,   296,    -1,   307,    -1,   308,
1077 <      -1,   297,    -1,   298,    -1,   309,    -1,   299,    -1,   300,
1078 <      -1,   301,    -1,   302,    -1,   303,    -1,   304,    -1,   305,
1079 <      -1,   306,    -1,     1,   215,    -1,    89,   218,   118,   215,
1080 <      -1,   115,   218,   224,   215,    -1,   116,   218,   224,   215,
1081 <      -1,   101,   218,    99,   215,    -1,    19,   218,   224,   215,
1082 <      -1,    81,   218,    99,   215,    -1,    76,   218,    99,   215,
1083 <      -1,    78,   218,    99,   215,    -1,    77,   218,    99,   215,
1084 <      -1,   143,   218,   226,   215,    -1,   184,   218,   226,   215,
1085 <      -1,    15,   218,    99,   215,    -1,    16,   218,    99,   215,
1086 <      -1,   100,   218,    99,   215,    -1,    -1,    70,   311,   217,
1087 <     316,   216,   215,    -1,    -1,    36,   313,   218,   314,   215,
1088 <      -1,   314,   219,   315,    -1,   315,    -1,   191,    -1,    51,
1089 <      -1,   186,    -1,   316,   317,    -1,   317,    -1,   318,    -1,
1090 <     312,    -1,   322,    -1,   323,    -1,     1,   215,    -1,    -1,
1091 <     117,   218,   320,   319,   215,    -1,   320,   219,   321,    -1,
1092 <     321,    -1,    99,    -1,    99,   164,    99,    -1,    61,   218,
1093 <     118,   215,    -1,    56,   218,   118,   215,    -1,    -1,    48,
1094 <     325,   217,   326,   216,   215,    -1,   326,   327,    -1,   327,
1095 <      -1,   328,    -1,   329,    -1,   330,    -1,   332,    -1,   336,
1096 <      -1,   337,    -1,   338,    -1,   331,    -1,     1,   215,    -1,
1097 <     206,   218,   118,   215,    -1,   112,   218,   118,   215,    -1,
1098 <      17,   218,   118,   215,    -1,    32,   218,   160,   215,    -1,
1099 <      -1,    36,   333,   218,   334,   215,    -1,   334,   219,   335,
1100 <      -1,   335,    -1,   154,    -1,    33,    -1,    65,    -1,    49,
1101 <      -1,    13,    -1,    98,    -1,    43,    -1,   137,    -1,    90,
1102 <      -1,   153,   218,   118,   215,    -1,   122,   218,   118,   215,
1103 <      -1,   121,   218,    99,   215,    -1,    -1,   136,   340,   217,
1104 <     341,   216,   215,    -1,   341,   342,    -1,   342,    -1,   343,
1105 <      -1,   344,    -1,   345,    -1,     1,   215,    -1,   120,   218,
1106 <     118,   215,    -1,    14,   218,   118,   215,    -1,    93,   218,
1107 <     118,   215,    -1,   201,   217,   347,   216,   215,    -1,   347,
1108 <     348,    -1,   348,    -1,   349,    -1,     1,    -1,    89,   218,
1109 <     118,   215,    -1,    -1,   149,   351,   217,   352,   216,   215,
1110 <      -1,   352,   353,    -1,   353,    -1,   354,    -1,   355,    -1,
1111 <     356,    -1,     1,   215,    -1,    89,   218,   118,   215,    -1,
1112 <     206,   218,   118,   215,    -1,    -1,   151,   357,   218,   358,
1113 <     215,    -1,   358,   219,   359,    -1,   359,    -1,    64,    -1,
1114 <     205,    -1,   174,    -1,   194,    -1,   211,    -1,   197,    -1,
1115 <     136,    -1,   196,    -1,   180,    -1,   165,    -1,    -1,   150,
1116 <     361,   217,   362,   216,   215,    -1,   362,   363,    -1,   363,
1117 <      -1,   364,    -1,   365,    -1,     1,   215,    -1,    89,   218,
1118 <     118,   215,    -1,    -1,   151,   366,   218,   367,   215,    -1,
1119 <     367,   219,   368,    -1,   368,    -1,    64,    -1,   205,    -1,
1120 <     174,    -1,   194,    -1,   211,    -1,   197,    -1,   136,    -1,
1121 <     196,    -1,   180,    -1,   165,    -1,    -1,    18,   370,   217,
1122 <     371,   216,   215,    -1,   371,   372,    -1,   372,    -1,   373,
1123 <      -1,   374,    -1,   375,    -1,   376,    -1,   377,    -1,   379,
1124 <      -1,   378,    -1,   388,    -1,   380,    -1,   385,    -1,   386,
1125 <      -1,   387,    -1,   384,    -1,     1,   215,    -1,    89,   218,
1126 <     118,   215,    -1,    56,   218,   118,   215,    -1,   209,   218,
1127 <     118,   215,    -1,   144,   218,   118,   215,    -1,     3,   218,
1128 <     118,   215,    -1,   117,   218,    99,   215,    -1,     5,   218,
1129 <     178,   215,    -1,     5,   218,   179,   215,    -1,    -1,    36,
1130 <     381,   218,   382,   215,    -1,   382,   219,   383,    -1,   383,
1131 <      -1,     8,    -1,   191,    -1,    32,   218,   160,   215,    -1,
1132 <      58,   218,   118,   215,    -1,    68,   218,   118,   215,    -1,
1133 <      17,   218,   118,   215,    -1,   171,   218,   118,   215,    -1,
1134 <      -1,    62,   390,   217,   395,   216,   215,    -1,    -1,   151,
1135 <     392,   218,   393,   215,    -1,   393,   219,   394,    -1,   394,
1136 <      -1,   123,    -1,   395,   396,    -1,   396,    -1,   397,    -1,
1137 <     398,    -1,   391,    -1,     1,    -1,   206,   218,   118,   215,
1138 <      -1,   120,   218,   118,   215,    -1,    -1,    23,   400,   217,
1139 <     401,   216,   215,    -1,   401,   402,    -1,   402,    -1,   403,
1140 <      -1,   404,    -1,     1,    -1,    61,   218,   118,   215,    -1,
1141 <     120,   218,   118,   215,    -1,    34,   217,   406,   216,   215,
1142 <      -1,   406,   407,    -1,   407,    -1,   408,    -1,     1,    -1,
1143 <      61,   218,   118,   215,    -1,    -1,    38,   410,   217,   415,
1144 <     216,   215,    -1,    -1,   151,   412,   218,   413,   215,    -1,
1145 <     413,   219,   414,    -1,   414,    -1,   123,    -1,   415,   416,
1146 <      -1,   416,    -1,   417,    -1,   418,    -1,   411,    -1,     1,
1147 <      -1,    89,   218,   118,   215,    -1,   120,   218,   118,   215,
1148 <      -1,    39,   217,   420,   216,   215,    -1,   420,   421,    -1,
1149 <     421,    -1,   430,    -1,   431,    -1,   433,    -1,   434,    -1,
1150 <     435,    -1,   436,    -1,   437,    -1,   438,    -1,   439,    -1,
1151 <     440,    -1,   429,    -1,   442,    -1,   443,    -1,   458,    -1,
1152 <     445,    -1,   447,    -1,   449,    -1,   448,    -1,   452,    -1,
1153 <     446,    -1,   453,    -1,   454,    -1,   455,    -1,   456,    -1,
1154 <     457,    -1,   470,    -1,   459,    -1,   460,    -1,   461,    -1,
1155 <     466,    -1,   450,    -1,   451,    -1,   476,    -1,   474,    -1,
1156 <     475,    -1,   432,    -1,   465,    -1,   441,    -1,   463,    -1,
1157 <     464,    -1,   428,    -1,   423,    -1,   424,    -1,   425,    -1,
1158 <     426,    -1,   427,    -1,   444,    -1,   422,    -1,   462,    -1,
1159 <       1,    -1,    83,   218,    99,   215,    -1,    42,   218,   160,
1160 <     215,    -1,    41,   218,   224,   215,    -1,    44,   218,   224,
1161 <     215,    -1,    45,   218,    99,   215,    -1,    46,   218,    99,
1162 <     215,    -1,   148,   218,   160,   215,    -1,    63,   218,   224,
1163 <     215,    -1,    55,   218,   160,   215,    -1,    59,   218,   160,
1164 <     215,    -1,    28,   218,   160,   215,    -1,    35,   218,   160,
1165 <     215,    -1,     6,   218,   160,   215,    -1,    80,   218,   224,
1166 <     215,    -1,    79,   218,    99,   215,    -1,    72,   218,    99,
1167 <     215,    -1,     7,   218,   224,   215,    -1,   163,   218,   224,
1168 <     215,    -1,   162,   218,   224,   215,    -1,    50,   218,    99,
1169 <     215,    -1,    60,   218,   160,   215,    -1,   212,   218,   160,
1170 <     215,    -1,   155,   218,   160,   215,    -1,   158,   218,   160,
1171 <     215,    -1,   159,   218,   160,   215,    -1,   157,   218,   160,
1172 <     215,    -1,   157,   218,   161,   215,    -1,   156,   218,   160,
1173 <     215,    -1,   156,   218,   161,   215,    -1,   110,   218,   224,
1174 <     215,    -1,    12,   218,   224,   215,    -1,   103,   218,   160,
1175 <     215,    -1,   111,   218,   224,   215,    -1,   152,   218,   160,
1176 <     215,    -1,    97,   218,   160,   215,    -1,   204,   218,   160,
1177 <     215,    -1,   105,   218,   160,   215,    -1,    84,   218,   118,
1178 <     215,    -1,    29,   218,    99,   215,    -1,    82,   218,    99,
1179 <     215,    -1,   207,   218,   160,   215,    -1,    30,   218,   118,
1180 <     215,    -1,   202,   218,   118,   215,    -1,   114,   218,   160,
1181 <     215,    -1,    26,   218,   160,   215,    -1,   203,   218,   224,
1182 <     215,    -1,    -1,   107,   467,   218,   468,   215,    -1,   468,
1183 <     219,   469,    -1,   469,    -1,   166,    -1,   169,    -1,   170,
1184 <      -1,   172,    -1,   173,    -1,   176,    -1,    51,    -1,   189,
1185 <      -1,   182,    -1,   185,    -1,   193,    -1,   190,    -1,   175,
1186 <      -1,   183,    -1,   187,    -1,   177,    -1,   199,    -1,   167,
1187 <      -1,   168,    -1,   180,    -1,    -1,   104,   471,   218,   472,
1188 <     215,    -1,   472,   219,   473,    -1,   473,    -1,   166,    -1,
1189 <     169,    -1,   170,    -1,   172,    -1,   173,    -1,   176,    -1,
1190 <     189,    -1,    51,    -1,   182,    -1,   185,    -1,   193,    -1,
1191 <     190,    -1,   175,    -1,   183,    -1,   187,    -1,   177,    -1,
1192 <     199,    -1,   167,    -1,   168,    -1,   180,    -1,    85,   218,
1193 <      99,   215,    -1,    86,   218,    99,   215,    -1,    20,   218,
1194 <      99,   215,    -1,    14,   217,   478,   216,   215,    -1,   478,
1195 <     479,    -1,   479,    -1,   487,    -1,   482,    -1,   483,    -1,
1196 <     484,    -1,   485,    -1,   486,    -1,   488,    -1,   489,    -1,
1197 <     490,    -1,   481,    -1,   491,    -1,   492,    -1,   493,    -1,
1198 <     480,    -1,     1,    -1,    27,   218,   160,   215,    -1,   127,
1199 <     218,   160,   215,    -1,    66,   218,   224,   215,    -1,    67,
1200 <     218,   224,   215,    -1,    75,   218,    99,   215,    -1,    74,
1201 <     218,    99,   215,    -1,   119,   218,   160,   215,    -1,    73,
1202 <     218,    99,   215,    -1,    22,   218,    99,   215,    -1,    21,
1203 <     218,    99,   215,    -1,    95,   218,   160,   215,    -1,    96,
1204 <     218,   160,   215,    -1,   108,   218,    99,   215,    -1,   109,
1205 <     218,   224,   215,    -1,   145,   217,   495,   216,   215,    -1,
1206 <     495,   496,    -1,   496,    -1,   497,    -1,   498,    -1,   500,
1207 <      -1,   501,    -1,   499,    -1,   502,    -1,     1,    -1,    37,
1208 <     218,   160,   215,    -1,    54,   218,   160,   215,    -1,    52,
1209 <     218,   118,   215,    -1,    69,   218,   224,   215,    -1,    51,
1210 <     218,   160,   215,    -1,    53,   218,   160,   215,    -1
1211 < };
1212 <
1213 < /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
1030 >  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
1031   static const yytype_uint16 yyrline[] =
1032   {
1033 <       0,   330,   330,   331,   334,   335,   336,   337,   338,   339,
1034 <     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
1035 <     350,   351,   352,   353,   354,   355,   359,   359,   360,   364,
1036 <     368,   372,   376,   380,   386,   386,   387,   388,   389,   390,
1037 <     397,   400,   400,   401,   401,   401,   403,   409,   416,   418,
1038 <     418,   419,   419,   420,   420,   421,   421,   422,   422,   423,
1039 <     423,   424,   424,   425,   425,   426,   427,   430,   431,   433,
1040 <     433,   434,   440,   448,   448,   449,   455,   463,   502,   561,
1041 <     589,   597,   612,   627,   636,   650,   659,   687,   717,   740,
1042 <     749,   751,   751,   752,   752,   753,   753,   755,   764,   773,
1043 <     785,   786,   786,   788,   788,   789,   791,   798,   798,   808,
1044 <     809,   811,   811,   812,   812,   814,   819,   822,   828,   827,
1045 <     833,   833,   834,   838,   842,   846,   850,   854,   858,   869,
1046 <     868,   966,   966,   967,   967,   967,   968,   968,   968,   969,
1047 <     969,   969,   971,   980,  1017,  1029,  1040,  1082,  1092,  1091,
1048 <    1097,  1097,  1098,  1102,  1106,  1110,  1114,  1118,  1122,  1126,
1049 <    1130,  1134,  1138,  1142,  1146,  1150,  1154,  1158,  1162,  1166,
1050 <    1170,  1174,  1181,  1180,  1186,  1186,  1187,  1191,  1195,  1199,
1051 <    1203,  1207,  1211,  1215,  1219,  1223,  1227,  1231,  1235,  1239,
1052 <    1243,  1247,  1251,  1255,  1259,  1270,  1269,  1319,  1319,  1320,
1053 <    1321,  1321,  1322,  1323,  1324,  1325,  1326,  1327,  1328,  1329,
1054 <    1330,  1331,  1331,  1332,  1334,  1343,  1349,  1355,  1361,  1367,
1055 <    1373,  1379,  1385,  1391,  1397,  1404,  1410,  1416,  1426,  1425,
1056 <    1442,  1441,  1446,  1446,  1447,  1451,  1455,  1463,  1463,  1464,
1057 <    1464,  1464,  1464,  1464,  1466,  1466,  1468,  1468,  1470,  1484,
1058 <    1504,  1513,  1526,  1525,  1594,  1594,  1595,  1595,  1595,  1595,
1059 <    1596,  1596,  1596,  1597,  1597,  1599,  1634,  1647,  1656,  1668,
1060 <    1667,  1671,  1671,  1672,  1676,  1680,  1684,  1688,  1692,  1696,
1061 <    1700,  1704,  1710,  1729,  1739,  1753,  1752,  1768,  1768,  1769,
1062 <    1769,  1769,  1769,  1771,  1780,  1795,  1808,  1810,  1810,  1811,
1063 <    1811,  1813,  1829,  1828,  1844,  1844,  1845,  1845,  1845,  1845,
1064 <    1847,  1856,  1879,  1878,  1884,  1884,  1885,  1889,  1893,  1897,
1065 <    1901,  1905,  1909,  1913,  1917,  1921,  1931,  1930,  1947,  1947,
1066 <    1948,  1948,  1948,  1950,  1957,  1956,  1962,  1962,  1963,  1967,
1067 <    1971,  1975,  1979,  1983,  1987,  1991,  1995,  1999,  2009,  2008,
1068 <    2059,  2059,  2060,  2060,  2060,  2061,  2061,  2062,  2062,  2062,
1069 <    2063,  2063,  2063,  2064,  2064,  2065,  2067,  2076,  2085,  2111,
1070 <    2129,  2147,  2153,  2157,  2166,  2165,  2169,  2169,  2170,  2174,
1071 <    2180,  2191,  2202,  2213,  2222,  2241,  2240,  2306,  2305,  2309,
1072 <    2309,  2310,  2316,  2316,  2317,  2317,  2317,  2317,  2319,  2338,
1073 <    2348,  2347,  2372,  2372,  2373,  2373,  2373,  2375,  2381,  2390,
1074 <    2392,  2392,  2393,  2393,  2395,  2414,  2413,  2461,  2460,  2464,
1075 <    2464,  2465,  2471,  2471,  2472,  2472,  2472,  2472,  2474,  2480,
1076 <    2489,  2492,  2492,  2493,  2493,  2494,  2494,  2495,  2495,  2496,
1077 <    2496,  2497,  2497,  2498,  2499,  2500,  2500,  2501,  2501,  2502,
1078 <    2502,  2503,  2503,  2504,  2504,  2505,  2505,  2506,  2507,  2507,
1079 <    2508,  2508,  2509,  2509,  2510,  2510,  2511,  2511,  2512,  2513,
1080 <    2513,  2514,  2515,  2516,  2516,  2517,  2517,  2518,  2519,  2520,
1081 <    2521,  2521,  2522,  2525,  2530,  2536,  2542,  2548,  2553,  2558,
1082 <    2563,  2568,  2573,  2578,  2583,  2588,  2593,  2598,  2603,  2608,
1083 <    2613,  2618,  2624,  2635,  2640,  2645,  2650,  2655,  2660,  2663,
1084 <    2668,  2671,  2676,  2681,  2686,  2691,  2696,  2701,  2706,  2711,
1085 <    2716,  2727,  2732,  2737,  2742,  2751,  2760,  2765,  2770,  2776,
1086 <    2775,  2780,  2780,  2781,  2784,  2787,  2790,  2793,  2796,  2799,
1087 <    2802,  2805,  2808,  2811,  2814,  2817,  2820,  2823,  2826,  2829,
1088 <    2832,  2835,  2838,  2844,  2843,  2848,  2848,  2849,  2852,  2855,
1089 <    2858,  2861,  2864,  2867,  2870,  2873,  2876,  2879,  2882,  2885,
1090 <    2888,  2891,  2894,  2897,  2900,  2903,  2906,  2911,  2916,  2921,
1091 <    2930,  2933,  2933,  2934,  2935,  2935,  2936,  2936,  2937,  2937,
1092 <    2938,  2939,  2939,  2940,  2941,  2941,  2942,  2942,  2944,  2949,
1093 <    2954,  2959,  2964,  2969,  2974,  2979,  2984,  2989,  2994,  2999,
1094 <    3004,  3009,  3017,  3020,  3020,  3021,  3021,  3022,  3023,  3023,
1095 <    3024,  3025,  3027,  3033,  3039,  3048,  3062,  3068
1033 >       0,   388,   388,   389,   392,   393,   394,   395,   396,   397,
1034 >     398,   399,   400,   401,   402,   403,   404,   405,   406,   407,
1035 >     408,   409,   410,   411,   412,   413,   414,   415,   419,   419,
1036 >     420,   421,   422,   423,   424,   425,   426,   427,   430,   430,
1037 >     431,   432,   433,   434,   441,   444,   444,   445,   445,   445,
1038 >     447,   453,   460,   462,   462,   463,   464,   465,   466,   467,
1039 >     468,   469,   470,   471,   472,   473,   474,   475,   476,   477,
1040 >     478,   479,   480,   483,   523,   581,   610,   618,   632,   660,
1041 >     675,   690,   700,   714,   723,   751,   779,   804,   826,   848,
1042 >     857,   859,   859,   860,   861,   862,   863,   865,   874,   883,
1043 >     896,   895,   913,   913,   914,   914,   914,   916,   922,   932,
1044 >     931,   950,   950,   951,   951,   951,   951,   951,   953,   959,
1045 >     965,   971,   994,   995,   995,   997,   997,   998,  1000,  1007,
1046 >    1007,  1020,  1021,  1023,  1023,  1024,  1024,  1026,  1034,  1037,
1047 >    1043,  1042,  1048,  1048,  1049,  1053,  1057,  1061,  1065,  1069,
1048 >    1073,  1077,  1081,  1092,  1091,  1177,  1177,  1178,  1179,  1180,
1049 >    1181,  1182,  1183,  1184,  1185,  1186,  1187,  1188,  1190,  1196,
1050 >    1202,  1208,  1219,  1225,  1231,  1242,  1249,  1248,  1254,  1254,
1051 >    1255,  1259,  1263,  1267,  1271,  1275,  1279,  1283,  1287,  1291,
1052 >    1295,  1299,  1303,  1307,  1311,  1315,  1319,  1323,  1327,  1331,
1053 >    1335,  1339,  1346,  1345,  1351,  1351,  1352,  1356,  1360,  1364,
1054 >    1368,  1372,  1376,  1380,  1384,  1388,  1392,  1396,  1400,  1404,
1055 >    1408,  1412,  1416,  1420,  1424,  1428,  1432,  1436,  1440,  1451,
1056 >    1450,  1512,  1512,  1513,  1514,  1515,  1516,  1517,  1518,  1519,
1057 >    1520,  1521,  1522,  1523,  1524,  1525,  1525,  1526,  1527,  1528,
1058 >    1529,  1531,  1537,  1543,  1549,  1555,  1561,  1567,  1573,  1579,
1059 >    1585,  1591,  1598,  1604,  1610,  1616,  1625,  1635,  1634,  1640,
1060 >    1640,  1641,  1645,  1656,  1655,  1662,  1661,  1666,  1666,  1667,
1061 >    1671,  1675,  1681,  1681,  1682,  1682,  1682,  1682,  1682,  1684,
1062 >    1684,  1686,  1686,  1688,  1701,  1718,  1724,  1734,  1733,  1775,
1063 >    1775,  1776,  1777,  1778,  1779,  1780,  1781,  1782,  1783,  1784,
1064 >    1786,  1792,  1798,  1804,  1816,  1815,  1821,  1821,  1822,  1826,
1065 >    1830,  1834,  1838,  1842,  1846,  1850,  1854,  1858,  1864,  1878,
1066 >    1887,  1901,  1900,  1915,  1915,  1916,  1916,  1916,  1916,  1918,
1067 >    1924,  1930,  1940,  1942,  1942,  1943,  1943,  1945,  1961,  1960,
1068 >    1985,  1985,  1986,  1986,  1986,  1986,  1988,  1994,  2014,  2013,
1069 >    2019,  2019,  2020,  2024,  2028,  2032,  2036,  2040,  2044,  2048,
1070 >    2052,  2056,  2066,  2065,  2086,  2086,  2087,  2087,  2087,  2089,
1071 >    2096,  2095,  2101,  2101,  2102,  2106,  2110,  2114,  2118,  2122,
1072 >    2126,  2130,  2134,  2138,  2148,  2147,  2219,  2219,  2220,  2221,
1073 >    2222,  2223,  2224,  2225,  2226,  2227,  2228,  2229,  2230,  2231,
1074 >    2232,  2233,  2234,  2236,  2242,  2248,  2254,  2267,  2280,  2286,
1075 >    2292,  2296,  2303,  2302,  2307,  2307,  2308,  2312,  2318,  2329,
1076 >    2335,  2341,  2347,  2363,  2362,  2388,  2388,  2389,  2389,  2389,
1077 >    2391,  2411,  2421,  2420,  2447,  2447,  2448,  2448,  2448,  2450,
1078 >    2456,  2465,  2467,  2467,  2468,  2468,  2470,  2488,  2487,  2510,
1079 >    2510,  2511,  2511,  2511,  2513,  2519,  2528,  2531,  2531,  2532,
1080 >    2533,  2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,
1081 >    2543,  2544,  2545,  2546,  2547,  2548,  2549,  2550,  2551,  2552,
1082 >    2553,  2554,  2555,  2556,  2557,  2558,  2559,  2560,  2561,  2562,
1083 >    2563,  2564,  2565,  2566,  2567,  2568,  2569,  2570,  2571,  2572,
1084 >    2573,  2574,  2575,  2576,  2577,  2578,  2579,  2582,  2587,  2592,
1085 >    2597,  2603,  2609,  2615,  2621,  2626,  2631,  2636,  2641,  2646,
1086 >    2651,  2656,  2661,  2666,  2671,  2676,  2681,  2687,  2698,  2703,
1087 >    2708,  2713,  2718,  2723,  2728,  2731,  2736,  2739,  2744,  2749,
1088 >    2754,  2759,  2764,  2769,  2774,  2779,  2784,  2789,  2794,  2799,
1089 >    2804,  2810,  2809,  2814,  2814,  2815,  2818,  2821,  2824,  2827,
1090 >    2830,  2833,  2836,  2839,  2842,  2845,  2848,  2851,  2854,  2857,
1091 >    2860,  2863,  2866,  2869,  2872,  2875,  2878,  2884,  2883,  2888,
1092 >    2888,  2889,  2892,  2895,  2898,  2901,  2904,  2907,  2910,  2913,
1093 >    2916,  2919,  2922,  2925,  2928,  2931,  2934,  2937,  2940,  2943,
1094 >    2946,  2951,  2956,  2961,  2970,  2973,  2973,  2974,  2975,  2976,
1095 >    2977,  2978,  2979,  2980,  2981,  2982,  2983,  2984,  2985,  2986,
1096 >    2987,  2988,  2990,  2995,  3000,  3005,  3010,  3015,  3020,  3025,
1097 >    3030,  3035,  3040,  3045,  3050,  3055,  3063,  3066,  3066,  3067,
1098 >    3068,  3069,  3070,  3071,  3072,  3073,  3074,  3075,  3077,  3083,
1099 >    3089,  3095,  3101,  3110,  3125,  3131
1100   };
1101   #endif
1102  
# Line 1285 | Line 1106 | static const yytype_uint16 yyrline[] =
1106   static const char *const yytname[] =
1107   {
1108    "$end", "error", "$undefined", "ACCEPT_PASSWORD", "ADMIN", "AFTYPE",
1109 <  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN", "BYTES",
1110 <  "KBYTES", "MBYTES", "CALLER_ID_WAIT", "CAN_FLOOD", "CHANNEL",
1111 <  "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS", "CONNECT",
1112 <  "CONNECTFREQ", "DEFAULT_FLOODCOUNT", "DEFAULT_SPLIT_SERVER_COUNT",
1113 <  "DEFAULT_SPLIT_USER_COUNT", "DENY", "DESCRIPTION", "DIE", "DISABLE_AUTH",
1114 <  "DISABLE_FAKE_CHANNELS", "DISABLE_REMOTE_COMMANDS", "DOTS_IN_IDENT",
1115 <  "EGDPOOL_PATH", "EMAIL", "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT",
1116 <  "FAILED_OPER_NOTICE", "IRCD_FLAGS", "FLATTEN_LINKS", "GECOS", "GENERAL",
1117 <  "GLINE", "GLINE_DURATION", "GLINE_ENABLE", "GLINE_EXEMPT",
1118 <  "GLINE_REQUEST_DURATION", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1119 <  "GLOBAL_KILL", "IRCD_AUTH", "NEED_IDENT", "HAVENT_READ_CONF", "HIDDEN",
1120 <  "HIDDEN_NAME", "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SPOOF_IPS",
1109 >  "ANTI_NICK_FLOOD", "ANTI_SPAM_EXIT_MESSAGE_TIME", "AUTOCONN",
1110 >  "AWAY_COUNT", "AWAY_TIME", "BYTES", "KBYTES", "MBYTES", "CALLER_ID_WAIT",
1111 >  "CAN_FLOOD", "CHANNEL", "CIDR_BITLEN_IPV4", "CIDR_BITLEN_IPV6", "CLASS",
1112 >  "CONNECT", "CONNECTFREQ", "CYCLE_ON_HOST_CHANGE", "DEFAULT_FLOODCOUNT",
1113 >  "DEFAULT_SPLIT_SERVER_COUNT", "DEFAULT_SPLIT_USER_COUNT", "DENY",
1114 >  "DESCRIPTION", "DIE", "DISABLE_AUTH", "DISABLE_FAKE_CHANNELS",
1115 >  "DISABLE_REMOTE_COMMANDS", "DOTS_IN_IDENT", "EGDPOOL_PATH", "EMAIL",
1116 >  "ENCRYPTED", "EXCEED_LIMIT", "EXEMPT", "FAILED_OPER_NOTICE",
1117 >  "FLATTEN_LINKS", "GECOS", "GENERAL", "GLINE", "GLINE_DURATION",
1118 >  "GLINE_ENABLE", "GLINE_EXEMPT", "GLINE_MIN_CIDR", "GLINE_MIN_CIDR6",
1119 >  "GLINE_REQUEST_DURATION", "GLOBAL_KILL", "HAVENT_READ_CONF", "HIDDEN",
1120 >  "HIDDEN_NAME", "HIDE_CHANS", "HIDE_IDLE", "HIDE_IDLE_FROM_OPERS",
1121 >  "HIDE_SERVER_IPS", "HIDE_SERVERS", "HIDE_SERVICES", "HIDE_SPOOF_IPS",
1122    "HOST", "HUB", "HUB_MASK", "IGNORE_BOGUS_TS", "INVISIBLE_ON_CONNECT",
1123 <  "IP", "KILL", "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT",
1124 <  "KNOCK_DELAY", "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY",
1125 <  "LISTEN", "T_LOG", "MAX_ACCEPT", "MAX_BANS", "MAX_CHANS_PER_OPER",
1126 <  "MAX_CHANS_PER_USER", "MAX_GLOBAL", "MAX_IDENT", "MAX_LOCAL",
1127 <  "MAX_NICK_CHANGES", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1128 <  "MAX_WATCH", "MESSAGE_LOCALE", "MIN_NONWILDCARD",
1129 <  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "NAME", "NEED_PASSWORD",
1130 <  "NETWORK_DESC", "NETWORK_NAME", "NICK", "NICK_CHANGES",
1123 >  "INVITE_CLIENT_COUNT", "INVITE_CLIENT_TIME", "IP", "IRCD_AUTH",
1124 >  "IRCD_FLAGS", "IRCD_SID", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME", "KILL",
1125 >  "KILL_CHASE_TIME_LIMIT", "KLINE", "KLINE_EXEMPT", "KNOCK_CLIENT_COUNT",
1126 >  "KNOCK_CLIENT_TIME", "KNOCK_DELAY_CHANNEL", "LEAF_MASK", "LINKS_DELAY",
1127 >  "LISTEN", "MASK", "MAX_ACCEPT", "MAX_BANS", "MAX_CHANNELS", "MAX_GLOBAL",
1128 >  "MAX_IDENT", "MAX_IDLE", "MAX_LOCAL", "MAX_NICK_CHANGES",
1129 >  "MAX_NICK_LENGTH", "MAX_NICK_TIME", "MAX_NUMBER", "MAX_TARGETS",
1130 >  "MAX_TOPIC_LENGTH", "MAX_WATCH", "MIN_IDLE", "MIN_NONWILDCARD",
1131 >  "MIN_NONWILDCARD_SIMPLE", "MODULE", "MODULES", "MOTD", "NAME",
1132 >  "NEED_IDENT", "NEED_PASSWORD", "NETWORK_DESC", "NETWORK_NAME", "NICK",
1133    "NO_CREATE_ON_SPLIT", "NO_JOIN_ON_SPLIT", "NO_OPER_FLOOD", "NO_TILDE",
1134 <  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPERATOR",
1135 <  "OPERS_BYPASS_CALLERID", "OPER_ONLY_UMODES", "OPER_PASS_RESV",
1312 <  "OPER_SPY_T", "OPER_UMODES", "JOIN_FLOOD_COUNT", "JOIN_FLOOD_TIME",
1134 >  "NUMBER", "NUMBER_PER_CIDR", "NUMBER_PER_IP", "OPER_ONLY_UMODES",
1135 >  "OPER_PASS_RESV", "OPER_UMODES", "OPERATOR", "OPERS_BYPASS_CALLERID",
1136    "PACE_WAIT", "PACE_WAIT_SIMPLE", "PASSWORD", "PATH", "PING_COOKIE",
1137 <  "PING_TIME", "PING_WARNING", "PORT", "QSTRING", "QUIET_ON_BAN", "REASON",
1138 <  "REDIRPORT", "REDIRSERV", "REGEX_T", "REHASH", "REMOTE", "REMOTEBAN",
1139 <  "RESTRICT_CHANNELS", "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE",
1140 <  "SSL_CERTIFICATE_FILE", "SSL_DH_PARAM_FILE", "T_SSL_CLIENT_METHOD",
1141 <  "T_SSL_SERVER_METHOD", "T_SSLV3", "T_TLSV1", "RESV", "RESV_EXEMPT",
1142 <  "SECONDS", "MINUTES", "HOURS", "DAYS", "WEEKS", "SENDQ", "SEND_PASSWORD",
1143 <  "SERVERHIDE", "SERVERINFO", "IRCD_SID", "TKLINE_EXPIRE_NOTICES",
1144 <  "T_SHARED", "T_CLUSTER", "TYPE", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1145 <  "STATS_E_DISABLED", "STATS_I_OPER_ONLY", "STATS_K_OPER_ONLY",
1146 <  "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY", "TBOOL", "TMASKED",
1147 <  "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "T_ALL", "T_BOTS",
1148 <  "T_SOFTCALLERID", "T_CALLERID", "T_CCONN", "T_CCONN_FULL",
1149 <  "T_SSL_CIPHER_LIST", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
1150 <  "T_FULL", "T_INVISIBLE", "T_IPV4", "T_IPV6", "T_LOCOPS", "T_MAX_CLIENTS",
1151 <  "T_NCHANGE", "T_OPERWALL", "T_RECVQ", "T_REJ", "T_SERVER",
1152 <  "T_SERVNOTICE", "T_SET", "T_SKILL", "T_SPY", "T_SSL", "T_UMODES",
1153 <  "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED", "T_UNRESV", "T_UNXLINE",
1154 <  "T_GLOBOPS", "T_WALLOP", "T_RESTART", "T_SERVICE", "T_SERVICES_NAME",
1155 <  "THROTTLE_TIME", "TRUE_NO_OPER_FLOOD", "UNKLINE", "USER", "USE_EGD",
1156 <  "USE_LOGGING", "VHOST", "VHOST6", "XLINE", "WARN_NO_NLINE", "T_SIZE",
1157 <  "T_FILE", "';'", "'}'", "'{'", "'='", "','", "$accept", "conf",
1137 >  "PING_TIME", "PORT", "QSTRING", "RANDOM_IDLE", "REASON", "REDIRPORT",
1138 >  "REDIRSERV", "REHASH", "REMOTE", "REMOTEBAN", "RESV", "RESV_EXEMPT",
1139 >  "RSA_PRIVATE_KEY_FILE", "RSA_PUBLIC_KEY_FILE", "SECONDS", "MINUTES",
1140 >  "HOURS", "DAYS", "WEEKS", "MONTHS", "YEARS", "SEND_PASSWORD", "SENDQ",
1141 >  "SERVERHIDE", "SERVERINFO", "SHORT_MOTD", "SPOOF", "SPOOF_NOTICE",
1142 >  "SQUIT", "SSL_CERTIFICATE_FILE", "SSL_CERTIFICATE_FINGERPRINT",
1143 >  "SSL_CONNECTION_REQUIRED", "SSL_DH_ELLIPTIC_CURVE", "SSL_DH_PARAM_FILE",
1144 >  "SSL_MESSAGE_DIGEST_ALGORITHM", "STATS_E_DISABLED", "STATS_I_OPER_ONLY",
1145 >  "STATS_K_OPER_ONLY", "STATS_O_OPER_ONLY", "STATS_P_OPER_ONLY",
1146 >  "STATS_U_OPER_ONLY", "T_ALL", "T_BOTS", "T_CALLERID", "T_CCONN",
1147 >  "T_COMMAND", "T_CLUSTER", "T_DEAF", "T_DEBUG", "T_DLINE", "T_EXTERNAL",
1148 >  "T_FARCONNECT", "T_FILE", "T_FULL", "T_GLOBOPS", "T_INVISIBLE", "T_IPV4",
1149 >  "T_IPV6", "T_LOCOPS", "T_LOG", "T_MAX_CLIENTS", "T_NCHANGE",
1150 >  "T_NONONREG", "T_PREPEND", "T_PSEUDO", "T_RECVQ", "T_REJ", "T_RESTART",
1151 >  "T_SERVER", "T_SERVICE", "T_SERVNOTICE", "T_SET", "T_SHARED", "T_SIZE",
1152 >  "T_SKILL", "T_SOFTCALLERID", "T_SPY", "T_SSL", "T_SSL_CIPHER_LIST",
1153 >  "T_TARGET", "T_UMODES", "T_UNAUTH", "T_UNDLINE", "T_UNLIMITED",
1154 >  "T_UNRESV", "T_UNXLINE", "T_WALLOP", "T_WALLOPS", "T_WEBIRC", "TBOOL",
1155 >  "THROTTLE_COUNT", "THROTTLE_TIME", "TKLINE_EXPIRE_NOTICES", "TMASKED",
1156 >  "TS_MAX_DELTA", "TS_WARN_DELTA", "TWODOTS", "TYPE", "UNKLINE", "USE_EGD",
1157 >  "USE_LOGGING", "USER", "VHOST", "VHOST6", "WARN_NO_CONNECT_BLOCK",
1158 >  "XLINE", "';'", "'}'", "'{'", "'='", "','", "':'", "$accept", "conf",
1159    "conf_item", "timespec_", "timespec", "sizespec_", "sizespec",
1160    "modules_entry", "modules_items", "modules_item", "modules_module",
1161    "modules_path", "serverinfo_entry", "serverinfo_items",
1162 <  "serverinfo_item", "serverinfo_ssl_client_method",
1339 <  "serverinfo_ssl_server_method", "client_method_types",
1340 <  "client_method_type_item", "server_method_types",
1341 <  "server_method_type_item", "serverinfo_ssl_certificate_file",
1162 >  "serverinfo_item", "serverinfo_ssl_certificate_file",
1163    "serverinfo_rsa_private_key_file", "serverinfo_ssl_dh_param_file",
1164 <  "serverinfo_ssl_cipher_list", "serverinfo_name", "serverinfo_sid",
1164 >  "serverinfo_ssl_cipher_list", "serverinfo_ssl_message_digest_algorithm",
1165 >  "serverinfo_ssl_dh_elliptic_curve", "serverinfo_name", "serverinfo_sid",
1166    "serverinfo_description", "serverinfo_network_name",
1167    "serverinfo_network_desc", "serverinfo_vhost", "serverinfo_vhost6",
1168 <  "serverinfo_max_clients", "serverinfo_hub", "admin_entry", "admin_items",
1169 <  "admin_item", "admin_name", "admin_email", "admin_description",
1170 <  "logging_entry", "logging_items", "logging_item", "logging_use_logging",
1171 <  "logging_file_entry", "$@1", "logging_file_items", "logging_file_item",
1172 <  "logging_file_name", "logging_file_size", "logging_file_type", "$@2",
1173 <  "logging_file_type_items", "logging_file_type_item", "oper_entry", "$@3",
1174 <  "oper_items", "oper_item", "oper_name", "oper_user", "oper_password",
1175 <  "oper_encrypted", "oper_rsa_public_key_file", "oper_class",
1176 <  "oper_umodes", "$@4", "oper_umodes_items", "oper_umodes_item",
1177 <  "oper_flags", "$@5", "oper_flags_items", "oper_flags_item",
1178 <  "class_entry", "$@6", "class_items", "class_item", "class_name",
1179 <  "class_ping_time", "class_ping_warning", "class_number_per_ip",
1180 <  "class_connectfreq", "class_max_number", "class_max_global",
1181 <  "class_max_local", "class_max_ident", "class_sendq", "class_recvq",
1168 >  "serverinfo_max_clients", "serverinfo_max_nick_length",
1169 >  "serverinfo_max_topic_length", "serverinfo_hub", "admin_entry",
1170 >  "admin_items", "admin_item", "admin_name", "admin_email",
1171 >  "admin_description", "motd_entry", "$@1", "motd_items", "motd_item",
1172 >  "motd_mask", "motd_file", "pseudo_entry", "$@2", "pseudo_items",
1173 >  "pseudo_item", "pseudo_command", "pseudo_name", "pseudo_prepend",
1174 >  "pseudo_target", "logging_entry", "logging_items", "logging_item",
1175 >  "logging_use_logging", "logging_file_entry", "$@3", "logging_file_items",
1176 >  "logging_file_item", "logging_file_name", "logging_file_size",
1177 >  "logging_file_type", "$@4", "logging_file_type_items",
1178 >  "logging_file_type_item", "oper_entry", "$@5", "oper_items", "oper_item",
1179 >  "oper_name", "oper_user", "oper_password", "oper_encrypted",
1180 >  "oper_rsa_public_key_file", "oper_ssl_certificate_fingerprint",
1181 >  "oper_ssl_connection_required", "oper_class", "oper_umodes", "$@6",
1182 >  "oper_umodes_items", "oper_umodes_item", "oper_flags", "$@7",
1183 >  "oper_flags_items", "oper_flags_item", "class_entry", "$@8",
1184 >  "class_items", "class_item", "class_name", "class_ping_time",
1185 >  "class_number_per_ip", "class_connectfreq", "class_max_channels",
1186 >  "class_max_number", "class_max_global", "class_max_local",
1187 >  "class_max_ident", "class_sendq", "class_recvq",
1188    "class_cidr_bitlen_ipv4", "class_cidr_bitlen_ipv6",
1189 <  "class_number_per_cidr", "listen_entry", "$@7", "listen_flags", "$@8",
1190 <  "listen_flags_items", "listen_flags_item", "listen_items", "listen_item",
1191 <  "listen_port", "$@9", "port_items", "port_item", "listen_address",
1192 <  "listen_host", "auth_entry", "$@10", "auth_items", "auth_item",
1193 <  "auth_user", "auth_passwd", "auth_class", "auth_encrypted", "auth_flags",
1194 <  "$@11", "auth_flags_items", "auth_flags_item", "auth_spoof",
1195 <  "auth_redir_serv", "auth_redir_port", "resv_entry", "$@12", "resv_items",
1196 <  "resv_item", "resv_creason", "resv_channel", "resv_nick",
1197 <  "service_entry", "service_items", "service_item", "service_name",
1198 <  "shared_entry", "$@13", "shared_items", "shared_item", "shared_name",
1199 <  "shared_user", "shared_type", "$@14", "shared_types", "shared_type_item",
1200 <  "cluster_entry", "$@15", "cluster_items", "cluster_item", "cluster_name",
1201 <  "cluster_type", "$@16", "cluster_types", "cluster_type_item",
1202 <  "connect_entry", "$@17", "connect_items", "connect_item", "connect_name",
1189 >  "class_number_per_cidr", "class_min_idle", "class_max_idle",
1190 >  "class_flags", "$@9", "class_flags_items", "class_flags_item",
1191 >  "listen_entry", "$@10", "listen_flags", "$@11", "listen_flags_items",
1192 >  "listen_flags_item", "listen_items", "listen_item", "listen_port",
1193 >  "$@12", "port_items", "port_item", "listen_address", "listen_host",
1194 >  "auth_entry", "$@13", "auth_items", "auth_item", "auth_user",
1195 >  "auth_passwd", "auth_class", "auth_encrypted", "auth_flags", "$@14",
1196 >  "auth_flags_items", "auth_flags_item", "auth_spoof", "auth_redir_serv",
1197 >  "auth_redir_port", "resv_entry", "$@15", "resv_items", "resv_item",
1198 >  "resv_mask", "resv_reason", "resv_exempt", "service_entry",
1199 >  "service_items", "service_item", "service_name", "shared_entry", "$@16",
1200 >  "shared_items", "shared_item", "shared_name", "shared_user",
1201 >  "shared_type", "$@17", "shared_types", "shared_type_item",
1202 >  "cluster_entry", "$@18", "cluster_items", "cluster_item", "cluster_name",
1203 >  "cluster_type", "$@19", "cluster_types", "cluster_type_item",
1204 >  "connect_entry", "$@20", "connect_items", "connect_item", "connect_name",
1205    "connect_host", "connect_vhost", "connect_send_password",
1206 <  "connect_accept_password", "connect_port", "connect_aftype",
1207 <  "connect_flags", "$@18", "connect_flags_items", "connect_flags_item",
1208 <  "connect_encrypted", "connect_hub_mask", "connect_leaf_mask",
1209 <  "connect_class", "connect_ssl_cipher_list", "kill_entry", "$@19",
1210 <  "kill_type", "$@20", "kill_type_items", "kill_type_item", "kill_items",
1211 <  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@21",
1206 >  "connect_accept_password", "connect_ssl_certificate_fingerprint",
1207 >  "connect_port", "connect_aftype", "connect_flags", "$@21",
1208 >  "connect_flags_items", "connect_flags_item", "connect_encrypted",
1209 >  "connect_hub_mask", "connect_leaf_mask", "connect_class",
1210 >  "connect_ssl_cipher_list", "kill_entry", "$@22", "kill_items",
1211 >  "kill_item", "kill_user", "kill_reason", "deny_entry", "$@23",
1212    "deny_items", "deny_item", "deny_ip", "deny_reason", "exempt_entry",
1213 <  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@22",
1384 <  "gecos_flags", "$@23", "gecos_flags_items", "gecos_flags_item",
1213 >  "exempt_items", "exempt_item", "exempt_ip", "gecos_entry", "$@24",
1214    "gecos_items", "gecos_item", "gecos_name", "gecos_reason",
1215 <  "general_entry", "general_items", "general_item", "general_max_watch",
1215 >  "general_entry", "general_items", "general_item", "general_away_count",
1216 >  "general_away_time", "general_max_watch", "general_cycle_on_host_change",
1217    "general_gline_enable", "general_gline_duration",
1218    "general_gline_request_duration", "general_gline_min_cidr",
1219    "general_gline_min_cidr6", "general_tkline_expire_notices",
1220 <  "general_kill_chase_time_limit", "general_hide_spoof_ips",
1391 <  "general_ignore_bogus_ts", "general_disable_remote_commands",
1220 >  "general_kill_chase_time_limit", "general_ignore_bogus_ts",
1221    "general_failed_oper_notice", "general_anti_nick_flood",
1222    "general_max_nick_time", "general_max_nick_changes",
1223    "general_max_accept", "general_anti_spam_exit_message_time",
1224    "general_ts_warn_delta", "general_ts_max_delta",
1225    "general_havent_read_conf", "general_invisible_on_connect",
1226 <  "general_warn_no_nline", "general_stats_e_disabled",
1226 >  "general_warn_no_connect_block", "general_stats_e_disabled",
1227    "general_stats_o_oper_only", "general_stats_P_oper_only",
1228 <  "general_stats_k_oper_only", "general_stats_i_oper_only",
1229 <  "general_pace_wait", "general_caller_id_wait",
1230 <  "general_opers_bypass_callerid", "general_pace_wait_simple",
1231 <  "general_short_motd", "general_no_oper_flood",
1232 <  "general_true_no_oper_flood", "general_oper_pass_resv",
1233 <  "general_message_locale", "general_dots_in_ident", "general_max_targets",
1234 <  "general_use_egd", "general_egdpool_path", "general_services_name",
1235 <  "general_ping_cookie", "general_disable_auth", "general_throttle_time",
1236 <  "general_oper_umodes", "$@24", "umode_oitems", "umode_oitem",
1237 <  "general_oper_only_umodes", "$@25", "umode_items", "umode_item",
1238 <  "general_min_nonwildcard", "general_min_nonwildcard_simple",
1239 <  "general_default_floodcount", "channel_entry", "channel_items",
1240 <  "channel_item", "channel_disable_fake_channels",
1241 <  "channel_restrict_channels", "channel_knock_delay",
1242 <  "channel_knock_delay_channel", "channel_max_chans_per_user",
1243 <  "channel_max_chans_per_oper", "channel_quiet_on_ban", "channel_max_bans",
1228 >  "general_stats_u_oper_only", "general_stats_k_oper_only",
1229 >  "general_stats_i_oper_only", "general_pace_wait",
1230 >  "general_caller_id_wait", "general_opers_bypass_callerid",
1231 >  "general_pace_wait_simple", "general_short_motd",
1232 >  "general_no_oper_flood", "general_oper_pass_resv",
1233 >  "general_dots_in_ident", "general_max_targets", "general_ping_cookie",
1234 >  "general_disable_auth", "general_throttle_count",
1235 >  "general_throttle_time", "general_oper_umodes", "$@25", "umode_oitems",
1236 >  "umode_oitem", "general_oper_only_umodes", "$@26", "umode_items",
1237 >  "umode_item", "general_min_nonwildcard",
1238 >  "general_min_nonwildcard_simple", "general_default_floodcount",
1239 >  "channel_entry", "channel_items", "channel_item",
1240 >  "channel_disable_fake_channels", "channel_invite_client_count",
1241 >  "channel_invite_client_time", "channel_knock_client_count",
1242 >  "channel_knock_client_time", "channel_knock_delay_channel",
1243 >  "channel_max_channels", "channel_max_bans",
1244    "channel_default_split_user_count", "channel_default_split_server_count",
1245    "channel_no_create_on_split", "channel_no_join_on_split",
1246    "channel_jflood_count", "channel_jflood_time", "serverhide_entry",
1247    "serverhide_items", "serverhide_item", "serverhide_flatten_links",
1248 <  "serverhide_hide_servers", "serverhide_hidden_name",
1248 >  "serverhide_disable_remote_commands", "serverhide_hide_servers",
1249 >  "serverhide_hide_services", "serverhide_hidden_name",
1250    "serverhide_links_delay", "serverhide_hidden",
1251 <  "serverhide_hide_server_ips", YY_NULL
1251 >  "serverhide_hide_server_ips", YY_NULLPTR
1252   };
1253   #endif
1254  
1255   # ifdef YYPRINT
1256 < /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
1257 <   token YYLEX-NUM.  */
1256 > /* YYTOKNUM[NUM] -- (External) token number corresponding to the
1257 >   (internal) symbol number NUM (which must be that of a token).  */
1258   static const yytype_uint16 yytoknum[] =
1259   {
1260         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
# Line 1448 | Line 1278 | static const yytype_uint16 yytoknum[] =
1278       435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
1279       445,   446,   447,   448,   449,   450,   451,   452,   453,   454,
1280       455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
1281 <     465,   466,   467,   468,   469,    59,   125,   123,    61,    44
1281 >     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
1282 >     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
1283 >     485,   486,   487,    59,   125,   123,    61,    44,    58
1284   };
1285   # endif
1286  
1287 < /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
1456 < static const yytype_uint16 yyr1[] =
1457 < {
1458 <       0,   220,   221,   221,   222,   222,   222,   222,   222,   222,
1459 <     222,   222,   222,   222,   222,   222,   222,   222,   222,   222,
1460 <     222,   222,   222,   222,   222,   222,   223,   223,   224,   224,
1461 <     224,   224,   224,   224,   225,   225,   226,   226,   226,   226,
1462 <     227,   228,   228,   229,   229,   229,   230,   231,   232,   233,
1463 <     233,   234,   234,   234,   234,   234,   234,   234,   234,   234,
1464 <     234,   234,   234,   234,   234,   234,   234,   235,   236,   237,
1465 <     237,   238,   238,   239,   239,   240,   240,   241,   242,   243,
1466 <     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
1467 <     254,   255,   255,   256,   256,   256,   256,   257,   258,   259,
1468 <     260,   261,   261,   262,   262,   262,   263,   265,   264,   266,
1469 <     266,   267,   267,   267,   267,   268,   269,   269,   271,   270,
1470 <     272,   272,   273,   273,   273,   273,   273,   273,   273,   275,
1471 <     274,   276,   276,   277,   277,   277,   277,   277,   277,   277,
1472 <     277,   277,   278,   279,   280,   281,   282,   283,   285,   284,
1473 <     286,   286,   287,   287,   287,   287,   287,   287,   287,   287,
1474 <     287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
1475 <     287,   287,   289,   288,   290,   290,   291,   291,   291,   291,
1476 <     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
1477 <     291,   291,   291,   291,   291,   293,   292,   294,   294,   295,
1478 <     295,   295,   295,   295,   295,   295,   295,   295,   295,   295,
1479 <     295,   295,   295,   295,   296,   297,   298,   299,   300,   301,
1480 <     302,   303,   304,   305,   306,   307,   308,   309,   311,   310,
1481 <     313,   312,   314,   314,   315,   315,   315,   316,   316,   317,
1482 <     317,   317,   317,   317,   319,   318,   320,   320,   321,   321,
1483 <     322,   323,   325,   324,   326,   326,   327,   327,   327,   327,
1484 <     327,   327,   327,   327,   327,   328,   329,   330,   331,   333,
1485 <     332,   334,   334,   335,   335,   335,   335,   335,   335,   335,
1486 <     335,   335,   336,   337,   338,   340,   339,   341,   341,   342,
1487 <     342,   342,   342,   343,   344,   345,   346,   347,   347,   348,
1488 <     348,   349,   351,   350,   352,   352,   353,   353,   353,   353,
1489 <     354,   355,   357,   356,   358,   358,   359,   359,   359,   359,
1490 <     359,   359,   359,   359,   359,   359,   361,   360,   362,   362,
1491 <     363,   363,   363,   364,   366,   365,   367,   367,   368,   368,
1492 <     368,   368,   368,   368,   368,   368,   368,   368,   370,   369,
1493 <     371,   371,   372,   372,   372,   372,   372,   372,   372,   372,
1494 <     372,   372,   372,   372,   372,   372,   373,   374,   375,   376,
1495 <     377,   378,   379,   379,   381,   380,   382,   382,   383,   383,
1496 <     384,   385,   386,   387,   388,   390,   389,   392,   391,   393,
1497 <     393,   394,   395,   395,   396,   396,   396,   396,   397,   398,
1498 <     400,   399,   401,   401,   402,   402,   402,   403,   404,   405,
1499 <     406,   406,   407,   407,   408,   410,   409,   412,   411,   413,
1500 <     413,   414,   415,   415,   416,   416,   416,   416,   417,   418,
1501 <     419,   420,   420,   421,   421,   421,   421,   421,   421,   421,
1502 <     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
1503 <     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
1504 <     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
1505 <     421,   421,   421,   421,   421,   421,   421,   421,   421,   421,
1506 <     421,   421,   421,   422,   423,   424,   425,   426,   427,   428,
1507 <     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
1508 <     439,   440,   441,   442,   443,   444,   445,   446,   447,   447,
1509 <     448,   448,   449,   450,   451,   452,   453,   454,   455,   456,
1510 <     457,   458,   459,   460,   461,   462,   463,   464,   465,   467,
1511 <     466,   468,   468,   469,   469,   469,   469,   469,   469,   469,
1512 <     469,   469,   469,   469,   469,   469,   469,   469,   469,   469,
1513 <     469,   469,   469,   471,   470,   472,   472,   473,   473,   473,
1514 <     473,   473,   473,   473,   473,   473,   473,   473,   473,   473,
1515 <     473,   473,   473,   473,   473,   473,   473,   474,   475,   476,
1516 <     477,   478,   478,   479,   479,   479,   479,   479,   479,   479,
1517 <     479,   479,   479,   479,   479,   479,   479,   479,   480,   481,
1518 <     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
1519 <     492,   493,   494,   495,   495,   496,   496,   496,   496,   496,
1520 <     496,   496,   497,   498,   499,   500,   501,   502
1521 < };
1287 > #define YYPACT_NINF -761
1288  
1289 < /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
1290 < static const yytype_uint8 yyr2[] =
1289 > #define yypact_value_is_default(Yystate) \
1290 >  (!!((Yystate) == (-761)))
1291 >
1292 > #define YYTABLE_NINF -130
1293 >
1294 > #define yytable_value_is_error(Yytable_value) \
1295 >  0
1296 >
1297 >  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1298 >     STATE-NUM.  */
1299 > static const yytype_int16 yypact[] =
1300   {
1301 <       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
1302 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1303 <       1,     1,     1,     1,     2,     2,     0,     1,     2,     3,
1304 <       3,     3,     3,     3,     0,     1,     2,     3,     3,     3,
1305 <       5,     2,     1,     1,     1,     2,     4,     4,     5,     2,
1306 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1307 <       1,     1,     1,     1,     1,     1,     2,     4,     4,     3,
1308 <       1,     1,     1,     3,     1,     1,     1,     4,     4,     4,
1309 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1310 <       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
1311 <       5,     2,     1,     1,     1,     2,     4,     0,     6,     2,
1312 <       1,     1,     1,     1,     2,     4,     4,     4,     0,     5,
1313 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     0,
1314 <       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1315 <       1,     2,     4,     4,     4,     4,     4,     4,     0,     5,
1316 <       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1317 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1318 <       1,     1,     0,     5,     3,     1,     1,     1,     1,     1,
1319 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1320 <       1,     1,     1,     1,     1,     0,     6,     2,     1,     1,
1321 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1322 <       1,     1,     1,     2,     4,     4,     4,     4,     4,     4,
1323 <       4,     4,     4,     4,     4,     4,     4,     4,     0,     6,
1324 <       0,     5,     3,     1,     1,     1,     1,     2,     1,     1,
1325 <       1,     1,     1,     2,     0,     5,     3,     1,     1,     3,
1326 <       4,     4,     0,     6,     2,     1,     1,     1,     1,     1,
1327 <       1,     1,     1,     1,     2,     4,     4,     4,     4,     0,
1328 <       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
1329 <       1,     1,     4,     4,     4,     0,     6,     2,     1,     1,
1330 <       1,     1,     2,     4,     4,     4,     5,     2,     1,     1,
1331 <       1,     4,     0,     6,     2,     1,     1,     1,     1,     2,
1332 <       4,     4,     0,     5,     3,     1,     1,     1,     1,     1,
1333 <       1,     1,     1,     1,     1,     1,     0,     6,     2,     1,
1334 <       1,     1,     2,     4,     0,     5,     3,     1,     1,     1,
1335 <       1,     1,     1,     1,     1,     1,     1,     1,     0,     6,
1336 <       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1337 <       1,     1,     1,     1,     1,     2,     4,     4,     4,     4,
1338 <       4,     4,     4,     4,     0,     5,     3,     1,     1,     1,
1339 <       4,     4,     4,     4,     4,     0,     6,     0,     5,     3,
1340 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1341 <       0,     6,     2,     1,     1,     1,     1,     4,     4,     5,
1342 <       2,     1,     1,     1,     4,     0,     6,     0,     5,     3,
1343 <       1,     1,     2,     1,     1,     1,     1,     1,     4,     4,
1344 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1345 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1346 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1347 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1348 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1349 <       1,     1,     1,     4,     4,     4,     4,     4,     4,     4,
1350 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1351 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1352 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1353 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     0,
1354 <       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
1355 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1356 <       1,     1,     1,     0,     5,     3,     1,     1,     1,     1,
1357 <       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
1358 <       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
1359 <       5,     2,     1,     1,     1,     1,     1,     1,     1,     1,
1360 <       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
1361 <       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
1362 <       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
1363 <       1,     1,     4,     4,     4,     4,     4,     4
1301 >    -761,   657,  -761,  -144,  -223,  -217,  -761,  -761,  -761,  -215,
1302 >    -761,  -208,  -761,  -761,  -761,  -198,  -761,  -761,  -761,  -196,
1303 >    -190,  -761,  -182,  -761,  -171,  -761,  -761,  -761,  -761,  -761,
1304 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1305 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1306 >    -761,   170,   933,  -163,  -161,  -153,    10,  -143,   409,   -96,
1307 >     -75,   -43,    20,   -40,   -37,   -34,   512,   329,   -32,     4,
1308 >     -26,    25,   -20,  -204,   -18,    -1,     1,     8,  -761,  -761,
1309 >    -761,  -761,  -761,    24,    76,    77,    84,    88,    90,    92,
1310 >      95,    96,   102,   105,   110,   113,   114,   229,  -761,  -761,
1311 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1312 >    -761,  -761,  -761,   648,   477,    57,  -761,   115,    47,  -761,
1313 >    -761,    55,  -761,   116,   119,   122,   123,   125,   127,   129,
1314 >     130,   131,   132,   134,   136,   138,   139,   140,   141,   143,
1315 >     145,   146,   147,   148,   149,   150,   153,   155,   156,   157,
1316 >    -761,   158,  -761,   171,   172,   173,   175,   178,   184,   188,
1317 >     190,   191,   192,   198,   199,   203,   204,   206,   207,   208,
1318 >     126,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1319 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1320 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1321 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1322 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,   476,
1323 >      51,   302,    64,   209,   212,    50,  -761,  -761,  -761,    15,
1324 >     498,   233,  -761,   213,   214,   215,   218,   222,   224,   225,
1325 >     226,    29,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1326 >    -761,   231,   234,   235,   238,   240,   243,   245,   248,   250,
1327 >     251,   258,   261,   265,   267,   269,   274,   278,   282,    46,
1328 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1329 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,    61,   232,
1330 >     283,    12,  -761,  -761,  -761,    89,   223,  -761,   284,    43,
1331 >    -761,  -761,    74,  -761,   111,   338,   340,   289,  -761,   410,
1332 >     411,   320,   424,   426,   427,   426,   428,   426,   426,   430,
1333 >     434,   333,   334,   321,  -761,   322,   317,   330,   342,  -761,
1334 >     343,   344,   346,   347,   348,   349,   351,   353,   354,   356,
1335 >     358,   359,   360,     7,  -761,  -761,  -761,  -761,  -761,  -761,
1336 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1337 >    -761,  -761,   332,   361,   362,   363,   365,   367,   368,  -761,
1338 >     370,   371,   382,   383,   384,   388,   396,   318,  -761,  -761,
1339 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1340 >    -761,  -761,  -761,  -761,   397,   399,    37,  -761,  -761,  -761,
1341 >     507,   404,  -761,  -761,   403,   405,    53,  -761,  -761,  -761,
1342 >     429,   426,   529,   426,   426,   432,   530,   435,   536,   437,
1343 >     426,   443,   546,   548,   426,   550,   451,   454,   426,   557,
1344 >     560,   426,   561,   564,   566,   570,   470,   452,   473,   455,
1345 >     474,   426,   426,   484,   486,   491,  -206,  -201,   492,   493,
1346 >     494,   578,   426,   495,   426,   426,   497,   460,  -761,   482,
1347 >     467,   480,  -761,   485,   488,   496,   504,   511,   264,  -761,
1348 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,   513,
1349 >     514,    30,  -761,  -761,  -761,   489,   515,   518,  -761,   519,
1350 >    -761,    39,  -761,  -761,  -761,  -761,  -761,   594,   598,   500,
1351 >    -761,   524,   522,   525,    35,  -761,  -761,  -761,   533,   531,
1352 >     532,  -761,   534,   535,   537,   538,   540,  -761,   542,    22,
1353 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1354 >    -761,   539,   543,   544,   549,    32,  -761,  -761,  -761,  -761,
1355 >     553,   571,   574,   599,   575,   576,   579,   426,   563,  -761,
1356 >    -761,   600,   582,   602,   634,   679,   670,   671,   672,   674,
1357 >     675,   676,   677,   681,   697,   683,   684,   685,   583,  -761,
1358 >     584,   587,  -761,    48,  -761,  -761,  -761,  -761,   603,   585,
1359 >    -761,   580,   591,   589,   590,   592,   593,    21,  -761,  -761,
1360 >    -761,  -761,  -761,   698,   601,  -761,   604,   595,  -761,   596,
1361 >      33,  -761,  -761,  -761,  -761,   605,   606,   608,  -761,   609,
1362 >     611,   612,   613,   259,   614,   616,   617,   619,   621,   622,
1363 >     624,   625,   629,   630,  -761,  -761,   719,   721,   426,   633,
1364 >     722,   752,   757,   426,   760,   762,   426,   751,   767,   768,
1365 >     426,   770,   770,   652,  -761,  -761,   759,   121,   761,   673,
1366 >     765,   766,   650,   773,   777,   782,   780,   785,   787,   788,
1367 >     664,  -761,   791,   792,   678,  -761,   689,  -761,   795,   796,
1368 >     693,  -761,   695,   696,   702,   703,   704,   706,   714,   717,
1369 >     729,   732,   733,   734,   736,   737,   738,   742,   743,   744,
1370 >     745,   747,   748,   749,   750,   753,   756,   758,   763,   771,
1371 >     764,   690,   769,   774,   781,   783,   784,   789,   790,   793,
1372 >     794,   797,   798,   799,   800,   801,   802,   803,   804,   805,
1373 >     806,  -761,  -761,   825,   739,   694,   861,   878,   864,   865,
1374 >     866,   807,  -761,   871,   874,   808,  -761,  -761,   877,   880,
1375 >     779,   899,   809,  -761,   812,   813,  -761,  -761,   891,   892,
1376 >     814,  -761,  -761,   895,   832,   815,   896,   900,   920,   921,
1377 >     836,   817,   925,   822,  -761,  -761,   927,   928,   929,   826,
1378 >    -761,   827,   828,   829,   830,   831,   833,   834,   835,  -761,
1379 >     837,   838,   839,   840,   841,   842,   843,   844,   845,   846,
1380 >     847,   848,   849,   850,   851,   852,   853,  -761,  -761,   936,
1381 >     854,   855,  -761,   856,  -761,   118,  -761,   940,   958,   962,
1382 >     963,   860,  -761,   862,  -761,  -761,   965,   863,   967,   867,
1383 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,   426,   426,
1384 >     426,   426,   426,   426,   426,  -761,  -761,  -761,  -761,  -761,
1385 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,   868,   869,   870,
1386 >     -52,   872,   873,   875,   876,   879,   881,   882,   883,   884,
1387 >     885,   886,   298,   887,   888,  -761,   889,   890,   893,   894,
1388 >     897,   898,   901,     9,   902,   903,   904,   905,   906,   907,
1389 >     908,  -761,   909,   910,  -761,  -761,   911,   912,  -761,  -761,
1390 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1391 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1392 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1393 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1394 >    -761,  -761,  -761,  -761,  -761,  -761,  -187,  -761,  -761,  -761,
1395 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1396 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1397 >    -761,  -178,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1398 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1399 >    -761,  -761,   913,   914,   541,   915,   916,   917,   918,   919,
1400 >    -761,   922,   923,  -761,   924,   926,    -8,   930,   117,  -761,
1401 >    -761,  -761,  -761,   931,   932,  -761,   934,   935,   487,   937,
1402 >     938,   939,   941,   942,   730,   943,  -761,   944,   945,   946,
1403 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1404 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1405 >    -761,  -761,  -761,  -761,  -761,  -761,   947,   577,  -761,  -761,
1406 >     948,   949,   950,  -761,    62,  -761,  -761,  -761,  -761,   951,
1407 >     954,   955,   956,  -761,  -761,   957,   776,   959,  -761,  -761,
1408 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1409 >    -761,  -172,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1410 >    -761,  -761,  -761,  -761,   770,   770,   770,  -761,  -761,  -761,
1411 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1412 >    -167,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1413 >    -761,  -761,  -761,  -761,   771,  -761,   690,  -761,  -761,  -761,
1414 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -166,
1415 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1416 >    -761,  -761,  -761,  -154,  -761,   983,   899,   960,  -761,  -761,
1417 >    -761,  -761,  -761,   953,  -761,  -761,   961,  -761,  -761,  -761,
1418 >    -761,   964,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1419 >    -761,  -761,  -149,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1420 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1421 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1422 >    -761,   -56,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1423 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,   -25,  -761,
1424 >    -761,   969,   -82,   968,   970,  -761,  -761,  -761,  -761,  -761,
1425 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1426 >    -761,   -17,  -761,  -761,  -761,   -52,  -761,  -761,  -761,  -761,
1427 >       9,  -761,  -761,  -761,   541,  -761,    -8,  -761,  -761,  -761,
1428 >     972,   975,   976,  -761,   487,  -761,   730,  -761,   577,   973,
1429 >     974,   977,   645,  -761,  -761,   776,  -761,  -761,  -761,  -761,
1430 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1431 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,    -5,  -761,
1432 >    -761,  -761,   645,  -761
1433   };
1434  
1435 < /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
1436 <   Performed when YYTABLE doesn't specify something else to do.  Zero
1437 <   means the default is an error.  */
1435 >  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
1436 >     Performed when YYTABLE does not specify something else to do.  Zero
1437 >     means the default is an error.  */
1438   static const yytype_uint16 yydefact[] =
1439   {
1440 <       2,     0,     1,     0,     0,     0,   195,   348,   400,     0,
1441 <     415,     0,   252,   385,   228,     0,     0,   129,   285,     0,
1442 <       0,   302,   326,     0,     3,    23,    11,     4,     5,     6,
1443 <       8,     9,    10,    13,    14,    15,    16,    17,    18,    19,
1444 <      20,    22,    21,     7,    12,    24,    25,     0,     0,     0,
1440 >       2,     0,     1,     0,     0,     0,   229,   394,   442,     0,
1441 >     457,     0,   297,   433,   273,     0,   100,   153,   331,     0,
1442 >       0,   372,     0,   109,     0,   348,     3,    23,    11,     4,
1443 >      24,    25,     5,     6,     8,     9,    10,    13,    14,    15,
1444 >      16,    17,    18,    19,    20,    22,    21,     7,    12,    26,
1445 >      27,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1446         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1447 +       0,     0,     0,     0,     0,     0,     0,     0,    92,    93,
1448 +      95,    94,   631,     0,     0,     0,     0,     0,     0,     0,
1449 +       0,     0,     0,     0,     0,     0,     0,     0,   616,   630,
1450 +     618,   619,   620,   621,   622,   623,   617,   624,   625,   626,
1451 +     627,   628,   629,     0,     0,     0,   455,     0,     0,   453,
1452 +     454,     0,   516,     0,     0,     0,     0,     0,     0,     0,
1453         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1603       0,     0,    92,    93,    95,    94,   597,     0,     0,     0,
1454         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1455 <       0,     0,   582,   596,   592,   584,   585,   586,   587,   588,
1606 <     583,   589,   590,   591,   593,   594,   595,     0,     0,     0,
1607 <     413,     0,     0,   411,   412,     0,   482,     0,     0,     0,
1455 >     587,     0,   561,     0,     0,     0,     0,     0,     0,     0,
1456         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1457 +       0,   468,   469,   470,   514,   515,   508,   509,   510,   511,
1458 +     512,   507,   480,   471,   472,   473,   474,   475,   476,   477,
1459 +     478,   479,   504,   481,   482,   513,   484,   489,   490,   485,
1460 +     487,   486,   497,   498,   488,   491,   492,   493,   483,   495,
1461 +     505,   506,   502,   503,   496,   494,   500,   501,   499,     0,
1462 +       0,     0,     0,     0,     0,     0,    46,    47,    48,     0,
1463 +       0,     0,   657,     0,     0,     0,     0,     0,     0,     0,
1464 +       0,     0,   648,   649,   650,   651,   652,   655,   653,   654,
1465 +     656,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1466         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1467 <       0,     0,     0,     0,     0,     0,   553,     0,   529,     0,
1467 >      54,    69,    66,    64,    70,    71,    65,    55,    68,    58,
1468 >      59,    60,    56,    67,    61,    62,    63,    57,     0,     0,
1469 >       0,     0,   124,   125,   126,     0,     0,   346,     0,     0,
1470 >     344,   345,     0,    96,     0,     0,     0,     0,    91,     0,
1471         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1472 <       0,     0,     0,     0,     0,     0,     0,   432,   480,   474,
1613 <     475,   476,   477,   478,   473,   443,   433,   434,   468,   435,
1614 <     436,   437,   438,   439,   440,   441,   442,   470,   444,   445,
1615 <     479,   447,   452,   448,   450,   449,   463,   464,   451,   453,
1616 <     454,   455,   456,   457,   446,   459,   460,   461,   481,   471,
1617 <     472,   469,   462,   458,   466,   467,   465,     0,     0,     0,
1618 <       0,     0,     0,   102,   103,   104,     0,     0,     0,     0,
1619 <       0,    42,    43,    44,     0,     0,   621,     0,     0,     0,
1620 <       0,     0,     0,     0,   614,   615,   616,   619,   617,   618,
1621 <     620,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1622 <       0,     0,     0,     0,     0,     0,     0,     0,    50,    63,
1623 <      64,    62,    59,    58,    65,    51,    61,    54,    55,    56,
1624 <      52,    60,    57,    53,     0,     0,   300,     0,     0,   298,
1625 <     299,    96,     0,     0,     0,     0,    91,     0,     0,     0,
1472 >       0,     0,     0,     0,   615,     0,     0,     0,     0,   267,
1473         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1474 <       0,     0,   581,     0,     0,     0,     0,     0,     0,     0,
1475 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   198,
1476 <     199,   202,   203,   205,   206,   207,   208,   209,   210,   211,
1477 <     212,   200,   201,   204,     0,     0,     0,     0,     0,   374,
1478 <       0,     0,     0,     0,     0,     0,     0,     0,     0,   351,
1479 <     352,   353,   354,   355,   356,   358,   357,   360,   364,   361,
1480 <     362,   363,   359,   406,     0,     0,     0,   403,   404,   405,
1634 <       0,     0,   410,   427,     0,     0,   417,   426,     0,   423,
1635 <     424,   425,     0,     0,     0,     0,     0,     0,     0,     0,
1474 >       0,     0,     0,     0,   232,   233,   236,   238,   239,   240,
1475 >     241,   242,   243,   244,   245,   246,   234,   235,   237,   247,
1476 >     248,   249,     0,     0,     0,     0,     0,     0,     0,   422,
1477 >       0,     0,     0,     0,     0,     0,     0,     0,   397,   398,
1478 >     399,   400,   401,   402,   403,   405,   404,   407,   411,   408,
1479 >     409,   410,   406,   448,     0,     0,     0,   445,   446,   447,
1480 >       0,     0,   452,   463,     0,     0,     0,   460,   461,   462,
1481         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1482         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1483         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1484         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1485 <       0,     0,   431,     0,     0,     0,   269,     0,     0,     0,
1486 <       0,     0,     0,   255,   256,   257,   258,   263,   259,   260,
1487 <     261,   262,   397,     0,   387,     0,   396,     0,   393,   394,
1488 <     395,     0,   230,     0,     0,     0,   240,     0,   238,   239,
1489 <     241,   242,   105,     0,     0,   101,     0,    45,     0,     0,
1490 <       0,    41,     0,     0,     0,   172,     0,     0,     0,   148,
1491 <       0,     0,   132,   133,   134,   135,   138,   139,   137,   136,
1492 <     140,     0,     0,     0,     0,     0,   288,   289,   290,   291,
1493 <       0,     0,     0,     0,     0,     0,     0,   613,    66,     0,
1485 >       0,     0,     0,     0,     0,     0,     0,     0,   467,     0,
1486 >       0,     0,   314,     0,     0,     0,     0,     0,     0,   300,
1487 >     301,   302,   303,   308,   304,   305,   306,   307,   439,     0,
1488 >       0,     0,   436,   437,   438,     0,     0,     0,   275,     0,
1489 >     285,     0,   283,   284,   286,   287,    49,     0,     0,     0,
1490 >      45,     0,     0,     0,     0,   103,   104,   105,     0,     0,
1491 >       0,   202,     0,     0,     0,     0,     0,   176,     0,     0,
1492 >     156,   157,   158,   159,   162,   163,   164,   165,   161,   160,
1493 >     166,     0,     0,     0,     0,     0,   334,   335,   336,   337,
1494 >       0,     0,     0,     0,     0,     0,     0,     0,     0,   647,
1495 >      72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1496 >       0,     0,     0,     0,     0,     0,     0,     0,     0,    53,
1497 >       0,     0,   380,     0,   375,   376,   377,   127,     0,     0,
1498 >     123,     0,     0,     0,     0,     0,     0,     0,   112,   113,
1499 >     115,   114,   116,     0,     0,   343,     0,     0,   358,     0,
1500 >       0,   351,   352,   353,   354,     0,     0,     0,    90,     0,
1501 >       0,     0,     0,    28,     0,     0,     0,     0,     0,     0,
1502 >       0,     0,     0,     0,   614,   250,     0,     0,     0,     0,
1503         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1504 <       0,     0,     0,     0,     0,    49,     0,     0,   312,     0,
1651 <       0,   305,   306,   307,   308,     0,     0,   334,     0,   329,
1652 <     330,   331,     0,     0,   297,     0,     0,     0,    90,     0,
1653 <       0,     0,    26,     0,     0,     0,     0,     0,     0,     0,
1654 <       0,     0,     0,     0,   580,   213,     0,     0,     0,     0,
1504 >       0,     0,     0,     0,   231,   412,     0,     0,     0,     0,
1505         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1506 <       0,   197,   365,     0,     0,     0,     0,     0,     0,     0,
1507 <       0,     0,     0,     0,     0,     0,     0,   350,     0,     0,
1658 <       0,   402,     0,   409,     0,     0,     0,     0,   422,     0,
1506 >       0,   396,     0,     0,     0,   444,     0,   451,     0,     0,
1507 >       0,   459,     0,     0,     0,     0,     0,     0,     0,     0,
1508         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1509         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1510         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1511         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1512 +       0,   466,   309,     0,     0,     0,     0,     0,     0,     0,
1513 +       0,     0,   299,     0,     0,     0,   435,   288,     0,     0,
1514 +       0,     0,     0,   282,     0,     0,    44,   106,     0,     0,
1515 +       0,   102,   167,     0,     0,     0,     0,     0,     0,     0,
1516 +       0,     0,     0,     0,   155,   338,     0,     0,     0,     0,
1517 +     333,     0,     0,     0,     0,     0,     0,     0,     0,   646,
1518         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1519 <     430,   264,     0,     0,     0,     0,     0,     0,     0,     0,
1520 <       0,   254,     0,     0,     0,     0,   392,   243,     0,     0,
1521 <       0,     0,     0,   237,     0,   100,     0,     0,     0,    40,
1522 <     141,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1523 <     131,   292,     0,     0,     0,     0,   287,     0,     0,     0,
1524 <       0,     0,     0,   612,     0,     0,     0,     0,     0,     0,
1670 <       0,     0,    71,    72,     0,    70,    75,    76,     0,    74,
1671 <       0,     0,     0,     0,     0,    48,   309,     0,     0,     0,
1672 <       0,   304,   332,     0,     0,     0,   328,     0,   296,    99,
1673 <      98,    97,   607,   606,   598,    26,    26,    26,    26,    26,
1674 <      28,    27,   600,   601,   605,   603,   602,   608,   609,   610,
1675 <     611,   604,   599,     0,     0,     0,     0,     0,     0,     0,
1676 <       0,     0,     0,     0,     0,    34,     0,     0,   196,     0,
1519 >       0,     0,     0,     0,     0,     0,     0,    52,   378,     0,
1520 >       0,     0,   374,     0,   122,     0,   117,     0,     0,     0,
1521 >       0,     0,   111,     0,   342,   355,     0,     0,     0,     0,
1522 >     350,    99,    98,    97,   641,   640,   632,   633,    28,    28,
1523 >      28,    28,    28,    28,    28,    30,    29,   634,   644,   645,
1524 >     635,   636,   637,   639,   638,   642,   643,     0,     0,     0,
1525         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1526 <       0,     0,     0,   349,     0,     0,   401,   414,     0,     0,
1527 <       0,   416,   495,   499,   513,   579,   527,   493,   521,   524,
1528 <     494,   485,   484,   486,   487,   488,   502,   491,   492,   503,
1529 <     490,   498,   497,   496,   522,   483,   520,   577,   578,   517,
1530 <     514,   564,   557,   574,   575,   558,   559,   560,   561,   569,
1531 <     562,   572,   576,   565,   570,   566,   571,   563,   568,   567,
1532 <     573,     0,   556,   519,   539,   533,   550,   551,   534,   535,
1533 <     536,   537,   545,   538,   548,   552,   541,   546,   542,   547,
1534 <     540,   544,   543,   549,     0,   532,   512,   515,   526,   489,
1535 <     516,   505,   510,   511,   508,   509,   506,   507,   501,   500,
1536 <     525,   528,   518,   523,   504,     0,     0,     0,     0,     0,
1537 <       0,     0,     0,   253,     0,     0,     0,   386,     0,     0,
1538 <       0,   248,   244,   247,   229,   106,     0,     0,   118,     0,
1539 <       0,   110,   111,   113,   112,    46,    47,     0,     0,     0,
1540 <       0,     0,     0,     0,     0,   130,     0,     0,     0,   286,
1541 <     622,   626,   624,   627,   623,   625,    83,    89,    81,    85,
1542 <      84,    78,    77,    79,    67,     0,    68,     0,    82,    80,
1543 <      88,    86,    87,     0,     0,     0,   303,     0,     0,   327,
1544 <     301,    29,    30,    31,    32,    33,   225,   226,   218,   220,
1545 <     222,   221,   219,   214,   227,   217,   215,   216,    34,    34,
1546 <      34,    36,    35,   223,   224,   370,   372,   373,   383,   380,
1547 <     378,   379,     0,   377,   367,   381,   382,   366,   371,   369,
1548 <     384,   368,   407,   408,   428,   429,   421,     0,   420,   554,
1549 <       0,   530,     0,   267,   268,   277,   274,   279,   276,   275,
1550 <     281,   278,   280,   273,     0,   272,   266,   284,   283,   282,
1551 <     265,   399,   391,     0,   390,   398,   235,   236,   234,     0,
1552 <     233,   251,   250,     0,     0,     0,   114,     0,     0,     0,
1553 <       0,   109,   147,   145,   187,   184,   183,   176,   178,   194,
1554 <     188,   191,   186,   177,   192,   180,   189,   193,   181,   190,
1555 <     185,   179,   182,     0,   175,   142,   144,   146,   158,   152,
1556 <     169,   170,   153,   154,   155,   156,   164,   157,   167,   171,
1557 <     160,   165,   161,   166,   159,   163,   162,   168,     0,   151,
1558 <     143,   294,   295,   293,    69,    73,   310,   316,   322,   325,
1559 <     318,   324,   319,   323,   321,   317,   320,     0,   315,   311,
1560 <     333,   338,   344,   347,   340,   346,   341,   345,   343,   339,
1561 <     342,     0,   337,    37,    38,    39,   375,     0,   418,     0,
1562 <     555,   531,   270,     0,   388,     0,   231,     0,   249,   246,
1563 <     245,     0,     0,     0,     0,   108,   173,     0,   149,     0,
1564 <     313,     0,   335,     0,   376,   419,   271,   389,   232,   115,
1565 <     124,   127,   126,   123,   128,   125,   122,     0,   121,   117,
1566 <     116,   174,   150,   314,   336,   119,     0,   120
1567 < };
1568 <
1569 < /* YYDEFGOTO[NTERM-NUM].  */
1570 < static const yytype_int16 yydefgoto[] =
1571 < {
1724 <      -1,     1,    24,   780,   781,  1021,  1022,    25,   230,   231,
1725 <     232,   233,    26,   267,   268,   269,   270,   744,   745,   748,
1726 <     749,   271,   272,   273,   274,   275,   276,   277,   278,   279,
1727 <     280,   281,   282,   283,    27,    71,    72,    73,    74,    75,
1728 <      28,   222,   223,   224,   225,   226,   950,   951,   952,   953,
1729 <     954,  1088,  1217,  1218,    29,    60,   501,   502,   503,   504,
1730 <     505,   506,   507,   508,   509,   717,  1138,  1139,   510,   713,
1731 <    1113,  1114,    30,    49,   328,   329,   330,   331,   332,   333,
1732 <     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
1733 <      31,    57,   476,   698,  1079,  1080,   477,   478,   479,  1085,
1734 <     942,   943,   480,   481,    32,    55,   452,   453,   454,   455,
1735 <     456,   457,   458,   684,  1064,  1065,   459,   460,   461,    33,
1736 <      61,   515,   516,   517,   518,   519,    34,   288,   289,   290,
1737 <      35,    64,   550,   551,   552,   553,   554,   758,  1157,  1158,
1738 <      36,    65,   558,   559,   560,   561,   764,  1171,  1172,    37,
1739 <      50,   358,   359,   360,   361,   362,   363,   364,   365,   366,
1740 <     367,   607,  1032,  1033,   368,   369,   370,   371,   372,    38,
1741 <      56,   466,   693,  1073,  1074,   467,   468,   469,   470,    39,
1742 <      51,   376,   377,   378,   379,    40,   112,   113,   114,    41,
1743 <      53,   387,   626,  1047,  1048,   388,   389,   390,   391,    42,
1744 <     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
1745 <     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
1746 <     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
1747 <     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
1748 <     206,   207,   208,   209,   210,   211,   212,   423,   904,   905,
1749 <     213,   421,   881,   882,   214,   215,   216,    43,    91,    92,
1750 <      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
1751 <     103,   104,   105,   106,    44,   243,   244,   245,   246,   247,
1752 <     248,   249,   250
1526 >       0,     0,    38,     0,     0,   230,     0,     0,     0,     0,
1527 >       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1528 >       0,   395,     0,     0,   443,   456,     0,     0,   458,   530,
1529 >     534,   517,   518,   549,   520,   613,   558,   555,   529,   522,
1530 >     521,   524,   525,   523,   537,   528,   538,   527,   533,   532,
1531 >     531,   556,   519,   611,   612,   553,   597,   591,   607,   592,
1532 >     593,   594,   602,   610,   595,   604,   608,   598,   609,   599,
1533 >     603,   596,   606,   601,   600,   605,     0,   590,   554,   570,
1534 >     571,   572,   565,   583,   566,   567,   568,   578,   586,   569,
1535 >     580,   584,   574,   585,   575,   579,   573,   582,   577,   576,
1536 >     581,     0,   564,   550,   548,   551,   557,   552,   540,   546,
1537 >     547,   544,   545,   541,   542,   543,   559,   560,   526,   536,
1538 >     535,   539,     0,     0,     0,     0,     0,     0,     0,     0,
1539 >     298,     0,     0,   434,     0,     0,     0,   293,   289,   292,
1540 >     274,    50,    51,     0,     0,   101,     0,     0,     0,     0,
1541 >       0,     0,     0,     0,     0,     0,   154,     0,     0,     0,
1542 >     332,   659,   658,   664,   662,   665,   660,   661,   663,    81,
1543 >      89,    80,    87,    88,    79,    83,    82,    74,    73,    78,
1544 >      75,    77,    86,    76,    84,    85,     0,     0,   373,   128,
1545 >       0,     0,     0,   140,     0,   132,   133,   135,   134,     0,
1546 >       0,     0,     0,   110,   347,     0,     0,     0,   349,    31,
1547 >      32,    33,    34,    35,    36,    37,   262,   263,   254,   272,
1548 >     271,     0,   270,   255,   257,   259,   266,   258,   256,   265,
1549 >     251,   264,   253,   252,    38,    38,    38,    40,    39,   260,
1550 >     261,   417,   420,   421,   431,   428,   414,   429,   426,   427,
1551 >       0,   425,   430,   413,   419,   416,   418,   432,   415,   449,
1552 >     450,   464,   465,   588,     0,   562,     0,   312,   313,   322,
1553 >     319,   324,   320,   321,   327,   323,   325,   318,   326,     0,
1554 >     317,   311,   330,   329,   328,   310,   441,   440,   296,   295,
1555 >     280,   281,   279,     0,   278,     0,     0,     0,   107,   108,
1556 >     175,   171,   222,   209,   219,   218,   207,   212,   228,   221,
1557 >     226,   211,   214,   223,   225,   220,   227,   215,   217,   224,
1558 >     213,   216,     0,   205,   168,   170,   172,   173,   174,   185,
1559 >     186,   187,   180,   198,   181,   182,   183,   193,   201,   184,
1560 >     195,   199,   189,   200,   190,   194,   188,   197,   192,   191,
1561 >     196,     0,   179,   169,   341,   339,   340,   379,   384,   390,
1562 >     393,   386,   392,   387,   391,   389,   385,   388,     0,   383,
1563 >     136,     0,     0,     0,     0,   131,   119,   118,   120,   121,
1564 >     356,   362,   368,   371,   364,   370,   365,   369,   367,   363,
1565 >     366,     0,   361,   357,   268,     0,    41,    42,    43,   423,
1566 >       0,   589,   563,   315,     0,   276,     0,   294,   291,   290,
1567 >       0,     0,     0,   203,     0,   177,     0,   381,     0,     0,
1568 >       0,     0,     0,   130,   359,     0,   269,   424,   316,   277,
1569 >     208,   206,   210,   204,   178,   382,   137,   139,   138,   146,
1570 >     151,   150,   145,   148,   152,   149,   144,   147,     0,   143,
1571 >     360,   141,     0,   142
1572   };
1573  
1574 < /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
1575 <   STATE-NUM.  */
1757 < #define YYPACT_NINF -744
1758 < static const yytype_int16 yypact[] =
1574 >  /* YYPGOTO[NTERM-NUM].  */
1575 > static const yytype_int16 yypgoto[] =
1576   {
1577 <    -744,   610,  -744,  -209,  -187,  -179,  -744,  -744,  -744,  -176,
1578 <    -744,  -171,  -744,  -744,  -744,  -166,  -164,  -744,  -744,  -139,
1579 <    -136,  -744,  -744,  -131,  -744,  -744,  -744,  -744,  -744,  -744,
1580 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1581 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,    61,   807,  -126,
1582 <    -104,   -84,    16,   -79,   382,   -77,   -63,   -60,     7,    21,
1583 <     -49,   -40,   638,   381,   -26,    52,    25,  -152,    62,    85,
1584 <      86,    18,  -744,  -744,  -744,  -744,  -744,    88,    89,    93,
1585 <      94,    96,   101,   108,   112,   118,   119,   125,   127,   132,
1586 <     133,   162,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1587 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,   531,   499,   266,
1588 <    -744,   135,    28,  -744,  -744,    11,  -744,   142,   143,   145,
1589 <     147,   148,   150,   153,   163,   166,   167,   169,   173,   174,
1590 <     175,   177,   178,   180,   182,   183,   185,   191,   197,   200,
1591 <     201,   202,   204,   211,   212,   215,  -744,   216,  -744,   217,
1592 <     218,   221,   222,   225,   226,   229,   234,   235,   237,   238,
1593 <     239,   242,   253,   256,   257,   262,    38,  -744,  -744,  -744,
1594 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1595 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1596 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1597 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1598 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,   337,    24,   259,
1599 <      73,   263,     4,  -744,  -744,  -744,   126,   131,   264,   270,
1600 <      59,  -744,  -744,  -744,   389,   209,  -744,   276,   279,   280,
1601 <     281,   285,   287,     3,  -744,  -744,  -744,  -744,  -744,  -744,
1602 <    -744,   149,   288,   289,   290,   292,   299,   301,   302,   303,
1603 <     304,   305,   307,   308,   315,   324,   330,    75,  -744,  -744,
1604 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1605 <    -744,  -744,  -744,  -744,   208,    30,  -744,   331,    15,  -744,
1606 <    -744,  -744,   107,   254,   359,   165,  -744,   385,   396,   367,
1790 <     454,   454,   455,   457,   461,   399,   401,   464,   454,   404,
1791 <     405,   351,  -744,   358,   356,   360,   361,   362,   364,   365,
1792 <     369,   374,   375,   379,   383,   386,   388,   395,   232,  -744,
1793 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1794 <    -744,  -744,  -744,  -744,   384,   397,   400,   403,   408,  -744,
1795 <     411,   412,   420,   423,   424,   427,   433,   434,   260,  -744,
1796 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1797 <    -744,  -744,  -744,  -744,   435,   437,     8,  -744,  -744,  -744,
1798 <     458,   407,  -744,  -744,   441,   442,  -744,  -744,    36,  -744,
1799 <    -744,  -744,   417,   454,   454,   501,   443,   459,   524,   543,
1800 <     502,   454,   503,   454,   565,   567,   568,   508,   509,   513,
1801 <     454,   577,   578,   454,   580,   583,   566,   584,   587,   527,
1802 <     528,   475,   535,   478,   454,   454,   537,   540,   541,   542,
1803 <    -146,  -133,   544,   546,   454,   454,   585,   454,   550,   553,
1804 <     554,   510,  -744,   515,   514,   517,  -744,   519,   521,   525,
1805 <     529,   530,    58,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1806 <    -744,  -744,  -744,   533,  -744,   534,  -744,    10,  -744,  -744,
1807 <    -744,   538,  -744,   536,   539,   545,  -744,   115,  -744,  -744,
1808 <    -744,  -744,  -744,   582,   547,  -744,   532,  -744,   640,   643,
1809 <     549,  -744,   555,   559,   560,  -744,   562,   569,   572,  -744,
1810 <     573,    70,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1811 <    -744,   558,   588,   595,   597,   146,  -744,  -744,  -744,  -744,
1812 <     623,   625,   687,   658,   659,   454,   606,  -744,  -744,   704,
1813 <     663,   706,   707,   709,   713,   714,   715,    79,   159,   717,
1814 <     718,   646,   719,   720,   626,  -744,   628,   622,  -744,   624,
1815 <     128,  -744,  -744,  -744,  -744,   629,   630,  -744,    22,  -744,
1816 <    -744,  -744,   728,   632,  -744,   634,   635,   636,  -744,   637,
1817 <     639,   641,   430,   642,   645,   648,   649,   650,   651,   652,
1818 <     653,   654,   656,   657,  -744,  -744,   754,   756,   454,   759,
1819 <     776,   778,   779,   761,   784,   785,   454,   454,   786,   786,
1820 <     671,  -744,  -744,   769,   122,   770,   729,   672,   773,   774,
1821 <     775,   777,   795,   780,   781,   782,   681,  -744,   783,   787,
1822 <     682,  -744,   689,  -744,   788,   789,   690,   694,  -744,   695,
1823 <     696,   697,   698,   699,   702,   703,   705,   708,   710,   712,
1824 <     716,   721,   722,   723,   724,   725,   726,   727,   730,   731,
1825 <     732,   733,   734,   735,   736,   737,   738,   739,   551,   740,
1826 <     599,   741,   742,   743,   744,   745,   746,   747,   748,   749,
1827 <     750,   751,   752,   753,   755,   757,   758,   760,   762,   763,
1828 <    -744,  -744,   801,   764,   711,   803,   823,   810,   812,   814,
1829 <     765,  -744,   815,   766,   817,   767,  -744,  -744,   768,   825,
1830 <     826,   870,   772,  -744,   790,  -744,   184,   791,   792,  -744,
1831 <    -744,   853,   816,   771,   856,   861,   863,   793,   865,   794,
1832 <    -744,  -744,   867,   872,   873,   797,  -744,   798,   799,   800,
1833 <     802,   804,   805,  -744,   806,   808,   809,   811,   813,   818,
1834 <     819,   820,  -744,  -744,  -195,  -744,  -744,  -744,  -172,  -744,
1835 <     821,   822,   824,   827,   828,  -744,  -744,   874,   829,   875,
1836 <     830,  -744,  -744,   876,   831,   833,  -744,   835,  -744,  -744,
1837 <    -744,  -744,  -744,  -744,  -744,   454,   454,   454,   454,   454,
1838 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1839 <    -744,  -744,  -744,   836,   837,   838,   839,   840,   841,   842,
1840 <     843,   844,   845,   846,   847,   314,   848,   849,  -744,   850,
1841 <     851,   852,   854,   855,    13,   857,   858,   859,   860,   862,
1842 <     864,   866,   868,  -744,   869,   871,  -744,  -744,   877,   878,
1843 <     879,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1844 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1845 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1846 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1847 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1848 <    -744,  -167,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1849 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1850 <    -744,  -744,  -744,  -744,  -154,  -744,  -744,  -744,  -744,  -744,
1851 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1852 <    -744,  -744,  -744,  -744,  -744,   880,   881,   309,   882,   883,
1853 <     884,   885,   886,  -744,   887,   893,   888,  -744,   -33,   889,
1854 <     890,   832,   891,  -744,  -744,  -744,   892,   894,  -744,   895,
1855 <     154,  -744,  -744,  -744,  -744,  -744,  -744,   896,   899,   511,
1856 <     900,   901,   902,   627,   903,  -744,   904,   905,   906,  -744,
1857 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1858 <    -744,  -744,  -744,  -744,  -744,    79,  -744,   159,  -744,  -744,
1859 <    -744,  -744,  -744,   907,   460,   908,  -744,   909,   665,  -744,
1860 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1861 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,   786,   786,
1862 <     786,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1863 <    -744,  -744,  -145,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1864 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,   -50,  -744,  -744,
1865 <     551,  -744,   599,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1866 <    -744,  -744,  -744,  -744,   -41,  -744,  -744,  -744,  -744,  -744,
1867 <    -744,  -744,  -744,   -27,  -744,  -744,  -744,  -744,  -744,   -17,
1868 <    -744,  -744,  -744,   898,   870,   910,  -744,   911,   912,   -86,
1869 <     913,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1870 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1871 <    -744,  -744,  -744,    34,  -744,  -744,  -744,  -744,  -744,  -744,
1872 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1873 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,    40,  -744,
1874 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1875 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,    53,  -744,  -744,
1876 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1877 <    -744,    63,  -744,  -744,  -744,  -744,  -744,    13,  -744,   879,
1878 <    -744,  -744,  -744,   309,  -744,   893,  -744,   -33,  -744,  -744,
1879 <    -744,   914,   277,   916,   917,  -744,  -744,   511,  -744,   627,
1880 <    -744,   460,  -744,   665,  -744,  -744,  -744,  -744,  -744,  -744,
1881 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,    68,  -744,  -744,
1882 <    -744,  -744,  -744,  -744,  -744,  -744,   277,  -744
1577 >    -761,  -761,  -761,  -218,  -311,  -760,  -641,  -761,  -761,   971,
1578 >    -761,  -761,  -761,  -761,   859,  -761,  -761,  -761,  -761,  -761,
1579 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1580 >    -761,  -761,  -761,  -761,  1027,  -761,  -761,  -761,  -761,  -761,
1581 >    -761,   620,  -761,  -761,  -761,  -761,  -761,   441,  -761,  -761,
1582 >    -761,  -761,  -761,  -761,   952,  -761,  -761,  -761,  -761,    59,
1583 >    -761,  -761,  -761,  -761,  -761,  -183,  -761,  -761,  -761,   635,
1584 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1585 >    -761,  -151,  -761,  -761,  -761,  -142,  -761,  -761,  -761,   818,
1586 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1587 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -122,
1588 >    -761,  -761,  -761,  -761,  -761,  -108,  -761,   669,  -761,  -761,
1589 >    -761,     6,  -761,  -761,  -761,  -761,  -761,   701,  -761,  -761,
1590 >    -761,  -761,  -761,  -761,  -761,  -101,  -761,  -761,  -761,  -761,
1591 >    -761,  -761,   631,  -761,  -761,  -761,  -761,  -761,   966,  -761,
1592 >    -761,  -761,  -761,   573,  -761,  -761,  -761,  -761,  -761,  -103,
1593 >    -761,  -761,  -761,   610,  -761,  -761,  -761,  -761,   -84,  -761,
1594 >    -761,  -761,   820,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1595 >    -761,  -761,  -761,  -761,   -65,  -761,  -761,  -761,  -761,  -761,
1596 >    -761,  -761,  -761,   720,  -761,  -761,  -761,  -761,  -761,   816,
1597 >    -761,  -761,  -761,  -761,  1080,  -761,  -761,  -761,  -761,   810,
1598 >    -761,  -761,  -761,  -761,  1030,  -761,  -761,  -761,  -761,  -761,
1599 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1600 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1601 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1602 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1603 >      79,  -761,  -761,  -761,    85,  -761,  -761,  -761,  -761,  -761,
1604 >    1111,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,  -761,
1605 >    -761,  -761,  -761,  -761,  -761,  -761,  -761,   978,  -761,  -761,
1606 >    -761,  -761,  -761,  -761,  -761,  -761
1607   };
1608  
1609 < /* YYPGOTO[NTERM-NUM].  */
1610 < static const yytype_int16 yypgoto[] =
1609 >  /* YYDEFGOTO[NTERM-NUM].  */
1610 > static const yytype_int16 yydefgoto[] =
1611   {
1612 <    -744,  -744,  -744,  -743,  -298,  -663,  -598,  -744,  -744,   897,
1613 <    -744,  -744,  -744,  -744,   915,  -744,  -744,  -744,    14,  -744,
1614 <       1,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1615 <    -744,  -744,  -744,  -744,  -744,  -744,   924,  -744,  -744,  -744,
1616 <    -744,  -744,   796,  -744,  -744,  -744,  -744,    48,  -744,  -744,
1617 <    -744,  -744,  -744,  -226,  -744,  -744,  -744,   500,  -744,  -744,
1618 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -196,  -744,  -744,
1619 <    -744,  -193,  -744,  -744,  -744,   680,  -744,  -744,  -744,  -744,
1620 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1621 <    -744,  -744,  -744,  -744,  -744,  -177,  -744,   548,  -744,  -744,
1622 <    -744,   -62,  -744,  -744,  -744,  -744,  -744,   575,  -744,  -744,
1623 <    -744,  -744,  -744,  -744,  -744,  -153,  -744,  -744,  -744,  -744,
1624 <    -744,  -744,   516,  -744,  -744,  -744,  -744,  -744,   918,  -744,
1625 <    -744,  -744,  -744,   482,  -744,  -744,  -744,  -744,  -744,  -163,
1626 <    -744,  -744,  -744,   483,  -744,  -744,  -744,  -744,  -159,  -744,
1627 <    -744,  -744,   688,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1628 <    -744,  -744,  -744,  -137,  -744,  -744,  -744,  -744,  -744,  -744,
1629 <    -744,  -744,  -744,  -744,  -117,  -744,   604,  -744,  -744,  -744,
1630 <    -744,  -744,   700,  -744,  -744,  -744,  -744,   966,  -744,  -744,
1631 <    -744,  -744,  -744,  -744,   -99,  -744,   701,  -744,  -744,  -744,
1632 <    -744,   919,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1633 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1634 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1635 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1636 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,    35,
1637 <    -744,  -744,  -744,    32,  -744,  -744,  -744,  -744,  -744,   997,
1638 <    -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,  -744,
1639 <    -744,  -744,  -744,  -744,  -744,  -744,   920,  -744,  -744,  -744,
1640 <    -744,  -744,  -744
1612 >      -1,     1,    26,   835,   836,  1097,  1098,    27,   225,   226,
1613 >     227,   228,    28,   269,   270,   271,   272,   273,   274,   275,
1614 >     276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
1615 >     286,   287,    29,    77,    78,    79,    80,    81,    30,    63,
1616 >     504,   505,   506,   507,    31,    70,   587,   588,   589,   590,
1617 >     591,   592,    32,   291,   292,   293,   294,   295,  1054,  1055,
1618 >    1056,  1057,  1058,  1233,  1308,  1309,    33,    64,   519,   520,
1619 >     521,   522,   523,   524,   525,   526,   527,   528,   529,   761,
1620 >    1211,  1212,   530,   755,  1182,  1183,    34,    53,   343,   344,
1621 >     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
1622 >     355,   356,   357,   358,   359,   360,   361,   629,  1081,  1082,
1623 >      35,    61,   490,   740,  1153,  1154,   491,   492,   493,  1157,
1624 >     998,   999,   494,   495,    36,    59,   468,   469,   470,   471,
1625 >     472,   473,   474,   725,  1139,  1140,   475,   476,   477,    37,
1626 >      65,   535,   536,   537,   538,   539,    38,   299,   300,   301,
1627 >      39,    72,   600,   601,   602,   603,   604,   817,  1251,  1252,
1628 >      40,    68,   573,   574,   575,   576,   800,  1228,  1229,    41,
1629 >      54,   377,   378,   379,   380,   381,   382,   383,   384,   385,
1630 >     386,   387,   652,  1110,  1111,   388,   389,   390,   391,   392,
1631 >      42,    60,   481,   482,   483,   484,    43,    55,   396,   397,
1632 >     398,   399,    44,   118,   119,   120,    45,    57,   406,   407,
1633 >     408,   409,    46,   170,   171,   172,   173,   174,   175,   176,
1634 >     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
1635 >     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
1636 >     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
1637 >     207,   208,   209,   210,   211,   212,   213,   214,   439,   961,
1638 >     962,   215,   437,   936,   937,   216,   217,   218,    47,    97,
1639 >      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
1640 >     108,   109,   110,   111,   112,    48,   241,   242,   243,   244,
1641 >     245,   246,   247,   248,   249,   250
1642   };
1643  
1644 < /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
1645 <   positive, shift that token.  If negative, reduce the rule which
1646 <   number is the opposite.  If YYTABLE_NINF, syntax error.  */
1922 < #define YYTABLE_NINF -108
1644 >  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
1645 >     positive, shift that token.  If negative, reduce the rule whose
1646 >     number is the opposite.  If YYTABLE_NINF, syntax error.  */
1647   static const yytype_int16 yytable[] =
1648   {
1649 <     806,   807,   573,   574,   236,   220,    45,    46,   220,   373,
1650 <     581,   462,   383,   805,   667,   668,   286,   110,  1076,    67,
1651 <     984,  1030,   227,   555,   985,   462,   286,   669,   670,   110,
1652 <      47,   555,  1001,  1002,  1003,  1004,  1005,   383,    48,   116,
1653 <     237,    52,    68,   986,   117,   118,    54,   987,  1049,    69,
1654 <     119,    58,  1050,    59,   238,   239,   240,   241,   120,   443,
1655 <     227,  1051,    67,   291,   121,  1052,   122,   123,   124,   374,
1656 <    1176,   492,   242,   125,  1177,   444,   251,   111,    62,   126,
1657 <     127,    63,   128,   129,   130,    68,    66,   493,   131,   111,
1658 <     445,   107,    69,   132,   446,   630,   631,   133,   134,   252,
1659 <     384,   135,   494,   638,   287,   640,   495,    70,   228,  1193,
1660 <     136,   556,   647,   108,   287,   650,   471,   137,   138,   556,
1661 <     139,   140,   141,   142,   143,   384,   661,   662,   375,   546,
1662 <     463,   385,   253,   109,   229,   144,   673,   674,   115,   676,
1663 <     217,   145,   146,   147,   463,   148,   228,   511,   149,   150,
1664 <      70,   472,   151,  1077,   218,   946,   385,   219,  1078,   496,
1665 <     512,   464,   386,    76,   254,  1178,   255,   256,   234,  1179,
1666 <     447,   473,   229,   557,  1182,   464,   474,   235,  1183,   448,
1667 <     449,   557,   497,    77,    78,   946,   152,   386,  1184,    79,
1668 <     153,   284,  1185,   154,   155,   156,   157,   158,  1186,   498,
1669 <     159,   160,  1187,   257,  1031,   258,   259,   260,   261,   546,
1670 <     511,   450,   221,   742,   743,   221,   465,   547,  -107,   526,
1671 <     484,  -107,   262,   512,   620,   565,   695,   732,    80,    81,
1672 <     465,   563,   475,   313,   295,    82,    83,    84,   765,   513,
1673 <     161,   162,   163,   947,   381,   164,   263,   314,   315,  1196,
1674 <     165,   316,   627,  1197,   441,  1198,   264,    85,    86,  1199,
1675 <     471,   344,   499,   345,   451,   346,   514,   373,  1200,   285,
1676 <      87,    88,  1201,   947,   690,   490,   500,   347,  1202,   548,
1677 <     292,    89,  1203,  1225,   265,   266,   719,  1226,   482,    90,
1678 <     795,   544,   348,   746,   747,   472,   349,   547,   803,   804,
1679 <     810,   811,   513,   293,   294,   948,   297,   298,   317,   318,
1680 <     319,   299,   300,   320,   301,   473,   350,  1210,   351,   302,
1681 <     474,   321,  1055,  1018,  1019,  1020,   303,   374,   352,   514,
1682 <     304,   702,   322,   323,   549,   948,   305,   306,   443,  1211,
1683 <     486,  1212,  1056,   307,   760,   308,   487,   324,   325,   353,
1684 <     309,   310,  1057,   380,   444,  1173,  1174,  1175,  1058,   548,
1685 <     392,   393,   725,   394,   528,   395,   396,   949,   397,   445,
1686 <    1090,   398,   566,   446,  1059,   326,   475,   354,   311,  1213,
1687 <     568,   399,   251,   116,   400,   401,   375,   402,   117,   118,
1688 <     492,   403,   404,   405,   119,   406,   407,   949,   408,  1060,
1689 <     409,   410,   120,   411,   355,   252,   493,  1061,   121,   412,
1690 <     122,   123,   124,   805,   549,   413,   327,   125,   414,   415,
1691 <     416,   494,   417,   126,   127,   495,   128,   129,   130,   418,
1692 <     419,   356,   131,   420,   422,   424,   425,   132,   253,   426,
1693 <     427,   133,   134,   428,   429,   135,  1062,   430,   600,   447,
1694 <    1214,  1215,   431,   432,   136,   433,   434,   435,   448,   449,
1695 <     436,   137,   138,  1063,   139,   140,   141,   142,   143,   357,
1696 <     254,   437,   255,   256,   438,   439,   616,   567,   496,   144,
1697 <     440,   483,   488,  1216,   569,   145,   146,   147,   489,   148,
1698 <     450,  1194,   149,   150,   520,   570,   151,   521,   522,   523,
1699 <     344,   497,   345,   524,   346,   525,   529,   530,   531,   257,
1700 <     532,   258,   259,   260,   261,  1094,   347,   533,   498,   534,
1701 <     535,   536,   537,   538,  1147,   539,   540,   571,   262,   572,
1702 <     152,   348,   313,   541,   153,   349,  1095,   154,   155,   156,
1703 <     157,   158,   542,   451,   159,   160,   314,   315,   543,   562,
1704 <     316,  1096,   263,   572,   575,   350,   576,   351,  1097,   578,
1705 <     577,   579,   264,   580,   582,   583,   584,   352,   775,   776,
1706 <     777,   778,   779,   585,   586,  1098,   622,   629,   587,   588,
1707 <     589,   499,   590,   591,   161,   162,   163,   592,   353,   164,
1708 <     265,   266,   593,   594,   165,   500,  1148,   595,  1099,   602,
1709 <     632,   596,   861,   633,   597,  1100,   598,   317,   318,   319,
1710 <       2,     3,   320,   599,     4,   603,   354,  1101,   604,   634,
1711 <     321,   605,   623,   635,     5,  1149,   606,     6,     7,   608,
1712 <     609,   322,   323,     8,  1150,  1102,  1103,  1104,   610,   236,
1713 <    1151,   611,   612,   355,     9,   613,   324,   325,    10,    11,
1714 <     884,   614,   615,   618,  1152,   619,  1153,  1154,    12,   624,
1715 <     625,   636,   637,   639,   641,  1155,   642,   643,   644,   645,
1716 <     356,  1156,    13,   646,   326,   237,   648,   649,  1118,   651,
1717 <      14,    15,   652,   654,   653,  1105,   655,   656,   657,   238,
1718 <     239,   240,   241,   658,  1106,   659,   660,   663,    16,  1107,
1719 <     664,   665,   666,   675,   671,  1108,   672,   242,   357,  1109,
1720 <     677,  1110,    17,   678,   679,   327,  1111,   862,   863,   864,
1721 <     865,   866,  1112,   867,   868,   680,   869,   870,   871,  1161,
1722 <     681,   872,   682,   873,   874,   683,   875,   685,   876,   686,
1723 <     877,   878,   704,   687,   879,   752,    18,   688,   689,   706,
1724 <     880,   692,   694,   697,   699,    19,    20,   700,   707,    21,
1725 <      22,   708,   705,   701,   709,   885,   886,   887,   888,   889,
1726 <     710,   890,   891,   721,   892,   893,   894,   711,   712,   895,
1727 <     714,   896,   897,   727,   898,   728,   899,   715,   900,   901,
1728 <     716,   718,   902,  1119,  1120,  1121,  1122,  1123,   903,  1124,
1729 <    1125,  1162,  1126,  1127,  1128,   729,   722,  1129,    76,  1130,
1730 <    1131,    23,  1132,   723,  1133,   724,  1134,  1135,   730,   731,
1731 <    1136,   733,   734,   735,   736,   737,  1137,   738,    77,    78,
1732 <    1163,   739,   740,   741,    79,   750,   751,   753,   754,  1164,
1733 <     757,   755,   759,   756,   762,  1165,   767,   768,   763,   769,
1734 <     770,   771,   772,   793,   773,   794,   774,   782,   796,  1166,
1735 <     783,  1167,  1168,   784,   785,   786,   787,   788,   789,   790,
1736 <    1169,   791,   792,    80,    81,   797,  1170,   798,   799,   800,
1737 <      82,    83,    84,   801,   802,   805,   808,   809,   812,   813,
1738 <     814,   815,   816,   817,   819,   818,   823,   826,   820,   821,
1739 <     822,   824,    85,    86,   827,   825,   828,   829,   830,   831,
1740 <     832,   833,   834,   835,   836,    87,    88,   837,   838,   925,
1741 <     839,   928,   929,   840,   926,   841,    89,   842,   930,   927,
1742 <     931,   843,   932,   934,    90,   936,   844,   845,   846,   847,
1743 <     848,   849,   850,   939,   940,   851,   852,   853,   854,   855,
1744 <     856,   857,   858,   859,   860,   883,   906,   907,   908,   909,
1745 <     910,   911,   912,   913,   914,   915,   916,   917,   918,   941,
1746 <     919,   957,   920,   921,   960,   922,   958,   923,   924,   961,
1747 <     933,   962,   937,   964,   935,   966,   938,   944,  1145,   959,
1748 <     967,   968,   993,   995,   997,   296,  1083,  1188,  1091,  1144,
1749 <    1227,   720,  1046,  1222,  1221,   945,   955,   956,   601,   965,
1750 <    1208,   963,   969,   970,   971,   972,  1072,   973,   485,   974,
1751 <     975,   976,  1189,   977,   978,   703,   979,   691,   980,  1191,
1752 <    1206,   726,   761,   981,   982,   983,   988,   989,  1223,   990,
1753 <    1204,   766,   991,   992,  1224,   996,   617,   994,   999,   998,
1754 <    1000,  1006,  1007,  1008,  1009,  1010,  1011,  1012,  1013,  1014,
1755 <    1015,  1016,  1017,  1023,  1024,  1025,  1026,  1027,  1207,  1028,
1756 <    1029,   696,  1034,  1035,  1036,  1037,   621,  1038,   382,  1039,
1757 <    1205,  1040,  1180,  1041,  1042,   442,  1043,  1181,   312,   628,
1758 <       0,     0,  1044,  1045,     0,  1053,  1054,  1066,  1067,  1068,
1759 <    1069,  1070,  1071,  1075,  1081,  1082,     0,  1086,     0,     0,
1760 <    1084,  1092,  1087,  1089,  1093,  1115,  1116,  1117,  1140,  1141,
1761 <    1142,  1143,  1146,  1159,  1160,  1190,     0,   491,  1195,  1209,
1762 <    1192,  1219,  1220,     0,     0,     0,     0,     0,     0,     0,
1649 >     863,   864,   614,  1079,   616,   289,   618,   619,   325,    73,
1650 >     708,   116,    51,   289,   709,   710,   501,  1108,    52,   711,
1651 >      56,   222,   582,   508,   326,   327,   297,    58,   328,   303,
1652 >     232,   478,   862,   531,   596,    74,   501,    62,   393,    66,
1653 >     485,   509,    75,  1150,   297,    67,  1123,   251,   116,   570,
1654 >    1124,   222,   478,    69,   403,  1125,   403,   510,   393,  1126,
1655 >     233,  1254,   570,  1050,    71,  1255,  1259,  1263,   234,   532,
1656 >    1260,  1264,   113,   252,   114,   596,   329,   117,  1080,  1265,
1657 >     235,   236,   115,  1266,  1273,   237,   238,   239,  1274,    49,
1658 >      50,   511,   121,   330,   331,   332,   333,   334,   502,   486,
1659 >     673,   335,   675,   676,   394,   336,   487,   253,   488,   682,
1660 >     240,   337,    76,   686,   117,   533,   254,   690,   502,  1050,
1661 >     693,   223,   338,   339,   394,   583,   512,   122,  1280,   298,
1662 >     703,   704,   123,   124,   340,   125,   126,   597,   255,   219,
1663 >     127,   716,   256,   718,   719,   224,   513,   298,   128,   129,
1664 >     257,   223,   571,   258,   259,   130,   341,   404,   131,   404,
1665 >     220,   479,   514,   534,   132,   571,  1051,   489,   395,   133,
1666 >     134,    73,   135,   136,   137,   224,   138,  1275,   597,   515,
1667 >     516,  1276,   479,  -129,   405,   260,   405,  1151,   395,   139,
1668 >     140,  -129,   221,   584,   503,   229,  1152,    74,   230,   342,
1669 >     141,   231,   261,   288,    75,   262,   263,   264,  1277,   296,
1670 >     142,   585,  1278,  1109,   503,   302,  1284,   143,   304,   144,
1671 >    1285,   145,  1051,   146,   582,   147,   148,   586,  1311,   517,
1672 >      82,   290,  1312,   265,   531,   305,   778,   306,   149,   290,
1673 >     605,   643,   307,   150,   151,   152,   579,   153,   154,   155,
1674 >     518,   266,   156,    83,    84,   811,   763,   598,   480,    85,
1675 >     309,   599,  1052,   548,   735,   459,   769,   819,   581,   750,
1676 >     532,   664,   572,   742,    76,   267,   268,   594,   157,   480,
1677 >     568,   401,   801,   460,   499,   572,  1053,   670,   158,   159,
1678 >     160,   161,   162,   163,    86,    87,  1234,   496,   598,   461,
1679 >      88,    89,   599,   485,   867,   868,    90,    91,    92,  1094,
1680 >    1095,  1096,   310,   311,    93,    94,   533,   849,  1052,   362,
1681 >     312,   363,   854,   364,   313,   857,   314,   583,   315,   861,
1682 >     251,   316,   317,   462,  1256,  1257,  1258,   365,   318,    95,
1683 >      96,   319,  1053,   164,   165,   166,   320,   167,   168,   321,
1684 >     322,   400,   410,   366,  1156,   411,   252,   169,   412,   413,
1685 >     457,   414,   486,   415,   534,   416,   417,   418,   419,   487,
1686 >     420,   488,   421,   613,   422,   423,   424,   425,   367,   426,
1687 >     368,   427,   428,   429,   430,   431,   432,   369,   463,   433,
1688 >     253,   434,   435,   436,   438,   584,   464,   465,   370,   254,
1689 >     828,   829,   830,   831,   832,   833,   834,   440,   441,   442,
1690 >     122,   443,   862,   585,   444,   123,   124,   466,   125,   126,
1691 >     445,   255,   371,   127,   446,   256,   447,   448,   449,   586,
1692 >     489,   128,   129,   257,   450,   451,   258,   259,   130,   452,
1693 >     453,   131,   454,   455,   456,   497,   372,   132,   498,   540,
1694 >     541,   542,   133,   134,   543,   135,   136,   137,   544,   138,
1695 >     545,   546,   547,   323,   550,   577,   373,   606,   260,   607,
1696 >     551,   552,   139,   140,   553,   374,   554,   459,   362,   555,
1697 >     363,   556,   364,   141,   557,   261,   558,   559,   262,   263,
1698 >     264,  1162,   467,   142,   560,   460,   365,   561,   731,   508,
1699 >     143,   562,   144,   563,   145,   564,   146,  1163,   147,   148,
1700 >     565,   461,   366,   232,   566,  1164,   265,   509,   567,   578,
1701 >     593,   149,   608,   375,   609,   610,   150,   151,   152,  1165,
1702 >     153,   154,   155,   510,   266,   156,   611,   367,   612,   368,
1703 >     613,   615,   617,   233,   620,   462,   369,   376,   621,   622,
1704 >     623,   234,   660,   626,   624,   625,  1129,   370,   267,   268,
1705 >    1166,   157,  1167,   235,   236,   645,   627,   511,   237,   238,
1706 >     239,   158,   159,   160,   161,   162,   163,  1130,   628,   630,
1707 >     631,   371,   632,   633,   634,   635,  1131,   636,  1168,   637,
1708 >     638,  1281,   639,   240,   640,   641,   642,   646,   647,   648,
1709 >     463,   649,   512,   650,   651,   372,   653,   654,   464,   465,
1710 >    1069,  1070,  1071,  1072,  1073,  1074,  1075,  1132,   655,   656,
1711 >     657,  1169,   513,  1170,   658,   373,   164,   165,   166,   466,
1712 >     167,   168,   659,   662,   374,   663,   666,   667,   514,   668,
1713 >     169,   669,  1171,   674,   678,   672,  1133,  1134,   677,   325,
1714 >     680,   679,  1218,   681,  1135,   515,   516,     2,     3,   683,
1715 >     684,     4,   685,  1172,   687,   326,   327,   688,  1173,   328,
1716 >     689,   691,  1174,     5,   692,   694,     6,     7,   695,  1136,
1717 >     696,  1175,   375,     8,   697,  1176,   698,  1299,   699,   700,
1718 >     702,   701,   715,   721,     9,  1137,  1177,    10,    11,  1178,
1719 >     705,  1179,   706,   723,   467,   517,   376,   707,   712,   713,
1720 >     714,   717,  1180,   720,  1219,   722,   724,   329,  1300,  1181,
1721 >    1301,   726,   737,   744,   727,    12,   518,   745,   774,   780,
1722 >      13,   782,   728,   746,   330,   331,   332,   333,   334,    14,
1723 >     729,   939,   335,   940,   941,  1220,   336,   730,   783,   733,
1724 >     734,   738,   337,  1221,   739,   741,  1138,   747,   748,    15,
1725 >      16,   749,  1222,   338,   339,  1302,   752,   753,   754,   771,
1726 >     756,   757,   765,   758,   759,   340,   760,    17,   762,   766,
1727 >     767,  1189,  1303,  1190,  1191,   768,  1223,   772,  1224,  1225,
1728 >     773,   775,   776,   784,    18,   777,   779,   341,   781,   785,
1729 >     786,   787,  1226,   788,   789,   790,   791,    19,    20,  1227,
1730 >     792,   793,   794,   795,   796,   805,   797,   798,   804,   803,
1731 >    1304,  1305,   916,   799,   806,   807,   808,   813,   809,   810,
1732 >      21,   816,   818,   847,   814,   848,   851,   815,   821,   822,
1733 >     342,   823,   824,    22,   825,   826,   827,   837,    23,   838,
1734 >     839,  1241,   840,    24,   841,   842,    25,   843,   844,   942,
1735 >     943,   944,   845,   846,   945,   946,   852,   947,   948,   850,
1736 >     949,   853,   950,  1306,   855,   951,   856,  1307,   952,   953,
1737 >     858,   859,   860,   954,   862,   865,   873,   955,   866,   870,
1738 >     869,   956,   957,   958,   871,   872,   876,   881,   959,  1192,
1739 >    1193,  1194,   874,   960,  1195,  1196,   875,  1197,  1198,   877,
1740 >    1199,   884,  1200,  1242,   878,  1201,   879,   880,  1202,  1203,
1741 >     882,   883,   885,  1204,   886,   887,   888,  1205,   889,   890,
1742 >     984,  1206,  1207,  1208,    82,   891,   892,   893,  1209,   894,
1743 >     917,   918,   919,  1210,  1243,   920,   921,   895,   922,   923,
1744 >     896,   924,  1244,   925,   982,   983,   926,    83,    84,   927,
1745 >     928,  1245,   897,    85,   929,   898,   899,   900,   930,   901,
1746 >     902,   903,   931,   932,   933,   904,   905,   906,   907,   934,
1747 >     908,   909,   910,   911,   935,  1246,   912,  1247,  1248,   913,
1748 >     985,   914,   986,   987,   988,   989,   915,   938,    86,    87,
1749 >     991,  1249,   963,   992,    88,    89,   994,   964,  1250,   995,
1750 >      90,    91,    92,   997,   965,   996,   966,   967,    93,    94,
1751 >    1003,  1004,   968,   969,  1006,  1009,   970,   971,   812,  1010,
1752 >     972,   973,   974,   975,   976,   977,   978,   979,   980,   981,
1753 >     990,   993,  1000,    95,    96,  1001,  1002,  1005,  1007,  1011,
1754 >    1012,  1008,  1013,  1014,  1015,  1016,  1017,  1018,  1019,  1020,
1755 >    1021,  1022,  1023,  1024,  1025,  1046,  1026,  1027,  1028,  1059,
1756 >    1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,  1038,
1757 >    1039,  1040,  1041,  1042,  1043,  1044,  1045,  1060,  1048,  1049,
1758 >    1047,  1061,  1062,  1063,  1065,  1064,  1067,  1267,  1279,  1066,
1759 >    1068,  1076,  1077,  1078,   308,  1083,  1084,  1290,  1085,  1086,
1760 >    1291,  1292,  1087,  1235,  1088,  1089,  1090,  1091,  1092,  1093,
1761 >    1099,  1100,  1101,  1102,   751,  1294,  1103,  1104,   569,  1313,
1762 >    1105,  1106,  1293,  1286,  1107,  1112,  1113,  1114,  1115,  1116,
1763 >    1117,  1118,  1119,  1120,  1121,  1122,  1127,  1128,  1141,  1142,
1764 >    1143,  1144,  1145,  1155,   764,  1146,  1147,  1148,  1289,  1149,
1765 >     743,   644,  1268,  1288,  1158,  1159,   770,  1160,  1161,   732,
1766 >    1184,  1185,  1186,   820,  1187,  1188,  1213,  1214,  1215,  1216,
1767 >    1217,  1230,  1310,   802,  1236,  1231,  1232,  1237,  1238,  1239,
1768 >    1240,  1270,  1253,  1269,  1295,  1287,   500,   661,   402,  1271,
1769 >     458,   736,  1272,  1283,  1282,  1262,  1296,  1297,   324,  1261,
1770 >    1298,     0,   665,     0,     0,     0,   671,     0,     0,   549,
1771         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1772         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1773 <       0,     0,     0,   527,     0,     0,     0,     0,     0,     0,
1773 >       0,     0,     0,   580,     0,     0,     0,     0,     0,     0,
1774         0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
1775 <       0,     0,   545,     0,     0,     0,     0,     0,     0,     0,
2044 <       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
2045 <       0,     0,     0,     0,     0,     0,   564
1775 >       0,     0,     0,     0,     0,   595
1776   };
1777  
2048 #define yypact_value_is_default(yystate) \
2049  ((yystate) == (-744))
2050
2051 #define yytable_value_is_error(yytable_value) \
2052  YYID (0)
2053
1778   static const yytype_int16 yycheck[] =
1779   {
1780 <     598,   599,   300,   301,     1,     1,   215,   216,     1,     1,
1781 <     308,     1,     1,    99,   160,   161,     1,     1,    51,     1,
1782 <     215,     8,     1,     1,   219,     1,     1,   160,   161,     1,
1783 <     217,     1,   775,   776,   777,   778,   779,     1,   217,     1,
1784 <      37,   217,    24,   215,     6,     7,   217,   219,   215,    31,
1785 <      12,   217,   219,   217,    51,    52,    53,    54,    20,     1,
1786 <       1,   215,     1,   215,    26,   219,    28,    29,    30,    61,
1787 <     215,     1,    69,    35,   219,    17,     1,    61,   217,    41,
1788 <      42,   217,    44,    45,    46,    24,   217,    17,    50,    61,
1789 <      32,   217,    31,    55,    36,   393,   394,    59,    60,    24,
1790 <      89,    63,    32,   401,    89,   403,    36,    89,    87,   195,
1791 <      72,    89,   410,   217,    89,   413,     1,    79,    80,    89,
1792 <      82,    83,    84,    85,    86,    89,   424,   425,   120,     1,
1793 <     120,   120,    57,   217,   113,    97,   434,   435,   217,   437,
1794 <     217,   103,   104,   105,   120,   107,    87,     1,   110,   111,
1795 <      89,    36,   114,   186,   217,     1,   120,   217,   191,    89,
1796 <      14,   151,   151,     1,    89,   215,    91,    92,   217,   219,
1797 <     112,    56,   113,   151,   215,   151,    61,   217,   219,   121,
1798 <     122,   151,   112,    21,    22,     1,   148,   151,   215,    27,
1799 <     152,   217,   219,   155,   156,   157,   158,   159,   215,   129,
1800 <     162,   163,   219,   128,   191,   130,   131,   132,   133,     1,
1801 <       1,   153,   208,   134,   135,   208,   206,    89,   214,   216,
1802 <     216,   214,   147,    14,   216,   118,   216,   525,    66,    67,
1803 <     206,   216,   117,     1,   216,    73,    74,    75,   216,    93,
1804 <     202,   203,   204,    89,   216,   207,   171,    15,    16,   215,
1805 <     212,    19,   216,   219,   216,   215,   181,    95,    96,   219,
1806 <       1,     1,   192,     3,   206,     5,   120,     1,   215,   217,
1807 <     108,   109,   219,    89,   216,   216,   206,    17,   215,   151,
1808 <     218,   119,   219,   215,   209,   210,   216,   219,   215,   127,
1809 <     588,   216,    32,   134,   135,    36,    36,    89,   596,   597,
1810 <     178,   179,    93,   218,   218,   151,   218,   218,    76,    77,
1811 <      78,   218,   218,    81,   218,    56,    56,    40,    58,   218,
1812 <      61,    89,    13,     9,    10,    11,   218,    61,    68,   120,
1813 <     218,   216,   100,   101,   206,   151,   218,   218,     1,    62,
1814 <     214,    64,    33,   218,   216,   218,   215,   115,   116,    89,
1815 <     218,   218,    43,   218,    17,  1018,  1019,  1020,    49,   151,
1816 <     218,   218,   216,   218,   215,   218,   218,   213,   218,    32,
1817 <     216,   218,   118,    36,    65,   143,   117,   117,   216,   102,
1818 <     215,   218,     1,     1,   218,   218,   120,   218,     6,     7,
1819 <       1,   218,   218,   218,    12,   218,   218,   213,   218,    90,
1820 <     218,   218,    20,   218,   144,    24,    17,    98,    26,   218,
1821 <      28,    29,    30,    99,   206,   218,   184,    35,   218,   218,
1822 <     218,    32,   218,    41,    42,    36,    44,    45,    46,   218,
1823 <     218,   171,    50,   218,   218,   218,   218,    55,    57,   218,
1824 <     218,    59,    60,   218,   218,    63,   137,   218,   216,   112,
1825 <     173,   174,   218,   218,    72,   218,   218,   218,   121,   122,
1826 <     218,    79,    80,   154,    82,    83,    84,    85,    86,   209,
1827 <      89,   218,    91,    92,   218,   218,   216,   118,    89,    97,
1828 <     218,   218,   218,   206,    99,   103,   104,   105,   218,   107,
1829 <     153,  1089,   110,   111,   218,    99,   114,   218,   218,   218,
1830 <       1,   112,     3,   218,     5,   218,   218,   218,   218,   128,
1831 <     218,   130,   131,   132,   133,     4,    17,   218,   129,   218,
1832 <     218,   218,   218,   218,    64,   218,   218,   160,   147,    99,
1833 <     148,    32,     1,   218,   152,    36,    25,   155,   156,   157,
1834 <     158,   159,   218,   206,   162,   163,    15,    16,   218,   218,
1835 <      19,    40,   171,    99,    99,    56,    99,    58,    47,   160,
1836 <      99,   160,   181,    99,   160,   160,   215,    68,   138,   139,
1837 <     140,   141,   142,   215,   218,    64,   118,   160,   218,   218,
1838 <     218,   192,   218,   218,   202,   203,   204,   218,    89,   207,
1839 <     209,   210,   218,   218,   212,   206,   136,   218,    87,   215,
1840 <      99,   218,    51,   160,   218,    94,   218,    76,    77,    78,
1841 <       0,     1,    81,   218,     4,   218,   117,   106,   218,   160,
1842 <      89,   218,   215,    99,    14,   165,   218,    17,    18,   218,
1843 <     218,   100,   101,    23,   174,   124,   125,   126,   218,     1,
1844 <     180,   218,   218,   144,    34,   218,   115,   116,    38,    39,
1845 <      51,   218,   218,   218,   194,   218,   196,   197,    48,   218,
1846 <     218,   118,   160,   160,    99,   205,    99,    99,   160,   160,
1847 <     171,   211,    62,   160,   143,    37,    99,    99,    51,    99,
1848 <      70,    71,    99,    99,   118,   174,    99,   160,   160,    51,
1849 <      52,    53,    54,   218,   183,   160,   218,   160,    88,   188,
1850 <     160,   160,   160,   118,   160,   194,   160,    69,   209,   198,
1851 <     160,   200,   102,   160,   160,   184,   205,   166,   167,   168,
1852 <     169,   170,   211,   172,   173,   215,   175,   176,   177,    64,
1853 <     215,   180,   218,   182,   183,   218,   185,   218,   187,   218,
1854 <     189,   190,   160,   218,   193,    99,   136,   218,   218,   217,
1855 <     199,   218,   218,   215,   218,   145,   146,   218,   118,   149,
1856 <     150,   118,   215,   218,   215,   166,   167,   168,   169,   170,
1857 <     215,   172,   173,   215,   175,   176,   177,   218,   218,   180,
1858 <     218,   182,   183,   160,   185,   160,   187,   218,   189,   190,
1859 <     218,   218,   193,   166,   167,   168,   169,   170,   199,   172,
1860 <     173,   136,   175,   176,   177,   118,   218,   180,     1,   182,
1861 <     183,   201,   185,   218,   187,   218,   189,   190,   160,   160,
1862 <     193,   215,   118,   160,   118,   118,   199,   118,    21,    22,
1863 <     165,   118,   118,   118,    27,   118,   118,   118,   118,   174,
1864 <     218,   215,   218,   215,   215,   180,   118,   215,   218,   215,
1865 <     215,   215,   215,    99,   215,    99,   215,   215,    99,   194,
1866 <     215,   196,   197,   215,   215,   215,   215,   215,   215,   215,
1867 <     205,   215,   215,    66,    67,    99,   211,    99,    99,   118,
1868 <      73,    74,    75,    99,    99,    99,   215,   118,   118,   160,
1869 <     218,   118,   118,   118,    99,   118,   215,   215,   118,   118,
1870 <     118,   118,    95,    96,   215,   118,   118,   118,   218,   215,
1871 <     215,   215,   215,   215,   215,   108,   109,   215,   215,   118,
1872 <     215,   118,    99,   215,   160,   215,   119,   215,   118,   218,
1873 <     118,   215,   118,   118,   127,   118,   215,   215,   215,   215,
1874 <     215,   215,   215,   118,   118,   215,   215,   215,   215,   215,
1875 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
1876 <     215,   215,   215,   215,   215,   215,   215,   215,   215,    99,
1877 <     215,   118,   215,   215,   118,   215,   160,   215,   215,   118,
1878 <     215,   118,   215,   118,   218,   118,   218,   215,   987,   218,
1879 <     118,   118,   118,   118,   118,    71,   164,    99,   950,   985,
1880 <    1226,   501,   123,  1199,  1197,   215,   215,   215,   328,   215,
1881 <    1187,   218,   215,   215,   215,   215,   123,   215,   222,   215,
1882 <     215,   215,  1084,   215,   215,   477,   215,   452,   215,   118,
1883 <    1183,   515,   550,   215,   215,   215,   215,   215,  1201,   215,
1884 <    1177,   558,   215,   215,  1203,   215,   358,   218,   215,   218,
1885 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
1886 <     215,   215,   215,   215,   215,   215,   215,   215,  1185,   215,
1887 <     215,   467,   215,   215,   215,   215,   376,   215,   112,   215,
1888 <    1179,   215,  1050,   215,   215,   166,   215,  1052,    91,   388,
1889 <      -1,    -1,   215,   215,    -1,   215,   215,   215,   215,   215,
1890 <     215,   215,   215,   215,   215,   215,    -1,   215,    -1,    -1,
1891 <     219,   215,   218,   218,   215,   215,   215,   215,   215,   215,
1892 <     215,   215,   215,   215,   215,   215,    -1,   230,   215,   215,
1893 <     218,   215,   215,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1894 <      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1780 >     641,   642,   313,    55,   315,     1,   317,   318,     1,     1,
1781 >     216,     1,   235,     1,   220,   216,     1,     8,   235,   220,
1782 >     235,     1,     1,     1,    17,    18,     1,   235,    21,   233,
1783 >       1,     1,   114,     1,     1,    27,     1,   235,     1,   235,
1784 >       1,    19,    34,    51,     1,   235,   233,     1,     1,     1,
1785 >     237,     1,     1,   235,     1,   233,     1,    35,     1,   237,
1786 >      31,   233,     1,     1,   235,   237,   233,   233,    39,    37,
1787 >     237,   237,   235,    27,   235,     1,    69,    67,   130,   233,
1788 >      51,    52,   235,   237,   233,    56,    57,    58,   237,   233,
1789 >     234,    69,   235,    86,    87,    88,    89,    90,    83,    60,
1790 >     411,    94,   413,   414,    67,    98,    67,    61,    69,   420,
1791 >      81,   104,   104,   424,    67,    83,    70,   428,    83,     1,
1792 >     431,   101,   115,   116,    67,   104,   104,     1,   210,   104,
1793 >     441,   442,     6,     7,   127,     9,    10,   104,    92,   235,
1794 >      14,   452,    96,   454,   455,   125,   124,   104,    22,    23,
1795 >     104,   101,   104,   107,   108,    29,   149,   104,    32,   104,
1796 >     235,   131,   140,   131,    38,   104,   104,   128,   131,    43,
1797 >      44,     1,    46,    47,    48,   125,    50,   233,   104,   157,
1798 >     158,   237,   131,   179,   131,   139,   131,   195,   131,    63,
1799 >      64,   179,   235,   172,   179,   235,   204,    27,   235,   192,
1800 >      74,   235,   156,   235,    34,   159,   160,   161,   233,   235,
1801 >      84,   190,   237,   204,   179,   235,   233,    91,   236,    93,
1802 >     237,    95,   104,    97,     1,    99,   100,   206,   233,   207,
1803 >       1,   227,   237,   187,     1,   236,   547,   236,   112,   227,
1804 >     129,   234,   234,   117,   118,   119,   234,   121,   122,   123,
1805 >     228,   205,   126,    24,    25,   234,   234,   224,   228,    30,
1806 >     236,   228,   200,   234,   234,     1,   234,   234,   179,   234,
1807 >      37,   234,   224,   234,   104,   229,   230,   234,   152,   228,
1808 >     234,   234,   234,    19,   234,   224,   224,   234,   162,   163,
1809 >     164,   165,   166,   167,    65,    66,   234,   233,   224,    35,
1810 >      71,    72,   228,     1,   183,   184,    77,    78,    79,    11,
1811 >      12,    13,   236,   236,    85,    86,    83,   628,   200,     1,
1812 >     236,     3,   633,     5,   236,   636,   236,   104,   236,   640,
1813 >       1,   236,   236,    69,  1094,  1095,  1096,    19,   236,   110,
1814 >     111,   236,   224,   217,   218,   219,   236,   221,   222,   236,
1815 >     236,   236,   236,    35,   237,   236,    27,   231,   236,   236,
1816 >     234,   236,    60,   236,   131,   236,   236,   236,   236,    67,
1817 >     236,    69,   236,   114,   236,   236,   236,   236,    60,   236,
1818 >      62,   236,   236,   236,   236,   236,   236,    69,   124,   236,
1819 >      61,   236,   236,   236,   236,   172,   132,   133,    80,    70,
1820 >     141,   142,   143,   144,   145,   146,   147,   236,   236,   236,
1821 >       1,   236,   114,   190,   236,     6,     7,   153,     9,    10,
1822 >     236,    92,   104,    14,   236,    96,   236,   236,   236,   206,
1823 >     128,    22,    23,   104,   236,   236,   107,   108,    29,   236,
1824 >     236,    32,   236,   236,   236,   236,   128,    38,   236,   236,
1825 >     236,   236,    43,    44,   236,    46,    47,    48,   236,    50,
1826 >     236,   236,   236,   234,   233,   233,   148,   129,   139,   129,
1827 >     236,   236,    63,    64,   236,   157,   236,     1,     1,   236,
1828 >       3,   236,     5,    74,   236,   156,   236,   236,   159,   160,
1829 >     161,     4,   228,    84,   236,    19,    19,   236,   234,     1,
1830 >      91,   236,    93,   236,    95,   236,    97,    20,    99,   100,
1831 >     236,    35,    35,     1,   236,    28,   187,    19,   236,   236,
1832 >     236,   112,   233,   205,   114,   114,   117,   118,   119,    42,
1833 >     121,   122,   123,    35,   205,   126,   216,    60,   114,    62,
1834 >     114,   114,   114,    31,   114,    69,    69,   229,   114,   216,
1835 >     216,    39,   234,   236,   233,   233,    15,    80,   229,   230,
1836 >      73,   152,    75,    51,    52,   233,   236,    69,    56,    57,
1837 >      58,   162,   163,   164,   165,   166,   167,    36,   236,   236,
1838 >     236,   104,   236,   236,   236,   236,    45,   236,   101,   236,
1839 >     236,  1232,   236,    81,   236,   236,   236,   236,   236,   236,
1840 >     124,   236,   104,   236,   236,   128,   236,   236,   132,   133,
1841 >     828,   829,   830,   831,   832,   833,   834,    76,   236,   236,
1842 >     236,   134,   124,   136,   236,   148,   217,   218,   219,   153,
1843 >     221,   222,   236,   236,   157,   236,   129,   233,   140,   236,
1844 >     231,   236,   155,   114,   114,   216,   105,   106,   216,     1,
1845 >     114,   216,    75,   216,   113,   157,   158,     0,     1,   216,
1846 >     114,     4,   114,   176,   114,    17,    18,   216,   181,    21,
1847 >     216,   114,   185,    16,   114,   114,    19,    20,   114,   138,
1848 >     114,   194,   205,    26,   114,   198,   216,    42,   236,   216,
1849 >     216,   236,   114,   233,    37,   154,   209,    40,    41,   212,
1850 >     216,   214,   216,   236,   228,   207,   229,   216,   216,   216,
1851 >     216,   216,   225,   216,   137,   233,   236,    69,    73,   232,
1852 >      75,   236,   233,   129,   236,    68,   228,   129,   129,   129,
1853 >      73,   129,   236,   233,    86,    87,    88,    89,    90,    82,
1854 >     236,    51,    94,    53,    54,   168,    98,   236,   114,   236,
1855 >     236,   236,   104,   176,   236,   236,   215,   233,   236,   102,
1856 >     103,   236,   185,   115,   116,   120,   233,   236,   236,   216,
1857 >     236,   236,   233,   236,   236,   127,   236,   120,   236,   236,
1858 >     236,    51,   137,    53,    54,   236,   209,   216,   211,   212,
1859 >     216,   216,   216,   114,   137,   216,   233,   149,   216,   129,
1860 >     129,   129,   225,   129,   129,   129,   129,   150,   151,   232,
1861 >     129,   114,   129,   129,   129,   235,   233,   233,   233,   216,
1862 >     175,   176,    51,   236,   233,   236,   236,   129,   236,   236,
1863 >     173,   236,   236,   114,   233,   114,   114,   233,   233,   233,
1864 >     192,   233,   233,   186,   233,   233,   233,   233,   191,   233,
1865 >     233,    75,   233,   196,   233,   233,   199,   233,   233,   169,
1866 >     170,   171,   233,   233,   174,   175,   114,   177,   178,   236,
1867 >     180,   114,   182,   228,   114,   185,   114,   232,   188,   189,
1868 >     129,   114,   114,   193,   114,   233,   236,   197,   129,   216,
1869 >     129,   201,   202,   203,   129,   129,   114,   233,   208,   169,
1870 >     170,   171,   129,   213,   174,   175,   129,   177,   178,   129,
1871 >     180,   233,   182,   137,   129,   185,   129,   129,   188,   189,
1872 >     129,   129,   233,   193,   129,   129,   233,   197,   233,   233,
1873 >     236,   201,   202,   203,     1,   233,   233,   233,   208,   233,
1874 >     169,   170,   171,   213,   168,   174,   175,   233,   177,   178,
1875 >     233,   180,   176,   182,   129,   216,   185,    24,    25,   188,
1876 >     189,   185,   233,    30,   193,   233,   233,   233,   197,   233,
1877 >     233,   233,   201,   202,   203,   233,   233,   233,   233,   208,
1878 >     233,   233,   233,   233,   213,   209,   233,   211,   212,   233,
1879 >     129,   233,   114,   129,   129,   129,   233,   233,    65,    66,
1880 >     129,   225,   233,   129,    71,    72,   129,   233,   232,   129,
1881 >      77,    78,    79,   114,   233,   236,   233,   233,    85,    86,
1882 >     129,   129,   233,   233,   129,   129,   233,   233,   587,   129,
1883 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
1884 >     233,   233,   233,   110,   111,   233,   233,   233,   216,   129,
1885 >     129,   236,   216,   236,   129,   233,   129,   129,   129,   233,
1886 >     233,   233,   233,   233,   233,   129,   233,   233,   233,   129,
1887 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
1888 >     233,   233,   233,   233,   233,   233,   233,   129,   233,   233,
1889 >     236,   129,   129,   233,   129,   233,   129,   114,   129,   236,
1890 >     233,   233,   233,   233,    77,   233,   233,   135,   233,   233,
1891 >     135,   135,   233,  1054,   233,   233,   233,   233,   233,   233,
1892 >     233,   233,   233,   233,   504,  1276,   233,   233,   269,  1312,
1893 >     233,   233,  1274,  1255,   233,   233,   233,   233,   233,   233,
1894 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
1895 >     233,   233,   233,   223,   519,   233,   233,   233,  1266,   233,
1896 >     491,   343,  1156,  1264,   233,   233,   535,   233,   233,   468,
1897 >     233,   233,   233,   600,   233,   233,   233,   233,   233,   233,
1898 >     233,   233,  1285,   573,   233,   236,   236,   233,   233,   233,
1899 >     233,   238,   233,   233,  1278,  1260,   225,   377,   118,   238,
1900 >     170,   481,   238,   233,   236,  1126,   233,   233,    97,  1124,
1901 >     233,    -1,   396,    -1,    -1,    -1,   406,    -1,    -1,   241,
1902        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
2172      -1,    -1,    -1,   243,    -1,    -1,    -1,    -1,    -1,    -1,
1903        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1904 <      -1,    -1,   267,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1904 >      -1,    -1,    -1,   291,    -1,    -1,    -1,    -1,    -1,    -1,
1905        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
1906 <      -1,    -1,    -1,    -1,    -1,    -1,   288
1906 >      -1,    -1,    -1,    -1,    -1,   299
1907   };
1908  
1909 < /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1910 <   symbol of state STATE-NUM.  */
1909 >  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
1910 >     symbol of state STATE-NUM.  */
1911   static const yytype_uint16 yystos[] =
1912   {
1913 <       0,   221,     0,     1,     4,    14,    17,    18,    23,    34,
1914 <      38,    39,    48,    62,    70,    71,    88,   102,   136,   145,
1915 <     146,   149,   150,   201,   222,   227,   232,   254,   260,   274,
1916 <     292,   310,   324,   339,   346,   350,   360,   369,   389,   399,
1917 <     405,   409,   419,   477,   494,   215,   216,   217,   217,   293,
1918 <     370,   400,   217,   410,   217,   325,   390,   311,   217,   217,
1919 <     275,   340,   217,   217,   351,   361,   217,     1,    24,    31,
1920 <      89,   255,   256,   257,   258,   259,     1,    21,    22,    27,
1921 <      66,    67,    73,    74,    75,    95,    96,   108,   109,   119,
1922 <     127,   478,   479,   480,   481,   482,   483,   484,   485,   486,
1923 <     487,   488,   489,   490,   491,   492,   493,   217,   217,   217,
1924 <       1,    61,   406,   407,   408,   217,     1,     6,     7,    12,
1925 <      20,    26,    28,    29,    30,    35,    41,    42,    44,    45,
1926 <      46,    50,    55,    59,    60,    63,    72,    79,    80,    82,
1927 <      83,    84,    85,    86,    97,   103,   104,   105,   107,   110,
1928 <     111,   114,   148,   152,   155,   156,   157,   158,   159,   162,
1929 <     163,   202,   203,   204,   207,   212,   420,   421,   422,   423,
1930 <     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
1931 <     434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
1932 <     444,   445,   446,   447,   448,   449,   450,   451,   452,   453,
1933 <     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
1934 <     464,   465,   466,   470,   474,   475,   476,   217,   217,   217,
1935 <       1,   208,   261,   262,   263,   264,   265,     1,    87,   113,
1936 <     228,   229,   230,   231,   217,   217,     1,    37,    51,    52,
1937 <      53,    54,    69,   495,   496,   497,   498,   499,   500,   501,
1938 <     502,     1,    24,    57,    89,    91,    92,   128,   130,   131,
1939 <     132,   133,   147,   171,   181,   209,   210,   233,   234,   235,
1940 <     236,   241,   242,   243,   244,   245,   246,   247,   248,   249,
1941 <     250,   251,   252,   253,   217,   217,     1,    89,   347,   348,
1942 <     349,   215,   218,   218,   218,   216,   256,   218,   218,   218,
1943 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1944 <     218,   216,   479,     1,    15,    16,    19,    76,    77,    78,
1945 <      81,    89,   100,   101,   115,   116,   143,   184,   294,   295,
1946 <     296,   297,   298,   299,   300,   301,   302,   303,   304,   305,
1947 <     306,   307,   308,   309,     1,     3,     5,    17,    32,    36,
1948 <      56,    58,    68,    89,   117,   144,   171,   209,   371,   372,
1949 <     373,   374,   375,   376,   377,   378,   379,   380,   384,   385,
1950 <     386,   387,   388,     1,    61,   120,   401,   402,   403,   404,
1951 <     218,   216,   407,     1,    89,   120,   151,   411,   415,   416,
1952 <     417,   418,   218,   218,   218,   218,   218,   218,   218,   218,
1953 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1954 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1955 <     218,   471,   218,   467,   218,   218,   218,   218,   218,   218,
1956 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1957 <     218,   216,   421,     1,    17,    32,    36,   112,   121,   122,
1958 <     153,   206,   326,   327,   328,   329,   330,   331,   332,   336,
1959 <     337,   338,     1,   120,   151,   206,   391,   395,   396,   397,
1960 <     398,     1,    36,    56,    61,   117,   312,   316,   317,   318,
1961 <     322,   323,   215,   218,   216,   262,   214,   215,   218,   218,
1962 <     216,   229,     1,    17,    32,    36,    89,   112,   129,   192,
1963 <     206,   276,   277,   278,   279,   280,   281,   282,   283,   284,
1964 <     288,     1,    14,    93,   120,   341,   342,   343,   344,   345,
1965 <     218,   218,   218,   218,   218,   218,   216,   496,   215,   218,
1966 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1967 <     218,   218,   218,   218,   216,   234,     1,    89,   151,   206,
1968 <     352,   353,   354,   355,   356,     1,    89,   151,   362,   363,
1969 <     364,   365,   218,   216,   348,   118,   118,   118,   215,    99,
1970 <      99,   160,    99,   224,   224,    99,    99,    99,   160,   160,
1971 <      99,   224,   160,   160,   215,   215,   218,   218,   218,   218,
1972 <     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
1973 <     216,   295,   215,   218,   218,   218,   218,   381,   218,   218,
1974 <     218,   218,   218,   218,   218,   218,   216,   372,   218,   218,
1975 <     216,   402,   118,   215,   218,   218,   412,   216,   416,   160,
1976 <     224,   224,    99,   160,   160,    99,   118,   160,   224,   160,
1977 <     224,    99,    99,    99,   160,   160,   160,   224,    99,    99,
1978 <     224,    99,    99,   118,    99,    99,   160,   160,   218,   160,
1979 <     218,   224,   224,   160,   160,   160,   160,   160,   161,   160,
1980 <     161,   160,   160,   224,   224,   118,   224,   160,   160,   160,
1981 <     215,   215,   218,   218,   333,   218,   218,   218,   218,   218,
1982 <     216,   327,   218,   392,   218,   216,   396,   215,   313,   218,
1983 <     218,   218,   216,   317,   160,   215,   217,   118,   118,   215,
1984 <     215,   218,   218,   289,   218,   218,   218,   285,   218,   216,
1985 <     277,   215,   218,   218,   218,   216,   342,   160,   160,   118,
1986 <     160,   160,   224,   215,   118,   160,   118,   118,   118,   118,
1987 <     118,   118,   134,   135,   237,   238,   134,   135,   239,   240,
1988 <     118,   118,    99,   118,   118,   215,   215,   218,   357,   218,
1989 <     216,   353,   215,   218,   366,   216,   363,   118,   215,   215,
1990 <     215,   215,   215,   215,   215,   138,   139,   140,   141,   142,
1991 <     223,   224,   215,   215,   215,   215,   215,   215,   215,   215,
1992 <     215,   215,   215,    99,    99,   224,    99,    99,    99,    99,
1993 <     118,    99,    99,   224,   224,    99,   226,   226,   215,   118,
1994 <     178,   179,   118,   160,   218,   118,   118,   118,   118,    99,
1995 <     118,   118,   118,   215,   118,   118,   215,   215,   118,   118,
1996 <     218,   215,   215,   215,   215,   215,   215,   215,   215,   215,
1997 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
1998 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
1999 <     215,    51,   166,   167,   168,   169,   170,   172,   173,   175,
2000 <     176,   177,   180,   182,   183,   185,   187,   189,   190,   193,
2001 <     199,   472,   473,   215,    51,   166,   167,   168,   169,   170,
2002 <     172,   173,   175,   176,   177,   180,   182,   183,   185,   187,
2003 <     189,   190,   193,   199,   468,   469,   215,   215,   215,   215,
2004 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
2005 <     215,   215,   215,   215,   215,   118,   160,   218,   118,    99,
2006 <     118,   118,   118,   215,   118,   218,   118,   215,   218,   118,
2007 <     118,    99,   320,   321,   215,   215,     1,    89,   151,   213,
2008 <     266,   267,   268,   269,   270,   215,   215,   118,   160,   218,
2009 <     118,   118,   118,   218,   118,   215,   118,   118,   118,   215,
2010 <     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
2011 <     215,   215,   215,   215,   215,   219,   215,   219,   215,   215,
2012 <     215,   215,   215,   118,   218,   118,   215,   118,   218,   215,
2013 <     215,   223,   223,   223,   223,   223,   215,   215,   215,   215,
2014 <     215,   215,   215,   215,   215,   215,   215,   215,     9,    10,
2015 <      11,   225,   226,   215,   215,   215,   215,   215,   215,   215,
2016 <       8,   191,   382,   383,   215,   215,   215,   215,   215,   215,
2017 <     215,   215,   215,   215,   215,   215,   123,   413,   414,   215,
2018 <     219,   215,   219,   215,   215,    13,    33,    43,    49,    65,
2019 <      90,    98,   137,   154,   334,   335,   215,   215,   215,   215,
2020 <     215,   215,   123,   393,   394,   215,    51,   186,   191,   314,
2021 <     315,   215,   215,   164,   219,   319,   215,   218,   271,   218,
2022 <     216,   267,   215,   215,     4,    25,    40,    47,    64,    87,
2023 <      94,   106,   124,   125,   126,   174,   183,   188,   194,   198,
2024 <     200,   205,   211,   290,   291,   215,   215,   215,    51,   166,
2025 <     167,   168,   169,   170,   172,   173,   175,   176,   177,   180,
2026 <     182,   183,   185,   187,   189,   190,   193,   199,   286,   287,
2027 <     215,   215,   215,   215,   238,   240,   215,    64,   136,   165,
2028 <     174,   180,   194,   196,   197,   205,   211,   358,   359,   215,
2029 <     215,    64,   136,   165,   174,   180,   194,   196,   197,   205,
2030 <     211,   367,   368,   225,   225,   225,   215,   219,   215,   219,
2031 <     473,   469,   215,   219,   215,   219,   215,   219,    99,   321,
2032 <     215,   118,   218,   195,   226,   215,   215,   219,   215,   219,
2033 <     215,   219,   215,   219,   383,   414,   335,   394,   315,   215,
2034 <      40,    62,    64,   102,   173,   174,   206,   272,   273,   215,
2035 <     215,   291,   287,   359,   368,   215,   219,   273
1913 >       0,   240,     0,     1,     4,    16,    19,    20,    26,    37,
1914 >      40,    41,    68,    73,    82,   102,   103,   120,   137,   150,
1915 >     151,   173,   186,   191,   196,   199,   241,   246,   251,   271,
1916 >     277,   283,   291,   305,   325,   349,   363,   378,   385,   389,
1917 >     399,   408,   429,   435,   441,   445,   451,   507,   524,   233,
1918 >     234,   235,   235,   326,   409,   436,   235,   446,   235,   364,
1919 >     430,   350,   235,   278,   306,   379,   235,   235,   400,   235,
1920 >     284,   235,   390,     1,    27,    34,   104,   272,   273,   274,
1921 >     275,   276,     1,    24,    25,    30,    65,    66,    71,    72,
1922 >      77,    78,    79,    85,    86,   110,   111,   508,   509,   510,
1923 >     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
1924 >     521,   522,   523,   235,   235,   235,     1,    67,   442,   443,
1925 >     444,   235,     1,     6,     7,     9,    10,    14,    22,    23,
1926 >      29,    32,    38,    43,    44,    46,    47,    48,    50,    63,
1927 >      64,    74,    84,    91,    93,    95,    97,    99,   100,   112,
1928 >     117,   118,   119,   121,   122,   123,   126,   152,   162,   163,
1929 >     164,   165,   166,   167,   217,   218,   219,   221,   222,   231,
1930 >     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
1931 >     462,   463,   464,   465,   466,   467,   468,   469,   470,   471,
1932 >     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
1933 >     482,   483,   484,   485,   486,   487,   488,   489,   490,   491,
1934 >     492,   493,   494,   495,   496,   500,   504,   505,   506,   235,
1935 >     235,   235,     1,   101,   125,   247,   248,   249,   250,   235,
1936 >     235,   235,     1,    31,    39,    51,    52,    56,    57,    58,
1937 >      81,   525,   526,   527,   528,   529,   530,   531,   532,   533,
1938 >     534,     1,    27,    61,    70,    92,    96,   104,   107,   108,
1939 >     139,   156,   159,   160,   161,   187,   205,   229,   230,   252,
1940 >     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
1941 >     263,   264,   265,   266,   267,   268,   269,   270,   235,     1,
1942 >     227,   292,   293,   294,   295,   296,   235,     1,   104,   386,
1943 >     387,   388,   235,   233,   236,   236,   236,   234,   273,   236,
1944 >     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1945 >     236,   236,   236,   234,   509,     1,    17,    18,    21,    69,
1946 >      86,    87,    88,    89,    90,    94,    98,   104,   115,   116,
1947 >     127,   149,   192,   327,   328,   329,   330,   331,   332,   333,
1948 >     334,   335,   336,   337,   338,   339,   340,   341,   342,   343,
1949 >     344,   345,     1,     3,     5,    19,    35,    60,    62,    69,
1950 >      80,   104,   128,   148,   157,   205,   229,   410,   411,   412,
1951 >     413,   414,   415,   416,   417,   418,   419,   420,   424,   425,
1952 >     426,   427,   428,     1,    67,   131,   437,   438,   439,   440,
1953 >     236,   234,   443,     1,   104,   131,   447,   448,   449,   450,
1954 >     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1955 >     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1956 >     236,   236,   236,   236,   236,   236,   236,   501,   236,   497,
1957 >     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1958 >     236,   236,   236,   236,   236,   236,   236,   234,   453,     1,
1959 >      19,    35,    69,   124,   132,   133,   153,   228,   365,   366,
1960 >     367,   368,   369,   370,   371,   375,   376,   377,     1,   131,
1961 >     228,   431,   432,   433,   434,     1,    60,    67,    69,   128,
1962 >     351,   355,   356,   357,   361,   362,   233,   236,   236,   234,
1963 >     248,     1,    83,   179,   279,   280,   281,   282,     1,    19,
1964 >      35,    69,   104,   124,   140,   157,   158,   207,   228,   307,
1965 >     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
1966 >     321,     1,    37,    83,   131,   380,   381,   382,   383,   384,
1967 >     236,   236,   236,   236,   236,   236,   236,   236,   234,   526,
1968 >     233,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1969 >     236,   236,   236,   236,   236,   236,   236,   236,   234,   253,
1970 >       1,   104,   224,   401,   402,   403,   404,   233,   236,   234,
1971 >     293,   179,     1,   104,   172,   190,   206,   285,   286,   287,
1972 >     288,   289,   290,   236,   234,   387,     1,   104,   224,   228,
1973 >     391,   392,   393,   394,   395,   129,   129,   129,   233,   114,
1974 >     114,   216,   114,   114,   243,   114,   243,   114,   243,   243,
1975 >     114,   114,   216,   216,   233,   233,   236,   236,   236,   346,
1976 >     236,   236,   236,   236,   236,   236,   236,   236,   236,   236,
1977 >     236,   236,   236,   234,   328,   233,   236,   236,   236,   236,
1978 >     236,   236,   421,   236,   236,   236,   236,   236,   236,   236,
1979 >     234,   411,   236,   236,   234,   438,   129,   233,   236,   236,
1980 >     234,   448,   216,   243,   114,   243,   243,   216,   114,   216,
1981 >     114,   216,   243,   216,   114,   114,   243,   114,   216,   216,
1982 >     243,   114,   114,   243,   114,   114,   114,   114,   216,   236,
1983 >     216,   236,   216,   243,   243,   216,   216,   216,   216,   220,
1984 >     216,   220,   216,   216,   216,   114,   243,   216,   243,   243,
1985 >     216,   233,   233,   236,   236,   372,   236,   236,   236,   236,
1986 >     236,   234,   366,   236,   236,   234,   432,   233,   236,   236,
1987 >     352,   236,   234,   356,   129,   129,   233,   233,   236,   236,
1988 >     234,   280,   233,   236,   236,   322,   236,   236,   236,   236,
1989 >     236,   318,   236,   234,   308,   233,   236,   236,   236,   234,
1990 >     381,   216,   216,   216,   129,   216,   216,   216,   243,   233,
1991 >     129,   216,   129,   114,   114,   129,   129,   129,   129,   129,
1992 >     129,   129,   129,   114,   129,   129,   129,   233,   233,   236,
1993 >     405,   234,   402,   216,   233,   235,   233,   236,   236,   236,
1994 >     236,   234,   286,   129,   233,   233,   236,   396,   236,   234,
1995 >     392,   233,   233,   233,   233,   233,   233,   233,   141,   142,
1996 >     143,   144,   145,   146,   147,   242,   243,   233,   233,   233,
1997 >     233,   233,   233,   233,   233,   233,   233,   114,   114,   243,
1998 >     236,   114,   114,   114,   243,   114,   114,   243,   129,   114,
1999 >     114,   243,   114,   245,   245,   233,   129,   183,   184,   129,
2000 >     216,   129,   129,   236,   129,   129,   114,   129,   129,   129,
2001 >     129,   233,   129,   129,   233,   233,   129,   129,   233,   233,
2002 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2003 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2004 >     233,   233,   233,   233,   233,   233,    51,   169,   170,   171,
2005 >     174,   175,   177,   178,   180,   182,   185,   188,   189,   193,
2006 >     197,   201,   202,   203,   208,   213,   502,   503,   233,    51,
2007 >      53,    54,   169,   170,   171,   174,   175,   177,   178,   180,
2008 >     182,   185,   188,   189,   193,   197,   201,   202,   203,   208,
2009 >     213,   498,   499,   233,   233,   233,   233,   233,   233,   233,
2010 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2011 >     233,   233,   129,   216,   236,   129,   114,   129,   129,   129,
2012 >     233,   129,   129,   233,   129,   129,   236,   114,   359,   360,
2013 >     233,   233,   233,   129,   129,   233,   129,   216,   236,   129,
2014 >     129,   129,   129,   216,   236,   129,   233,   129,   129,   129,
2015 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2016 >     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2017 >     233,   233,   233,   233,   233,   233,   129,   236,   233,   233,
2018 >       1,   104,   200,   224,   297,   298,   299,   300,   301,   129,
2019 >     129,   129,   129,   233,   233,   129,   236,   129,   233,   242,
2020 >     242,   242,   242,   242,   242,   242,   233,   233,   233,    55,
2021 >     130,   347,   348,   233,   233,   233,   233,   233,   233,   233,
2022 >     233,   233,   233,   233,    11,    12,    13,   244,   245,   233,
2023 >     233,   233,   233,   233,   233,   233,   233,   233,     8,   204,
2024 >     422,   423,   233,   233,   233,   233,   233,   233,   233,   233,
2025 >     233,   233,   233,   233,   237,   233,   237,   233,   233,    15,
2026 >      36,    45,    76,   105,   106,   113,   138,   154,   215,   373,
2027 >     374,   233,   233,   233,   233,   233,   233,   233,   233,   233,
2028 >      51,   195,   204,   353,   354,   223,   237,   358,   233,   233,
2029 >     233,   233,     4,    20,    28,    42,    73,    75,   101,   134,
2030 >     136,   155,   176,   181,   185,   194,   198,   209,   212,   214,
2031 >     225,   232,   323,   324,   233,   233,   233,   233,   233,    51,
2032 >      53,    54,   169,   170,   171,   174,   175,   177,   178,   180,
2033 >     182,   185,   188,   189,   193,   197,   201,   202,   203,   208,
2034 >     213,   319,   320,   233,   233,   233,   233,   233,    75,   137,
2035 >     168,   176,   185,   209,   211,   212,   225,   232,   406,   407,
2036 >     233,   236,   236,   302,   234,   298,   233,   233,   233,   233,
2037 >     233,    75,   137,   168,   176,   185,   209,   211,   212,   225,
2038 >     232,   397,   398,   233,   233,   237,   244,   244,   244,   233,
2039 >     237,   503,   499,   233,   237,   233,   237,   114,   360,   233,
2040 >     238,   238,   238,   233,   237,   233,   237,   233,   237,   129,
2041 >     210,   245,   236,   233,   233,   237,   348,   423,   374,   354,
2042 >     135,   135,   135,   324,   320,   407,   233,   233,   233,    42,
2043 >      73,    75,   120,   137,   175,   176,   228,   232,   303,   304,
2044 >     398,   233,   237,   304
2045   };
2046  
2047 < #define yyerrok         (yyerrstatus = 0)
2048 < #define yyclearin       (yychar = YYEMPTY)
2049 < #define YYEMPTY         (-2)
2050 < #define YYEOF           0
2051 <
2052 < #define YYACCEPT        goto yyacceptlab
2053 < #define YYABORT         goto yyabortlab
2054 < #define YYERROR         goto yyerrorlab
2055 <
2056 <
2057 < /* Like YYERROR except do call yyerror.  This remains here temporarily
2058 <   to ease the transition to the new meaning of YYERROR, for GCC.
2059 <   Once GCC version 2 has supplanted version 1, this can go.  However,
2060 <   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
2061 <   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
2062 <   discussed.  */
2063 <
2064 < #define YYFAIL          goto yyerrlab
2065 < #if defined YYFAIL
2066 <  /* This is here to suppress warnings from the GCC cpp's
2067 <     -Wunused-macros.  Normally we don't worry about that warning, but
2068 <     some users do, and we want to make it easy for users to remove
2069 <     YYFAIL uses, which will produce warnings from Bison 2.5.  */
2070 < #endif
2047 >  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
2048 > static const yytype_uint16 yyr1[] =
2049 > {
2050 >       0,   239,   240,   240,   241,   241,   241,   241,   241,   241,
2051 >     241,   241,   241,   241,   241,   241,   241,   241,   241,   241,
2052 >     241,   241,   241,   241,   241,   241,   241,   241,   242,   242,
2053 >     243,   243,   243,   243,   243,   243,   243,   243,   244,   244,
2054 >     245,   245,   245,   245,   246,   247,   247,   248,   248,   248,
2055 >     249,   250,   251,   252,   252,   253,   253,   253,   253,   253,
2056 >     253,   253,   253,   253,   253,   253,   253,   253,   253,   253,
2057 >     253,   253,   253,   254,   255,   256,   257,   258,   259,   260,
2058 >     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
2059 >     271,   272,   272,   273,   273,   273,   273,   274,   275,   276,
2060 >     278,   277,   279,   279,   280,   280,   280,   281,   282,   284,
2061 >     283,   285,   285,   286,   286,   286,   286,   286,   287,   288,
2062 >     289,   290,   291,   292,   292,   293,   293,   293,   294,   296,
2063 >     295,   297,   297,   298,   298,   298,   298,   299,   300,   300,
2064 >     302,   301,   303,   303,   304,   304,   304,   304,   304,   304,
2065 >     304,   304,   304,   306,   305,   307,   307,   308,   308,   308,
2066 >     308,   308,   308,   308,   308,   308,   308,   308,   309,   310,
2067 >     311,   312,   313,   314,   315,   316,   318,   317,   319,   319,
2068 >     320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
2069 >     320,   320,   320,   320,   320,   320,   320,   320,   320,   320,
2070 >     320,   320,   322,   321,   323,   323,   324,   324,   324,   324,
2071 >     324,   324,   324,   324,   324,   324,   324,   324,   324,   324,
2072 >     324,   324,   324,   324,   324,   324,   324,   324,   324,   326,
2073 >     325,   327,   327,   328,   328,   328,   328,   328,   328,   328,
2074 >     328,   328,   328,   328,   328,   328,   328,   328,   328,   328,
2075 >     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
2076 >     338,   339,   340,   341,   342,   343,   344,   346,   345,   347,
2077 >     347,   348,   348,   350,   349,   352,   351,   353,   353,   354,
2078 >     354,   354,   355,   355,   356,   356,   356,   356,   356,   358,
2079 >     357,   359,   359,   360,   360,   361,   362,   364,   363,   365,
2080 >     365,   366,   366,   366,   366,   366,   366,   366,   366,   366,
2081 >     367,   368,   369,   370,   372,   371,   373,   373,   374,   374,
2082 >     374,   374,   374,   374,   374,   374,   374,   374,   375,   376,
2083 >     377,   379,   378,   380,   380,   381,   381,   381,   381,   382,
2084 >     383,   384,   385,   386,   386,   387,   387,   388,   390,   389,
2085 >     391,   391,   392,   392,   392,   392,   393,   394,   396,   395,
2086 >     397,   397,   398,   398,   398,   398,   398,   398,   398,   398,
2087 >     398,   398,   400,   399,   401,   401,   402,   402,   402,   403,
2088 >     405,   404,   406,   406,   407,   407,   407,   407,   407,   407,
2089 >     407,   407,   407,   407,   409,   408,   410,   410,   411,   411,
2090 >     411,   411,   411,   411,   411,   411,   411,   411,   411,   411,
2091 >     411,   411,   411,   412,   413,   414,   415,   416,   417,   418,
2092 >     419,   419,   421,   420,   422,   422,   423,   423,   424,   425,
2093 >     426,   427,   428,   430,   429,   431,   431,   432,   432,   432,
2094 >     433,   434,   436,   435,   437,   437,   438,   438,   438,   439,
2095 >     440,   441,   442,   442,   443,   443,   444,   446,   445,   447,
2096 >     447,   448,   448,   448,   449,   450,   451,   452,   452,   453,
2097 >     453,   453,   453,   453,   453,   453,   453,   453,   453,   453,
2098 >     453,   453,   453,   453,   453,   453,   453,   453,   453,   453,
2099 >     453,   453,   453,   453,   453,   453,   453,   453,   453,   453,
2100 >     453,   453,   453,   453,   453,   453,   453,   453,   453,   453,
2101 >     453,   453,   453,   453,   453,   453,   453,   454,   455,   456,
2102 >     457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
2103 >     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
2104 >     477,   478,   479,   480,   481,   481,   482,   482,   483,   484,
2105 >     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
2106 >     495,   497,   496,   498,   498,   499,   499,   499,   499,   499,
2107 >     499,   499,   499,   499,   499,   499,   499,   499,   499,   499,
2108 >     499,   499,   499,   499,   499,   499,   499,   501,   500,   502,
2109 >     502,   503,   503,   503,   503,   503,   503,   503,   503,   503,
2110 >     503,   503,   503,   503,   503,   503,   503,   503,   503,   503,
2111 >     503,   504,   505,   506,   507,   508,   508,   509,   509,   509,
2112 >     509,   509,   509,   509,   509,   509,   509,   509,   509,   509,
2113 >     509,   509,   510,   511,   512,   513,   514,   515,   516,   517,
2114 >     518,   519,   520,   521,   522,   523,   524,   525,   525,   526,
2115 >     526,   526,   526,   526,   526,   526,   526,   526,   527,   528,
2116 >     529,   530,   531,   532,   533,   534
2117 > };
2118 >
2119 >  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
2120 > static const yytype_uint8 yyr2[] =
2121 > {
2122 >       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
2123 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2124 >       1,     1,     1,     1,     1,     1,     2,     2,     0,     1,
2125 >       2,     3,     3,     3,     3,     3,     3,     3,     0,     1,
2126 >       2,     3,     3,     3,     5,     2,     1,     1,     1,     2,
2127 >       4,     4,     5,     2,     1,     1,     1,     1,     1,     1,
2128 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2129 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2130 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2131 >       5,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2132 >       0,     6,     2,     1,     1,     1,     2,     4,     4,     0,
2133 >       6,     2,     1,     1,     1,     1,     1,     2,     4,     4,
2134 >       4,     4,     5,     2,     1,     1,     1,     2,     4,     0,
2135 >       6,     2,     1,     1,     1,     1,     2,     4,     4,     4,
2136 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2137 >       1,     1,     1,     0,     6,     2,     1,     1,     1,     1,
2138 >       1,     1,     1,     1,     1,     1,     1,     2,     4,     4,
2139 >       4,     4,     4,     4,     4,     4,     0,     5,     3,     1,
2140 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2141 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2142 >       1,     1,     0,     5,     3,     1,     3,     1,     3,     1,
2143 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2144 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
2145 >       6,     2,     1,     1,     1,     1,     1,     1,     1,     1,
2146 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2147 >       2,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2148 >       4,     4,     4,     4,     4,     4,     4,     0,     5,     3,
2149 >       1,     1,     1,     0,     6,     0,     5,     3,     1,     1,
2150 >       1,     1,     2,     1,     1,     1,     1,     1,     2,     0,
2151 >       5,     3,     1,     1,     3,     4,     4,     0,     6,     2,
2152 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
2153 >       4,     4,     4,     4,     0,     5,     3,     1,     1,     1,
2154 >       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
2155 >       4,     0,     6,     2,     1,     1,     1,     1,     2,     4,
2156 >       4,     4,     5,     2,     1,     1,     1,     4,     0,     6,
2157 >       2,     1,     1,     1,     1,     2,     4,     4,     0,     5,
2158 >       3,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2159 >       1,     1,     0,     6,     2,     1,     1,     1,     2,     4,
2160 >       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
2161 >       1,     1,     1,     1,     0,     6,     2,     1,     1,     1,
2162 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2163 >       1,     1,     2,     4,     4,     4,     4,     4,     4,     4,
2164 >       4,     4,     0,     5,     3,     1,     1,     1,     4,     4,
2165 >       4,     4,     4,     0,     6,     2,     1,     1,     1,     1,
2166 >       4,     4,     0,     6,     2,     1,     1,     1,     1,     4,
2167 >       4,     5,     2,     1,     1,     1,     4,     0,     6,     2,
2168 >       1,     1,     1,     1,     4,     4,     5,     2,     1,     1,
2169 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2170 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2171 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2172 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2173 >       1,     1,     1,     1,     1,     1,     1,     4,     4,     4,
2174 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2175 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2176 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2177 >       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
2178 >       4,     0,     5,     3,     1,     1,     1,     1,     1,     1,
2179 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2180 >       1,     1,     1,     1,     1,     1,     1,     0,     5,     3,
2181 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2182 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2183 >       1,     4,     4,     4,     5,     2,     1,     1,     1,     1,
2184 >       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
2185 >       1,     1,     4,     4,     4,     4,     4,     4,     4,     4,
2186 >       4,     4,     4,     4,     4,     4,     5,     2,     1,     1,
2187 >       1,     1,     1,     1,     1,     1,     1,     1,     4,     4,
2188 >       4,     4,     4,     4,     4,     4
2189 > };
2190 >
2191 >
2192 > #define yyerrok         (yyerrstatus = 0)
2193 > #define yyclearin       (yychar = YYEMPTY)
2194 > #define YYEMPTY         (-2)
2195 > #define YYEOF           0
2196 >
2197 > #define YYACCEPT        goto yyacceptlab
2198 > #define YYABORT         goto yyabortlab
2199 > #define YYERROR         goto yyerrorlab
2200 >
2201  
2202   #define YYRECOVERING()  (!!yyerrstatus)
2203  
# Line 2345 | Line 2214 | do
2214    else                                                          \
2215      {                                                           \
2216        yyerror (YY_("syntax error: cannot back up")); \
2217 <      YYERROR;                                                  \
2218 <    }                                                           \
2219 < while (YYID (0))
2351 <
2217 >      YYERROR;                                                  \
2218 >    }                                                           \
2219 > while (0)
2220  
2221 < #define YYTERROR        1
2222 < #define YYERRCODE       256
2221 > /* Error token number */
2222 > #define YYTERROR        1
2223 > #define YYERRCODE       256
2224  
2356 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
2357   If N is 0, then set CURRENT to the empty location which ends
2358   the previous symbol: RHS[0] (always defined).  */
2225  
2360 #ifndef YYLLOC_DEFAULT
2361 # define YYLLOC_DEFAULT(Current, Rhs, N)                                \
2362    do                                                                  \
2363      if (YYID (N))                                                     \
2364        {                                                               \
2365          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
2366          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
2367          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
2368          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
2369        }                                                               \
2370      else                                                              \
2371        {                                                               \
2372          (Current).first_line   = (Current).last_line   =              \
2373            YYRHSLOC (Rhs, 0).last_line;                                \
2374          (Current).first_column = (Current).last_column =              \
2375            YYRHSLOC (Rhs, 0).last_column;                              \
2376        }                                                               \
2377    while (YYID (0))
2378 #endif
2226  
2227 < #define YYRHSLOC(Rhs, K) ((Rhs)[K])
2227 > /* Enable debugging if requested.  */
2228 > #if YYDEBUG
2229  
2230 + # ifndef YYFPRINTF
2231 + #  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
2232 + #  define YYFPRINTF fprintf
2233 + # endif
2234  
2235 + # define YYDPRINTF(Args)                        \
2236 + do {                                            \
2237 +  if (yydebug)                                  \
2238 +    YYFPRINTF Args;                             \
2239 + } while (0)
2240  
2241   /* This macro is provided for backward compatibility. */
2385
2242   #ifndef YY_LOCATION_PRINT
2243   # define YY_LOCATION_PRINT(File, Loc) ((void) 0)
2244   #endif
2245  
2246  
2247 < /* YYLEX -- calling `yylex' with the right arguments.  */
2247 > # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2248 > do {                                                                      \
2249 >  if (yydebug)                                                            \
2250 >    {                                                                     \
2251 >      YYFPRINTF (stderr, "%s ", Title);                                   \
2252 >      yy_symbol_print (stderr,                                            \
2253 >                  Type, Value); \
2254 >      YYFPRINTF (stderr, "\n");                                           \
2255 >    }                                                                     \
2256 > } while (0)
2257  
2393 #ifdef YYLEX_PARAM
2394 # define YYLEX yylex (YYLEX_PARAM)
2395 #else
2396 # define YYLEX yylex ()
2397 #endif
2258  
2259 < /* Enable debugging if requested.  */
2260 < #if YYDEBUG
2259 > /*----------------------------------------.
2260 > | Print this symbol's value on YYOUTPUT.  |
2261 > `----------------------------------------*/
2262  
2402 # ifndef YYFPRINTF
2403 #  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
2404 #  define YYFPRINTF fprintf
2405 # endif
2406
2407 # define YYDPRINTF(Args)                        \
2408 do {                                            \
2409  if (yydebug)                                  \
2410    YYFPRINTF Args;                             \
2411 } while (YYID (0))
2412
2413 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
2414 do {                                                                      \
2415  if (yydebug)                                                            \
2416    {                                                                     \
2417      YYFPRINTF (stderr, "%s ", Title);                                   \
2418      yy_symbol_print (stderr,                                            \
2419                  Type, Value); \
2420      YYFPRINTF (stderr, "\n");                                           \
2421    }                                                                     \
2422 } while (YYID (0))
2423
2424
2425 /*--------------------------------.
2426 | Print this symbol on YYOUTPUT.  |
2427 `--------------------------------*/
2428
2429 /*ARGSUSED*/
2430 #if (defined __STDC__ || defined __C99__FUNC__ \
2431     || defined __cplusplus || defined _MSC_VER)
2263   static void
2264   yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2434 #else
2435 static void
2436 yy_symbol_value_print (yyoutput, yytype, yyvaluep)
2437    FILE *yyoutput;
2438    int yytype;
2439    YYSTYPE const * const yyvaluep;
2440 #endif
2265   {
2266    FILE *yyo = yyoutput;
2267    YYUSE (yyo);
# Line 2446 | Line 2270 | yy_symbol_value_print (yyoutput, yytype,
2270   # ifdef YYPRINT
2271    if (yytype < YYNTOKENS)
2272      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
2449 # else
2450  YYUSE (yyoutput);
2273   # endif
2274 <  switch (yytype)
2453 <    {
2454 <      default:
2455 <        break;
2456 <    }
2274 >  YYUSE (yytype);
2275   }
2276  
2277  
# Line 2461 | Line 2279 | yy_symbol_value_print (yyoutput, yytype,
2279   | Print this symbol on YYOUTPUT.  |
2280   `--------------------------------*/
2281  
2464 #if (defined __STDC__ || defined __C99__FUNC__ \
2465     || defined __cplusplus || defined _MSC_VER)
2282   static void
2283   yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
2468 #else
2469 static void
2470 yy_symbol_print (yyoutput, yytype, yyvaluep)
2471    FILE *yyoutput;
2472    int yytype;
2473    YYSTYPE const * const yyvaluep;
2474 #endif
2284   {
2285 <  if (yytype < YYNTOKENS)
2286 <    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
2478 <  else
2479 <    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
2285 >  YYFPRINTF (yyoutput, "%s %s (",
2286 >             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
2287  
2288    yy_symbol_value_print (yyoutput, yytype, yyvaluep);
2289    YYFPRINTF (yyoutput, ")");
# Line 2487 | Line 2294 | yy_symbol_print (yyoutput, yytype, yyval
2294   | TOP (included).                                                   |
2295   `------------------------------------------------------------------*/
2296  
2490 #if (defined __STDC__ || defined __C99__FUNC__ \
2491     || defined __cplusplus || defined _MSC_VER)
2297   static void
2298   yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
2494 #else
2495 static void
2496 yy_stack_print (yybottom, yytop)
2497    yytype_int16 *yybottom;
2498    yytype_int16 *yytop;
2499 #endif
2299   {
2300    YYFPRINTF (stderr, "Stack now");
2301    for (; yybottom <= yytop; yybottom++)
# Line 2507 | Line 2306 | yy_stack_print (yybottom, yytop)
2306    YYFPRINTF (stderr, "\n");
2307   }
2308  
2309 < # define YY_STACK_PRINT(Bottom, Top)                            \
2310 < do {                                                            \
2311 <  if (yydebug)                                                  \
2312 <    yy_stack_print ((Bottom), (Top));                           \
2313 < } while (YYID (0))
2309 > # define YY_STACK_PRINT(Bottom, Top)                            \
2310 > do {                                                            \
2311 >  if (yydebug)                                                  \
2312 >    yy_stack_print ((Bottom), (Top));                           \
2313 > } while (0)
2314  
2315  
2316   /*------------------------------------------------.
2317   | Report that the YYRULE is going to be reduced.  |
2318   `------------------------------------------------*/
2319  
2521 #if (defined __STDC__ || defined __C99__FUNC__ \
2522     || defined __cplusplus || defined _MSC_VER)
2320   static void
2321 < yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
2525 < #else
2526 < static void
2527 < yy_reduce_print (yyvsp, yyrule)
2528 <    YYSTYPE *yyvsp;
2529 <    int yyrule;
2530 < #endif
2321 > yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
2322   {
2323 +  unsigned long int yylno = yyrline[yyrule];
2324    int yynrhs = yyr2[yyrule];
2325    int yyi;
2534  unsigned long int yylno = yyrline[yyrule];
2326    YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
2327 <             yyrule - 1, yylno);
2327 >             yyrule - 1, yylno);
2328    /* The symbols being reduced.  */
2329    for (yyi = 0; yyi < yynrhs; yyi++)
2330      {
2331        YYFPRINTF (stderr, "   $%d = ", yyi + 1);
2332 <      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
2333 <                       &(yyvsp[(yyi + 1) - (yynrhs)])
2334 <                                       );
2332 >      yy_symbol_print (stderr,
2333 >                       yystos[yyssp[yyi + 1 - yynrhs]],
2334 >                       &(yyvsp[(yyi + 1) - (yynrhs)])
2335 >                                              );
2336        YYFPRINTF (stderr, "\n");
2337      }
2338   }
2339  
2340 < # define YY_REDUCE_PRINT(Rule)          \
2341 < do {                                    \
2342 <  if (yydebug)                          \
2343 <    yy_reduce_print (yyvsp, Rule); \
2344 < } while (YYID (0))
2340 > # define YY_REDUCE_PRINT(Rule)          \
2341 > do {                                    \
2342 >  if (yydebug)                          \
2343 >    yy_reduce_print (yyssp, yyvsp, Rule); \
2344 > } while (0)
2345  
2346   /* Nonzero means print parse trace.  It is left uninitialized so that
2347     multiple parsers can coexist.  */
# Line 2563 | Line 2355 | int yydebug;
2355  
2356  
2357   /* YYINITDEPTH -- initial size of the parser's stacks.  */
2358 < #ifndef YYINITDEPTH
2358 > #ifndef YYINITDEPTH
2359   # define YYINITDEPTH 200
2360   #endif
2361  
# Line 2586 | Line 2378 | int yydebug;
2378   #   define yystrlen strlen
2379   #  else
2380   /* Return the length of YYSTR.  */
2589 #if (defined __STDC__ || defined __C99__FUNC__ \
2590     || defined __cplusplus || defined _MSC_VER)
2381   static YYSIZE_T
2382   yystrlen (const char *yystr)
2593 #else
2594 static YYSIZE_T
2595 yystrlen (yystr)
2596    const char *yystr;
2597 #endif
2383   {
2384    YYSIZE_T yylen;
2385    for (yylen = 0; yystr[yylen]; yylen++)
# Line 2610 | Line 2395 | yystrlen (yystr)
2395   #  else
2396   /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
2397     YYDEST.  */
2613 #if (defined __STDC__ || defined __C99__FUNC__ \
2614     || defined __cplusplus || defined _MSC_VER)
2398   static char *
2399   yystpcpy (char *yydest, const char *yysrc)
2617 #else
2618 static char *
2619 yystpcpy (yydest, yysrc)
2620    char *yydest;
2621    const char *yysrc;
2622 #endif
2400   {
2401    char *yyd = yydest;
2402    const char *yys = yysrc;
# Line 2649 | Line 2426 | yytnamerr (char *yyres, const char *yyst
2426        char const *yyp = yystr;
2427  
2428        for (;;)
2429 <        switch (*++yyp)
2430 <          {
2431 <          case '\'':
2432 <          case ',':
2433 <            goto do_not_strip_quotes;
2434 <
2435 <          case '\\':
2436 <            if (*++yyp != '\\')
2437 <              goto do_not_strip_quotes;
2438 <            /* Fall through.  */
2439 <          default:
2440 <            if (yyres)
2441 <              yyres[yyn] = *yyp;
2442 <            yyn++;
2443 <            break;
2444 <
2445 <          case '"':
2446 <            if (yyres)
2447 <              yyres[yyn] = '\0';
2448 <            return yyn;
2449 <          }
2429 >        switch (*++yyp)
2430 >          {
2431 >          case '\'':
2432 >          case ',':
2433 >            goto do_not_strip_quotes;
2434 >
2435 >          case '\\':
2436 >            if (*++yyp != '\\')
2437 >              goto do_not_strip_quotes;
2438 >            /* Fall through.  */
2439 >          default:
2440 >            if (yyres)
2441 >              yyres[yyn] = *yyp;
2442 >            yyn++;
2443 >            break;
2444 >
2445 >          case '"':
2446 >            if (yyres)
2447 >              yyres[yyn] = '\0';
2448 >            return yyn;
2449 >          }
2450      do_not_strip_quotes: ;
2451      }
2452  
# Line 2692 | Line 2469 | static int
2469   yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
2470                  yytype_int16 *yyssp, int yytoken)
2471   {
2472 <  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
2472 >  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
2473    YYSIZE_T yysize = yysize0;
2697  YYSIZE_T yysize1;
2474    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
2475    /* Internationalized format string. */
2476 <  const char *yyformat = YY_NULL;
2476 >  const char *yyformat = YY_NULLPTR;
2477    /* Arguments of yyformat. */
2478    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
2479    /* Number of reported tokens (one for the "unexpected", one per
# Line 2705 | Line 2481 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2481    int yycount = 0;
2482  
2483    /* There are many possibilities here to consider:
2708     - Assume YYFAIL is not used.  It's too flawed to consider.  See
2709       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
2710       for details.  YYERROR is fine as it does not invoke this
2711       function.
2484       - If this state is a consistent state with a default action, then
2485         the only way this function was invoked is if the default action
2486         is an error action.  In that case, don't check for expected
# Line 2757 | Line 2529 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2529                      break;
2530                    }
2531                  yyarg[yycount++] = yytname[yyx];
2532 <                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
2533 <                if (! (yysize <= yysize1
2534 <                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2535 <                  return 2;
2536 <                yysize = yysize1;
2532 >                {
2533 >                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
2534 >                  if (! (yysize <= yysize1
2535 >                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2536 >                    return 2;
2537 >                  yysize = yysize1;
2538 >                }
2539                }
2540          }
2541      }
# Line 2781 | Line 2555 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2555   # undef YYCASE_
2556      }
2557  
2558 <  yysize1 = yysize + yystrlen (yyformat);
2559 <  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2560 <    return 2;
2561 <  yysize = yysize1;
2558 >  {
2559 >    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
2560 >    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
2561 >      return 2;
2562 >    yysize = yysize1;
2563 >  }
2564  
2565    if (*yymsg_alloc < yysize)
2566      {
# Line 2821 | Line 2597 | yysyntax_error (YYSIZE_T *yymsg_alloc, c
2597   | Release the memory associated to this symbol.  |
2598   `-----------------------------------------------*/
2599  
2824 /*ARGSUSED*/
2825 #if (defined __STDC__ || defined __C99__FUNC__ \
2826     || defined __cplusplus || defined _MSC_VER)
2600   static void
2601   yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
2829 #else
2830 static void
2831 yydestruct (yymsg, yytype, yyvaluep)
2832    const char *yymsg;
2833    int yytype;
2834    YYSTYPE *yyvaluep;
2835 #endif
2602   {
2603    YYUSE (yyvaluep);
2838
2604    if (!yymsg)
2605      yymsg = "Deleting";
2606    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
2607  
2608 <  switch (yytype)
2609 <    {
2610 <
2846 <      default:
2847 <        break;
2848 <    }
2608 >  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2609 >  YYUSE (yytype);
2610 >  YY_IGNORE_MAYBE_UNINITIALIZED_END
2611   }
2612  
2613  
# Line 2856 | Line 2618 | int yychar;
2618  
2619   /* The semantic value of the lookahead symbol.  */
2620   YYSTYPE yylval;
2859
2621   /* Number of syntax errors so far.  */
2622   int yynerrs;
2623  
# Line 2865 | Line 2626 | int yynerrs;
2626   | yyparse.  |
2627   `----------*/
2628  
2868 #ifdef YYPARSE_PARAM
2869 #if (defined __STDC__ || defined __C99__FUNC__ \
2870     || defined __cplusplus || defined _MSC_VER)
2871 int
2872 yyparse (void *YYPARSE_PARAM)
2873 #else
2874 int
2875 yyparse (YYPARSE_PARAM)
2876    void *YYPARSE_PARAM;
2877 #endif
2878 #else /* ! YYPARSE_PARAM */
2879 #if (defined __STDC__ || defined __C99__FUNC__ \
2880     || defined __cplusplus || defined _MSC_VER)
2629   int
2630   yyparse (void)
2883 #else
2884 int
2885 yyparse ()
2886
2887 #endif
2888 #endif
2631   {
2632      int yystate;
2633      /* Number of tokens to shift before error messages enabled.  */
2634      int yyerrstatus;
2635  
2636      /* The stacks and their tools:
2637 <       `yyss': related to states.
2638 <       `yyvs': related to semantic values.
2637 >       'yyss': related to states.
2638 >       'yyvs': related to semantic values.
2639  
2640         Refer to the stacks through separate pointers, to allow yyoverflow
2641         to reallocate them elsewhere.  */
# Line 2913 | Line 2655 | yyparse ()
2655    int yyn;
2656    int yyresult;
2657    /* Lookahead token as an internal (translated) token number.  */
2658 <  int yytoken;
2658 >  int yytoken = 0;
2659    /* The variables used to return semantic value and location from the
2660       action routines.  */
2661    YYSTYPE yyval;
# Line 2931 | Line 2673 | yyparse ()
2673       Keep to zero when no symbol should be popped.  */
2674    int yylen = 0;
2675  
2676 <  yytoken = 0;
2677 <  yyss = yyssa;
2936 <  yyvs = yyvsa;
2676 >  yyssp = yyss = yyssa;
2677 >  yyvsp = yyvs = yyvsa;
2678    yystacksize = YYINITDEPTH;
2679  
2680    YYDPRINTF ((stderr, "Starting parse\n"));
# Line 2942 | Line 2683 | yyparse ()
2683    yyerrstatus = 0;
2684    yynerrs = 0;
2685    yychar = YYEMPTY; /* Cause a token to be read.  */
2945
2946  /* Initialize stack pointers.
2947     Waste one element of value and location stack
2948     so that they stay on the same level as the state stack.
2949     The wasted elements are never initialized.  */
2950  yyssp = yyss;
2951  yyvsp = yyvs;
2686    goto yysetstate;
2687  
2688   /*------------------------------------------------------------.
# Line 2969 | Line 2703 | yyparse ()
2703  
2704   #ifdef yyoverflow
2705        {
2706 <        /* Give user a chance to reallocate the stack.  Use copies of
2707 <           these so that the &'s don't force the real ones into
2708 <           memory.  */
2709 <        YYSTYPE *yyvs1 = yyvs;
2710 <        yytype_int16 *yyss1 = yyss;
2711 <
2712 <        /* Each stack pointer address is followed by the size of the
2713 <           data in use in that stack, in bytes.  This used to be a
2714 <           conditional around just the two extra args, but that might
2715 <           be undefined if yyoverflow is a macro.  */
2716 <        yyoverflow (YY_("memory exhausted"),
2717 <                    &yyss1, yysize * sizeof (*yyssp),
2718 <                    &yyvs1, yysize * sizeof (*yyvsp),
2719 <                    &yystacksize);
2706 >        /* Give user a chance to reallocate the stack.  Use copies of
2707 >           these so that the &'s don't force the real ones into
2708 >           memory.  */
2709 >        YYSTYPE *yyvs1 = yyvs;
2710 >        yytype_int16 *yyss1 = yyss;
2711 >
2712 >        /* Each stack pointer address is followed by the size of the
2713 >           data in use in that stack, in bytes.  This used to be a
2714 >           conditional around just the two extra args, but that might
2715 >           be undefined if yyoverflow is a macro.  */
2716 >        yyoverflow (YY_("memory exhausted"),
2717 >                    &yyss1, yysize * sizeof (*yyssp),
2718 >                    &yyvs1, yysize * sizeof (*yyvsp),
2719 >                    &yystacksize);
2720  
2721 <        yyss = yyss1;
2722 <        yyvs = yyvs1;
2721 >        yyss = yyss1;
2722 >        yyvs = yyvs1;
2723        }
2724   #else /* no yyoverflow */
2725   # ifndef YYSTACK_RELOCATE
# Line 2993 | Line 2727 | yyparse ()
2727   # else
2728        /* Extend the stack our own way.  */
2729        if (YYMAXDEPTH <= yystacksize)
2730 <        goto yyexhaustedlab;
2730 >        goto yyexhaustedlab;
2731        yystacksize *= 2;
2732        if (YYMAXDEPTH < yystacksize)
2733 <        yystacksize = YYMAXDEPTH;
2733 >        yystacksize = YYMAXDEPTH;
2734  
2735        {
2736 <        yytype_int16 *yyss1 = yyss;
2737 <        union yyalloc *yyptr =
2738 <          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2739 <        if (! yyptr)
2740 <          goto yyexhaustedlab;
2741 <        YYSTACK_RELOCATE (yyss_alloc, yyss);
2742 <        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2736 >        yytype_int16 *yyss1 = yyss;
2737 >        union yyalloc *yyptr =
2738 >          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
2739 >        if (! yyptr)
2740 >          goto yyexhaustedlab;
2741 >        YYSTACK_RELOCATE (yyss_alloc, yyss);
2742 >        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
2743   #  undef YYSTACK_RELOCATE
2744 <        if (yyss1 != yyssa)
2745 <          YYSTACK_FREE (yyss1);
2744 >        if (yyss1 != yyssa)
2745 >          YYSTACK_FREE (yyss1);
2746        }
2747   # endif
2748   #endif /* no yyoverflow */
# Line 3017 | Line 2751 | yyparse ()
2751        yyvsp = yyvs + yysize - 1;
2752  
2753        YYDPRINTF ((stderr, "Stack size increased to %lu\n",
2754 <                  (unsigned long int) yystacksize));
2754 >                  (unsigned long int) yystacksize));
2755  
2756        if (yyss + yystacksize - 1 <= yyssp)
2757 <        YYABORT;
2757 >        YYABORT;
2758      }
2759  
2760    YYDPRINTF ((stderr, "Entering state %d\n", yystate));
# Line 3049 | Line 2783 | yybackup:
2783    if (yychar == YYEMPTY)
2784      {
2785        YYDPRINTF ((stderr, "Reading a token: "));
2786 <      yychar = YYLEX;
2786 >      yychar = yylex ();
2787      }
2788  
2789    if (yychar <= YYEOF)
# Line 3089 | Line 2823 | yybackup:
2823    yychar = YYEMPTY;
2824  
2825    yystate = yyn;
2826 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
2827    *++yyvsp = yylval;
2828 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
2829  
2830    goto yynewstate;
2831  
# Line 3112 | Line 2848 | yyreduce:
2848    yylen = yyr2[yyn];
2849  
2850    /* If YYLEN is nonzero, implement the default value of the action:
2851 <     `$$ = $1'.
2851 >     '$$ = $1'.
2852  
2853       Otherwise, the following line sets YYVAL to garbage.
2854       This behavior is undocumented and Bison
# Line 3125 | Line 2861 | yyreduce:
2861    YY_REDUCE_PRINT (yyn);
2862    switch (yyn)
2863      {
2864 <        case 26:
2865 < /* Line 1787 of yacc.c  */
3130 < #line 359 "conf_parser.y"
2864 >        case 28:
2865 > #line 419 "conf_parser.y" /* yacc.c:1646  */
2866      { (yyval.number) = 0; }
2867 <    break;
3133 <
3134 <  case 28:
3135 < /* Line 1787 of yacc.c  */
3136 < #line 361 "conf_parser.y"
3137 <    {
3138 <                        (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number);
3139 <                }
3140 <    break;
3141 <
3142 <  case 29:
3143 < /* Line 1787 of yacc.c  */
3144 < #line 365 "conf_parser.y"
3145 <    {
3146 <                        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
3147 <                }
2867 > #line 2868 "conf_parser.c" /* yacc.c:1646  */
2868      break;
2869  
2870    case 30:
2871 < /* Line 1787 of yacc.c  */
2872 < #line 369 "conf_parser.y"
2873 <    {
3154 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 + (yyvsp[(3) - (3)].number);
3155 <                }
2871 > #line 420 "conf_parser.y" /* yacc.c:1646  */
2872 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2873 > #line 2874 "conf_parser.c" /* yacc.c:1646  */
2874      break;
2875  
2876    case 31:
2877 < /* Line 1787 of yacc.c  */
2878 < #line 373 "conf_parser.y"
2879 <    {
3162 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 + (yyvsp[(3) - (3)].number);
3163 <                }
2877 > #line 421 "conf_parser.y" /* yacc.c:1646  */
2878 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2879 > #line 2880 "conf_parser.c" /* yacc.c:1646  */
2880      break;
2881  
2882    case 32:
2883 < /* Line 1787 of yacc.c  */
2884 < #line 377 "conf_parser.y"
2885 <    {
3170 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 + (yyvsp[(3) - (3)].number);
3171 <                }
2883 > #line 422 "conf_parser.y" /* yacc.c:1646  */
2884 >    { (yyval.number) = (yyvsp[-2].number) * 60 + (yyvsp[0].number); }
2885 > #line 2886 "conf_parser.c" /* yacc.c:1646  */
2886      break;
2887  
2888    case 33:
2889 < /* Line 1787 of yacc.c  */
2890 < #line 381 "conf_parser.y"
2891 <    {
3178 <                        (yyval.number) = (yyvsp[(1) - (3)].number) * 60 * 60 * 24 * 7 + (yyvsp[(3) - (3)].number);
3179 <                }
2889 > #line 423 "conf_parser.y" /* yacc.c:1646  */
2890 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 + (yyvsp[0].number); }
2891 > #line 2892 "conf_parser.c" /* yacc.c:1646  */
2892      break;
2893  
2894    case 34:
2895 < /* Line 1787 of yacc.c  */
2896 < #line 386 "conf_parser.y"
2897 <    { (yyval.number) = 0; }
2895 > #line 424 "conf_parser.y" /* yacc.c:1646  */
2896 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 + (yyvsp[0].number); }
2897 > #line 2898 "conf_parser.c" /* yacc.c:1646  */
2898 >    break;
2899 >
2900 >  case 35:
2901 > #line 425 "conf_parser.y" /* yacc.c:1646  */
2902 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 + (yyvsp[0].number); }
2903 > #line 2904 "conf_parser.c" /* yacc.c:1646  */
2904      break;
2905  
2906    case 36:
2907 < /* Line 1787 of yacc.c  */
2908 < #line 387 "conf_parser.y"
2909 <    { (yyval.number) = (yyvsp[(1) - (2)].number) + (yyvsp[(2) - (2)].number); }
2907 > #line 426 "conf_parser.y" /* yacc.c:1646  */
2908 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 7 * 4 + (yyvsp[0].number); }
2909 > #line 2910 "conf_parser.c" /* yacc.c:1646  */
2910      break;
2911  
2912    case 37:
2913 < /* Line 1787 of yacc.c  */
2914 < #line 388 "conf_parser.y"
2915 <    { (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number); }
2913 > #line 427 "conf_parser.y" /* yacc.c:1646  */
2914 >    { (yyval.number) = (yyvsp[-2].number) * 60 * 60 * 24 * 365 + (yyvsp[0].number); }
2915 > #line 2916 "conf_parser.c" /* yacc.c:1646  */
2916      break;
2917  
2918    case 38:
2919 < /* Line 1787 of yacc.c  */
2920 < #line 389 "conf_parser.y"
2921 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 + (yyvsp[(3) - (3)].number); }
2919 > #line 430 "conf_parser.y" /* yacc.c:1646  */
2920 >    { (yyval.number) = 0; }
2921 > #line 2922 "conf_parser.c" /* yacc.c:1646  */
2922      break;
2923  
2924 <  case 39:
2925 < /* Line 1787 of yacc.c  */
2926 < #line 390 "conf_parser.y"
2927 <    { (yyval.number) = (yyvsp[(1) - (3)].number) * 1024 * 1024 + (yyvsp[(3) - (3)].number); }
2924 >  case 40:
2925 > #line 431 "conf_parser.y" /* yacc.c:1646  */
2926 >    { (yyval.number) = (yyvsp[-1].number) + (yyvsp[0].number); }
2927 > #line 2928 "conf_parser.c" /* yacc.c:1646  */
2928      break;
2929  
2930 <  case 46:
2931 < /* Line 1787 of yacc.c  */
2932 < #line 404 "conf_parser.y"
2933 <    {
3216 <  if (conf_parser_ctx.pass == 2)
3217 <    add_conf_module(libio_basename(yylval.string));
3218 < }
2930 >  case 41:
2931 > #line 432 "conf_parser.y" /* yacc.c:1646  */
2932 >    { (yyval.number) = (yyvsp[-2].number) + (yyvsp[0].number); }
2933 > #line 2934 "conf_parser.c" /* yacc.c:1646  */
2934      break;
2935  
2936 <  case 47:
2937 < /* Line 1787 of yacc.c  */
2938 < #line 410 "conf_parser.y"
2939 <    {
3225 <  if (conf_parser_ctx.pass == 2)
3226 <    mod_add_path(yylval.string);
3227 < }
2936 >  case 42:
2937 > #line 433 "conf_parser.y" /* yacc.c:1646  */
2938 >    { (yyval.number) = (yyvsp[-2].number) * 1024 + (yyvsp[0].number); }
2939 > #line 2940 "conf_parser.c" /* yacc.c:1646  */
2940      break;
2941  
2942 <  case 71:
2943 < /* Line 1787 of yacc.c  */
2944 < #line 435 "conf_parser.y"
2945 <    {
3234 < #ifdef HAVE_LIBCRYPTO
3235 <  if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
3236 <    SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_SSLv3);
3237 < #endif
3238 < }
2942 >  case 43:
2943 > #line 434 "conf_parser.y" /* yacc.c:1646  */
2944 >    { (yyval.number) = (yyvsp[-2].number) * 1024 * 1024 + (yyvsp[0].number); }
2945 > #line 2946 "conf_parser.c" /* yacc.c:1646  */
2946      break;
2947  
2948 <  case 72:
2949 < /* Line 1787 of yacc.c  */
3243 < #line 441 "conf_parser.y"
2948 >  case 50:
2949 > #line 448 "conf_parser.y" /* yacc.c:1646  */
2950      {
2951 < #ifdef HAVE_LIBCRYPTO
2952 <  if (conf_parser_ctx.pass == 2 && ServerInfo.client_ctx)
3247 <    SSL_CTX_clear_options(ServerInfo.client_ctx, SSL_OP_NO_TLSv1);
3248 < #endif
3249 < }
3250 <    break;
3251 <
3252 <  case 75:
3253 < /* Line 1787 of yacc.c  */
3254 < #line 450 "conf_parser.y"
3255 <    {
3256 < #ifdef HAVE_LIBCRYPTO
3257 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3258 <    SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_SSLv3);
3259 < #endif
2951 >  if (conf_parser_ctx.pass == 2)
2952 >    add_conf_module(libio_basename(yylval.string));
2953   }
2954 + #line 2955 "conf_parser.c" /* yacc.c:1646  */
2955      break;
2956  
2957 <  case 76:
2958 < /* Line 1787 of yacc.c  */
3265 < #line 456 "conf_parser.y"
2957 >  case 51:
2958 > #line 454 "conf_parser.y" /* yacc.c:1646  */
2959      {
2960 < #ifdef HAVE_LIBCRYPTO
2961 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3269 <    SSL_CTX_clear_options(ServerInfo.server_ctx, SSL_OP_NO_TLSv1);
3270 < #endif
2960 >  if (conf_parser_ctx.pass == 2)
2961 >    mod_add_path(yylval.string);
2962   }
2963 + #line 2964 "conf_parser.c" /* yacc.c:1646  */
2964      break;
2965  
2966 <  case 77:
2967 < /* Line 1787 of yacc.c  */
3276 < #line 464 "conf_parser.y"
2966 >  case 73:
2967 > #line 484 "conf_parser.y" /* yacc.c:1646  */
2968      {
2969   #ifdef HAVE_LIBCRYPTO
2970 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
2970 >  if (conf_parser_ctx.pass == 2)
2971    {
2972 <    if (!ServerInfo.rsa_private_key_file)
2972 >    if (!ConfigServerInfo.rsa_private_key_file)
2973      {
2974 <      yyerror("No rsa_private_key_file specified, SSL disabled");
2974 >      conf_error_report("No rsa_private_key_file specified, SSL disabled");
2975        break;
2976      }
2977  
2978 <    if (SSL_CTX_use_certificate_file(ServerInfo.server_ctx, yylval.string,
2979 <                                     SSL_FILETYPE_PEM) <= 0 ||
3289 <        SSL_CTX_use_certificate_file(ServerInfo.client_ctx, yylval.string,
3290 <                                     SSL_FILETYPE_PEM) <= 0)
2978 >    if (SSL_CTX_use_certificate_chain_file(ConfigServerInfo.server_ctx, yylval.string) <= 0 ||
2979 >        SSL_CTX_use_certificate_chain_file(ConfigServerInfo.client_ctx, yylval.string) <= 0)
2980      {
2981 <      yyerror(ERR_lib_error_string(ERR_get_error()));
2981 >      report_crypto_errors();
2982 >      conf_error_report("Could not open/read certificate file");
2983        break;
2984      }
2985  
2986 <    if (SSL_CTX_use_PrivateKey_file(ServerInfo.server_ctx, ServerInfo.rsa_private_key_file,
2986 >    if (SSL_CTX_use_PrivateKey_file(ConfigServerInfo.server_ctx, ConfigServerInfo.rsa_private_key_file,
2987                                      SSL_FILETYPE_PEM) <= 0 ||
2988 <        SSL_CTX_use_PrivateKey_file(ServerInfo.client_ctx, ServerInfo.rsa_private_key_file,
2988 >        SSL_CTX_use_PrivateKey_file(ConfigServerInfo.client_ctx, ConfigServerInfo.rsa_private_key_file,
2989                                      SSL_FILETYPE_PEM) <= 0)
2990      {
2991 <      yyerror(ERR_lib_error_string(ERR_get_error()));
2991 >      report_crypto_errors();
2992 >      conf_error_report("Could not read RSA private key");
2993        break;
2994      }
2995  
2996 <    if (!SSL_CTX_check_private_key(ServerInfo.server_ctx) ||
2997 <        !SSL_CTX_check_private_key(ServerInfo.client_ctx))
2996 >    if (!SSL_CTX_check_private_key(ConfigServerInfo.server_ctx) ||
2997 >        !SSL_CTX_check_private_key(ConfigServerInfo.client_ctx))
2998      {
2999 <      yyerror(ERR_lib_error_string(ERR_get_error()));
2999 >      report_crypto_errors();
3000 >      conf_error_report("Could not read RSA private key");
3001        break;
3002      }
3003    }
3004   #endif
3005   }
3006 + #line 3007 "conf_parser.c" /* yacc.c:1646  */
3007      break;
3008  
3009 <  case 78:
3010 < /* Line 1787 of yacc.c  */
3318 < #line 503 "conf_parser.y"
3009 >  case 74:
3010 > #line 524 "conf_parser.y" /* yacc.c:1646  */
3011      {
3012   #ifdef HAVE_LIBCRYPTO
3013 <  if (conf_parser_ctx.pass == 1)
3322 <  {
3323 <    BIO *file;
3013 >  BIO *file = NULL;
3014  
3015 <    if (ServerInfo.rsa_private_key)
3016 <    {
3327 <      RSA_free(ServerInfo.rsa_private_key);
3328 <      ServerInfo.rsa_private_key = NULL;
3329 <    }
3015 >  if (conf_parser_ctx.pass != 1)
3016 >    break;
3017  
3018 <    if (ServerInfo.rsa_private_key_file)
3019 <    {
3020 <      MyFree(ServerInfo.rsa_private_key_file);
3021 <      ServerInfo.rsa_private_key_file = NULL;
3022 <    }
3018 >  if (ConfigServerInfo.rsa_private_key)
3019 >  {
3020 >    RSA_free(ConfigServerInfo.rsa_private_key);
3021 >    ConfigServerInfo.rsa_private_key = NULL;
3022 >  }
3023  
3024 <    DupString(ServerInfo.rsa_private_key_file, yylval.string);
3024 >  if (ConfigServerInfo.rsa_private_key_file)
3025 >  {
3026 >    MyFree(ConfigServerInfo.rsa_private_key_file);
3027 >    ConfigServerInfo.rsa_private_key_file = NULL;
3028 >  }
3029  
3030 <    if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3340 <    {
3341 <      yyerror("File open failed, ignoring");
3342 <      break;
3343 <    }
3030 >  ConfigServerInfo.rsa_private_key_file = xstrdup(yylval.string);
3031  
3032 <    ServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3032 >  if ((file = BIO_new_file(yylval.string, "r")) == NULL)
3033 >  {
3034 >    conf_error_report("File open failed, ignoring");
3035 >    break;
3036 >  }
3037  
3038 <    BIO_set_close(file, BIO_CLOSE);
3348 <    BIO_free(file);
3038 >  ConfigServerInfo.rsa_private_key = PEM_read_bio_RSAPrivateKey(file, NULL, 0, NULL);
3039  
3040 <    if (ServerInfo.rsa_private_key == NULL)
3041 <    {
3352 <      yyerror("Couldn't extract key, ignoring");
3353 <      break;
3354 <    }
3040 >  BIO_set_close(file, BIO_CLOSE);
3041 >  BIO_free(file);
3042  
3043 <    if (!RSA_check_key(ServerInfo.rsa_private_key))
3044 <    {
3045 <      RSA_free(ServerInfo.rsa_private_key);
3046 <      ServerInfo.rsa_private_key = NULL;
3043 >  if (ConfigServerInfo.rsa_private_key == NULL)
3044 >  {
3045 >    conf_error_report("Couldn't extract key, ignoring");
3046 >    break;
3047 >  }
3048  
3049 <      yyerror("Invalid key, ignoring");
3050 <      break;
3051 <    }
3049 >  if (!RSA_check_key(ConfigServerInfo.rsa_private_key))
3050 >  {
3051 >    RSA_free(ConfigServerInfo.rsa_private_key);
3052 >    ConfigServerInfo.rsa_private_key = NULL;
3053  
3054 <    /* require 2048 bit (256 byte) key */
3055 <    if (RSA_size(ServerInfo.rsa_private_key) != 256)
3056 <    {
3368 <      RSA_free(ServerInfo.rsa_private_key);
3369 <      ServerInfo.rsa_private_key = NULL;
3054 >    conf_error_report("Invalid key, ignoring");
3055 >    break;
3056 >  }
3057  
3058 <      yyerror("Not a 2048 bit key, ignoring");
3059 <    }
3058 >  if (RSA_size(ConfigServerInfo.rsa_private_key) < 128)
3059 >  {
3060 >    RSA_free(ConfigServerInfo.rsa_private_key);
3061 >    ConfigServerInfo.rsa_private_key = NULL;
3062 >
3063 >    conf_error_report("Ignoring serverinfo::rsa_private_key_file -- need at least a 1024 bit key size");
3064    }
3065   #endif
3066   }
3067 + #line 3068 "conf_parser.c" /* yacc.c:1646  */
3068      break;
3069  
3070 <  case 79:
3071 < /* Line 1787 of yacc.c  */
3380 < #line 562 "conf_parser.y"
3070 >  case 75:
3071 > #line 582 "conf_parser.y" /* yacc.c:1646  */
3072      {
3382 /* TBD - XXX: error reporting */
3073   #ifdef HAVE_LIBCRYPTO
3074 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3074 >  if (conf_parser_ctx.pass == 2)
3075    {
3076      BIO *file = BIO_new_file(yylval.string, "r");
3077  
# Line 3394 | Line 3084 | yyreduce:
3084        if (dh)
3085        {
3086          if (DH_size(dh) < 128)
3087 <          ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3087 >          conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- need at least a 1024 bit DH prime size");
3088          else
3089 <          SSL_CTX_set_tmp_dh(ServerInfo.server_ctx, dh);
3089 >          SSL_CTX_set_tmp_dh(ConfigServerInfo.server_ctx, dh);
3090  
3091          DH_free(dh);
3092        }
3093      }
3094 +    else
3095 +      conf_error_report("Ignoring serverinfo::ssl_dh_param_file -- could not open/read Diffie-Hellman parameter file");
3096    }
3097   #endif
3098   }
3099 + #line 3100 "conf_parser.c" /* yacc.c:1646  */
3100      break;
3101  
3102 <  case 80:
3103 < /* Line 1787 of yacc.c  */
3411 < #line 590 "conf_parser.y"
3102 >  case 76:
3103 > #line 611 "conf_parser.y" /* yacc.c:1646  */
3104      {
3105   #ifdef HAVE_LIBCRYPTO
3106 <  if (conf_parser_ctx.pass == 2 && ServerInfo.server_ctx)
3107 <    SSL_CTX_set_cipher_list(ServerInfo.server_ctx, yylval.string);
3106 >  if (conf_parser_ctx.pass == 2)
3107 >    SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, yylval.string);
3108   #endif
3109   }
3110 + #line 3111 "conf_parser.c" /* yacc.c:1646  */
3111      break;
3112  
3113 <  case 81:
3114 < /* Line 1787 of yacc.c  */
3115 < #line 598 "conf_parser.y"
3113 >  case 77:
3114 > #line 619 "conf_parser.y" /* yacc.c:1646  */
3115 >    {
3116 > #ifdef HAVE_LIBCRYPTO
3117 >  if (conf_parser_ctx.pass == 2)
3118 >  {
3119 >    if ((ConfigServerInfo.message_digest_algorithm = EVP_get_digestbyname(yylval.string)) == NULL)
3120 >    {
3121 >      ConfigServerInfo.message_digest_algorithm = EVP_sha256();
3122 >      conf_error_report("Ignoring serverinfo::ssl_message_digest_algorithm -- unknown message digest algorithm");
3123 >    }
3124 >  }
3125 > #endif
3126 > }
3127 > #line 3128 "conf_parser.c" /* yacc.c:1646  */
3128 >    break;
3129 >
3130 >  case 78:
3131 > #line 633 "conf_parser.y" /* yacc.c:1646  */
3132 >    {
3133 > #ifdef HAVE_LIBCRYPTO
3134 > #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
3135 >  int nid = 0;
3136 >  EC_KEY *key = NULL;
3137 >
3138 >  if (conf_parser_ctx.pass == 2)
3139 >  {
3140 >    if ((nid = OBJ_sn2nid(yylval.string)) == 0)
3141 >    {
3142 >        conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- unknown curve name");
3143 >        break;
3144 >    }
3145 >
3146 >    if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
3147 >    {
3148 >      conf_error_report("Ignoring serverinfo::serverinfo_ssl_dh_elliptic_curve -- could not create curve");
3149 >      break;
3150 >    }
3151 >
3152 >    SSL_CTX_set_tmp_ecdh(ConfigServerInfo.server_ctx, key);
3153 >    EC_KEY_free(key);
3154 > }
3155 > #endif
3156 > #endif
3157 > }
3158 > #line 3159 "conf_parser.c" /* yacc.c:1646  */
3159 >    break;
3160 >
3161 >  case 79:
3162 > #line 661 "conf_parser.y" /* yacc.c:1646  */
3163      {
3164    /* this isn't rehashable */
3165 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.name)
3165 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.name)
3166    {
3167      if (valid_servname(yylval.string))
3168 <      DupString(ServerInfo.name, yylval.string);
3168 >      ConfigServerInfo.name = xstrdup(yylval.string);
3169      else
3170      {
3171 <      ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::name -- invalid name. Aborting.");
3171 >      conf_error_report("Ignoring serverinfo::name -- invalid name. Aborting.");
3172        exit(0);
3173      }
3174    }
3175   }
3176 + #line 3177 "conf_parser.c" /* yacc.c:1646  */
3177      break;
3178  
3179 <  case 82:
3180 < /* Line 1787 of yacc.c  */
3440 < #line 613 "conf_parser.y"
3179 >  case 80:
3180 > #line 676 "conf_parser.y" /* yacc.c:1646  */
3181      {
3182    /* this isn't rehashable */
3183 <  if (conf_parser_ctx.pass == 2 && !ServerInfo.sid)
3183 >  if (conf_parser_ctx.pass == 2 && !ConfigServerInfo.sid)
3184    {
3185      if (valid_sid(yylval.string))
3186 <      DupString(ServerInfo.sid, yylval.string);
3186 >      ConfigServerInfo.sid = xstrdup(yylval.string);
3187      else
3188      {
3189 <      ilog(LOG_TYPE_IRCD, "Ignoring serverinfo::sid -- invalid SID. Aborting.");
3189 >      conf_error_report("Ignoring serverinfo::sid -- invalid SID. Aborting.");
3190        exit(0);
3191      }
3192    }
3193   }
3194 + #line 3195 "conf_parser.c" /* yacc.c:1646  */
3195      break;
3196  
3197 <  case 83:
3198 < /* Line 1787 of yacc.c  */
3458 < #line 628 "conf_parser.y"
3197 >  case 81:
3198 > #line 691 "conf_parser.y" /* yacc.c:1646  */
3199      {
3200    if (conf_parser_ctx.pass == 2)
3201    {
3202 <    MyFree(ServerInfo.description);
3203 <    DupString(ServerInfo.description,yylval.string);
3202 >    MyFree(ConfigServerInfo.description);
3203 >    ConfigServerInfo.description = xstrdup(yylval.string);
3204 >    strlcpy(me.info, ConfigServerInfo.description, sizeof(me.info));
3205    }
3206   }
3207 + #line 3208 "conf_parser.c" /* yacc.c:1646  */
3208      break;
3209  
3210 <  case 84:
3211 < /* Line 1787 of yacc.c  */
3470 < #line 637 "conf_parser.y"
3210 >  case 82:
3211 > #line 701 "conf_parser.y" /* yacc.c:1646  */
3212      {
3213    if (conf_parser_ctx.pass == 2)
3214    {
3215      char *p;
3216  
3217 <    if ((p = strchr(yylval.string, ' ')) != NULL)
3218 <      p = '\0';
3217 >    if ((p = strchr(yylval.string, ' ')))
3218 >      *p = '\0';
3219  
3220 <    MyFree(ServerInfo.network_name);
3221 <    DupString(ServerInfo.network_name, yylval.string);
3220 >    MyFree(ConfigServerInfo.network_name);
3221 >    ConfigServerInfo.network_name = xstrdup(yylval.string);
3222    }
3223   }
3224 + #line 3225 "conf_parser.c" /* yacc.c:1646  */
3225      break;
3226  
3227 <  case 85:
3228 < /* Line 1787 of yacc.c  */
3487 < #line 651 "conf_parser.y"
3227 >  case 83:
3228 > #line 715 "conf_parser.y" /* yacc.c:1646  */
3229      {
3230 <  if (conf_parser_ctx.pass == 2)
3231 <  {
3232 <    MyFree(ServerInfo.network_desc);
3233 <    DupString(ServerInfo.network_desc, yylval.string);
3234 <  }
3230 >  if (conf_parser_ctx.pass != 2)
3231 >    break;
3232 >
3233 >  MyFree(ConfigServerInfo.network_desc);
3234 >  ConfigServerInfo.network_desc = xstrdup(yylval.string);
3235   }
3236 + #line 3237 "conf_parser.c" /* yacc.c:1646  */
3237      break;
3238  
3239 <  case 86:
3240 < /* Line 1787 of yacc.c  */
3499 < #line 660 "conf_parser.y"
3239 >  case 84:
3240 > #line 724 "conf_parser.y" /* yacc.c:1646  */
3241      {
3242    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3243    {
# Line 3512 | Line 3253 | yyreduce:
3253        ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
3254      else
3255      {
3256 <      assert(res != NULL);
3256 >      assert(res);
3257  
3258 <      memcpy(&ServerInfo.ip, res->ai_addr, res->ai_addrlen);
3259 <      ServerInfo.ip.ss.ss_family = res->ai_family;
3260 <      ServerInfo.ip.ss_len = res->ai_addrlen;
3258 >      memcpy(&ConfigServerInfo.ip, res->ai_addr, res->ai_addrlen);
3259 >      ConfigServerInfo.ip.ss.ss_family = res->ai_family;
3260 >      ConfigServerInfo.ip.ss_len = res->ai_addrlen;
3261        freeaddrinfo(res);
3262  
3263 <      ServerInfo.specific_ipv4_vhost = 1;
3263 >      ConfigServerInfo.specific_ipv4_vhost = 1;
3264      }
3265    }
3266   }
3267 + #line 3268 "conf_parser.c" /* yacc.c:1646  */
3268      break;
3269  
3270 <  case 87:
3271 < /* Line 1787 of yacc.c  */
3530 < #line 688 "conf_parser.y"
3270 >  case 85:
3271 > #line 752 "conf_parser.y" /* yacc.c:1646  */
3272      {
3532 #ifdef IPV6
3273    if (conf_parser_ctx.pass == 2 && *yylval.string != '*')
3274    {
3275      struct addrinfo hints, *res;
# Line 3544 | Line 3284 | yyreduce:
3284        ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost6(%s)", yylval.string);
3285      else
3286      {
3287 <      assert(res != NULL);
3287 >      assert(res);
3288  
3289 <      memcpy(&ServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3290 <      ServerInfo.ip6.ss.ss_family = res->ai_family;
3291 <      ServerInfo.ip6.ss_len = res->ai_addrlen;
3289 >      memcpy(&ConfigServerInfo.ip6, res->ai_addr, res->ai_addrlen);
3290 >      ConfigServerInfo.ip6.ss.ss_family = res->ai_family;
3291 >      ConfigServerInfo.ip6.ss_len = res->ai_addrlen;
3292        freeaddrinfo(res);
3293  
3294 <      ServerInfo.specific_ipv6_vhost = 1;
3294 >      ConfigServerInfo.specific_ipv6_vhost = 1;
3295      }
3296    }
3557 #endif
3297   }
3298 + #line 3299 "conf_parser.c" /* yacc.c:1646  */
3299      break;
3300  
3301 <  case 88:
3302 < /* Line 1787 of yacc.c  */
3563 < #line 718 "conf_parser.y"
3301 >  case 86:
3302 > #line 780 "conf_parser.y" /* yacc.c:1646  */
3303      {
3304 <  if (conf_parser_ctx.pass == 2)
3304 >  if (conf_parser_ctx.pass != 2)
3305 >    break;
3306 >
3307 >  if ((yyvsp[-1].number) < MAXCLIENTS_MIN)
3308    {
3309 <    recalc_fdlimit(NULL);
3309 >    char buf[IRCD_BUFSIZE] = "";
3310  
3311 <    if ((yyvsp[(3) - (4)].number) < MAXCLIENTS_MIN)
3312 <    {
3313 <      char buf[IRCD_BUFSIZE];
3572 <      ircsprintf(buf, "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3573 <      yyerror(buf);
3574 <    }
3575 <    else if ((yyvsp[(3) - (4)].number) > MAXCLIENTS_MAX)
3576 <    {
3577 <      char buf[IRCD_BUFSIZE];
3578 <      ircsprintf(buf, "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3579 <      yyerror(buf);
3580 <    }
3581 <    else
3582 <      ServerInfo.max_clients = (yyvsp[(3) - (4)].number);
3311 >    snprintf(buf, sizeof(buf), "MAXCLIENTS too low, setting to %d", MAXCLIENTS_MIN);
3312 >    conf_error_report(buf);
3313 >    ConfigServerInfo.max_clients = MAXCLIENTS_MIN;
3314    }
3315 +  else if ((yyvsp[-1].number) > MAXCLIENTS_MAX)
3316 +  {
3317 +    char buf[IRCD_BUFSIZE] = "";
3318 +
3319 +    snprintf(buf, sizeof(buf), "MAXCLIENTS too high, setting to %d", MAXCLIENTS_MAX);
3320 +    conf_error_report(buf);
3321 +    ConfigServerInfo.max_clients = MAXCLIENTS_MAX;
3322 +  }
3323 +  else
3324 +    ConfigServerInfo.max_clients = (yyvsp[-1].number);
3325   }
3326 + #line 3327 "conf_parser.c" /* yacc.c:1646  */
3327      break;
3328  
3329 <  case 89:
3330 < /* Line 1787 of yacc.c  */
3589 < #line 741 "conf_parser.y"
3329 >  case 87:
3330 > #line 805 "conf_parser.y" /* yacc.c:1646  */
3331      {
3332 <  if (conf_parser_ctx.pass == 2)
3592 <    ServerInfo.hub = yylval.number;
3593 < }
3332 >  if (conf_parser_ctx.pass != 2)
3333      break;
3334  
3335 <  case 97:
3597 < /* Line 1787 of yacc.c  */
3598 < #line 756 "conf_parser.y"
3599 <    {
3600 <  if (conf_parser_ctx.pass == 2)
3335 >  if ((yyvsp[-1].number) < 9)
3336    {
3337 <    MyFree(AdminInfo.name);
3338 <    DupString(AdminInfo.name, yylval.string);
3337 >    conf_error_report("max_nick_length too low, setting to 9");
3338 >    ConfigServerInfo.max_nick_length = 9;
3339    }
3340 +  else if ((yyvsp[-1].number) > NICKLEN)
3341 +  {
3342 +    char buf[IRCD_BUFSIZE] = "";
3343 +
3344 +    snprintf(buf, sizeof(buf), "max_nick_length too high, setting to %d", NICKLEN);
3345 +    conf_error_report(buf);
3346 +    ConfigServerInfo.max_nick_length = NICKLEN;
3347 +  }
3348 +  else
3349 +    ConfigServerInfo.max_nick_length = (yyvsp[-1].number);
3350   }
3351 + #line 3352 "conf_parser.c" /* yacc.c:1646  */
3352      break;
3353  
3354 <  case 98:
3355 < /* Line 1787 of yacc.c  */
3610 < #line 765 "conf_parser.y"
3354 >  case 88:
3355 > #line 827 "conf_parser.y" /* yacc.c:1646  */
3356      {
3357 <  if (conf_parser_ctx.pass == 2)
3357 >  if (conf_parser_ctx.pass != 2)
3358 >    break;
3359 >
3360 >  if ((yyvsp[-1].number) < 80)
3361    {
3362 <    MyFree(AdminInfo.email);
3363 <    DupString(AdminInfo.email, yylval.string);
3362 >    conf_error_report("max_topic_length too low, setting to 80");
3363 >    ConfigServerInfo.max_topic_length = 80;
3364    }
3365 +  else if ((yyvsp[-1].number) > TOPICLEN)
3366 +  {
3367 +    char buf[IRCD_BUFSIZE] = "";
3368 +
3369 +    snprintf(buf, sizeof(buf), "max_topic_length too high, setting to %d", TOPICLEN);
3370 +    conf_error_report(buf);
3371 +    ConfigServerInfo.max_topic_length = TOPICLEN;
3372 +  }
3373 +  else
3374 +    ConfigServerInfo.max_topic_length = (yyvsp[-1].number);
3375   }
3376 + #line 3377 "conf_parser.c" /* yacc.c:1646  */
3377      break;
3378  
3379 <  case 99:
3380 < /* Line 1787 of yacc.c  */
3622 < #line 774 "conf_parser.y"
3379 >  case 89:
3380 > #line 849 "conf_parser.y" /* yacc.c:1646  */
3381      {
3382    if (conf_parser_ctx.pass == 2)
3383 <  {
3626 <    MyFree(AdminInfo.description);
3627 <    DupString(AdminInfo.description, yylval.string);
3628 <  }
3383 >    ConfigServerInfo.hub = yylval.number;
3384   }
3385 + #line 3386 "conf_parser.c" /* yacc.c:1646  */
3386      break;
3387  
3388 <  case 106:
3389 < /* Line 1787 of yacc.c  */
3634 < #line 792 "conf_parser.y"
3388 >  case 97:
3389 > #line 866 "conf_parser.y" /* yacc.c:1646  */
3390      {
3391 <  if (conf_parser_ctx.pass == 2)
3392 <    ConfigLoggingEntry.use_logging = yylval.number;
3391 >  if (conf_parser_ctx.pass != 2)
3392 >    break;
3393 >
3394 >  MyFree(ConfigAdminInfo.name);
3395 >  ConfigAdminInfo.name = xstrdup(yylval.string);
3396   }
3397 + #line 3398 "conf_parser.c" /* yacc.c:1646  */
3398      break;
3399  
3400 <  case 107:
3401 < /* Line 1787 of yacc.c  */
3643 < #line 798 "conf_parser.y"
3400 >  case 98:
3401 > #line 875 "conf_parser.y" /* yacc.c:1646  */
3402      {
3403 <  lfile[0] = '\0';
3404 <  ltype = 0;
3405 <  lsize = 0;
3403 >  if (conf_parser_ctx.pass != 2)
3404 >    break;
3405 >
3406 >  MyFree(ConfigAdminInfo.email);
3407 >  ConfigAdminInfo.email = xstrdup(yylval.string);
3408   }
3409 + #line 3410 "conf_parser.c" /* yacc.c:1646  */
3410      break;
3411  
3412 <  case 108:
3413 < /* Line 1787 of yacc.c  */
3653 < #line 803 "conf_parser.y"
3412 >  case 99:
3413 > #line 884 "conf_parser.y" /* yacc.c:1646  */
3414      {
3415 <  if (conf_parser_ctx.pass == 2 && ltype > 0)
3416 <    log_add_file(ltype, lsize, lfile);
3415 >  if (conf_parser_ctx.pass != 2)
3416 >    break;
3417 >
3418 >  MyFree(ConfigAdminInfo.description);
3419 >  ConfigAdminInfo.description = xstrdup(yylval.string);
3420   }
3421 + #line 3422 "conf_parser.c" /* yacc.c:1646  */
3422      break;
3423  
3424 <  case 115:
3425 < /* Line 1787 of yacc.c  */
3662 < #line 815 "conf_parser.y"
3424 >  case 100:
3425 > #line 896 "conf_parser.y" /* yacc.c:1646  */
3426      {
3427 <  strlcpy(lfile, yylval.string, sizeof(lfile));
3427 >  if (conf_parser_ctx.pass == 2)
3428 >    reset_block_state();
3429   }
3430 + #line 3431 "conf_parser.c" /* yacc.c:1646  */
3431      break;
3432  
3433 <  case 116:
3434 < /* Line 1787 of yacc.c  */
3670 < #line 820 "conf_parser.y"
3433 >  case 101:
3434 > #line 900 "conf_parser.y" /* yacc.c:1646  */
3435      {
3436 <  lsize = (yyvsp[(3) - (4)].number);
3436 >  dlink_node *node = NULL;
3437 >
3438 >  if (conf_parser_ctx.pass != 2)
3439 >    break;
3440 >
3441 >  if (!block_state.file.buf[0])
3442 >    break;
3443 >
3444 >  DLINK_FOREACH(node, block_state.mask.list.head)
3445 >    motd_add(node->data, block_state.file.buf);
3446   }
3447 + #line 3448 "conf_parser.c" /* yacc.c:1646  */
3448      break;
3449  
3450 <  case 117:
3451 < /* Line 1787 of yacc.c  */
3678 < #line 823 "conf_parser.y"
3450 >  case 107:
3451 > #line 917 "conf_parser.y" /* yacc.c:1646  */
3452      {
3453 <  lsize = 0;
3453 >  if (conf_parser_ctx.pass == 2)
3454 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3455   }
3456 + #line 3457 "conf_parser.c" /* yacc.c:1646  */
3457      break;
3458  
3459 <  case 118:
3460 < /* Line 1787 of yacc.c  */
3686 < #line 828 "conf_parser.y"
3459 >  case 108:
3460 > #line 923 "conf_parser.y" /* yacc.c:1646  */
3461      {
3462    if (conf_parser_ctx.pass == 2)
3463 <    ltype = 0;
3463 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3464   }
3465 + #line 3466 "conf_parser.c" /* yacc.c:1646  */
3466      break;
3467  
3468 <  case 122:
3469 < /* Line 1787 of yacc.c  */
3695 < #line 835 "conf_parser.y"
3468 >  case 109:
3469 > #line 932 "conf_parser.y" /* yacc.c:1646  */
3470      {
3471    if (conf_parser_ctx.pass == 2)
3472 <    ltype = LOG_TYPE_USER;
3472 >    reset_block_state();
3473   }
3474 + #line 3475 "conf_parser.c" /* yacc.c:1646  */
3475      break;
3476  
3477 <  case 123:
3478 < /* Line 1787 of yacc.c  */
3704 < #line 839 "conf_parser.y"
3477 >  case 110:
3478 > #line 936 "conf_parser.y" /* yacc.c:1646  */
3479      {
3480 <  if (conf_parser_ctx.pass == 2)
3481 <    ltype = LOG_TYPE_OPER;
3480 >  if (conf_parser_ctx.pass != 2)
3481 >    break;
3482 >
3483 >  if (!block_state.command.buf[0] ||
3484 >      !block_state.name.buf[0] ||
3485 >      !block_state.nick.buf[0] ||
3486 >      !block_state.host.buf[0])
3487 >    break;
3488 >
3489 >  pseudo_register(block_state.name.buf, block_state.nick.buf, block_state.host.buf,
3490 >                  block_state.prepend.buf, block_state.command.buf);
3491   }
3492 + #line 3493 "conf_parser.c" /* yacc.c:1646  */
3493      break;
3494  
3495 <  case 124:
3496 < /* Line 1787 of yacc.c  */
3713 < #line 843 "conf_parser.y"
3495 >  case 118:
3496 > #line 954 "conf_parser.y" /* yacc.c:1646  */
3497      {
3498    if (conf_parser_ctx.pass == 2)
3499 <    ltype = LOG_TYPE_GLINE;
3499 >    strlcpy(block_state.command.buf, yylval.string, sizeof(block_state.command.buf));
3500   }
3501 + #line 3502 "conf_parser.c" /* yacc.c:1646  */
3502      break;
3503  
3504 <  case 125:
3505 < /* Line 1787 of yacc.c  */
3722 < #line 847 "conf_parser.y"
3504 >  case 119:
3505 > #line 960 "conf_parser.y" /* yacc.c:1646  */
3506      {
3507    if (conf_parser_ctx.pass == 2)
3508 <    ltype = LOG_TYPE_DLINE;
3508 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3509   }
3510 + #line 3511 "conf_parser.c" /* yacc.c:1646  */
3511      break;
3512  
3513 <  case 126:
3514 < /* Line 1787 of yacc.c  */
3731 < #line 851 "conf_parser.y"
3513 >  case 120:
3514 > #line 966 "conf_parser.y" /* yacc.c:1646  */
3515      {
3516    if (conf_parser_ctx.pass == 2)
3517 <    ltype = LOG_TYPE_KLINE;
3517 >    strlcpy(block_state.prepend.buf, yylval.string, sizeof(block_state.prepend.buf));
3518   }
3519 + #line 3520 "conf_parser.c" /* yacc.c:1646  */
3520      break;
3521  
3522 <  case 127:
3523 < /* Line 1787 of yacc.c  */
3740 < #line 855 "conf_parser.y"
3522 >  case 121:
3523 > #line 972 "conf_parser.y" /* yacc.c:1646  */
3524      {
3525    if (conf_parser_ctx.pass == 2)
3526 <    ltype = LOG_TYPE_KILL;
3526 >  {
3527 >    struct split_nuh_item nuh;
3528 >
3529 >    nuh.nuhmask  = yylval.string;
3530 >    nuh.nickptr  = NULL;
3531 >    nuh.userptr  = block_state.user.buf;
3532 >    nuh.hostptr  = block_state.host.buf;
3533 >    nuh.nicksize = 0;
3534 >    nuh.usersize = sizeof(block_state.nick.buf);
3535 >    nuh.hostsize = sizeof(block_state.host.buf);
3536 >    split_nuh(&nuh);
3537 >
3538 >    strlcpy(block_state.nick.buf, nuh.userptr, sizeof(block_state.nick.buf));
3539 >    strlcpy(block_state.host.buf, nuh.hostptr, sizeof(block_state.host.buf));
3540 >  }
3541   }
3542 + #line 3543 "conf_parser.c" /* yacc.c:1646  */
3543      break;
3544  
3545    case 128:
3546 < /* Line 1787 of yacc.c  */
3749 < #line 859 "conf_parser.y"
3546 > #line 1001 "conf_parser.y" /* yacc.c:1646  */
3547      {
3548    if (conf_parser_ctx.pass == 2)
3549 <    ltype = LOG_TYPE_DEBUG;
3549 >    ConfigLog.use_logging = yylval.number;
3550   }
3551 + #line 3552 "conf_parser.c" /* yacc.c:1646  */
3552      break;
3553  
3554    case 129:
3555 < /* Line 1787 of yacc.c  */
3758 < #line 869 "conf_parser.y"
3555 > #line 1007 "conf_parser.y" /* yacc.c:1646  */
3556      {
3557    if (conf_parser_ctx.pass == 2)
3558 <  {
3762 <    yy_conf = make_conf_item(OPER_TYPE);
3763 <    yy_aconf = map_to_conf(yy_conf);
3764 <    SetConfEncrypted(yy_aconf); /* Yes, the default is encrypted */
3765 <  }
3766 <  else
3767 <  {
3768 <    MyFree(class_name);
3769 <    class_name = NULL;
3770 <  }
3558 >    reset_block_state();
3559   }
3560 + #line 3561 "conf_parser.c" /* yacc.c:1646  */
3561      break;
3562  
3563    case 130:
3564 < /* Line 1787 of yacc.c  */
3776 < #line 882 "conf_parser.y"
3564 > #line 1011 "conf_parser.y" /* yacc.c:1646  */
3565      {
3566 <  if (conf_parser_ctx.pass == 2)
3567 <  {
3780 <    struct CollectItem *yy_tmp;
3781 <    dlink_node *ptr;
3782 <    dlink_node *next_ptr;
3783 <
3784 <    conf_add_class_to_conf(yy_conf, class_name);
3566 >  if (conf_parser_ctx.pass != 2)
3567 >    break;
3568  
3569 <    /* Now, make sure there is a copy of the "base" given oper
3570 <     * block in each of the collected copies
3571 <     */
3569 >  if (block_state.type.value && block_state.file.buf[0])
3570 >    log_set_file(block_state.type.value, block_state.size.value,
3571 >                 block_state.file.buf);
3572 > }
3573 > #line 3574 "conf_parser.c" /* yacc.c:1646  */
3574 >    break;
3575  
3576 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
3576 >  case 137:
3577 > #line 1027 "conf_parser.y" /* yacc.c:1646  */
3578      {
3579 <      struct AccessItem *new_aconf;
3580 <      struct ConfItem *new_conf;
3794 <      yy_tmp = ptr->data;
3795 <
3796 <      new_conf = make_conf_item(OPER_TYPE);
3797 <      new_aconf = (struct AccessItem *)map_to_conf(new_conf);
3798 <
3799 <      new_aconf->flags = yy_aconf->flags;
3579 >  if (conf_parser_ctx.pass != 2)
3580 >    break;
3581  
3582 <      if (yy_conf->name != NULL)
3583 <        DupString(new_conf->name, yy_conf->name);
3584 <      if (yy_tmp->user != NULL)
3585 <        DupString(new_aconf->user, yy_tmp->user);
3805 <      else
3806 <        DupString(new_aconf->user, "*");
3807 <      if (yy_tmp->host != NULL)
3808 <        DupString(new_aconf->host, yy_tmp->host);
3809 <      else
3810 <        DupString(new_aconf->host, "*");
3582 >  strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3583 > }
3584 > #line 3585 "conf_parser.c" /* yacc.c:1646  */
3585 >    break;
3586  
3587 <      new_aconf->type = parse_netmask(new_aconf->host, &new_aconf->addr,
3588 <                                     &new_aconf->bits);
3587 >  case 138:
3588 > #line 1035 "conf_parser.y" /* yacc.c:1646  */
3589 >    {
3590 >  block_state.size.value = (yyvsp[-1].number);
3591 > }
3592 > #line 3593 "conf_parser.c" /* yacc.c:1646  */
3593 >    break;
3594  
3595 <      conf_add_class_to_conf(new_conf, class_name);
3596 <      if (yy_aconf->passwd != NULL)
3597 <        DupString(new_aconf->passwd, yy_aconf->passwd);
3595 >  case 139:
3596 > #line 1038 "conf_parser.y" /* yacc.c:1646  */
3597 >    {
3598 >  block_state.size.value = 0;
3599 > }
3600 > #line 3601 "conf_parser.c" /* yacc.c:1646  */
3601 >    break;
3602  
3603 <      new_aconf->port = yy_aconf->port;
3604 < #ifdef HAVE_LIBCRYPTO
3605 <      if (yy_aconf->rsa_public_key_file != NULL)
3606 <      {
3607 <        BIO *file;
3603 >  case 140:
3604 > #line 1043 "conf_parser.y" /* yacc.c:1646  */
3605 >    {
3606 >  if (conf_parser_ctx.pass == 2)
3607 >    block_state.type.value = 0;
3608 > }
3609 > #line 3610 "conf_parser.c" /* yacc.c:1646  */
3610 >    break;
3611  
3612 <        DupString(new_aconf->rsa_public_key_file,
3613 <                  yy_aconf->rsa_public_key_file);
3612 >  case 144:
3613 > #line 1050 "conf_parser.y" /* yacc.c:1646  */
3614 >    {
3615 >  if (conf_parser_ctx.pass == 2)
3616 >    block_state.type.value = LOG_TYPE_USER;
3617 > }
3618 > #line 3619 "conf_parser.c" /* yacc.c:1646  */
3619 >    break;
3620  
3621 <        file = BIO_new_file(yy_aconf->rsa_public_key_file, "r");
3622 <        new_aconf->rsa_public_key = PEM_read_bio_RSA_PUBKEY(file,
3623 <                                                           NULL, 0, NULL);
3624 <        BIO_set_close(file, BIO_CLOSE);
3625 <        BIO_free(file);
3626 <      }
3627 < #endif
3621 >  case 145:
3622 > #line 1054 "conf_parser.y" /* yacc.c:1646  */
3623 >    {
3624 >  if (conf_parser_ctx.pass == 2)
3625 >    block_state.type.value = LOG_TYPE_OPER;
3626 > }
3627 > #line 3628 "conf_parser.c" /* yacc.c:1646  */
3628 >    break;
3629  
3630 < #ifdef HAVE_LIBCRYPTO
3631 <      if (yy_tmp->name && (yy_tmp->passwd || yy_aconf->rsa_public_key)
3632 <          && yy_tmp->host)
3633 < #else
3634 <      if (yy_tmp->name && yy_tmp->passwd && yy_tmp->host)
3635 < #endif
3636 <      {
3637 <        conf_add_class_to_conf(new_conf, class_name);
3844 <        if (yy_tmp->name != NULL)
3845 <          DupString(new_conf->name, yy_tmp->name);
3846 <      }
3630 >  case 146:
3631 > #line 1058 "conf_parser.y" /* yacc.c:1646  */
3632 >    {
3633 >  if (conf_parser_ctx.pass == 2)
3634 >    block_state.type.value = LOG_TYPE_GLINE;
3635 > }
3636 > #line 3637 "conf_parser.c" /* yacc.c:1646  */
3637 >    break;
3638  
3639 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
3640 <      free_collect_item(yy_tmp);
3641 <    }
3639 >  case 147:
3640 > #line 1062 "conf_parser.y" /* yacc.c:1646  */
3641 >    {
3642 >  if (conf_parser_ctx.pass == 2)
3643 >    block_state.type.value = LOG_TYPE_XLINE;
3644 > }
3645 > #line 3646 "conf_parser.c" /* yacc.c:1646  */
3646 >    break;
3647  
3648 <    yy_conf = NULL;
3649 <    yy_aconf = NULL;
3648 >  case 148:
3649 > #line 1066 "conf_parser.y" /* yacc.c:1646  */
3650 >    {
3651 >  if (conf_parser_ctx.pass == 2)
3652 >    block_state.type.value = LOG_TYPE_RESV;
3653 > }
3654 > #line 3655 "conf_parser.c" /* yacc.c:1646  */
3655 >    break;
3656  
3657 +  case 149:
3658 + #line 1070 "conf_parser.y" /* yacc.c:1646  */
3659 +    {
3660 +  if (conf_parser_ctx.pass == 2)
3661 +    block_state.type.value = LOG_TYPE_DLINE;
3662 + }
3663 + #line 3664 "conf_parser.c" /* yacc.c:1646  */
3664 +    break;
3665  
3666 <    MyFree(class_name);
3667 <    class_name = NULL;
3668 <  }
3666 >  case 150:
3667 > #line 1074 "conf_parser.y" /* yacc.c:1646  */
3668 >    {
3669 >  if (conf_parser_ctx.pass == 2)
3670 >    block_state.type.value = LOG_TYPE_KLINE;
3671   }
3672 + #line 3673 "conf_parser.c" /* yacc.c:1646  */
3673      break;
3674  
3675 <  case 142:
3676 < /* Line 1787 of yacc.c  */
3864 < #line 972 "conf_parser.y"
3675 >  case 151:
3676 > #line 1078 "conf_parser.y" /* yacc.c:1646  */
3677      {
3678    if (conf_parser_ctx.pass == 2)
3679 <  {
3868 <    MyFree(yy_conf->name);
3869 <    DupString(yy_conf->name, yylval.string);
3870 <  }
3679 >    block_state.type.value = LOG_TYPE_KILL;
3680   }
3681 + #line 3682 "conf_parser.c" /* yacc.c:1646  */
3682      break;
3683  
3684 <  case 143:
3685 < /* Line 1787 of yacc.c  */
3876 < #line 981 "conf_parser.y"
3684 >  case 152:
3685 > #line 1082 "conf_parser.y" /* yacc.c:1646  */
3686      {
3687    if (conf_parser_ctx.pass == 2)
3688 +    block_state.type.value = LOG_TYPE_DEBUG;
3689 + }
3690 + #line 3691 "conf_parser.c" /* yacc.c:1646  */
3691 +    break;
3692 +
3693 +  case 153:
3694 + #line 1092 "conf_parser.y" /* yacc.c:1646  */
3695 +    {
3696 +  if (conf_parser_ctx.pass != 2)
3697 +    break;
3698 +
3699 +  reset_block_state();
3700 +  block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3701 + }
3702 + #line 3703 "conf_parser.c" /* yacc.c:1646  */
3703 +    break;
3704 +
3705 +  case 154:
3706 + #line 1099 "conf_parser.y" /* yacc.c:1646  */
3707 +    {
3708 +  dlink_node *node = NULL;
3709 +
3710 +  if (conf_parser_ctx.pass != 2)
3711 +    break;
3712 +
3713 +  if (!block_state.name.buf[0])
3714 +    break;
3715 + #ifdef HAVE_LIBCRYPTO
3716 +  if (!block_state.file.buf[0] &&
3717 +      !block_state.rpass.buf[0])
3718 +    break;
3719 + #else
3720 +  if (!block_state.rpass.buf[0])
3721 +    break;
3722 + #endif
3723 +
3724 +  DLINK_FOREACH(node, block_state.mask.list.head)
3725    {
3726 +    struct MaskItem *conf = NULL;
3727      struct split_nuh_item nuh;
3728  
3729 <    nuh.nuhmask  = yylval.string;
3729 >    nuh.nuhmask  = node->data;
3730      nuh.nickptr  = NULL;
3731 <    nuh.userptr  = userbuf;
3732 <    nuh.hostptr  = hostbuf;
3886 <
3731 >    nuh.userptr  = block_state.user.buf;
3732 >    nuh.hostptr  = block_state.host.buf;
3733      nuh.nicksize = 0;
3734 <    nuh.usersize = sizeof(userbuf);
3735 <    nuh.hostsize = sizeof(hostbuf);
3890 <
3734 >    nuh.usersize = sizeof(block_state.user.buf);
3735 >    nuh.hostsize = sizeof(block_state.host.buf);
3736      split_nuh(&nuh);
3737  
3738 <    if (yy_aconf->user == NULL)
3739 <    {
3740 <      DupString(yy_aconf->user, userbuf);
3741 <      DupString(yy_aconf->host, hostbuf);
3738 >    conf         = conf_make(CONF_OPER);
3739 >    conf->name   = xstrdup(block_state.name.buf);
3740 >    conf->user   = xstrdup(block_state.user.buf);
3741 >    conf->host   = xstrdup(block_state.host.buf);
3742 >
3743 >    if (block_state.cert.buf[0])
3744 >      conf->certfp = xstrdup(block_state.cert.buf);
3745 >
3746 >    if (block_state.rpass.buf[0])
3747 >      conf->passwd = xstrdup(block_state.rpass.buf);
3748 >
3749 >    conf->flags = block_state.flags.value;
3750 >    conf->modes = block_state.modes.value;
3751 >    conf->port  = block_state.port.value;
3752 >    conf->htype = parse_netmask(conf->host, &conf->addr, &conf->bits);
3753  
3754 <      yy_aconf->type = parse_netmask(yy_aconf->host, &yy_aconf->addr,
3755 <                                    &yy_aconf->bits);
3756 <    }
3757 <    else
3754 >    conf_add_class_to_conf(conf, block_state.class.buf);
3755 >
3756 > #ifdef HAVE_LIBCRYPTO
3757 >    if (block_state.file.buf[0])
3758      {
3759 <      struct CollectItem *yy_tmp = MyMalloc(sizeof(struct CollectItem));
3759 >      BIO *file = NULL;
3760 >      RSA *pkey = NULL;
3761  
3762 <      DupString(yy_tmp->user, userbuf);
3763 <      DupString(yy_tmp->host, hostbuf);
3762 >      if ((file = BIO_new_file(block_state.file.buf, "r")) == NULL)
3763 >      {
3764 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- file doesn't exist");
3765 >        break;
3766 >      }
3767 >
3768 >      if ((pkey = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL)) == NULL)
3769 >        ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key invalid; check key syntax");
3770 >      else
3771 >      {
3772 >        if (RSA_size(pkey) > 128)
3773 >          ilog(LOG_TYPE_IRCD, "Ignoring rsa_public_key_file -- key size must be 1024 or below");
3774 >        else
3775 >          conf->rsa_public_key = pkey;
3776 >      }
3777  
3778 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
3778 >      BIO_set_close(file, BIO_CLOSE);
3779 >      BIO_free(file);
3780      }
3781 + #endif /* HAVE_LIBCRYPTO */
3782    }
3783   }
3784 + #line 3785 "conf_parser.c" /* yacc.c:1646  */
3785      break;
3786  
3787 <  case 144:
3788 < /* Line 1787 of yacc.c  */
3916 < #line 1018 "conf_parser.y"
3787 >  case 168:
3788 > #line 1191 "conf_parser.y" /* yacc.c:1646  */
3789      {
3790    if (conf_parser_ctx.pass == 2)
3791 <  {
3792 <    if (yy_aconf->passwd != NULL)
3793 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
3791 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
3792 > }
3793 > #line 3794 "conf_parser.c" /* yacc.c:1646  */
3794 >    break;
3795  
3796 <    MyFree(yy_aconf->passwd);
3797 <    DupString(yy_aconf->passwd, yylval.string);
3798 <  }
3796 >  case 169:
3797 > #line 1197 "conf_parser.y" /* yacc.c:1646  */
3798 >    {
3799 >  if (conf_parser_ctx.pass == 2)
3800 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
3801   }
3802 + #line 3803 "conf_parser.c" /* yacc.c:1646  */
3803      break;
3804  
3805 <  case 145:
3806 < /* Line 1787 of yacc.c  */
3931 < #line 1030 "conf_parser.y"
3805 >  case 170:
3806 > #line 1203 "conf_parser.y" /* yacc.c:1646  */
3807      {
3808    if (conf_parser_ctx.pass == 2)
3809 <  {
3935 <    if (yylval.number)
3936 <      SetConfEncrypted(yy_aconf);
3937 <    else
3938 <      ClearConfEncrypted(yy_aconf);
3939 <  }
3809 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
3810   }
3811 + #line 3812 "conf_parser.c" /* yacc.c:1646  */
3812      break;
3813  
3814 <  case 146:
3815 < /* Line 1787 of yacc.c  */
3816 < #line 1041 "conf_parser.y"
3814 >  case 171:
3815 > #line 1209 "conf_parser.y" /* yacc.c:1646  */
3816 >    {
3817 >  if (conf_parser_ctx.pass != 2)
3818 >    break;
3819 >
3820 >  if (yylval.number)
3821 >    block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
3822 >  else
3823 >    block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
3824 > }
3825 > #line 3826 "conf_parser.c" /* yacc.c:1646  */
3826 >    break;
3827 >
3828 >  case 172:
3829 > #line 1220 "conf_parser.y" /* yacc.c:1646  */
3830      {
3947 #ifdef HAVE_LIBCRYPTO
3831    if (conf_parser_ctx.pass == 2)
3832 <  {
3833 <    BIO *file;
3832 >    strlcpy(block_state.file.buf, yylval.string, sizeof(block_state.file.buf));
3833 > }
3834 > #line 3835 "conf_parser.c" /* yacc.c:1646  */
3835 >    break;
3836  
3837 <    if (yy_aconf->rsa_public_key != NULL)
3837 >  case 173:
3838 > #line 1226 "conf_parser.y" /* yacc.c:1646  */
3839      {
3840 <      RSA_free(yy_aconf->rsa_public_key);
3841 <      yy_aconf->rsa_public_key = NULL;
3842 <    }
3840 >  if (conf_parser_ctx.pass == 2)
3841 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
3842 > }
3843 > #line 3844 "conf_parser.c" /* yacc.c:1646  */
3844 >    break;
3845  
3846 <    if (yy_aconf->rsa_public_key_file != NULL)
3846 >  case 174:
3847 > #line 1232 "conf_parser.y" /* yacc.c:1646  */
3848      {
3849 <      MyFree(yy_aconf->rsa_public_key_file);
3850 <      yy_aconf->rsa_public_key_file = NULL;
3962 <    }
3849 >  if (conf_parser_ctx.pass != 2)
3850 >    break;
3851  
3852 <    DupString(yy_aconf->rsa_public_key_file, yylval.string);
3853 <    file = BIO_new_file(yylval.string, "r");
3852 >  if (yylval.number)
3853 >    block_state.flags.value |= CONF_FLAGS_SSL;
3854 >  else
3855 >    block_state.flags.value &= ~CONF_FLAGS_SSL;
3856 > }
3857 > #line 3858 "conf_parser.c" /* yacc.c:1646  */
3858 >    break;
3859  
3860 <    if (file == NULL)
3860 >  case 175:
3861 > #line 1243 "conf_parser.y" /* yacc.c:1646  */
3862      {
3863 <      yyerror("Ignoring rsa_public_key_file -- file doesn't exist");
3864 <      break;
3865 <    }
3863 >  if (conf_parser_ctx.pass == 2)
3864 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
3865 > }
3866 > #line 3867 "conf_parser.c" /* yacc.c:1646  */
3867 >    break;
3868  
3869 <    yy_aconf->rsa_public_key = PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
3869 >  case 176:
3870 > #line 1249 "conf_parser.y" /* yacc.c:1646  */
3871 >    {
3872 >  if (conf_parser_ctx.pass == 2)
3873 >    block_state.modes.value = 0;
3874 > }
3875 > #line 3876 "conf_parser.c" /* yacc.c:1646  */
3876 >    break;
3877  
3878 <    if (yy_aconf->rsa_public_key == NULL)
3878 >  case 180:
3879 > #line 1256 "conf_parser.y" /* yacc.c:1646  */
3880      {
3881 <      yyerror("Ignoring rsa_public_key_file -- Key invalid; check key syntax.");
3882 <      break;
3883 <    }
3881 >  if (conf_parser_ctx.pass == 2)
3882 >    block_state.modes.value |= UMODE_BOTS;
3883 > }
3884 > #line 3885 "conf_parser.c" /* yacc.c:1646  */
3885 >    break;
3886  
3887 <    BIO_set_close(file, BIO_CLOSE);
3888 <    BIO_free(file);
3889 <  }
3890 < #endif /* HAVE_LIBCRYPTO */
3887 >  case 181:
3888 > #line 1260 "conf_parser.y" /* yacc.c:1646  */
3889 >    {
3890 >  if (conf_parser_ctx.pass == 2)
3891 >    block_state.modes.value |= UMODE_CCONN;
3892   }
3893 + #line 3894 "conf_parser.c" /* yacc.c:1646  */
3894      break;
3895  
3896 <  case 147:
3897 < /* Line 1787 of yacc.c  */
3990 < #line 1083 "conf_parser.y"
3896 >  case 182:
3897 > #line 1264 "conf_parser.y" /* yacc.c:1646  */
3898      {
3899    if (conf_parser_ctx.pass == 2)
3900 <  {
3994 <    MyFree(class_name);
3995 <    DupString(class_name, yylval.string);
3996 <  }
3900 >    block_state.modes.value |= UMODE_DEAF;
3901   }
3902 + #line 3903 "conf_parser.c" /* yacc.c:1646  */
3903      break;
3904  
3905 <  case 148:
3906 < /* Line 1787 of yacc.c  */
4002 < #line 1092 "conf_parser.y"
3905 >  case 183:
3906 > #line 1268 "conf_parser.y" /* yacc.c:1646  */
3907      {
3908    if (conf_parser_ctx.pass == 2)
3909 <    yy_aconf->modes = 0;
3909 >    block_state.modes.value |= UMODE_DEBUG;
3910   }
3911 + #line 3912 "conf_parser.c" /* yacc.c:1646  */
3912      break;
3913  
3914 <  case 152:
3915 < /* Line 1787 of yacc.c  */
4011 < #line 1099 "conf_parser.y"
3914 >  case 184:
3915 > #line 1272 "conf_parser.y" /* yacc.c:1646  */
3916      {
3917    if (conf_parser_ctx.pass == 2)
3918 <    yy_aconf->modes |= UMODE_BOTS;
3918 >    block_state.modes.value |= UMODE_FULL;
3919   }
3920 + #line 3921 "conf_parser.c" /* yacc.c:1646  */
3921      break;
3922  
3923 <  case 153:
3924 < /* Line 1787 of yacc.c  */
4020 < #line 1103 "conf_parser.y"
3923 >  case 185:
3924 > #line 1276 "conf_parser.y" /* yacc.c:1646  */
3925      {
3926    if (conf_parser_ctx.pass == 2)
3927 <    yy_aconf->modes |= UMODE_CCONN;
3927 >    block_state.modes.value |= UMODE_HIDDEN;
3928   }
3929 + #line 3930 "conf_parser.c" /* yacc.c:1646  */
3930      break;
3931  
3932 <  case 154:
3933 < /* Line 1787 of yacc.c  */
4029 < #line 1107 "conf_parser.y"
3932 >  case 186:
3933 > #line 1280 "conf_parser.y" /* yacc.c:1646  */
3934      {
3935    if (conf_parser_ctx.pass == 2)
3936 <    yy_aconf->modes |= UMODE_CCONN_FULL;
3936 >    block_state.modes.value |= UMODE_HIDECHANS;
3937   }
3938 + #line 3939 "conf_parser.c" /* yacc.c:1646  */
3939      break;
3940  
3941 <  case 155:
3942 < /* Line 1787 of yacc.c  */
4038 < #line 1111 "conf_parser.y"
3941 >  case 187:
3942 > #line 1284 "conf_parser.y" /* yacc.c:1646  */
3943      {
3944    if (conf_parser_ctx.pass == 2)
3945 <    yy_aconf->modes |= UMODE_DEAF;
3945 >    block_state.modes.value |= UMODE_HIDEIDLE;
3946   }
3947 + #line 3948 "conf_parser.c" /* yacc.c:1646  */
3948      break;
3949  
3950 <  case 156:
3951 < /* Line 1787 of yacc.c  */
4047 < #line 1115 "conf_parser.y"
3950 >  case 188:
3951 > #line 1288 "conf_parser.y" /* yacc.c:1646  */
3952      {
3953    if (conf_parser_ctx.pass == 2)
3954 <    yy_aconf->modes |= UMODE_DEBUG;
3954 >    block_state.modes.value |= UMODE_SKILL;
3955   }
3956 + #line 3957 "conf_parser.c" /* yacc.c:1646  */
3957      break;
3958  
3959 <  case 157:
3960 < /* Line 1787 of yacc.c  */
4056 < #line 1119 "conf_parser.y"
3959 >  case 189:
3960 > #line 1292 "conf_parser.y" /* yacc.c:1646  */
3961      {
3962    if (conf_parser_ctx.pass == 2)
3963 <    yy_aconf->modes |= UMODE_FULL;
3963 >    block_state.modes.value |= UMODE_NCHANGE;
3964   }
3965 + #line 3966 "conf_parser.c" /* yacc.c:1646  */
3966      break;
3967  
3968 <  case 158:
3969 < /* Line 1787 of yacc.c  */
4065 < #line 1123 "conf_parser.y"
3968 >  case 190:
3969 > #line 1296 "conf_parser.y" /* yacc.c:1646  */
3970      {
3971    if (conf_parser_ctx.pass == 2)
3972 <    yy_aconf->modes |= UMODE_HIDDEN;
3972 >    block_state.modes.value |= UMODE_REJ;
3973   }
3974 + #line 3975 "conf_parser.c" /* yacc.c:1646  */
3975      break;
3976  
3977 <  case 159:
3978 < /* Line 1787 of yacc.c  */
4074 < #line 1127 "conf_parser.y"
3977 >  case 191:
3978 > #line 1300 "conf_parser.y" /* yacc.c:1646  */
3979      {
3980    if (conf_parser_ctx.pass == 2)
3981 <    yy_aconf->modes |= UMODE_SKILL;
3981 >    block_state.modes.value |= UMODE_UNAUTH;
3982   }
3983 + #line 3984 "conf_parser.c" /* yacc.c:1646  */
3984      break;
3985  
3986 <  case 160:
3987 < /* Line 1787 of yacc.c  */
4083 < #line 1131 "conf_parser.y"
3986 >  case 192:
3987 > #line 1304 "conf_parser.y" /* yacc.c:1646  */
3988      {
3989    if (conf_parser_ctx.pass == 2)
3990 <    yy_aconf->modes |= UMODE_NCHANGE;
3990 >    block_state.modes.value |= UMODE_SPY;
3991   }
3992 + #line 3993 "conf_parser.c" /* yacc.c:1646  */
3993      break;
3994  
3995 <  case 161:
3996 < /* Line 1787 of yacc.c  */
4092 < #line 1135 "conf_parser.y"
3995 >  case 193:
3996 > #line 1308 "conf_parser.y" /* yacc.c:1646  */
3997      {
3998    if (conf_parser_ctx.pass == 2)
3999 <    yy_aconf->modes |= UMODE_REJ;
3999 >    block_state.modes.value |= UMODE_EXTERNAL;
4000   }
4001 + #line 4002 "conf_parser.c" /* yacc.c:1646  */
4002      break;
4003  
4004 <  case 162:
4005 < /* Line 1787 of yacc.c  */
4101 < #line 1139 "conf_parser.y"
4004 >  case 194:
4005 > #line 1312 "conf_parser.y" /* yacc.c:1646  */
4006      {
4007    if (conf_parser_ctx.pass == 2)
4008 <    yy_aconf->modes |= UMODE_UNAUTH;
4008 >    block_state.modes.value |= UMODE_SERVNOTICE;
4009   }
4010 + #line 4011 "conf_parser.c" /* yacc.c:1646  */
4011      break;
4012  
4013 <  case 163:
4014 < /* Line 1787 of yacc.c  */
4110 < #line 1143 "conf_parser.y"
4013 >  case 195:
4014 > #line 1316 "conf_parser.y" /* yacc.c:1646  */
4015      {
4016    if (conf_parser_ctx.pass == 2)
4017 <    yy_aconf->modes |= UMODE_SPY;
4017 >    block_state.modes.value |= UMODE_INVISIBLE;
4018   }
4019 + #line 4020 "conf_parser.c" /* yacc.c:1646  */
4020      break;
4021  
4022 <  case 164:
4023 < /* Line 1787 of yacc.c  */
4119 < #line 1147 "conf_parser.y"
4022 >  case 196:
4023 > #line 1320 "conf_parser.y" /* yacc.c:1646  */
4024      {
4025    if (conf_parser_ctx.pass == 2)
4026 <    yy_aconf->modes |= UMODE_EXTERNAL;
4026 >    block_state.modes.value |= UMODE_WALLOP;
4027   }
4028 + #line 4029 "conf_parser.c" /* yacc.c:1646  */
4029      break;
4030  
4031 <  case 165:
4032 < /* Line 1787 of yacc.c  */
4128 < #line 1151 "conf_parser.y"
4031 >  case 197:
4032 > #line 1324 "conf_parser.y" /* yacc.c:1646  */
4033      {
4034    if (conf_parser_ctx.pass == 2)
4035 <    yy_aconf->modes |= UMODE_OPERWALL;
4035 >    block_state.modes.value |= UMODE_SOFTCALLERID;
4036   }
4037 + #line 4038 "conf_parser.c" /* yacc.c:1646  */
4038      break;
4039  
4040 <  case 166:
4041 < /* Line 1787 of yacc.c  */
4137 < #line 1155 "conf_parser.y"
4040 >  case 198:
4041 > #line 1328 "conf_parser.y" /* yacc.c:1646  */
4042      {
4043    if (conf_parser_ctx.pass == 2)
4044 <    yy_aconf->modes |= UMODE_SERVNOTICE;
4044 >    block_state.modes.value |= UMODE_CALLERID;
4045   }
4046 + #line 4047 "conf_parser.c" /* yacc.c:1646  */
4047      break;
4048  
4049 <  case 167:
4050 < /* Line 1787 of yacc.c  */
4146 < #line 1159 "conf_parser.y"
4049 >  case 199:
4050 > #line 1332 "conf_parser.y" /* yacc.c:1646  */
4051      {
4052    if (conf_parser_ctx.pass == 2)
4053 <    yy_aconf->modes |= UMODE_INVISIBLE;
4053 >    block_state.modes.value |= UMODE_LOCOPS;
4054   }
4055 + #line 4056 "conf_parser.c" /* yacc.c:1646  */
4056      break;
4057  
4058 <  case 168:
4059 < /* Line 1787 of yacc.c  */
4155 < #line 1163 "conf_parser.y"
4058 >  case 200:
4059 > #line 1336 "conf_parser.y" /* yacc.c:1646  */
4060      {
4061    if (conf_parser_ctx.pass == 2)
4062 <    yy_aconf->modes |= UMODE_WALLOP;
4062 >    block_state.modes.value |= UMODE_REGONLY;
4063   }
4064 + #line 4065 "conf_parser.c" /* yacc.c:1646  */
4065      break;
4066  
4067 <  case 169:
4068 < /* Line 1787 of yacc.c  */
4164 < #line 1167 "conf_parser.y"
4067 >  case 201:
4068 > #line 1340 "conf_parser.y" /* yacc.c:1646  */
4069      {
4070    if (conf_parser_ctx.pass == 2)
4071 <    yy_aconf->modes |= UMODE_SOFTCALLERID;
4071 >    block_state.modes.value |= UMODE_FARCONNECT;
4072   }
4073 + #line 4074 "conf_parser.c" /* yacc.c:1646  */
4074      break;
4075  
4076 <  case 170:
4077 < /* Line 1787 of yacc.c  */
4173 < #line 1171 "conf_parser.y"
4076 >  case 202:
4077 > #line 1346 "conf_parser.y" /* yacc.c:1646  */
4078      {
4079    if (conf_parser_ctx.pass == 2)
4080 <    yy_aconf->modes |= UMODE_CALLERID;
4080 >    block_state.port.value = 0;
4081   }
4082 + #line 4083 "conf_parser.c" /* yacc.c:1646  */
4083      break;
4084  
4085 <  case 171:
4086 < /* Line 1787 of yacc.c  */
4182 < #line 1175 "conf_parser.y"
4085 >  case 206:
4086 > #line 1353 "conf_parser.y" /* yacc.c:1646  */
4087      {
4088    if (conf_parser_ctx.pass == 2)
4089 <    yy_aconf->modes |= UMODE_LOCOPS;
4089 >    block_state.port.value |= OPER_FLAG_KILL_REMOTE;
4090   }
4091 + #line 4092 "conf_parser.c" /* yacc.c:1646  */
4092      break;
4093  
4094 <  case 172:
4095 < /* Line 1787 of yacc.c  */
4191 < #line 1181 "conf_parser.y"
4094 >  case 207:
4095 > #line 1357 "conf_parser.y" /* yacc.c:1646  */
4096      {
4097    if (conf_parser_ctx.pass == 2)
4098 <    yy_aconf->port = 0;
4098 >    block_state.port.value |= OPER_FLAG_KILL;
4099   }
4100 + #line 4101 "conf_parser.c" /* yacc.c:1646  */
4101      break;
4102  
4103 <  case 176:
4104 < /* Line 1787 of yacc.c  */
4200 < #line 1188 "conf_parser.y"
4103 >  case 208:
4104 > #line 1361 "conf_parser.y" /* yacc.c:1646  */
4105      {
4106    if (conf_parser_ctx.pass == 2)
4107 <    yy_aconf->port |= OPER_FLAG_GLOBAL_KILL;
4107 >    block_state.port.value |= OPER_FLAG_CONNECT_REMOTE;
4108   }
4109 + #line 4110 "conf_parser.c" /* yacc.c:1646  */
4110      break;
4111  
4112 <  case 177:
4113 < /* Line 1787 of yacc.c  */
4209 < #line 1192 "conf_parser.y"
4112 >  case 209:
4113 > #line 1365 "conf_parser.y" /* yacc.c:1646  */
4114      {
4115    if (conf_parser_ctx.pass == 2)
4116 <    yy_aconf->port |= OPER_FLAG_REMOTE;
4116 >    block_state.port.value |= OPER_FLAG_CONNECT;
4117   }
4118 + #line 4119 "conf_parser.c" /* yacc.c:1646  */
4119      break;
4120  
4121 <  case 178:
4122 < /* Line 1787 of yacc.c  */
4218 < #line 1196 "conf_parser.y"
4121 >  case 210:
4122 > #line 1369 "conf_parser.y" /* yacc.c:1646  */
4123      {
4124    if (conf_parser_ctx.pass == 2)
4125 <    yy_aconf->port |= OPER_FLAG_K;
4125 >    block_state.port.value |= OPER_FLAG_SQUIT_REMOTE;
4126   }
4127 + #line 4128 "conf_parser.c" /* yacc.c:1646  */
4128      break;
4129  
4130 <  case 179:
4131 < /* Line 1787 of yacc.c  */
4227 < #line 1200 "conf_parser.y"
4130 >  case 211:
4131 > #line 1373 "conf_parser.y" /* yacc.c:1646  */
4132      {
4133    if (conf_parser_ctx.pass == 2)
4134 <    yy_aconf->port |= OPER_FLAG_UNKLINE;
4134 >    block_state.port.value |= OPER_FLAG_SQUIT;
4135   }
4136 + #line 4137 "conf_parser.c" /* yacc.c:1646  */
4137      break;
4138  
4139 <  case 180:
4140 < /* Line 1787 of yacc.c  */
4236 < #line 1204 "conf_parser.y"
4139 >  case 212:
4140 > #line 1377 "conf_parser.y" /* yacc.c:1646  */
4141      {
4142    if (conf_parser_ctx.pass == 2)
4143 <    yy_aconf->port |= OPER_FLAG_DLINE;
4143 >    block_state.port.value |= OPER_FLAG_KLINE;
4144   }
4145 + #line 4146 "conf_parser.c" /* yacc.c:1646  */
4146      break;
4147  
4148 <  case 181:
4149 < /* Line 1787 of yacc.c  */
4245 < #line 1208 "conf_parser.y"
4148 >  case 213:
4149 > #line 1381 "conf_parser.y" /* yacc.c:1646  */
4150      {
4151    if (conf_parser_ctx.pass == 2)
4152 <    yy_aconf->port |= OPER_FLAG_UNDLINE;
4152 >    block_state.port.value |= OPER_FLAG_UNKLINE;
4153   }
4154 + #line 4155 "conf_parser.c" /* yacc.c:1646  */
4155      break;
4156  
4157 <  case 182:
4158 < /* Line 1787 of yacc.c  */
4254 < #line 1212 "conf_parser.y"
4157 >  case 214:
4158 > #line 1385 "conf_parser.y" /* yacc.c:1646  */
4159      {
4160    if (conf_parser_ctx.pass == 2)
4161 <    yy_aconf->port |= OPER_FLAG_X;
4161 >    block_state.port.value |= OPER_FLAG_DLINE;
4162   }
4163 + #line 4164 "conf_parser.c" /* yacc.c:1646  */
4164      break;
4165  
4166 <  case 183:
4167 < /* Line 1787 of yacc.c  */
4263 < #line 1216 "conf_parser.y"
4166 >  case 215:
4167 > #line 1389 "conf_parser.y" /* yacc.c:1646  */
4168      {
4169    if (conf_parser_ctx.pass == 2)
4170 <    yy_aconf->port |= OPER_FLAG_GLINE;
4170 >    block_state.port.value |= OPER_FLAG_UNDLINE;
4171   }
4172 + #line 4173 "conf_parser.c" /* yacc.c:1646  */
4173      break;
4174  
4175 <  case 184:
4176 < /* Line 1787 of yacc.c  */
4272 < #line 1220 "conf_parser.y"
4175 >  case 216:
4176 > #line 1393 "conf_parser.y" /* yacc.c:1646  */
4177      {
4178    if (conf_parser_ctx.pass == 2)
4179 <    yy_aconf->port |= OPER_FLAG_DIE;
4179 >    block_state.port.value |= OPER_FLAG_XLINE;
4180   }
4181 + #line 4182 "conf_parser.c" /* yacc.c:1646  */
4182      break;
4183  
4184 <  case 185:
4185 < /* Line 1787 of yacc.c  */
4281 < #line 1224 "conf_parser.y"
4184 >  case 217:
4185 > #line 1397 "conf_parser.y" /* yacc.c:1646  */
4186      {
4187    if (conf_parser_ctx.pass == 2)
4188 <    yy_aconf->port |= OPER_FLAG_RESTART;
4188 >    block_state.port.value |= OPER_FLAG_UNXLINE;
4189   }
4190 + #line 4191 "conf_parser.c" /* yacc.c:1646  */
4191      break;
4192  
4193 <  case 186:
4194 < /* Line 1787 of yacc.c  */
4290 < #line 1228 "conf_parser.y"
4193 >  case 218:
4194 > #line 1401 "conf_parser.y" /* yacc.c:1646  */
4195      {
4196    if (conf_parser_ctx.pass == 2)
4197 <    yy_aconf->port |= OPER_FLAG_REHASH;
4197 >    block_state.port.value |= OPER_FLAG_GLINE;
4198   }
4199 + #line 4200 "conf_parser.c" /* yacc.c:1646  */
4200      break;
4201  
4202 <  case 187:
4203 < /* Line 1787 of yacc.c  */
4299 < #line 1232 "conf_parser.y"
4202 >  case 219:
4203 > #line 1405 "conf_parser.y" /* yacc.c:1646  */
4204      {
4205    if (conf_parser_ctx.pass == 2)
4206 <    yy_aconf->port |= OPER_FLAG_ADMIN;
4206 >    block_state.port.value |= OPER_FLAG_DIE;
4207   }
4208 + #line 4209 "conf_parser.c" /* yacc.c:1646  */
4209      break;
4210  
4211 <  case 188:
4212 < /* Line 1787 of yacc.c  */
4308 < #line 1236 "conf_parser.y"
4211 >  case 220:
4212 > #line 1409 "conf_parser.y" /* yacc.c:1646  */
4213      {
4214    if (conf_parser_ctx.pass == 2)
4215 <    yy_aconf->port |= OPER_FLAG_N;
4215 >    block_state.port.value |= OPER_FLAG_RESTART;
4216   }
4217 + #line 4218 "conf_parser.c" /* yacc.c:1646  */
4218      break;
4219  
4220 <  case 189:
4221 < /* Line 1787 of yacc.c  */
4317 < #line 1240 "conf_parser.y"
4220 >  case 221:
4221 > #line 1413 "conf_parser.y" /* yacc.c:1646  */
4222      {
4223    if (conf_parser_ctx.pass == 2)
4224 <    yy_aconf->port |= OPER_FLAG_OPERWALL;
4224 >    block_state.port.value |= OPER_FLAG_REHASH;
4225   }
4226 + #line 4227 "conf_parser.c" /* yacc.c:1646  */
4227      break;
4228  
4229 <  case 190:
4230 < /* Line 1787 of yacc.c  */
4326 < #line 1244 "conf_parser.y"
4229 >  case 222:
4230 > #line 1417 "conf_parser.y" /* yacc.c:1646  */
4231      {
4232    if (conf_parser_ctx.pass == 2)
4233 <    yy_aconf->port |= OPER_FLAG_GLOBOPS;
4233 >    block_state.port.value |= OPER_FLAG_ADMIN;
4234   }
4235 + #line 4236 "conf_parser.c" /* yacc.c:1646  */
4236      break;
4237  
4238 <  case 191:
4239 < /* Line 1787 of yacc.c  */
4335 < #line 1248 "conf_parser.y"
4238 >  case 223:
4239 > #line 1421 "conf_parser.y" /* yacc.c:1646  */
4240      {
4241    if (conf_parser_ctx.pass == 2)
4242 <    yy_aconf->port |= OPER_FLAG_OPER_SPY;
4242 >    block_state.port.value |= OPER_FLAG_GLOBOPS;
4243   }
4244 + #line 4245 "conf_parser.c" /* yacc.c:1646  */
4245      break;
4246  
4247 <  case 192:
4248 < /* Line 1787 of yacc.c  */
4344 < #line 1252 "conf_parser.y"
4247 >  case 224:
4248 > #line 1425 "conf_parser.y" /* yacc.c:1646  */
4249      {
4250    if (conf_parser_ctx.pass == 2)
4251 <    yy_aconf->port |= OPER_FLAG_REMOTEBAN;
4251 >    block_state.port.value |= OPER_FLAG_WALLOPS;
4252   }
4253 + #line 4254 "conf_parser.c" /* yacc.c:1646  */
4254      break;
4255  
4256 <  case 193:
4257 < /* Line 1787 of yacc.c  */
4353 < #line 1256 "conf_parser.y"
4256 >  case 225:
4257 > #line 1429 "conf_parser.y" /* yacc.c:1646  */
4258      {
4259    if (conf_parser_ctx.pass == 2)
4260 <    yy_aconf->port |= OPER_FLAG_SET;
4260 >    block_state.port.value |= OPER_FLAG_LOCOPS;
4261   }
4262 + #line 4263 "conf_parser.c" /* yacc.c:1646  */
4263      break;
4264  
4265 <  case 194:
4266 < /* Line 1787 of yacc.c  */
4362 < #line 1260 "conf_parser.y"
4265 >  case 226:
4266 > #line 1433 "conf_parser.y" /* yacc.c:1646  */
4267      {
4268    if (conf_parser_ctx.pass == 2)
4269 <    yy_aconf->port |= OPER_FLAG_MODULE;
4269 >    block_state.port.value |= OPER_FLAG_REMOTEBAN;
4270   }
4271 + #line 4272 "conf_parser.c" /* yacc.c:1646  */
4272      break;
4273  
4274 <  case 195:
4275 < /* Line 1787 of yacc.c  */
4371 < #line 1270 "conf_parser.y"
4274 >  case 227:
4275 > #line 1437 "conf_parser.y" /* yacc.c:1646  */
4276      {
4277 <  if (conf_parser_ctx.pass == 1)
4278 <  {
4375 <    yy_conf = make_conf_item(CLASS_TYPE);
4376 <    yy_class = map_to_conf(yy_conf);
4377 <  }
4277 >  if (conf_parser_ctx.pass == 2)
4278 >    block_state.port.value |= OPER_FLAG_SET;
4279   }
4280 + #line 4281 "conf_parser.c" /* yacc.c:1646  */
4281      break;
4282  
4283 <  case 196:
4284 < /* Line 1787 of yacc.c  */
4383 < #line 1277 "conf_parser.y"
4283 >  case 228:
4284 > #line 1441 "conf_parser.y" /* yacc.c:1646  */
4285      {
4286 <  if (conf_parser_ctx.pass == 1)
4287 <  {
4288 <    struct ConfItem *cconf = NULL;
4289 <    struct ClassItem *class = NULL;
4286 >  if (conf_parser_ctx.pass == 2)
4287 >    block_state.port.value |= OPER_FLAG_MODULE;
4288 > }
4289 > #line 4290 "conf_parser.c" /* yacc.c:1646  */
4290 >    break;
4291  
4292 <    if (yy_class_name == NULL)
4293 <      delete_conf_item(yy_conf);
4392 <    else
4292 >  case 229:
4293 > #line 1451 "conf_parser.y" /* yacc.c:1646  */
4294      {
4295 <      cconf = find_exact_name_conf(CLASS_TYPE, NULL, yy_class_name, NULL, NULL);
4295 >  if (conf_parser_ctx.pass != 1)
4296 >    break;
4297  
4298 <      if (cconf != NULL)                /* The class existed already */
4397 <      {
4398 <        int user_count = 0;
4298 >  reset_block_state();
4299  
4300 <        rebuild_cidr_class(cconf, yy_class);
4300 >  block_state.ping_freq.value = DEFAULT_PINGFREQUENCY;
4301 >  block_state.con_freq.value  = DEFAULT_CONNECTFREQUENCY;
4302 >  block_state.max_total.value = MAXIMUM_LINKS_DEFAULT;
4303 >  block_state.max_sendq.value = DEFAULT_SENDQ;
4304 >  block_state.max_recvq.value = DEFAULT_RECVQ;
4305 > }
4306 > #line 4307 "conf_parser.c" /* yacc.c:1646  */
4307 >    break;
4308  
4309 <        class = map_to_conf(cconf);
4309 >  case 230:
4310 > #line 1463 "conf_parser.y" /* yacc.c:1646  */
4311 >    {
4312 >  struct ClassItem *class = NULL;
4313  
4314 <        user_count = class->curr_user_count;
4315 <        memcpy(class, yy_class, sizeof(*class));
4406 <        class->curr_user_count = user_count;
4407 <        class->active = 1;
4314 >  if (conf_parser_ctx.pass != 1)
4315 >    break;
4316  
4317 <        delete_conf_item(yy_conf);
4317 >  if (!block_state.class.buf[0])
4318 >    break;
4319  
4320 <        MyFree(cconf->name);            /* Allows case change of class name */
4321 <        cconf->name = yy_class_name;
4413 <      }
4414 <      else      /* Brand new class */
4415 <      {
4416 <        MyFree(yy_conf->name);          /* just in case it was allocated */
4417 <        yy_conf->name = yy_class_name;
4418 <        yy_class->active = 1;
4419 <      }
4420 <    }
4320 >  if (!(class = class_find(block_state.class.buf, 0)))
4321 >    class = class_make();
4322  
4323 <    yy_class_name = NULL;
4323 >  class->active = 1;
4324 >  MyFree(class->name);
4325 >  class->name = xstrdup(block_state.class.buf);
4326 >  class->ping_freq = block_state.ping_freq.value;
4327 >  class->max_perip = block_state.max_perip.value;
4328 >  class->con_freq = block_state.con_freq.value;
4329 >  class->max_total = block_state.max_total.value;
4330 >  class->max_global = block_state.max_global.value;
4331 >  class->max_local = block_state.max_local.value;
4332 >  class->max_ident = block_state.max_ident.value;
4333 >  class->max_sendq = block_state.max_sendq.value;
4334 >  class->max_recvq = block_state.max_recvq.value;
4335 >  class->max_channels = block_state.max_channels.value;
4336 >
4337 >  if (block_state.min_idle.value > block_state.max_idle.value)
4338 >  {
4339 >    block_state.min_idle.value = 0;
4340 >    block_state.max_idle.value = 0;
4341 >    block_state.flags.value &= ~CLASS_FLAGS_FAKE_IDLE;
4342    }
4343 +
4344 +  class->flags = block_state.flags.value;
4345 +  class->min_idle = block_state.min_idle.value;
4346 +  class->max_idle = block_state.max_idle.value;
4347 +
4348 +  if (class->number_per_cidr && block_state.number_per_cidr.value)
4349 +    if ((class->cidr_bitlen_ipv4 && block_state.cidr_bitlen_ipv4.value) ||
4350 +        (class->cidr_bitlen_ipv6 && block_state.cidr_bitlen_ipv6.value))
4351 +      if ((class->cidr_bitlen_ipv4 != block_state.cidr_bitlen_ipv4.value) ||
4352 +          (class->cidr_bitlen_ipv6 != block_state.cidr_bitlen_ipv6.value))
4353 +        rebuild_cidr_list(class);
4354 +
4355 +  class->cidr_bitlen_ipv4 = block_state.cidr_bitlen_ipv4.value;
4356 +  class->cidr_bitlen_ipv6 = block_state.cidr_bitlen_ipv6.value;
4357 +  class->number_per_cidr = block_state.number_per_cidr.value;
4358   }
4359 + #line 4360 "conf_parser.c" /* yacc.c:1646  */
4360      break;
4361  
4362 <  case 214:
4363 < /* Line 1787 of yacc.c  */
4429 < #line 1335 "conf_parser.y"
4362 >  case 251:
4363 > #line 1532 "conf_parser.y" /* yacc.c:1646  */
4364      {
4365    if (conf_parser_ctx.pass == 1)
4366 <  {
4433 <    MyFree(yy_class_name);
4434 <    DupString(yy_class_name, yylval.string);
4435 <  }
4366 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4367   }
4368 + #line 4369 "conf_parser.c" /* yacc.c:1646  */
4369      break;
4370  
4371 <  case 215:
4372 < /* Line 1787 of yacc.c  */
4441 < #line 1344 "conf_parser.y"
4371 >  case 252:
4372 > #line 1538 "conf_parser.y" /* yacc.c:1646  */
4373      {
4374    if (conf_parser_ctx.pass == 1)
4375 <    yy_class->ping_freq = (yyvsp[(3) - (4)].number);
4375 >    block_state.ping_freq.value = (yyvsp[-1].number);
4376   }
4377 + #line 4378 "conf_parser.c" /* yacc.c:1646  */
4378      break;
4379  
4380 <  case 216:
4381 < /* Line 1787 of yacc.c  */
4450 < #line 1350 "conf_parser.y"
4380 >  case 253:
4381 > #line 1544 "conf_parser.y" /* yacc.c:1646  */
4382      {
4383    if (conf_parser_ctx.pass == 1)
4384 <    yy_class->ping_warning = (yyvsp[(3) - (4)].number);
4384 >    block_state.max_perip.value = (yyvsp[-1].number);
4385   }
4386 + #line 4387 "conf_parser.c" /* yacc.c:1646  */
4387      break;
4388  
4389 <  case 217:
4390 < /* Line 1787 of yacc.c  */
4459 < #line 1356 "conf_parser.y"
4389 >  case 254:
4390 > #line 1550 "conf_parser.y" /* yacc.c:1646  */
4391      {
4392    if (conf_parser_ctx.pass == 1)
4393 <    yy_class->max_perip = (yyvsp[(3) - (4)].number);
4393 >    block_state.con_freq.value = (yyvsp[-1].number);
4394   }
4395 + #line 4396 "conf_parser.c" /* yacc.c:1646  */
4396      break;
4397  
4398 <  case 218:
4399 < /* Line 1787 of yacc.c  */
4468 < #line 1362 "conf_parser.y"
4398 >  case 255:
4399 > #line 1556 "conf_parser.y" /* yacc.c:1646  */
4400      {
4401    if (conf_parser_ctx.pass == 1)
4402 <    yy_class->con_freq = (yyvsp[(3) - (4)].number);
4402 >    block_state.max_channels.value = (yyvsp[-1].number);
4403   }
4404 + #line 4405 "conf_parser.c" /* yacc.c:1646  */
4405      break;
4406  
4407 <  case 219:
4408 < /* Line 1787 of yacc.c  */
4477 < #line 1368 "conf_parser.y"
4407 >  case 256:
4408 > #line 1562 "conf_parser.y" /* yacc.c:1646  */
4409      {
4410    if (conf_parser_ctx.pass == 1)
4411 <    yy_class->max_total = (yyvsp[(3) - (4)].number);
4411 >    block_state.max_total.value = (yyvsp[-1].number);
4412   }
4413 + #line 4414 "conf_parser.c" /* yacc.c:1646  */
4414      break;
4415  
4416 <  case 220:
4417 < /* Line 1787 of yacc.c  */
4486 < #line 1374 "conf_parser.y"
4416 >  case 257:
4417 > #line 1568 "conf_parser.y" /* yacc.c:1646  */
4418      {
4419    if (conf_parser_ctx.pass == 1)
4420 <    yy_class->max_global = (yyvsp[(3) - (4)].number);
4420 >    block_state.max_global.value = (yyvsp[-1].number);
4421   }
4422 + #line 4423 "conf_parser.c" /* yacc.c:1646  */
4423      break;
4424  
4425 <  case 221:
4426 < /* Line 1787 of yacc.c  */
4495 < #line 1380 "conf_parser.y"
4425 >  case 258:
4426 > #line 1574 "conf_parser.y" /* yacc.c:1646  */
4427      {
4428    if (conf_parser_ctx.pass == 1)
4429 <    yy_class->max_local = (yyvsp[(3) - (4)].number);
4429 >    block_state.max_local.value = (yyvsp[-1].number);
4430   }
4431 + #line 4432 "conf_parser.c" /* yacc.c:1646  */
4432      break;
4433  
4434 <  case 222:
4435 < /* Line 1787 of yacc.c  */
4504 < #line 1386 "conf_parser.y"
4434 >  case 259:
4435 > #line 1580 "conf_parser.y" /* yacc.c:1646  */
4436      {
4437    if (conf_parser_ctx.pass == 1)
4438 <    yy_class->max_ident = (yyvsp[(3) - (4)].number);
4438 >    block_state.max_ident.value = (yyvsp[-1].number);
4439   }
4440 + #line 4441 "conf_parser.c" /* yacc.c:1646  */
4441      break;
4442  
4443 <  case 223:
4444 < /* Line 1787 of yacc.c  */
4513 < #line 1392 "conf_parser.y"
4443 >  case 260:
4444 > #line 1586 "conf_parser.y" /* yacc.c:1646  */
4445      {
4446    if (conf_parser_ctx.pass == 1)
4447 <    yy_class->max_sendq = (yyvsp[(3) - (4)].number);
4447 >    block_state.max_sendq.value = (yyvsp[-1].number);
4448   }
4449 + #line 4450 "conf_parser.c" /* yacc.c:1646  */
4450      break;
4451  
4452 <  case 224:
4453 < /* Line 1787 of yacc.c  */
4522 < #line 1398 "conf_parser.y"
4452 >  case 261:
4453 > #line 1592 "conf_parser.y" /* yacc.c:1646  */
4454      {
4455    if (conf_parser_ctx.pass == 1)
4456 <    if ((yyvsp[(3) - (4)].number) >= CLIENT_FLOOD_MIN && (yyvsp[(3) - (4)].number) <= CLIENT_FLOOD_MAX)
4457 <      yy_class->max_recvq = (yyvsp[(3) - (4)].number);
4456 >    if ((yyvsp[-1].number) >= CLIENT_FLOOD_MIN && (yyvsp[-1].number) <= CLIENT_FLOOD_MAX)
4457 >      block_state.max_recvq.value = (yyvsp[-1].number);
4458   }
4459 + #line 4460 "conf_parser.c" /* yacc.c:1646  */
4460      break;
4461  
4462 <  case 225:
4463 < /* Line 1787 of yacc.c  */
4532 < #line 1405 "conf_parser.y"
4462 >  case 262:
4463 > #line 1599 "conf_parser.y" /* yacc.c:1646  */
4464      {
4465    if (conf_parser_ctx.pass == 1)
4466 <    yy_class->cidr_bitlen_ipv4 = (yyvsp[(3) - (4)].number) > 32 ? 32 : (yyvsp[(3) - (4)].number);
4466 >    block_state.cidr_bitlen_ipv4.value = (yyvsp[-1].number) > 32 ? 32 : (yyvsp[-1].number);
4467   }
4468 + #line 4469 "conf_parser.c" /* yacc.c:1646  */
4469      break;
4470  
4471 <  case 226:
4472 < /* Line 1787 of yacc.c  */
4541 < #line 1411 "conf_parser.y"
4471 >  case 263:
4472 > #line 1605 "conf_parser.y" /* yacc.c:1646  */
4473      {
4474    if (conf_parser_ctx.pass == 1)
4475 <    yy_class->cidr_bitlen_ipv6 = (yyvsp[(3) - (4)].number) > 128 ? 128 : (yyvsp[(3) - (4)].number);
4475 >    block_state.cidr_bitlen_ipv6.value = (yyvsp[-1].number) > 128 ? 128 : (yyvsp[-1].number);
4476   }
4477 + #line 4478 "conf_parser.c" /* yacc.c:1646  */
4478      break;
4479  
4480 <  case 227:
4481 < /* Line 1787 of yacc.c  */
4550 < #line 1417 "conf_parser.y"
4480 >  case 264:
4481 > #line 1611 "conf_parser.y" /* yacc.c:1646  */
4482      {
4483    if (conf_parser_ctx.pass == 1)
4484 <    yy_class->number_per_cidr = (yyvsp[(3) - (4)].number);
4484 >    block_state.number_per_cidr.value = (yyvsp[-1].number);
4485   }
4486 + #line 4487 "conf_parser.c" /* yacc.c:1646  */
4487      break;
4488  
4489 <  case 228:
4490 < /* Line 1787 of yacc.c  */
4559 < #line 1426 "conf_parser.y"
4489 >  case 265:
4490 > #line 1617 "conf_parser.y" /* yacc.c:1646  */
4491      {
4492 <  if (conf_parser_ctx.pass == 2)
4493 <  {
4494 <    listener_address = NULL;
4495 <    listener_flags = 0;
4496 <  }
4492 >  if (conf_parser_ctx.pass != 1)
4493 >    break;
4494 >
4495 >  block_state.min_idle.value = (yyvsp[-1].number);
4496 >  block_state.flags.value |= CLASS_FLAGS_FAKE_IDLE;
4497   }
4498 + #line 4499 "conf_parser.c" /* yacc.c:1646  */
4499      break;
4500  
4501 <  case 229:
4502 < /* Line 1787 of yacc.c  */
4571 < #line 1433 "conf_parser.y"
4501 >  case 266:
4502 > #line 1626 "conf_parser.y" /* yacc.c:1646  */
4503      {
4504 <  if (conf_parser_ctx.pass == 2)
4505 <  {
4506 <    MyFree(listener_address);
4507 <    listener_address = NULL;
4508 <  }
4504 >  if (conf_parser_ctx.pass != 1)
4505 >    break;
4506 >
4507 >  block_state.max_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 <  case 230:
4514 < /* Line 1787 of yacc.c  */
4583 < #line 1442 "conf_parser.y"
4513 >  case 267:
4514 > #line 1635 "conf_parser.y" /* yacc.c:1646  */
4515      {
4516 <  listener_flags = 0;
4516 >  if (conf_parser_ctx.pass == 1)
4517 >    block_state.flags.value &= CLASS_FLAGS_FAKE_IDLE;
4518   }
4519 + #line 4520 "conf_parser.c" /* yacc.c:1646  */
4520      break;
4521  
4522 <  case 234:
4523 < /* Line 1787 of yacc.c  */
4591 < #line 1448 "conf_parser.y"
4522 >  case 271:
4523 > #line 1642 "conf_parser.y" /* yacc.c:1646  */
4524      {
4525 <  if (conf_parser_ctx.pass == 2)
4526 <    listener_flags |= LISTENER_SSL;
4525 >  if (conf_parser_ctx.pass == 1)
4526 >    block_state.flags.value |= CLASS_FLAGS_RANDOM_IDLE;
4527   }
4528 + #line 4529 "conf_parser.c" /* yacc.c:1646  */
4529      break;
4530  
4531 <  case 235:
4532 < /* Line 1787 of yacc.c  */
4600 < #line 1452 "conf_parser.y"
4531 >  case 272:
4532 > #line 1646 "conf_parser.y" /* yacc.c:1646  */
4533      {
4534 <  if (conf_parser_ctx.pass == 2)
4535 <    listener_flags |= LISTENER_HIDDEN;
4534 >  if (conf_parser_ctx.pass == 1)
4535 >    block_state.flags.value |= CLASS_FLAGS_HIDE_IDLE_FROM_OPERS;
4536   }
4537 + #line 4538 "conf_parser.c" /* yacc.c:1646  */
4538      break;
4539  
4540 <  case 236:
4541 < /* Line 1787 of yacc.c  */
4609 < #line 1456 "conf_parser.y"
4540 >  case 273:
4541 > #line 1656 "conf_parser.y" /* yacc.c:1646  */
4542      {
4543    if (conf_parser_ctx.pass == 2)
4544 <    listener_flags |= LISTENER_SERVER;
4544 >    reset_block_state();
4545   }
4546 + #line 4547 "conf_parser.c" /* yacc.c:1646  */
4547      break;
4548  
4549 <  case 244:
4550 < /* Line 1787 of yacc.c  */
4551 < #line 1466 "conf_parser.y"
4552 <    { listener_flags = 0; }
4549 >  case 275:
4550 > #line 1662 "conf_parser.y" /* yacc.c:1646  */
4551 >    {
4552 >  block_state.flags.value = 0;
4553 > }
4554 > #line 4555 "conf_parser.c" /* yacc.c:1646  */
4555      break;
4556  
4557 <  case 248:
4558 < /* Line 1787 of yacc.c  */
4624 < #line 1471 "conf_parser.y"
4557 >  case 279:
4558 > #line 1668 "conf_parser.y" /* yacc.c:1646  */
4559      {
4560    if (conf_parser_ctx.pass == 2)
4561 <  {
4628 <    if ((listener_flags & LISTENER_SSL))
4629 < #ifdef HAVE_LIBCRYPTO
4630 <      if (!ServerInfo.server_ctx)
4631 < #endif
4632 <      {
4633 <        yyerror("SSL not available - port closed");
4634 <        break;
4635 <      }
4636 <    add_listener((yyvsp[(1) - (1)].number), listener_address, listener_flags);
4637 <  }
4561 >    block_state.flags.value |= LISTENER_SSL;
4562   }
4563 + #line 4564 "conf_parser.c" /* yacc.c:1646  */
4564      break;
4565  
4566 <  case 249:
4567 < /* Line 1787 of yacc.c  */
4643 < #line 1485 "conf_parser.y"
4566 >  case 280:
4567 > #line 1672 "conf_parser.y" /* yacc.c:1646  */
4568      {
4569    if (conf_parser_ctx.pass == 2)
4570 <  {
4647 <    int i;
4648 <
4649 <    if ((listener_flags & LISTENER_SSL))
4650 < #ifdef HAVE_LIBCRYPTO
4651 <      if (!ServerInfo.server_ctx)
4652 < #endif
4653 <      {
4654 <        yyerror("SSL not available - port closed");
4655 <        break;
4656 <      }
4657 <
4658 <    for (i = (yyvsp[(1) - (3)].number); i <= (yyvsp[(3) - (3)].number); ++i)
4659 <      add_listener(i, listener_address, listener_flags);
4660 <  }
4570 >    block_state.flags.value |= LISTENER_HIDDEN;
4571   }
4572 + #line 4573 "conf_parser.c" /* yacc.c:1646  */
4573      break;
4574  
4575 <  case 250:
4576 < /* Line 1787 of yacc.c  */
4666 < #line 1505 "conf_parser.y"
4575 >  case 281:
4576 > #line 1676 "conf_parser.y" /* yacc.c:1646  */
4577      {
4578    if (conf_parser_ctx.pass == 2)
4579 <  {
4670 <    MyFree(listener_address);
4671 <    DupString(listener_address, yylval.string);
4672 <  }
4579 >   block_state.flags.value |= LISTENER_SERVER;
4580   }
4581 + #line 4582 "conf_parser.c" /* yacc.c:1646  */
4582      break;
4583  
4584 <  case 251:
4585 < /* Line 1787 of yacc.c  */
4586 < #line 1514 "conf_parser.y"
4584 >  case 289:
4585 > #line 1684 "conf_parser.y" /* yacc.c:1646  */
4586 >    { block_state.flags.value = 0; }
4587 > #line 4588 "conf_parser.c" /* yacc.c:1646  */
4588 >    break;
4589 >
4590 >  case 293:
4591 > #line 1689 "conf_parser.y" /* yacc.c:1646  */
4592      {
4593    if (conf_parser_ctx.pass == 2)
4594    {
4595 <    MyFree(listener_address);
4596 <    DupString(listener_address, yylval.string);
4595 > #ifndef HAVE_LIBCRYPTO
4596 >    if (block_state.flags.value & LISTENER_SSL)
4597 >    {
4598 >      conf_error_report("SSL not available - port closed");
4599 >      break;
4600 >    }
4601 > #endif
4602 >    add_listener((yyvsp[0].number), block_state.addr.buf, block_state.flags.value);
4603    }
4604   }
4605 + #line 4606 "conf_parser.c" /* yacc.c:1646  */
4606      break;
4607  
4608 <  case 252:
4609 < /* Line 1787 of yacc.c  */
4690 < #line 1526 "conf_parser.y"
4608 >  case 294:
4609 > #line 1702 "conf_parser.y" /* yacc.c:1646  */
4610      {
4611    if (conf_parser_ctx.pass == 2)
4612    {
4613 <    yy_conf = make_conf_item(CLIENT_TYPE);
4614 <    yy_aconf = map_to_conf(yy_conf);
4615 <  }
4616 <  else
4617 <  {
4618 <    MyFree(class_name);
4619 <    class_name = NULL;
4613 > #ifndef HAVE_LIBCRYPTO
4614 >    if (block_state.flags.value & LISTENER_SSL)
4615 >    {
4616 >      conf_error_report("SSL not available - port closed");
4617 >      break;
4618 >    }
4619 > #endif
4620 >
4621 >    for (int i = (yyvsp[-2].number); i <= (yyvsp[0].number); ++i)
4622 >      add_listener(i, block_state.addr.buf, block_state.flags.value);
4623    }
4624   }
4625 + #line 4626 "conf_parser.c" /* yacc.c:1646  */
4626      break;
4627  
4628 <  case 253:
4629 < /* Line 1787 of yacc.c  */
4707 < #line 1538 "conf_parser.y"
4628 >  case 295:
4629 > #line 1719 "conf_parser.y" /* yacc.c:1646  */
4630      {
4631    if (conf_parser_ctx.pass == 2)
4632 <  {
4633 <    struct CollectItem *yy_tmp = NULL;
4634 <    dlink_node *ptr = NULL, *next_ptr = NULL;
4632 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4633 > }
4634 > #line 4635 "conf_parser.c" /* yacc.c:1646  */
4635 >    break;
4636  
4637 <    if (yy_aconf->user && yy_aconf->host)
4637 >  case 296:
4638 > #line 1725 "conf_parser.y" /* yacc.c:1646  */
4639      {
4640 <      conf_add_class_to_conf(yy_conf, class_name);
4641 <      add_conf_by_address(CONF_CLIENT, yy_aconf);
4642 <    }
4643 <    else
4644 <      delete_conf_item(yy_conf);
4640 >  if (conf_parser_ctx.pass == 2)
4641 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
4642 > }
4643 > #line 4644 "conf_parser.c" /* yacc.c:1646  */
4644 >    break;
4645  
4646 <    /* copy over settings from first struct */
4647 <    DLINK_FOREACH_SAFE(ptr, next_ptr, col_conf_list.head)
4646 >  case 297:
4647 > #line 1734 "conf_parser.y" /* yacc.c:1646  */
4648      {
4649 <      struct AccessItem *new_aconf;
4650 <      struct ConfItem *new_conf;
4727 <
4728 <      new_conf = make_conf_item(CLIENT_TYPE);
4729 <      new_aconf = map_to_conf(new_conf);
4730 <
4731 <      yy_tmp = ptr->data;
4732 <
4733 <      assert(yy_tmp->user && yy_tmp->host);
4734 <
4735 <      if (yy_aconf->passwd != NULL)
4736 <        DupString(new_aconf->passwd, yy_aconf->passwd);
4737 <      if (yy_conf->name != NULL)
4738 <        DupString(new_conf->name, yy_conf->name);
4739 <      if (yy_aconf->passwd != NULL)
4740 <        DupString(new_aconf->passwd, yy_aconf->passwd);
4741 <
4742 <      new_aconf->flags = yy_aconf->flags;
4743 <      new_aconf->port  = yy_aconf->port;
4744 <
4745 <      DupString(new_aconf->user, yy_tmp->user);
4746 <      collapse(new_aconf->user);
4747 <
4748 <      DupString(new_aconf->host, yy_tmp->host);
4749 <      collapse(new_aconf->host);
4750 <
4751 <      conf_add_class_to_conf(new_conf, class_name);
4752 <      add_conf_by_address(CONF_CLIENT, new_aconf);
4753 <      dlinkDelete(&yy_tmp->node, &col_conf_list);
4754 <      free_collect_item(yy_tmp);
4755 <    }
4756 <
4757 <    MyFree(class_name);
4758 <    class_name = NULL;
4759 <    yy_conf = NULL;
4760 <    yy_aconf = NULL;
4761 <  }
4649 >  if (conf_parser_ctx.pass == 2)
4650 >    reset_block_state();
4651   }
4652 + #line 4653 "conf_parser.c" /* yacc.c:1646  */
4653      break;
4654  
4655 <  case 265:
4656 < /* Line 1787 of yacc.c  */
4767 < #line 1600 "conf_parser.y"
4655 >  case 298:
4656 > #line 1738 "conf_parser.y" /* yacc.c:1646  */
4657      {
4658 <  if (conf_parser_ctx.pass == 2)
4658 >  dlink_node *node = NULL;
4659 >
4660 >  if (conf_parser_ctx.pass != 2)
4661 >    break;
4662 >
4663 >  DLINK_FOREACH(node, block_state.mask.list.head)
4664    {
4665 <    struct CollectItem *yy_tmp = NULL;
4665 >    struct MaskItem *conf = NULL;
4666      struct split_nuh_item nuh;
4667  
4668 <    nuh.nuhmask  = yylval.string;
4668 >    nuh.nuhmask  = node->data;
4669      nuh.nickptr  = NULL;
4670 <    nuh.userptr  = userbuf;
4671 <    nuh.hostptr  = hostbuf;
4778 <
4670 >    nuh.userptr  = block_state.user.buf;
4671 >    nuh.hostptr  = block_state.host.buf;
4672      nuh.nicksize = 0;
4673 <    nuh.usersize = sizeof(userbuf);
4674 <    nuh.hostsize = sizeof(hostbuf);
4782 <
4673 >    nuh.usersize = sizeof(block_state.user.buf);
4674 >    nuh.hostsize = sizeof(block_state.host.buf);
4675      split_nuh(&nuh);
4676  
4677 <    if (yy_aconf->user == NULL)
4678 <    {
4679 <      DupString(yy_aconf->user, userbuf);
4788 <      DupString(yy_aconf->host, hostbuf);
4789 <    }
4790 <    else
4791 <    {
4792 <      yy_tmp = MyMalloc(sizeof(struct CollectItem));
4677 >    conf        = conf_make(CONF_CLIENT);
4678 >    conf->user  = xstrdup(block_state.user.buf);
4679 >    conf->host  = xstrdup(block_state.host.buf);
4680  
4681 <      DupString(yy_tmp->user, userbuf);
4682 <      DupString(yy_tmp->host, hostbuf);
4681 >    if (block_state.rpass.buf[0])
4682 >      conf->passwd = xstrdup(block_state.rpass.buf);
4683 >    if (block_state.name.buf[0])
4684 >      conf->name = xstrdup(block_state.name.buf);
4685  
4686 <      dlinkAdd(yy_tmp, &yy_tmp->node, &col_conf_list);
4687 <    }
4686 >    conf->flags = block_state.flags.value;
4687 >    conf->port  = block_state.port.value;
4688 >
4689 >    conf_add_class_to_conf(conf, block_state.class.buf);
4690 >    add_conf_by_address(CONF_CLIENT, conf);
4691    }
4692   }
4693 + #line 4694 "conf_parser.c" /* yacc.c:1646  */
4694      break;
4695  
4696 <  case 266:
4697 < /* Line 1787 of yacc.c  */
4805 < #line 1635 "conf_parser.y"
4696 >  case 310:
4697 > #line 1787 "conf_parser.y" /* yacc.c:1646  */
4698      {
4699    if (conf_parser_ctx.pass == 2)
4700 <  {
4701 <    /* be paranoid */
4702 <    if (yy_aconf->passwd != NULL)
4703 <      memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
4700 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4701 > }
4702 > #line 4703 "conf_parser.c" /* yacc.c:1646  */
4703 >    break;
4704  
4705 <    MyFree(yy_aconf->passwd);
4706 <    DupString(yy_aconf->passwd, yylval.string);
4707 <  }
4705 >  case 311:
4706 > #line 1793 "conf_parser.y" /* yacc.c:1646  */
4707 >    {
4708 >  if (conf_parser_ctx.pass == 2)
4709 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4710   }
4711 + #line 4712 "conf_parser.c" /* yacc.c:1646  */
4712      break;
4713  
4714 <  case 267:
4715 < /* Line 1787 of yacc.c  */
4821 < #line 1648 "conf_parser.y"
4714 >  case 312:
4715 > #line 1799 "conf_parser.y" /* yacc.c:1646  */
4716      {
4717    if (conf_parser_ctx.pass == 2)
4718 <  {
4825 <    MyFree(class_name);
4826 <    DupString(class_name, yylval.string);
4827 <  }
4718 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
4719   }
4720 + #line 4721 "conf_parser.c" /* yacc.c:1646  */
4721      break;
4722  
4723 <  case 268:
4724 < /* Line 1787 of yacc.c  */
4833 < #line 1657 "conf_parser.y"
4723 >  case 313:
4724 > #line 1805 "conf_parser.y" /* yacc.c:1646  */
4725      {
4726    if (conf_parser_ctx.pass == 2)
4727    {
4728      if (yylval.number)
4729 <      SetConfEncrypted(yy_aconf);
4729 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
4730      else
4731 <      ClearConfEncrypted(yy_aconf);
4731 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
4732    }
4733   }
4734 + #line 4735 "conf_parser.c" /* yacc.c:1646  */
4735      break;
4736  
4737 <  case 269:
4738 < /* Line 1787 of yacc.c  */
4847 < #line 1668 "conf_parser.y"
4737 >  case 314:
4738 > #line 1816 "conf_parser.y" /* yacc.c:1646  */
4739      {
4740 +  if (conf_parser_ctx.pass == 2)
4741 +    block_state.flags.value &= (CONF_FLAGS_ENCRYPTED | CONF_FLAGS_SPOOF_IP);
4742   }
4743 + #line 4744 "conf_parser.c" /* yacc.c:1646  */
4744      break;
4745  
4746 <  case 273:
4747 < /* Line 1787 of yacc.c  */
4854 < #line 1673 "conf_parser.y"
4746 >  case 318:
4747 > #line 1823 "conf_parser.y" /* yacc.c:1646  */
4748      {
4749    if (conf_parser_ctx.pass == 2)
4750 <    yy_aconf->flags |= CONF_FLAGS_SPOOF_NOTICE;
4750 >    block_state.flags.value |= CONF_FLAGS_SPOOF_NOTICE;
4751   }
4752 + #line 4753 "conf_parser.c" /* yacc.c:1646  */
4753      break;
4754  
4755 <  case 274:
4756 < /* Line 1787 of yacc.c  */
4863 < #line 1677 "conf_parser.y"
4755 >  case 319:
4756 > #line 1827 "conf_parser.y" /* yacc.c:1646  */
4757      {
4758    if (conf_parser_ctx.pass == 2)
4759 <    yy_aconf->flags |= CONF_FLAGS_NOLIMIT;
4759 >    block_state.flags.value |= CONF_FLAGS_NOLIMIT;
4760   }
4761 + #line 4762 "conf_parser.c" /* yacc.c:1646  */
4762      break;
4763  
4764 <  case 275:
4765 < /* Line 1787 of yacc.c  */
4872 < #line 1681 "conf_parser.y"
4764 >  case 320:
4765 > #line 1831 "conf_parser.y" /* yacc.c:1646  */
4766      {
4767    if (conf_parser_ctx.pass == 2)
4768 <    yy_aconf->flags |= CONF_FLAGS_EXEMPTKLINE;
4768 >    block_state.flags.value |= CONF_FLAGS_EXEMPTKLINE;
4769   }
4770 + #line 4771 "conf_parser.c" /* yacc.c:1646  */
4771      break;
4772  
4773 <  case 276:
4774 < /* Line 1787 of yacc.c  */
4881 < #line 1685 "conf_parser.y"
4773 >  case 321:
4774 > #line 1835 "conf_parser.y" /* yacc.c:1646  */
4775      {
4776    if (conf_parser_ctx.pass == 2)
4777 <    yy_aconf->flags |= CONF_FLAGS_NEED_IDENTD;
4777 >    block_state.flags.value |= CONF_FLAGS_NEED_IDENTD;
4778   }
4779 + #line 4780 "conf_parser.c" /* yacc.c:1646  */
4780      break;
4781  
4782 <  case 277:
4783 < /* Line 1787 of yacc.c  */
4890 < #line 1689 "conf_parser.y"
4782 >  case 322:
4783 > #line 1839 "conf_parser.y" /* yacc.c:1646  */
4784      {
4785    if (conf_parser_ctx.pass == 2)
4786 <    yy_aconf->flags |= CONF_FLAGS_CAN_FLOOD;
4786 >    block_state.flags.value |= CONF_FLAGS_CAN_FLOOD;
4787   }
4788 + #line 4789 "conf_parser.c" /* yacc.c:1646  */
4789      break;
4790  
4791 <  case 278:
4792 < /* Line 1787 of yacc.c  */
4899 < #line 1693 "conf_parser.y"
4791 >  case 323:
4792 > #line 1843 "conf_parser.y" /* yacc.c:1646  */
4793      {
4794    if (conf_parser_ctx.pass == 2)
4795 <    yy_aconf->flags |= CONF_FLAGS_NO_TILDE;
4795 >    block_state.flags.value |= CONF_FLAGS_NO_TILDE;
4796   }
4797 + #line 4798 "conf_parser.c" /* yacc.c:1646  */
4798      break;
4799  
4800 <  case 279:
4801 < /* Line 1787 of yacc.c  */
4908 < #line 1697 "conf_parser.y"
4800 >  case 324:
4801 > #line 1847 "conf_parser.y" /* yacc.c:1646  */
4802      {
4803    if (conf_parser_ctx.pass == 2)
4804 <    yy_aconf->flags |= CONF_FLAGS_EXEMPTGLINE;
4804 >    block_state.flags.value |= CONF_FLAGS_EXEMPTGLINE;
4805   }
4806 + #line 4807 "conf_parser.c" /* yacc.c:1646  */
4807      break;
4808  
4809 <  case 280:
4810 < /* Line 1787 of yacc.c  */
4917 < #line 1701 "conf_parser.y"
4809 >  case 325:
4810 > #line 1851 "conf_parser.y" /* yacc.c:1646  */
4811      {
4812    if (conf_parser_ctx.pass == 2)
4813 <    yy_aconf->flags |= CONF_FLAGS_EXEMPTRESV;
4813 >    block_state.flags.value |= CONF_FLAGS_EXEMPTRESV;
4814   }
4815 + #line 4816 "conf_parser.c" /* yacc.c:1646  */
4816      break;
4817  
4818 <  case 281:
4819 < /* Line 1787 of yacc.c  */
4926 < #line 1705 "conf_parser.y"
4818 >  case 326:
4819 > #line 1855 "conf_parser.y" /* yacc.c:1646  */
4820      {
4821    if (conf_parser_ctx.pass == 2)
4822 <    yy_aconf->flags |= CONF_FLAGS_NEED_PASSWORD;
4822 >    block_state.flags.value |= CONF_FLAGS_WEBIRC;
4823   }
4824 + #line 4825 "conf_parser.c" /* yacc.c:1646  */
4825      break;
4826  
4827 <  case 282:
4828 < /* Line 1787 of yacc.c  */
4935 < #line 1711 "conf_parser.y"
4827 >  case 327:
4828 > #line 1859 "conf_parser.y" /* yacc.c:1646  */
4829      {
4830    if (conf_parser_ctx.pass == 2)
4831 <  {
4832 <    MyFree(yy_conf->name);
4831 >    block_state.flags.value |= CONF_FLAGS_NEED_PASSWORD;
4832 > }
4833 > #line 4834 "conf_parser.c" /* yacc.c:1646  */
4834 >    break;
4835  
4836 <    if (strlen(yylval.string) <= HOSTLEN && valid_hostname(yylval.string))
4837 <    {    
4943 <      DupString(yy_conf->name, yylval.string);
4944 <      yy_aconf->flags |= CONF_FLAGS_SPOOF_IP;
4945 <    }
4946 <    else
4836 >  case 328:
4837 > #line 1865 "conf_parser.y" /* yacc.c:1646  */
4838      {
4839 <      ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4840 <      yy_conf->name = NULL;
4841 <    }
4839 >  if (conf_parser_ctx.pass != 2)
4840 >    break;
4841 >
4842 >  if (valid_hostname(yylval.string))
4843 >  {
4844 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4845 >    block_state.flags.value |= CONF_FLAGS_SPOOF_IP;
4846    }
4847 +  else
4848 +    ilog(LOG_TYPE_IRCD, "Spoof either is too long or contains invalid characters. Ignoring it.");
4849   }
4850 + #line 4851 "conf_parser.c" /* yacc.c:1646  */
4851      break;
4852  
4853 <  case 283:
4854 < /* Line 1787 of yacc.c  */
4957 < #line 1730 "conf_parser.y"
4853 >  case 329:
4854 > #line 1879 "conf_parser.y" /* yacc.c:1646  */
4855      {
4856 <  if (conf_parser_ctx.pass == 2)
4857 <  {
4858 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
4859 <    MyFree(yy_conf->name);
4860 <    DupString(yy_conf->name, yylval.string);
4964 <  }
4856 >  if (conf_parser_ctx.pass != 2)
4857 >    break;
4858 >
4859 >  strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4860 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4861   }
4862 + #line 4863 "conf_parser.c" /* yacc.c:1646  */
4863      break;
4864  
4865 <  case 284:
4866 < /* Line 1787 of yacc.c  */
4970 < #line 1740 "conf_parser.y"
4865 >  case 330:
4866 > #line 1888 "conf_parser.y" /* yacc.c:1646  */
4867      {
4868 <  if (conf_parser_ctx.pass == 2)
4869 <  {
4870 <    yy_aconf->flags |= CONF_FLAGS_REDIR;
4871 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
4872 <  }
4868 >  if (conf_parser_ctx.pass != 2)
4869 >    break;
4870 >
4871 >  block_state.flags.value |= CONF_FLAGS_REDIR;
4872 >  block_state.port.value = (yyvsp[-1].number);
4873   }
4874 + #line 4875 "conf_parser.c" /* yacc.c:1646  */
4875      break;
4876  
4877 <  case 285:
4878 < /* Line 1787 of yacc.c  */
4982 < #line 1753 "conf_parser.y"
4877 >  case 331:
4878 > #line 1901 "conf_parser.y" /* yacc.c:1646  */
4879      {
4880 <  if (conf_parser_ctx.pass == 2)
4881 <  {
4882 <    MyFree(resv_reason);
4883 <    resv_reason = NULL;
4884 <  }
4880 >  if (conf_parser_ctx.pass != 2)
4881 >    break;
4882 >
4883 >  reset_block_state();
4884 >  strlcpy(block_state.rpass.buf, CONF_NOREASON, sizeof(block_state.rpass.buf));
4885   }
4886 + #line 4887 "conf_parser.c" /* yacc.c:1646  */
4887      break;
4888  
4889 <  case 286:
4890 < /* Line 1787 of yacc.c  */
4994 < #line 1760 "conf_parser.y"
4889 >  case 332:
4890 > #line 1908 "conf_parser.y" /* yacc.c:1646  */
4891      {
4892 <  if (conf_parser_ctx.pass == 2)
4893 <  {
4894 <    MyFree(resv_reason);
4895 <    resv_reason = NULL;
5000 <  }
4892 >  if (conf_parser_ctx.pass != 2)
4893 >    break;
4894 >
4895 >  create_resv(block_state.name.buf, block_state.rpass.buf, &block_state.mask.list);
4896   }
4897 + #line 4898 "conf_parser.c" /* yacc.c:1646  */
4898      break;
4899  
4900 <  case 293:
4901 < /* Line 1787 of yacc.c  */
5006 < #line 1772 "conf_parser.y"
4900 >  case 339:
4901 > #line 1919 "conf_parser.y" /* yacc.c:1646  */
4902      {
4903    if (conf_parser_ctx.pass == 2)
4904 <  {
5010 <    MyFree(resv_reason);
5011 <    DupString(resv_reason, yylval.string);
5012 <  }
4904 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4905   }
4906 + #line 4907 "conf_parser.c" /* yacc.c:1646  */
4907      break;
4908  
4909 <  case 294:
4910 < /* Line 1787 of yacc.c  */
5018 < #line 1781 "conf_parser.y"
4909 >  case 340:
4910 > #line 1925 "conf_parser.y" /* yacc.c:1646  */
4911      {
4912    if (conf_parser_ctx.pass == 2)
4913 <  {
5022 <    if (IsChanPrefix(*yylval.string))
5023 <    {
5024 <      char def_reason[] = "No reason";
5025 <
5026 <      create_channel_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5027 <    }
5028 <  }
5029 <  /* ignore it for now.. but we really should make a warning if
5030 <   * its an erroneous name --fl_ */
4913 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
4914   }
4915 + #line 4916 "conf_parser.c" /* yacc.c:1646  */
4916      break;
4917  
4918 <  case 295:
4919 < /* Line 1787 of yacc.c  */
5036 < #line 1796 "conf_parser.y"
4918 >  case 341:
4919 > #line 1931 "conf_parser.y" /* yacc.c:1646  */
4920      {
4921    if (conf_parser_ctx.pass == 2)
4922 <  {
5040 <    char def_reason[] = "No reason";
5041 <
5042 <    create_nick_resv(yylval.string, resv_reason != NULL ? resv_reason : def_reason, 1);
5043 <  }
4922 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.mask.list);
4923   }
4924 + #line 4925 "conf_parser.c" /* yacc.c:1646  */
4925      break;
4926  
4927 <  case 301:
4928 < /* Line 1787 of yacc.c  */
5049 < #line 1814 "conf_parser.y"
4927 >  case 347:
4928 > #line 1946 "conf_parser.y" /* yacc.c:1646  */
4929      {
4930 <  if (conf_parser_ctx.pass == 2)
4930 >  if (conf_parser_ctx.pass != 2)
4931 >    break;
4932 >
4933 >  if (valid_servname(yylval.string))
4934    {
4935 <    if (valid_servname(yylval.string))
4936 <    {
5055 <      yy_conf = make_conf_item(SERVICE_TYPE);
5056 <      DupString(yy_conf->name, yylval.string);
5057 <    }
4935 >    struct MaskItem *conf = conf_make(CONF_SERVICE);
4936 >    conf->name = xstrdup(yylval.string);
4937    }
4938   }
4939 + #line 4940 "conf_parser.c" /* yacc.c:1646  */
4940      break;
4941  
4942 <  case 302:
4943 < /* Line 1787 of yacc.c  */
5064 < #line 1829 "conf_parser.y"
4942 >  case 348:
4943 > #line 1961 "conf_parser.y" /* yacc.c:1646  */
4944      {
4945 <  if (conf_parser_ctx.pass == 2)
4946 <  {
4947 <    yy_conf = make_conf_item(ULINE_TYPE);
4948 <    yy_match_item = map_to_conf(yy_conf);
4949 <    yy_match_item->action = SHARED_ALL;
4950 <  }
4945 >  if (conf_parser_ctx.pass != 2)
4946 >    break;
4947 >
4948 >  reset_block_state();
4949 >
4950 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
4951 >  strlcpy(block_state.user.buf, "*", sizeof(block_state.user.buf));
4952 >  strlcpy(block_state.host.buf, "*", sizeof(block_state.host.buf));
4953 >  block_state.flags.value = SHARED_ALL;
4954   }
4955 + #line 4956 "conf_parser.c" /* yacc.c:1646  */
4956      break;
4957  
4958 <  case 303:
4959 < /* Line 1787 of yacc.c  */
5077 < #line 1837 "conf_parser.y"
4958 >  case 349:
4959 > #line 1972 "conf_parser.y" /* yacc.c:1646  */
4960      {
4961 <  if (conf_parser_ctx.pass == 2)
4962 <  {
4963 <    yy_conf = NULL;
4964 <  }
4961 >  struct MaskItem *conf = NULL;
4962 >
4963 >  if (conf_parser_ctx.pass != 2)
4964 >    break;
4965 >
4966 >  conf = conf_make(CONF_ULINE);
4967 >  conf->flags = block_state.flags.value;
4968 >  conf->name = xstrdup(block_state.name.buf);
4969 >  conf->user = xstrdup(block_state.user.buf);
4970 >  conf->host = xstrdup(block_state.host.buf);
4971   }
4972 + #line 4973 "conf_parser.c" /* yacc.c:1646  */
4973      break;
4974  
4975 <  case 310:
4976 < /* Line 1787 of yacc.c  */
5088 < #line 1848 "conf_parser.y"
4975 >  case 356:
4976 > #line 1989 "conf_parser.y" /* yacc.c:1646  */
4977      {
4978    if (conf_parser_ctx.pass == 2)
4979 <  {
5092 <    MyFree(yy_conf->name);
5093 <    DupString(yy_conf->name, yylval.string);
5094 <  }
4979 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
4980   }
4981 + #line 4982 "conf_parser.c" /* yacc.c:1646  */
4982      break;
4983  
4984 <  case 311:
4985 < /* Line 1787 of yacc.c  */
5100 < #line 1857 "conf_parser.y"
4984 >  case 357:
4985 > #line 1995 "conf_parser.y" /* yacc.c:1646  */
4986      {
4987    if (conf_parser_ctx.pass == 2)
4988    {
# Line 5105 | Line 4990 | yyreduce:
4990  
4991      nuh.nuhmask  = yylval.string;
4992      nuh.nickptr  = NULL;
4993 <    nuh.userptr  = userbuf;
4994 <    nuh.hostptr  = hostbuf;
4993 >    nuh.userptr  = block_state.user.buf;
4994 >    nuh.hostptr  = block_state.host.buf;
4995  
4996      nuh.nicksize = 0;
4997 <    nuh.usersize = sizeof(userbuf);
4998 <    nuh.hostsize = sizeof(hostbuf);
4997 >    nuh.usersize = sizeof(block_state.user.buf);
4998 >    nuh.hostsize = sizeof(block_state.host.buf);
4999  
5000      split_nuh(&nuh);
5116
5117    DupString(yy_match_item->user, userbuf);
5118    DupString(yy_match_item->host, hostbuf);
5001    }
5002   }
5003 + #line 5004 "conf_parser.c" /* yacc.c:1646  */
5004      break;
5005  
5006 <  case 312:
5007 < /* Line 1787 of yacc.c  */
5125 < #line 1879 "conf_parser.y"
5006 >  case 358:
5007 > #line 2014 "conf_parser.y" /* yacc.c:1646  */
5008      {
5009    if (conf_parser_ctx.pass == 2)
5010 <    yy_match_item->action = 0;
5010 >    block_state.flags.value = 0;
5011   }
5012 + #line 5013 "conf_parser.c" /* yacc.c:1646  */
5013      break;
5014  
5015 <  case 316:
5016 < /* Line 1787 of yacc.c  */
5134 < #line 1886 "conf_parser.y"
5015 >  case 362:
5016 > #line 2021 "conf_parser.y" /* yacc.c:1646  */
5017      {
5018    if (conf_parser_ctx.pass == 2)
5019 <    yy_match_item->action |= SHARED_KLINE;
5019 >    block_state.flags.value |= SHARED_KLINE;
5020   }
5021 + #line 5022 "conf_parser.c" /* yacc.c:1646  */
5022      break;
5023  
5024 <  case 317:
5025 < /* Line 1787 of yacc.c  */
5143 < #line 1890 "conf_parser.y"
5024 >  case 363:
5025 > #line 2025 "conf_parser.y" /* yacc.c:1646  */
5026      {
5027    if (conf_parser_ctx.pass == 2)
5028 <    yy_match_item->action |= SHARED_UNKLINE;
5028 >    block_state.flags.value |= SHARED_UNKLINE;
5029   }
5030 + #line 5031 "conf_parser.c" /* yacc.c:1646  */
5031      break;
5032  
5033 <  case 318:
5034 < /* Line 1787 of yacc.c  */
5152 < #line 1894 "conf_parser.y"
5033 >  case 364:
5034 > #line 2029 "conf_parser.y" /* yacc.c:1646  */
5035      {
5036    if (conf_parser_ctx.pass == 2)
5037 <    yy_match_item->action |= SHARED_DLINE;
5037 >    block_state.flags.value |= SHARED_DLINE;
5038   }
5039 + #line 5040 "conf_parser.c" /* yacc.c:1646  */
5040      break;
5041  
5042 <  case 319:
5043 < /* Line 1787 of yacc.c  */
5161 < #line 1898 "conf_parser.y"
5042 >  case 365:
5043 > #line 2033 "conf_parser.y" /* yacc.c:1646  */
5044      {
5045    if (conf_parser_ctx.pass == 2)
5046 <    yy_match_item->action |= SHARED_UNDLINE;
5046 >    block_state.flags.value |= SHARED_UNDLINE;
5047   }
5048 + #line 5049 "conf_parser.c" /* yacc.c:1646  */
5049      break;
5050  
5051 <  case 320:
5052 < /* Line 1787 of yacc.c  */
5170 < #line 1902 "conf_parser.y"
5051 >  case 366:
5052 > #line 2037 "conf_parser.y" /* yacc.c:1646  */
5053      {
5054    if (conf_parser_ctx.pass == 2)
5055 <    yy_match_item->action |= SHARED_XLINE;
5055 >    block_state.flags.value |= SHARED_XLINE;
5056   }
5057 + #line 5058 "conf_parser.c" /* yacc.c:1646  */
5058      break;
5059  
5060 <  case 321:
5061 < /* Line 1787 of yacc.c  */
5179 < #line 1906 "conf_parser.y"
5060 >  case 367:
5061 > #line 2041 "conf_parser.y" /* yacc.c:1646  */
5062      {
5063    if (conf_parser_ctx.pass == 2)
5064 <    yy_match_item->action |= SHARED_UNXLINE;
5064 >    block_state.flags.value |= SHARED_UNXLINE;
5065   }
5066 + #line 5067 "conf_parser.c" /* yacc.c:1646  */
5067      break;
5068  
5069 <  case 322:
5070 < /* Line 1787 of yacc.c  */
5188 < #line 1910 "conf_parser.y"
5069 >  case 368:
5070 > #line 2045 "conf_parser.y" /* yacc.c:1646  */
5071      {
5072    if (conf_parser_ctx.pass == 2)
5073 <    yy_match_item->action |= SHARED_RESV;
5073 >    block_state.flags.value |= SHARED_RESV;
5074   }
5075 + #line 5076 "conf_parser.c" /* yacc.c:1646  */
5076      break;
5077  
5078 <  case 323:
5079 < /* Line 1787 of yacc.c  */
5197 < #line 1914 "conf_parser.y"
5078 >  case 369:
5079 > #line 2049 "conf_parser.y" /* yacc.c:1646  */
5080      {
5081    if (conf_parser_ctx.pass == 2)
5082 <    yy_match_item->action |= SHARED_UNRESV;
5082 >    block_state.flags.value |= SHARED_UNRESV;
5083   }
5084 + #line 5085 "conf_parser.c" /* yacc.c:1646  */
5085      break;
5086  
5087 <  case 324:
5088 < /* Line 1787 of yacc.c  */
5206 < #line 1918 "conf_parser.y"
5087 >  case 370:
5088 > #line 2053 "conf_parser.y" /* yacc.c:1646  */
5089      {
5090    if (conf_parser_ctx.pass == 2)
5091 <    yy_match_item->action |= SHARED_LOCOPS;
5091 >    block_state.flags.value |= SHARED_LOCOPS;
5092   }
5093 + #line 5094 "conf_parser.c" /* yacc.c:1646  */
5094      break;
5095  
5096 <  case 325:
5097 < /* Line 1787 of yacc.c  */
5215 < #line 1922 "conf_parser.y"
5096 >  case 371:
5097 > #line 2057 "conf_parser.y" /* yacc.c:1646  */
5098      {
5099    if (conf_parser_ctx.pass == 2)
5100 <    yy_match_item->action = SHARED_ALL;
5100 >    block_state.flags.value = SHARED_ALL;
5101   }
5102 + #line 5103 "conf_parser.c" /* yacc.c:1646  */
5103      break;
5104  
5105 <  case 326:
5106 < /* Line 1787 of yacc.c  */
5224 < #line 1931 "conf_parser.y"
5105 >  case 372:
5106 > #line 2066 "conf_parser.y" /* yacc.c:1646  */
5107      {
5108 <  if (conf_parser_ctx.pass == 2)
5109 <  {
5110 <    yy_conf = make_conf_item(CLUSTER_TYPE);
5111 <    yy_conf->flags = SHARED_ALL;
5112 <  }
5108 >  if (conf_parser_ctx.pass != 2)
5109 >    break;
5110 >
5111 >  reset_block_state();
5112 >
5113 >  strlcpy(block_state.name.buf, "*", sizeof(block_state.name.buf));
5114 >  block_state.flags.value = SHARED_ALL;
5115   }
5116 + #line 5117 "conf_parser.c" /* yacc.c:1646  */
5117      break;
5118  
5119 <  case 327:
5120 < /* Line 1787 of yacc.c  */
5236 < #line 1938 "conf_parser.y"
5119 >  case 373:
5120 > #line 2075 "conf_parser.y" /* yacc.c:1646  */
5121      {
5122 <  if (conf_parser_ctx.pass == 2)
5123 <  {
5124 <    if (yy_conf->name == NULL)
5125 <      DupString(yy_conf->name, "*");
5126 <    yy_conf = NULL;
5127 <  }
5122 >  struct MaskItem *conf = NULL;
5123 >
5124 >  if (conf_parser_ctx.pass != 2)
5125 >    break;
5126 >
5127 >  conf = conf_make(CONF_CLUSTER);
5128 >  conf->flags = block_state.flags.value;
5129 >  conf->name = xstrdup(block_state.name.buf);
5130   }
5131 + #line 5132 "conf_parser.c" /* yacc.c:1646  */
5132      break;
5133  
5134 <  case 333:
5135 < /* Line 1787 of yacc.c  */
5249 < #line 1951 "conf_parser.y"
5134 >  case 379:
5135 > #line 2090 "conf_parser.y" /* yacc.c:1646  */
5136      {
5137    if (conf_parser_ctx.pass == 2)
5138 <    DupString(yy_conf->name, yylval.string);
5138 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5139   }
5140 + #line 5141 "conf_parser.c" /* yacc.c:1646  */
5141      break;
5142  
5143 <  case 334:
5144 < /* Line 1787 of yacc.c  */
5258 < #line 1957 "conf_parser.y"
5143 >  case 380:
5144 > #line 2096 "conf_parser.y" /* yacc.c:1646  */
5145      {
5146    if (conf_parser_ctx.pass == 2)
5147 <    yy_conf->flags = 0;
5147 >    block_state.flags.value = 0;
5148   }
5149 + #line 5150 "conf_parser.c" /* yacc.c:1646  */
5150      break;
5151  
5152 <  case 338:
5153 < /* Line 1787 of yacc.c  */
5267 < #line 1964 "conf_parser.y"
5152 >  case 384:
5153 > #line 2103 "conf_parser.y" /* yacc.c:1646  */
5154      {
5155    if (conf_parser_ctx.pass == 2)
5156 <    yy_conf->flags |= SHARED_KLINE;
5156 >    block_state.flags.value |= SHARED_KLINE;
5157   }
5158 + #line 5159 "conf_parser.c" /* yacc.c:1646  */
5159      break;
5160  
5161 <  case 339:
5162 < /* Line 1787 of yacc.c  */
5276 < #line 1968 "conf_parser.y"
5161 >  case 385:
5162 > #line 2107 "conf_parser.y" /* yacc.c:1646  */
5163      {
5164    if (conf_parser_ctx.pass == 2)
5165 <    yy_conf->flags |= SHARED_UNKLINE;
5165 >    block_state.flags.value |= SHARED_UNKLINE;
5166   }
5167 + #line 5168 "conf_parser.c" /* yacc.c:1646  */
5168      break;
5169  
5170 <  case 340:
5171 < /* Line 1787 of yacc.c  */
5285 < #line 1972 "conf_parser.y"
5170 >  case 386:
5171 > #line 2111 "conf_parser.y" /* yacc.c:1646  */
5172      {
5173    if (conf_parser_ctx.pass == 2)
5174 <    yy_conf->flags |= SHARED_DLINE;
5174 >    block_state.flags.value |= SHARED_DLINE;
5175   }
5176 + #line 5177 "conf_parser.c" /* yacc.c:1646  */
5177      break;
5178  
5179 <  case 341:
5180 < /* Line 1787 of yacc.c  */
5294 < #line 1976 "conf_parser.y"
5179 >  case 387:
5180 > #line 2115 "conf_parser.y" /* yacc.c:1646  */
5181      {
5182    if (conf_parser_ctx.pass == 2)
5183 <    yy_conf->flags |= SHARED_UNDLINE;
5183 >    block_state.flags.value |= SHARED_UNDLINE;
5184   }
5185 + #line 5186 "conf_parser.c" /* yacc.c:1646  */
5186      break;
5187  
5188 <  case 342:
5189 < /* Line 1787 of yacc.c  */
5303 < #line 1980 "conf_parser.y"
5188 >  case 388:
5189 > #line 2119 "conf_parser.y" /* yacc.c:1646  */
5190      {
5191    if (conf_parser_ctx.pass == 2)
5192 <    yy_conf->flags |= SHARED_XLINE;
5192 >    block_state.flags.value |= SHARED_XLINE;
5193   }
5194 + #line 5195 "conf_parser.c" /* yacc.c:1646  */
5195      break;
5196  
5197 <  case 343:
5198 < /* Line 1787 of yacc.c  */
5312 < #line 1984 "conf_parser.y"
5197 >  case 389:
5198 > #line 2123 "conf_parser.y" /* yacc.c:1646  */
5199      {
5200    if (conf_parser_ctx.pass == 2)
5201 <    yy_conf->flags |= SHARED_UNXLINE;
5201 >    block_state.flags.value |= SHARED_UNXLINE;
5202   }
5203 + #line 5204 "conf_parser.c" /* yacc.c:1646  */
5204      break;
5205  
5206 <  case 344:
5207 < /* Line 1787 of yacc.c  */
5321 < #line 1988 "conf_parser.y"
5206 >  case 390:
5207 > #line 2127 "conf_parser.y" /* yacc.c:1646  */
5208      {
5209    if (conf_parser_ctx.pass == 2)
5210 <    yy_conf->flags |= SHARED_RESV;
5210 >    block_state.flags.value |= SHARED_RESV;
5211   }
5212 + #line 5213 "conf_parser.c" /* yacc.c:1646  */
5213      break;
5214  
5215 <  case 345:
5216 < /* Line 1787 of yacc.c  */
5330 < #line 1992 "conf_parser.y"
5215 >  case 391:
5216 > #line 2131 "conf_parser.y" /* yacc.c:1646  */
5217      {
5218    if (conf_parser_ctx.pass == 2)
5219 <    yy_conf->flags |= SHARED_UNRESV;
5219 >    block_state.flags.value |= SHARED_UNRESV;
5220   }
5221 + #line 5222 "conf_parser.c" /* yacc.c:1646  */
5222      break;
5223  
5224 <  case 346:
5225 < /* Line 1787 of yacc.c  */
5339 < #line 1996 "conf_parser.y"
5224 >  case 392:
5225 > #line 2135 "conf_parser.y" /* yacc.c:1646  */
5226      {
5227    if (conf_parser_ctx.pass == 2)
5228 <    yy_conf->flags |= SHARED_LOCOPS;
5228 >    block_state.flags.value |= SHARED_LOCOPS;
5229   }
5230 + #line 5231 "conf_parser.c" /* yacc.c:1646  */
5231      break;
5232  
5233 <  case 347:
5234 < /* Line 1787 of yacc.c  */
5348 < #line 2000 "conf_parser.y"
5233 >  case 393:
5234 > #line 2139 "conf_parser.y" /* yacc.c:1646  */
5235      {
5236    if (conf_parser_ctx.pass == 2)
5237 <    yy_conf->flags = SHARED_ALL;
5237 >    block_state.flags.value = SHARED_ALL;
5238   }
5239 + #line 5240 "conf_parser.c" /* yacc.c:1646  */
5240      break;
5241  
5242 <  case 348:
5243 < /* Line 1787 of yacc.c  */
5357 < #line 2009 "conf_parser.y"
5242 >  case 394:
5243 > #line 2148 "conf_parser.y" /* yacc.c:1646  */
5244      {
5359  if (conf_parser_ctx.pass == 2)
5360  {
5361    yy_conf = make_conf_item(SERVER_TYPE);
5362    yy_aconf = map_to_conf(yy_conf);
5245  
5246 <    /* defaults */
5247 <    yy_aconf->port = PORTNUM;
5248 <  }
5249 <  else
5250 <  {
5251 <    MyFree(class_name);
5370 <    class_name = NULL;
5371 <  }
5246 >  if (conf_parser_ctx.pass != 2)
5247 >    break;
5248 >
5249 >  reset_block_state();
5250 >  block_state.aftype.value = AF_INET;
5251 >  block_state.port.value = PORTNUM;
5252   }
5253 + #line 5254 "conf_parser.c" /* yacc.c:1646  */
5254      break;
5255  
5256 <  case 349:
5257 < /* Line 1787 of yacc.c  */
5377 < #line 2024 "conf_parser.y"
5256 >  case 395:
5257 > #line 2157 "conf_parser.y" /* yacc.c:1646  */
5258      {
5259 <  if (conf_parser_ctx.pass == 2)
5259 >  struct MaskItem *conf = NULL;
5260 >  struct addrinfo hints, *res;
5261 >
5262 >  if (conf_parser_ctx.pass != 2)
5263 >    break;
5264 >
5265 >  if (!block_state.name.buf[0] ||
5266 >      !block_state.host.buf[0])
5267 >    break;
5268 >
5269 >  if (!block_state.rpass.buf[0] ||
5270 >      !block_state.spass.buf[0])
5271 >    break;
5272 >
5273 >  if (has_wildcards(block_state.name.buf) ||
5274 >      has_wildcards(block_state.host.buf))
5275 >    break;
5276 >
5277 >  conf = conf_make(CONF_SERVER);
5278 >  conf->port = block_state.port.value;
5279 >  conf->flags = block_state.flags.value;
5280 >  conf->aftype = block_state.aftype.value;
5281 >  conf->host = xstrdup(block_state.host.buf);
5282 >  conf->name = xstrdup(block_state.name.buf);
5283 >  conf->passwd = xstrdup(block_state.rpass.buf);
5284 >  conf->spasswd = xstrdup(block_state.spass.buf);
5285 >
5286 >  if (block_state.cert.buf[0])
5287 >    conf->certfp = xstrdup(block_state.cert.buf);
5288 >
5289 >  if (block_state.ciph.buf[0])
5290 >    conf->cipher_list = xstrdup(block_state.ciph.buf);
5291 >
5292 >  dlinkMoveList(&block_state.leaf.list, &conf->leaf_list);
5293 >  dlinkMoveList(&block_state.hub.list, &conf->hub_list);
5294 >
5295 >  if (block_state.bind.buf[0])
5296    {
5297 <    if (yy_aconf->host && yy_aconf->passwd && yy_aconf->spasswd)
5298 <    {
5299 <      if (conf_add_server(yy_conf, class_name) == -1)
5300 <        delete_conf_item(yy_conf);
5301 <    }
5297 >    memset(&hints, 0, sizeof(hints));
5298 >
5299 >    hints.ai_family   = AF_UNSPEC;
5300 >    hints.ai_socktype = SOCK_STREAM;
5301 >    hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5302 >
5303 >    if (getaddrinfo(block_state.bind.buf, NULL, &hints, &res))
5304 >      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", block_state.bind.buf);
5305      else
5306      {
5307 <      if (yy_conf->name != NULL)
5389 <      {
5390 <        if (yy_aconf->host == NULL)
5391 <          yyerror("Ignoring connect block -- missing host");
5392 <        else if (!yy_aconf->passwd || !yy_aconf->spasswd)
5393 <          yyerror("Ignoring connect block -- missing password");
5394 <      }
5307 >      assert(res);
5308  
5309 <      /* XXX
5310 <       * This fixes a try_connections() core (caused by invalid class_ptr
5311 <       * pointers) reported by metalrock. That's an ugly fix, but there
5312 <       * is currently no better way. The entire config subsystem needs an
5400 <       * rewrite ASAP. make_conf_item() shouldn't really add things onto
5401 <       * a doubly linked list immediately without any sanity checks!  -Michael
5402 <       */
5403 <      delete_conf_item(yy_conf);
5309 >      memcpy(&conf->bind, res->ai_addr, res->ai_addrlen);
5310 >      conf->bind.ss.ss_family = res->ai_family;
5311 >      conf->bind.ss_len = res->ai_addrlen;
5312 >      freeaddrinfo(res);
5313      }
5405
5406    MyFree(class_name);
5407    class_name = NULL;
5408    yy_conf = NULL;
5409    yy_aconf = NULL;
5314    }
5315 +
5316 +  conf_add_class_to_conf(conf, block_state.class.buf);
5317 +  lookup_confhost(conf);
5318   }
5319 + #line 5320 "conf_parser.c" /* yacc.c:1646  */
5320      break;
5321  
5322 <  case 366:
5323 < /* Line 1787 of yacc.c  */
5416 < #line 2068 "conf_parser.y"
5322 >  case 413:
5323 > #line 2237 "conf_parser.y" /* yacc.c:1646  */
5324      {
5325    if (conf_parser_ctx.pass == 2)
5326 <  {
5420 <    MyFree(yy_conf->name);
5421 <    DupString(yy_conf->name, yylval.string);
5422 <  }
5326 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5327   }
5328 + #line 5329 "conf_parser.c" /* yacc.c:1646  */
5329      break;
5330  
5331 <  case 367:
5332 < /* Line 1787 of yacc.c  */
5428 < #line 2077 "conf_parser.y"
5331 >  case 414:
5332 > #line 2243 "conf_parser.y" /* yacc.c:1646  */
5333      {
5334    if (conf_parser_ctx.pass == 2)
5335 <  {
5432 <    MyFree(yy_aconf->host);
5433 <    DupString(yy_aconf->host, yylval.string);
5434 <  }
5335 >    strlcpy(block_state.host.buf, yylval.string, sizeof(block_state.host.buf));
5336   }
5337 + #line 5338 "conf_parser.c" /* yacc.c:1646  */
5338      break;
5339  
5340 <  case 368:
5341 < /* Line 1787 of yacc.c  */
5440 < #line 2086 "conf_parser.y"
5340 >  case 415:
5341 > #line 2249 "conf_parser.y" /* yacc.c:1646  */
5342      {
5343    if (conf_parser_ctx.pass == 2)
5344 <  {
5345 <    struct addrinfo hints, *res;
5346 <
5347 <    memset(&hints, 0, sizeof(hints));
5447 <
5448 <    hints.ai_family   = AF_UNSPEC;
5449 <    hints.ai_socktype = SOCK_STREAM;
5450 <    hints.ai_flags    = AI_PASSIVE | AI_NUMERICHOST;
5344 >    strlcpy(block_state.bind.buf, yylval.string, sizeof(block_state.bind.buf));
5345 > }
5346 > #line 5347 "conf_parser.c" /* yacc.c:1646  */
5347 >    break;
5348  
5349 <    if (getaddrinfo(yylval.string, NULL, &hints, &res))
5350 <      ilog(LOG_TYPE_IRCD, "Invalid netmask for server vhost(%s)", yylval.string);
5454 <    else
5349 >  case 416:
5350 > #line 2255 "conf_parser.y" /* yacc.c:1646  */
5351      {
5352 <      assert(res != NULL);
5352 >  if (conf_parser_ctx.pass != 2)
5353 >    break;
5354  
5355 <      memcpy(&yy_aconf->bind, res->ai_addr, res->ai_addrlen);
5356 <      yy_aconf->bind.ss.ss_family = res->ai_family;
5357 <      yy_aconf->bind.ss_len = res->ai_addrlen;
5358 <      freeaddrinfo(res);
5359 <    }
5360 <  }
5355 >  if ((yyvsp[-1].string)[0] == ':')
5356 >    conf_error_report("Server passwords cannot begin with a colon");
5357 >  else if (strchr((yyvsp[-1].string), ' '))
5358 >    conf_error_report("Server passwords cannot contain spaces");
5359 >  else
5360 >    strlcpy(block_state.spass.buf, yylval.string, sizeof(block_state.spass.buf));
5361   }
5362 + #line 5363 "conf_parser.c" /* yacc.c:1646  */
5363      break;
5364  
5365 <  case 369:
5366 < /* Line 1787 of yacc.c  */
5469 < #line 2112 "conf_parser.y"
5365 >  case 417:
5366 > #line 2268 "conf_parser.y" /* yacc.c:1646  */
5367      {
5368 <  if (conf_parser_ctx.pass == 2)
5369 <  {
5473 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
5474 <      yyerror("Server passwords cannot begin with a colon");
5475 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
5476 <      yyerror("Server passwords cannot contain spaces");
5477 <    else {
5478 <      if (yy_aconf->spasswd != NULL)
5479 <        memset(yy_aconf->spasswd, 0, strlen(yy_aconf->spasswd));
5368 >  if (conf_parser_ctx.pass != 2)
5369 >    break;
5370  
5371 <      MyFree(yy_aconf->spasswd);
5372 <      DupString(yy_aconf->spasswd, yylval.string);
5373 <    }
5374 <  }
5371 >  if ((yyvsp[-1].string)[0] == ':')
5372 >    conf_error_report("Server passwords cannot begin with a colon");
5373 >  else if (strchr((yyvsp[-1].string), ' '))
5374 >    conf_error_report("Server passwords cannot contain spaces");
5375 >  else
5376 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5377   }
5378 + #line 5379 "conf_parser.c" /* yacc.c:1646  */
5379      break;
5380  
5381 <  case 370:
5382 < /* Line 1787 of yacc.c  */
5490 < #line 2130 "conf_parser.y"
5381 >  case 418:
5382 > #line 2281 "conf_parser.y" /* yacc.c:1646  */
5383      {
5384    if (conf_parser_ctx.pass == 2)
5385 <  {
5494 <    if ((yyvsp[(3) - (4)].string)[0] == ':')
5495 <      yyerror("Server passwords cannot begin with a colon");
5496 <    else if (strchr((yyvsp[(3) - (4)].string), ' ') != NULL)
5497 <      yyerror("Server passwords cannot contain spaces");
5498 <    else {
5499 <      if (yy_aconf->passwd != NULL)
5500 <        memset(yy_aconf->passwd, 0, strlen(yy_aconf->passwd));
5501 <
5502 <      MyFree(yy_aconf->passwd);
5503 <      DupString(yy_aconf->passwd, yylval.string);
5504 <    }
5505 <  }
5385 >    strlcpy(block_state.cert.buf, yylval.string, sizeof(block_state.cert.buf));
5386   }
5387 + #line 5388 "conf_parser.c" /* yacc.c:1646  */
5388      break;
5389  
5390 <  case 371:
5391 < /* Line 1787 of yacc.c  */
5511 < #line 2148 "conf_parser.y"
5390 >  case 419:
5391 > #line 2287 "conf_parser.y" /* yacc.c:1646  */
5392      {
5393    if (conf_parser_ctx.pass == 2)
5394 <    yy_aconf->port = (yyvsp[(3) - (4)].number);
5394 >    block_state.port.value = (yyvsp[-1].number);
5395   }
5396 + #line 5397 "conf_parser.c" /* yacc.c:1646  */
5397      break;
5398  
5399 <  case 372:
5400 < /* Line 1787 of yacc.c  */
5520 < #line 2154 "conf_parser.y"
5399 >  case 420:
5400 > #line 2293 "conf_parser.y" /* yacc.c:1646  */
5401      {
5402    if (conf_parser_ctx.pass == 2)
5403 <    yy_aconf->aftype = AF_INET;
5403 >    block_state.aftype.value = AF_INET;
5404   }
5405 + #line 5406 "conf_parser.c" /* yacc.c:1646  */
5406      break;
5407  
5408 <  case 373:
5409 < /* Line 1787 of yacc.c  */
5529 < #line 2158 "conf_parser.y"
5408 >  case 421:
5409 > #line 2297 "conf_parser.y" /* yacc.c:1646  */
5410      {
5531 #ifdef IPV6
5411    if (conf_parser_ctx.pass == 2)
5412 <    yy_aconf->aftype = AF_INET6;
5534 < #endif
5412 >    block_state.aftype.value = AF_INET6;
5413   }
5414 + #line 5415 "conf_parser.c" /* yacc.c:1646  */
5415      break;
5416  
5417 <  case 374:
5418 < /* Line 1787 of yacc.c  */
5540 < #line 2166 "conf_parser.y"
5417 >  case 422:
5418 > #line 2303 "conf_parser.y" /* yacc.c:1646  */
5419      {
5420 +  block_state.flags.value &= CONF_FLAGS_ENCRYPTED;
5421   }
5422 + #line 5423 "conf_parser.c" /* yacc.c:1646  */
5423      break;
5424  
5425 <  case 378:
5426 < /* Line 1787 of yacc.c  */
5547 < #line 2171 "conf_parser.y"
5425 >  case 426:
5426 > #line 2309 "conf_parser.y" /* yacc.c:1646  */
5427      {
5428    if (conf_parser_ctx.pass == 2)
5429 <    SetConfAllowAutoConn(yy_aconf);
5429 >    block_state.flags.value |= CONF_FLAGS_ALLOW_AUTO_CONN;
5430   }
5431 + #line 5432 "conf_parser.c" /* yacc.c:1646  */
5432      break;
5433  
5434 <  case 379:
5435 < /* Line 1787 of yacc.c  */
5556 < #line 2175 "conf_parser.y"
5434 >  case 427:
5435 > #line 2313 "conf_parser.y" /* yacc.c:1646  */
5436      {
5437    if (conf_parser_ctx.pass == 2)
5438 <    SetConfSSL(yy_aconf);
5438 >    block_state.flags.value |= CONF_FLAGS_SSL;
5439   }
5440 + #line 5441 "conf_parser.c" /* yacc.c:1646  */
5441      break;
5442  
5443 <  case 380:
5444 < /* Line 1787 of yacc.c  */
5565 < #line 2181 "conf_parser.y"
5443 >  case 428:
5444 > #line 2319 "conf_parser.y" /* yacc.c:1646  */
5445      {
5446    if (conf_parser_ctx.pass == 2)
5447    {
5448      if (yylval.number)
5449 <      yy_aconf->flags |= CONF_FLAGS_ENCRYPTED;
5449 >      block_state.flags.value |= CONF_FLAGS_ENCRYPTED;
5450      else
5451 <      yy_aconf->flags &= ~CONF_FLAGS_ENCRYPTED;
5451 >      block_state.flags.value &= ~CONF_FLAGS_ENCRYPTED;
5452    }
5453   }
5454 + #line 5455 "conf_parser.c" /* yacc.c:1646  */
5455      break;
5456  
5457 <  case 381:
5458 < /* Line 1787 of yacc.c  */
5579 < #line 2192 "conf_parser.y"
5457 >  case 429:
5458 > #line 2330 "conf_parser.y" /* yacc.c:1646  */
5459      {
5460    if (conf_parser_ctx.pass == 2)
5461 <  {
5583 <    char *mask;
5584 <
5585 <    DupString(mask, yylval.string);
5586 <    dlinkAdd(mask, make_dlink_node(), &yy_aconf->hub_list);
5587 <  }
5461 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.hub.list);
5462   }
5463 + #line 5464 "conf_parser.c" /* yacc.c:1646  */
5464      break;
5465  
5466 <  case 382:
5467 < /* Line 1787 of yacc.c  */
5593 < #line 2203 "conf_parser.y"
5466 >  case 430:
5467 > #line 2336 "conf_parser.y" /* yacc.c:1646  */
5468      {
5469    if (conf_parser_ctx.pass == 2)
5470 <  {
5597 <    char *mask;
5598 <
5599 <    DupString(mask, yylval.string);
5600 <    dlinkAdd(mask, make_dlink_node(), &yy_aconf->leaf_list);
5601 <  }
5470 >    dlinkAdd(xstrdup(yylval.string), make_dlink_node(), &block_state.leaf.list);
5471   }
5472 + #line 5473 "conf_parser.c" /* yacc.c:1646  */
5473      break;
5474  
5475 <  case 383:
5476 < /* Line 1787 of yacc.c  */
5607 < #line 2214 "conf_parser.y"
5475 >  case 431:
5476 > #line 2342 "conf_parser.y" /* yacc.c:1646  */
5477      {
5478    if (conf_parser_ctx.pass == 2)
5479 <  {
5611 <    MyFree(class_name);
5612 <    DupString(class_name, yylval.string);
5613 <  }
5479 >    strlcpy(block_state.class.buf, yylval.string, sizeof(block_state.class.buf));
5480   }
5481 + #line 5482 "conf_parser.c" /* yacc.c:1646  */
5482      break;
5483  
5484 <  case 384:
5485 < /* Line 1787 of yacc.c  */
5619 < #line 2223 "conf_parser.y"
5484 >  case 432:
5485 > #line 2348 "conf_parser.y" /* yacc.c:1646  */
5486      {
5487   #ifdef HAVE_LIBCRYPTO
5488    if (conf_parser_ctx.pass == 2)
5489 <  {
5624 <    MyFree(yy_aconf->cipher_list);
5625 <    DupString(yy_aconf->cipher_list, yylval.string);
5626 <  }
5489 >    strlcpy(block_state.ciph.buf, yylval.string, sizeof(block_state.ciph.buf));
5490   #else
5491    if (conf_parser_ctx.pass == 2)
5492 <    yyerror("Ignoring connect::ciphers -- no OpenSSL support");
5492 >    conf_error_report("Ignoring connect::ciphers -- no OpenSSL support");
5493   #endif
5494   }
5495 + #line 5496 "conf_parser.c" /* yacc.c:1646  */
5496      break;
5497  
5498 <  case 385:
5499 < /* Line 1787 of yacc.c  */
5636 < #line 2241 "conf_parser.y"
5498 >  case 433:
5499 > #line 2363 "conf_parser.y" /* yacc.c:1646  */
5500      {
5501    if (conf_parser_ctx.pass == 2)
5502 <  {
5640 <    userbuf[0] = hostbuf[0] = reasonbuf[0] = '\0';
5641 <    regex_ban = 0;
5642 <  }
5502 >    reset_block_state();
5503   }
5504 + #line 5505 "conf_parser.c" /* yacc.c:1646  */
5505      break;
5506  
5507 <  case 386:
5508 < /* Line 1787 of yacc.c  */
5648 < #line 2248 "conf_parser.y"
5507 >  case 434:
5508 > #line 2367 "conf_parser.y" /* yacc.c:1646  */
5509      {
5510 <  if (conf_parser_ctx.pass == 2)
5651 <  {
5652 <    if (userbuf[0] && hostbuf[0])
5653 <    {
5654 <      if (regex_ban)
5655 <      {
5656 < #ifdef HAVE_LIBPCRE
5657 <        void *exp_user = NULL;
5658 <        void *exp_host = NULL;
5659 <        const char *errptr = NULL;
5660 <
5661 <        if (!(exp_user = ircd_pcre_compile(userbuf, &errptr)) ||
5662 <            !(exp_host = ircd_pcre_compile(hostbuf, &errptr)))
5663 <        {
5664 <          ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: %s",
5665 <               errptr);
5666 <          break;
5667 <        }
5510 >  struct MaskItem *conf = NULL;
5511  
5512 <        yy_aconf = map_to_conf(make_conf_item(RKLINE_TYPE));
5670 <        yy_aconf->regexuser = exp_user;
5671 <        yy_aconf->regexhost = exp_host;
5672 <
5673 <        DupString(yy_aconf->user, userbuf);
5674 <        DupString(yy_aconf->host, hostbuf);
5675 <
5676 <        if (reasonbuf[0])
5677 <          DupString(yy_aconf->reason, reasonbuf);
5678 <        else
5679 <          DupString(yy_aconf->reason, "No reason");
5680 < #else
5681 <        ilog(LOG_TYPE_IRCD, "Failed to add regular expression based K-Line: no PCRE support");
5682 <        break;
5683 < #endif
5684 <      }
5685 <      else
5686 <      {
5687 <        find_and_delete_temporary(userbuf, hostbuf, CONF_KLINE);
5688 <
5689 <        yy_aconf = map_to_conf(make_conf_item(KLINE_TYPE));
5690 <
5691 <        DupString(yy_aconf->user, userbuf);
5692 <        DupString(yy_aconf->host, hostbuf);
5693 <
5694 <        if (reasonbuf[0])
5695 <          DupString(yy_aconf->reason, reasonbuf);
5696 <        else
5697 <          DupString(yy_aconf->reason, "No reason");
5698 <        add_conf_by_address(CONF_KLINE, yy_aconf);
5699 <      }
5700 <    }
5701 <
5702 <    yy_aconf = NULL;
5703 <  }
5704 < }
5512 >  if (conf_parser_ctx.pass != 2)
5513      break;
5514  
5515 <  case 387:
5516 < /* Line 1787 of yacc.c  */
5709 < #line 2306 "conf_parser.y"
5710 <    {
5711 < }
5515 >  if (!block_state.user.buf[0] ||
5516 >      !block_state.host.buf[0])
5517      break;
5518  
5519 <  case 391:
5520 < /* Line 1787 of yacc.c  */
5521 < #line 2311 "conf_parser.y"
5522 <    {
5523 <  if (conf_parser_ctx.pass == 2)
5524 <    regex_ban = 1;
5519 >  conf = conf_make(CONF_KLINE);
5520 >  conf->user = xstrdup(block_state.user.buf);
5521 >  conf->host = xstrdup(block_state.host.buf);
5522 >
5523 >  if (block_state.rpass.buf[0])
5524 >    conf->reason = xstrdup(block_state.rpass.buf);
5525 >  else
5526 >    conf->reason = xstrdup(CONF_NOREASON);
5527 >  add_conf_by_address(CONF_KLINE, conf);
5528   }
5529 + #line 5530 "conf_parser.c" /* yacc.c:1646  */
5530      break;
5531  
5532 <  case 398:
5533 < /* Line 1787 of yacc.c  */
5725 < #line 2320 "conf_parser.y"
5532 >  case 440:
5533 > #line 2392 "conf_parser.y" /* yacc.c:1646  */
5534      {
5535 +
5536    if (conf_parser_ctx.pass == 2)
5537    {
5538      struct split_nuh_item nuh;
5539  
5540      nuh.nuhmask  = yylval.string;
5541      nuh.nickptr  = NULL;
5542 <    nuh.userptr  = userbuf;
5543 <    nuh.hostptr  = hostbuf;
5542 >    nuh.userptr  = block_state.user.buf;
5543 >    nuh.hostptr  = block_state.host.buf;
5544  
5545      nuh.nicksize = 0;
5546 <    nuh.usersize = sizeof(userbuf);
5547 <    nuh.hostsize = sizeof(hostbuf);
5546 >    nuh.usersize = sizeof(block_state.user.buf);
5547 >    nuh.hostsize = sizeof(block_state.host.buf);
5548  
5549      split_nuh(&nuh);
5550    }
5551   }
5552 + #line 5553 "conf_parser.c" /* yacc.c:1646  */
5553      break;
5554  
5555 <  case 399:
5556 < /* Line 1787 of yacc.c  */
5747 < #line 2339 "conf_parser.y"
5555 >  case 441:
5556 > #line 2412 "conf_parser.y" /* yacc.c:1646  */
5557      {
5558    if (conf_parser_ctx.pass == 2)
5559 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5559 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5560   }
5561 + #line 5562 "conf_parser.c" /* yacc.c:1646  */
5562      break;
5563  
5564 <  case 400:
5565 < /* Line 1787 of yacc.c  */
5756 < #line 2348 "conf_parser.y"
5564 >  case 442:
5565 > #line 2421 "conf_parser.y" /* yacc.c:1646  */
5566      {
5567    if (conf_parser_ctx.pass == 2)
5568 <    hostbuf[0] = reasonbuf[0] = '\0';
5568 >    reset_block_state();
5569   }
5570 + #line 5571 "conf_parser.c" /* yacc.c:1646  */
5571      break;
5572  
5573 <  case 401:
5574 < /* Line 1787 of yacc.c  */
5765 < #line 2352 "conf_parser.y"
5766 <    {
5767 <  if (conf_parser_ctx.pass == 2)
5768 <  {
5769 <    if (hostbuf[0] && parse_netmask(hostbuf, NULL, NULL) != HM_HOST)
5573 >  case 443:
5574 > #line 2425 "conf_parser.y" /* yacc.c:1646  */
5575      {
5576 <      find_and_delete_temporary(NULL, hostbuf, CONF_DLINE);
5576 >  struct MaskItem *conf = NULL;
5577  
5578 <      yy_aconf = map_to_conf(make_conf_item(DLINE_TYPE));
5579 <      DupString(yy_aconf->host, hostbuf);
5578 >  if (conf_parser_ctx.pass != 2)
5579 >    break;
5580  
5581 <      if (reasonbuf[0])
5582 <        DupString(yy_aconf->reason, reasonbuf);
5583 <      else
5584 <        DupString(yy_aconf->reason, "No reason");
5585 <      add_conf_by_address(CONF_DLINE, yy_aconf);
5586 <      yy_aconf = NULL;
5587 <    }
5581 >  if (!block_state.addr.buf[0])
5582 >    break;
5583 >
5584 >  if (parse_netmask(block_state.addr.buf, NULL, NULL) != HM_HOST)
5585 >  {
5586 >    conf = conf_make(CONF_DLINE);
5587 >    conf->host = xstrdup(block_state.addr.buf);
5588 >
5589 >    if (block_state.rpass.buf[0])
5590 >      conf->reason = xstrdup(block_state.rpass.buf);
5591 >    else
5592 >      conf->reason = xstrdup(CONF_NOREASON);
5593 >    add_conf_by_address(CONF_DLINE, conf);
5594    }
5595   }
5596 + #line 5597 "conf_parser.c" /* yacc.c:1646  */
5597      break;
5598  
5599 <  case 407:
5600 < /* Line 1787 of yacc.c  */
5789 < #line 2376 "conf_parser.y"
5599 >  case 449:
5600 > #line 2451 "conf_parser.y" /* yacc.c:1646  */
5601      {
5602    if (conf_parser_ctx.pass == 2)
5603 <    strlcpy(hostbuf, yylval.string, sizeof(hostbuf));
5603 >    strlcpy(block_state.addr.buf, yylval.string, sizeof(block_state.addr.buf));
5604   }
5605 + #line 5606 "conf_parser.c" /* yacc.c:1646  */
5606      break;
5607  
5608 <  case 408:
5609 < /* Line 1787 of yacc.c  */
5798 < #line 2382 "conf_parser.y"
5608 >  case 450:
5609 > #line 2457 "conf_parser.y" /* yacc.c:1646  */
5610      {
5611    if (conf_parser_ctx.pass == 2)
5612 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5612 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5613   }
5614 + #line 5615 "conf_parser.c" /* yacc.c:1646  */
5615      break;
5616  
5617 <  case 414:
5618 < /* Line 1787 of yacc.c  */
5807 < #line 2396 "conf_parser.y"
5617 >  case 456:
5618 > #line 2471 "conf_parser.y" /* yacc.c:1646  */
5619      {
5620    if (conf_parser_ctx.pass == 2)
5621    {
5622      if (yylval.string[0] && parse_netmask(yylval.string, NULL, NULL) != HM_HOST)
5623      {
5624 <      yy_aconf = map_to_conf(make_conf_item(EXEMPTDLINE_TYPE));
5625 <      DupString(yy_aconf->host, yylval.string);
5624 >      struct MaskItem *conf = conf_make(CONF_EXEMPT);
5625 >      conf->host = xstrdup(yylval.string);
5626  
5627 <      add_conf_by_address(CONF_EXEMPTDLINE, yy_aconf);
5817 <      yy_aconf = NULL;
5627 >      add_conf_by_address(CONF_EXEMPT, conf);
5628      }
5629    }
5630   }
5631 + #line 5632 "conf_parser.c" /* yacc.c:1646  */
5632      break;
5633  
5634 <  case 415:
5635 < /* Line 1787 of yacc.c  */
5825 < #line 2414 "conf_parser.y"
5634 >  case 457:
5635 > #line 2488 "conf_parser.y" /* yacc.c:1646  */
5636      {
5637    if (conf_parser_ctx.pass == 2)
5638 <  {
5829 <    regex_ban = 0;
5830 <    reasonbuf[0] = gecos_name[0] = '\0';
5831 <  }
5638 >    reset_block_state();
5639   }
5640 + #line 5641 "conf_parser.c" /* yacc.c:1646  */
5641      break;
5642  
5643 <  case 416:
5644 < /* Line 1787 of yacc.c  */
5837 < #line 2421 "conf_parser.y"
5838 <    {
5839 <  if (conf_parser_ctx.pass == 2)
5840 <  {
5841 <    if (gecos_name[0])
5643 >  case 458:
5644 > #line 2492 "conf_parser.y" /* yacc.c:1646  */
5645      {
5646 <      if (regex_ban)
5844 <      {
5845 < #ifdef HAVE_LIBPCRE
5846 <        void *exp_p = NULL;
5847 <        const char *errptr = NULL;
5848 <
5849 <        if (!(exp_p = ircd_pcre_compile(gecos_name, &errptr)))
5850 <        {
5851 <          ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: %s",
5852 <               errptr);
5853 <          break;
5854 <        }
5855 <
5856 <        yy_conf = make_conf_item(RXLINE_TYPE);
5857 <        yy_conf->regexpname = exp_p;
5858 < #else
5859 <        ilog(LOG_TYPE_IRCD, "Failed to add regular expression based X-Line: no PCRE support");
5860 <        break;
5861 < #endif
5862 <      }
5863 <      else
5864 <        yy_conf = make_conf_item(XLINE_TYPE);
5646 >  struct MaskItem *conf = NULL;
5647  
5648 <      yy_match_item = map_to_conf(yy_conf);
5649 <      DupString(yy_conf->name, gecos_name);
5648 >  if (conf_parser_ctx.pass != 2)
5649 >    break;
5650  
5651 <      if (reasonbuf[0])
5870 <        DupString(yy_match_item->reason, reasonbuf);
5871 <      else
5872 <        DupString(yy_match_item->reason, "No reason");
5873 <    }
5874 <  }
5875 < }
5651 >  if (!block_state.name.buf[0])
5652      break;
5653  
5654 <  case 417:
5655 < /* Line 1787 of yacc.c  */
5656 < #line 2461 "conf_parser.y"
5657 <    {
5654 >  conf = conf_make(CONF_XLINE);
5655 >  conf->name = xstrdup(block_state.name.buf);
5656 >
5657 >  if (block_state.rpass.buf[0])
5658 >    conf->reason = xstrdup(block_state.rpass.buf);
5659 >  else
5660 >    conf->reason = xstrdup(CONF_NOREASON);
5661   }
5662 + #line 5663 "conf_parser.c" /* yacc.c:1646  */
5663      break;
5664  
5665 <  case 421:
5666 < /* Line 1787 of yacc.c  */
5887 < #line 2466 "conf_parser.y"
5665 >  case 464:
5666 > #line 2514 "conf_parser.y" /* yacc.c:1646  */
5667      {
5668    if (conf_parser_ctx.pass == 2)
5669 <    regex_ban = 1;
5669 >    strlcpy(block_state.name.buf, yylval.string, sizeof(block_state.name.buf));
5670   }
5671 + #line 5672 "conf_parser.c" /* yacc.c:1646  */
5672      break;
5673  
5674 <  case 428:
5675 < /* Line 1787 of yacc.c  */
5896 < #line 2475 "conf_parser.y"
5674 >  case 465:
5675 > #line 2520 "conf_parser.y" /* yacc.c:1646  */
5676      {
5677    if (conf_parser_ctx.pass == 2)
5678 <    strlcpy(gecos_name, yylval.string, sizeof(gecos_name));
5678 >    strlcpy(block_state.rpass.buf, yylval.string, sizeof(block_state.rpass.buf));
5679   }
5680 + #line 5681 "conf_parser.c" /* yacc.c:1646  */
5681      break;
5682  
5683 <  case 429:
5684 < /* Line 1787 of yacc.c  */
5905 < #line 2481 "conf_parser.y"
5683 >  case 517:
5684 > #line 2583 "conf_parser.y" /* yacc.c:1646  */
5685      {
5686 <  if (conf_parser_ctx.pass == 2)
5908 <    strlcpy(reasonbuf, yylval.string, sizeof(reasonbuf));
5686 >  ConfigGeneral.away_count = (yyvsp[-1].number);
5687   }
5688 + #line 5689 "conf_parser.c" /* yacc.c:1646  */
5689      break;
5690  
5691 <  case 483:
5692 < /* Line 1787 of yacc.c  */
5914 < #line 2526 "conf_parser.y"
5691 >  case 518:
5692 > #line 2588 "conf_parser.y" /* yacc.c:1646  */
5693      {
5694 <  ConfigFileEntry.max_watch = (yyvsp[(3) - (4)].number);
5694 >  ConfigGeneral.away_time = (yyvsp[-1].number);
5695   }
5696 + #line 5697 "conf_parser.c" /* yacc.c:1646  */
5697      break;
5698  
5699 <  case 484:
5700 < /* Line 1787 of yacc.c  */
5922 < #line 2531 "conf_parser.y"
5699 >  case 519:
5700 > #line 2593 "conf_parser.y" /* yacc.c:1646  */
5701      {
5702 <  if (conf_parser_ctx.pass == 2)
5925 <    ConfigFileEntry.glines = yylval.number;
5702 >  ConfigGeneral.max_watch = (yyvsp[-1].number);
5703   }
5704 + #line 5705 "conf_parser.c" /* yacc.c:1646  */
5705      break;
5706  
5707 <  case 485:
5708 < /* Line 1787 of yacc.c  */
5931 < #line 2537 "conf_parser.y"
5707 >  case 520:
5708 > #line 2598 "conf_parser.y" /* yacc.c:1646  */
5709      {
5710    if (conf_parser_ctx.pass == 2)
5711 <    ConfigFileEntry.gline_time = (yyvsp[(3) - (4)].number);
5711 >    ConfigGeneral.cycle_on_host_change = yylval.number;
5712   }
5713 + #line 5714 "conf_parser.c" /* yacc.c:1646  */
5714      break;
5715  
5716 <  case 486:
5717 < /* Line 1787 of yacc.c  */
5940 < #line 2543 "conf_parser.y"
5716 >  case 521:
5717 > #line 2604 "conf_parser.y" /* yacc.c:1646  */
5718      {
5719    if (conf_parser_ctx.pass == 2)
5720 <    ConfigFileEntry.gline_request_time = (yyvsp[(3) - (4)].number);
5720 >    ConfigGeneral.glines = yylval.number;
5721   }
5722 + #line 5723 "conf_parser.c" /* yacc.c:1646  */
5723      break;
5724  
5725 <  case 487:
5726 < /* Line 1787 of yacc.c  */
5949 < #line 2549 "conf_parser.y"
5725 >  case 522:
5726 > #line 2610 "conf_parser.y" /* yacc.c:1646  */
5727      {
5728 <  ConfigFileEntry.gline_min_cidr = (yyvsp[(3) - (4)].number);
5728 >  if (conf_parser_ctx.pass == 2)
5729 >    ConfigGeneral.gline_time = (yyvsp[-1].number);
5730   }
5731 + #line 5732 "conf_parser.c" /* yacc.c:1646  */
5732      break;
5733  
5734 <  case 488:
5735 < /* Line 1787 of yacc.c  */
5957 < #line 2554 "conf_parser.y"
5734 >  case 523:
5735 > #line 2616 "conf_parser.y" /* yacc.c:1646  */
5736      {
5737 <  ConfigFileEntry.gline_min_cidr6 = (yyvsp[(3) - (4)].number);
5737 >  if (conf_parser_ctx.pass == 2)
5738 >    ConfigGeneral.gline_request_time = (yyvsp[-1].number);
5739   }
5740 + #line 5741 "conf_parser.c" /* yacc.c:1646  */
5741      break;
5742  
5743 <  case 489:
5744 < /* Line 1787 of yacc.c  */
5965 < #line 2559 "conf_parser.y"
5743 >  case 524:
5744 > #line 2622 "conf_parser.y" /* yacc.c:1646  */
5745      {
5746 <  ConfigFileEntry.tkline_expire_notices = yylval.number;
5746 >  ConfigGeneral.gline_min_cidr = (yyvsp[-1].number);
5747   }
5748 + #line 5749 "conf_parser.c" /* yacc.c:1646  */
5749      break;
5750  
5751 <  case 490:
5752 < /* Line 1787 of yacc.c  */
5973 < #line 2564 "conf_parser.y"
5751 >  case 525:
5752 > #line 2627 "conf_parser.y" /* yacc.c:1646  */
5753      {
5754 <  ConfigFileEntry.kill_chase_time_limit = (yyvsp[(3) - (4)].number);
5754 >  ConfigGeneral.gline_min_cidr6 = (yyvsp[-1].number);
5755   }
5756 + #line 5757 "conf_parser.c" /* yacc.c:1646  */
5757      break;
5758  
5759 <  case 491:
5760 < /* Line 1787 of yacc.c  */
5981 < #line 2569 "conf_parser.y"
5759 >  case 526:
5760 > #line 2632 "conf_parser.y" /* yacc.c:1646  */
5761      {
5762 <  ConfigFileEntry.hide_spoof_ips = yylval.number;
5762 >  ConfigGeneral.tkline_expire_notices = yylval.number;
5763   }
5764 + #line 5765 "conf_parser.c" /* yacc.c:1646  */
5765      break;
5766  
5767 <  case 492:
5768 < /* Line 1787 of yacc.c  */
5989 < #line 2574 "conf_parser.y"
5767 >  case 527:
5768 > #line 2637 "conf_parser.y" /* yacc.c:1646  */
5769      {
5770 <  ConfigFileEntry.ignore_bogus_ts = yylval.number;
5770 >  ConfigGeneral.kill_chase_time_limit = (yyvsp[-1].number);
5771   }
5772 + #line 5773 "conf_parser.c" /* yacc.c:1646  */
5773      break;
5774  
5775 <  case 493:
5776 < /* Line 1787 of yacc.c  */
5997 < #line 2579 "conf_parser.y"
5775 >  case 528:
5776 > #line 2642 "conf_parser.y" /* yacc.c:1646  */
5777      {
5778 <  ConfigFileEntry.disable_remote = yylval.number;
5778 >  ConfigGeneral.ignore_bogus_ts = yylval.number;
5779   }
5780 + #line 5781 "conf_parser.c" /* yacc.c:1646  */
5781      break;
5782  
5783 <  case 494:
5784 < /* Line 1787 of yacc.c  */
6005 < #line 2584 "conf_parser.y"
5783 >  case 529:
5784 > #line 2647 "conf_parser.y" /* yacc.c:1646  */
5785      {
5786 <  ConfigFileEntry.failed_oper_notice = yylval.number;
5786 >  ConfigGeneral.failed_oper_notice = yylval.number;
5787   }
5788 + #line 5789 "conf_parser.c" /* yacc.c:1646  */
5789      break;
5790  
5791 <  case 495:
5792 < /* Line 1787 of yacc.c  */
6013 < #line 2589 "conf_parser.y"
5791 >  case 530:
5792 > #line 2652 "conf_parser.y" /* yacc.c:1646  */
5793      {
5794 <  ConfigFileEntry.anti_nick_flood = yylval.number;
5794 >  ConfigGeneral.anti_nick_flood = yylval.number;
5795   }
5796 + #line 5797 "conf_parser.c" /* yacc.c:1646  */
5797      break;
5798  
5799 <  case 496:
5800 < /* Line 1787 of yacc.c  */
6021 < #line 2594 "conf_parser.y"
5799 >  case 531:
5800 > #line 2657 "conf_parser.y" /* yacc.c:1646  */
5801      {
5802 <  ConfigFileEntry.max_nick_time = (yyvsp[(3) - (4)].number);
5802 >  ConfigGeneral.max_nick_time = (yyvsp[-1].number);
5803   }
5804 + #line 5805 "conf_parser.c" /* yacc.c:1646  */
5805      break;
5806  
5807 <  case 497:
5808 < /* Line 1787 of yacc.c  */
6029 < #line 2599 "conf_parser.y"
5807 >  case 532:
5808 > #line 2662 "conf_parser.y" /* yacc.c:1646  */
5809      {
5810 <  ConfigFileEntry.max_nick_changes = (yyvsp[(3) - (4)].number);
5810 >  ConfigGeneral.max_nick_changes = (yyvsp[-1].number);
5811   }
5812 + #line 5813 "conf_parser.c" /* yacc.c:1646  */
5813      break;
5814  
5815 <  case 498:
5816 < /* Line 1787 of yacc.c  */
6037 < #line 2604 "conf_parser.y"
5815 >  case 533:
5816 > #line 2667 "conf_parser.y" /* yacc.c:1646  */
5817      {
5818 <  ConfigFileEntry.max_accept = (yyvsp[(3) - (4)].number);
5818 >  ConfigGeneral.max_accept = (yyvsp[-1].number);
5819   }
5820 + #line 5821 "conf_parser.c" /* yacc.c:1646  */
5821      break;
5822  
5823 <  case 499:
5824 < /* Line 1787 of yacc.c  */
6045 < #line 2609 "conf_parser.y"
5823 >  case 534:
5824 > #line 2672 "conf_parser.y" /* yacc.c:1646  */
5825      {
5826 <  ConfigFileEntry.anti_spam_exit_message_time = (yyvsp[(3) - (4)].number);
5826 >  ConfigGeneral.anti_spam_exit_message_time = (yyvsp[-1].number);
5827   }
5828 + #line 5829 "conf_parser.c" /* yacc.c:1646  */
5829      break;
5830  
5831 <  case 500:
5832 < /* Line 1787 of yacc.c  */
6053 < #line 2614 "conf_parser.y"
5831 >  case 535:
5832 > #line 2677 "conf_parser.y" /* yacc.c:1646  */
5833      {
5834 <  ConfigFileEntry.ts_warn_delta = (yyvsp[(3) - (4)].number);
5834 >  ConfigGeneral.ts_warn_delta = (yyvsp[-1].number);
5835   }
5836 + #line 5837 "conf_parser.c" /* yacc.c:1646  */
5837      break;
5838  
5839 <  case 501:
5840 < /* Line 1787 of yacc.c  */
6061 < #line 2619 "conf_parser.y"
5839 >  case 536:
5840 > #line 2682 "conf_parser.y" /* yacc.c:1646  */
5841      {
5842    if (conf_parser_ctx.pass == 2)
5843 <    ConfigFileEntry.ts_max_delta = (yyvsp[(3) - (4)].number);
5843 >    ConfigGeneral.ts_max_delta = (yyvsp[-1].number);
5844   }
5845 + #line 5846 "conf_parser.c" /* yacc.c:1646  */
5846      break;
5847  
5848 <  case 502:
5849 < /* Line 1787 of yacc.c  */
6070 < #line 2625 "conf_parser.y"
5848 >  case 537:
5849 > #line 2688 "conf_parser.y" /* yacc.c:1646  */
5850      {
5851 <  if (((yyvsp[(3) - (4)].number) > 0) && conf_parser_ctx.pass == 1)
5851 >  if (((yyvsp[-1].number) > 0) && conf_parser_ctx.pass == 1)
5852    {
5853      ilog(LOG_TYPE_IRCD, "You haven't read your config file properly.");
5854      ilog(LOG_TYPE_IRCD, "There is a line in the example conf that will kill your server if not removed.");
# Line 6077 | Line 5856 | yyreduce:
5856      exit(0);
5857    }
5858   }
5859 + #line 5860 "conf_parser.c" /* yacc.c:1646  */
5860      break;
5861  
5862 <  case 503:
5863 < /* Line 1787 of yacc.c  */
6084 < #line 2636 "conf_parser.y"
5862 >  case 538:
5863 > #line 2699 "conf_parser.y" /* yacc.c:1646  */
5864      {
5865 <  ConfigFileEntry.invisible_on_connect = yylval.number;
5865 >  ConfigGeneral.invisible_on_connect = yylval.number;
5866   }
5867 + #line 5868 "conf_parser.c" /* yacc.c:1646  */
5868      break;
5869  
5870 <  case 504:
5871 < /* Line 1787 of yacc.c  */
6092 < #line 2641 "conf_parser.y"
5870 >  case 539:
5871 > #line 2704 "conf_parser.y" /* yacc.c:1646  */
5872      {
5873 <  ConfigFileEntry.warn_no_nline = yylval.number;
5873 >  ConfigGeneral.warn_no_connect_block = yylval.number;
5874   }
5875 + #line 5876 "conf_parser.c" /* yacc.c:1646  */
5876      break;
5877  
5878 <  case 505:
5879 < /* Line 1787 of yacc.c  */
6100 < #line 2646 "conf_parser.y"
5878 >  case 540:
5879 > #line 2709 "conf_parser.y" /* yacc.c:1646  */
5880      {
5881 <  ConfigFileEntry.stats_e_disabled = yylval.number;
5881 >  ConfigGeneral.stats_e_disabled = yylval.number;
5882   }
5883 + #line 5884 "conf_parser.c" /* yacc.c:1646  */
5884      break;
5885  
5886 <  case 506:
5887 < /* Line 1787 of yacc.c  */
6108 < #line 2651 "conf_parser.y"
5886 >  case 541:
5887 > #line 2714 "conf_parser.y" /* yacc.c:1646  */
5888      {
5889 <  ConfigFileEntry.stats_o_oper_only = yylval.number;
5889 >  ConfigGeneral.stats_o_oper_only = yylval.number;
5890   }
5891 + #line 5892 "conf_parser.c" /* yacc.c:1646  */
5892      break;
5893  
5894 <  case 507:
5895 < /* Line 1787 of yacc.c  */
6116 < #line 2656 "conf_parser.y"
5894 >  case 542:
5895 > #line 2719 "conf_parser.y" /* yacc.c:1646  */
5896      {
5897 <  ConfigFileEntry.stats_P_oper_only = yylval.number;
5897 >  ConfigGeneral.stats_P_oper_only = yylval.number;
5898   }
5899 + #line 5900 "conf_parser.c" /* yacc.c:1646  */
5900      break;
5901  
5902 <  case 508:
5903 < /* Line 1787 of yacc.c  */
6124 < #line 2661 "conf_parser.y"
5902 >  case 543:
5903 > #line 2724 "conf_parser.y" /* yacc.c:1646  */
5904      {
5905 <  ConfigFileEntry.stats_k_oper_only = 2 * yylval.number;
5905 >  ConfigGeneral.stats_u_oper_only = yylval.number;
5906   }
5907 + #line 5908 "conf_parser.c" /* yacc.c:1646  */
5908      break;
5909  
5910 <  case 509:
5911 < /* Line 1787 of yacc.c  */
6132 < #line 2664 "conf_parser.y"
5910 >  case 544:
5911 > #line 2729 "conf_parser.y" /* yacc.c:1646  */
5912      {
5913 <  ConfigFileEntry.stats_k_oper_only = 1;
5913 >  ConfigGeneral.stats_k_oper_only = 2 * yylval.number;
5914   }
5915 + #line 5916 "conf_parser.c" /* yacc.c:1646  */
5916      break;
5917  
5918 <  case 510:
5919 < /* Line 1787 of yacc.c  */
6140 < #line 2669 "conf_parser.y"
5918 >  case 545:
5919 > #line 2732 "conf_parser.y" /* yacc.c:1646  */
5920      {
5921 <  ConfigFileEntry.stats_i_oper_only = 2 * yylval.number;
5921 >  ConfigGeneral.stats_k_oper_only = 1;
5922   }
5923 + #line 5924 "conf_parser.c" /* yacc.c:1646  */
5924      break;
5925  
5926 <  case 511:
5927 < /* Line 1787 of yacc.c  */
6148 < #line 2672 "conf_parser.y"
5926 >  case 546:
5927 > #line 2737 "conf_parser.y" /* yacc.c:1646  */
5928      {
5929 <  ConfigFileEntry.stats_i_oper_only = 1;
5929 >  ConfigGeneral.stats_i_oper_only = 2 * yylval.number;
5930   }
5931 + #line 5932 "conf_parser.c" /* yacc.c:1646  */
5932      break;
5933  
5934 <  case 512:
5935 < /* Line 1787 of yacc.c  */
6156 < #line 2677 "conf_parser.y"
5934 >  case 547:
5935 > #line 2740 "conf_parser.y" /* yacc.c:1646  */
5936      {
5937 <  ConfigFileEntry.pace_wait = (yyvsp[(3) - (4)].number);
5937 >  ConfigGeneral.stats_i_oper_only = 1;
5938   }
5939 + #line 5940 "conf_parser.c" /* yacc.c:1646  */
5940      break;
5941  
5942 <  case 513:
5943 < /* Line 1787 of yacc.c  */
6164 < #line 2682 "conf_parser.y"
5942 >  case 548:
5943 > #line 2745 "conf_parser.y" /* yacc.c:1646  */
5944      {
5945 <  ConfigFileEntry.caller_id_wait = (yyvsp[(3) - (4)].number);
5945 >  ConfigGeneral.pace_wait = (yyvsp[-1].number);
5946   }
5947 + #line 5948 "conf_parser.c" /* yacc.c:1646  */
5948      break;
5949  
5950 <  case 514:
5951 < /* Line 1787 of yacc.c  */
6172 < #line 2687 "conf_parser.y"
5950 >  case 549:
5951 > #line 2750 "conf_parser.y" /* yacc.c:1646  */
5952      {
5953 <  ConfigFileEntry.opers_bypass_callerid = yylval.number;
5953 >  ConfigGeneral.caller_id_wait = (yyvsp[-1].number);
5954   }
5955 + #line 5956 "conf_parser.c" /* yacc.c:1646  */
5956      break;
5957  
5958 <  case 515:
5959 < /* Line 1787 of yacc.c  */
6180 < #line 2692 "conf_parser.y"
5958 >  case 550:
5959 > #line 2755 "conf_parser.y" /* yacc.c:1646  */
5960      {
5961 <  ConfigFileEntry.pace_wait_simple = (yyvsp[(3) - (4)].number);
5961 >  ConfigGeneral.opers_bypass_callerid = yylval.number;
5962   }
5963 + #line 5964 "conf_parser.c" /* yacc.c:1646  */
5964      break;
5965  
5966 <  case 516:
5967 < /* Line 1787 of yacc.c  */
6188 < #line 2697 "conf_parser.y"
5966 >  case 551:
5967 > #line 2760 "conf_parser.y" /* yacc.c:1646  */
5968      {
5969 <  ConfigFileEntry.short_motd = yylval.number;
5969 >  ConfigGeneral.pace_wait_simple = (yyvsp[-1].number);
5970   }
5971 + #line 5972 "conf_parser.c" /* yacc.c:1646  */
5972      break;
5973  
5974 <  case 517:
5975 < /* Line 1787 of yacc.c  */
6196 < #line 2702 "conf_parser.y"
5974 >  case 552:
5975 > #line 2765 "conf_parser.y" /* yacc.c:1646  */
5976      {
5977 <  ConfigFileEntry.no_oper_flood = yylval.number;
5977 >  ConfigGeneral.short_motd = yylval.number;
5978   }
5979 + #line 5980 "conf_parser.c" /* yacc.c:1646  */
5980      break;
5981  
5982 <  case 518:
5983 < /* Line 1787 of yacc.c  */
6204 < #line 2707 "conf_parser.y"
5982 >  case 553:
5983 > #line 2770 "conf_parser.y" /* yacc.c:1646  */
5984      {
5985 <  ConfigFileEntry.true_no_oper_flood = yylval.number;
5985 >  ConfigGeneral.no_oper_flood = yylval.number;
5986   }
5987 + #line 5988 "conf_parser.c" /* yacc.c:1646  */
5988      break;
5989  
5990 <  case 519:
5991 < /* Line 1787 of yacc.c  */
6212 < #line 2712 "conf_parser.y"
5990 >  case 554:
5991 > #line 2775 "conf_parser.y" /* yacc.c:1646  */
5992      {
5993 <  ConfigFileEntry.oper_pass_resv = yylval.number;
5993 >  ConfigGeneral.oper_pass_resv = yylval.number;
5994   }
5995 + #line 5996 "conf_parser.c" /* yacc.c:1646  */
5996      break;
5997  
5998 <  case 520:
5999 < /* Line 1787 of yacc.c  */
6220 < #line 2717 "conf_parser.y"
5998 >  case 555:
5999 > #line 2780 "conf_parser.y" /* yacc.c:1646  */
6000      {
6001 <  if (conf_parser_ctx.pass == 2)
6223 <  {
6224 <    if (strlen(yylval.string) > LOCALE_LENGTH-2)
6225 <      yylval.string[LOCALE_LENGTH-1] = '\0';
6226 <
6227 <    set_locale(yylval.string);
6228 <  }
6001 >  ConfigGeneral.dots_in_ident = (yyvsp[-1].number);
6002   }
6003 + #line 6004 "conf_parser.c" /* yacc.c:1646  */
6004      break;
6005  
6006 <  case 521:
6007 < /* Line 1787 of yacc.c  */
6234 < #line 2728 "conf_parser.y"
6006 >  case 556:
6007 > #line 2785 "conf_parser.y" /* yacc.c:1646  */
6008      {
6009 <  ConfigFileEntry.dots_in_ident = (yyvsp[(3) - (4)].number);
6009 >  ConfigGeneral.max_targets = (yyvsp[-1].number);
6010   }
6011 + #line 6012 "conf_parser.c" /* yacc.c:1646  */
6012      break;
6013  
6014 <  case 522:
6015 < /* Line 1787 of yacc.c  */
6242 < #line 2733 "conf_parser.y"
6014 >  case 557:
6015 > #line 2790 "conf_parser.y" /* yacc.c:1646  */
6016      {
6017 <  ConfigFileEntry.max_targets = (yyvsp[(3) - (4)].number);
6017 >  ConfigGeneral.ping_cookie = yylval.number;
6018   }
6019 + #line 6020 "conf_parser.c" /* yacc.c:1646  */
6020      break;
6021  
6022 <  case 523:
6023 < /* Line 1787 of yacc.c  */
6250 < #line 2738 "conf_parser.y"
6022 >  case 558:
6023 > #line 2795 "conf_parser.y" /* yacc.c:1646  */
6024      {
6025 <  ConfigFileEntry.use_egd = yylval.number;
6025 >  ConfigGeneral.disable_auth = yylval.number;
6026   }
6027 + #line 6028 "conf_parser.c" /* yacc.c:1646  */
6028      break;
6029  
6030 <  case 524:
6031 < /* Line 1787 of yacc.c  */
6258 < #line 2743 "conf_parser.y"
6030 >  case 559:
6031 > #line 2800 "conf_parser.y" /* yacc.c:1646  */
6032      {
6033 <  if (conf_parser_ctx.pass == 2)
6261 <  {
6262 <    MyFree(ConfigFileEntry.egdpool_path);
6263 <    DupString(ConfigFileEntry.egdpool_path, yylval.string);
6264 <  }
6033 >  ConfigGeneral.throttle_count = (yyvsp[-1].number);
6034   }
6035 + #line 6036 "conf_parser.c" /* yacc.c:1646  */
6036      break;
6037  
6038 <  case 525:
6039 < /* Line 1787 of yacc.c  */
6270 < #line 2752 "conf_parser.y"
6038 >  case 560:
6039 > #line 2805 "conf_parser.y" /* yacc.c:1646  */
6040      {
6041 <  if (conf_parser_ctx.pass == 2 && valid_servname(yylval.string))
6273 <  {
6274 <    MyFree(ConfigFileEntry.service_name);
6275 <    DupString(ConfigFileEntry.service_name, yylval.string);
6276 <  }
6041 >  ConfigGeneral.throttle_time = (yyvsp[-1].number);
6042   }
6043 + #line 6044 "conf_parser.c" /* yacc.c:1646  */
6044      break;
6045  
6046 <  case 526:
6047 < /* Line 1787 of yacc.c  */
6282 < #line 2761 "conf_parser.y"
6046 >  case 561:
6047 > #line 2810 "conf_parser.y" /* yacc.c:1646  */
6048      {
6049 <  ConfigFileEntry.ping_cookie = yylval.number;
6049 >  ConfigGeneral.oper_umodes = 0;
6050   }
6051 + #line 6052 "conf_parser.c" /* yacc.c:1646  */
6052      break;
6053  
6054 <  case 527:
6055 < /* Line 1787 of yacc.c  */
6290 < #line 2766 "conf_parser.y"
6054 >  case 565:
6055 > #line 2816 "conf_parser.y" /* yacc.c:1646  */
6056      {
6057 <  ConfigFileEntry.disable_auth = yylval.number;
6057 >  ConfigGeneral.oper_umodes |= UMODE_BOTS;
6058   }
6059 + #line 6060 "conf_parser.c" /* yacc.c:1646  */
6060      break;
6061  
6062 <  case 528:
6063 < /* Line 1787 of yacc.c  */
6298 < #line 2771 "conf_parser.y"
6062 >  case 566:
6063 > #line 2819 "conf_parser.y" /* yacc.c:1646  */
6064      {
6065 <  ConfigFileEntry.throttle_time = yylval.number;
6065 >  ConfigGeneral.oper_umodes |= UMODE_CCONN;
6066   }
6067 + #line 6068 "conf_parser.c" /* yacc.c:1646  */
6068      break;
6069  
6070 <  case 529:
6071 < /* Line 1787 of yacc.c  */
6306 < #line 2776 "conf_parser.y"
6070 >  case 567:
6071 > #line 2822 "conf_parser.y" /* yacc.c:1646  */
6072      {
6073 <  ConfigFileEntry.oper_umodes = 0;
6073 >  ConfigGeneral.oper_umodes |= UMODE_DEAF;
6074   }
6075 + #line 6076 "conf_parser.c" /* yacc.c:1646  */
6076      break;
6077  
6078 <  case 533:
6079 < /* Line 1787 of yacc.c  */
6314 < #line 2782 "conf_parser.y"
6078 >  case 568:
6079 > #line 2825 "conf_parser.y" /* yacc.c:1646  */
6080      {
6081 <  ConfigFileEntry.oper_umodes |= UMODE_BOTS;
6081 >  ConfigGeneral.oper_umodes |= UMODE_DEBUG;
6082   }
6083 + #line 6084 "conf_parser.c" /* yacc.c:1646  */
6084      break;
6085  
6086 <  case 534:
6087 < /* Line 1787 of yacc.c  */
6322 < #line 2785 "conf_parser.y"
6086 >  case 569:
6087 > #line 2828 "conf_parser.y" /* yacc.c:1646  */
6088      {
6089 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN;
6089 >  ConfigGeneral.oper_umodes |= UMODE_FULL;
6090   }
6091 + #line 6092 "conf_parser.c" /* yacc.c:1646  */
6092      break;
6093  
6094 <  case 535:
6095 < /* Line 1787 of yacc.c  */
6330 < #line 2788 "conf_parser.y"
6094 >  case 570:
6095 > #line 2831 "conf_parser.y" /* yacc.c:1646  */
6096      {
6097 <  ConfigFileEntry.oper_umodes |= UMODE_CCONN_FULL;
6097 >  ConfigGeneral.oper_umodes |= UMODE_HIDDEN;
6098   }
6099 + #line 6100 "conf_parser.c" /* yacc.c:1646  */
6100      break;
6101  
6102 <  case 536:
6103 < /* Line 1787 of yacc.c  */
6338 < #line 2791 "conf_parser.y"
6102 >  case 571:
6103 > #line 2834 "conf_parser.y" /* yacc.c:1646  */
6104      {
6105 <  ConfigFileEntry.oper_umodes |= UMODE_DEAF;
6105 >  ConfigGeneral.oper_umodes |= UMODE_HIDECHANS;
6106   }
6107 + #line 6108 "conf_parser.c" /* yacc.c:1646  */
6108      break;
6109  
6110 <  case 537:
6111 < /* Line 1787 of yacc.c  */
6346 < #line 2794 "conf_parser.y"
6110 >  case 572:
6111 > #line 2837 "conf_parser.y" /* yacc.c:1646  */
6112      {
6113 <  ConfigFileEntry.oper_umodes |= UMODE_DEBUG;
6113 >  ConfigGeneral.oper_umodes |= UMODE_HIDEIDLE;
6114   }
6115 + #line 6116 "conf_parser.c" /* yacc.c:1646  */
6116      break;
6117  
6118 <  case 538:
6119 < /* Line 1787 of yacc.c  */
6354 < #line 2797 "conf_parser.y"
6118 >  case 573:
6119 > #line 2840 "conf_parser.y" /* yacc.c:1646  */
6120      {
6121 <  ConfigFileEntry.oper_umodes |= UMODE_FULL;
6121 >  ConfigGeneral.oper_umodes |= UMODE_SKILL;
6122   }
6123 + #line 6124 "conf_parser.c" /* yacc.c:1646  */
6124      break;
6125  
6126 <  case 539:
6127 < /* Line 1787 of yacc.c  */
6362 < #line 2800 "conf_parser.y"
6126 >  case 574:
6127 > #line 2843 "conf_parser.y" /* yacc.c:1646  */
6128      {
6129 <  ConfigFileEntry.oper_umodes |= UMODE_HIDDEN;
6129 >  ConfigGeneral.oper_umodes |= UMODE_NCHANGE;
6130   }
6131 + #line 6132 "conf_parser.c" /* yacc.c:1646  */
6132      break;
6133  
6134 <  case 540:
6135 < /* Line 1787 of yacc.c  */
6370 < #line 2803 "conf_parser.y"
6134 >  case 575:
6135 > #line 2846 "conf_parser.y" /* yacc.c:1646  */
6136      {
6137 <  ConfigFileEntry.oper_umodes |= UMODE_SKILL;
6137 >  ConfigGeneral.oper_umodes |= UMODE_REJ;
6138   }
6139 + #line 6140 "conf_parser.c" /* yacc.c:1646  */
6140      break;
6141  
6142 <  case 541:
6143 < /* Line 1787 of yacc.c  */
6378 < #line 2806 "conf_parser.y"
6142 >  case 576:
6143 > #line 2849 "conf_parser.y" /* yacc.c:1646  */
6144      {
6145 <  ConfigFileEntry.oper_umodes |= UMODE_NCHANGE;
6145 >  ConfigGeneral.oper_umodes |= UMODE_UNAUTH;
6146   }
6147 + #line 6148 "conf_parser.c" /* yacc.c:1646  */
6148      break;
6149  
6150 <  case 542:
6151 < /* Line 1787 of yacc.c  */
6386 < #line 2809 "conf_parser.y"
6150 >  case 577:
6151 > #line 2852 "conf_parser.y" /* yacc.c:1646  */
6152      {
6153 <  ConfigFileEntry.oper_umodes |= UMODE_REJ;
6153 >  ConfigGeneral.oper_umodes |= UMODE_SPY;
6154   }
6155 + #line 6156 "conf_parser.c" /* yacc.c:1646  */
6156      break;
6157  
6158 <  case 543:
6159 < /* Line 1787 of yacc.c  */
6394 < #line 2812 "conf_parser.y"
6158 >  case 578:
6159 > #line 2855 "conf_parser.y" /* yacc.c:1646  */
6160      {
6161 <  ConfigFileEntry.oper_umodes |= UMODE_UNAUTH;
6161 >  ConfigGeneral.oper_umodes |= UMODE_EXTERNAL;
6162   }
6163 + #line 6164 "conf_parser.c" /* yacc.c:1646  */
6164      break;
6165  
6166 <  case 544:
6167 < /* Line 1787 of yacc.c  */
6402 < #line 2815 "conf_parser.y"
6166 >  case 579:
6167 > #line 2858 "conf_parser.y" /* yacc.c:1646  */
6168      {
6169 <  ConfigFileEntry.oper_umodes |= UMODE_SPY;
6169 >  ConfigGeneral.oper_umodes |= UMODE_SERVNOTICE;
6170   }
6171 + #line 6172 "conf_parser.c" /* yacc.c:1646  */
6172      break;
6173  
6174 <  case 545:
6175 < /* Line 1787 of yacc.c  */
6410 < #line 2818 "conf_parser.y"
6174 >  case 580:
6175 > #line 2861 "conf_parser.y" /* yacc.c:1646  */
6176      {
6177 <  ConfigFileEntry.oper_umodes |= UMODE_EXTERNAL;
6177 >  ConfigGeneral.oper_umodes |= UMODE_INVISIBLE;
6178   }
6179 + #line 6180 "conf_parser.c" /* yacc.c:1646  */
6180      break;
6181  
6182 <  case 546:
6183 < /* Line 1787 of yacc.c  */
6418 < #line 2821 "conf_parser.y"
6182 >  case 581:
6183 > #line 2864 "conf_parser.y" /* yacc.c:1646  */
6184      {
6185 <  ConfigFileEntry.oper_umodes |= UMODE_OPERWALL;
6185 >  ConfigGeneral.oper_umodes |= UMODE_WALLOP;
6186   }
6187 + #line 6188 "conf_parser.c" /* yacc.c:1646  */
6188      break;
6189  
6190 <  case 547:
6191 < /* Line 1787 of yacc.c  */
6426 < #line 2824 "conf_parser.y"
6190 >  case 582:
6191 > #line 2867 "conf_parser.y" /* yacc.c:1646  */
6192      {
6193 <  ConfigFileEntry.oper_umodes |= UMODE_SERVNOTICE;
6193 >  ConfigGeneral.oper_umodes |= UMODE_SOFTCALLERID;
6194   }
6195 + #line 6196 "conf_parser.c" /* yacc.c:1646  */
6196      break;
6197  
6198 <  case 548:
6199 < /* Line 1787 of yacc.c  */
6434 < #line 2827 "conf_parser.y"
6198 >  case 583:
6199 > #line 2870 "conf_parser.y" /* yacc.c:1646  */
6200      {
6201 <  ConfigFileEntry.oper_umodes |= UMODE_INVISIBLE;
6201 >  ConfigGeneral.oper_umodes |= UMODE_CALLERID;
6202   }
6203 + #line 6204 "conf_parser.c" /* yacc.c:1646  */
6204      break;
6205  
6206 <  case 549:
6207 < /* Line 1787 of yacc.c  */
6442 < #line 2830 "conf_parser.y"
6206 >  case 584:
6207 > #line 2873 "conf_parser.y" /* yacc.c:1646  */
6208      {
6209 <  ConfigFileEntry.oper_umodes |= UMODE_WALLOP;
6209 >  ConfigGeneral.oper_umodes |= UMODE_LOCOPS;
6210   }
6211 + #line 6212 "conf_parser.c" /* yacc.c:1646  */
6212      break;
6213  
6214 <  case 550:
6215 < /* Line 1787 of yacc.c  */
6450 < #line 2833 "conf_parser.y"
6214 >  case 585:
6215 > #line 2876 "conf_parser.y" /* yacc.c:1646  */
6216      {
6217 <  ConfigFileEntry.oper_umodes |= UMODE_SOFTCALLERID;
6217 >  ConfigGeneral.oper_umodes |= UMODE_REGONLY;
6218   }
6219 + #line 6220 "conf_parser.c" /* yacc.c:1646  */
6220      break;
6221  
6222 <  case 551:
6223 < /* Line 1787 of yacc.c  */
6458 < #line 2836 "conf_parser.y"
6222 >  case 586:
6223 > #line 2879 "conf_parser.y" /* yacc.c:1646  */
6224      {
6225 <  ConfigFileEntry.oper_umodes |= UMODE_CALLERID;
6225 >  ConfigGeneral.oper_umodes |= UMODE_FARCONNECT;
6226   }
6227 + #line 6228 "conf_parser.c" /* yacc.c:1646  */
6228      break;
6229  
6230 <  case 552:
6231 < /* Line 1787 of yacc.c  */
6466 < #line 2839 "conf_parser.y"
6230 >  case 587:
6231 > #line 2884 "conf_parser.y" /* yacc.c:1646  */
6232      {
6233 <  ConfigFileEntry.oper_umodes |= UMODE_LOCOPS;
6233 >  ConfigGeneral.oper_only_umodes = 0;
6234   }
6235 + #line 6236 "conf_parser.c" /* yacc.c:1646  */
6236      break;
6237  
6238 <  case 553:
6239 < /* Line 1787 of yacc.c  */
6474 < #line 2844 "conf_parser.y"
6238 >  case 591:
6239 > #line 2890 "conf_parser.y" /* yacc.c:1646  */
6240      {
6241 <  ConfigFileEntry.oper_only_umodes = 0;
6241 >  ConfigGeneral.oper_only_umodes |= UMODE_BOTS;
6242   }
6243 + #line 6244 "conf_parser.c" /* yacc.c:1646  */
6244      break;
6245  
6246 <  case 557:
6247 < /* Line 1787 of yacc.c  */
6482 < #line 2850 "conf_parser.y"
6246 >  case 592:
6247 > #line 2893 "conf_parser.y" /* yacc.c:1646  */
6248      {
6249 <  ConfigFileEntry.oper_only_umodes |= UMODE_BOTS;
6249 >  ConfigGeneral.oper_only_umodes |= UMODE_CCONN;
6250   }
6251 + #line 6252 "conf_parser.c" /* yacc.c:1646  */
6252      break;
6253  
6254 <  case 558:
6255 < /* Line 1787 of yacc.c  */
6490 < #line 2853 "conf_parser.y"
6254 >  case 593:
6255 > #line 2896 "conf_parser.y" /* yacc.c:1646  */
6256      {
6257 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN;
6257 >  ConfigGeneral.oper_only_umodes |= UMODE_DEAF;
6258   }
6259 + #line 6260 "conf_parser.c" /* yacc.c:1646  */
6260      break;
6261  
6262 <  case 559:
6263 < /* Line 1787 of yacc.c  */
6498 < #line 2856 "conf_parser.y"
6262 >  case 594:
6263 > #line 2899 "conf_parser.y" /* yacc.c:1646  */
6264      {
6265 <  ConfigFileEntry.oper_only_umodes |= UMODE_CCONN_FULL;
6265 >  ConfigGeneral.oper_only_umodes |= UMODE_DEBUG;
6266   }
6267 + #line 6268 "conf_parser.c" /* yacc.c:1646  */
6268      break;
6269  
6270 <  case 560:
6271 < /* Line 1787 of yacc.c  */
6506 < #line 2859 "conf_parser.y"
6270 >  case 595:
6271 > #line 2902 "conf_parser.y" /* yacc.c:1646  */
6272      {
6273 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEAF;
6273 >  ConfigGeneral.oper_only_umodes |= UMODE_FULL;
6274   }
6275 + #line 6276 "conf_parser.c" /* yacc.c:1646  */
6276      break;
6277  
6278 <  case 561:
6279 < /* Line 1787 of yacc.c  */
6514 < #line 2862 "conf_parser.y"
6278 >  case 596:
6279 > #line 2905 "conf_parser.y" /* yacc.c:1646  */
6280      {
6281 <  ConfigFileEntry.oper_only_umodes |= UMODE_DEBUG;
6281 >  ConfigGeneral.oper_only_umodes |= UMODE_SKILL;
6282   }
6283 + #line 6284 "conf_parser.c" /* yacc.c:1646  */
6284      break;
6285  
6286 <  case 562:
6287 < /* Line 1787 of yacc.c  */
6522 < #line 2865 "conf_parser.y"
6523 <    {
6524 <  ConfigFileEntry.oper_only_umodes |= UMODE_FULL;
6525 < }
6526 <    break;
6527 <
6528 <  case 563:
6529 < /* Line 1787 of yacc.c  */
6530 < #line 2868 "conf_parser.y"
6286 >  case 597:
6287 > #line 2908 "conf_parser.y" /* yacc.c:1646  */
6288      {
6289 <  ConfigFileEntry.oper_only_umodes |= UMODE_SKILL;
6289 >  ConfigGeneral.oper_only_umodes |= UMODE_HIDDEN;
6290   }
6291 + #line 6292 "conf_parser.c" /* yacc.c:1646  */
6292      break;
6293  
6294 <  case 564:
6295 < /* Line 1787 of yacc.c  */
6538 < #line 2871 "conf_parser.y"
6294 >  case 598:
6295 > #line 2911 "conf_parser.y" /* yacc.c:1646  */
6296      {
6297 <  ConfigFileEntry.oper_only_umodes |= UMODE_HIDDEN;
6297 >  ConfigGeneral.oper_only_umodes |= UMODE_NCHANGE;
6298   }
6299 + #line 6300 "conf_parser.c" /* yacc.c:1646  */
6300      break;
6301  
6302 <  case 565:
6303 < /* Line 1787 of yacc.c  */
6546 < #line 2874 "conf_parser.y"
6302 >  case 599:
6303 > #line 2914 "conf_parser.y" /* yacc.c:1646  */
6304      {
6305 <  ConfigFileEntry.oper_only_umodes |= UMODE_NCHANGE;
6305 >  ConfigGeneral.oper_only_umodes |= UMODE_REJ;
6306   }
6307 + #line 6308 "conf_parser.c" /* yacc.c:1646  */
6308      break;
6309  
6310 <  case 566:
6311 < /* Line 1787 of yacc.c  */
6554 < #line 2877 "conf_parser.y"
6310 >  case 600:
6311 > #line 2917 "conf_parser.y" /* yacc.c:1646  */
6312      {
6313 <  ConfigFileEntry.oper_only_umodes |= UMODE_REJ;
6313 >  ConfigGeneral.oper_only_umodes |= UMODE_UNAUTH;
6314   }
6315 + #line 6316 "conf_parser.c" /* yacc.c:1646  */
6316      break;
6317  
6318 <  case 567:
6319 < /* Line 1787 of yacc.c  */
6562 < #line 2880 "conf_parser.y"
6318 >  case 601:
6319 > #line 2920 "conf_parser.y" /* yacc.c:1646  */
6320      {
6321 <  ConfigFileEntry.oper_only_umodes |= UMODE_UNAUTH;
6321 >  ConfigGeneral.oper_only_umodes |= UMODE_SPY;
6322   }
6323 + #line 6324 "conf_parser.c" /* yacc.c:1646  */
6324      break;
6325  
6326 <  case 568:
6327 < /* Line 1787 of yacc.c  */
6570 < #line 2883 "conf_parser.y"
6326 >  case 602:
6327 > #line 2923 "conf_parser.y" /* yacc.c:1646  */
6328      {
6329 <  ConfigFileEntry.oper_only_umodes |= UMODE_SPY;
6329 >  ConfigGeneral.oper_only_umodes |= UMODE_EXTERNAL;
6330   }
6331 + #line 6332 "conf_parser.c" /* yacc.c:1646  */
6332      break;
6333  
6334 <  case 569:
6335 < /* Line 1787 of yacc.c  */
6578 < #line 2886 "conf_parser.y"
6334 >  case 603:
6335 > #line 2926 "conf_parser.y" /* yacc.c:1646  */
6336      {
6337 <  ConfigFileEntry.oper_only_umodes |= UMODE_EXTERNAL;
6337 >  ConfigGeneral.oper_only_umodes |= UMODE_SERVNOTICE;
6338   }
6339 + #line 6340 "conf_parser.c" /* yacc.c:1646  */
6340      break;
6341  
6342 <  case 570:
6343 < /* Line 1787 of yacc.c  */
6586 < #line 2889 "conf_parser.y"
6342 >  case 604:
6343 > #line 2929 "conf_parser.y" /* yacc.c:1646  */
6344      {
6345 <  ConfigFileEntry.oper_only_umodes |= UMODE_OPERWALL;
6345 >  ConfigGeneral.oper_only_umodes |= UMODE_INVISIBLE;
6346   }
6347 + #line 6348 "conf_parser.c" /* yacc.c:1646  */
6348      break;
6349  
6350 <  case 571:
6351 < /* Line 1787 of yacc.c  */
6594 < #line 2892 "conf_parser.y"
6350 >  case 605:
6351 > #line 2932 "conf_parser.y" /* yacc.c:1646  */
6352      {
6353 <  ConfigFileEntry.oper_only_umodes |= UMODE_SERVNOTICE;
6353 >  ConfigGeneral.oper_only_umodes |= UMODE_WALLOP;
6354   }
6355 + #line 6356 "conf_parser.c" /* yacc.c:1646  */
6356      break;
6357  
6358 <  case 572:
6359 < /* Line 1787 of yacc.c  */
6602 < #line 2895 "conf_parser.y"
6358 >  case 606:
6359 > #line 2935 "conf_parser.y" /* yacc.c:1646  */
6360      {
6361 <  ConfigFileEntry.oper_only_umodes |= UMODE_INVISIBLE;
6361 >  ConfigGeneral.oper_only_umodes |= UMODE_SOFTCALLERID;
6362   }
6363 + #line 6364 "conf_parser.c" /* yacc.c:1646  */
6364      break;
6365  
6366 <  case 573:
6367 < /* Line 1787 of yacc.c  */
6610 < #line 2898 "conf_parser.y"
6366 >  case 607:
6367 > #line 2938 "conf_parser.y" /* yacc.c:1646  */
6368      {
6369 <  ConfigFileEntry.oper_only_umodes |= UMODE_WALLOP;
6369 >  ConfigGeneral.oper_only_umodes |= UMODE_CALLERID;
6370   }
6371 + #line 6372 "conf_parser.c" /* yacc.c:1646  */
6372      break;
6373  
6374 <  case 574:
6375 < /* Line 1787 of yacc.c  */
6618 < #line 2901 "conf_parser.y"
6374 >  case 608:
6375 > #line 2941 "conf_parser.y" /* yacc.c:1646  */
6376      {
6377 <  ConfigFileEntry.oper_only_umodes |= UMODE_SOFTCALLERID;
6377 >  ConfigGeneral.oper_only_umodes |= UMODE_LOCOPS;
6378   }
6379 + #line 6380 "conf_parser.c" /* yacc.c:1646  */
6380      break;
6381  
6382 <  case 575:
6383 < /* Line 1787 of yacc.c  */
6626 < #line 2904 "conf_parser.y"
6382 >  case 609:
6383 > #line 2944 "conf_parser.y" /* yacc.c:1646  */
6384      {
6385 <  ConfigFileEntry.oper_only_umodes |= UMODE_CALLERID;
6385 >  ConfigGeneral.oper_only_umodes |= UMODE_REGONLY;
6386   }
6387 + #line 6388 "conf_parser.c" /* yacc.c:1646  */
6388      break;
6389  
6390 <  case 576:
6391 < /* Line 1787 of yacc.c  */
6634 < #line 2907 "conf_parser.y"
6390 >  case 610:
6391 > #line 2947 "conf_parser.y" /* yacc.c:1646  */
6392      {
6393 <  ConfigFileEntry.oper_only_umodes |= UMODE_LOCOPS;
6393 >  ConfigGeneral.oper_only_umodes |= UMODE_FARCONNECT;
6394   }
6395 + #line 6396 "conf_parser.c" /* yacc.c:1646  */
6396      break;
6397  
6398 <  case 577:
6399 < /* Line 1787 of yacc.c  */
6642 < #line 2912 "conf_parser.y"
6398 >  case 611:
6399 > #line 2952 "conf_parser.y" /* yacc.c:1646  */
6400      {
6401 <  ConfigFileEntry.min_nonwildcard = (yyvsp[(3) - (4)].number);
6401 >  ConfigGeneral.min_nonwildcard = (yyvsp[-1].number);
6402   }
6403 + #line 6404 "conf_parser.c" /* yacc.c:1646  */
6404      break;
6405  
6406 <  case 578:
6407 < /* Line 1787 of yacc.c  */
6650 < #line 2917 "conf_parser.y"
6406 >  case 612:
6407 > #line 2957 "conf_parser.y" /* yacc.c:1646  */
6408      {
6409 <  ConfigFileEntry.min_nonwildcard_simple = (yyvsp[(3) - (4)].number);
6409 >  ConfigGeneral.min_nonwildcard_simple = (yyvsp[-1].number);
6410   }
6411 + #line 6412 "conf_parser.c" /* yacc.c:1646  */
6412      break;
6413  
6414 <  case 579:
6415 < /* Line 1787 of yacc.c  */
6658 < #line 2922 "conf_parser.y"
6414 >  case 613:
6415 > #line 2962 "conf_parser.y" /* yacc.c:1646  */
6416      {
6417 <  ConfigFileEntry.default_floodcount = (yyvsp[(3) - (4)].number);
6417 >  ConfigGeneral.default_floodcount = (yyvsp[-1].number);
6418   }
6419 + #line 6420 "conf_parser.c" /* yacc.c:1646  */
6420      break;
6421  
6422 <  case 598:
6423 < /* Line 1787 of yacc.c  */
6666 < #line 2945 "conf_parser.y"
6422 >  case 632:
6423 > #line 2991 "conf_parser.y" /* yacc.c:1646  */
6424      {
6425    ConfigChannel.disable_fake_channels = yylval.number;
6426   }
6427 + #line 6428 "conf_parser.c" /* yacc.c:1646  */
6428      break;
6429  
6430 <  case 599:
6431 < /* Line 1787 of yacc.c  */
6674 < #line 2950 "conf_parser.y"
6430 >  case 633:
6431 > #line 2996 "conf_parser.y" /* yacc.c:1646  */
6432      {
6433 <  ConfigChannel.restrict_channels = yylval.number;
6433 >  ConfigChannel.invite_client_count = (yyvsp[-1].number);
6434   }
6435 + #line 6436 "conf_parser.c" /* yacc.c:1646  */
6436      break;
6437  
6438 <  case 600:
6439 < /* Line 1787 of yacc.c  */
6682 < #line 2955 "conf_parser.y"
6438 >  case 634:
6439 > #line 3001 "conf_parser.y" /* yacc.c:1646  */
6440      {
6441 <  ConfigChannel.knock_delay = (yyvsp[(3) - (4)].number);
6441 >  ConfigChannel.invite_client_time = (yyvsp[-1].number);
6442   }
6443 + #line 6444 "conf_parser.c" /* yacc.c:1646  */
6444      break;
6445  
6446 <  case 601:
6447 < /* Line 1787 of yacc.c  */
6690 < #line 2960 "conf_parser.y"
6446 >  case 635:
6447 > #line 3006 "conf_parser.y" /* yacc.c:1646  */
6448      {
6449 <  ConfigChannel.knock_delay_channel = (yyvsp[(3) - (4)].number);
6449 >  ConfigChannel.knock_client_count = (yyvsp[-1].number);
6450   }
6451 + #line 6452 "conf_parser.c" /* yacc.c:1646  */
6452      break;
6453  
6454 <  case 602:
6455 < /* Line 1787 of yacc.c  */
6698 < #line 2965 "conf_parser.y"
6454 >  case 636:
6455 > #line 3011 "conf_parser.y" /* yacc.c:1646  */
6456      {
6457 <  ConfigChannel.max_chans_per_user = (yyvsp[(3) - (4)].number);
6457 >  ConfigChannel.knock_client_time = (yyvsp[-1].number);
6458   }
6459 + #line 6460 "conf_parser.c" /* yacc.c:1646  */
6460      break;
6461  
6462 <  case 603:
6463 < /* Line 1787 of yacc.c  */
6706 < #line 2970 "conf_parser.y"
6462 >  case 637:
6463 > #line 3016 "conf_parser.y" /* yacc.c:1646  */
6464      {
6465 <  ConfigChannel.max_chans_per_oper = (yyvsp[(3) - (4)].number);
6465 >  ConfigChannel.knock_delay_channel = (yyvsp[-1].number);
6466   }
6467 + #line 6468 "conf_parser.c" /* yacc.c:1646  */
6468      break;
6469  
6470 <  case 604:
6471 < /* Line 1787 of yacc.c  */
6714 < #line 2975 "conf_parser.y"
6470 >  case 638:
6471 > #line 3021 "conf_parser.y" /* yacc.c:1646  */
6472      {
6473 <  ConfigChannel.quiet_on_ban = yylval.number;
6473 >  ConfigChannel.max_channels = (yyvsp[-1].number);
6474   }
6475 + #line 6476 "conf_parser.c" /* yacc.c:1646  */
6476      break;
6477  
6478 <  case 605:
6479 < /* Line 1787 of yacc.c  */
6722 < #line 2980 "conf_parser.y"
6478 >  case 639:
6479 > #line 3026 "conf_parser.y" /* yacc.c:1646  */
6480      {
6481 <  ConfigChannel.max_bans = (yyvsp[(3) - (4)].number);
6481 >  ConfigChannel.max_bans = (yyvsp[-1].number);
6482   }
6483 + #line 6484 "conf_parser.c" /* yacc.c:1646  */
6484      break;
6485  
6486 <  case 606:
6487 < /* Line 1787 of yacc.c  */
6730 < #line 2985 "conf_parser.y"
6486 >  case 640:
6487 > #line 3031 "conf_parser.y" /* yacc.c:1646  */
6488      {
6489 <  ConfigChannel.default_split_user_count = (yyvsp[(3) - (4)].number);
6489 >  ConfigChannel.default_split_user_count = (yyvsp[-1].number);
6490   }
6491 + #line 6492 "conf_parser.c" /* yacc.c:1646  */
6492      break;
6493  
6494 <  case 607:
6495 < /* Line 1787 of yacc.c  */
6738 < #line 2990 "conf_parser.y"
6494 >  case 641:
6495 > #line 3036 "conf_parser.y" /* yacc.c:1646  */
6496      {
6497 <  ConfigChannel.default_split_server_count = (yyvsp[(3) - (4)].number);
6497 >  ConfigChannel.default_split_server_count = (yyvsp[-1].number);
6498   }
6499 + #line 6500 "conf_parser.c" /* yacc.c:1646  */
6500      break;
6501  
6502 <  case 608:
6503 < /* Line 1787 of yacc.c  */
6746 < #line 2995 "conf_parser.y"
6502 >  case 642:
6503 > #line 3041 "conf_parser.y" /* yacc.c:1646  */
6504      {
6505    ConfigChannel.no_create_on_split = yylval.number;
6506   }
6507 + #line 6508 "conf_parser.c" /* yacc.c:1646  */
6508      break;
6509  
6510 <  case 609:
6511 < /* Line 1787 of yacc.c  */
6754 < #line 3000 "conf_parser.y"
6510 >  case 643:
6511 > #line 3046 "conf_parser.y" /* yacc.c:1646  */
6512      {
6513    ConfigChannel.no_join_on_split = yylval.number;
6514   }
6515 + #line 6516 "conf_parser.c" /* yacc.c:1646  */
6516      break;
6517  
6518 <  case 610:
6519 < /* Line 1787 of yacc.c  */
6762 < #line 3005 "conf_parser.y"
6518 >  case 644:
6519 > #line 3051 "conf_parser.y" /* yacc.c:1646  */
6520      {
6521    GlobalSetOptions.joinfloodcount = yylval.number;
6522   }
6523 + #line 6524 "conf_parser.c" /* yacc.c:1646  */
6524      break;
6525  
6526 <  case 611:
6527 < /* Line 1787 of yacc.c  */
6770 < #line 3010 "conf_parser.y"
6526 >  case 645:
6527 > #line 3056 "conf_parser.y" /* yacc.c:1646  */
6528      {
6529 <  GlobalSetOptions.joinfloodtime = yylval.number;
6529 >  GlobalSetOptions.joinfloodtime = (yyvsp[-1].number);
6530   }
6531 + #line 6532 "conf_parser.c" /* yacc.c:1646  */
6532      break;
6533  
6534 <  case 622:
6535 < /* Line 1787 of yacc.c  */
6778 < #line 3028 "conf_parser.y"
6534 >  case 658:
6535 > #line 3078 "conf_parser.y" /* yacc.c:1646  */
6536      {
6537    if (conf_parser_ctx.pass == 2)
6538      ConfigServerHide.flatten_links = yylval.number;
6539   }
6540 + #line 6541 "conf_parser.c" /* yacc.c:1646  */
6541 +    break;
6542 +
6543 +  case 659:
6544 + #line 3084 "conf_parser.y" /* yacc.c:1646  */
6545 +    {
6546 +  if (conf_parser_ctx.pass == 2)
6547 +    ConfigServerHide.disable_remote_commands = yylval.number;
6548 + }
6549 + #line 6550 "conf_parser.c" /* yacc.c:1646  */
6550      break;
6551  
6552 <  case 623:
6553 < /* Line 1787 of yacc.c  */
6787 < #line 3034 "conf_parser.y"
6552 >  case 660:
6553 > #line 3090 "conf_parser.y" /* yacc.c:1646  */
6554      {
6555    if (conf_parser_ctx.pass == 2)
6556      ConfigServerHide.hide_servers = yylval.number;
6557   }
6558 + #line 6559 "conf_parser.c" /* yacc.c:1646  */
6559 +    break;
6560 +
6561 +  case 661:
6562 + #line 3096 "conf_parser.y" /* yacc.c:1646  */
6563 +    {
6564 +  if (conf_parser_ctx.pass == 2)
6565 +    ConfigServerHide.hide_services = yylval.number;
6566 + }
6567 + #line 6568 "conf_parser.c" /* yacc.c:1646  */
6568      break;
6569  
6570 <  case 624:
6571 < /* Line 1787 of yacc.c  */
6796 < #line 3040 "conf_parser.y"
6570 >  case 662:
6571 > #line 3102 "conf_parser.y" /* yacc.c:1646  */
6572      {
6573    if (conf_parser_ctx.pass == 2)
6574    {
6575      MyFree(ConfigServerHide.hidden_name);
6576 <    DupString(ConfigServerHide.hidden_name, yylval.string);
6576 >    ConfigServerHide.hidden_name = xstrdup(yylval.string);
6577    }
6578   }
6579 + #line 6580 "conf_parser.c" /* yacc.c:1646  */
6580      break;
6581  
6582 <  case 625:
6583 < /* Line 1787 of yacc.c  */
6808 < #line 3049 "conf_parser.y"
6582 >  case 663:
6583 > #line 3111 "conf_parser.y" /* yacc.c:1646  */
6584      {
6585    if (conf_parser_ctx.pass == 2)
6586    {
6587 <    if (((yyvsp[(3) - (4)].number) > 0) && ConfigServerHide.links_disabled == 1)
6587 >    if (((yyvsp[-1].number) > 0) && ConfigServerHide.links_disabled == 1)
6588      {
6589 <      eventAddIsh("write_links_file", write_links_file, NULL, (yyvsp[(3) - (4)].number));
6589 >      event_write_links_file.when = (yyvsp[-1].number);
6590 >      event_addish(&event_write_links_file, NULL);
6591        ConfigServerHide.links_disabled = 0;
6592      }
6593  
6594 <    ConfigServerHide.links_delay = (yyvsp[(3) - (4)].number);
6594 >    ConfigServerHide.links_delay = (yyvsp[-1].number);
6595    }
6596   }
6597 + #line 6598 "conf_parser.c" /* yacc.c:1646  */
6598      break;
6599  
6600 <  case 626:
6601 < /* Line 1787 of yacc.c  */
6825 < #line 3063 "conf_parser.y"
6600 >  case 664:
6601 > #line 3126 "conf_parser.y" /* yacc.c:1646  */
6602      {
6603    if (conf_parser_ctx.pass == 2)
6604      ConfigServerHide.hidden = yylval.number;
6605   }
6606 + #line 6607 "conf_parser.c" /* yacc.c:1646  */
6607      break;
6608  
6609 <  case 627:
6610 < /* Line 1787 of yacc.c  */
6834 < #line 3069 "conf_parser.y"
6609 >  case 665:
6610 > #line 3132 "conf_parser.y" /* yacc.c:1646  */
6611      {
6612    if (conf_parser_ctx.pass == 2)
6613      ConfigServerHide.hide_server_ips = yylval.number;
6614   }
6615 + #line 6616 "conf_parser.c" /* yacc.c:1646  */
6616      break;
6617  
6618  
6619 < /* Line 1787 of yacc.c  */
6843 < #line 6844 "conf_parser.c"
6619 > #line 6620 "conf_parser.c" /* yacc.c:1646  */
6620        default: break;
6621      }
6622    /* User semantic actions sometimes alter yychar, and that requires
# Line 6862 | Line 6638 | yyreduce:
6638  
6639    *++yyvsp = yyval;
6640  
6641 <  /* Now `shift' the result of the reduction.  Determine what state
6641 >  /* Now 'shift' the result of the reduction.  Determine what state
6642       that goes to, based on the state we popped back to and the rule
6643       number reduced by.  */
6644  
# Line 6877 | Line 6653 | yyreduce:
6653    goto yynewstate;
6654  
6655  
6656 < /*------------------------------------.
6657 < | yyerrlab -- here on detecting error |
6658 < `------------------------------------*/
6656 > /*--------------------------------------.
6657 > | yyerrlab -- here on detecting error.  |
6658 > `--------------------------------------*/
6659   yyerrlab:
6660    /* Make sure we have latest lookahead translation.  See comments at
6661       user semantic actions for why this is necessary.  */
# Line 6930 | Line 6706 | yyerrlab:
6706    if (yyerrstatus == 3)
6707      {
6708        /* If just tried and failed to reuse lookahead token after an
6709 <         error, discard it.  */
6709 >         error, discard it.  */
6710  
6711        if (yychar <= YYEOF)
6712 <        {
6713 <          /* Return failure if at end of input.  */
6714 <          if (yychar == YYEOF)
6715 <            YYABORT;
6716 <        }
6712 >        {
6713 >          /* Return failure if at end of input.  */
6714 >          if (yychar == YYEOF)
6715 >            YYABORT;
6716 >        }
6717        else
6718 <        {
6719 <          yydestruct ("Error: discarding",
6720 <                      yytoken, &yylval);
6721 <          yychar = YYEMPTY;
6722 <        }
6718 >        {
6719 >          yydestruct ("Error: discarding",
6720 >                      yytoken, &yylval);
6721 >          yychar = YYEMPTY;
6722 >        }
6723      }
6724  
6725    /* Else will try to reuse lookahead token after shifting the error
# Line 6962 | Line 6738 | yyerrorlab:
6738    if (/*CONSTCOND*/ 0)
6739       goto yyerrorlab;
6740  
6741 <  /* Do not reclaim the symbols of the rule which action triggered
6741 >  /* Do not reclaim the symbols of the rule whose action triggered
6742       this YYERROR.  */
6743    YYPOPSTACK (yylen);
6744    yylen = 0;
# Line 6975 | Line 6751 | yyerrorlab:
6751   | yyerrlab1 -- common code for both syntax error and YYERROR.  |
6752   `-------------------------------------------------------------*/
6753   yyerrlab1:
6754 <  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6754 >  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
6755  
6756    for (;;)
6757      {
6758        yyn = yypact[yystate];
6759        if (!yypact_value_is_default (yyn))
6760 <        {
6761 <          yyn += YYTERROR;
6762 <          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6763 <            {
6764 <              yyn = yytable[yyn];
6765 <              if (0 < yyn)
6766 <                break;
6767 <            }
6768 <        }
6760 >        {
6761 >          yyn += YYTERROR;
6762 >          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
6763 >            {
6764 >              yyn = yytable[yyn];
6765 >              if (0 < yyn)
6766 >                break;
6767 >            }
6768 >        }
6769  
6770        /* Pop the current state because it cannot handle the error token.  */
6771        if (yyssp == yyss)
6772 <        YYABORT;
6772 >        YYABORT;
6773  
6774  
6775        yydestruct ("Error: popping",
6776 <                  yystos[yystate], yyvsp);
6776 >                  yystos[yystate], yyvsp);
6777        YYPOPSTACK (1);
6778        yystate = *yyssp;
6779        YY_STACK_PRINT (yyss, yyssp);
6780      }
6781  
6782 +  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
6783    *++yyvsp = yylval;
6784 +  YY_IGNORE_MAYBE_UNINITIALIZED_END
6785  
6786  
6787    /* Shift the error token.  */
# Line 7046 | Line 6824 | yyreturn:
6824        yydestruct ("Cleanup: discarding lookahead",
6825                    yytoken, &yylval);
6826      }
6827 <  /* Do not reclaim the symbols of the rule which action triggered
6827 >  /* Do not reclaim the symbols of the rule whose action triggered
6828       this YYABORT or YYACCEPT.  */
6829    YYPOPSTACK (yylen);
6830    YY_STACK_PRINT (yyss, yyssp);
6831    while (yyssp != yyss)
6832      {
6833        yydestruct ("Cleanup: popping",
6834 <                  yystos[*yyssp], yyvsp);
6834 >                  yystos[*yyssp], yyvsp);
6835        YYPOPSTACK (1);
6836      }
6837   #ifndef yyoverflow
# Line 7064 | Line 6842 | yyreturn:
6842    if (yymsg != yymsgbuf)
6843      YYSTACK_FREE (yymsg);
6844   #endif
6845 <  /* Make sure YYID is used.  */
7068 <  return YYID (yyresult);
6845 >  return yyresult;
6846   }
7070
7071

Comparing:
ircd-hybrid-8/src/conf_parser.c (property svn:keywords), Revision 1549 by michael, Mon Oct 1 18:11:11 2012 UTC vs.
ircd-hybrid/branches/8.2.x/src/conf_parser.c (property svn:keywords), Revision 4988 by michael, Mon Dec 8 20:04:42 2014 UTC

# Line 0 | Line 1
1 + Id Revision

Diff Legend

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