[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Sun Sep 14 03:18:35 UTC 2008


#### ChangeSet ####
2008-09-13 23:07:30-04:00, stenn at pogo.udel.edu 
  [Bug 1065] Re-enable support for the timingstats file

==== ChangeLog ====
2008-09-13 23:07:24-04:00, stenn at pogo.udel.edu +1 -0
  [Bug 1065] Re-enable support for the timingstats file

--- 1.223/ChangeLog	2008-09-13 07:48:57 -04:00
+++ 1.224/ChangeLog	2008-09-13 23:07:24 -04:00
@@ -1,3 +1,4 @@
+* [Bug 1065] Re-enable support for the timingstats file.
 (4.2.5p130) 2008/09/13 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1064] Implement --with-net-snmp-config=progname
 * [Bug 1063] ntpSnmpSubagentObject.h is missing from the distribution.

#### ChangeSet ####
2008-09-13 23:03:22-04:00, stenn at pogo.udel.edu 
  rebuild ntp_parser.[ch] with newer bison

==== ntpd/ntp_parser.c ====
2008-09-13 23:02:50-04:00, stenn at pogo.udel.edu +2449 -1618
  rebuild with newer bison

--- 1.29/ntpd/ntp_parser.c	2008-09-12 09:37:53 -04:00
+++ 1.30/ntpd/ntp_parser.c	2008-09-13 23:02:50 -04:00
@@ -1,162 +1,385 @@
-/* A Bison parser, made from /usa/utterback/ntp-dev/ntpd/ntp_parser.y
-   by GNU bison 1.35.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-#define YYBISON 1  /* Identify Bison output.  */
+/* Skeleton implementation for Bison's Yacc-like parsers in C
 
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_Bias	265
-# define	T_Broadcast	266
-# define	T_Broadcastclient	267
-# define	T_Broadcastdelay	268
-# define	T_Burst	269
-# define	T_Calibrate	270
-# define	T_Calldelay	271
-# define	T_Ceiling	272
-# define	T_Clockstats	273
-# define	T_Cohort	274
-# define	T_ControlKey	275
-# define	T_Crypto	276
-# define	T_Cryptostats	277
-# define	T_Day	278
-# define	T_Default	279
-# define	T_Disable	280
-# define	T_Discard	281
-# define	T_Dispersion	282
-# define	T_Double	283
-# define	T_Driftfile	284
-# define	T_WanderThreshold	285
-# define	T_Enable	286
-# define	T_End	287
-# define	T_False	288
-# define	T_File	289
-# define	T_Filegen	290
-# define	T_Flag1	291
-# define	T_Flag2	292
-# define	T_Flag3	293
-# define	T_Flag4	294
-# define	T_Flake	295
-# define	T_Floor	296
-# define	T_Freq	297
-# define	T_Fudge	298
-# define	T_Host	299
-# define	T_Huffpuff	300
-# define	T_IPv4_address	301
-# define	T_IPv6_address	302
-# define	T_Iburst	303
-# define	T_Ident	304
-# define	T_Ignore	305
-# define	T_Includefile	306
-# define	T_Integer	307
-# define	T_Interface	308
-# define	T_Kernel	309
-# define	T_Key	310
-# define	T_Keys	311
-# define	T_Keysdir	312
-# define	T_Kod	313
-# define	T_Leap	314
-# define	T_Leapfile	315
-# define	T_Limited	316
-# define	T_Link	317
-# define	T_Logconfig	318
-# define	T_Logfile	319
-# define	T_Loopstats	320
-# define	T_Lowpriotrap	321
-# define	T_Manycastclient	322
-# define	T_Manycastserver	323
-# define	T_Mask	324
-# define	T_Maxclock	325
-# define	T_Maxdist	326
-# define	T_Maxhop	327
-# define	T_Maxpoll	328
-# define	T_Minclock	329
-# define	T_Mindist	330
-# define	T_Minimum	331
-# define	T_Minpoll	332
-# define	T_Minsane	333
-# define	T_Mode	334
-# define	T_Monitor	335
-# define	T_Month	336
-# define	T_Multicastclient	337
-# define	T_Nolink	338
-# define	T_Nomodify	339
-# define	T_None	340
-# define	T_Nopeer	341
-# define	T_Noquery	342
-# define	T_Noselect	343
-# define	T_Noserve	344
-# define	T_Notrap	345
-# define	T_Notrust	346
-# define	T_Novolley	347
-# define	T_Ntp	348
-# define	T_Ntpport	349
-# define	T_Orphan	350
-# define	T_Panic	351
-# define	T_Peer	352
-# define	T_Peerstats	353
-# define	T_Phone	354
-# define	T_Pid	355
-# define	T_Pidfile	356
-# define	T_Pool	357
-# define	T_Port	358
-# define	T_Pps	359
-# define	T_Preempt	360
-# define	T_Prefer	361
-# define	T_Protostats	362
-# define	T_Pw	363
-# define	T_Qos	364
-# define	T_RandFile	365
-# define	T_Rawstats	366
-# define	T_Refid	367
-# define	T_Requestkey	368
-# define	T_Restrict	369
-# define	T_Revoke	370
-# define	T_Server	371
-# define	T_Setvar	372
-# define	T_Sign	373
-# define	T_Statistics	374
-# define	T_Stats	375
-# define	T_Statsdir	376
-# define	T_Step	377
-# define	T_Stepout	378
-# define	T_Stratum	379
-# define	T_String	380
-# define	T_Sysstats	381
-# define	T_Tick	382
-# define	T_Time1	383
-# define	T_Time2	384
-# define	T_Timingstats	385
-# define	T_Tinker	386
-# define	T_Tos	387
-# define	T_Trap	388
-# define	T_True	389
-# define	T_Trustedkey	390
-# define	T_Ttl	391
-# define	T_Type	392
-# define	T_Version	393
-# define	T_Week	394
-# define	T_Xleave	395
-# define	T_Year	396
-# define	T_Flag	397
-# define	T_Void	398
-# define	T_EOC	399
-# define	T_Simulate	400
-# define	T_Beep_Delay	401
-# define	T_Sim_Duration	402
-# define	T_Server_Offset	403
-# define	T_Duration	404
-# define	T_Freq_Offset	405
-# define	T_Wander	406
-# define	T_Jitter	407
-# define	T_Prop_Delay	408
-# define	T_Proc_Delay	409
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_Age = 258,
+     T_Allan = 259,
+     T_Auth = 260,
+     T_Autokey = 261,
+     T_Automax = 262,
+     T_Average = 263,
+     T_Bclient = 264,
+     T_Beacon = 265,
+     T_Bias = 266,
+     T_Broadcast = 267,
+     T_Broadcastclient = 268,
+     T_Broadcastdelay = 269,
+     T_Burst = 270,
+     T_Calibrate = 271,
+     T_Calldelay = 272,
+     T_Ceiling = 273,
+     T_Clockstats = 274,
+     T_Cohort = 275,
+     T_ControlKey = 276,
+     T_Crypto = 277,
+     T_Cryptostats = 278,
+     T_Day = 279,
+     T_Default = 280,
+     T_Disable = 281,
+     T_Discard = 282,
+     T_Dispersion = 283,
+     T_Double = 284,
+     T_Driftfile = 285,
+     T_WanderThreshold = 286,
+     T_Enable = 287,
+     T_End = 288,
+     T_False = 289,
+     T_File = 290,
+     T_Filegen = 291,
+     T_Flag1 = 292,
+     T_Flag2 = 293,
+     T_Flag3 = 294,
+     T_Flag4 = 295,
+     T_Flake = 296,
+     T_Floor = 297,
+     T_Freq = 298,
+     T_Fudge = 299,
+     T_Host = 300,
+     T_Huffpuff = 301,
+     T_IPv4_address = 302,
+     T_IPv6_address = 303,
+     T_Iburst = 304,
+     T_Ident = 305,
+     T_Ignore = 306,
+     T_Includefile = 307,
+     T_Integer = 308,
+     T_Interface = 309,
+     T_Kernel = 310,
+     T_Key = 311,
+     T_Keys = 312,
+     T_Keysdir = 313,
+     T_Kod = 314,
+     T_Leap = 315,
+     T_Leapfile = 316,
+     T_Limited = 317,
+     T_Link = 318,
+     T_Logconfig = 319,
+     T_Logfile = 320,
+     T_Loopstats = 321,
+     T_Lowpriotrap = 322,
+     T_Manycastclient = 323,
+     T_Manycastserver = 324,
+     T_Mask = 325,
+     T_Maxclock = 326,
+     T_Maxdist = 327,
+     T_Maxhop = 328,
+     T_Maxpoll = 329,
+     T_Minclock = 330,
+     T_Mindist = 331,
+     T_Minimum = 332,
+     T_Minpoll = 333,
+     T_Minsane = 334,
+     T_Mode = 335,
+     T_Monitor = 336,
+     T_Month = 337,
+     T_Multicastclient = 338,
+     T_Nolink = 339,
+     T_Nomodify = 340,
+     T_None = 341,
+     T_Nopeer = 342,
+     T_Noquery = 343,
+     T_Noselect = 344,
+     T_Noserve = 345,
+     T_Notrap = 346,
+     T_Notrust = 347,
+     T_Novolley = 348,
+     T_Ntp = 349,
+     T_Ntpport = 350,
+     T_Orphan = 351,
+     T_Panic = 352,
+     T_Peer = 353,
+     T_Peerstats = 354,
+     T_Phone = 355,
+     T_Pid = 356,
+     T_Pidfile = 357,
+     T_Pool = 358,
+     T_Port = 359,
+     T_Pps = 360,
+     T_Preempt = 361,
+     T_Prefer = 362,
+     T_Protostats = 363,
+     T_Pw = 364,
+     T_Qos = 365,
+     T_RandFile = 366,
+     T_Rawstats = 367,
+     T_Refid = 368,
+     T_Requestkey = 369,
+     T_Restrict = 370,
+     T_Revoke = 371,
+     T_Server = 372,
+     T_Setvar = 373,
+     T_Sign = 374,
+     T_Statistics = 375,
+     T_Stats = 376,
+     T_Statsdir = 377,
+     T_Step = 378,
+     T_Stepout = 379,
+     T_Stratum = 380,
+     T_String = 381,
+     T_Sysstats = 382,
+     T_Tick = 383,
+     T_Time1 = 384,
+     T_Time2 = 385,
+     T_Timingstats = 386,
+     T_Tinker = 387,
+     T_Tos = 388,
+     T_Trap = 389,
+     T_True = 390,
+     T_Trustedkey = 391,
+     T_Ttl = 392,
+     T_Type = 393,
+     T_Version = 394,
+     T_Week = 395,
+     T_Xleave = 396,
+     T_Year = 397,
+     T_Flag = 398,
+     T_Void = 399,
+     T_EOC = 400,
+     T_Simulate = 401,
+     T_Beep_Delay = 402,
+     T_Sim_Duration = 403,
+     T_Server_Offset = 404,
+     T_Duration = 405,
+     T_Freq_Offset = 406,
+     T_Wander = 407,
+     T_Jitter = 408,
+     T_Prop_Delay = 409,
+     T_Proc_Delay = 410
+   };
+#endif
+/* Tokens.  */
+#define T_Age 258
+#define T_Allan 259
+#define T_Auth 260
+#define T_Autokey 261
+#define T_Automax 262
+#define T_Average 263
+#define T_Bclient 264
+#define T_Beacon 265
+#define T_Bias 266
+#define T_Broadcast 267
+#define T_Broadcastclient 268
+#define T_Broadcastdelay 269
+#define T_Burst 270
+#define T_Calibrate 271
+#define T_Calldelay 272
+#define T_Ceiling 273
+#define T_Clockstats 274
+#define T_Cohort 275
+#define T_ControlKey 276
+#define T_Crypto 277
+#define T_Cryptostats 278
+#define T_Day 279
+#define T_Default 280
+#define T_Disable 281
+#define T_Discard 282
+#define T_Dispersion 283
+#define T_Double 284
+#define T_Driftfile 285
+#define T_WanderThreshold 286
+#define T_Enable 287
+#define T_End 288
+#define T_False 289
+#define T_File 290
+#define T_Filegen 291
+#define T_Flag1 292
+#define T_Flag2 293
+#define T_Flag3 294
+#define T_Flag4 295
+#define T_Flake 296
+#define T_Floor 297
+#define T_Freq 298
+#define T_Fudge 299
+#define T_Host 300
+#define T_Huffpuff 301
+#define T_IPv4_address 302
+#define T_IPv6_address 303
+#define T_Iburst 304
+#define T_Ident 305
+#define T_Ignore 306
+#define T_Includefile 307
+#define T_Integer 308
+#define T_Interface 309
+#define T_Kernel 310
+#define T_Key 311
+#define T_Keys 312
+#define T_Keysdir 313
+#define T_Kod 314
+#define T_Leap 315
+#define T_Leapfile 316
+#define T_Limited 317
+#define T_Link 318
+#define T_Logconfig 319
+#define T_Logfile 320
+#define T_Loopstats 321
+#define T_Lowpriotrap 322
+#define T_Manycastclient 323
+#define T_Manycastserver 324
+#define T_Mask 325
+#define T_Maxclock 326
+#define T_Maxdist 327
+#define T_Maxhop 328
+#define T_Maxpoll 329
+#define T_Minclock 330
+#define T_Mindist 331
+#define T_Minimum 332
+#define T_Minpoll 333
+#define T_Minsane 334
+#define T_Mode 335
+#define T_Monitor 336
+#define T_Month 337
+#define T_Multicastclient 338
+#define T_Nolink 339
+#define T_Nomodify 340
+#define T_None 341
+#define T_Nopeer 342
+#define T_Noquery 343
+#define T_Noselect 344
+#define T_Noserve 345
+#define T_Notrap 346
+#define T_Notrust 347
+#define T_Novolley 348
+#define T_Ntp 349
+#define T_Ntpport 350
+#define T_Orphan 351
+#define T_Panic 352
+#define T_Peer 353
+#define T_Peerstats 354
+#define T_Phone 355
+#define T_Pid 356
+#define T_Pidfile 357
+#define T_Pool 358
+#define T_Port 359
+#define T_Pps 360
+#define T_Preempt 361
+#define T_Prefer 362
+#define T_Protostats 363
+#define T_Pw 364
+#define T_Qos 365
+#define T_RandFile 366
+#define T_Rawstats 367
+#define T_Refid 368
+#define T_Requestkey 369
+#define T_Restrict 370
+#define T_Revoke 371
+#define T_Server 372
+#define T_Setvar 373
+#define T_Sign 374
+#define T_Statistics 375
+#define T_Stats 376
+#define T_Statsdir 377
+#define T_Step 378
+#define T_Stepout 379
+#define T_Stratum 380
+#define T_String 381
+#define T_Sysstats 382
+#define T_Tick 383
+#define T_Time1 384
+#define T_Time2 385
+#define T_Timingstats 386
+#define T_Tinker 387
+#define T_Tos 388
+#define T_Trap 389
+#define T_True 390
+#define T_Trustedkey 391
+#define T_Ttl 392
+#define T_Type 393
+#define T_Version 394
+#define T_Week 395
+#define T_Xleave 396
+#define T_Year 397
+#define T_Flag 398
+#define T_Void 399
+#define T_EOC 400
+#define T_Simulate 401
+#define T_Beep_Delay 402
+#define T_Sim_Duration 403
+#define T_Server_Offset 404
+#define T_Duration 405
+#define T_Freq_Offset 406
+#define T_Wander 407
+#define T_Jitter 408
+#define T_Prop_Delay 409
+#define T_Proc_Delay 410
+
+
+
+
+/* Copy the first part of user declarations.  */
 #line 11 "ntp_parser.y"
 
   #ifdef HAVE_CONFIG_H
@@ -195,9 +418,29 @@
   extern int input_from_file;  /* 0=input from ntpq>config command buffer */
   extern int cryptosw;
 
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
 #line 49 "ntp_parser.y"
-#ifndef YYSTYPE
-typedef union {
+{
     char   *String;
     double  Double;
     int     Integer;
@@ -210,659 +453,212 @@ typedef union {
     /* Simulation types */
     server_info *Sim_server;
     script_info *Sim_script;
-} yystype;
-# define YYSTYPE yystype
+}
+/* Line 193 of yacc.c.  */
+#line 459 "ntp_parser.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
 
 
 
-#define	YYFINAL		355
-#define	YYFLAG		-32768
-#define	YYNTBASE	159
+/* Copy the second part of user declarations.  */
 
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 409 ? yytranslate[x] : 220)
 
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const short yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   156,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   157,     2,   158,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     2,     6,     9,    12,    13,    15,    17,    19,
-      21,    23,    25,    27,    29,    31,    33,    35,    39,    42,
-      44,    46,    48,    50,    52,    54,    57,    60,    62,    65,
-      67,    69,    72,    74,    76,    79,    82,    85,    87,    89,
-      91,    93,    95,    98,   101,   104,   106,   109,   112,   115,
-     118,   121,   124,   127,   130,   133,   136,   138,   139,   142,
-     144,   147,   150,   153,   156,   159,   162,   165,   168,   170,
-     173,   176,   179,   182,   185,   188,   191,   194,   197,   200,
-     203,   206,   209,   213,   216,   218,   220,   222,   224,   226,
-     228,   230,   232,   234,   237,   239,   242,   245,   247,   249,
-     251,   253,   255,   257,   259,   261,   263,   265,   267,   270,
-     274,   278,   284,   285,   288,   290,   292,   294,   296,   298,
-     300,   302,   304,   306,   308,   310,   312,   314,   317,   319,
-     322,   325,   328,   332,   335,   337,   340,   343,   346,   349,
-     352,   355,   358,   361,   364,   367,   370,   372,   374,   376,
-     378,   380,   382,   384,   386,   389,   392,   394,   397,   400,
-     403,   406,   409,   412,   415,   419,   421,   424,   427,   430,
-     433,   436,   439,   442,   445,   448,   451,   454,   458,   461,
-     464,   466,   469,   470,   475,   479,   482,   484,   487,   490,
-     493,   495,   497,   500,   502,   505,   507,   510,   512,   514,
-     516,   518,   520,   522,   528,   530,   534,   537,   541,   545,
-     548,   550,   556,   561,   565,   568,   570,   577,   581,   584,
-     588,   592,   596,   600
-};
-static const short yyrhs[] =
-{
-     160,     0,   160,   161,   145,     0,   161,   145,     0,     1,
-     145,     0,     0,   162,     0,   168,     0,   169,     0,   176,
-       0,   182,     0,   173,     0,   187,     0,   190,     0,   193,
-       0,   196,     0,   208,     0,   163,   164,   166,     0,   163,
-     164,     0,   117,     0,   103,     0,    98,     0,    12,     0,
-      68,     0,   165,     0,    47,   126,     0,    48,   126,     0,
-     126,     0,   166,   167,     0,   167,     0,     6,     0,    11,
-     207,     0,    15,     0,    49,     0,    56,    53,     0,    78,
-      53,     0,    74,    53,     0,    89,     0,   106,     0,   107,
-       0,   135,     0,   141,     0,   137,    53,     0,    80,    53,
-       0,   139,    53,     0,    13,     0,    13,    93,     0,    69,
-     205,     0,    83,   205,     0,     6,    53,     0,    21,    53,
-       0,    22,   170,     0,    57,   126,     0,    58,   126,     0,
-     114,    53,     0,   136,   203,     0,   171,     0,     0,   171,
-     172,     0,   172,     0,    45,   126,     0,    50,   126,     0,
-     109,   126,     0,   111,   126,     0,   116,    53,     0,   119,
-     126,     0,   133,   174,     0,   174,   175,     0,   175,     0,
-      18,    53,     0,    42,    53,     0,    20,   206,     0,    96,
-      53,     0,    76,   207,     0,    72,   207,     0,    75,   207,
-       0,    71,   207,     0,    79,    53,     0,    10,    53,     0,
-      73,    53,     0,   120,   177,     0,   122,   126,     0,    36,
-     178,   179,     0,   177,   178,     0,   178,     0,    19,     0,
-      23,     0,    66,     0,    99,     0,   112,     0,   127,     0,
-     131,     0,   108,     0,   179,   180,     0,   180,     0,    35,
-     126,     0,   138,   181,     0,    63,     0,    84,     0,    32,
-       0,    26,     0,    86,     0,   101,     0,    24,     0,   140,
-       0,    82,     0,   142,     0,     3,     0,    27,   185,     0,
-     115,   164,   183,     0,   115,    25,   183,     0,   115,   165,
-      70,   165,   183,     0,     0,   183,   184,     0,    41,     0,
-      51,     0,    59,     0,    62,     0,    67,     0,    85,     0,
-      87,     0,    88,     0,    90,     0,    91,     0,    92,     0,
-      95,     0,   139,     0,   185,   186,     0,   186,     0,     8,
-      53,     0,    77,    53,     0,    81,    53,     0,    44,   164,
-     188,     0,   188,   189,     0,   189,     0,   129,   207,     0,
-     130,   207,     0,   125,    53,     0,   113,   126,     0,    37,
-     206,     0,    38,   206,     0,    39,   206,     0,    40,   206,
-       0,    32,   191,     0,    26,   191,     0,   191,   192,     0,
-     192,     0,     5,     0,     9,     0,    16,     0,    55,     0,
-      81,     0,    94,     0,   121,     0,   132,   194,     0,   194,
-     195,     0,   195,     0,     4,   207,     0,    28,   207,     0,
-      43,   207,     0,    46,   207,     0,    97,   207,     0,   123,
-     207,     0,   124,   207,     0,    52,   126,   161,     0,    33,
-       0,    14,   207,     0,    17,    53,     0,   128,   207,     0,
-      30,   197,     0,    61,   126,     0,   102,   126,     0,    65,
-     126,     0,     7,    53,     0,    64,   201,     0,   100,   204,
-       0,   118,   198,     0,   134,   165,   199,     0,   137,   203,
-       0,   110,   126,     0,   126,     0,   126,    29,     0,     0,
-     126,   156,   126,    25,     0,   126,   156,   126,     0,   199,
-     200,     0,   200,     0,   104,    53,     0,    54,   165,     0,
-     201,   202,     0,   202,     0,   126,     0,   203,    53,     0,
-      53,     0,   204,   126,     0,   126,     0,   205,   164,     0,
-     164,     0,    53,     0,   135,     0,    34,     0,    53,     0,
-      29,     0,   209,   157,   210,   212,   158,     0,   146,     0,
-     210,   211,   145,     0,   211,   145,     0,   147,   156,   207,
-       0,   148,   156,   207,     0,   212,   213,     0,   213,     0,
-     215,   157,   214,   216,   158,     0,   149,   156,   207,   145,
-       0,   117,   156,   164,     0,   216,   217,     0,   217,     0,
-     150,   156,   207,   157,   218,   158,     0,   218,   219,   145,
-       0,   219,   145,     0,   151,   156,   207,     0,   152,   156,
-     207,     0,   153,   156,   207,     0,   154,   156,   207,     0,
-     155,   156,   207,     0
-};
+/* Line 216 of yacc.c.  */
+#line 472 "ntp_parser.c"
 
+#ifdef short
+# undef short
 #endif
 
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
-{
-       0,   281,   285,   286,   291,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   321,   327,   336,
-     337,   338,   339,   340,   344,   345,   346,   350,   354,   355,
-     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
-     370,   371,   372,   373,   374,   384,   386,   388,   390,   401,
-     403,   405,   412,   414,   416,   418,   423,   424,   429,   430,
-     434,   436,   438,   440,   442,   444,   454,   459,   460,   464,
-     466,   468,   470,   472,   474,   476,   478,   480,   482,   484,
-     494,   496,   498,   506,   507,   511,   513,   515,   517,   519,
-     521,   523,   525,   530,   531,   535,   536,   537,   538,   539,
-     540,   544,   545,   546,   547,   548,   549,   550,   559,   561,
-     566,   571,   579,   580,   584,   585,   586,   587,   588,   589,
-     590,   591,   592,   593,   594,   595,   596,   600,   601,   605,
-     606,   607,   615,   620,   621,   625,   627,   629,   631,   633,
-     635,   637,   639,   648,   650,   655,   656,   660,   661,   662,
-     663,   664,   665,   667,   675,   679,   680,   684,   685,   686,
-     687,   688,   689,   690,   698,   714,   720,   722,   724,   726,
-     728,   731,   733,   735,   738,   740,   742,   744,   746,   748,
-     752,   754,   757,   762,   764,   770,   771,   775,   776,   781,
-     782,   786,   803,   804,   808,   809,   813,   814,   818,   827,
-     828,   832,   833,   841,   856,   860,   861,   865,   866,   870,
-     871,   875,   880,   884,   888,   889,   893,   898,   899,   903,
-     905,   907,   909,   911
-};
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
 
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
-  "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Bias", 
-  "T_Broadcast", "T_Broadcastclient", "T_Broadcastdelay", "T_Burst", 
-  "T_Calibrate", "T_Calldelay", "T_Ceiling", "T_Clockstats", "T_Cohort", 
-  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default", 
-  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile", 
-  "T_WanderThreshold", "T_Enable", "T_End", "T_False", "T_File", 
-  "T_Filegen", "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake", 
-  "T_Floor", "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", 
-  "T_IPv4_address", "T_IPv6_address", "T_Iburst", "T_Ident", "T_Ignore", 
-  "T_Includefile", "T_Integer", "T_Interface", "T_Kernel", "T_Key", 
-  "T_Keys", "T_Keysdir", "T_Kod", "T_Leap", "T_Leapfile", "T_Limited", 
-  "T_Link", "T_Logconfig", "T_Logfile", "T_Loopstats", "T_Lowpriotrap", 
-  "T_Manycastclient", "T_Manycastserver", "T_Mask", "T_Maxclock", 
-  "T_Maxdist", "T_Maxhop", "T_Maxpoll", "T_Minclock", "T_Mindist", 
-  "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", 
-  "T_Multicastclient", "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", 
-  "T_Noquery", "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", 
-  "T_Novolley", "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", 
-  "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", 
-  "T_Pps", "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Qos", 
-  "T_RandFile", "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", 
-  "T_Revoke", "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats", 
-  "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", 
-  "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timingstats", 
-  "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", 
-  "T_Type", "T_Version", "T_Week", "T_Xleave", "T_Year", "T_Flag", 
-  "T_Void", "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", 
-  "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", 
-  "T_Jitter", "T_Prop_Delay", "T_Proc_Delay", "'='", "'{'", "'}'", 
-  "configuration", "command_list", "command", "server_command", 
-  "client_type", "address", "ip_address", "option_list", "option", 
-  "other_mode_command", "authentication_command", "crypto_command_line", 
-  "crypto_command_list", "crypto_command", "orphan_mode_command", 
-  "tos_option_list", "tos_option", "monitoring_command", "stats_list", 
-  "stat", "filegen_option_list", "filegen_option", "filegen_type", 
-  "access_control_command", "ac_flag_list", "access_control_flag", 
-  "discard_option_list", "discard_option", "fudge_command", 
-  "fudge_factor_list", "fudge_factor", "system_option_command", 
-  "system_option_list", "system_option", "tinker_command", 
-  "tinker_option_list", "tinker_option", "miscellaneous_command", 
-  "drift_parm", "variable_assign", "trap_option_list", "trap_option", 
-  "log_config_list", "log_config_command", "integer_list", "string_list", 
-  "address_list", "boolean", "number", "simulate_command", 
-  "sim_conf_start", "sim_init_statement_list", "sim_init_statement", 
-  "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", 
-  "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", 0
-};
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,   159,   160,   160,   160,   161,   161,   161,   161,   161,
-     161,   161,   161,   161,   161,   161,   161,   162,   162,   163,
-     163,   163,   163,   163,   164,   164,   164,   165,   166,   166,
-     167,   167,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   167,   167,   167,   167,   168,   168,   168,   168,   169,
-     169,   169,   169,   169,   169,   169,   170,   170,   171,   171,
-     172,   172,   172,   172,   172,   172,   173,   174,   174,   175,
-     175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
-     176,   176,   176,   177,   177,   178,   178,   178,   178,   178,
-     178,   178,   178,   179,   179,   180,   180,   180,   180,   180,
-     180,   181,   181,   181,   181,   181,   181,   181,   182,   182,
-     182,   182,   183,   183,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   185,   185,   186,
-     186,   186,   187,   188,   188,   189,   189,   189,   189,   189,
-     189,   189,   189,   190,   190,   191,   191,   192,   192,   192,
-     192,   192,   192,   192,   193,   194,   194,   195,   195,   195,
-     195,   195,   195,   195,   196,   196,   196,   196,   196,   196,
-     196,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-     197,   197,   197,   198,   198,   199,   199,   200,   200,   201,
-     201,   202,   203,   203,   204,   204,   205,   205,   206,   206,
-     206,   207,   207,   208,   209,   210,   210,   211,   211,   212,
-     212,   213,   214,   215,   216,   216,   217,   218,   218,   219,
-     219,   219,   219,   219
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     1,     3,     2,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     2,     1,
-       1,     1,     1,     1,     1,     2,     2,     1,     2,     1,
-       1,     2,     1,     1,     2,     2,     2,     1,     1,     1,
-       1,     1,     2,     2,     2,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     0,     2,     1,
-       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     3,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     1,     2,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
-       3,     5,     0,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     2,
-       2,     2,     3,     2,     1,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     2,     2,     1,     2,     2,     2,
-       2,     2,     2,     2,     3,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     2,     2,
-       1,     2,     0,     4,     3,     2,     1,     2,     2,     2,
-       1,     1,     2,     1,     2,     1,     2,     1,     1,     1,
-       1,     1,     1,     5,     1,     3,     2,     3,     3,     2,
-       1,     5,     4,     3,     2,     1,     6,     3,     2,     3,
-       3,     3,     3,     3
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-static const short yydefact[] =
-{
-       0,     0,     0,     0,    22,    45,     0,     0,     0,    57,
-       0,     0,   182,     0,   165,     0,     0,     0,     0,     0,
-       0,     0,     0,    23,     0,     0,    21,     0,     0,    20,
-       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   204,     1,     0,     6,     0,     7,     8,
-      11,     9,    10,    12,    13,    14,    15,    16,     0,     4,
-      49,   173,    46,   202,   201,   166,   167,    50,     0,     0,
-       0,     0,     0,     0,    51,    56,    59,   147,   148,   149,
-     150,   151,   152,   153,   144,   146,     0,     0,     0,   108,
-     128,   180,   169,   143,    85,    86,    87,    88,    92,    89,
-      90,    91,     0,     0,     0,    27,     0,    24,     5,    52,
-      53,   170,   191,   174,   190,   172,   197,    47,    48,   195,
-     175,   171,   179,    54,   112,   112,    24,     0,   176,    80,
-      84,    81,   168,     0,     0,     0,     0,     0,     0,     0,
-     154,   156,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    66,    68,     0,   193,    55,   178,     0,
-       3,    18,     0,    60,    61,    62,    63,    64,    65,    58,
-     145,   129,   130,   131,   127,   181,   100,    99,     0,    97,
-      98,     0,    82,    94,    25,    26,     0,     0,     0,     0,
-       0,     0,     0,     0,   132,   134,   164,   189,   196,   194,
-     110,   109,     0,     0,    83,   157,   158,   159,   160,   161,
-     162,   163,   155,    78,    69,   200,   198,   199,    71,    70,
-      76,    74,    79,    75,    73,    77,    72,    67,     0,     0,
-     177,   186,   192,     2,    30,     0,    32,    33,     0,     0,
-       0,     0,    37,    38,    39,    40,     0,     0,    41,    17,
-      29,     0,     0,     0,     0,    95,   107,   103,   105,   101,
-     102,   104,   106,    96,    93,   139,   140,   141,   142,   138,
-     137,   135,   136,   133,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   126,   113,   112,   184,
-     188,   187,   185,    31,    34,    36,    35,    43,    42,    44,
-      28,     0,     0,     0,     0,     0,   210,     0,   206,   111,
-     183,   207,   208,     0,   205,   203,   209,     0,   213,     0,
-       0,     0,     0,     0,   215,     0,     0,   211,   214,   212,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   216,     0,   218,   219,   220,   221,
-     222,   223,   217,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-     353,    44,    45,    46,    47,   116,   107,   249,   250,    48,
-      49,    74,    75,    76,    50,   153,   154,    51,   129,   102,
-     182,   183,   263,    52,   200,   287,    89,    90,    53,   194,
-     195,    54,    84,    85,    55,   140,   141,    56,    92,   128,
-     230,   231,   113,   114,   157,   120,   117,   218,    65,    57,
-      58,   253,   254,   305,   306,   320,   307,   323,   324,   337,
-     338
-};
-
-static const short yypact[] =
-{
-     116,  -124,   -26,   -21,-32768,   -45,     2,    -4,    -1,   -34,
-      14,    -3,   -73,    14,-32768,    45,   -33,   -70,   -66,   -65,
-     -61,   -60,   -59,-32768,   -33,   -33,-32768,   -56,   -55,-32768,
-     -54,    20,    -8,-32768,   -50,    45,   -46,     2,     8,   149,
-     -43,    26,    26,-32768,   264,   -64,-32768,   -33,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -71,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -42,   -36,
-     -32,   -11,    36,    -7,-32768,   -34,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    14,-32768,    39,    67,    68,    -3,
-  -32768,   105,-32768,    14,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,   -22,    13,    15,-32768,   150,-32768,   399,-32768,
-  -32768,-32768,-32768,   -60,-32768,-32768,-32768,   -33,   -33,-32768,
-      24,-32768,-32768,-32768,-32768,-32768,    66,   -16,-32768,    45,
-  -32768,-32768,-32768,     2,     2,     2,     2,     2,     2,     2,
-       8,-32768,    98,   101,   -28,   117,     2,     2,   122,     2,
-       2,   125,   126,   149,-32768,   -47,-32768,   129,   129,    38,
-  -32768,   466,  -110,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    32,-32768,
-  -32768,     5,   -22,-32768,-32768,-32768,   -28,   -28,   -28,   -28,
-      60,   139,     2,     2,   150,-32768,-32768,-32768,-32768,-32768,
-     268,   268,   -43,    69,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -43,   140,
-     -47,-32768,-32768,-32768,-32768,     2,-32768,-32768,   141,   143,
-     147,   148,-32768,-32768,-32768,-32768,   151,   152,-32768,   466,
-  -32768,    46,    47,   -89,    61,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   182,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,     2,     2,    52,    64,   -95,-32768,    53,-32768,   268,
-  -32768,-32768,-32768,   -33,-32768,-32768,-32768,    62,-32768,    56,
-      63,     2,    59,  -116,-32768,    72,     2,-32768,-32768,-32768,
-      70,    10,    73,    76,    79,    81,    83,  -108,    78,     2,
-       2,     2,     2,     2,-32768,    95,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,   241,   242,-32768
-};
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
 
-static const short yypgoto[] =
-{
-  -32768,-32768,   -20,-32768,-32768,   -14,   -31,-32768,    -6,-32768,
-  -32768,-32768,-32768,   171,-32768,-32768,    94,-32768,-32768,   -15,
-  -32768,    74,-32768,-32768,  -122,-32768,-32768,   162,-32768,-32768,
-      65,-32768,   244,   -58,-32768,-32768,   114,-32768,-32768,-32768,
-  -32768,    25,-32768,   145,   218,-32768,   243,   -62,   -37,-32768,
-  -32768,-32768,    16,-32768,   -39,-32768,-32768,-32768,   -51,-32768,
-     -63
-};
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
 
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
 
-#define	YYLAST		607
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
 
-static const short yytable[] =
-{
-     132,   126,   106,   201,   176,    86,   215,   228,   256,   155,
-     177,    68,   133,   178,   103,   104,    69,   124,   125,    77,
-     130,    59,   303,    78,   159,   216,   170,    60,   303,   257,
-      79,    63,    61,   161,   322,   170,   134,   251,   252,   103,
-     104,   179,   327,   332,   333,   334,   335,   336,    62,    66,
-     344,   135,    67,    91,   136,    64,   108,   229,   251,   252,
-     109,   110,   180,   315,    94,   111,   112,   115,    95,    80,
-     119,   121,   122,   123,    87,    70,   127,    71,    88,   156,
-     131,   160,    72,   105,   163,    73,   162,   258,   196,   167,
-     164,   259,   171,   105,   165,    81,   205,   206,   207,   208,
-     209,   210,   211,   198,   198,   137,   260,   217,    82,   220,
-     221,    96,   223,   224,   204,   166,   181,     1,   105,   168,
-     172,   173,     2,     3,   265,   266,   267,   268,     4,     5,
-       6,   138,   139,     7,   175,    83,   202,     8,     9,   184,
-     203,   185,    10,    11,    97,   261,    12,   262,    13,    14,
-     199,   213,    15,    98,   214,   271,   272,    99,   255,   142,
-      16,   332,   333,   334,   335,   336,   309,   143,    17,   144,
-     219,   288,   100,    18,    19,   222,   101,    20,   225,   226,
-      21,    22,   232,   233,    23,    24,   269,   186,   187,   188,
-     189,   145,   270,   291,   294,   289,   295,   290,   293,    25,
-     296,   297,   301,   302,   298,   299,   308,   310,   313,   314,
-     317,   319,   321,   322,    26,   326,    27,   329,    28,    29,
-     146,   147,   148,   346,   149,   150,    30,   331,   151,   339,
-      31,    32,   340,    33,    34,   341,    35,   342,    36,   343,
-     352,   354,   355,   300,    37,   152,   169,   227,    38,    39,
-      40,   174,    41,    42,   212,   292,   264,    93,   197,   273,
-     158,    -5,    43,   190,   311,   312,   316,     0,   118,   304,
-       2,     3,   328,     0,   345,   191,     4,     5,     6,   192,
-     193,     7,     0,     0,   325,     8,     9,     0,     0,   330,
-      10,    11,     0,     0,    12,     0,    13,    14,     0,   318,
-      15,     0,   347,   348,   349,   350,   351,     0,    16,   274,
-       0,     0,     0,     0,     0,     0,    17,     0,     0,   275,
-       0,    18,    19,     0,     0,    20,     0,   276,    21,    22,
-     277,     0,    23,    24,     0,   278,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    25,     0,     0,
-       0,     0,     0,   279,     0,   280,   281,     0,   282,   283,
-     284,     0,    26,   285,    27,     0,    28,    29,     0,     0,
-       0,     0,     0,     0,    30,     0,     0,     0,    31,    32,
-       0,    33,    34,     0,    35,     0,    36,     0,     0,     0,
-       0,     0,    37,     0,     0,     0,    38,    39,    40,     0,
-      41,    42,     0,     0,     0,     2,     3,   286,     0,    -5,
-      43,     4,     5,     6,     0,     0,     7,     0,     0,     0,
-       8,     9,     0,     0,     0,    10,    11,     0,     0,    12,
-       0,    13,    14,     0,     0,    15,     0,     0,     0,     0,
-       0,     0,     0,    16,     0,     0,     0,     0,     0,     0,
-       0,    17,     0,     0,     0,     0,    18,    19,     0,     0,
-      20,     0,     0,    21,    22,     0,     0,    23,    24,     0,
-       0,     0,   234,     0,     0,     0,     0,   235,     0,     0,
-       0,   236,    25,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    26,     0,    27,
-       0,    28,    29,     0,     0,     0,     0,     0,     0,    30,
-       0,     0,     0,    31,    32,   237,    33,    34,     0,    35,
-       0,    36,   238,     0,     0,     0,     0,    37,     0,     0,
-       0,    38,    39,    40,     0,    41,    42,     0,     0,     0,
-     239,     0,     0,     0,   240,    43,   241,     0,     0,     0,
-       0,     0,     0,     0,     0,   242,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   243,   244,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   245,     0,   246,     0,   247,     0,   248
-};
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
 
-static const short yycheck[] =
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
 {
-      37,    32,    16,   125,    26,     8,    34,    54,     3,    40,
-      32,    45,     4,    35,    47,    48,    50,    25,    32,     5,
-      35,   145,   117,     9,    44,    53,    84,    53,   117,    24,
-      16,    29,    53,    47,   150,    93,    28,   147,   148,    47,
-      48,    63,   158,   151,   152,   153,   154,   155,    93,    53,
-     158,    43,    53,   126,    46,    53,   126,   104,   147,   148,
-     126,   126,    84,   158,    19,   126,   126,   126,    23,    55,
-     126,   126,   126,    53,    77,   109,   126,   111,    81,    53,
-     126,   145,   116,   126,   126,   119,   157,    82,   108,    53,
-     126,    86,    53,   126,   126,    81,   133,   134,   135,   136,
-     137,   138,   139,   117,   118,    97,   101,   135,    94,   146,
-     147,    66,   149,   150,   129,   126,   138,     1,   126,   126,
-      53,    53,     6,     7,   186,   187,   188,   189,    12,    13,
-      14,   123,   124,    17,    29,   121,    70,    21,    22,   126,
-     156,   126,    26,    27,    99,   140,    30,   142,    32,    33,
-     126,    53,    36,   108,    53,   192,   193,   112,   126,    10,
-      44,   151,   152,   153,   154,   155,   288,    18,    52,    20,
-      53,   202,   127,    57,    58,    53,   131,    61,    53,    53,
-      64,    65,    53,   145,    68,    69,   126,    37,    38,    39,
-      40,    42,    53,    53,    53,   126,    53,   228,   235,    83,
-      53,    53,   156,   156,    53,    53,   145,    25,   156,   145,
-     157,   149,   156,   150,    98,   156,   100,   145,   102,   103,
-      71,    72,    73,   145,    75,    76,   110,   157,    79,   156,
-     114,   115,   156,   117,   118,   156,   120,   156,   122,   156,
-     145,     0,     0,   249,   128,    96,    75,   153,   132,   133,
-     134,    89,   136,   137,   140,   230,   182,    13,   113,   194,
-      42,   145,   146,   113,   301,   302,   305,    -1,    25,   253,
-       6,     7,   323,    -1,   337,   125,    12,    13,    14,   129,
-     130,    17,    -1,    -1,   321,    21,    22,    -1,    -1,   326,
-      26,    27,    -1,    -1,    30,    -1,    32,    33,    -1,   313,
-      36,    -1,   339,   340,   341,   342,   343,    -1,    44,    41,
-      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    51,
-      -1,    57,    58,    -1,    -1,    61,    -1,    59,    64,    65,
-      62,    -1,    68,    69,    -1,    67,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    -1,    -1,
-      -1,    -1,    -1,    85,    -1,    87,    88,    -1,    90,    91,
-      92,    -1,    98,    95,   100,    -1,   102,   103,    -1,    -1,
-      -1,    -1,    -1,    -1,   110,    -1,    -1,    -1,   114,   115,
-      -1,   117,   118,    -1,   120,    -1,   122,    -1,    -1,    -1,
-      -1,    -1,   128,    -1,    -1,    -1,   132,   133,   134,    -1,
-     136,   137,    -1,    -1,    -1,     6,     7,   139,    -1,   145,
-     146,    12,    13,    14,    -1,    -1,    17,    -1,    -1,    -1,
-      21,    22,    -1,    -1,    -1,    26,    27,    -1,    -1,    30,
-      -1,    32,    33,    -1,    -1,    36,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    52,    -1,    -1,    -1,    -1,    57,    58,    -1,    -1,
-      61,    -1,    -1,    64,    65,    -1,    -1,    68,    69,    -1,
-      -1,    -1,     6,    -1,    -1,    -1,    -1,    11,    -1,    -1,
-      -1,    15,    83,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,   100,
-      -1,   102,   103,    -1,    -1,    -1,    -1,    -1,    -1,   110,
-      -1,    -1,    -1,   114,   115,    49,   117,   118,    -1,   120,
-      -1,   122,    56,    -1,    -1,    -1,    -1,   128,    -1,    -1,
-      -1,   132,   133,   134,    -1,   136,   137,    -1,    -1,    -1,
-      74,    -1,    -1,    -1,    78,   146,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    89,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   106,   107,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   135,    -1,   137,    -1,   139,    -1,   141
-};
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/gnu/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
+  return i;
+}
+#endif
 
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
 #    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-# endif
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -877,97 +673,705 @@ union yyalloc
 	YYSIZE_T yynewbytes;						\
 	YYCOPY (&yyptr->Stack, Stack, yysize);				\
 	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  160
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   547
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  159
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  62
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  224
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  355
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   410
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   156,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   157,     2,   158,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
+     155
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     9,    12,    15,    16,    18,    20,
+      22,    24,    26,    28,    30,    32,    34,    36,    38,    42,
+      45,    47,    49,    51,    53,    55,    57,    60,    63,    65,
+      68,    70,    72,    75,    77,    79,    82,    85,    88,    90,
+      92,    94,    96,    98,   101,   104,   107,   109,   112,   115,
+     118,   121,   124,   127,   130,   133,   136,   139,   141,   142,
+     145,   147,   150,   153,   156,   159,   162,   165,   168,   171,
+     173,   176,   179,   182,   185,   188,   191,   194,   197,   200,
+     203,   206,   209,   212,   216,   219,   221,   223,   225,   227,
+     229,   231,   233,   235,   237,   240,   242,   245,   248,   250,
+     252,   254,   256,   258,   260,   262,   264,   266,   268,   270,
+     273,   277,   281,   287,   288,   291,   293,   295,   297,   299,
+     301,   303,   305,   307,   309,   311,   313,   315,   317,   320,
+     322,   325,   328,   331,   335,   338,   340,   343,   346,   349,
+     352,   355,   358,   361,   364,   367,   370,   373,   375,   377,
+     379,   381,   383,   385,   387,   389,   392,   395,   397,   400,
+     403,   406,   409,   412,   415,   418,   422,   424,   427,   430,
+     433,   436,   439,   442,   445,   448,   451,   454,   457,   461,
+     464,   467,   469,   472,   473,   478,   482,   485,   487,   490,
+     493,   496,   498,   500,   503,   505,   508,   510,   513,   515,
+     517,   519,   521,   523,   525,   531,   533,   537,   540,   544,
+     548,   551,   553,   559,   564,   568,   571,   573,   580,   584,
+     587,   591,   595,   599,   603
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     160,     0,    -1,   161,    -1,   161,   162,   145,    -1,   162,
+     145,    -1,     1,   145,    -1,    -1,   163,    -1,   169,    -1,
+     170,    -1,   177,    -1,   183,    -1,   174,    -1,   188,    -1,
+     191,    -1,   194,    -1,   197,    -1,   209,    -1,   164,   165,
+     167,    -1,   164,   165,    -1,   117,    -1,   103,    -1,    98,
+      -1,    12,    -1,    68,    -1,   166,    -1,    47,   126,    -1,
+      48,   126,    -1,   126,    -1,   167,   168,    -1,   168,    -1,
+       6,    -1,    11,   208,    -1,    15,    -1,    49,    -1,    56,
+      53,    -1,    78,    53,    -1,    74,    53,    -1,    89,    -1,
+     106,    -1,   107,    -1,   135,    -1,   141,    -1,   137,    53,
+      -1,    80,    53,    -1,   139,    53,    -1,    13,    -1,    13,
+      93,    -1,    69,   206,    -1,    83,   206,    -1,     6,    53,
+      -1,    21,    53,    -1,    22,   171,    -1,    57,   126,    -1,
+      58,   126,    -1,   114,    53,    -1,   136,   204,    -1,   172,
+      -1,    -1,   172,   173,    -1,   173,    -1,    45,   126,    -1,
+      50,   126,    -1,   109,   126,    -1,   111,   126,    -1,   116,
+      53,    -1,   119,   126,    -1,   133,   175,    -1,   175,   176,
+      -1,   176,    -1,    18,    53,    -1,    42,    53,    -1,    20,
+     207,    -1,    96,    53,    -1,    76,   208,    -1,    72,   208,
+      -1,    75,   208,    -1,    71,   208,    -1,    79,    53,    -1,
+      10,    53,    -1,    73,    53,    -1,   120,   178,    -1,   122,
+     126,    -1,    36,   179,   180,    -1,   178,   179,    -1,   179,
+      -1,    19,    -1,    23,    -1,    66,    -1,    99,    -1,   112,
+      -1,   127,    -1,   131,    -1,   108,    -1,   180,   181,    -1,
+     181,    -1,    35,   126,    -1,   138,   182,    -1,    63,    -1,
+      84,    -1,    32,    -1,    26,    -1,    86,    -1,   101,    -1,
+      24,    -1,   140,    -1,    82,    -1,   142,    -1,     3,    -1,
+      27,   186,    -1,   115,   165,   184,    -1,   115,    25,   184,
+      -1,   115,   166,    70,   166,   184,    -1,    -1,   184,   185,
+      -1,    41,    -1,    51,    -1,    59,    -1,    62,    -1,    67,
+      -1,    85,    -1,    87,    -1,    88,    -1,    90,    -1,    91,
+      -1,    92,    -1,    95,    -1,   139,    -1,   186,   187,    -1,
+     187,    -1,     8,    53,    -1,    77,    53,    -1,    81,    53,
+      -1,    44,   165,   189,    -1,   189,   190,    -1,   190,    -1,
+     129,   208,    -1,   130,   208,    -1,   125,    53,    -1,   113,
+     126,    -1,    37,   207,    -1,    38,   207,    -1,    39,   207,
+      -1,    40,   207,    -1,    32,   192,    -1,    26,   192,    -1,
+     192,   193,    -1,   193,    -1,     5,    -1,     9,    -1,    16,
+      -1,    55,    -1,    81,    -1,    94,    -1,   121,    -1,   132,
+     195,    -1,   195,   196,    -1,   196,    -1,     4,   208,    -1,
+      28,   208,    -1,    43,   208,    -1,    46,   208,    -1,    97,
+     208,    -1,   123,   208,    -1,   124,   208,    -1,    52,   126,
+     162,    -1,    33,    -1,    14,   208,    -1,    17,    53,    -1,
+     128,   208,    -1,    30,   198,    -1,    61,   126,    -1,   102,
+     126,    -1,    65,   126,    -1,     7,    53,    -1,    64,   202,
+      -1,   100,   205,    -1,   118,   199,    -1,   134,   166,   200,
+      -1,   137,   204,    -1,   110,   126,    -1,   126,    -1,   126,
+      29,    -1,    -1,   126,   156,   126,    25,    -1,   126,   156,
+     126,    -1,   200,   201,    -1,   201,    -1,   104,    53,    -1,
+      54,   166,    -1,   202,   203,    -1,   203,    -1,   126,    -1,
+     204,    53,    -1,    53,    -1,   205,   126,    -1,   126,    -1,
+     206,   165,    -1,   165,    -1,    53,    -1,   135,    -1,    34,
+      -1,    53,    -1,    29,    -1,   210,   157,   211,   213,   158,
+      -1,   146,    -1,   211,   212,   145,    -1,   212,   145,    -1,
+     147,   156,   208,    -1,   148,   156,   208,    -1,   213,   214,
+      -1,   214,    -1,   216,   157,   215,   217,   158,    -1,   149,
+     156,   208,   145,    -1,   117,   156,   165,    -1,   217,   218,
+      -1,   218,    -1,   150,   156,   208,   157,   219,   158,    -1,
+     219,   220,   145,    -1,   220,   145,    -1,   151,   156,   208,
+      -1,   152,   156,   208,    -1,   153,   156,   208,    -1,   154,
+     156,   208,    -1,   155,   156,   208,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,   281,   281,   285,   286,   291,   302,   303,   304,   305,
+     306,   307,   308,   309,   310,   311,   312,   313,   321,   327,
+     336,   337,   338,   339,   340,   344,   345,   346,   350,   354,
+     355,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   384,   386,   388,   390,
+     401,   403,   405,   412,   414,   416,   418,   423,   425,   429,
+     430,   434,   436,   438,   440,   442,   444,   454,   459,   460,
+     464,   466,   468,   470,   472,   474,   476,   478,   480,   482,
+     484,   494,   496,   498,   506,   507,   511,   513,   515,   517,
+     519,   521,   523,   525,   530,   531,   535,   536,   537,   538,
+     539,   540,   544,   545,   546,   547,   548,   549,   550,   559,
+     561,   566,   571,   579,   580,   584,   585,   586,   587,   588,
+     589,   590,   591,   592,   593,   594,   595,   596,   600,   601,
+     605,   606,   607,   615,   620,   621,   625,   627,   629,   631,
+     633,   635,   637,   639,   648,   650,   655,   656,   660,   661,
+     662,   663,   664,   665,   667,   675,   679,   680,   684,   685,
+     686,   687,   688,   689,   690,   698,   714,   720,   722,   724,
+     726,   728,   731,   733,   735,   738,   740,   742,   744,   746,
+     748,   752,   754,   757,   762,   764,   770,   771,   775,   776,
+     781,   782,   786,   803,   804,   808,   809,   813,   814,   818,
+     827,   828,   832,   833,   841,   856,   860,   861,   865,   866,
+     870,   871,   875,   880,   884,   888,   889,   893,   898,   899,
+     903,   905,   907,   909,   911
+};
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_Age", "T_Allan", "T_Auth",
+  "T_Autokey", "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Bias",
+  "T_Broadcast", "T_Broadcastclient", "T_Broadcastdelay", "T_Burst",
+  "T_Calibrate", "T_Calldelay", "T_Ceiling", "T_Clockstats", "T_Cohort",
+  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default",
+  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile",
+  "T_WanderThreshold", "T_Enable", "T_End", "T_False", "T_File",
+  "T_Filegen", "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake",
+  "T_Floor", "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", "T_IPv4_address",
+  "T_IPv6_address", "T_Iburst", "T_Ident", "T_Ignore", "T_Includefile",
+  "T_Integer", "T_Interface", "T_Kernel", "T_Key", "T_Keys", "T_Keysdir",
+  "T_Kod", "T_Leap", "T_Leapfile", "T_Limited", "T_Link", "T_Logconfig",
+  "T_Logfile", "T_Loopstats", "T_Lowpriotrap", "T_Manycastclient",
+  "T_Manycastserver", "T_Mask", "T_Maxclock", "T_Maxdist", "T_Maxhop",
+  "T_Maxpoll", "T_Minclock", "T_Mindist", "T_Minimum", "T_Minpoll",
+  "T_Minsane", "T_Mode", "T_Monitor", "T_Month", "T_Multicastclient",
+  "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", "T_Noquery",
+  "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Novolley",
+  "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", "T_Peerstats",
+  "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Pps",
+  "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Qos", "T_RandFile",
+  "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke",
+  "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats",
+  "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String",
+  "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timingstats",
+  "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl",
+  "T_Type", "T_Version", "T_Week", "T_Xleave", "T_Year", "T_Flag",
+  "T_Void", "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration",
+  "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", "T_Jitter",
+  "T_Prop_Delay", "T_Proc_Delay", "'='", "'{'", "'}'", "$accept",
+  "configuration", "command_list", "command", "server_command",
+  "client_type", "address", "ip_address", "option_list", "option",
+  "other_mode_command", "authentication_command", "crypto_command_line",
+  "crypto_command_list", "crypto_command", "orphan_mode_command",
+  "tos_option_list", "tos_option", "monitoring_command", "stats_list",
+  "stat", "filegen_option_list", "filegen_option", "filegen_type",
+  "access_control_command", "ac_flag_list", "access_control_flag",
+  "discard_option_list", "discard_option", "fudge_command",
+  "fudge_factor_list", "fudge_factor", "system_option_command",
+  "system_option_list", "system_option", "tinker_command",
+  "tinker_option_list", "tinker_option", "miscellaneous_command",
+  "drift_parm", "variable_assign", "trap_option_list", "trap_option",
+  "log_config_list", "log_config_command", "integer_list", "string_list",
+  "address_list", "boolean", "number", "simulate_command",
+  "sim_conf_start", "sim_init_statement_list", "sim_init_statement",
+  "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name",
+  "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", 0
+};
 #endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,   408,   409,   410,    61,   123,   125
+};
 # endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   159,   160,   161,   161,   161,   162,   162,   162,   162,
+     162,   162,   162,   162,   162,   162,   162,   162,   163,   163,
+     164,   164,   164,   164,   164,   165,   165,   165,   166,   167,
+     167,   168,   168,   168,   168,   168,   168,   168,   168,   168,
+     168,   168,   168,   168,   168,   168,   169,   169,   169,   169,
+     170,   170,   170,   170,   170,   170,   170,   171,   171,   172,
+     172,   173,   173,   173,   173,   173,   173,   174,   175,   175,
+     176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
+     176,   177,   177,   177,   178,   178,   179,   179,   179,   179,
+     179,   179,   179,   179,   180,   180,   181,   181,   181,   181,
+     181,   181,   182,   182,   182,   182,   182,   182,   182,   183,
+     183,   183,   183,   184,   184,   185,   185,   185,   185,   185,
+     185,   185,   185,   185,   185,   185,   185,   185,   186,   186,
+     187,   187,   187,   188,   189,   189,   190,   190,   190,   190,
+     190,   190,   190,   190,   191,   191,   192,   192,   193,   193,
+     193,   193,   193,   193,   193,   194,   195,   195,   196,   196,
+     196,   196,   196,   196,   196,   197,   197,   197,   197,   197,
+     197,   197,   197,   197,   197,   197,   197,   197,   197,   197,
+     197,   198,   198,   198,   199,   199,   200,   200,   201,   201,
+     202,   202,   203,   204,   204,   205,   205,   206,   206,   207,
+     207,   207,   208,   208,   209,   210,   211,   211,   212,   212,
+     213,   213,   214,   215,   216,   217,   217,   218,   219,   219,
+     220,   220,   220,   220,   220
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     3,     2,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
+       1,     1,     1,     1,     1,     1,     2,     2,     1,     2,
+       1,     1,     2,     1,     1,     2,     2,     2,     1,     1,
+       1,     1,     1,     2,     2,     2,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     1,     0,     2,
+       1,     2,     2,     2,     2,     2,     2,     2,     2,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     3,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     1,     2,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       3,     3,     5,     0,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     2,     1,
+       2,     2,     2,     3,     2,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     2,     1,     2,     2,
+       2,     2,     2,     2,     2,     3,     1,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
+       2,     1,     2,     0,     4,     3,     2,     1,     2,     2,
+       2,     1,     1,     2,     1,     2,     1,     2,     1,     1,
+       1,     1,     1,     1,     5,     1,     3,     2,     3,     3,
+       2,     1,     5,     4,     3,     2,     1,     6,     3,     2,
+       3,     3,     3,     3,     3
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       0,     0,     0,     0,    23,    46,     0,     0,     0,    58,
+       0,     0,   183,     0,   166,     0,     0,     0,     0,     0,
+       0,     0,     0,    24,     0,     0,    22,     0,     0,    21,
+       0,     0,     0,    20,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   205,     0,     2,     0,     7,     0,     8,
+       9,    12,    10,    11,    13,    14,    15,    16,    17,     0,
+       5,    50,   174,    47,   203,   202,   167,   168,    51,     0,
+       0,     0,     0,     0,     0,    52,    57,    60,   148,   149,
+     150,   151,   152,   153,   154,   145,   147,     0,     0,     0,
+     109,   129,   181,   170,   144,    86,    87,    88,    89,    93,
+      90,    91,    92,     0,     0,     0,    28,     0,    25,     6,
+      53,    54,   171,   192,   175,   191,   173,   198,    48,    49,
+     196,   176,   172,   180,    55,   113,   113,    25,     0,   177,
+      81,    85,    82,   169,     0,     0,     0,     0,     0,     0,
+       0,   155,   157,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    67,    69,     0,   194,    56,   179,
+       1,     0,     4,    19,     0,    61,    62,    63,    64,    65,
+      66,    59,   146,   130,   131,   132,   128,   182,   101,   100,
+       0,    98,    99,     0,    83,    95,    26,    27,     0,     0,
+       0,     0,     0,     0,     0,     0,   133,   135,   165,   190,
+     197,   195,   111,   110,     0,     0,    84,   158,   159,   160,
+     161,   162,   163,   164,   156,    79,    70,   201,   199,   200,
+      72,    71,    77,    75,    80,    76,    74,    78,    73,    68,
+       0,     0,   178,   187,   193,     3,    31,     0,    33,    34,
+       0,     0,     0,     0,    38,    39,    40,    41,     0,     0,
+      42,    18,    30,     0,     0,     0,     0,    96,   108,   104,
+     106,   102,   103,   105,   107,    97,    94,   140,   141,   142,
+     143,   139,   138,   136,   137,   134,   115,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   114,
+     113,   185,   189,   188,   186,    32,    35,    37,    36,    44,
+      43,    45,    29,     0,     0,     0,     0,     0,   211,     0,
+     207,   112,   184,   208,   209,     0,   206,   204,   210,     0,
+     214,     0,     0,     0,     0,     0,   216,     0,     0,   212,
+     215,   213,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   217,     0,   219,   220,
+     221,   222,   223,   224,   218
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    44,    45,    46,    47,    48,   117,   108,   251,   252,
+      49,    50,    75,    76,    77,    51,   154,   155,    52,   130,
+     103,   184,   185,   265,    53,   202,   289,    90,    91,    54,
+     196,   197,    55,    85,    86,    56,   141,   142,    57,    93,
+     129,   232,   233,   114,   115,   158,   121,   118,   220,    66,
+      58,    59,   255,   256,   307,   308,   322,   309,   325,   326,
+     339,   340
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -141
+static const yytype_int16 yypact[] =
+{
+     111,  -128,   -34,   -23,  -141,   -60,   -17,   -18,   -13,   -24,
+     182,    45,   -82,   182,  -141,   246,    -5,   -81,   -74,   -70,
+     -67,   -66,   -65,  -141,    -5,    -5,  -141,   -58,   -57,  -141,
+     -43,    31,   -20,  -141,   -35,   246,   -33,   -17,    11,   299,
+     -30,    35,    35,  -141,    38,   266,   -56,  -141,    -5,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,   -27,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,    -7,
+       3,     5,    10,    86,    14,  -141,   -24,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,   182,  -141,    89,    93,    99,
+      45,  -141,   124,  -141,   182,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,   -22,    30,    33,  -141,    41,  -141,   401,
+    -141,  -141,  -141,  -141,   -66,  -141,  -141,  -141,    -5,    -5,
+    -141,    36,  -141,  -141,  -141,  -141,  -141,    91,     9,  -141,
+     246,  -141,  -141,  -141,   -17,   -17,   -17,   -17,   -17,   -17,
+     -17,    11,  -141,   121,   128,   -28,   129,   -17,   -17,   130,
+     -17,   -17,   131,   132,   299,  -141,   -46,  -141,   133,   133,
+    -141,    19,  -141,    71,  -124,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+      62,  -141,  -141,     8,   -22,  -141,  -141,  -141,   -28,   -28,
+     -28,   -28,    63,   137,   -17,   -17,    41,  -141,  -141,  -141,
+    -141,  -141,   388,   388,   -30,    66,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+     -30,   140,   -46,  -141,  -141,  -141,  -141,   -17,  -141,  -141,
+     142,   143,   144,   148,  -141,  -141,  -141,  -141,   149,   150,
+    -141,    71,  -141,    48,    49,  -101,    70,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+    -141,   191,  -141,  -141,  -141,  -141,  -141,  -141,  -141,  -141,
+    -141,  -141,  -141,   -17,   -17,    51,    72,  -103,  -141,    61,
+    -141,   388,  -141,  -141,  -141,    -5,  -141,  -141,  -141,    73,
+    -141,    64,    69,   -17,    67,  -121,  -141,    79,   -17,  -141,
+    -141,  -141,    75,   -79,    74,    78,    80,    82,    84,   -88,
+      90,   -17,   -17,   -17,   -17,   -17,  -141,    96,  -141,  -141,
+    -141,  -141,  -141,  -141,  -141
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -141,  -141,  -141,   -38,  -141,  -141,   -14,   -31,  -141,    -9,
+    -141,  -141,  -141,  -141,   151,  -141,  -141,    92,  -141,  -141,
+     -15,  -141,    65,  -141,  -141,  -123,  -141,  -141,   160,  -141,
+    -141,    55,  -141,   239,   -63,  -141,  -141,   112,  -141,  -141,
+    -141,  -141,    22,  -141,   141,   216,  -141,   234,  -140,   -37,
+    -141,  -141,  -141,     6,  -141,   -47,  -141,  -141,  -141,   -61,
+    -141,   -77
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -7
+static const yytype_int16 yytable[] =
+{
+     133,   127,   107,   203,   178,   125,   217,   161,   230,   156,
+     179,   258,    64,   180,   305,   134,   305,    60,   126,    61,
+     131,    69,   172,   253,   254,   218,    70,   104,   105,   324,
+      62,   172,   259,    63,   163,    67,    65,   329,   160,   135,
+      68,   181,   104,   105,    92,   109,   253,   254,   267,   268,
+     269,   270,   110,    87,   136,   317,   111,   137,   231,   112,
+     113,   116,   182,   334,   335,   336,   337,   338,   120,   122,
+     346,   198,   334,   335,   336,   337,   338,   236,   188,   189,
+     190,   191,   237,   123,   124,    71,   238,    72,   157,   162,
+     260,   128,    73,   132,   261,    74,   106,   207,   208,   209,
+     210,   211,   212,   213,   200,   200,   106,   219,   138,   262,
+     222,   223,     1,   225,   226,   206,   183,     2,     3,   165,
+     239,   106,    88,     4,     5,     6,    89,   240,     7,   166,
+     164,   167,     8,     9,   139,   140,   168,    10,    11,   169,
+     170,    12,   173,    13,    14,   241,   174,    15,   263,   242,
+     264,   243,   175,   177,   192,    16,   186,   273,   274,   187,
+     244,   204,   201,    17,   235,   205,   193,   311,    18,    19,
+     194,   195,    20,   290,   215,    21,    22,   245,   246,    23,
+      24,   216,   221,   224,   227,   228,   234,    78,   257,   271,
+     272,    79,   291,   293,    25,   296,   297,   298,    80,   292,
+     295,   299,   300,   301,   303,   304,   247,   315,   248,    26,
+     249,    27,   250,    28,    29,   310,   312,   316,   319,   324,
+     323,    30,   321,   328,   331,    31,    32,   171,    33,    34,
+     341,    35,   333,    36,   342,   348,   343,    81,   344,    37,
+     345,   354,   302,    38,    39,    40,   229,    41,    42,   266,
+     176,   275,    94,   214,   294,   199,    -6,    43,   159,   119,
+     318,   306,   347,    82,   330,    95,   313,   314,     0,    96,
+       0,     0,     2,     3,     0,     0,    83,     0,     4,     5,
+       6,     0,     0,     7,     0,     0,   327,     8,     9,     0,
+       0,   332,    10,    11,     0,     0,    12,     0,    13,    14,
+       0,   320,    15,    84,   349,   350,   351,   352,   353,   143,
+      16,     0,    97,     0,     0,     0,     0,   144,    17,   145,
+       0,     0,     0,    18,    19,     0,     0,    20,     0,     0,
+      21,    22,     0,     0,    23,    24,     0,     0,     0,     0,
+       0,   146,     0,     0,     0,    98,     0,     0,     0,    25,
+       0,     0,     0,     0,    99,     0,     0,     0,   100,     0,
+       0,     0,     0,     0,    26,     0,    27,     0,    28,    29,
+     147,   148,   149,   101,   150,   151,    30,   102,   152,     0,
+      31,    32,     0,    33,    34,     0,    35,     0,    36,     0,
+       0,     0,     0,     0,    37,   153,     0,     0,    38,    39,
+      40,     0,    41,    42,     0,     0,     0,     2,     3,     0,
+       0,    -6,    43,     4,     5,     6,     0,     0,     7,     0,
+       0,     0,     8,     9,     0,     0,     0,    10,    11,   276,
+       0,    12,     0,    13,    14,     0,     0,    15,     0,   277,
+       0,     0,     0,     0,     0,    16,     0,   278,     0,     0,
+     279,     0,     0,    17,     0,   280,     0,     0,    18,    19,
+       0,     0,    20,     0,     0,    21,    22,     0,     0,    23,
+      24,     0,     0,   281,     0,   282,   283,     0,   284,   285,
+     286,     0,     0,   287,    25,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    26,
+       0,    27,     0,    28,    29,     0,     0,     0,     0,     0,
+       0,    30,     0,     0,     0,    31,    32,     0,    33,    34,
+       0,    35,     0,    36,     0,     0,     0,   288,     0,    37,
+       0,     0,     0,    38,    39,    40,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,     0,    43
+};
+
+static const yytype_int16 yycheck[] =
+{
+      37,    32,    16,   126,    26,    25,    34,    45,    54,    40,
+      32,     3,    29,    35,   117,     4,   117,   145,    32,    53,
+      35,    45,    85,   147,   148,    53,    50,    47,    48,   150,
+      53,    94,    24,    93,    48,    53,    53,   158,     0,    28,
+      53,    63,    47,    48,   126,   126,   147,   148,   188,   189,
+     190,   191,   126,     8,    43,   158,   126,    46,   104,   126,
+     126,   126,    84,   151,   152,   153,   154,   155,   126,   126,
+     158,   109,   151,   152,   153,   154,   155,     6,    37,    38,
+      39,    40,    11,   126,    53,   109,    15,   111,    53,   145,
+      82,   126,   116,   126,    86,   119,   126,   134,   135,   136,
+     137,   138,   139,   140,   118,   119,   126,   135,    97,   101,
+     147,   148,     1,   150,   151,   130,   138,     6,     7,   126,
+      49,   126,    77,    12,    13,    14,    81,    56,    17,   126,
+     157,   126,    21,    22,   123,   124,   126,    26,    27,    53,
+     126,    30,    53,    32,    33,    74,    53,    36,   140,    78,
+     142,    80,    53,    29,   113,    44,   126,   194,   195,   126,
+      89,    70,   126,    52,   145,   156,   125,   290,    57,    58,
+     129,   130,    61,   204,    53,    64,    65,   106,   107,    68,
+      69,    53,    53,    53,    53,    53,    53,     5,   126,   126,
+      53,     9,   126,    53,    83,    53,    53,    53,    16,   230,
+     237,    53,    53,    53,   156,   156,   135,   156,   137,    98,
+     139,   100,   141,   102,   103,   145,    25,   145,   157,   150,
+     156,   110,   149,   156,   145,   114,   115,    76,   117,   118,
+     156,   120,   157,   122,   156,   145,   156,    55,   156,   128,
+     156,   145,   251,   132,   133,   134,   154,   136,   137,   184,
+      90,   196,    13,   141,   232,   114,   145,   146,    42,    25,
+     307,   255,   339,    81,   325,    19,   303,   304,    -1,    23,
+      -1,    -1,     6,     7,    -1,    -1,    94,    -1,    12,    13,
+      14,    -1,    -1,    17,    -1,    -1,   323,    21,    22,    -1,
+      -1,   328,    26,    27,    -1,    -1,    30,    -1,    32,    33,
+      -1,   315,    36,   121,   341,   342,   343,   344,   345,    10,
+      44,    -1,    66,    -1,    -1,    -1,    -1,    18,    52,    20,
+      -1,    -1,    -1,    57,    58,    -1,    -1,    61,    -1,    -1,
+      64,    65,    -1,    -1,    68,    69,    -1,    -1,    -1,    -1,
+      -1,    42,    -1,    -1,    -1,    99,    -1,    -1,    -1,    83,
+      -1,    -1,    -1,    -1,   108,    -1,    -1,    -1,   112,    -1,
+      -1,    -1,    -1,    -1,    98,    -1,   100,    -1,   102,   103,
+      71,    72,    73,   127,    75,    76,   110,   131,    79,    -1,
+     114,   115,    -1,   117,   118,    -1,   120,    -1,   122,    -1,
+      -1,    -1,    -1,    -1,   128,    96,    -1,    -1,   132,   133,
+     134,    -1,   136,   137,    -1,    -1,    -1,     6,     7,    -1,
+      -1,   145,   146,    12,    13,    14,    -1,    -1,    17,    -1,
+      -1,    -1,    21,    22,    -1,    -1,    -1,    26,    27,    41,
+      -1,    30,    -1,    32,    33,    -1,    -1,    36,    -1,    51,
+      -1,    -1,    -1,    -1,    -1,    44,    -1,    59,    -1,    -1,
+      62,    -1,    -1,    52,    -1,    67,    -1,    -1,    57,    58,
+      -1,    -1,    61,    -1,    -1,    64,    65,    -1,    -1,    68,
+      69,    -1,    -1,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    -1,    -1,    95,    83,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,
+      -1,   100,    -1,   102,   103,    -1,    -1,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,    -1,   114,   115,    -1,   117,   118,
+      -1,   120,    -1,   122,    -1,    -1,    -1,   139,    -1,   128,
+      -1,    -1,    -1,   132,   133,   134,    -1,   136,   137,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   146
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     1,     6,     7,    12,    13,    14,    17,    21,    22,
+      26,    27,    30,    32,    33,    36,    44,    52,    57,    58,
+      61,    64,    65,    68,    69,    83,    98,   100,   102,   103,
+     110,   114,   115,   117,   118,   120,   122,   128,   132,   133,
+     134,   136,   137,   146,   160,   161,   162,   163,   164,   169,
+     170,   174,   177,   183,   188,   191,   194,   197,   209,   210,
+     145,    53,    53,    93,    29,    53,   208,    53,    53,    45,
+      50,   109,   111,   116,   119,   171,   172,   173,     5,     9,
+      16,    55,    81,    94,   121,   192,   193,     8,    77,    81,
+     186,   187,   126,   198,   192,    19,    23,    66,    99,   108,
+     112,   127,   131,   179,    47,    48,   126,   165,   166,   126,
+     126,   126,   126,   126,   202,   203,   126,   165,   206,   206,
+     126,   205,   126,   126,    53,    25,   165,   166,   126,   199,
+     178,   179,   126,   208,     4,    28,    43,    46,    97,   123,
+     124,   195,   196,    10,    18,    20,    42,    71,    72,    73,
+      75,    76,    79,    96,   175,   176,   166,    53,   204,   204,
+       0,   162,   145,   165,   157,   126,   126,   126,   126,    53,
+     126,   173,   193,    53,    53,    53,   187,    29,    26,    32,
+      35,    63,    84,   138,   180,   181,   126,   126,    37,    38,
+      39,    40,   113,   125,   129,   130,   189,   190,   162,   203,
+     165,   126,   184,   184,    70,   156,   179,   208,   208,   208,
+     208,   208,   208,   208,   196,    53,    53,    34,    53,   135,
+     207,    53,   208,   208,    53,   208,   208,    53,    53,   176,
+      54,   104,   200,   201,    53,   145,     6,    11,    15,    49,
+      56,    74,    78,    80,    89,   106,   107,   135,   137,   139,
+     141,   167,   168,   147,   148,   211,   212,   126,     3,    24,
+      82,    86,   101,   140,   142,   182,   181,   207,   207,   207,
+     207,   126,    53,   208,   208,   190,    41,    51,    59,    62,
+      67,    85,    87,    88,    90,    91,    92,    95,   139,   185,
+     166,   126,   166,    53,   201,   208,    53,    53,    53,    53,
+      53,    53,   168,   156,   156,   117,   212,   213,   214,   216,
+     145,   184,    25,   208,   208,   156,   145,   158,   214,   157,
+     165,   149,   215,   156,   150,   217,   218,   208,   156,   158,
+     218,   145,   208,   157,   151,   152,   153,   154,   155,   219,
+     220,   156,   156,   156,   156,   156,   158,   220,   145,   208,
+     208,   208,   208,   208,   145
+};
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
+
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
 
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -981,14 +1385,155 @@ while (0)
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
+
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
@@ -998,59 +1543,59 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
+
 
-#ifdef YYERROR_VERBOSE
+
+#if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -1059,86 +1604,266 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
-#endif
-
-#line 315 "/usr/local/gnu/share/bison/bison.simple"
 
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-#ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
 # endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
-int yyparse (void);
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
 # endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
+{
+  YYUSE (yyvaluep);
 
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
 
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
 #else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
+int yyparse ();
 #endif
+#endif /* ! YYPARSE_PARAM */
+
 
 
-/* If nonreentrant, generate the variables here. */
+/* The look-ahead symbol.  */
+int yychar;
 
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
 
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
 
-  register int yystate;
-  register int yyn;
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1148,42 +1873,30 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack. */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
 
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
-  int yylen;
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1199,9 +1912,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1209,70 +1920,60 @@ yyparse (YYPARSE_PARAM_ARG)
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
   *yyssp = yystate;
 
-  if (yyssp >= yyss + yystacksize - 1)
+  if (yyss + yystacksize - 1 <= yyssp)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
+
 
 	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
-	yyoverflow ("parser stack overflow",
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
-# endif
+
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
+
+#  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -1281,14 +1982,12 @@ yyparse (YYPARSE_PARAM_ARG)
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
+
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyssp >= yyss + yystacksize - 1)
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
@@ -1296,108 +1995,71 @@ yyparse (YYPARSE_PARAM_ARG)
 
   goto yybackup;
 
-
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
+  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
+      yychar = yytoken = YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE (yychar);
-
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
   yystate = yyn;
+  *++yyvsp = yylval;
+
   goto yynewstate;
 
 
@@ -1421,42 +2083,20 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
 
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-  switch (yyn) {
-
-case 4:
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 5:
 #line 292 "ntp_parser.y"
-{
+    {
 					if (input_from_file == 1) {
 			msyslog(LOG_INFO, "parse error %s line %d ignored\n",
                             ip_file->fname, ip_file->line_no);
@@ -1465,920 +2105,1114 @@ case 4:
 				    "parse: bad boolean input flag\n");
                 }
     break;
-case 17:
+
+  case 18:
 #line 322 "ntp_parser.y"
-{
-                        struct peer_node *my_node =  create_peer_node(yyvsp[-2].Integer, yyvsp[-1].Address_node, yyvsp[0].Queue);
+    {
+                        struct peer_node *my_node =  create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue));
                         if (my_node)
                             enqueue(my_config.peers, my_node);
                     }
     break;
-case 18:
+
+  case 19:
 #line 328 "ntp_parser.y"
-{
-                        struct peer_node *my_node = create_peer_node(yyvsp[-1].Integer, yyvsp[0].Address_node, NULL);
+    {
+                        struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL);
                         if (my_node)
                             enqueue(my_config.peers, my_node);
                     }
     break;
-case 19:
+
+  case 20:
 #line 336 "ntp_parser.y"
-{ yyval.Integer = T_Server; }
+    { (yyval.Integer) = T_Server; }
     break;
-case 20:
+
+  case 21:
 #line 337 "ntp_parser.y"
-{ yyval.Integer = T_Pool; }
+    { (yyval.Integer) = T_Pool; }
     break;
-case 21:
+
+  case 22:
 #line 338 "ntp_parser.y"
-{ yyval.Integer = T_Peer; }
+    { (yyval.Integer) = T_Peer; }
     break;
-case 22:
+
+  case 23:
 #line 339 "ntp_parser.y"
-{ yyval.Integer = T_Broadcast; }
+    { (yyval.Integer) = T_Broadcast; }
     break;
-case 23:
+
+  case 24:
 #line 340 "ntp_parser.y"
-{ yyval.Integer = T_Manycastclient; }
+    { (yyval.Integer) = T_Manycastclient; }
     break;
-case 24:
+
+  case 25:
 #line 344 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
+    { (yyval.Address_node) = (yyvsp[(1) - (1)].Address_node); }
     break;
-case 25:
+
+  case 26:
 #line 345 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
+    { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); }
     break;
-case 26:
+
+  case 27:
 #line 346 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
+    { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); }
     break;
-case 27:
+
+  case 28:
 #line 350 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, 0); }
+    { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); }
     break;
-case 28:
+
+  case 29:
 #line 354 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 29:
+
+  case 30:
 #line 355 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 30:
+
+  case 31:
 #line 360 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_SKEY); }
     break;
-case 31:
+
+  case 32:
 #line 361 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Bias, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Bias, (yyvsp[(2) - (2)].Double)); }
     break;
-case 32:
+
+  case 33:
 #line 362 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
-case 33:
+
+  case 34:
 #line 363 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
-case 34:
+
+  case 35:
 #line 364 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Key, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 35:
+
+  case 36:
 #line 365 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Minpoll, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 36:
+
+  case 37:
 #line 366 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Maxpoll, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 37:
+
+  case 38:
 #line 367 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
-case 38:
+
+  case 39:
 #line 368 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
-case 39:
+
+  case 40:
 #line 369 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
-case 40:
+
+  case 41:
 #line 370 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
-case 41:
+
+  case 42:
 #line 371 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_XLEAVE); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_XLEAVE); }
     break;
-case 42:
+
+  case 43:
 #line 372 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Ttl, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 43:
+
+  case 44:
 #line 373 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Mode, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 44:
+
+  case 45:
 #line 374 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Version, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 45:
+
+  case 46:
 #line 385 "ntp_parser.y"
-{ my_config.broadcastclient = SIMPLE; }
+    { my_config.broadcastclient = SIMPLE; }
     break;
-case 46:
+
+  case 47:
 #line 387 "ntp_parser.y"
-{ my_config.broadcastclient = NOVOLLEY;  }
+    { my_config.broadcastclient = NOVOLLEY;  }
     break;
-case 47:
+
+  case 48:
 #line 389 "ntp_parser.y"
-{ append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
+    { append_queue(my_config.manycastserver, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 48:
+
+  case 49:
 #line 391 "ntp_parser.y"
-{ append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
+    { append_queue(my_config.multicastclient, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 49:
+
+  case 50:
 #line 402 "ntp_parser.y"
-{ my_config.auth.autokey = yyvsp[0].Integer;  }
+    { my_config.auth.autokey = (yyvsp[(2) - (2)].Integer);  }
     break;
-case 50:
+
+  case 51:
 #line 404 "ntp_parser.y"
-{ my_config.auth.control_key = yyvsp[0].Integer;  }
+    { my_config.auth.control_key = (yyvsp[(2) - (2)].Integer);  }
     break;
-case 51:
+
+  case 52:
 #line 406 "ntp_parser.y"
-{ if (my_config.auth.crypto_cmd_list != NULL)
-					append_queue(my_config.auth.crypto_cmd_list, yyvsp[0].Queue);
+    { if (my_config.auth.crypto_cmd_list != NULL)
+					append_queue(my_config.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue));
 				else
-					my_config.auth.crypto_cmd_list = yyvsp[0].Queue;
+					my_config.auth.crypto_cmd_list = (yyvsp[(2) - (2)].Queue);
 			cryptosw++;
 			}
     break;
-case 52:
+
+  case 53:
 #line 413 "ntp_parser.y"
-{ my_config.auth.keys = yyvsp[0].String;  }
+    { my_config.auth.keys = (yyvsp[(2) - (2)].String);  }
     break;
-case 53:
+
+  case 54:
 #line 415 "ntp_parser.y"
-{ my_config.auth.keysdir = yyvsp[0].String;  }
+    { my_config.auth.keysdir = (yyvsp[(2) - (2)].String);  }
     break;
-case 54:
+
+  case 55:
 #line 417 "ntp_parser.y"
-{ my_config.auth.requested_key = yyvsp[0].Integer;  }
+    { my_config.auth.requested_key = (yyvsp[(2) - (2)].Integer);  }
     break;
-case 55:
+
+  case 56:
 #line 419 "ntp_parser.y"
-{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+    { my_config.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue);  }
     break;
-case 57:
+
+  case 58:
 #line 425 "ntp_parser.y"
-{ yyval.Queue = NULL; }
+    { (yyval.Queue) = NULL; }
     break;
-case 58:
+
+  case 59:
 #line 429 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 59:
+
+  case 60:
 #line 430 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 60:
+
+  case 61:
 #line 435 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PRIV, (yyvsp[(2) - (2)].String)); }
     break;
-case 61:
+
+  case 62:
 #line 437 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_IDENT, (yyvsp[(2) - (2)].String)); }
     break;
-case 62:
+
+  case 63:
 #line 439 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PW, (yyvsp[(2) - (2)].String)); }
     break;
-case 63:
+
+  case 64:
 #line 441 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_RAND, (yyvsp[(2) - (2)].String)); }
     break;
-case 64:
+
+  case 65:
 #line 443 "ntp_parser.y"
-{ my_config.auth.revoke = yyvsp[0].Integer;  }
+    { my_config.auth.revoke = (yyvsp[(2) - (2)].Integer);  }
     break;
-case 65:
+
+  case 66:
 #line 445 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_SIGN, (yyvsp[(2) - (2)].String)); }
     break;
-case 66:
+
+  case 67:
 #line 455 "ntp_parser.y"
-{ append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
+    { append_queue(my_config.orphan_cmds,(yyvsp[(2) - (2)].Queue));  }
     break;
-case 67:
+
+  case 68:
 #line 459 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 68:
+
+  case 69:
 #line 460 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 69:
+
+  case 70:
 #line 465 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_CEILING, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 70:
+
+  case 71:
 #line 467 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_FLOOR, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 71:
+
+  case 72:
 #line 469 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_COHORT, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 72:
+
+  case 73:
 #line 471 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_ORPHAN, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 73:
+
+  case 74:
 #line 473 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MINDISP, (yyvsp[(2) - (2)].Double)); }
     break;
-case 74:
+
+  case 75:
 #line 475 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXDIST, (yyvsp[(2) - (2)].Double)); }
     break;
-case 75:
+
+  case 76:
 #line 477 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MINCLOCK, (yyvsp[(2) - (2)].Double)); }
     break;
-case 76:
+
+  case 77:
 #line 479 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXCLOCK, (yyvsp[(2) - (2)].Double)); }
     break;
-case 77:
+
+  case 78:
 #line 481 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MINSANE, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 78:
+
+  case 79:
 #line 483 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_BEACON, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 79:
+
+  case 80:
 #line 485 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXHOP, (double)(yyvsp[(2) - (2)].Integer)); }
     break;
-case 80:
+
+  case 81:
 #line 495 "ntp_parser.y"
-{ append_queue(my_config.stats_list, yyvsp[0].Queue);  }
+    { append_queue(my_config.stats_list, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 81:
+
+  case 82:
 #line 497 "ntp_parser.y"
-{ my_config.stats_dir = yyvsp[0].String;  }
+    { my_config.stats_dir = (yyvsp[(2) - (2)].String);  }
     break;
-case 82:
+
+  case 83:
 #line 499 "ntp_parser.y"
-{
+    {
                         enqueue(my_config.filegen_opts,
-                                create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));
+                                create_filegen_node((yyvsp[(2) - (3)].VoidPtr), (yyvsp[(3) - (3)].Queue)));
                     }
     break;
-case 83:
+
+  case 84:
 #line 506 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); }
     break;
-case 84:
+
+  case 85:
 #line 507 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].VoidPtr)); }
     break;
-case 85:
+
+  case 86:
 #line 512 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("clockstats"); }
+    { (yyval.VoidPtr) = create_pval("clockstats"); }
     break;
-case 86:
+
+  case 87:
 #line 514 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("cryptostats"); }
+    { (yyval.VoidPtr) = create_pval("cryptostats"); }
     break;
-case 87:
+
+  case 88:
 #line 516 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("loopstats"); }
+    { (yyval.VoidPtr) = create_pval("loopstats"); }
     break;
-case 88:
+
+  case 89:
 #line 518 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("peerstats"); }
+    { (yyval.VoidPtr) = create_pval("peerstats"); }
     break;
-case 89:
+
+  case 90:
 #line 520 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("rawstats"); }
+    { (yyval.VoidPtr) = create_pval("rawstats"); }
     break;
-case 90:
+
+  case 91:
 #line 522 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("sysstats"); }
+    { (yyval.VoidPtr) = create_pval("sysstats"); }
     break;
-case 91:
+
+  case 92:
 #line 524 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("timingstats"); }
+    { (yyval.VoidPtr) = create_pval("timingstats"); }
     break;
-case 92:
+
+  case 93:
 #line 526 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("protostats"); }
+    { (yyval.VoidPtr) = create_pval("protostats"); }
     break;
-case 93:
+
+  case 94:
 #line 530 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 94:
+
+  case 95:
 #line 531 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 95:
+
+  case 96:
 #line 535 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(T_File, (yyvsp[(2) - (2)].String)); }
     break;
-case 96:
+
+  case 97:
 #line 536 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Type, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 97:
+
+  case 98:
 #line 537 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Link); }
     break;
-case 98:
+
+  case 99:
 #line 538 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Nolink); }
     break;
-case 99:
+
+  case 100:
 #line 539 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Enable); }
     break;
-case 100:
+
+  case 101:
 #line 540 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Disable); }
     break;
-case 101:
+
+  case 102:
 #line 544 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_NONE; }
+    { (yyval.Integer) = FILEGEN_NONE; }
     break;
-case 102:
+
+  case 103:
 #line 545 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_PID; }
+    { (yyval.Integer) = FILEGEN_PID; }
     break;
-case 103:
+
+  case 104:
 #line 546 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_DAY; }
+    { (yyval.Integer) = FILEGEN_DAY; }
     break;
-case 104:
+
+  case 105:
 #line 547 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_WEEK; }
+    { (yyval.Integer) = FILEGEN_WEEK; }
     break;
-case 105:
+
+  case 106:
 #line 548 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_MONTH; }
+    { (yyval.Integer) = FILEGEN_MONTH; }
     break;
-case 106:
+
+  case 107:
 #line 549 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_YEAR; }
+    { (yyval.Integer) = FILEGEN_YEAR; }
     break;
-case 107:
+
+  case 108:
 #line 550 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_AGE; }
+    { (yyval.Integer) = FILEGEN_AGE; }
     break;
-case 108:
+
+  case 109:
 #line 560 "ntp_parser.y"
-{   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+    {   append_queue(my_config.discard_opts, (yyvsp[(2) - (2)].Queue)); }
     break;
-case 109:
+
+  case 110:
 #line 562 "ntp_parser.y"
-{
+    {
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node(yyvsp[-1].Address_node, NULL, yyvsp[0].Queue, ip_file->line_no));
+                                create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no));
                     }
     break;
-case 110:
+
+  case 111:
 #line 567 "ntp_parser.y"
-{
+    {
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no));
+                                create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no));
                     }
     break;
-case 111:
+
+  case 112:
 #line 572 "ntp_parser.y"
-{
+    {
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node(yyvsp[-3].Address_node, yyvsp[-1].Address_node, yyvsp[0].Queue, ip_file->line_no));
+                                create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Queue), ip_file->line_no));
                     }
     break;
-case 112:
+
+  case 113:
 #line 579 "ntp_parser.y"
-{ yyval.Queue = create_queue(); }
+    { (yyval.Queue) = create_queue(); }
     break;
-case 113:
+
+  case 114:
 #line 580 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); }
     break;
-case 114:
+
+  case 115:
 #line 584 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_TIMEOUT); }
+    { (yyval.VoidPtr) = create_ival(RES_TIMEOUT); }
     break;
-case 115:
+
+  case 116:
 #line 585 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_IGNORE); }
+    { (yyval.VoidPtr) = create_ival(RES_IGNORE); }
     break;
-case 116:
+
+  case 117:
 #line 586 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_KOD); }
+    { (yyval.VoidPtr) = create_ival(RES_KOD); }
     break;
-case 117:
+
+  case 118:
 #line 587 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LIMITED); }
+    { (yyval.VoidPtr) = create_ival(RES_LIMITED); }
     break;
-case 118:
+
+  case 119:
 #line 588 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LPTRAP); }
+    { (yyval.VoidPtr) = create_ival(RES_LPTRAP); }
     break;
-case 119:
+
+  case 120:
 #line 589 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOMODIFY); }
+    { (yyval.VoidPtr) = create_ival(RES_NOMODIFY); }
     break;
-case 120:
+
+  case 121:
 #line 590 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOPEER); }
+    { (yyval.VoidPtr) = create_ival(RES_NOPEER); }
     break;
-case 121:
+
+  case 122:
 #line 591 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOQUERY); }
+    { (yyval.VoidPtr) = create_ival(RES_NOQUERY); }
     break;
-case 122:
+
+  case 123:
 #line 592 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTSERVE); }
+    { (yyval.VoidPtr) = create_ival(RES_DONTSERVE); }
     break;
-case 123:
+
+  case 124:
 #line 593 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOTRAP); }
+    { (yyval.VoidPtr) = create_ival(RES_NOTRAP); }
     break;
-case 124:
+
+  case 125:
 #line 594 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTTRUST); }
+    { (yyval.VoidPtr) = create_ival(RES_DONTTRUST); }
     break;
-case 125:
+
+  case 126:
 #line 595 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RESM_NTPONLY); }
+    { (yyval.VoidPtr) = create_ival(RESM_NTPONLY); }
     break;
-case 126:
+
+  case 127:
 #line 596 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_VERSION); }
+    { (yyval.VoidPtr) = create_ival(RES_VERSION); }
     break;
-case 127:
+
+  case 128:
 #line 600 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 128:
+
+  case 129:
 #line 601 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 129:
+
+  case 130:
 #line 605 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Average, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 130:
+
+  case 131:
 #line 606 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Minimum, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 131:
+
+  case 132:
 #line 607 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Monitor, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 132:
+
+  case 133:
 #line 616 "ntp_parser.y"
-{ enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+    { enqueue(my_config.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)));  }
     break;
-case 133:
+
+  case 134:
 #line 620 "ntp_parser.y"
-{ enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 134:
+
+  case 135:
 #line 621 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 135:
+
+  case 136:
 #line 626 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME1, (yyvsp[(2) - (2)].Double)); }
     break;
-case 136:
+
+  case 137:
 #line 628 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME2, (yyvsp[(2) - (2)].Double)); }
     break;
-case 137:
+
+  case 138:
 #line 630 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEVAL1,  (yyvsp[(2) - (2)].Integer)); }
     break;
-case 138:
+
+  case 139:
 #line 632 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
+    { (yyval.Attr_val) = create_attr_sval(CLK_HAVEVAL2,  (yyvsp[(2) - (2)].String)); }
     break;
-case 139:
+
+  case 140:
 #line 634 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG1, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 140:
+
+  case 141:
 #line 636 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG2, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 141:
+
+  case 142:
 #line 638 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG3, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 142:
+
+  case 143:
 #line 640 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG4, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 143:
+
+  case 144:
 #line 649 "ntp_parser.y"
-{ append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
+    { append_queue(my_config.enable_opts,(yyvsp[(2) - (2)].Queue));  }
     break;
-case 144:
+
+  case 145:
 #line 651 "ntp_parser.y"
-{ append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
+    { append_queue(my_config.disable_opts,(yyvsp[(2) - (2)].Queue));  }
     break;
-case 145:
+
+  case 146:
 #line 655 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 146:
+
+  case 147:
 #line 656 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 147:
+
+  case 148:
 #line 660 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
-case 148:
+
+  case 149:
 #line 661 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
-case 149:
+
+  case 150:
 #line 662 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
-case 150:
+
+  case 151:
 #line 663 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
-case 151:
+
+  case 152:
 #line 664 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
-case 152:
+
+  case 153:
 #line 665 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
-case 153:
+
+  case 154:
 #line 667 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
+    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
-case 154:
+
+  case 155:
 #line 675 "ntp_parser.y"
-{ append_queue(my_config.tinker, yyvsp[0].Queue);  }
+    { append_queue(my_config.tinker, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 155:
+
+  case 156:
 #line 679 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 156:
+
+  case 157:
 #line 680 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 157:
+
+  case 158:
 #line 684 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_ALLAN, (yyvsp[(2) - (2)].Double)); }
     break;
-case 158:
+
+  case 159:
 #line 685 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_PHI, (yyvsp[(2) - (2)].Double)); }
     break;
-case 159:
+
+  case 160:
 #line 686 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_FREQ, (yyvsp[(2) - (2)].Double)); }
     break;
-case 160:
+
+  case 161:
 #line 687 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_HUFFPUFF, (yyvsp[(2) - (2)].Double)); }
     break;
-case 161:
+
+  case 162:
 #line 688 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_PANIC, (yyvsp[(2) - (2)].Double)); }
     break;
-case 162:
+
+  case 163:
 #line 689 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_MAX, (yyvsp[(2) - (2)].Double)); }
     break;
-case 163:
+
+  case 164:
 #line 690 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(LOOP_MINSTEP, (yyvsp[(2) - (2)].Double)); }
     break;
-case 164:
+
+  case 165:
 #line 699 "ntp_parser.y"
-{
+    {
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
                         msyslog(LOG_INFO, "getconfig: Maximum include file level exceeded.");
                     }
                     else {
-                        fp[curr_include_level + 1] = F_OPEN(FindConfig(yyvsp[-1].String), "r");
+                        fp[curr_include_level + 1] = F_OPEN(FindConfig((yyvsp[(2) - (3)].String)), "r");
                         if (fp[curr_include_level + 1] == NULL) {
-                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(yyvsp[-1].String));
-                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig(yyvsp[-1].String));
+                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig((yyvsp[(2) - (3)].String)));
+                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[(2) - (3)].String)));
                         }
                         else
                             ip_file = fp[++curr_include_level];
                     }
                 }
     break;
-case 165:
+
+  case 166:
 #line 715 "ntp_parser.y"
-{
+    {
                     while (curr_include_level != -1)
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
-case 166:
+
+  case 167:
 #line 721 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
+    { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, (yyvsp[(2) - (2)].Double)));  }
     break;
-case 167:
+
+  case 168:
 #line 723 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
+    { enqueue(my_config.vars, create_attr_ival(T_Calldelay, (yyvsp[(2) - (2)].Integer)));  }
     break;
-case 168:
+
+  case 169:
 #line 725 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
+    { enqueue(my_config.vars, create_attr_dval(T_Tick, (yyvsp[(2) - (2)].Double)));  }
     break;
-case 169:
+
+  case 170:
 #line 727 "ntp_parser.y"
-{ /* Null action, possibly all null parms */ }
+    { /* Null action, possibly all null parms */ }
     break;
-case 170:
+
+  case 171:
 #line 729 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Leapfile, yyvsp[0].String)); }
+    { enqueue(my_config.vars, create_attr_sval(T_Leapfile, (yyvsp[(2) - (2)].String))); }
     break;
-case 171:
+
+  case 172:
 #line 732 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
+    { enqueue(my_config.vars, create_attr_sval(T_Pidfile, (yyvsp[(2) - (2)].String)));  }
     break;
-case 172:
+
+  case 173:
 #line 734 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
+    { enqueue(my_config.vars, create_attr_sval(T_Logfile, (yyvsp[(2) - (2)].String)));  }
     break;
-case 173:
+
+  case 174:
 #line 736 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
+    { enqueue(my_config.vars, create_attr_ival(T_Automax, (yyvsp[(2) - (2)].Integer)));  }
     break;
-case 174:
+
+  case 175:
 #line 739 "ntp_parser.y"
-{ append_queue(my_config.logconfig, yyvsp[0].Queue);  }
+    { append_queue(my_config.logconfig, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 175:
+
+  case 176:
 #line 741 "ntp_parser.y"
-{ append_queue(my_config.phone, yyvsp[0].Queue);  }
+    { append_queue(my_config.phone, (yyvsp[(2) - (2)].Queue));  }
     break;
-case 176:
+
+  case 177:
 #line 743 "ntp_parser.y"
-{ enqueue(my_config.setvar, yyvsp[0].Set_var);  }
+    { enqueue(my_config.setvar, (yyvsp[(2) - (2)].Set_var));  }
     break;
-case 177:
+
+  case 178:
 #line 745 "ntp_parser.y"
-{ enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+    { enqueue(my_config.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)));  }
     break;
-case 178:
+
+  case 179:
 #line 747 "ntp_parser.y"
-{ append_queue(my_config.ttl, yyvsp[0].Queue); }
+    { append_queue(my_config.ttl, (yyvsp[(2) - (2)].Queue)); }
     break;
-case 179:
+
+  case 180:
 #line 749 "ntp_parser.y"
-{ enqueue(my_config.qos, create_attr_sval(T_Qos, yyvsp[0].String)); }
+    { enqueue(my_config.qos, create_attr_sval(T_Qos, (yyvsp[(2) - (2)].String))); }
     break;
-case 180:
+
+  case 181:
 #line 753 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
+    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); }
     break;
-case 181:
+
+  case 182:
 #line 755 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, yyvsp[0].Double));
-		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
+    { enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double)));
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); }
     break;
-case 182:
+
+  case 183:
 #line 757 "ntp_parser.y"
-{ /* Null driftfile,  indicated by null string "\0" */
+    { /* Null driftfile,  indicated by null string "\0" */
 		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
     break;
-case 183:
+
+  case 184:
 #line 763 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+    { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), DEF); }
     break;
-case 184:
+
+  case 185:
 #line 765 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+    { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); }
     break;
-case 185:
+
+  case 186:
 #line 770 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 186:
+
+  case 187:
 #line 771 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 187:
+
+  case 188:
 #line 775 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+    { (yyval.Attr_val) = create_attr_ival(T_Port, (yyvsp[(2) - (2)].Integer)); }
     break;
-case 188:
+
+  case 189:
 #line 776 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+    { (yyval.Attr_val) = create_attr_pval(T_Interface, (yyvsp[(2) - (2)].Address_node)); }
     break;
-case 189:
+
+  case 190:
 #line 781 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
     break;
-case 190:
+
+  case 191:
 #line 782 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
     break;
-case 191:
+
+  case 192:
 #line 787 "ntp_parser.y"
-{
-                    char prefix = yyvsp[0].String[0];
-                    char *type = &(yyvsp[0].String[1]);
+    {
+                    char prefix = (yyvsp[(1) - (1)].String)[0];
+                    char *type = &((yyvsp[(1) - (1)].String)[1]);
                     if (prefix != '+' && prefix != '-' && prefix != '=') {
                         yyerror("Logconfig prefix is not '+', '-' or '='\n");
                     }
                     else
-                        yyval.Attr_val = create_attr_sval(prefix, type);
+                        (yyval.Attr_val) = create_attr_sval(prefix, type);
                 }
     break;
-case 192:
+
+  case 193:
 #line 803 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); }
     break;
-case 193:
+
+  case 194:
 #line 804 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
+    { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); }
     break;
-case 194:
+
+  case 195:
 #line 808 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); }
     break;
-case 195:
+
+  case 196:
 #line 809 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
+    { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); }
     break;
-case 196:
+
+  case 197:
 #line 813 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); }
     break;
-case 197:
+
+  case 198:
 #line 814 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); }
     break;
-case 198:
+
+  case 199:
 #line 819 "ntp_parser.y"
-{
-                    if (yyvsp[0].Integer != 0 && yyvsp[0].Integer != 1) {
+    {
+                    if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) {
                         yyerror("Integer value is not boolean (0 or 1). Assuming 1");
-                        yyval.Integer = 1;
+                        (yyval.Integer) = 1;
                     }
                     else
-                        yyval.Integer = yyvsp[0].Integer;
+                        (yyval.Integer) = (yyvsp[(1) - (1)].Integer);
                 }
     break;
-case 199:
+
+  case 200:
 #line 827 "ntp_parser.y"
-{ yyval.Integer = 1; }
+    { (yyval.Integer) = 1; }
     break;
-case 200:
+
+  case 201:
 #line 828 "ntp_parser.y"
-{ yyval.Integer = 0; }
+    { (yyval.Integer) = 0; }
     break;
-case 201:
+
+  case 202:
 #line 832 "ntp_parser.y"
-{ yyval.Double = (double)yyvsp[0].Integer; }
+    { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); }
     break;
-case 202:
+
+  case 203:
 #line 833 "ntp_parser.y"
-{ yyval.Double = yyvsp[0].Double; }
+    { (yyval.Double) = (yyvsp[(1) - (1)].Double); }
     break;
-case 203:
+
+  case 204:
 #line 842 "ntp_parser.y"
-{
-                 my_config.sim_details = create_sim_node(yyvsp[-2].Queue, yyvsp[-1].Queue);
+    {
+                 my_config.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue));
 
                  /* Reset the old_config_style variable */
                  old_config_style = 1;
              }
     break;
-case 204:
+
+  case 205:
 #line 856 "ntp_parser.y"
-{ old_config_style = 0; }
+    { old_config_style = 0; }
     break;
-case 205:
+
+  case 206:
 #line 860 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); }
     break;
-case 206:
+
+  case 207:
 #line 861 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); }
     break;
-case 207:
+
+  case 208:
 #line 865 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Beep_Delay, (yyvsp[(3) - (3)].Double)); }
     break;
-case 208:
+
+  case 209:
 #line 866 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Sim_Duration, (yyvsp[(3) - (3)].Double)); }
     break;
-case 209:
+
+  case 210:
 #line 870 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); }
     break;
-case 210:
+
+  case 211:
 #line 871 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); }
     break;
-case 211:
+
+  case 212:
 #line 876 "ntp_parser.y"
-{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
+    { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); }
     break;
-case 212:
+
+  case 213:
 #line 880 "ntp_parser.y"
-{ yyval.Double = yyvsp[-1].Double; }
+    { (yyval.Double) = (yyvsp[(3) - (4)].Double); }
     break;
-case 213:
+
+  case 214:
 #line 884 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
+    { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); }
     break;
-case 214:
+
+  case 215:
 #line 888 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); }
     break;
-case 215:
+
+  case 216:
 #line 889 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); }
     break;
-case 216:
+
+  case 217:
 #line 894 "ntp_parser.y"
-{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+    { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); }
     break;
-case 217:
+
+  case 218:
 #line 898 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); }
     break;
-case 218:
+
+  case 219:
 #line 899 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); }
     break;
-case 219:
+
+  case 220:
 #line 904 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Freq_Offset, (yyvsp[(3) - (3)].Double)); }
     break;
-case 220:
+
+  case 221:
 #line 906 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Wander, (yyvsp[(3) - (3)].Double)); }
     break;
-case 221:
+
+  case 222:
 #line 908 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Jitter, (yyvsp[(3) - (3)].Double)); }
     break;
-case 222:
+
+  case 223:
 #line 910 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Prop_Delay, (yyvsp[(3) - (3)].Double)); }
     break;
-case 223:
+
+  case 224:
 #line 912 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+    { (yyval.Attr_val) = create_attr_dval(T_Proc_Delay, (yyvsp[(3) - (3)].Double)); }
     break;
-}
-
-#line 705 "/usr/local/gnu/share/bison/bison.simple"
 
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
+/* Line 1267 of yacc.c.  */
+#line 3206 "ntp_parser.c"
+      default: break;
     }
-#endif
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
+
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
@@ -2386,11 +3220,11 @@ case 223:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
@@ -2403,155 +3237,129 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
 	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* defined (YYERROR_VERBOSE) */
-	yyerror ("parse error");
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
-  goto yyerrlab1;
 
 
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
-yyerrlab1:
+
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
+  goto yyerrlab1;
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
 
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG
-  if (yydebug)
+  for (;;)
     {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
   goto yynewstate;
@@ -2571,21 +3379,43 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
+#endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
+
+
 #line 916 "ntp_parser.y"
 
 
@@ -2627,4 +3457,5 @@ int main(int argc, char *argv[])
     return 0;
 }
 */
+
 

==== ntpd/ntp_parser.h ====
2008-09-13 23:02:50-04:00, stenn at pogo.udel.edu +363 -161
  rebuild with newer bison

--- 1.13/ntpd/ntp_parser.h	2008-09-12 09:38:21 -04:00
+++ 1.14/ntpd/ntp_parser.h	2008-09-13 23:02:50 -04:00
@@ -1,8 +1,361 @@
-#ifndef BISON_NTP_PARSER_H
-# define BISON_NTP_PARSER_H
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-#ifndef YYSTYPE
-typedef union {
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_Age = 258,
+     T_Allan = 259,
+     T_Auth = 260,
+     T_Autokey = 261,
+     T_Automax = 262,
+     T_Average = 263,
+     T_Bclient = 264,
+     T_Beacon = 265,
+     T_Bias = 266,
+     T_Broadcast = 267,
+     T_Broadcastclient = 268,
+     T_Broadcastdelay = 269,
+     T_Burst = 270,
+     T_Calibrate = 271,
+     T_Calldelay = 272,
+     T_Ceiling = 273,
+     T_Clockstats = 274,
+     T_Cohort = 275,
+     T_ControlKey = 276,
+     T_Crypto = 277,
+     T_Cryptostats = 278,
+     T_Day = 279,
+     T_Default = 280,
+     T_Disable = 281,
+     T_Discard = 282,
+     T_Dispersion = 283,
+     T_Double = 284,
+     T_Driftfile = 285,
+     T_WanderThreshold = 286,
+     T_Enable = 287,
+     T_End = 288,
+     T_False = 289,
+     T_File = 290,
+     T_Filegen = 291,
+     T_Flag1 = 292,
+     T_Flag2 = 293,
+     T_Flag3 = 294,
+     T_Flag4 = 295,
+     T_Flake = 296,
+     T_Floor = 297,
+     T_Freq = 298,
+     T_Fudge = 299,
+     T_Host = 300,
+     T_Huffpuff = 301,
+     T_IPv4_address = 302,
+     T_IPv6_address = 303,
+     T_Iburst = 304,
+     T_Ident = 305,
+     T_Ignore = 306,
+     T_Includefile = 307,
+     T_Integer = 308,
+     T_Interface = 309,
+     T_Kernel = 310,
+     T_Key = 311,
+     T_Keys = 312,
+     T_Keysdir = 313,
+     T_Kod = 314,
+     T_Leap = 315,
+     T_Leapfile = 316,
+     T_Limited = 317,
+     T_Link = 318,
+     T_Logconfig = 319,
+     T_Logfile = 320,
+     T_Loopstats = 321,
+     T_Lowpriotrap = 322,
+     T_Manycastclient = 323,
+     T_Manycastserver = 324,
+     T_Mask = 325,
+     T_Maxclock = 326,
+     T_Maxdist = 327,
+     T_Maxhop = 328,
+     T_Maxpoll = 329,
+     T_Minclock = 330,
+     T_Mindist = 331,
+     T_Minimum = 332,
+     T_Minpoll = 333,
+     T_Minsane = 334,
+     T_Mode = 335,
+     T_Monitor = 336,
+     T_Month = 337,
+     T_Multicastclient = 338,
+     T_Nolink = 339,
+     T_Nomodify = 340,
+     T_None = 341,
+     T_Nopeer = 342,
+     T_Noquery = 343,
+     T_Noselect = 344,
+     T_Noserve = 345,
+     T_Notrap = 346,
+     T_Notrust = 347,
+     T_Novolley = 348,
+     T_Ntp = 349,
+     T_Ntpport = 350,
+     T_Orphan = 351,
+     T_Panic = 352,
+     T_Peer = 353,
+     T_Peerstats = 354,
+     T_Phone = 355,
+     T_Pid = 356,
+     T_Pidfile = 357,
+     T_Pool = 358,
+     T_Port = 359,
+     T_Pps = 360,
+     T_Preempt = 361,
+     T_Prefer = 362,
+     T_Protostats = 363,
+     T_Pw = 364,
+     T_Qos = 365,
+     T_RandFile = 366,
+     T_Rawstats = 367,
+     T_Refid = 368,
+     T_Requestkey = 369,
+     T_Restrict = 370,
+     T_Revoke = 371,
+     T_Server = 372,
+     T_Setvar = 373,
+     T_Sign = 374,
+     T_Statistics = 375,
+     T_Stats = 376,
+     T_Statsdir = 377,
+     T_Step = 378,
+     T_Stepout = 379,
+     T_Stratum = 380,
+     T_String = 381,
+     T_Sysstats = 382,
+     T_Tick = 383,
+     T_Time1 = 384,
+     T_Time2 = 385,
+     T_Timingstats = 386,
+     T_Tinker = 387,
+     T_Tos = 388,
+     T_Trap = 389,
+     T_True = 390,
+     T_Trustedkey = 391,
+     T_Ttl = 392,
+     T_Type = 393,
+     T_Version = 394,
+     T_Week = 395,
+     T_Xleave = 396,
+     T_Year = 397,
+     T_Flag = 398,
+     T_Void = 399,
+     T_EOC = 400,
+     T_Simulate = 401,
+     T_Beep_Delay = 402,
+     T_Sim_Duration = 403,
+     T_Server_Offset = 404,
+     T_Duration = 405,
+     T_Freq_Offset = 406,
+     T_Wander = 407,
+     T_Jitter = 408,
+     T_Prop_Delay = 409,
+     T_Proc_Delay = 410
+   };
+#endif
+/* Tokens.  */
+#define T_Age 258
+#define T_Allan 259
+#define T_Auth 260
+#define T_Autokey 261
+#define T_Automax 262
+#define T_Average 263
+#define T_Bclient 264
+#define T_Beacon 265
+#define T_Bias 266
+#define T_Broadcast 267
+#define T_Broadcastclient 268
+#define T_Broadcastdelay 269
+#define T_Burst 270
+#define T_Calibrate 271
+#define T_Calldelay 272
+#define T_Ceiling 273
+#define T_Clockstats 274
+#define T_Cohort 275
+#define T_ControlKey 276
+#define T_Crypto 277
+#define T_Cryptostats 278
+#define T_Day 279
+#define T_Default 280
+#define T_Disable 281
+#define T_Discard 282
+#define T_Dispersion 283
+#define T_Double 284
+#define T_Driftfile 285
+#define T_WanderThreshold 286
+#define T_Enable 287
+#define T_End 288
+#define T_False 289
+#define T_File 290
+#define T_Filegen 291
+#define T_Flag1 292
+#define T_Flag2 293
+#define T_Flag3 294
+#define T_Flag4 295
+#define T_Flake 296
+#define T_Floor 297
+#define T_Freq 298
+#define T_Fudge 299
+#define T_Host 300
+#define T_Huffpuff 301
+#define T_IPv4_address 302
+#define T_IPv6_address 303
+#define T_Iburst 304
+#define T_Ident 305
+#define T_Ignore 306
+#define T_Includefile 307
+#define T_Integer 308
+#define T_Interface 309
+#define T_Kernel 310
+#define T_Key 311
+#define T_Keys 312
+#define T_Keysdir 313
+#define T_Kod 314
+#define T_Leap 315
+#define T_Leapfile 316
+#define T_Limited 317
+#define T_Link 318
+#define T_Logconfig 319
+#define T_Logfile 320
+#define T_Loopstats 321
+#define T_Lowpriotrap 322
+#define T_Manycastclient 323
+#define T_Manycastserver 324
+#define T_Mask 325
+#define T_Maxclock 326
+#define T_Maxdist 327
+#define T_Maxhop 328
+#define T_Maxpoll 329
+#define T_Minclock 330
+#define T_Mindist 331
+#define T_Minimum 332
+#define T_Minpoll 333
+#define T_Minsane 334
+#define T_Mode 335
+#define T_Monitor 336
+#define T_Month 337
+#define T_Multicastclient 338
+#define T_Nolink 339
+#define T_Nomodify 340
+#define T_None 341
+#define T_Nopeer 342
+#define T_Noquery 343
+#define T_Noselect 344
+#define T_Noserve 345
+#define T_Notrap 346
+#define T_Notrust 347
+#define T_Novolley 348
+#define T_Ntp 349
+#define T_Ntpport 350
+#define T_Orphan 351
+#define T_Panic 352
+#define T_Peer 353
+#define T_Peerstats 354
+#define T_Phone 355
+#define T_Pid 356
+#define T_Pidfile 357
+#define T_Pool 358
+#define T_Port 359
+#define T_Pps 360
+#define T_Preempt 361
+#define T_Prefer 362
+#define T_Protostats 363
+#define T_Pw 364
+#define T_Qos 365
+#define T_RandFile 366
+#define T_Rawstats 367
+#define T_Refid 368
+#define T_Requestkey 369
+#define T_Restrict 370
+#define T_Revoke 371
+#define T_Server 372
+#define T_Setvar 373
+#define T_Sign 374
+#define T_Statistics 375
+#define T_Stats 376
+#define T_Statsdir 377
+#define T_Step 378
+#define T_Stepout 379
+#define T_Stratum 380
+#define T_String 381
+#define T_Sysstats 382
+#define T_Tick 383
+#define T_Time1 384
+#define T_Time2 385
+#define T_Timingstats 386
+#define T_Tinker 387
+#define T_Tos 388
+#define T_Trap 389
+#define T_True 390
+#define T_Trustedkey 391
+#define T_Ttl 392
+#define T_Type 393
+#define T_Version 394
+#define T_Week 395
+#define T_Xleave 396
+#define T_Year 397
+#define T_Flag 398
+#define T_Void 399
+#define T_EOC 400
+#define T_Simulate 401
+#define T_Beep_Delay 402
+#define T_Sim_Duration 403
+#define T_Server_Offset 404
+#define T_Duration 405
+#define T_Freq_Offset 406
+#define T_Wander 407
+#define T_Jitter 408
+#define T_Prop_Delay 409
+#define T_Proc_Delay 410
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 49 "ntp_parser.y"
+{
     char   *String;
     double  Double;
     int     Integer;
@@ -15,165 +368,14 @@ typedef union {
     /* Simulation types */
     server_info *Sim_server;
     script_info *Sim_script;
-} yystype;
-# define YYSTYPE yystype
+}
+/* Line 1529 of yacc.c.  */
+#line 374 "ntp_parser.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_Bias	265
-# define	T_Broadcast	266
-# define	T_Broadcastclient	267
-# define	T_Broadcastdelay	268
-# define	T_Burst	269
-# define	T_Calibrate	270
-# define	T_Calldelay	271
-# define	T_Ceiling	272
-# define	T_Clockstats	273
-# define	T_Cohort	274
-# define	T_ControlKey	275
-# define	T_Crypto	276
-# define	T_Cryptostats	277
-# define	T_Day	278
-# define	T_Default	279
-# define	T_Disable	280
-# define	T_Discard	281
-# define	T_Dispersion	282
-# define	T_Double	283
-# define	T_Driftfile	284
-# define	T_WanderThreshold	285
-# define	T_Enable	286
-# define	T_End	287
-# define	T_False	288
-# define	T_File	289
-# define	T_Filegen	290
-# define	T_Flag1	291
-# define	T_Flag2	292
-# define	T_Flag3	293
-# define	T_Flag4	294
-# define	T_Flake	295
-# define	T_Floor	296
-# define	T_Freq	297
-# define	T_Fudge	298
-# define	T_Host	299
-# define	T_Huffpuff	300
-# define	T_IPv4_address	301
-# define	T_IPv6_address	302
-# define	T_Iburst	303
-# define	T_Ident	304
-# define	T_Ignore	305
-# define	T_Includefile	306
-# define	T_Integer	307
-# define	T_Interface	308
-# define	T_Kernel	309
-# define	T_Key	310
-# define	T_Keys	311
-# define	T_Keysdir	312
-# define	T_Kod	313
-# define	T_Leap	314
-# define	T_Leapfile	315
-# define	T_Limited	316
-# define	T_Link	317
-# define	T_Logconfig	318
-# define	T_Logfile	319
-# define	T_Loopstats	320
-# define	T_Lowpriotrap	321
-# define	T_Manycastclient	322
-# define	T_Manycastserver	323
-# define	T_Mask	324
-# define	T_Maxclock	325
-# define	T_Maxdist	326
-# define	T_Maxhop	327
-# define	T_Maxpoll	328
-# define	T_Minclock	329
-# define	T_Mindist	330
-# define	T_Minimum	331
-# define	T_Minpoll	332
-# define	T_Minsane	333
-# define	T_Mode	334
-# define	T_Monitor	335
-# define	T_Month	336
-# define	T_Multicastclient	337
-# define	T_Nolink	338
-# define	T_Nomodify	339
-# define	T_None	340
-# define	T_Nopeer	341
-# define	T_Noquery	342
-# define	T_Noselect	343
-# define	T_Noserve	344
-# define	T_Notrap	345
-# define	T_Notrust	346
-# define	T_Novolley	347
-# define	T_Ntp	348
-# define	T_Ntpport	349
-# define	T_Orphan	350
-# define	T_Panic	351
-# define	T_Peer	352
-# define	T_Peerstats	353
-# define	T_Phone	354
-# define	T_Pid	355
-# define	T_Pidfile	356
-# define	T_Pool	357
-# define	T_Port	358
-# define	T_Pps	359
-# define	T_Preempt	360
-# define	T_Prefer	361
-# define	T_Protostats	362
-# define	T_Pw	363
-# define	T_Qos	364
-# define	T_RandFile	365
-# define	T_Rawstats	366
-# define	T_Refid	367
-# define	T_Requestkey	368
-# define	T_Restrict	369
-# define	T_Revoke	370
-# define	T_Server	371
-# define	T_Setvar	372
-# define	T_Sign	373
-# define	T_Statistics	374
-# define	T_Stats	375
-# define	T_Statsdir	376
-# define	T_Step	377
-# define	T_Stepout	378
-# define	T_Stratum	379
-# define	T_String	380
-# define	T_Sysstats	381
-# define	T_Tick	382
-# define	T_Time1	383
-# define	T_Time2	384
-# define	T_Timingstats	385
-# define	T_Tinker	386
-# define	T_Tos	387
-# define	T_Trap	388
-# define	T_True	389
-# define	T_Trustedkey	390
-# define	T_Ttl	391
-# define	T_Type	392
-# define	T_Version	393
-# define	T_Week	394
-# define	T_Xleave	395
-# define	T_Year	396
-# define	T_Flag	397
-# define	T_Void	398
-# define	T_EOC	399
-# define	T_Simulate	400
-# define	T_Beep_Delay	401
-# define	T_Sim_Duration	402
-# define	T_Server_Offset	403
-# define	T_Duration	404
-# define	T_Freq_Offset	405
-# define	T_Wander	406
-# define	T_Jitter	407
-# define	T_Prop_Delay	408
-# define	T_Proc_Delay	409
-
 
 extern YYSTYPE yylval;
 
-#endif /* not BISON_NTP_PARSER_H */

#### ChangeSet ####
2008-09-13 21:42:40-04:00, utterback at pogo.udel.edu 
  ntp_config.c:
    Reinstate timingstats file

==== ntpd/ntp_config.c ====
2008-09-13 21:42:13-04:00, utterback at pogo.udel.edu +1 -0
  Reinstate timingstats file

--- 1.182/ntpd/ntp_config.c	2008-08-31 02:05:58 -04:00
+++ 1.183/ntpd/ntp_config.c	2008-09-13 21:42:13 -04:00
@@ -838,6 +838,7 @@ struct key_tok keyword_list[] = {
 	{ "rawstats",		T_Rawstats,        NO_ARG },
 	{ "sysstats", 		T_Sysstats,        NO_ARG },
 	{ "protostats",		T_Protostats,	   NO_ARG },
+	{ "timingstats",	T_Timingstats,	   NO_ARG },
 /* filegen_option */
 	{ "disable",		T_Disable,         NO_ARG },
 	{ "enable",		T_Enable,          NO_ARG },

#### ChangeSet ####
2008-09-13 07:49:17-04:00, stenn at whimsy.udel.edu 
  NTP_4_2_5P130
  TAG: NTP_4_2_5P130

==== ChangeLog ====
2008-09-13 07:48:57-04:00, stenn at whimsy.udel.edu +1 -0
  NTP_4_2_5P130

--- 1.222/ChangeLog	2008-09-13 05:03:42 -04:00
+++ 1.223/ChangeLog	2008-09-13 07:48:57 -04:00
@@ -1,3 +1,4 @@
+(4.2.5p130) 2008/09/13 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1064] Implement --with-net-snmp-config=progname
 * [Bug 1063] ntpSnmpSubagentObject.h is missing from the distribution.
 (4.2.5p129) 2008/09/11 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/ntpd-opts.c ====
2008-09-13 07:48:58-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.121/ntpd/ntpd-opts.c	2008-09-11 07:42:46 -04:00
+++ 1.122/ntpd/ntpd-opts.c	2008-09-13 07:48:58 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:33:53 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:39:44 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -853,7 +853,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.5p129\n\
+"ntpd - NTP daemon program - Ver. 4.2.5p130\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 #define zRcName     NULL
 #define apzHomeList NULL

==== ntpd/ntpd-opts.h ====
2008-09-13 07:48:59-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_5P130

--- 1.121/ntpd/ntpd-opts.h	2008-09-11 07:42:47 -04:00
+++ 1.122/ntpd/ntpd-opts.h	2008-09-13 07:48:59 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:33:53 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:39:43 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -87,8 +87,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    32
-#define NTPD_VERSION       "4.2.5p129"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p129"
+#define NTPD_VERSION       "4.2.5p130"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p130"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpd/ntpd-opts.texi ====
2008-09-13 07:49:00-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.120/ntpd/ntpd-opts.texi	2008-09-11 07:42:48 -04:00
+++ 1.121/ntpd/ntpd-opts.texi	2008-09-13 07:49:00 -04:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 11, 2008 at 07:33:56 AM EDT
+# It has been AutoGen-ed  Saturday September 13, 2008 at 07:39:47 AM EDT
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== ntpd/ntpd.1 ====
2008-09-13 07:49:00-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.120/ntpd/ntpd.1	2008-09-11 07:42:48 -04:00
+++ 1.121/ntpd/ntpd.1	2008-09-13 07:49:00 -04:00
@@ -1,7 +1,7 @@
-.TH NTPD 1 2008-09-11 "( 4.2.5p129)" "Programmer's Manual"
+.TH NTPD 1 2008-09-13 "( 4.2.5p130)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 11, 2008 at 07:33:55 AM EDT
+.\"  It has been AutoGen-ed  Saturday September 13, 2008 at 07:39:46 AM EDT
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpdc/ntpdc-opts.c ====
2008-09-13 07:49:01-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.117/ntpdc/ntpdc-opts.c	2008-09-11 07:42:50 -04:00
+++ 1.118/ntpdc/ntpdc-opts.c	2008-09-13 07:49:01 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:40:44 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:46:51 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -462,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p129\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p130\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpdc/ntpdc-opts.h ====
2008-09-13 07:49:02-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_5P130

--- 1.117/ntpdc/ntpdc-opts.h	2008-09-11 07:42:50 -04:00
+++ 1.118/ntpdc/ntpdc-opts.h	2008-09-13 07:49:02 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:40:44 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:46:50 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -70,8 +70,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.5p129"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p129"
+#define NTPDC_VERSION       "4.2.5p130"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p130"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpdc/ntpdc-opts.texi ====
2008-09-13 07:49:03-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.116/ntpdc/ntpdc-opts.texi	2008-09-11 07:42:51 -04:00
+++ 1.117/ntpdc/ntpdc-opts.texi	2008-09-13 07:49:03 -04:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 11, 2008 at 07:40:46 AM EDT
+# It has been AutoGen-ed  Saturday September 13, 2008 at 07:46:53 AM EDT
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== ntpdc/ntpdc.1 ====
2008-09-13 07:49:03-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.116/ntpdc/ntpdc.1	2008-09-11 07:42:51 -04:00
+++ 1.117/ntpdc/ntpdc.1	2008-09-13 07:49:03 -04:00
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2008-09-11 "( 4.2.5p129)" "Programmer's Manual"
+.TH NTPDC 1 2008-09-13 "( 4.2.5p130)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 11, 2008 at 07:40:45 AM EDT
+.\"  It has been AutoGen-ed  Saturday September 13, 2008 at 07:46:52 AM EDT
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== ntpq/ntpq-opts.c ====
2008-09-13 07:49:04-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.117/ntpq/ntpq-opts.c	2008-09-11 07:42:52 -04:00
+++ 1.118/ntpq/ntpq-opts.c	2008-09-13 07:49:04 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:41:15 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:47:24 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -410,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.5p129\n\
+"ntpq - standard NTP query program - Ver. 4.2.5p130\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== ntpq/ntpq-opts.h ====
2008-09-13 07:49:05-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_5P130

--- 1.117/ntpq/ntpq-opts.h	2008-09-11 07:42:52 -04:00
+++ 1.118/ntpq/ntpq-opts.h	2008-09-13 07:49:05 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:41:15 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:47:24 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -68,8 +68,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define NTPQ_VERSION       "4.2.5p129"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p129"
+#define NTPQ_VERSION       "4.2.5p130"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.5p130"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== ntpq/ntpq-opts.texi ====
2008-09-13 07:49:05-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.116/ntpq/ntpq-opts.texi	2008-09-11 07:42:53 -04:00
+++ 1.117/ntpq/ntpq-opts.texi	2008-09-13 07:49:05 -04:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 11, 2008 at 07:41:18 AM EDT
+# It has been AutoGen-ed  Saturday September 13, 2008 at 07:47:27 AM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== ntpq/ntpq.1 ====
2008-09-13 07:49:06-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.116/ntpq/ntpq.1	2008-09-11 07:42:53 -04:00
+++ 1.117/ntpq/ntpq.1	2008-09-13 07:49:06 -04:00
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2008-09-11 "( 4.2.5p129)" "Programmer's Manual"
+.TH NTPQ 1 2008-09-13 "( 4.2.5p130)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 11, 2008 at 07:41:17 AM EDT
+.\"  It has been AutoGen-ed  Saturday September 13, 2008 at 07:47:26 AM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== packageinfo.sh ====
2008-09-13 07:49:06-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.132/packageinfo.sh	2008-09-11 07:42:54 -04:00
+++ 1.133/packageinfo.sh	2008-09-13 07:49:06 -04:00
@@ -9,7 +9,7 @@ version=${proto}.${major}.${minor}
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=129
+point=130
 # Special.  Normally unused.  A suffix.
 #special=ag
 special=

==== sntp/sntp-opts.c ====
2008-09-13 07:49:07-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.117/sntp/sntp-opts.c	2008-09-11 07:42:55 -04:00
+++ 1.118/sntp/sntp-opts.c	2008-09-13 07:49:07 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:05 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:13 AM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -513,7 +513,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.5p129\n\
+"sntp - standard SNTP program - Ver. 4.2.5p130\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== sntp/sntp-opts.h ====
2008-09-13 07:49:08-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_5P130

--- 1.117/sntp/sntp-opts.h	2008-09-11 07:42:56 -04:00
+++ 1.118/sntp/sntp-opts.h	2008-09-13 07:49:08 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:04 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:12 AM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -147,8 +147,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define SNTP_VERSION       "4.2.5p129"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p129"
+#define SNTP_VERSION       "4.2.5p130"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.5p130"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== sntp/sntp-opts.texi ====
2008-09-13 07:49:08-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.116/sntp/sntp-opts.texi	2008-09-11 07:42:57 -04:00
+++ 1.117/sntp/sntp-opts.texi	2008-09-13 07:49:08 -04:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:07 AM EDT
+# It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:16 AM EDT
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== sntp/sntp.1 ====
2008-09-13 07:49:09-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.116/sntp/sntp.1	2008-09-11 07:42:58 -04:00
+++ 1.117/sntp/sntp.1	2008-09-13 07:49:09 -04:00
@@ -1,7 +1,7 @@
-.TH SNTP 1 2008-09-11 "( 4.2.5p129)" "Programmer's Manual"
+.TH SNTP 1 2008-09-13 "( 4.2.5p130)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:06 AM EDT
+.\"  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:14 AM EDT
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman1.tpl
 .\"

==== util/ntp-keygen-opts.c ====
2008-09-13 07:49:10-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.120/util/ntp-keygen-opts.c	2008-09-11 07:42:58 -04:00
+++ 1.121/util/ntp-keygen-opts.c	2008-09-13 07:49:10 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:15 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:24 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -770,7 +770,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p129\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p130\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {

==== util/ntp-keygen-opts.h ====
2008-09-13 07:49:11-04:00, stenn at whimsy.udel.edu +3 -3
  NTP_4_2_5P130

--- 1.120/util/ntp-keygen-opts.h	2008-09-11 07:42:59 -04:00
+++ 1.121/util/ntp-keygen-opts.h	2008-09-13 07:49:11 -04:00
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:14 AM EDT
+ *  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:23 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define NTP_KEYGEN_VERSION       "4.2.5p129"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p129"
+#define NTP_KEYGEN_VERSION       "4.2.5p130"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p130"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED

==== util/ntp-keygen-opts.texi ====
2008-09-13 07:49:12-04:00, stenn at whimsy.udel.edu +1 -1
  NTP_4_2_5P130

--- 1.119/util/ntp-keygen-opts.texi	2008-09-11 07:43:00 -04:00
+++ 1.120/util/ntp-keygen-opts.texi	2008-09-13 07:49:12 -04:00
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:17 AM EDT
+# It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:27 AM EDT
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore

==== util/ntp-keygen.1 ====
2008-09-13 07:49:13-04:00, stenn at whimsy.udel.edu +2 -2
  NTP_4_2_5P130

--- 1.119/util/ntp-keygen.1	2008-09-11 07:43:01 -04:00
+++ 1.120/util/ntp-keygen.1	2008-09-13 07:49:13 -04:00
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2008-09-11 "(ntp 4.2.5p129)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2008-09-13 "(ntp 4.2.5p130)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday September 11, 2008 at 07:42:16 AM EDT
+.\"  It has been AutoGen-ed  Saturday September 13, 2008 at 07:48:25 AM EDT
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"

#### ChangeSet ####
2008-09-12 09:39:33-04:00, utterback at pogo.udel.edu 
  ntp_util.c, ntp_parser.y, ntp_parser.h, ntp_parser.c:
    Reinstate lost timingstats file

==== ntpd/ntp_parser.c ====
2008-09-12 09:37:53-04:00, utterback at pogo.udel.edu +1818 -2649
  Reinstate lost timingstats file

--- 1.28/ntpd/ntp_parser.c	2008-08-31 20:41:47 -04:00
+++ 1.29/ntpd/ntp_parser.c	2008-09-12 09:37:53 -04:00
@@ -1,383 +1,162 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made from /usa/utterback/ntp-dev/ntpd/ntp_parser.y
+   by GNU bison 1.35.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+#define YYBISON 1  /* Identify Bison output.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+# define	T_Age	257
+# define	T_Allan	258
+# define	T_Auth	259
+# define	T_Autokey	260
+# define	T_Automax	261
+# define	T_Average	262
+# define	T_Bclient	263
+# define	T_Beacon	264
+# define	T_Bias	265
+# define	T_Broadcast	266
+# define	T_Broadcastclient	267
+# define	T_Broadcastdelay	268
+# define	T_Burst	269
+# define	T_Calibrate	270
+# define	T_Calldelay	271
+# define	T_Ceiling	272
+# define	T_Clockstats	273
+# define	T_Cohort	274
+# define	T_ControlKey	275
+# define	T_Crypto	276
+# define	T_Cryptostats	277
+# define	T_Day	278
+# define	T_Default	279
+# define	T_Disable	280
+# define	T_Discard	281
+# define	T_Dispersion	282
+# define	T_Double	283
+# define	T_Driftfile	284
+# define	T_WanderThreshold	285
+# define	T_Enable	286
+# define	T_End	287
+# define	T_False	288
+# define	T_File	289
+# define	T_Filegen	290
+# define	T_Flag1	291
+# define	T_Flag2	292
+# define	T_Flag3	293
+# define	T_Flag4	294
+# define	T_Flake	295
+# define	T_Floor	296
+# define	T_Freq	297
+# define	T_Fudge	298
+# define	T_Host	299
+# define	T_Huffpuff	300
+# define	T_IPv4_address	301
+# define	T_IPv6_address	302
+# define	T_Iburst	303
+# define	T_Ident	304
+# define	T_Ignore	305
+# define	T_Includefile	306
+# define	T_Integer	307
+# define	T_Interface	308
+# define	T_Kernel	309
+# define	T_Key	310
+# define	T_Keys	311
+# define	T_Keysdir	312
+# define	T_Kod	313
+# define	T_Leap	314
+# define	T_Leapfile	315
+# define	T_Limited	316
+# define	T_Link	317
+# define	T_Logconfig	318
+# define	T_Logfile	319
+# define	T_Loopstats	320
+# define	T_Lowpriotrap	321
+# define	T_Manycastclient	322
+# define	T_Manycastserver	323
+# define	T_Mask	324
+# define	T_Maxclock	325
+# define	T_Maxdist	326
+# define	T_Maxhop	327
+# define	T_Maxpoll	328
+# define	T_Minclock	329
+# define	T_Mindist	330
+# define	T_Minimum	331
+# define	T_Minpoll	332
+# define	T_Minsane	333
+# define	T_Mode	334
+# define	T_Monitor	335
+# define	T_Month	336
+# define	T_Multicastclient	337
+# define	T_Nolink	338
+# define	T_Nomodify	339
+# define	T_None	340
+# define	T_Nopeer	341
+# define	T_Noquery	342
+# define	T_Noselect	343
+# define	T_Noserve	344
+# define	T_Notrap	345
+# define	T_Notrust	346
+# define	T_Novolley	347
+# define	T_Ntp	348
+# define	T_Ntpport	349
+# define	T_Orphan	350
+# define	T_Panic	351
+# define	T_Peer	352
+# define	T_Peerstats	353
+# define	T_Phone	354
+# define	T_Pid	355
+# define	T_Pidfile	356
+# define	T_Pool	357
+# define	T_Port	358
+# define	T_Pps	359
+# define	T_Preempt	360
+# define	T_Prefer	361
+# define	T_Protostats	362
+# define	T_Pw	363
+# define	T_Qos	364
+# define	T_RandFile	365
+# define	T_Rawstats	366
+# define	T_Refid	367
+# define	T_Requestkey	368
+# define	T_Restrict	369
+# define	T_Revoke	370
+# define	T_Server	371
+# define	T_Setvar	372
+# define	T_Sign	373
+# define	T_Statistics	374
+# define	T_Stats	375
+# define	T_Statsdir	376
+# define	T_Step	377
+# define	T_Stepout	378
+# define	T_Stratum	379
+# define	T_String	380
+# define	T_Sysstats	381
+# define	T_Tick	382
+# define	T_Time1	383
+# define	T_Time2	384
+# define	T_Timingstats	385
+# define	T_Tinker	386
+# define	T_Tos	387
+# define	T_Trap	388
+# define	T_True	389
+# define	T_Trustedkey	390
+# define	T_Ttl	391
+# define	T_Type	392
+# define	T_Version	393
+# define	T_Week	394
+# define	T_Xleave	395
+# define	T_Year	396
+# define	T_Flag	397
+# define	T_Void	398
+# define	T_EOC	399
+# define	T_Simulate	400
+# define	T_Beep_Delay	401
+# define	T_Sim_Duration	402
+# define	T_Server_Offset	403
+# define	T_Duration	404
+# define	T_Freq_Offset	405
+# define	T_Wander	406
+# define	T_Jitter	407
+# define	T_Prop_Delay	408
+# define	T_Proc_Delay	409
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.3"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     T_Age = 258,
-     T_Allan = 259,
-     T_Auth = 260,
-     T_Autokey = 261,
-     T_Automax = 262,
-     T_Average = 263,
-     T_Bclient = 264,
-     T_Beacon = 265,
-     T_Bias = 266,
-     T_Broadcast = 267,
-     T_Broadcastclient = 268,
-     T_Broadcastdelay = 269,
-     T_Burst = 270,
-     T_Calibrate = 271,
-     T_Calldelay = 272,
-     T_Ceiling = 273,
-     T_Clockstats = 274,
-     T_Cohort = 275,
-     T_ControlKey = 276,
-     T_Crypto = 277,
-     T_Cryptostats = 278,
-     T_Day = 279,
-     T_Default = 280,
-     T_Disable = 281,
-     T_Discard = 282,
-     T_Dispersion = 283,
-     T_Double = 284,
-     T_Driftfile = 285,
-     T_WanderThreshold = 286,
-     T_Enable = 287,
-     T_End = 288,
-     T_False = 289,
-     T_File = 290,
-     T_Filegen = 291,
-     T_Flag1 = 292,
-     T_Flag2 = 293,
-     T_Flag3 = 294,
-     T_Flag4 = 295,
-     T_Flake = 296,
-     T_Floor = 297,
-     T_Freq = 298,
-     T_Fudge = 299,
-     T_Host = 300,
-     T_Huffpuff = 301,
-     T_IPv4_address = 302,
-     T_IPv6_address = 303,
-     T_Iburst = 304,
-     T_Ident = 305,
-     T_Ignore = 306,
-     T_Includefile = 307,
-     T_Integer = 308,
-     T_Interface = 309,
-     T_Kernel = 310,
-     T_Key = 311,
-     T_Keys = 312,
-     T_Keysdir = 313,
-     T_Kod = 314,
-     T_Leap = 315,
-     T_Leapfile = 316,
-     T_Limited = 317,
-     T_Link = 318,
-     T_Logconfig = 319,
-     T_Logfile = 320,
-     T_Loopstats = 321,
-     T_Lowpriotrap = 322,
-     T_Manycastclient = 323,
-     T_Manycastserver = 324,
-     T_Mask = 325,
-     T_Maxclock = 326,
-     T_Maxdist = 327,
-     T_Maxhop = 328,
-     T_Maxpoll = 329,
-     T_Minclock = 330,
-     T_Mindist = 331,
-     T_Minimum = 332,
-     T_Minpoll = 333,
-     T_Minsane = 334,
-     T_Mode = 335,
-     T_Monitor = 336,
-     T_Month = 337,
-     T_Multicastclient = 338,
-     T_Nolink = 339,
-     T_Nomodify = 340,
-     T_None = 341,
-     T_Nopeer = 342,
-     T_Noquery = 343,
-     T_Noselect = 344,
-     T_Noserve = 345,
-     T_Notrap = 346,
-     T_Notrust = 347,
-     T_Novolley = 348,
-     T_Ntp = 349,
-     T_Ntpport = 350,
-     T_Orphan = 351,
-     T_Panic = 352,
-     T_Peer = 353,
-     T_Peerstats = 354,
-     T_Phone = 355,
-     T_Pid = 356,
-     T_Pidfile = 357,
-     T_Pool = 358,
-     T_Port = 359,
-     T_Pps = 360,
-     T_Preempt = 361,
-     T_Prefer = 362,
-     T_Protostats = 363,
-     T_Pw = 364,
-     T_Qos = 365,
-     T_RandFile = 366,
-     T_Rawstats = 367,
-     T_Refid = 368,
-     T_Requestkey = 369,
-     T_Restrict = 370,
-     T_Revoke = 371,
-     T_Server = 372,
-     T_Setvar = 373,
-     T_Sign = 374,
-     T_Statistics = 375,
-     T_Stats = 376,
-     T_Statsdir = 377,
-     T_Step = 378,
-     T_Stepout = 379,
-     T_Stratum = 380,
-     T_String = 381,
-     T_Sysstats = 382,
-     T_Tick = 383,
-     T_Time1 = 384,
-     T_Time2 = 385,
-     T_Tinker = 386,
-     T_Tos = 387,
-     T_Trap = 388,
-     T_True = 389,
-     T_Trustedkey = 390,
-     T_Ttl = 391,
-     T_Type = 392,
-     T_Version = 393,
-     T_Week = 394,
-     T_Xleave = 395,
-     T_Year = 396,
-     T_Flag = 397,
-     T_Void = 398,
-     T_EOC = 399,
-     T_Simulate = 400,
-     T_Beep_Delay = 401,
-     T_Sim_Duration = 402,
-     T_Server_Offset = 403,
-     T_Duration = 404,
-     T_Freq_Offset = 405,
-     T_Wander = 406,
-     T_Jitter = 407,
-     T_Prop_Delay = 408,
-     T_Proc_Delay = 409
-   };
-#endif
-/* Tokens.  */
-#define T_Age 258
-#define T_Allan 259
-#define T_Auth 260
-#define T_Autokey 261
-#define T_Automax 262
-#define T_Average 263
-#define T_Bclient 264
-#define T_Beacon 265
-#define T_Bias 266
-#define T_Broadcast 267
-#define T_Broadcastclient 268
-#define T_Broadcastdelay 269
-#define T_Burst 270
-#define T_Calibrate 271
-#define T_Calldelay 272
-#define T_Ceiling 273
-#define T_Clockstats 274
-#define T_Cohort 275
-#define T_ControlKey 276
-#define T_Crypto 277
-#define T_Cryptostats 278
-#define T_Day 279
-#define T_Default 280
-#define T_Disable 281
-#define T_Discard 282
-#define T_Dispersion 283
-#define T_Double 284
-#define T_Driftfile 285
-#define T_WanderThreshold 286
-#define T_Enable 287
-#define T_End 288
-#define T_False 289
-#define T_File 290
-#define T_Filegen 291
-#define T_Flag1 292
-#define T_Flag2 293
-#define T_Flag3 294
-#define T_Flag4 295
-#define T_Flake 296
-#define T_Floor 297
-#define T_Freq 298
-#define T_Fudge 299
-#define T_Host 300
-#define T_Huffpuff 301
-#define T_IPv4_address 302
-#define T_IPv6_address 303
-#define T_Iburst 304
-#define T_Ident 305
-#define T_Ignore 306
-#define T_Includefile 307
-#define T_Integer 308
-#define T_Interface 309
-#define T_Kernel 310
-#define T_Key 311
-#define T_Keys 312
-#define T_Keysdir 313
-#define T_Kod 314
-#define T_Leap 315
-#define T_Leapfile 316
-#define T_Limited 317
-#define T_Link 318
-#define T_Logconfig 319
-#define T_Logfile 320
-#define T_Loopstats 321
-#define T_Lowpriotrap 322
-#define T_Manycastclient 323
-#define T_Manycastserver 324
-#define T_Mask 325
-#define T_Maxclock 326
-#define T_Maxdist 327
-#define T_Maxhop 328
-#define T_Maxpoll 329
-#define T_Minclock 330
-#define T_Mindist 331
-#define T_Minimum 332
-#define T_Minpoll 333
-#define T_Minsane 334
-#define T_Mode 335
-#define T_Monitor 336
-#define T_Month 337
-#define T_Multicastclient 338
-#define T_Nolink 339
-#define T_Nomodify 340
-#define T_None 341
-#define T_Nopeer 342
-#define T_Noquery 343
-#define T_Noselect 344
-#define T_Noserve 345
-#define T_Notrap 346
-#define T_Notrust 347
-#define T_Novolley 348
-#define T_Ntp 349
-#define T_Ntpport 350
-#define T_Orphan 351
-#define T_Panic 352
-#define T_Peer 353
-#define T_Peerstats 354
-#define T_Phone 355
-#define T_Pid 356
-#define T_Pidfile 357
-#define T_Pool 358
-#define T_Port 359
-#define T_Pps 360
-#define T_Preempt 361
-#define T_Prefer 362
-#define T_Protostats 363
-#define T_Pw 364
-#define T_Qos 365
-#define T_RandFile 366
-#define T_Rawstats 367
-#define T_Refid 368
-#define T_Requestkey 369
-#define T_Restrict 370
-#define T_Revoke 371
-#define T_Server 372
-#define T_Setvar 373
-#define T_Sign 374
-#define T_Statistics 375
-#define T_Stats 376
-#define T_Statsdir 377
-#define T_Step 378
-#define T_Stepout 379
-#define T_Stratum 380
-#define T_String 381
-#define T_Sysstats 382
-#define T_Tick 383
-#define T_Time1 384
-#define T_Time2 385
-#define T_Tinker 386
-#define T_Tos 387
-#define T_Trap 388
-#define T_True 389
-#define T_Trustedkey 390
-#define T_Ttl 391
-#define T_Type 392
-#define T_Version 393
-#define T_Week 394
-#define T_Xleave 395
-#define T_Year 396
-#define T_Flag 397
-#define T_Void 398
-#define T_EOC 399
-#define T_Simulate 400
-#define T_Beep_Delay 401
-#define T_Sim_Duration 402
-#define T_Server_Offset 403
-#define T_Duration 404
-#define T_Freq_Offset 405
-#define T_Wander 406
-#define T_Jitter 407
-#define T_Prop_Delay 408
-#define T_Proc_Delay 409
-
-
-
-
-/* Copy the first part of user declarations.  */
 #line 11 "ntp_parser.y"
 
   #ifdef HAVE_CONFIG_H
@@ -416,29 +195,9 @@
   extern int input_from_file;  /* 0=input from ntpq>config command buffer */
   extern int cryptosw;
 
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
 #line 49 "ntp_parser.y"
-{
+#ifndef YYSTYPE
+typedef union {
     char   *String;
     double  Double;
     int     Integer;
@@ -451,256 +210,25 @@ typedef union YYSTYPE
     /* Simulation types */
     server_info *Sim_server;
     script_info *Sim_script;
-}
-/* Line 193 of yacc.c.  */
-#line 457 "../../ntpd/ntp_parser.c"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+} yystype;
+# define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-
-
-
-/* Copy the second part of user declarations.  */
-
-
-/* Line 216 of yacc.c.  */
-#line 470 "../../ntpd/ntp_parser.c"
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(msgid) msgid
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
-#else
-# define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
-#else
-static int
-YYID (i)
-    int i;
-#endif
-{
-  return i;
-}
-#endif
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
-       && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
-
+#ifndef YYDEBUG
+# define YYDEBUG 1
 #endif
 
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  159
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   584
 
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  158
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  62
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  223
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  354
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   409
+#define	YYFINAL		355
+#define	YYFLAG		-32768
+#define	YYNTBASE	159
 
-#define YYTRANSLATE(YYX)						\
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
+#define YYTRANSLATE(x) ((unsigned)(x) <= 409 ? yytranslate[x] : 220)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const short yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -708,13 +236,13 @@ static const yytype_uint8 yytranslate[] 
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   155,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   156,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   156,     2,   157,     2,     2,     2,     2,
+       2,     2,     2,   157,     2,   158,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -727,240 +255,216 @@ static const yytype_uint8 yytranslate[] 
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
-     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154
+       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     5,     9,    12,    15,    16,    18,    20,
-      22,    24,    26,    28,    30,    32,    34,    36,    38,    42,
-      45,    47,    49,    51,    53,    55,    57,    60,    63,    65,
-      68,    70,    72,    75,    77,    79,    82,    85,    88,    90,
-      92,    94,    96,    98,   101,   104,   107,   109,   112,   115,
-     118,   121,   124,   127,   130,   133,   136,   139,   141,   142,
-     145,   147,   150,   153,   156,   159,   162,   165,   168,   171,
+static const short yyprhs[] =
+{
+       0,     0,     2,     6,     9,    12,    13,    15,    17,    19,
+      21,    23,    25,    27,    29,    31,    33,    35,    39,    42,
+      44,    46,    48,    50,    52,    54,    57,    60,    62,    65,
+      67,    69,    72,    74,    76,    79,    82,    85,    87,    89,
+      91,    93,    95,    98,   101,   104,   106,   109,   112,   115,
+     118,   121,   124,   127,   130,   133,   136,   138,   139,   142,
+     144,   147,   150,   153,   156,   159,   162,   165,   168,   170,
      173,   176,   179,   182,   185,   188,   191,   194,   197,   200,
-     203,   206,   209,   212,   216,   219,   221,   223,   225,   227,
-     229,   231,   233,   235,   238,   240,   243,   246,   248,   250,
-     252,   254,   256,   258,   260,   262,   264,   266,   268,   271,
-     275,   279,   285,   286,   289,   291,   293,   295,   297,   299,
-     301,   303,   305,   307,   309,   311,   313,   315,   318,   320,
-     323,   326,   329,   333,   336,   338,   341,   344,   347,   350,
-     353,   356,   359,   362,   365,   368,   371,   373,   375,   377,
-     379,   381,   383,   385,   387,   390,   393,   395,   398,   401,
-     404,   407,   410,   413,   416,   420,   422,   425,   428,   431,
-     434,   437,   440,   443,   446,   449,   452,   455,   459,   462,
-     465,   467,   470,   471,   476,   480,   483,   485,   488,   491,
-     494,   496,   498,   501,   503,   506,   508,   511,   513,   515,
-     517,   519,   521,   523,   529,   531,   535,   538,   542,   546,
-     549,   551,   557,   562,   566,   569,   571,   578,   582,   585,
-     589,   593,   597,   601
+     203,   206,   209,   213,   216,   218,   220,   222,   224,   226,
+     228,   230,   232,   234,   237,   239,   242,   245,   247,   249,
+     251,   253,   255,   257,   259,   261,   263,   265,   267,   270,
+     274,   278,   284,   285,   288,   290,   292,   294,   296,   298,
+     300,   302,   304,   306,   308,   310,   312,   314,   317,   319,
+     322,   325,   328,   332,   335,   337,   340,   343,   346,   349,
+     352,   355,   358,   361,   364,   367,   370,   372,   374,   376,
+     378,   380,   382,   384,   386,   389,   392,   394,   397,   400,
+     403,   406,   409,   412,   415,   419,   421,   424,   427,   430,
+     433,   436,   439,   442,   445,   448,   451,   454,   458,   461,
+     464,   466,   469,   470,   475,   479,   482,   484,   487,   490,
+     493,   495,   497,   500,   502,   505,   507,   510,   512,   514,
+     516,   518,   520,   522,   528,   530,   534,   537,   541,   545,
+     548,   550,   556,   561,   565,   568,   570,   577,   581,   584,
+     588,   592,   596,   600
 };
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
+static const short yyrhs[] =
 {
-     159,     0,    -1,   160,    -1,   160,   161,   144,    -1,   161,
-     144,    -1,     1,   144,    -1,    -1,   162,    -1,   168,    -1,
-     169,    -1,   176,    -1,   182,    -1,   173,    -1,   187,    -1,
-     190,    -1,   193,    -1,   196,    -1,   208,    -1,   163,   164,
-     166,    -1,   163,   164,    -1,   117,    -1,   103,    -1,    98,
-      -1,    12,    -1,    68,    -1,   165,    -1,    47,   126,    -1,
-      48,   126,    -1,   126,    -1,   166,   167,    -1,   167,    -1,
-       6,    -1,    11,   207,    -1,    15,    -1,    49,    -1,    56,
-      53,    -1,    78,    53,    -1,    74,    53,    -1,    89,    -1,
-     106,    -1,   107,    -1,   134,    -1,   140,    -1,   136,    53,
-      -1,    80,    53,    -1,   138,    53,    -1,    13,    -1,    13,
-      93,    -1,    69,   205,    -1,    83,   205,    -1,     6,    53,
-      -1,    21,    53,    -1,    22,   170,    -1,    57,   126,    -1,
-      58,   126,    -1,   114,    53,    -1,   135,   203,    -1,   171,
-      -1,    -1,   171,   172,    -1,   172,    -1,    45,   126,    -1,
-      50,   126,    -1,   109,   126,    -1,   111,   126,    -1,   116,
-      53,    -1,   119,   126,    -1,   132,   174,    -1,   174,   175,
-      -1,   175,    -1,    18,    53,    -1,    42,    53,    -1,    20,
-     206,    -1,    96,    53,    -1,    76,   207,    -1,    72,   207,
-      -1,    75,   207,    -1,    71,   207,    -1,    79,    53,    -1,
-      10,    53,    -1,    73,    53,    -1,   120,   177,    -1,   122,
-     126,    -1,    36,   178,   179,    -1,   177,   178,    -1,   178,
-      -1,    19,    -1,    23,    -1,    66,    -1,    99,    -1,   112,
-      -1,   127,    -1,   108,    -1,   179,   180,    -1,   180,    -1,
-      35,   126,    -1,   137,   181,    -1,    63,    -1,    84,    -1,
-      32,    -1,    26,    -1,    86,    -1,   101,    -1,    24,    -1,
-     139,    -1,    82,    -1,   141,    -1,     3,    -1,    27,   185,
-      -1,   115,   164,   183,    -1,   115,    25,   183,    -1,   115,
-     165,    70,   165,   183,    -1,    -1,   183,   184,    -1,    41,
-      -1,    51,    -1,    59,    -1,    62,    -1,    67,    -1,    85,
-      -1,    87,    -1,    88,    -1,    90,    -1,    91,    -1,    92,
-      -1,    95,    -1,   138,    -1,   185,   186,    -1,   186,    -1,
-       8,    53,    -1,    77,    53,    -1,    81,    53,    -1,    44,
-     164,   188,    -1,   188,   189,    -1,   189,    -1,   129,   207,
-      -1,   130,   207,    -1,   125,    53,    -1,   113,   126,    -1,
-      37,   206,    -1,    38,   206,    -1,    39,   206,    -1,    40,
-     206,    -1,    32,   191,    -1,    26,   191,    -1,   191,   192,
-      -1,   192,    -1,     5,    -1,     9,    -1,    16,    -1,    55,
-      -1,    81,    -1,    94,    -1,   121,    -1,   131,   194,    -1,
-     194,   195,    -1,   195,    -1,     4,   207,    -1,    28,   207,
-      -1,    43,   207,    -1,    46,   207,    -1,    97,   207,    -1,
-     123,   207,    -1,   124,   207,    -1,    52,   126,   161,    -1,
-      33,    -1,    14,   207,    -1,    17,    53,    -1,   128,   207,
-      -1,    30,   197,    -1,    61,   126,    -1,   102,   126,    -1,
-      65,   126,    -1,     7,    53,    -1,    64,   201,    -1,   100,
-     204,    -1,   118,   198,    -1,   133,   165,   199,    -1,   136,
-     203,    -1,   110,   126,    -1,   126,    -1,   126,    29,    -1,
-      -1,   126,   155,   126,    25,    -1,   126,   155,   126,    -1,
-     199,   200,    -1,   200,    -1,   104,    53,    -1,    54,   165,
-      -1,   201,   202,    -1,   202,    -1,   126,    -1,   203,    53,
-      -1,    53,    -1,   204,   126,    -1,   126,    -1,   205,   164,
-      -1,   164,    -1,    53,    -1,   134,    -1,    34,    -1,    53,
-      -1,    29,    -1,   209,   156,   210,   212,   157,    -1,   145,
-      -1,   210,   211,   144,    -1,   211,   144,    -1,   146,   155,
-     207,    -1,   147,   155,   207,    -1,   212,   213,    -1,   213,
-      -1,   215,   156,   214,   216,   157,    -1,   148,   155,   207,
-     144,    -1,   117,   155,   164,    -1,   216,   217,    -1,   217,
-      -1,   149,   155,   207,   156,   218,   157,    -1,   218,   219,
-     144,    -1,   219,   144,    -1,   150,   155,   207,    -1,   151,
-     155,   207,    -1,   152,   155,   207,    -1,   153,   155,   207,
-      -1,   154,   155,   207,    -1
+     160,     0,   160,   161,   145,     0,   161,   145,     0,     1,
+     145,     0,     0,   162,     0,   168,     0,   169,     0,   176,
+       0,   182,     0,   173,     0,   187,     0,   190,     0,   193,
+       0,   196,     0,   208,     0,   163,   164,   166,     0,   163,
+     164,     0,   117,     0,   103,     0,    98,     0,    12,     0,
+      68,     0,   165,     0,    47,   126,     0,    48,   126,     0,
+     126,     0,   166,   167,     0,   167,     0,     6,     0,    11,
+     207,     0,    15,     0,    49,     0,    56,    53,     0,    78,
+      53,     0,    74,    53,     0,    89,     0,   106,     0,   107,
+       0,   135,     0,   141,     0,   137,    53,     0,    80,    53,
+       0,   139,    53,     0,    13,     0,    13,    93,     0,    69,
+     205,     0,    83,   205,     0,     6,    53,     0,    21,    53,
+       0,    22,   170,     0,    57,   126,     0,    58,   126,     0,
+     114,    53,     0,   136,   203,     0,   171,     0,     0,   171,
+     172,     0,   172,     0,    45,   126,     0,    50,   126,     0,
+     109,   126,     0,   111,   126,     0,   116,    53,     0,   119,
+     126,     0,   133,   174,     0,   174,   175,     0,   175,     0,
+      18,    53,     0,    42,    53,     0,    20,   206,     0,    96,
+      53,     0,    76,   207,     0,    72,   207,     0,    75,   207,
+       0,    71,   207,     0,    79,    53,     0,    10,    53,     0,
+      73,    53,     0,   120,   177,     0,   122,   126,     0,    36,
+     178,   179,     0,   177,   178,     0,   178,     0,    19,     0,
+      23,     0,    66,     0,    99,     0,   112,     0,   127,     0,
+     131,     0,   108,     0,   179,   180,     0,   180,     0,    35,
+     126,     0,   138,   181,     0,    63,     0,    84,     0,    32,
+       0,    26,     0,    86,     0,   101,     0,    24,     0,   140,
+       0,    82,     0,   142,     0,     3,     0,    27,   185,     0,
+     115,   164,   183,     0,   115,    25,   183,     0,   115,   165,
+      70,   165,   183,     0,     0,   183,   184,     0,    41,     0,
+      51,     0,    59,     0,    62,     0,    67,     0,    85,     0,
+      87,     0,    88,     0,    90,     0,    91,     0,    92,     0,
+      95,     0,   139,     0,   185,   186,     0,   186,     0,     8,
+      53,     0,    77,    53,     0,    81,    53,     0,    44,   164,
+     188,     0,   188,   189,     0,   189,     0,   129,   207,     0,
+     130,   207,     0,   125,    53,     0,   113,   126,     0,    37,
+     206,     0,    38,   206,     0,    39,   206,     0,    40,   206,
+       0,    32,   191,     0,    26,   191,     0,   191,   192,     0,
+     192,     0,     5,     0,     9,     0,    16,     0,    55,     0,
+      81,     0,    94,     0,   121,     0,   132,   194,     0,   194,
+     195,     0,   195,     0,     4,   207,     0,    28,   207,     0,
+      43,   207,     0,    46,   207,     0,    97,   207,     0,   123,
+     207,     0,   124,   207,     0,    52,   126,   161,     0,    33,
+       0,    14,   207,     0,    17,    53,     0,   128,   207,     0,
+      30,   197,     0,    61,   126,     0,   102,   126,     0,    65,
+     126,     0,     7,    53,     0,    64,   201,     0,   100,   204,
+       0,   118,   198,     0,   134,   165,   199,     0,   137,   203,
+       0,   110,   126,     0,   126,     0,   126,    29,     0,     0,
+     126,   156,   126,    25,     0,   126,   156,   126,     0,   199,
+     200,     0,   200,     0,   104,    53,     0,    54,   165,     0,
+     201,   202,     0,   202,     0,   126,     0,   203,    53,     0,
+      53,     0,   204,   126,     0,   126,     0,   205,   164,     0,
+     164,     0,    53,     0,   135,     0,    34,     0,    53,     0,
+      29,     0,   209,   157,   210,   212,   158,     0,   146,     0,
+     210,   211,   145,     0,   211,   145,     0,   147,   156,   207,
+       0,   148,   156,   207,     0,   212,   213,     0,   213,     0,
+     215,   157,   214,   216,   158,     0,   149,   156,   207,   145,
+       0,   117,   156,   164,     0,   216,   217,     0,   217,     0,
+     150,   156,   207,   157,   218,   158,     0,   218,   219,   145,
+       0,   219,   145,     0,   151,   156,   207,     0,   152,   156,
+     207,     0,   153,   156,   207,     0,   154,   156,   207,     0,
+     155,   156,   207,     0
 };
 
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
+#endif
+
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
 {
-       0,   280,   280,   284,   285,   290,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   320,   326,
-     335,   336,   337,   338,   339,   343,   344,   345,   349,   353,
-     354,   359,   360,   361,   362,   363,   364,   365,   366,   367,
-     368,   369,   370,   371,   372,   373,   383,   385,   387,   389,
-     400,   402,   404,   411,   413,   415,   417,   422,   424,   428,
-     429,   433,   435,   437,   439,   441,   443,   453,   458,   459,
-     463,   465,   467,   469,   471,   473,   475,   477,   479,   481,
-     483,   493,   495,   497,   505,   506,   510,   512,   514,   516,
-     518,   520,   522,   527,   528,   532,   533,   534,   535,   536,
-     537,   541,   542,   543,   544,   545,   546,   547,   556,   558,
-     563,   568,   576,   577,   581,   582,   583,   584,   585,   586,
-     587,   588,   589,   590,   591,   592,   593,   597,   598,   602,
-     603,   604,   612,   617,   618,   622,   624,   626,   628,   630,
-     632,   634,   636,   645,   647,   652,   653,   657,   658,   659,
-     660,   661,   662,   664,   672,   676,   677,   681,   682,   683,
-     684,   685,   686,   687,   695,   711,   717,   719,   721,   723,
-     725,   728,   730,   732,   735,   737,   739,   741,   743,   745,
-     749,   751,   754,   759,   761,   767,   768,   772,   773,   778,
-     779,   783,   800,   801,   805,   806,   810,   811,   815,   824,
-     825,   829,   830,   838,   853,   857,   858,   862,   863,   867,
-     868,   872,   877,   881,   885,   886,   890,   895,   896,   900,
-     902,   904,   906,   908
+       0,   281,   285,   286,   291,   302,   303,   304,   305,   306,
+     307,   308,   309,   310,   311,   312,   313,   321,   327,   336,
+     337,   338,   339,   340,   344,   345,   346,   350,   354,   355,
+     360,   361,   362,   363,   364,   365,   366,   367,   368,   369,
+     370,   371,   372,   373,   374,   384,   386,   388,   390,   401,
+     403,   405,   412,   414,   416,   418,   423,   424,   429,   430,
+     434,   436,   438,   440,   442,   444,   454,   459,   460,   464,
+     466,   468,   470,   472,   474,   476,   478,   480,   482,   484,
+     494,   496,   498,   506,   507,   511,   513,   515,   517,   519,
+     521,   523,   525,   530,   531,   535,   536,   537,   538,   539,
+     540,   544,   545,   546,   547,   548,   549,   550,   559,   561,
+     566,   571,   579,   580,   584,   585,   586,   587,   588,   589,
+     590,   591,   592,   593,   594,   595,   596,   600,   601,   605,
+     606,   607,   615,   620,   621,   625,   627,   629,   631,   633,
+     635,   637,   639,   648,   650,   655,   656,   660,   661,   662,
+     663,   664,   665,   667,   675,   679,   680,   684,   685,   686,
+     687,   688,   689,   690,   698,   714,   720,   722,   724,   726,
+     728,   731,   733,   735,   738,   740,   742,   744,   746,   748,
+     752,   754,   757,   762,   764,   770,   771,   775,   776,   781,
+     782,   786,   803,   804,   808,   809,   813,   814,   818,   827,
+     828,   832,   833,   841,   856,   860,   861,   865,   866,   870,
+     871,   875,   880,   884,   888,   889,   893,   898,   899,   903,
+     905,   907,   909,   911
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+
+#if (YYDEBUG) || defined YYERROR_VERBOSE
+
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "T_Age", "T_Allan", "T_Auth",
-  "T_Autokey", "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Bias",
-  "T_Broadcast", "T_Broadcastclient", "T_Broadcastdelay", "T_Burst",
-  "T_Calibrate", "T_Calldelay", "T_Ceiling", "T_Clockstats", "T_Cohort",
-  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default",
-  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile",
-  "T_WanderThreshold", "T_Enable", "T_End", "T_False", "T_File",
-  "T_Filegen", "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake",
-  "T_Floor", "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", "T_IPv4_address",
-  "T_IPv6_address", "T_Iburst", "T_Ident", "T_Ignore", "T_Includefile",
-  "T_Integer", "T_Interface", "T_Kernel", "T_Key", "T_Keys", "T_Keysdir",
-  "T_Kod", "T_Leap", "T_Leapfile", "T_Limited", "T_Link", "T_Logconfig",
-  "T_Logfile", "T_Loopstats", "T_Lowpriotrap", "T_Manycastclient",
-  "T_Manycastserver", "T_Mask", "T_Maxclock", "T_Maxdist", "T_Maxhop",
-  "T_Maxpoll", "T_Minclock", "T_Mindist", "T_Minimum", "T_Minpoll",
-  "T_Minsane", "T_Mode", "T_Monitor", "T_Month", "T_Multicastclient",
-  "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", "T_Noquery",
-  "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Novolley",
-  "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", "T_Peerstats",
-  "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Pps",
-  "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Qos", "T_RandFile",
-  "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke",
-  "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats",
-  "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String",
-  "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Tinker", "T_Tos",
-  "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", "T_Type", "T_Version",
-  "T_Week", "T_Xleave", "T_Year", "T_Flag", "T_Void", "T_EOC",
-  "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", "T_Server_Offset",
-  "T_Duration", "T_Freq_Offset", "T_Wander", "T_Jitter", "T_Prop_Delay",
-  "T_Proc_Delay", "'='", "'{'", "'}'", "$accept", "configuration",
-  "command_list", "command", "server_command", "client_type", "address",
-  "ip_address", "option_list", "option", "other_mode_command",
-  "authentication_command", "crypto_command_line", "crypto_command_list",
-  "crypto_command", "orphan_mode_command", "tos_option_list", "tos_option",
-  "monitoring_command", "stats_list", "stat", "filegen_option_list",
-  "filegen_option", "filegen_type", "access_control_command",
-  "ac_flag_list", "access_control_flag", "discard_option_list",
-  "discard_option", "fudge_command", "fudge_factor_list", "fudge_factor",
-  "system_option_command", "system_option_list", "system_option",
-  "tinker_command", "tinker_option_list", "tinker_option",
-  "miscellaneous_command", "drift_parm", "variable_assign",
-  "trap_option_list", "trap_option", "log_config_list",
-  "log_config_command", "integer_list", "string_list", "address_list",
-  "boolean", "number", "simulate_command", "sim_conf_start",
-  "sim_init_statement_list", "sim_init_statement", "sim_server_list",
-  "sim_server", "sim_server_offset", "sim_server_name", "sim_act_list",
-  "sim_act", "sim_act_stmt_list", "sim_act_stmt", 0
+  "$", "error", "$undefined.", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
+  "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Bias", 
+  "T_Broadcast", "T_Broadcastclient", "T_Broadcastdelay", "T_Burst", 
+  "T_Calibrate", "T_Calldelay", "T_Ceiling", "T_Clockstats", "T_Cohort", 
+  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default", 
+  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile", 
+  "T_WanderThreshold", "T_Enable", "T_End", "T_False", "T_File", 
+  "T_Filegen", "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Flake", 
+  "T_Floor", "T_Freq", "T_Fudge", "T_Host", "T_Huffpuff", 
+  "T_IPv4_address", "T_IPv6_address", "T_Iburst", "T_Ident", "T_Ignore", 
+  "T_Includefile", "T_Integer", "T_Interface", "T_Kernel", "T_Key", 
+  "T_Keys", "T_Keysdir", "T_Kod", "T_Leap", "T_Leapfile", "T_Limited", 
+  "T_Link", "T_Logconfig", "T_Logfile", "T_Loopstats", "T_Lowpriotrap", 
+  "T_Manycastclient", "T_Manycastserver", "T_Mask", "T_Maxclock", 
+  "T_Maxdist", "T_Maxhop", "T_Maxpoll", "T_Minclock", "T_Mindist", 
+  "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", 
+  "T_Multicastclient", "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", 
+  "T_Noquery", "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", 
+  "T_Novolley", "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", 
+  "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", 
+  "T_Pps", "T_Preempt", "T_Prefer", "T_Protostats", "T_Pw", "T_Qos", 
+  "T_RandFile", "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", 
+  "T_Revoke", "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats", 
+  "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", 
+  "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Timingstats", 
+  "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", 
+  "T_Type", "T_Version", "T_Week", "T_Xleave", "T_Year", "T_Flag", 
+  "T_Void", "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", 
+  "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", 
+  "T_Jitter", "T_Prop_Delay", "T_Proc_Delay", "'='", "'{'", "'}'", 
+  "configuration", "command_list", "command", "server_command", 
+  "client_type", "address", "ip_address", "option_list", "option", 
+  "other_mode_command", "authentication_command", "crypto_command_line", 
+  "crypto_command_list", "crypto_command", "orphan_mode_command", 
+  "tos_option_list", "tos_option", "monitoring_command", "stats_list", 
+  "stat", "filegen_option_list", "filegen_option", "filegen_type", 
+  "access_control_command", "ac_flag_list", "access_control_flag", 
+  "discard_option_list", "discard_option", "fudge_command", 
+  "fudge_factor_list", "fudge_factor", "system_option_command", 
+  "system_option_list", "system_option", "tinker_command", 
+  "tinker_option_list", "tinker_option", "miscellaneous_command", 
+  "drift_parm", "variable_assign", "trap_option_list", "trap_option", 
+  "log_config_list", "log_config_command", "integer_list", "string_list", 
+  "address_list", "boolean", "number", "simulate_command", 
+  "sim_conf_start", "sim_init_statement_list", "sim_init_statement", 
+  "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", 
+  "sim_act_list", "sim_act", "sim_act_stmt_list", "sim_act_stmt", 0
 };
 #endif
 
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
-     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
-     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
-     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
-     405,   406,   407,   408,   409,    61,   123,   125
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
 {
-       0,   158,   159,   160,   160,   160,   161,   161,   161,   161,
-     161,   161,   161,   161,   161,   161,   161,   161,   162,   162,
-     163,   163,   163,   163,   163,   164,   164,   164,   165,   166,
-     166,   167,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   167,   167,   167,   167,   167,   168,   168,   168,   168,
-     169,   169,   169,   169,   169,   169,   169,   170,   170,   171,
-     171,   172,   172,   172,   172,   172,   172,   173,   174,   174,
+       0,   159,   160,   160,   160,   161,   161,   161,   161,   161,
+     161,   161,   161,   161,   161,   161,   161,   162,   162,   163,
+     163,   163,   163,   163,   164,   164,   164,   165,   166,   166,
+     167,   167,   167,   167,   167,   167,   167,   167,   167,   167,
+     167,   167,   167,   167,   167,   168,   168,   168,   168,   169,
+     169,   169,   169,   169,   169,   169,   170,   170,   171,   171,
+     172,   172,   172,   172,   172,   172,   173,   174,   174,   175,
      175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
-     175,   176,   176,   176,   177,   177,   178,   178,   178,   178,
+     176,   176,   176,   177,   177,   178,   178,   178,   178,   178,
      178,   178,   178,   179,   179,   180,   180,   180,   180,   180,
      180,   181,   181,   181,   181,   181,   181,   181,   182,   182,
      182,   182,   183,   183,   184,   184,   184,   184,   184,   184,
@@ -977,18 +481,18 @@ static const yytype_uint8 yyr1[] =
      219,   219,   219,   219
 };
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
 {
-       0,     2,     1,     3,     2,     2,     0,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
-       1,     1,     1,     1,     1,     1,     2,     2,     1,     2,
-       1,     1,     2,     1,     1,     2,     2,     2,     1,     1,
-       1,     1,     1,     2,     2,     2,     1,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     1,     0,     2,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     1,
+       0,     1,     3,     2,     2,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     2,     1,
+       1,     1,     1,     1,     1,     2,     2,     1,     2,     1,
+       1,     2,     1,     1,     2,     2,     2,     1,     1,     1,
+       1,     1,     2,     2,     2,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     0,     2,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     3,     2,     1,     1,     1,     1,     1,
+       2,     2,     3,     2,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     2,     1,     2,     2,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
        3,     5,     0,     2,     1,     1,     1,     1,     1,     1,
@@ -1005,378 +509,465 @@ static const yytype_uint8 yyr2[] =
        3,     3,     3,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error. */
+static const short yydefact[] =
 {
-       0,     0,     0,     0,    23,    46,     0,     0,     0,    58,
+       0,     0,     0,     0,    22,    45,     0,     0,     0,    57,
        0,     0,   182,     0,   165,     0,     0,     0,     0,     0,
-       0,     0,     0,    24,     0,     0,    22,     0,     0,    21,
-       0,     0,     0,    20,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   204,     0,     2,     0,     7,     0,     8,
-       9,    12,    10,    11,    13,    14,    15,    16,    17,     0,
-       5,    50,   173,    47,   202,   201,   166,   167,    51,     0,
-       0,     0,     0,     0,     0,    52,    57,    60,   147,   148,
-     149,   150,   151,   152,   153,   144,   146,     0,     0,     0,
-     108,   128,   180,   169,   143,    86,    87,    88,    89,    92,
-      90,    91,     0,     0,     0,    28,     0,    25,     6,    53,
-      54,   170,   191,   174,   190,   172,   197,    48,    49,   195,
-     175,   171,   179,    55,   112,   112,    25,     0,   176,    81,
-      85,    82,   168,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    23,     0,     0,    21,     0,     0,    20,
+       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   204,     1,     0,     6,     0,     7,     8,
+      11,     9,    10,    12,    13,    14,    15,    16,     0,     4,
+      49,   173,    46,   202,   201,   166,   167,    50,     0,     0,
+       0,     0,     0,     0,    51,    56,    59,   147,   148,   149,
+     150,   151,   152,   153,   144,   146,     0,     0,     0,   108,
+     128,   180,   169,   143,    85,    86,    87,    88,    92,    89,
+      90,    91,     0,     0,     0,    27,     0,    24,     5,    52,
+      53,   170,   191,   174,   190,   172,   197,    47,    48,   195,
+     175,   171,   179,    54,   112,   112,    24,     0,   176,    80,
+      84,    81,   168,     0,     0,     0,     0,     0,     0,     0,
      154,   156,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    67,    69,     0,   193,    56,   178,     1,
-       0,     4,    19,     0,    61,    62,    63,    64,    65,    66,
-      59,   145,   129,   130,   131,   127,   181,   100,    99,     0,
-      97,    98,     0,    83,    94,    26,    27,     0,     0,     0,
-       0,     0,     0,     0,     0,   132,   134,   164,   189,   196,
-     194,   110,   109,     0,     0,    84,   157,   158,   159,   160,
-     161,   162,   163,   155,    79,    70,   200,   198,   199,    72,
-      71,    77,    75,    80,    76,    74,    78,    73,    68,     0,
-       0,   177,   186,   192,     3,    31,     0,    33,    34,     0,
-       0,     0,     0,    38,    39,    40,    41,     0,     0,    42,
-      18,    30,     0,     0,     0,     0,    95,   107,   103,   105,
-     101,   102,   104,   106,    96,    93,   139,   140,   141,   142,
-     138,   137,   135,   136,   133,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   113,   112,
-     184,   188,   187,   185,    32,    35,    37,    36,    44,    43,
-      45,    29,     0,     0,     0,     0,     0,   210,     0,   206,
-     111,   183,   207,   208,     0,   205,   203,   209,     0,   213,
-       0,     0,     0,     0,     0,   215,     0,     0,   211,   214,
-     212,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   216,     0,   218,   219,   220,
-     221,   222,   223,   217
+       0,     0,     0,    66,    68,     0,   193,    55,   178,     0,
+       3,    18,     0,    60,    61,    62,    63,    64,    65,    58,
+     145,   129,   130,   131,   127,   181,   100,    99,     0,    97,
+      98,     0,    82,    94,    25,    26,     0,     0,     0,     0,
+       0,     0,     0,     0,   132,   134,   164,   189,   196,   194,
+     110,   109,     0,     0,    83,   157,   158,   159,   160,   161,
+     162,   163,   155,    78,    69,   200,   198,   199,    71,    70,
+      76,    74,    79,    75,    73,    77,    72,    67,     0,     0,
+     177,   186,   192,     2,    30,     0,    32,    33,     0,     0,
+       0,     0,    37,    38,    39,    40,     0,     0,    41,    17,
+      29,     0,     0,     0,     0,    95,   107,   103,   105,   101,
+     102,   104,   106,    96,    93,   139,   140,   141,   142,   138,
+     137,   135,   136,   133,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126,   113,   112,   184,
+     188,   187,   185,    31,    34,    36,    35,    43,    42,    44,
+      28,     0,     0,     0,     0,     0,   210,     0,   206,   111,
+     183,   207,   208,     0,   205,   203,   209,     0,   213,     0,
+       0,     0,     0,     0,   215,     0,     0,   211,   214,   212,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   216,     0,   218,   219,   220,   221,
+     222,   223,   217,     0,     0,     0
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
+static const short yydefgoto[] =
 {
-      -1,    44,    45,    46,    47,    48,   116,   107,   250,   251,
-      49,    50,    75,    76,    77,    51,   153,   154,    52,   129,
-     102,   183,   184,   264,    53,   201,   288,    90,    91,    54,
-     195,   196,    55,    85,    86,    56,   140,   141,    57,    93,
-     128,   231,   232,   113,   114,   157,   120,   117,   219,    66,
-      58,    59,   254,   255,   306,   307,   321,   308,   324,   325,
-     338,   339
+     353,    44,    45,    46,    47,   116,   107,   249,   250,    48,
+      49,    74,    75,    76,    50,   153,   154,    51,   129,   102,
+     182,   183,   263,    52,   200,   287,    89,    90,    53,   194,
+     195,    54,    84,    85,    55,   140,   141,    56,    92,   128,
+     230,   231,   113,   114,   157,   120,   117,   218,    65,    57,
+      58,   253,   254,   305,   306,   320,   307,   323,   324,   337,
+     338
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -125
-static const yytype_int16 yypact[] =
-{
-     117,  -109,   -17,   -12,  -125,   -54,    -5,    -9,    -8,   -29,
-      33,    -3,   -86,    33,  -125,    56,   -40,   -76,   -75,   -73,
-     -65,   -64,   -61,  -125,   -40,   -40,  -125,   -60,   -59,  -125,
-     -58,    23,   -21,  -125,   -49,    56,   -45,    -5,     9,   298,
-     -42,    32,    32,  -125,    91,   265,   -52,  -125,   -40,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,   -41,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,   -32,
-     -19,    -7,    -6,    68,    -1,  -125,   -29,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,    33,  -125,    73,    75,    82,
-      -3,  -125,    66,  -125,    33,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,   -20,    10,    11,  -125,   151,  -125,   399,  -125,
-    -125,  -125,  -125,   -64,  -125,  -125,  -125,   -40,   -40,  -125,
-      14,  -125,  -125,  -125,  -125,  -125,    71,   -10,  -125,    56,
-    -125,  -125,  -125,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
-       9,  -125,    89,    98,   -23,    99,    -5,    -5,   105,    -5,
-      -5,   106,   107,   298,  -125,   -35,  -125,   109,   109,  -125,
-      19,  -125,   444,  -118,  -125,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,    39,
-    -125,  -125,     7,   -20,  -125,  -125,  -125,   -23,   -23,   -23,
-     -23,    40,   118,    -5,    -5,   151,  -125,  -125,  -125,  -125,
-    -125,   269,   269,   -42,    44,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,   -42,
-     120,   -35,  -125,  -125,  -125,  -125,    -5,  -125,  -125,   123,
-     124,   126,   127,  -125,  -125,  -125,  -125,   131,   134,  -125,
-     444,  -125,    46,    47,  -100,    53,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,
-     178,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,  -125,
-    -125,  -125,    -5,    -5,    49,    61,  -103,  -125,    50,  -125,
-     269,  -125,  -125,  -125,   -40,  -125,  -125,  -125,    59,  -125,
-      54,    62,    -5,    55,  -124,  -125,    64,    -5,  -125,  -125,
-    -125,    57,    42,    63,    67,    69,    70,    74,   -94,    72,
-      -5,    -5,    -5,    -5,    -5,  -125,    77,  -125,  -125,  -125,
-    -125,  -125,  -125,  -125
+static const short yypact[] =
+{
+     116,  -124,   -26,   -21,-32768,   -45,     2,    -4,    -1,   -34,
+      14,    -3,   -73,    14,-32768,    45,   -33,   -70,   -66,   -65,
+     -61,   -60,   -59,-32768,   -33,   -33,-32768,   -56,   -55,-32768,
+     -54,    20,    -8,-32768,   -50,    45,   -46,     2,     8,   149,
+     -43,    26,    26,-32768,   264,   -64,-32768,   -33,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -71,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -42,   -36,
+     -32,   -11,    36,    -7,-32768,   -34,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,    14,-32768,    39,    67,    68,    -3,
+  -32768,   105,-32768,    14,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,   -22,    13,    15,-32768,   150,-32768,   399,-32768,
+  -32768,-32768,-32768,   -60,-32768,-32768,-32768,   -33,   -33,-32768,
+      24,-32768,-32768,-32768,-32768,-32768,    66,   -16,-32768,    45,
+  -32768,-32768,-32768,     2,     2,     2,     2,     2,     2,     2,
+       8,-32768,    98,   101,   -28,   117,     2,     2,   122,     2,
+       2,   125,   126,   149,-32768,   -47,-32768,   129,   129,    38,
+  -32768,   466,  -110,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    32,-32768,
+  -32768,     5,   -22,-32768,-32768,-32768,   -28,   -28,   -28,   -28,
+      60,   139,     2,     2,   150,-32768,-32768,-32768,-32768,-32768,
+     268,   268,   -43,    69,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -43,   140,
+     -47,-32768,-32768,-32768,-32768,     2,-32768,-32768,   141,   143,
+     147,   148,-32768,-32768,-32768,-32768,   151,   152,-32768,   466,
+  -32768,    46,    47,   -89,    61,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   182,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,     2,     2,    52,    64,   -95,-32768,    53,-32768,   268,
+  -32768,-32768,-32768,   -33,-32768,-32768,-32768,    62,-32768,    56,
+      63,     2,    59,  -116,-32768,    72,     2,-32768,-32768,-32768,
+      70,    10,    73,    76,    79,    81,    83,  -108,    78,     2,
+       2,     2,     2,     2,-32768,    95,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,   241,   242,-32768
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+static const short yypgoto[] =
 {
-    -125,  -125,  -125,   -25,  -125,  -125,   -14,   -31,  -125,   -38,
-    -125,  -125,  -125,  -125,   138,  -125,  -125,    80,  -125,  -125,
-     -13,  -125,    43,  -125,  -125,  -122,  -125,  -125,   133,  -125,
-    -125,    35,  -125,   215,   -62,  -125,  -125,    96,  -125,  -125,
-    -125,  -125,    12,  -125,   125,   198,  -125,   216,  -117,   -37,
-    -125,  -125,  -125,     0,  -125,   -55,  -125,  -125,  -125,   -82,
-    -125,   -92
+  -32768,-32768,   -20,-32768,-32768,   -14,   -31,-32768,    -6,-32768,
+  -32768,-32768,-32768,   171,-32768,-32768,    94,-32768,-32768,   -15,
+  -32768,    74,-32768,-32768,  -122,-32768,-32768,   162,-32768,-32768,
+      65,-32768,   244,   -58,-32768,-32768,   114,-32768,-32768,-32768,
+  -32768,    25,-32768,   145,   218,-32768,   243,   -62,   -37,-32768,
+  -32768,-32768,    16,-32768,   -39,-32768,-32768,-32768,   -51,-32768,
+     -63
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -7
-static const yytype_int16 yytable[] =
-{
-     132,   126,   106,   202,   124,    87,   177,   103,   104,   155,
-     257,   216,   178,   133,   304,   179,    69,   304,   125,   229,
-     160,    70,   130,   171,    64,   323,   103,   104,   252,   253,
-     217,   258,   171,   328,   162,    60,    61,   134,    78,    63,
-      92,    62,    79,   180,    67,    68,   252,   253,    65,    80,
-     108,   109,   135,   110,   316,   136,   333,   334,   335,   336,
-     337,   111,   112,   345,   181,   115,   119,   121,   122,   230,
-     266,   267,   268,   269,    88,    95,   123,   127,    89,    96,
-      71,   131,    72,   197,   105,   156,   105,    73,    81,   259,
-      74,   159,   161,   260,   164,   176,   206,   207,   208,   209,
-     210,   211,   212,   199,   199,   105,   137,   165,   261,   221,
-     222,   218,   224,   225,    82,   163,   205,   182,     1,   166,
-     167,   168,    97,     2,     3,   169,   172,    83,   173,     4,
-       5,     6,   138,   139,     7,   174,   185,   186,     8,     9,
-     200,   203,   214,    10,    11,   204,   262,    12,   263,    13,
-      14,   215,   220,    15,    84,    98,   272,   273,   223,   226,
-     227,    16,   233,   234,    99,   256,   270,   310,   100,    17,
-     290,   271,   289,   292,    18,    19,   295,   296,    20,   297,
-     298,    21,    22,   101,   299,    23,    24,   300,   187,   188,
-     189,   190,   333,   334,   335,   336,   337,   309,   291,   294,
-      25,   302,   303,   311,   314,   315,   318,   320,   330,   322,
-     327,   323,   301,   332,   170,    26,   347,    27,   340,    28,
-      29,   353,   341,   175,   342,   343,   265,    30,    94,   344,
-     274,    31,    32,   228,    33,    34,   213,    35,   198,    36,
-     158,   118,   329,   293,     0,    37,   346,     0,    38,    39,
-      40,   317,    41,    42,   305,     0,     0,     0,     0,     0,
-       0,    -6,    43,     0,   191,   312,   313,     0,     0,     0,
-       0,     2,     3,     0,     0,     0,   192,     4,     5,     6,
-     193,   194,     7,     0,     0,   326,     8,     9,     0,     0,
-     331,    10,    11,     0,     0,    12,     0,    13,    14,     0,
-     319,    15,     0,   348,   349,   350,   351,   352,   142,    16,
-     275,     0,     0,     0,     0,     0,   143,    17,   144,     0,
-     276,     0,    18,    19,     0,     0,    20,     0,   277,    21,
-      22,   278,     0,    23,    24,     0,   279,     0,     0,     0,
-     145,     0,     0,     0,     0,     0,     0,     0,    25,     0,
-       0,     0,     0,     0,   280,     0,   281,   282,     0,   283,
-     284,   285,     0,    26,   286,    27,     0,    28,    29,   146,
-     147,   148,     0,   149,   150,    30,     0,   151,     0,    31,
-      32,     0,    33,    34,     0,    35,     0,    36,     0,     0,
-       0,     0,     0,    37,   152,     0,    38,    39,    40,     0,
-      41,    42,     0,     0,     0,     2,     3,   287,     0,    -6,
+
+#define	YYLAST		607
+
+
+static const short yytable[] =
+{
+     132,   126,   106,   201,   176,    86,   215,   228,   256,   155,
+     177,    68,   133,   178,   103,   104,    69,   124,   125,    77,
+     130,    59,   303,    78,   159,   216,   170,    60,   303,   257,
+      79,    63,    61,   161,   322,   170,   134,   251,   252,   103,
+     104,   179,   327,   332,   333,   334,   335,   336,    62,    66,
+     344,   135,    67,    91,   136,    64,   108,   229,   251,   252,
+     109,   110,   180,   315,    94,   111,   112,   115,    95,    80,
+     119,   121,   122,   123,    87,    70,   127,    71,    88,   156,
+     131,   160,    72,   105,   163,    73,   162,   258,   196,   167,
+     164,   259,   171,   105,   165,    81,   205,   206,   207,   208,
+     209,   210,   211,   198,   198,   137,   260,   217,    82,   220,
+     221,    96,   223,   224,   204,   166,   181,     1,   105,   168,
+     172,   173,     2,     3,   265,   266,   267,   268,     4,     5,
+       6,   138,   139,     7,   175,    83,   202,     8,     9,   184,
+     203,   185,    10,    11,    97,   261,    12,   262,    13,    14,
+     199,   213,    15,    98,   214,   271,   272,    99,   255,   142,
+      16,   332,   333,   334,   335,   336,   309,   143,    17,   144,
+     219,   288,   100,    18,    19,   222,   101,    20,   225,   226,
+      21,    22,   232,   233,    23,    24,   269,   186,   187,   188,
+     189,   145,   270,   291,   294,   289,   295,   290,   293,    25,
+     296,   297,   301,   302,   298,   299,   308,   310,   313,   314,
+     317,   319,   321,   322,    26,   326,    27,   329,    28,    29,
+     146,   147,   148,   346,   149,   150,    30,   331,   151,   339,
+      31,    32,   340,    33,    34,   341,    35,   342,    36,   343,
+     352,   354,   355,   300,    37,   152,   169,   227,    38,    39,
+      40,   174,    41,    42,   212,   292,   264,    93,   197,   273,
+     158,    -5,    43,   190,   311,   312,   316,     0,   118,   304,
+       2,     3,   328,     0,   345,   191,     4,     5,     6,   192,
+     193,     7,     0,     0,   325,     8,     9,     0,     0,   330,
+      10,    11,     0,     0,    12,     0,    13,    14,     0,   318,
+      15,     0,   347,   348,   349,   350,   351,     0,    16,   274,
+       0,     0,     0,     0,     0,     0,    17,     0,     0,   275,
+       0,    18,    19,     0,     0,    20,     0,   276,    21,    22,
+     277,     0,    23,    24,     0,   278,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    25,     0,     0,
+       0,     0,     0,   279,     0,   280,   281,     0,   282,   283,
+     284,     0,    26,   285,    27,     0,    28,    29,     0,     0,
+       0,     0,     0,     0,    30,     0,     0,     0,    31,    32,
+       0,    33,    34,     0,    35,     0,    36,     0,     0,     0,
+       0,     0,    37,     0,     0,     0,    38,    39,    40,     0,
+      41,    42,     0,     0,     0,     2,     3,   286,     0,    -5,
       43,     4,     5,     6,     0,     0,     7,     0,     0,     0,
        8,     9,     0,     0,     0,    10,    11,     0,     0,    12,
        0,    13,    14,     0,     0,    15,     0,     0,     0,     0,
        0,     0,     0,    16,     0,     0,     0,     0,     0,     0,
-     235,    17,     0,     0,     0,   236,    18,    19,     0,   237,
+       0,    17,     0,     0,     0,     0,    18,    19,     0,     0,
       20,     0,     0,    21,    22,     0,     0,    23,    24,     0,
+       0,     0,   234,     0,     0,     0,     0,   235,     0,     0,
+       0,   236,    25,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    26,     0,    27,
+       0,    28,    29,     0,     0,     0,     0,     0,     0,    30,
+       0,     0,     0,    31,    32,   237,    33,    34,     0,    35,
+       0,    36,   238,     0,     0,     0,     0,    37,     0,     0,
+       0,    38,    39,    40,     0,    41,    42,     0,     0,     0,
+     239,     0,     0,     0,   240,    43,   241,     0,     0,     0,
+       0,     0,     0,     0,     0,   242,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   243,   244,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    25,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   238,     0,     0,     0,    26,     0,    27,
-     239,    28,    29,     0,     0,     0,     0,     0,     0,    30,
-       0,     0,     0,    31,    32,     0,    33,    34,   240,    35,
-       0,    36,   241,     0,   242,     0,     0,    37,     0,     0,
-      38,    39,    40,   243,    41,    42,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,     0,
-     244,   245,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   246,     0,
-     247,     0,   248,     0,   249
+       0,   245,     0,   246,     0,   247,     0,   248
 };
 
-static const yytype_int16 yycheck[] =
+static const short yycheck[] =
 {
-      37,    32,    16,   125,    25,     8,    26,    47,    48,    40,
-       3,    34,    32,     4,   117,    35,    45,   117,    32,    54,
-      45,    50,    35,    85,    29,   149,    47,    48,   146,   147,
-      53,    24,    94,   157,    48,   144,    53,    28,     5,    93,
-     126,    53,     9,    63,    53,    53,   146,   147,    53,    16,
-     126,   126,    43,   126,   157,    46,   150,   151,   152,   153,
-     154,   126,   126,   157,    84,   126,   126,   126,   126,   104,
-     187,   188,   189,   190,    77,    19,    53,   126,    81,    23,
-     109,   126,   111,   108,   126,    53,   126,   116,    55,    82,
-     119,     0,   144,    86,   126,    29,   133,   134,   135,   136,
-     137,   138,   139,   117,   118,   126,    97,   126,   101,   146,
-     147,   134,   149,   150,    81,   156,   129,   137,     1,   126,
-     126,    53,    66,     6,     7,   126,    53,    94,    53,    12,
-      13,    14,   123,   124,    17,    53,   126,   126,    21,    22,
-     126,    70,    53,    26,    27,   155,   139,    30,   141,    32,
-      33,    53,    53,    36,   121,    99,   193,   194,    53,    53,
-      53,    44,    53,   144,   108,   126,   126,   289,   112,    52,
-     126,    53,   203,    53,    57,    58,    53,    53,    61,    53,
-      53,    64,    65,   127,    53,    68,    69,    53,    37,    38,
-      39,    40,   150,   151,   152,   153,   154,   144,   229,   236,
-      83,   155,   155,    25,   155,   144,   156,   148,   144,   155,
-     155,   149,   250,   156,    76,    98,   144,   100,   155,   102,
-     103,   144,   155,    90,   155,   155,   183,   110,    13,   155,
-     195,   114,   115,   153,   117,   118,   140,   120,   113,   122,
-      42,    25,   324,   231,    -1,   128,   338,    -1,   131,   132,
-     133,   306,   135,   136,   254,    -1,    -1,    -1,    -1,    -1,
-      -1,   144,   145,    -1,   113,   302,   303,    -1,    -1,    -1,
-      -1,     6,     7,    -1,    -1,    -1,   125,    12,    13,    14,
-     129,   130,    17,    -1,    -1,   322,    21,    22,    -1,    -1,
-     327,    26,    27,    -1,    -1,    30,    -1,    32,    33,    -1,
-     314,    36,    -1,   340,   341,   342,   343,   344,    10,    44,
-      41,    -1,    -1,    -1,    -1,    -1,    18,    52,    20,    -1,
-      51,    -1,    57,    58,    -1,    -1,    61,    -1,    59,    64,
-      65,    62,    -1,    68,    69,    -1,    67,    -1,    -1,    -1,
-      42,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    -1,
-      -1,    -1,    -1,    -1,    85,    -1,    87,    88,    -1,    90,
-      91,    92,    -1,    98,    95,   100,    -1,   102,   103,    71,
-      72,    73,    -1,    75,    76,   110,    -1,    79,    -1,   114,
-     115,    -1,   117,   118,    -1,   120,    -1,   122,    -1,    -1,
-      -1,    -1,    -1,   128,    96,    -1,   131,   132,   133,    -1,
-     135,   136,    -1,    -1,    -1,     6,     7,   138,    -1,   144,
-     145,    12,    13,    14,    -1,    -1,    17,    -1,    -1,    -1,
+      37,    32,    16,   125,    26,     8,    34,    54,     3,    40,
+      32,    45,     4,    35,    47,    48,    50,    25,    32,     5,
+      35,   145,   117,     9,    44,    53,    84,    53,   117,    24,
+      16,    29,    53,    47,   150,    93,    28,   147,   148,    47,
+      48,    63,   158,   151,   152,   153,   154,   155,    93,    53,
+     158,    43,    53,   126,    46,    53,   126,   104,   147,   148,
+     126,   126,    84,   158,    19,   126,   126,   126,    23,    55,
+     126,   126,   126,    53,    77,   109,   126,   111,    81,    53,
+     126,   145,   116,   126,   126,   119,   157,    82,   108,    53,
+     126,    86,    53,   126,   126,    81,   133,   134,   135,   136,
+     137,   138,   139,   117,   118,    97,   101,   135,    94,   146,
+     147,    66,   149,   150,   129,   126,   138,     1,   126,   126,
+      53,    53,     6,     7,   186,   187,   188,   189,    12,    13,
+      14,   123,   124,    17,    29,   121,    70,    21,    22,   126,
+     156,   126,    26,    27,    99,   140,    30,   142,    32,    33,
+     126,    53,    36,   108,    53,   192,   193,   112,   126,    10,
+      44,   151,   152,   153,   154,   155,   288,    18,    52,    20,
+      53,   202,   127,    57,    58,    53,   131,    61,    53,    53,
+      64,    65,    53,   145,    68,    69,   126,    37,    38,    39,
+      40,    42,    53,    53,    53,   126,    53,   228,   235,    83,
+      53,    53,   156,   156,    53,    53,   145,    25,   156,   145,
+     157,   149,   156,   150,    98,   156,   100,   145,   102,   103,
+      71,    72,    73,   145,    75,    76,   110,   157,    79,   156,
+     114,   115,   156,   117,   118,   156,   120,   156,   122,   156,
+     145,     0,     0,   249,   128,    96,    75,   153,   132,   133,
+     134,    89,   136,   137,   140,   230,   182,    13,   113,   194,
+      42,   145,   146,   113,   301,   302,   305,    -1,    25,   253,
+       6,     7,   323,    -1,   337,   125,    12,    13,    14,   129,
+     130,    17,    -1,    -1,   321,    21,    22,    -1,    -1,   326,
+      26,    27,    -1,    -1,    30,    -1,    32,    33,    -1,   313,
+      36,    -1,   339,   340,   341,   342,   343,    -1,    44,    41,
+      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    51,
+      -1,    57,    58,    -1,    -1,    61,    -1,    59,    64,    65,
+      62,    -1,    68,    69,    -1,    67,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    83,    -1,    -1,
+      -1,    -1,    -1,    85,    -1,    87,    88,    -1,    90,    91,
+      92,    -1,    98,    95,   100,    -1,   102,   103,    -1,    -1,
+      -1,    -1,    -1,    -1,   110,    -1,    -1,    -1,   114,   115,
+      -1,   117,   118,    -1,   120,    -1,   122,    -1,    -1,    -1,
+      -1,    -1,   128,    -1,    -1,    -1,   132,   133,   134,    -1,
+     136,   137,    -1,    -1,    -1,     6,     7,   139,    -1,   145,
+     146,    12,    13,    14,    -1,    -1,    17,    -1,    -1,    -1,
       21,    22,    -1,    -1,    -1,    26,    27,    -1,    -1,    30,
       -1,    32,    33,    -1,    -1,    36,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,
-       6,    52,    -1,    -1,    -1,    11,    57,    58,    -1,    15,
+      -1,    52,    -1,    -1,    -1,    -1,    57,    58,    -1,    -1,
       61,    -1,    -1,    64,    65,    -1,    -1,    68,    69,    -1,
+      -1,    -1,     6,    -1,    -1,    -1,    -1,    11,    -1,    -1,
+      -1,    15,    83,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    98,    -1,   100,
+      -1,   102,   103,    -1,    -1,    -1,    -1,    -1,    -1,   110,
+      -1,    -1,    -1,   114,   115,    49,   117,   118,    -1,   120,
+      -1,   122,    56,    -1,    -1,    -1,    -1,   128,    -1,    -1,
+      -1,   132,   133,   134,    -1,   136,   137,    -1,    -1,    -1,
+      74,    -1,    -1,    -1,    78,   146,    80,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    89,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    83,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    49,    -1,    -1,    -1,    98,    -1,   100,
-      56,   102,   103,    -1,    -1,    -1,    -1,    -1,    -1,   110,
-      -1,    -1,    -1,   114,   115,    -1,   117,   118,    74,   120,
-      -1,   122,    78,    -1,    80,    -1,    -1,   128,    -1,    -1,
-     131,   132,   133,    89,   135,   136,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   145,    -1,    -1,    -1,    -1,    -1,
-     106,   107,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   106,   107,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   134,    -1,
-     136,    -1,   138,    -1,   140
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,   137,    -1,   139,    -1,   141
 };
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
+#line 3 "/usr/local/gnu/share/bison/bison.simple"
+
+/* Skeleton output parser for bison,
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
+   Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
-{
-       0,     1,     6,     7,    12,    13,    14,    17,    21,    22,
-      26,    27,    30,    32,    33,    36,    44,    52,    57,    58,
-      61,    64,    65,    68,    69,    83,    98,   100,   102,   103,
-     110,   114,   115,   117,   118,   120,   122,   128,   131,   132,
-     133,   135,   136,   145,   159,   160,   161,   162,   163,   168,
-     169,   173,   176,   182,   187,   190,   193,   196,   208,   209,
-     144,    53,    53,    93,    29,    53,   207,    53,    53,    45,
-      50,   109,   111,   116,   119,   170,   171,   172,     5,     9,
-      16,    55,    81,    94,   121,   191,   192,     8,    77,    81,
-     185,   186,   126,   197,   191,    19,    23,    66,    99,   108,
-     112,   127,   178,    47,    48,   126,   164,   165,   126,   126,
-     126,   126,   126,   201,   202,   126,   164,   205,   205,   126,
-     204,   126,   126,    53,    25,   164,   165,   126,   198,   177,
-     178,   126,   207,     4,    28,    43,    46,    97,   123,   124,
-     194,   195,    10,    18,    20,    42,    71,    72,    73,    75,
-      76,    79,    96,   174,   175,   165,    53,   203,   203,     0,
-     161,   144,   164,   156,   126,   126,   126,   126,    53,   126,
-     172,   192,    53,    53,    53,   186,    29,    26,    32,    35,
-      63,    84,   137,   179,   180,   126,   126,    37,    38,    39,
-      40,   113,   125,   129,   130,   188,   189,   161,   202,   164,
-     126,   183,   183,    70,   155,   178,   207,   207,   207,   207,
-     207,   207,   207,   195,    53,    53,    34,    53,   134,   206,
-      53,   207,   207,    53,   207,   207,    53,    53,   175,    54,
-     104,   199,   200,    53,   144,     6,    11,    15,    49,    56,
-      74,    78,    80,    89,   106,   107,   134,   136,   138,   140,
-     166,   167,   146,   147,   210,   211,   126,     3,    24,    82,
-      86,   101,   139,   141,   181,   180,   206,   206,   206,   206,
-     126,    53,   207,   207,   189,    41,    51,    59,    62,    67,
-      85,    87,    88,    90,    91,    92,    95,   138,   184,   165,
-     126,   165,    53,   200,   207,    53,    53,    53,    53,    53,
-      53,   167,   155,   155,   117,   211,   212,   213,   215,   144,
-     183,    25,   207,   207,   155,   144,   157,   213,   156,   164,
-     148,   214,   155,   149,   216,   217,   207,   155,   157,   217,
-     144,   207,   156,   150,   151,   152,   153,   154,   218,   219,
-     155,   155,   155,   155,   155,   157,   219,   144,   207,   207,
-     207,   207,   207,   144
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+# if YYLSP_NEEDED
+  YYLTYPE yyls;
+# endif
 };
 
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# if YYLSP_NEEDED
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
+      + 2 * YYSTACK_GAP_MAX)
+# else
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
+
+#endif
+
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
+#define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
+#define YYABORT 	goto yyabortlab
+#define YYERROR		goto yyerrlab1
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
-
 #define YYFAIL		goto yyerrlab
-
 #define YYRECOVERING()  (!!yyerrstatus)
-
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
+      yychar1 = YYTRANSLATE (yychar);				\
+      YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+    { 								\
+      yyerror ("syntax error: cannot back up");			\
       YYERROR;							\
     }								\
-while (YYID (0))
-
+while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).
 
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
+   Current.last_line   = Rhs[N].last_line;	\
+   Current.last_column = Rhs[N].last_column;
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
+#if YYPURE
+# if YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval, &yylloc)
+#  endif
+# else /* !YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval)
+#  endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+# define YYLEX			yylex ()
+#endif /* !YYPURE */
+
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1390,155 +981,14 @@ while (YYID (0))
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
-# endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
-{
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      fprintf (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-
+} while (0)
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
-
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
@@ -1548,59 +998,59 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
+#if YYMAXDEPTH == 0
+# undef YYMAXDEPTH
+#endif
+
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
-
 
-
-#if YYERROR_VERBOSE
+#ifdef YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
+#  if defined (__GLIBC__) && defined (_STRING_H)
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
+#   else
 yystrlen (yystr)
-    const char *yystr;
-#endif
+     const char *yystr;
+#   endif
 {
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
     continue;
-  return yylen;
+
+  return yys - yystr - 1;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
+#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
+#   else
 yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
+     char *yydest;
+     const char *yysrc;
+#   endif
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -1609,266 +1059,86 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
+#endif
+
+#line 315 "/usr/local/gnu/share/bison/bison.simple"
 
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
-    do_not_strip_quotes: ;
-    }
 
-  if (! yyres)
-    return yystrlen (yystr);
+/* The user can define YYPARSE_PARAM as the name of an argument to be passed
+   into yyparse.  The argument should have type void *.
+   It should actually point to an object.
+   Grammar actions can access the variable by casting it
+   to the proper pointer type.  */
 
-  return yystpcpy (yyres, yystr) - yyres;
-}
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
+# else
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
 # endif
-
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
-
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
+
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+# ifdef YYPARSE_PARAM
+int yyparse (void *);
+# else
+int yyparse (void);
 # endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
-    }
-}
-#endif /* YYERROR_VERBOSE */
-
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
 #endif
-{
-  YYUSE (yyvaluep);
-
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  switch (yytype)
-    {
 
-      default:
-	break;
-    }
-}
-
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
 
-/* Prevent warnings from -Wmissing-prototypes.  */
+#define YY_DECL_NON_LSP_VARIABLES			\
+/* The lookahead symbol.  */				\
+int yychar;						\
+							\
+/* The semantic value of the lookahead symbol. */	\
+YYSTYPE yylval;						\
+							\
+/* Number of parse errors so far.  */			\
+int yynerrs;
 
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES			\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
 #else
-int yyparse ();
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES
 #endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
 
 
-/* The look-ahead symbol.  */
-int yychar;
+/* If nonreentrant, generate the variables here. */
 
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
 
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
+yyparse (YYPARSE_PARAM_ARG)
+     YYPARSE_PARAM_DECL
 {
-  
-  int yystate;
-  int yyn;
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
+  register int yystate;
+  register int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
+  /* Lookahead token as an internal (translated) token number.  */
+  int yychar1 = 0;
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1878,30 +1148,42 @@ yyparse ()
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+  /* The state stack. */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
+  register YYSTYPE *yyvsp;
 
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+#endif
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+#if YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#else
+# define YYPOPSTACK   (yyvsp--, yyssp--)
+#endif
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
+
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
+#if YYLSP_NEEDED
+  YYLTYPE yyloc;
+#endif
 
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule. */
+  int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1917,7 +1199,9 @@ yyparse ()
 
   yyssp = yyss;
   yyvsp = yyvs;
-
+#if YYLSP_NEEDED
+  yylsp = yyls;
+#endif
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1925,60 +1209,70 @@ yyparse ()
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
+     have just been pushed. so pushing a state here evens the stacks.
+     */
   yyssp++;
 
  yysetstate:
   *yyssp = yystate;
 
-  if (yyss + yystacksize - 1 <= yyssp)
+  if (yyssp >= yyss + yystacksize - 1)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
+	/* Give user a chance to reallocate the stack. Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
+	short *yyss1 = yyss;
 
 	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
+	   data in use in that stack, in bytes.  */
+# if YYLSP_NEEDED
+	YYLTYPE *yyls1 = yyls;
+	/* This used to be a conditional around just the two extra args,
+	   but that might be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
+		    &yyls1, yysize * sizeof (*yylsp),
 		    &yystacksize);
-
+	yyls = yyls1;
+# else
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+# endif
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
+      goto yyoverflowlab;
 # else
       /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+      if (yystacksize >= YYMAXDEPTH)
+	goto yyoverflowlab;
       yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
+      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
+	short *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyexhaustedlab;
+	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-
-#  undef YYSTACK_RELOCATE
+# if YYLSP_NEEDED
+	YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -1987,12 +1281,14 @@ yyparse ()
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
-
+#if YYLSP_NEEDED
+      yylsp = yyls + yysize - 1;
+#endif
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyss + yystacksize - 1 <= yyssp)
+      if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
@@ -2000,71 +1296,108 @@ yyparse ()
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
 
-  /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+/* Do appropriate processing given the current state.  */
+/* Read a lookahead token if we need one and don't already have one.  */
+/* yyresume: */
+
+  /* First try to decide what to do without reference to lookahead token.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yyn == YYFLAG)
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* yychar is either YYEMPTY or YYEOF
+     or a valid token in external form.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  if (yychar <= YYEOF)
+  /* Convert token to internal form (in yychar1) for indexing tables with */
+
+  if (yychar <= 0)		/* This means end of input. */
     {
-      yychar = yytoken = YYEOF;
+      yychar1 = 0;
+      yychar = YYEOF;		/* Don't call YYLEX any more */
+
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+      yychar1 = YYTRANSLATE (yychar);
+
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+	which are defined only if `YYDEBUG' is set.  */
+      if (yydebug)
+	{
+	  YYFPRINTF (stderr, "Next token is %d (%s",
+		     yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise
+	     meaning of a token, for further debugging info.  */
+# ifdef YYPRINT
+	  YYPRINT (stderr, yychar, yylval);
+# endif
+	  YYFPRINTF (stderr, ")\n");
+	}
+#endif
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+  yyn += yychar1;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
     goto yydefault;
+
   yyn = yytable[yyn];
-  if (yyn <= 0)
+
+  /* yyn is what to do for this token type in this state.
+     Negative => reduce, -yyn is rule number.
+     Positive => shift, yyn is new state.
+       New state is final state => don't bother to shift,
+       just return success.
+     0, or most negative number => error.  */
+
+  if (yyn < 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
+      if (yyn == YYFLAG)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the look-ahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+  /* Shift the lookahead token.  */
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+	      yychar, yytname[yychar1]));
 
-  /* Discard the shifted token unless it is eof.  */
+  /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
-  yystate = yyn;
   *++yyvsp = yylval;
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
+  yystate = yyn;
   goto yynewstate;
 
 
@@ -2088,20 +1421,42 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
 
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 5:
-#line 291 "ntp_parser.y"
-    {
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
+  if (yydebug)
+    {
+      int yyi;
+
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+		 yyn, yyrline[yyn]);
+
+      /* Print the symbols being reduced, and their result.  */
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+    }
+#endif
+
+  switch (yyn) {
+
+case 4:
+#line 292 "ntp_parser.y"
+{
 					if (input_from_file == 1) {
 			msyslog(LOG_INFO, "parse error %s line %d ignored\n",
                             ip_file->fname, ip_file->line_no);
@@ -2110,1109 +1465,920 @@ yyreduce:
 				    "parse: bad boolean input flag\n");
                 }
     break;
-
-  case 18:
-#line 321 "ntp_parser.y"
-    {
-                        struct peer_node *my_node =  create_peer_node((yyvsp[(1) - (3)].Integer), (yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue));
+case 17:
+#line 322 "ntp_parser.y"
+{
+                        struct peer_node *my_node =  create_peer_node(yyvsp[-2].Integer, yyvsp[-1].Address_node, yyvsp[0].Queue);
                         if (my_node)
                             enqueue(my_config.peers, my_node);
                     }
     break;
-
-  case 19:
-#line 327 "ntp_parser.y"
-    {
-                        struct peer_node *my_node = create_peer_node((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Address_node), NULL);
+case 18:
+#line 328 "ntp_parser.y"
+{
+                        struct peer_node *my_node = create_peer_node(yyvsp[-1].Integer, yyvsp[0].Address_node, NULL);
                         if (my_node)
                             enqueue(my_config.peers, my_node);
                     }
     break;
-
-  case 20:
-#line 335 "ntp_parser.y"
-    { (yyval.Integer) = T_Server; }
-    break;
-
-  case 21:
+case 19:
 #line 336 "ntp_parser.y"
-    { (yyval.Integer) = T_Pool; }
+{ yyval.Integer = T_Server; }
     break;
-
-  case 22:
+case 20:
 #line 337 "ntp_parser.y"
-    { (yyval.Integer) = T_Peer; }
+{ yyval.Integer = T_Pool; }
     break;
-
-  case 23:
+case 21:
 #line 338 "ntp_parser.y"
-    { (yyval.Integer) = T_Broadcast; }
+{ yyval.Integer = T_Peer; }
     break;
-
-  case 24:
+case 22:
 #line 339 "ntp_parser.y"
-    { (yyval.Integer) = T_Manycastclient; }
+{ yyval.Integer = T_Broadcast; }
     break;
-
-  case 25:
-#line 343 "ntp_parser.y"
-    { (yyval.Address_node) = (yyvsp[(1) - (1)].Address_node); }
+case 23:
+#line 340 "ntp_parser.y"
+{ yyval.Integer = T_Manycastclient; }
     break;
-
-  case 26:
+case 24:
 #line 344 "ntp_parser.y"
-    { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET); }
+{ yyval.Address_node = yyvsp[0].Address_node; }
     break;
-
-  case 27:
+case 25:
 #line 345 "ntp_parser.y"
-    { (yyval.Address_node) = create_address_node((yyvsp[(2) - (2)].String), AF_INET6); }
+{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
     break;
-
-  case 28:
-#line 349 "ntp_parser.y"
-    { (yyval.Address_node) = create_address_node((yyvsp[(1) - (1)].String), 0); }
+case 26:
+#line 346 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
     break;
-
-  case 29:
-#line 353 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 27:
+#line 350 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, 0); }
     break;
-
-  case 30:
+case 28:
 #line 354 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 31:
-#line 359 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_SKEY); }
+case 29:
+#line 355 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 32:
+case 30:
 #line 360 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Bias, (yyvsp[(2) - (2)].Double)); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY); }
     break;
-
-  case 33:
+case 31:
 #line 361 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_BURST); }
+{ yyval.Attr_val = create_attr_dval(T_Bias, yyvsp[0].Double); }
     break;
-
-  case 34:
+case 32:
 #line 362 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_IBURST); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
-
-  case 35:
+case 33:
 #line 363 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Key, (yyvsp[(2) - (2)].Integer)); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
-
-  case 36:
+case 34:
 #line 364 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Minpoll, (yyvsp[(2) - (2)].Integer)); }
+{ yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
-
-  case 37:
+case 35:
 #line 365 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Maxpoll, (yyvsp[(2) - (2)].Integer)); }
+{ yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
-
-  case 38:
+case 36:
 #line 366 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_NOSELECT);}
+{ yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
-
-  case 39:
+case 37:
 #line 367 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREEMPT); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
-
-  case 40:
+case 38:
 #line 368 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_PREFER); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
-
-  case 41:
+case 39:
 #line 369 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_TRUE); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
-
-  case 42:
+case 40:
 #line 370 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, FLAG_XLEAVE); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
-
-  case 43:
+case 41:
 #line 371 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Ttl, (yyvsp[(2) - (2)].Integer)); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_XLEAVE); }
     break;
-
-  case 44:
+case 42:
 #line 372 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Mode, (yyvsp[(2) - (2)].Integer)); }
+{ yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
-
-  case 45:
+case 43:
 #line 373 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Version, (yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 46:
-#line 384 "ntp_parser.y"
-    { my_config.broadcastclient = SIMPLE; }
+{ yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
     break;
-
-  case 47:
-#line 386 "ntp_parser.y"
-    { my_config.broadcastclient = NOVOLLEY;  }
-    break;
-
-  case 48:
-#line 388 "ntp_parser.y"
-    { append_queue(my_config.manycastserver, (yyvsp[(2) - (2)].Queue));  }
-    break;
-
-  case 49:
-#line 390 "ntp_parser.y"
-    { append_queue(my_config.multicastclient, (yyvsp[(2) - (2)].Queue));  }
-    break;
-
-  case 50:
-#line 401 "ntp_parser.y"
-    { my_config.auth.autokey = (yyvsp[(2) - (2)].Integer);  }
-    break;
-
-  case 51:
-#line 403 "ntp_parser.y"
-    { my_config.auth.control_key = (yyvsp[(2) - (2)].Integer);  }
-    break;
-
-  case 52:
-#line 405 "ntp_parser.y"
-    { if (my_config.auth.crypto_cmd_list != NULL)
-					append_queue(my_config.auth.crypto_cmd_list, (yyvsp[(2) - (2)].Queue));
+case 44:
+#line 374 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    break;
+case 45:
+#line 385 "ntp_parser.y"
+{ my_config.broadcastclient = SIMPLE; }
+    break;
+case 46:
+#line 387 "ntp_parser.y"
+{ my_config.broadcastclient = NOVOLLEY;  }
+    break;
+case 47:
+#line 389 "ntp_parser.y"
+{ append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
+    break;
+case 48:
+#line 391 "ntp_parser.y"
+{ append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
+    break;
+case 49:
+#line 402 "ntp_parser.y"
+{ my_config.auth.autokey = yyvsp[0].Integer;  }
+    break;
+case 50:
+#line 404 "ntp_parser.y"
+{ my_config.auth.control_key = yyvsp[0].Integer;  }
+    break;
+case 51:
+#line 406 "ntp_parser.y"
+{ if (my_config.auth.crypto_cmd_list != NULL)
+					append_queue(my_config.auth.crypto_cmd_list, yyvsp[0].Queue);
 				else
-					my_config.auth.crypto_cmd_list = (yyvsp[(2) - (2)].Queue);
+					my_config.auth.crypto_cmd_list = yyvsp[0].Queue;
 			cryptosw++;
 			}
     break;
-
-  case 53:
-#line 412 "ntp_parser.y"
-    { my_config.auth.keys = (yyvsp[(2) - (2)].String);  }
-    break;
-
-  case 54:
-#line 414 "ntp_parser.y"
-    { my_config.auth.keysdir = (yyvsp[(2) - (2)].String);  }
-    break;
-
-  case 55:
-#line 416 "ntp_parser.y"
-    { my_config.auth.requested_key = (yyvsp[(2) - (2)].Integer);  }
-    break;
-
-  case 56:
-#line 418 "ntp_parser.y"
-    { my_config.auth.trusted_key_list = (yyvsp[(2) - (2)].Queue);  }
-    break;
-
-  case 58:
-#line 424 "ntp_parser.y"
-    { (yyval.Queue) = NULL; }
+case 52:
+#line 413 "ntp_parser.y"
+{ my_config.auth.keys = yyvsp[0].String;  }
+    break;
+case 53:
+#line 415 "ntp_parser.y"
+{ my_config.auth.keysdir = yyvsp[0].String;  }
+    break;
+case 54:
+#line 417 "ntp_parser.y"
+{ my_config.auth.requested_key = yyvsp[0].Integer;  }
+    break;
+case 55:
+#line 419 "ntp_parser.y"
+{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+    break;
+case 57:
+#line 425 "ntp_parser.y"
+{ yyval.Queue = NULL; }
     break;
-
-  case 59:
-#line 428 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
-    break;
-
-  case 60:
+case 58:
 #line 429 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 61:
-#line 434 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PRIV, (yyvsp[(2) - (2)].String)); }
+case 59:
+#line 430 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 62:
-#line 436 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_IDENT, (yyvsp[(2) - (2)].String)); }
+case 60:
+#line 435 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
-
-  case 63:
-#line 438 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_PW, (yyvsp[(2) - (2)].String)); }
+case 61:
+#line 437 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
-
-  case 64:
-#line 440 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_RAND, (yyvsp[(2) - (2)].String)); }
+case 62:
+#line 439 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
-
-  case 65:
-#line 442 "ntp_parser.y"
-    { my_config.auth.revoke = (yyvsp[(2) - (2)].Integer);  }
+case 63:
+#line 441 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
-
-  case 66:
-#line 444 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CRYPTO_CONF_SIGN, (yyvsp[(2) - (2)].String)); }
+case 64:
+#line 443 "ntp_parser.y"
+{ my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
-
-  case 67:
-#line 454 "ntp_parser.y"
-    { append_queue(my_config.orphan_cmds,(yyvsp[(2) - (2)].Queue));  }
+case 65:
+#line 445 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
-
-  case 68:
-#line 458 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 66:
+#line 455 "ntp_parser.y"
+{ append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
-
-  case 69:
+case 67:
 #line 459 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
-    break;
-
-  case 70:
-#line 464 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_CEILING, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 71:
-#line 466 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_FLOOR, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 72:
-#line 468 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_COHORT, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 73:
-#line 470 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_ORPHAN, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 74:
-#line 472 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MINDISP, (yyvsp[(2) - (2)].Double)); }
-    break;
-
-  case 75:
-#line 474 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXDIST, (yyvsp[(2) - (2)].Double)); }
-    break;
-
-  case 76:
-#line 476 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MINCLOCK, (yyvsp[(2) - (2)].Double)); }
-    break;
-
-  case 77:
-#line 478 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXCLOCK, (yyvsp[(2) - (2)].Double)); }
-    break;
-
-  case 78:
-#line 480 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MINSANE, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 79:
-#line 482 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_BEACON, (double)(yyvsp[(2) - (2)].Integer)); }
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 80:
-#line 484 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(PROTO_MAXHOP, (double)(yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 81:
-#line 494 "ntp_parser.y"
-    { append_queue(my_config.stats_list, (yyvsp[(2) - (2)].Queue));  }
+case 68:
+#line 460 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    break;
+case 69:
+#line 465 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
+    break;
+case 70:
+#line 467 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
+    break;
+case 71:
+#line 469 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
+    break;
+case 72:
+#line 471 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
+    break;
+case 73:
+#line 473 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
+    break;
+case 74:
+#line 475 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
+    break;
+case 75:
+#line 477 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
+    break;
+case 76:
+#line 479 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
+    break;
+case 77:
+#line 481 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
+    break;
+case 78:
+#line 483 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
+    break;
+case 79:
+#line 485 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
+    break;
+case 80:
+#line 495 "ntp_parser.y"
+{ append_queue(my_config.stats_list, yyvsp[0].Queue);  }
+    break;
+case 81:
+#line 497 "ntp_parser.y"
+{ my_config.stats_dir = yyvsp[0].String;  }
     break;
-
-  case 82:
-#line 496 "ntp_parser.y"
-    { my_config.stats_dir = (yyvsp[(2) - (2)].String);  }
-    break;
-
-  case 83:
-#line 498 "ntp_parser.y"
-    {
+case 82:
+#line 499 "ntp_parser.y"
+{
                         enqueue(my_config.filegen_opts,
-                                create_filegen_node((yyvsp[(2) - (3)].VoidPtr), (yyvsp[(3) - (3)].Queue)));
+                                create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));
                     }
     break;
-
-  case 84:
-#line 505 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); }
-    break;
-
-  case 85:
+case 83:
 #line 506 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].VoidPtr)); }
-    break;
-
-  case 86:
-#line 511 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("clockstats"); }
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-
-  case 87:
-#line 513 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("cryptostats"); }
+case 84:
+#line 507 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
-
-  case 88:
-#line 515 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("loopstats"); }
+case 85:
+#line 512 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("clockstats"); }
     break;
-
-  case 89:
-#line 517 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("peerstats"); }
+case 86:
+#line 514 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("cryptostats"); }
     break;
-
-  case 90:
-#line 519 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("rawstats"); }
+case 87:
+#line 516 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("loopstats"); }
     break;
-
-  case 91:
-#line 521 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("sysstats"); }
+case 88:
+#line 518 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("peerstats"); }
     break;
-
-  case 92:
-#line 523 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_pval("protostats"); }
+case 89:
+#line 520 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("rawstats"); }
     break;
-
-  case 93:
-#line 527 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 90:
+#line 522 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("sysstats"); }
     break;
-
-  case 94:
-#line 528 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+case 91:
+#line 524 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("timingstats"); }
     break;
-
-  case 95:
-#line 532 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(T_File, (yyvsp[(2) - (2)].String)); }
+case 92:
+#line 526 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("protostats"); }
     break;
-
-  case 96:
-#line 533 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Type, (yyvsp[(2) - (2)].Integer)); }
+case 93:
+#line 530 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 97:
-#line 534 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Link); }
+case 94:
+#line 531 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 98:
+case 95:
 #line 535 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Nolink); }
+{ yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
-
-  case 99:
+case 96:
 #line 536 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Enable); }
+{ yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
-
-  case 100:
+case 97:
 #line 537 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, T_Disable); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
-
-  case 101:
-#line 541 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_NONE; }
+case 98:
+#line 538 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
-
-  case 102:
-#line 542 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_PID; }
+case 99:
+#line 539 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
-
-  case 103:
-#line 543 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_DAY; }
+case 100:
+#line 540 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
-
-  case 104:
+case 101:
 #line 544 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_WEEK; }
+{ yyval.Integer = FILEGEN_NONE; }
     break;
-
-  case 105:
+case 102:
 #line 545 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_MONTH; }
+{ yyval.Integer = FILEGEN_PID; }
     break;
-
-  case 106:
+case 103:
 #line 546 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_YEAR; }
+{ yyval.Integer = FILEGEN_DAY; }
     break;
-
-  case 107:
+case 104:
 #line 547 "ntp_parser.y"
-    { (yyval.Integer) = FILEGEN_AGE; }
+{ yyval.Integer = FILEGEN_WEEK; }
     break;
-
-  case 108:
-#line 557 "ntp_parser.y"
-    {   append_queue(my_config.discard_opts, (yyvsp[(2) - (2)].Queue)); }
+case 105:
+#line 548 "ntp_parser.y"
+{ yyval.Integer = FILEGEN_MONTH; }
+    break;
+case 106:
+#line 549 "ntp_parser.y"
+{ yyval.Integer = FILEGEN_YEAR; }
+    break;
+case 107:
+#line 550 "ntp_parser.y"
+{ yyval.Integer = FILEGEN_AGE; }
+    break;
+case 108:
+#line 560 "ntp_parser.y"
+{   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
     break;
-
-  case 109:
-#line 559 "ntp_parser.y"
-    {
+case 109:
+#line 562 "ntp_parser.y"
+{
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node((yyvsp[(2) - (3)].Address_node), NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no));
+                                create_restrict_node(yyvsp[-1].Address_node, NULL, yyvsp[0].Queue, ip_file->line_no));
                     }
     break;
-
-  case 110:
-#line 564 "ntp_parser.y"
-    {
+case 110:
+#line 567 "ntp_parser.y"
+{
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node(NULL, NULL, (yyvsp[(3) - (3)].Queue), ip_file->line_no));
+                                create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no));
                     }
     break;
-
-  case 111:
-#line 569 "ntp_parser.y"
-    {
+case 111:
+#line 572 "ntp_parser.y"
+{
                         enqueue(my_config.restrict_opts,
-                                create_restrict_node((yyvsp[(2) - (5)].Address_node), (yyvsp[(4) - (5)].Address_node), (yyvsp[(5) - (5)].Queue), ip_file->line_no));
+                                create_restrict_node(yyvsp[-3].Address_node, yyvsp[-1].Address_node, yyvsp[0].Queue, ip_file->line_no));
                     }
     break;
-
-  case 112:
-#line 576 "ntp_parser.y"
-    { (yyval.Queue) = create_queue(); }
-    break;
-
-  case 113:
-#line 577 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].VoidPtr)); }
-    break;
-
-  case 114:
-#line 581 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_TIMEOUT); }
-    break;
-
-  case 115:
-#line 582 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_IGNORE); }
-    break;
-
-  case 116:
-#line 583 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_KOD); }
+case 112:
+#line 579 "ntp_parser.y"
+{ yyval.Queue = create_queue(); }
+    break;
+case 113:
+#line 580 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-
-  case 117:
+case 114:
 #line 584 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_LIMITED); }
+{ yyval.VoidPtr = create_ival(RES_TIMEOUT); }
     break;
-
-  case 118:
+case 115:
 #line 585 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_LPTRAP); }
+{ yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
-
-  case 119:
+case 116:
 #line 586 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_NOMODIFY); }
+{ yyval.VoidPtr = create_ival(RES_KOD); }
     break;
-
-  case 120:
+case 117:
 #line 587 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_NOPEER); }
+{ yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
-
-  case 121:
+case 118:
 #line 588 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_NOQUERY); }
+{ yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
-
-  case 122:
+case 119:
 #line 589 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_DONTSERVE); }
+{ yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
-
-  case 123:
+case 120:
 #line 590 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_NOTRAP); }
+{ yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
-
-  case 124:
+case 121:
 #line 591 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_DONTTRUST); }
+{ yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
-
-  case 125:
+case 122:
 #line 592 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RESM_NTPONLY); }
+{ yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
-
-  case 126:
+case 123:
 #line 593 "ntp_parser.y"
-    { (yyval.VoidPtr) = create_ival(RES_VERSION); }
+{ yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
-
-  case 127:
-#line 597 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 124:
+#line 594 "ntp_parser.y"
+{ yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
-
-  case 128:
-#line 598 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+case 125:
+#line 595 "ntp_parser.y"
+{ yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
-
-  case 129:
-#line 602 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Average, (yyvsp[(2) - (2)].Integer)); }
+case 126:
+#line 596 "ntp_parser.y"
+{ yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
-
-  case 130:
-#line 603 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Minimum, (yyvsp[(2) - (2)].Integer)); }
+case 127:
+#line 600 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 131:
-#line 604 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Monitor, (yyvsp[(2) - (2)].Integer)); }
+case 128:
+#line 601 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 132:
-#line 613 "ntp_parser.y"
-    { enqueue(my_config.fudge, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)));  }
+case 129:
+#line 605 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
-
-  case 133:
-#line 617 "ntp_parser.y"
-    { enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 130:
+#line 606 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
-
-  case 134:
-#line 618 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+case 131:
+#line 607 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
-
-  case 135:
-#line 623 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME1, (yyvsp[(2) - (2)].Double)); }
+case 132:
+#line 616 "ntp_parser.y"
+{ enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-
-  case 136:
-#line 625 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(CLK_HAVETIME2, (yyvsp[(2) - (2)].Double)); }
+case 133:
+#line 620 "ntp_parser.y"
+{ enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 137:
-#line 627 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEVAL1,  (yyvsp[(2) - (2)].Integer)); }
+case 134:
+#line 621 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 138:
-#line 629 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_sval(CLK_HAVEVAL2,  (yyvsp[(2) - (2)].String)); }
+case 135:
+#line 626 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
-
-  case 139:
-#line 631 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG1, (yyvsp[(2) - (2)].Integer)); }
+case 136:
+#line 628 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
-
-  case 140:
-#line 633 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG2, (yyvsp[(2) - (2)].Integer)); }
+case 137:
+#line 630 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
-
-  case 141:
-#line 635 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG3, (yyvsp[(2) - (2)].Integer)); }
+case 138:
+#line 632 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
-
-  case 142:
-#line 637 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(CLK_HAVEFLAG4, (yyvsp[(2) - (2)].Integer)); }
+case 139:
+#line 634 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
-
-  case 143:
-#line 646 "ntp_parser.y"
-    { append_queue(my_config.enable_opts,(yyvsp[(2) - (2)].Queue));  }
+case 140:
+#line 636 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
-
-  case 144:
-#line 648 "ntp_parser.y"
-    { append_queue(my_config.disable_opts,(yyvsp[(2) - (2)].Queue));  }
+case 141:
+#line 638 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
-
-  case 145:
-#line 652 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 142:
+#line 640 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
-
-  case 146:
-#line 653 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+case 143:
+#line 649 "ntp_parser.y"
+{ append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
-
-  case 147:
-#line 657 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
+case 144:
+#line 651 "ntp_parser.y"
+{ append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
-
-  case 148:
-#line 658 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
+case 145:
+#line 655 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 149:
-#line 659 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_CAL); }
+case 146:
+#line 656 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 150:
+case 147:
 #line 660 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_KERNEL); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
-
-  case 151:
+case 148:
 #line 661 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_MONITOR); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
-
-  case 152:
+case 149:
 #line 662 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_NTP); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
-
-  case 153:
-#line 664 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Flag, PROTO_FILEGEN); }
+case 150:
+#line 663 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
-
-  case 154:
-#line 672 "ntp_parser.y"
-    { append_queue(my_config.tinker, (yyvsp[(2) - (2)].Queue));  }
+case 151:
+#line 664 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
-
-  case 155:
-#line 676 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
+case 152:
+#line 665 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
-
-  case 156:
-#line 677 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
+case 153:
+#line 667 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
-
-  case 157:
-#line 681 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_ALLAN, (yyvsp[(2) - (2)].Double)); }
+case 154:
+#line 675 "ntp_parser.y"
+{ append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
-
-  case 158:
-#line 682 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_PHI, (yyvsp[(2) - (2)].Double)); }
+case 155:
+#line 679 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 159:
-#line 683 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_FREQ, (yyvsp[(2) - (2)].Double)); }
+case 156:
+#line 680 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 160:
+case 157:
 #line 684 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_HUFFPUFF, (yyvsp[(2) - (2)].Double)); }
+{ yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
-
-  case 161:
+case 158:
 #line 685 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_PANIC, (yyvsp[(2) - (2)].Double)); }
+{ yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
-
-  case 162:
+case 159:
 #line 686 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_MAX, (yyvsp[(2) - (2)].Double)); }
+{ yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
-
-  case 163:
+case 160:
 #line 687 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(LOOP_MINSTEP, (yyvsp[(2) - (2)].Double)); }
+{ yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
-
-  case 164:
-#line 696 "ntp_parser.y"
-    {
+case 161:
+#line 688 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
+    break;
+case 162:
+#line 689 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+    break;
+case 163:
+#line 690 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    break;
+case 164:
+#line 699 "ntp_parser.y"
+{
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
                         msyslog(LOG_INFO, "getconfig: Maximum include file level exceeded.");
                     }
                     else {
-                        fp[curr_include_level + 1] = F_OPEN(FindConfig((yyvsp[(2) - (3)].String)), "r");
+                        fp[curr_include_level + 1] = F_OPEN(FindConfig(yyvsp[-1].String), "r");
                         if (fp[curr_include_level + 1] == NULL) {
-                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig((yyvsp[(2) - (3)].String)));
-                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig((yyvsp[(2) - (3)].String)));
+                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(yyvsp[-1].String));
+                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig(yyvsp[-1].String));
                         }
                         else
                             ip_file = fp[++curr_include_level];
                     }
                 }
     break;
-
-  case 165:
-#line 712 "ntp_parser.y"
-    {
+case 165:
+#line 715 "ntp_parser.y"
+{
                     while (curr_include_level != -1)
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
-
-  case 166:
-#line 718 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, (yyvsp[(2) - (2)].Double)));  }
-    break;
-
-  case 167:
-#line 720 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_Calldelay, (yyvsp[(2) - (2)].Integer)));  }
-    break;
-
-  case 168:
-#line 722 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_dval(T_Tick, (yyvsp[(2) - (2)].Double)));  }
-    break;
-
-  case 169:
-#line 724 "ntp_parser.y"
-    { /* Null action, possibly all null parms */ }
-    break;
-
-  case 170:
-#line 726 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Leapfile, (yyvsp[(2) - (2)].String))); }
+case 166:
+#line 721 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
+    break;
+case 167:
+#line 723 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
+    break;
+case 168:
+#line 725 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
+    break;
+case 169:
+#line 727 "ntp_parser.y"
+{ /* Null action, possibly all null parms */ }
     break;
-
-  case 171:
+case 170:
 #line 729 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Pidfile, (yyvsp[(2) - (2)].String)));  }
+{ enqueue(my_config.vars, create_attr_sval(T_Leapfile, yyvsp[0].String)); }
     break;
-
-  case 172:
-#line 731 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Logfile, (yyvsp[(2) - (2)].String)));  }
+case 171:
+#line 732 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
     break;
-
-  case 173:
-#line 733 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_Automax, (yyvsp[(2) - (2)].Integer)));  }
+case 172:
+#line 734 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
     break;
-
-  case 174:
+case 173:
 #line 736 "ntp_parser.y"
-    { append_queue(my_config.logconfig, (yyvsp[(2) - (2)].Queue));  }
+{ enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
     break;
-
-  case 175:
-#line 738 "ntp_parser.y"
-    { append_queue(my_config.phone, (yyvsp[(2) - (2)].Queue));  }
-    break;
-
-  case 176:
-#line 740 "ntp_parser.y"
-    { enqueue(my_config.setvar, (yyvsp[(2) - (2)].Set_var));  }
-    break;
-
-  case 177:
-#line 742 "ntp_parser.y"
-    { enqueue(my_config.trap, create_addr_opts_node((yyvsp[(2) - (3)].Address_node), (yyvsp[(3) - (3)].Queue)));  }
-    break;
-
-  case 178:
-#line 744 "ntp_parser.y"
-    { append_queue(my_config.ttl, (yyvsp[(2) - (2)].Queue)); }
-    break;
-
-  case 179:
-#line 746 "ntp_parser.y"
-    { enqueue(my_config.qos, create_attr_sval(T_Qos, (yyvsp[(2) - (2)].String))); }
-    break;
-
-  case 180:
-#line 750 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (1)].String))); }
-    break;
-
-  case 181:
-#line 752 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, (yyvsp[(2) - (2)].Double)));
-		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, (yyvsp[(1) - (2)].String))); }
-    break;
-
-  case 182:
-#line 754 "ntp_parser.y"
-    { /* Null driftfile,  indicated by null string "\0" */
+case 174:
+#line 739 "ntp_parser.y"
+{ append_queue(my_config.logconfig, yyvsp[0].Queue);  }
+    break;
+case 175:
+#line 741 "ntp_parser.y"
+{ append_queue(my_config.phone, yyvsp[0].Queue);  }
+    break;
+case 176:
+#line 743 "ntp_parser.y"
+{ enqueue(my_config.setvar, yyvsp[0].Set_var);  }
+    break;
+case 177:
+#line 745 "ntp_parser.y"
+{ enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+    break;
+case 178:
+#line 747 "ntp_parser.y"
+{ append_queue(my_config.ttl, yyvsp[0].Queue); }
+    break;
+case 179:
+#line 749 "ntp_parser.y"
+{ enqueue(my_config.qos, create_attr_sval(T_Qos, yyvsp[0].String)); }
+    break;
+case 180:
+#line 753 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
+    break;
+case 181:
+#line 755 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, yyvsp[0].Double));
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
+    break;
+case 182:
+#line 757 "ntp_parser.y"
+{ /* Null driftfile,  indicated by null string "\0" */
 		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
     break;
-
-  case 183:
-#line 760 "ntp_parser.y"
-    { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (4)].String), (yyvsp[(3) - (4)].String), DEF); }
-    break;
-
-  case 184:
-#line 762 "ntp_parser.y"
-    { (yyval.Set_var) = create_setvar_node((yyvsp[(1) - (3)].String), (yyvsp[(3) - (3)].String), 0); }
-    break;
-
-  case 185:
-#line 767 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
-    break;
-
-  case 186:
-#line 768 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
-    break;
-
-  case 187:
-#line 772 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_ival(T_Port, (yyvsp[(2) - (2)].Integer)); }
-    break;
-
-  case 188:
-#line 773 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_pval(T_Interface, (yyvsp[(2) - (2)].Address_node)); }
+case 183:
+#line 763 "ntp_parser.y"
+{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+    break;
+case 184:
+#line 765 "ntp_parser.y"
+{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+    break;
+case 185:
+#line 770 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+case 186:
+#line 771 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    break;
+case 187:
+#line 775 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+    break;
+case 188:
+#line 776 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+    break;
+case 189:
+#line 781 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+case 190:
+#line 782 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 189:
-#line 778 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Attr_val)); }
-    break;
-
-  case 190:
-#line 779 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Attr_val)); }
-    break;
-
-  case 191:
-#line 784 "ntp_parser.y"
-    {
-                    char prefix = (yyvsp[(1) - (1)].String)[0];
-                    char *type = &((yyvsp[(1) - (1)].String)[1]);
+case 191:
+#line 787 "ntp_parser.y"
+{
+                    char prefix = yyvsp[0].String[0];
+                    char *type = &(yyvsp[0].String[1]);
                     if (prefix != '+' && prefix != '-' && prefix != '=') {
                         yyerror("Logconfig prefix is not '+', '-' or '='\n");
                     }
                     else
-                        (yyval.Attr_val) = create_attr_sval(prefix, type);
+                        yyval.Attr_val = create_attr_sval(prefix, type);
                 }
     break;
-
-  case 192:
-#line 800 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_ival((yyvsp[(2) - (2)].Integer))); }
-    break;
-
-  case 193:
-#line 801 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue(create_ival((yyvsp[(1) - (1)].Integer))); }
-    break;
-
-  case 194:
-#line 805 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), create_pval((yyvsp[(2) - (2)].String))); }
-    break;
-
-  case 195:
-#line 806 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue(create_pval((yyvsp[(1) - (1)].String))); }
-    break;
-
-  case 196:
-#line 810 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Address_node)); }
+case 192:
+#line 803 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+    break;
+case 193:
+#line 804 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
+    break;
+case 194:
+#line 808 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
+    break;
+case 195:
+#line 809 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
+    break;
+case 196:
+#line 813 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
+    break;
+case 197:
+#line 814 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
     break;
-
-  case 197:
-#line 811 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Address_node)); }
-    break;
-
-  case 198:
-#line 816 "ntp_parser.y"
-    {
-                    if ((yyvsp[(1) - (1)].Integer) != 0 && (yyvsp[(1) - (1)].Integer) != 1) {
+case 198:
+#line 819 "ntp_parser.y"
+{
+                    if (yyvsp[0].Integer != 0 && yyvsp[0].Integer != 1) {
                         yyerror("Integer value is not boolean (0 or 1). Assuming 1");
-                        (yyval.Integer) = 1;
+                        yyval.Integer = 1;
                     }
                     else
-                        (yyval.Integer) = (yyvsp[(1) - (1)].Integer);
+                        yyval.Integer = yyvsp[0].Integer;
                 }
     break;
-
-  case 199:
-#line 824 "ntp_parser.y"
-    { (yyval.Integer) = 1; }
-    break;
-
-  case 200:
-#line 825 "ntp_parser.y"
-    { (yyval.Integer) = 0; }
-    break;
-
-  case 201:
-#line 829 "ntp_parser.y"
-    { (yyval.Double) = (double)(yyvsp[(1) - (1)].Integer); }
+case 199:
+#line 827 "ntp_parser.y"
+{ yyval.Integer = 1; }
+    break;
+case 200:
+#line 828 "ntp_parser.y"
+{ yyval.Integer = 0; }
+    break;
+case 201:
+#line 832 "ntp_parser.y"
+{ yyval.Double = (double)yyvsp[0].Integer; }
+    break;
+case 202:
+#line 833 "ntp_parser.y"
+{ yyval.Double = yyvsp[0].Double; }
     break;
-
-  case 202:
-#line 830 "ntp_parser.y"
-    { (yyval.Double) = (yyvsp[(1) - (1)].Double); }
-    break;
-
-  case 203:
-#line 839 "ntp_parser.y"
-    {
-                 my_config.sim_details = create_sim_node((yyvsp[(3) - (5)].Queue), (yyvsp[(4) - (5)].Queue));
+case 203:
+#line 842 "ntp_parser.y"
+{
+                 my_config.sim_details = create_sim_node(yyvsp[-2].Queue, yyvsp[-1].Queue);
 
                  /* Reset the old_config_style variable */
                  old_config_style = 1;
              }
     break;
-
-  case 204:
-#line 853 "ntp_parser.y"
-    { old_config_style = 0; }
-    break;
-
-  case 205:
-#line 857 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); }
-    break;
-
-  case 206:
-#line 858 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); }
-    break;
-
-  case 207:
-#line 862 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Beep_Delay, (yyvsp[(3) - (3)].Double)); }
-    break;
-
-  case 208:
-#line 863 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Sim_Duration, (yyvsp[(3) - (3)].Double)); }
-    break;
-
-  case 209:
-#line 867 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_server)); }
-    break;
-
-  case 210:
-#line 868 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_server)); }
-    break;
-
-  case 211:
-#line 873 "ntp_parser.y"
-    { (yyval.Sim_server) = create_sim_server((yyvsp[(1) - (5)].Address_node), (yyvsp[(3) - (5)].Double), (yyvsp[(4) - (5)].Queue)); }
-    break;
-
-  case 212:
-#line 877 "ntp_parser.y"
-    { (yyval.Double) = (yyvsp[(3) - (4)].Double); }
-    break;
-
-  case 213:
-#line 881 "ntp_parser.y"
-    { (yyval.Address_node) = (yyvsp[(3) - (3)].Address_node); }
-    break;
-
-  case 214:
-#line 885 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (2)].Queue), (yyvsp[(2) - (2)].Sim_script)); }
-    break;
-
-  case 215:
-#line 886 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (1)].Sim_script)); }
-    break;
-
-  case 216:
-#line 891 "ntp_parser.y"
-    { (yyval.Sim_script) = create_sim_script_info((yyvsp[(3) - (6)].Double), (yyvsp[(5) - (6)].Queue)); }
-    break;
-
-  case 217:
-#line 895 "ntp_parser.y"
-    { (yyval.Queue) = enqueue((yyvsp[(1) - (3)].Queue), (yyvsp[(2) - (3)].Attr_val)); }
-    break;
-
-  case 218:
-#line 896 "ntp_parser.y"
-    { (yyval.Queue) = enqueue_in_new_queue((yyvsp[(1) - (2)].Attr_val)); }
-    break;
-
-  case 219:
-#line 901 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Freq_Offset, (yyvsp[(3) - (3)].Double)); }
-    break;
-
-  case 220:
-#line 903 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Wander, (yyvsp[(3) - (3)].Double)); }
-    break;
-
-  case 221:
-#line 905 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Jitter, (yyvsp[(3) - (3)].Double)); }
-    break;
-
-  case 222:
-#line 907 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Prop_Delay, (yyvsp[(3) - (3)].Double)); }
+case 204:
+#line 856 "ntp_parser.y"
+{ old_config_style = 0; }
+    break;
+case 205:
+#line 860 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+case 206:
+#line 861 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    break;
+case 207:
+#line 865 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+    break;
+case 208:
+#line 866 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+    break;
+case 209:
+#line 870 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+    break;
+case 210:
+#line 871 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+    break;
+case 211:
+#line 876 "ntp_parser.y"
+{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
+    break;
+case 212:
+#line 880 "ntp_parser.y"
+{ yyval.Double = yyvsp[-1].Double; }
+    break;
+case 213:
+#line 884 "ntp_parser.y"
+{ yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+case 214:
+#line 888 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+    break;
+case 215:
+#line 889 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+    break;
+case 216:
+#line 894 "ntp_parser.y"
+{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+    break;
+case 217:
+#line 898 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+case 218:
+#line 899 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    break;
+case 219:
+#line 904 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+    break;
+case 220:
+#line 906 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+    break;
+case 221:
+#line 908 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
+    break;
+case 222:
+#line 910 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+    break;
+case 223:
+#line 912 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
     break;
+}
 
-  case 223:
-#line 909 "ntp_parser.y"
-    { (yyval.Attr_val) = create_attr_dval(T_Proc_Delay, (yyvsp[(3) - (3)].Double)); }
-    break;
+#line 705 "/usr/local/gnu/share/bison/bison.simple"
 
+
+  yyvsp -= yylen;
+  yyssp -= yylen;
+#if YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
 
-/* Line 1267 of yacc.c.  */
-#line 3206 "../../ntpd/ntp_parser.c"
-      default: break;
+#if YYDEBUG
+  if (yydebug)
+    {
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
+#endif
 
   *++yyvsp = yyval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yyloc;
+#endif
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
@@ -3220,11 +2386,11 @@ yyreduce:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
+  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTOKENS];
+    yystate = yydefgoto[yyn - YYNTBASE];
 
   goto yynewstate;
 
@@ -3237,129 +2403,155 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-      {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
+
+#ifdef YYERROR_VERBOSE
+      yyn = yypact[yystate];
+
+      if (yyn > YYFLAG && yyn < YYLAST)
+	{
+	  YYSIZE_T yysize = 0;
+	  char *yymsg;
+	  int yyx, yycount;
+
+	  yycount = 0;
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("parse error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
+	    {
+	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
+
+	      if (yycount < 5)
+		{
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx)
+		      {
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yycount++;
+		      }
+		}
+	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
-      }
-#endif
+	    }
+	  else
+	    yyerror ("parse error; also virtual memory exhausted");
+	}
+      else
+#endif /* defined (YYERROR_VERBOSE) */
+	yyerror ("parse error");
     }
+  goto yyerrlab1;
 
 
-
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
-      else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+      /* return failure if at end of input */
+      if (yychar == YYEOF)
+	YYABORT;
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+		  yychar, yytname[yychar1]));
+      yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
-  goto yyerrlab1;
 
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
+  goto yyerrhandle;
 
 
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:
+#if 0
+  /* This is wrong; only states that explicitly want error tokens
+     should shift them.  */
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;
+#endif
+
+
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;
+  yyvsp--;
+  yystate = *--yyssp;
+#if YYLSP_NEEDED
+  yylsp--;
+#endif
 
-  for (;;)
+#if YYDEBUG
+  if (yydebug)
     {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
+    }
+#endif
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
+yyerrhandle:
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
 
+  yyn += YYTERROR;
+  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
+    goto yyerrdefault;
 
-      yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+  yyn = yytable[yyn];
+  if (yyn < 0)
+    {
+      if (yyn == YYFLAG)
+	goto yyerrpop;
+      yyn = -yyn;
+      goto yyreduce;
     }
+  else if (yyn == 0)
+    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  *++yyvsp = yylval;
-
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+  *++yyvsp = yylval;
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   yystate = yyn;
   goto yynewstate;
@@ -3379,44 +2571,22 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
-#endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-#line 913 "ntp_parser.y"
+#line 916 "ntp_parser.y"
 
 
 /* KEYWORDS
@@ -3457,5 +2627,4 @@ int main(int argc, char *argv[])
     return 0;
 }
 */
-
 

==== ntpd/ntp_parser.h ====
2008-09-12 09:38:21-04:00, utterback at pogo.udel.edu +161 -361
  Reinstate lost timingstats file

--- 1.12/ntpd/ntp_parser.h	2008-07-16 05:22:58 -04:00
+++ 1.13/ntpd/ntp_parser.h	2008-09-12 09:38:21 -04:00
@@ -1,359 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+#ifndef BISON_NTP_PARSER_H
+# define BISON_NTP_PARSER_H
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     T_Age = 258,
-     T_Allan = 259,
-     T_Auth = 260,
-     T_Autokey = 261,
-     T_Automax = 262,
-     T_Average = 263,
-     T_Bclient = 264,
-     T_Beacon = 265,
-     T_Bias = 266,
-     T_Broadcast = 267,
-     T_Broadcastclient = 268,
-     T_Broadcastdelay = 269,
-     T_Burst = 270,
-     T_Calibrate = 271,
-     T_Calldelay = 272,
-     T_Ceiling = 273,
-     T_Clockstats = 274,
-     T_Cohort = 275,
-     T_ControlKey = 276,
-     T_Crypto = 277,
-     T_Cryptostats = 278,
-     T_Day = 279,
-     T_Default = 280,
-     T_Disable = 281,
-     T_Discard = 282,
-     T_Dispersion = 283,
-     T_Double = 284,
-     T_Driftfile = 285,
-     T_WanderThreshold = 286,
-     T_Enable = 287,
-     T_End = 288,
-     T_False = 289,
-     T_File = 290,
-     T_Filegen = 291,
-     T_Flag1 = 292,
-     T_Flag2 = 293,
-     T_Flag3 = 294,
-     T_Flag4 = 295,
-     T_Flake = 296,
-     T_Floor = 297,
-     T_Freq = 298,
-     T_Fudge = 299,
-     T_Host = 300,
-     T_Huffpuff = 301,
-     T_IPv4_address = 302,
-     T_IPv6_address = 303,
-     T_Iburst = 304,
-     T_Ident = 305,
-     T_Ignore = 306,
-     T_Includefile = 307,
-     T_Integer = 308,
-     T_Interface = 309,
-     T_Kernel = 310,
-     T_Key = 311,
-     T_Keys = 312,
-     T_Keysdir = 313,
-     T_Kod = 314,
-     T_Leap = 315,
-     T_Leapfile = 316,
-     T_Limited = 317,
-     T_Link = 318,
-     T_Logconfig = 319,
-     T_Logfile = 320,
-     T_Loopstats = 321,
-     T_Lowpriotrap = 322,
-     T_Manycastclient = 323,
-     T_Manycastserver = 324,
-     T_Mask = 325,
-     T_Maxclock = 326,
-     T_Maxdist = 327,
-     T_Maxhop = 328,
-     T_Maxpoll = 329,
-     T_Minclock = 330,
-     T_Mindist = 331,
-     T_Minimum = 332,
-     T_Minpoll = 333,
-     T_Minsane = 334,
-     T_Mode = 335,
-     T_Monitor = 336,
-     T_Month = 337,
-     T_Multicastclient = 338,
-     T_Nolink = 339,
-     T_Nomodify = 340,
-     T_None = 341,
-     T_Nopeer = 342,
-     T_Noquery = 343,
-     T_Noselect = 344,
-     T_Noserve = 345,
-     T_Notrap = 346,
-     T_Notrust = 347,
-     T_Novolley = 348,
-     T_Ntp = 349,
-     T_Ntpport = 350,
-     T_Orphan = 351,
-     T_Panic = 352,
-     T_Peer = 353,
-     T_Peerstats = 354,
-     T_Phone = 355,
-     T_Pid = 356,
-     T_Pidfile = 357,
-     T_Pool = 358,
-     T_Port = 359,
-     T_Pps = 360,
-     T_Preempt = 361,
-     T_Prefer = 362,
-     T_Protostats = 363,
-     T_Pw = 364,
-     T_Qos = 365,
-     T_RandFile = 366,
-     T_Rawstats = 367,
-     T_Refid = 368,
-     T_Requestkey = 369,
-     T_Restrict = 370,
-     T_Revoke = 371,
-     T_Server = 372,
-     T_Setvar = 373,
-     T_Sign = 374,
-     T_Statistics = 375,
-     T_Stats = 376,
-     T_Statsdir = 377,
-     T_Step = 378,
-     T_Stepout = 379,
-     T_Stratum = 380,
-     T_String = 381,
-     T_Sysstats = 382,
-     T_Tick = 383,
-     T_Time1 = 384,
-     T_Time2 = 385,
-     T_Tinker = 386,
-     T_Tos = 387,
-     T_Trap = 388,
-     T_True = 389,
-     T_Trustedkey = 390,
-     T_Ttl = 391,
-     T_Type = 392,
-     T_Version = 393,
-     T_Week = 394,
-     T_Xleave = 395,
-     T_Year = 396,
-     T_Flag = 397,
-     T_Void = 398,
-     T_EOC = 399,
-     T_Simulate = 400,
-     T_Beep_Delay = 401,
-     T_Sim_Duration = 402,
-     T_Server_Offset = 403,
-     T_Duration = 404,
-     T_Freq_Offset = 405,
-     T_Wander = 406,
-     T_Jitter = 407,
-     T_Prop_Delay = 408,
-     T_Proc_Delay = 409
-   };
-#endif
-/* Tokens.  */
-#define T_Age 258
-#define T_Allan 259
-#define T_Auth 260
-#define T_Autokey 261
-#define T_Automax 262
-#define T_Average 263
-#define T_Bclient 264
-#define T_Beacon 265
-#define T_Bias 266
-#define T_Broadcast 267
-#define T_Broadcastclient 268
-#define T_Broadcastdelay 269
-#define T_Burst 270
-#define T_Calibrate 271
-#define T_Calldelay 272
-#define T_Ceiling 273
-#define T_Clockstats 274
-#define T_Cohort 275
-#define T_ControlKey 276
-#define T_Crypto 277
-#define T_Cryptostats 278
-#define T_Day 279
-#define T_Default 280
-#define T_Disable 281
-#define T_Discard 282
-#define T_Dispersion 283
-#define T_Double 284
-#define T_Driftfile 285
-#define T_WanderThreshold 286
-#define T_Enable 287
-#define T_End 288
-#define T_False 289
-#define T_File 290
-#define T_Filegen 291
-#define T_Flag1 292
-#define T_Flag2 293
-#define T_Flag3 294
-#define T_Flag4 295
-#define T_Flake 296
-#define T_Floor 297
-#define T_Freq 298
-#define T_Fudge 299
-#define T_Host 300
-#define T_Huffpuff 301
-#define T_IPv4_address 302
-#define T_IPv6_address 303
-#define T_Iburst 304
-#define T_Ident 305
-#define T_Ignore 306
-#define T_Includefile 307
-#define T_Integer 308
-#define T_Interface 309
-#define T_Kernel 310
-#define T_Key 311
-#define T_Keys 312
-#define T_Keysdir 313
-#define T_Kod 314
-#define T_Leap 315
-#define T_Leapfile 316
-#define T_Limited 317
-#define T_Link 318
-#define T_Logconfig 319
-#define T_Logfile 320
-#define T_Loopstats 321
-#define T_Lowpriotrap 322
-#define T_Manycastclient 323
-#define T_Manycastserver 324
-#define T_Mask 325
-#define T_Maxclock 326
-#define T_Maxdist 327
-#define T_Maxhop 328
-#define T_Maxpoll 329
-#define T_Minclock 330
-#define T_Mindist 331
-#define T_Minimum 332
-#define T_Minpoll 333
-#define T_Minsane 334
-#define T_Mode 335
-#define T_Monitor 336
-#define T_Month 337
-#define T_Multicastclient 338
-#define T_Nolink 339
-#define T_Nomodify 340
-#define T_None 341
-#define T_Nopeer 342
-#define T_Noquery 343
-#define T_Noselect 344
-#define T_Noserve 345
-#define T_Notrap 346
-#define T_Notrust 347
-#define T_Novolley 348
-#define T_Ntp 349
-#define T_Ntpport 350
-#define T_Orphan 351
-#define T_Panic 352
-#define T_Peer 353
-#define T_Peerstats 354
-#define T_Phone 355
-#define T_Pid 356
-#define T_Pidfile 357
-#define T_Pool 358
-#define T_Port 359
-#define T_Pps 360
-#define T_Preempt 361
-#define T_Prefer 362
-#define T_Protostats 363
-#define T_Pw 364
-#define T_Qos 365
-#define T_RandFile 366
-#define T_Rawstats 367
-#define T_Refid 368
-#define T_Requestkey 369
-#define T_Restrict 370
-#define T_Revoke 371
-#define T_Server 372
-#define T_Setvar 373
-#define T_Sign 374
-#define T_Statistics 375
-#define T_Stats 376
-#define T_Statsdir 377
-#define T_Step 378
-#define T_Stepout 379
-#define T_Stratum 380
-#define T_String 381
-#define T_Sysstats 382
-#define T_Tick 383
-#define T_Time1 384
-#define T_Time2 385
-#define T_Tinker 386
-#define T_Tos 387
-#define T_Trap 388
-#define T_True 389
-#define T_Trustedkey 390
-#define T_Ttl 391
-#define T_Type 392
-#define T_Version 393
-#define T_Week 394
-#define T_Xleave 395
-#define T_Year 396
-#define T_Flag 397
-#define T_Void 398
-#define T_EOC 399
-#define T_Simulate 400
-#define T_Beep_Delay 401
-#define T_Sim_Duration 402
-#define T_Server_Offset 403
-#define T_Duration 404
-#define T_Freq_Offset 405
-#define T_Wander 406
-#define T_Jitter 407
-#define T_Prop_Delay 408
-#define T_Proc_Delay 409
-
-
-
-
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 49 "ntp_parser.y"
-{
+#ifndef YYSTYPE
+typedef union {
     char   *String;
     double  Double;
     int     Integer;
@@ -366,14 +15,165 @@ typedef union YYSTYPE
     /* Simulation types */
     server_info *Sim_server;
     script_info *Sim_script;
-}
-/* Line 1529 of yacc.c.  */
-#line 372 "../../ntpd/ntp_parser.h"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+} yystype;
+# define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
+# define	T_Age	257
+# define	T_Allan	258
+# define	T_Auth	259
+# define	T_Autokey	260
+# define	T_Automax	261
+# define	T_Average	262
+# define	T_Bclient	263
+# define	T_Beacon	264
+# define	T_Bias	265
+# define	T_Broadcast	266
+# define	T_Broadcastclient	267
+# define	T_Broadcastdelay	268
+# define	T_Burst	269
+# define	T_Calibrate	270
+# define	T_Calldelay	271
+# define	T_Ceiling	272
+# define	T_Clockstats	273
+# define	T_Cohort	274
+# define	T_ControlKey	275
+# define	T_Crypto	276
+# define	T_Cryptostats	277
+# define	T_Day	278
+# define	T_Default	279
+# define	T_Disable	280
+# define	T_Discard	281
+# define	T_Dispersion	282
+# define	T_Double	283
+# define	T_Driftfile	284
+# define	T_WanderThreshold	285
+# define	T_Enable	286
+# define	T_End	287
+# define	T_False	288
+# define	T_File	289
+# define	T_Filegen	290
+# define	T_Flag1	291
+# define	T_Flag2	292
+# define	T_Flag3	293
+# define	T_Flag4	294
+# define	T_Flake	295
+# define	T_Floor	296
+# define	T_Freq	297
+# define	T_Fudge	298
+# define	T_Host	299
+# define	T_Huffpuff	300
+# define	T_IPv4_address	301
+# define	T_IPv6_address	302
+# define	T_Iburst	303
+# define	T_Ident	304
+# define	T_Ignore	305
+# define	T_Includefile	306
+# define	T_Integer	307
+# define	T_Interface	308
+# define	T_Kernel	309
+# define	T_Key	310
+# define	T_Keys	311
+# define	T_Keysdir	312
+# define	T_Kod	313
+# define	T_Leap	314
+# define	T_Leapfile	315
+# define	T_Limited	316
+# define	T_Link	317
+# define	T_Logconfig	318
+# define	T_Logfile	319
+# define	T_Loopstats	320
+# define	T_Lowpriotrap	321
+# define	T_Manycastclient	322
+# define	T_Manycastserver	323
+# define	T_Mask	324
+# define	T_Maxclock	325
+# define	T_Maxdist	326
+# define	T_Maxhop	327
+# define	T_Maxpoll	328
+# define	T_Minclock	329
+# define	T_Mindist	330
+# define	T_Minimum	331
+# define	T_Minpoll	332
+# define	T_Minsane	333
+# define	T_Mode	334
+# define	T_Monitor	335
+# define	T_Month	336
+# define	T_Multicastclient	337
+# define	T_Nolink	338
+# define	T_Nomodify	339
+# define	T_None	340
+# define	T_Nopeer	341
+# define	T_Noquery	342
+# define	T_Noselect	343
+# define	T_Noserve	344
+# define	T_Notrap	345
+# define	T_Notrust	346
+# define	T_Novolley	347
+# define	T_Ntp	348
+# define	T_Ntpport	349
+# define	T_Orphan	350
+# define	T_Panic	351
+# define	T_Peer	352
+# define	T_Peerstats	353
+# define	T_Phone	354
+# define	T_Pid	355
+# define	T_Pidfile	356
+# define	T_Pool	357
+# define	T_Port	358
+# define	T_Pps	359
+# define	T_Preempt	360
+# define	T_Prefer	361
+# define	T_Protostats	362
+# define	T_Pw	363
+# define	T_Qos	364
+# define	T_RandFile	365
+# define	T_Rawstats	366
+# define	T_Refid	367
+# define	T_Requestkey	368
+# define	T_Restrict	369
+# define	T_Revoke	370
+# define	T_Server	371
+# define	T_Setvar	372
+# define	T_Sign	373
+# define	T_Statistics	374
+# define	T_Stats	375
+# define	T_Statsdir	376
+# define	T_Step	377
+# define	T_Stepout	378
+# define	T_Stratum	379
+# define	T_String	380
+# define	T_Sysstats	381
+# define	T_Tick	382
+# define	T_Time1	383
+# define	T_Time2	384
+# define	T_Timingstats	385
+# define	T_Tinker	386
+# define	T_Tos	387
+# define	T_Trap	388
+# define	T_True	389
+# define	T_Trustedkey	390
+# define	T_Ttl	391
+# define	T_Type	392
+# define	T_Version	393
+# define	T_Week	394
+# define	T_Xleave	395
+# define	T_Year	396
+# define	T_Flag	397
+# define	T_Void	398
+# define	T_EOC	399
+# define	T_Simulate	400
+# define	T_Beep_Delay	401
+# define	T_Sim_Duration	402
+# define	T_Server_Offset	403
+# define	T_Duration	404
+# define	T_Freq_Offset	405
+# define	T_Wander	406
+# define	T_Jitter	407
+# define	T_Prop_Delay	408
+# define	T_Proc_Delay	409
+
 
 extern YYSTYPE yylval;
 
+#endif /* not BISON_NTP_PARSER_H */

==== ntpd/ntp_parser.y ====
2008-09-12 09:38:41-04:00, utterback at pogo.udel.edu +3 -0
  Reinstate lost timingstats file

--- 1.23/ntpd/ntp_parser.y	2008-08-31 02:06:00 -04:00
+++ 1.24/ntpd/ntp_parser.y	2008-09-12 09:38:41 -04:00
@@ -190,6 +190,7 @@
 %token		T_Tick
 %token		T_Time1
 %token		T_Time2
+%token		T_Timingstats
 %token		T_Tinker
 %token		T_Tos
 %token		T_Trap
@@ -519,6 +520,8 @@ stat
                     { $$ = create_pval("rawstats"); }
         |	T_Sysstats
                     { $$ = create_pval("sysstats"); }
+        |	T_Timingstats
+                    { $$ = create_pval("timingstats"); }
 	|	T_Protostats
 		    { $$ = create_pval("protostats"); }
 	;

==== ntpd/ntp_util.c ====
2008-09-12 09:38:46-04:00, utterback at pogo.udel.edu +8 -0
  Reinstate lost timingstats file

--- 1.65/ntpd/ntp_util.c	2008-07-16 05:23:04 -04:00
+++ 1.66/ntpd/ntp_util.c	2008-09-12 09:38:46 -04:00
@@ -471,6 +471,14 @@ stats_config(
 				filegen_setup(&cryptostats, now.l_ui);
 			}
 #endif /* OPENSSL */
+#ifdef DEBUG_TIMING
+			if(timingstats.prefix == &statsdir[0] &&
+			    timingstats.fp != NULL) {
+				fclose(timingstats.fp);
+				timingstats.fp = NULL;
+				filegen_setup(&timingstats, now.l_ui);
+			}
+#endif /* DEBUG_TIMING */
 		}
 		break;
 


More information about the bk-ntp-dev-send mailing list