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

Harlan Stenn stenn at whimsy.udel.edu
Sun Jun 17 05:26:49 UTC 2007


#### ChangeSet ####
2007-06-17 01:24:40-04:00, stenn at whimsy.udel.edu 
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

==== ChangeLog ====
2007-06-17 01:21:47-04:00, stenn at whimsy.udel.edu +1 -0
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

--- 1.70/ChangeLog	2007-06-14 23:21:42 -04:00
+++ 1.71/ChangeLog	2007-06-17 01:21:47 -04:00
@@ -1,3 +1,4 @@
+* Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
 * [Bug #629] changes to ensure broadcast works including on wildcard addresses
 * [Bug 853] get_node() must return a pointer to maximally-aligned memory.
 * Leap file fixes from Dave Mills.

==== ntpd/Makefile.am ====
2007-06-17 01:22:00-04:00, stenn at whimsy.udel.edu +2 -1
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

--- 1.61/ntpd/Makefile.am	2007-05-31 01:31:54 -04:00
+++ 1.62/ntpd/Makefile.am	2007-06-17 01:22:00 -04:00
@@ -11,7 +11,8 @@ AM_CPPFLAGS= -I$(top_srcdir)/include -I.
 LDADD=	version.o libntpd.a @LIBPARSE@
 AM_YFLAGS=	-d -t
 
-BUILT_SOURCES=	ntpd-opts.c ntpd-opts.h ntpd.1 ntpd-opts.texi ntpd-opts.menu ntp_parser.h
+BUILT_SOURCES=	ntp_parser.c ntp_parser.h	\
+		ntpd-opts.c ntpd-opts.h ntpd.1 ntpd-opts.texi ntpd-opts.menu
 
 man_MANS=	ntpd.1
 

==== ntpd/ntp_parser.c ====
2007-06-17 01:22:02-04:00, stenn at whimsy.udel.edu +1511 -1964
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

--- 1.10/ntpd/ntp_parser.c	2007-06-07 10:45:14 -04:00
+++ 1.11/ntpd/ntp_parser.c	2007-06-17 01:22:02 -04:00
@@ -1,362 +1,159 @@
-/* A Bison parser, made from /ntpdev/ntpd/ntp_parser.y, by GNU bison 1.75.  */
+/* A Bison parser, made from /backroom/ntp-dev/A.whimsy/ntpd/../../ntpd/ntp_parser.y
+   by GNU bison 1.35.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+#define YYBISON 1  /* Identify Bison output.  */
 
-   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.  */
-
-/* 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
-
-/* 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_Broadcast = 266,
-     T_Broadcastclient = 267,
-     T_Broadcastdelay = 268,
-     T_Burst = 269,
-     T_Calibrate = 270,
-     T_Calldelay = 271,
-     T_Ceiling = 272,
-     T_Cert = 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_DriftMinutes = 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_Floor = 296,
-     T_Freq = 297,
-     T_Fudge = 298,
-     T_Gqpar = 299,
-     T_Host = 300,
-     T_Huffpuff = 301,
-     T_IPv4_address = 302,
-     T_IPv6_address = 303,
-     T_Iburst = 304,
-     T_Ident = 305,
-     T_Iffpar = 306,
-     T_Ignore = 307,
-     T_Includefile = 308,
-     T_Integer = 309,
-     T_Interface = 310,
-     T_Kernel = 311,
-     T_Key = 312,
-     T_Keys = 313,
-     T_Keysdir = 314,
-     T_Kod = 315,
-     T_Leap = 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_Mvpar = 339,
-     T_Nolink = 340,
-     T_Nomodify = 341,
-     T_None = 342,
-     T_Nopeer = 343,
-     T_Noquery = 344,
-     T_Noselect = 345,
-     T_Noserve = 346,
-     T_Notrap = 347,
-     T_Notrust = 348,
-     T_Novolley = 349,
-     T_Ntp = 350,
-     T_Ntpport = 351,
-     T_Orphan = 352,
-     T_Panic = 353,
-     T_Peer = 354,
-     T_Peerstats = 355,
-     T_Phone = 356,
-     T_Pid = 357,
-     T_Pidfile = 358,
-     T_Pool = 359,
-     T_Port = 360,
-     T_Pps = 361,
-     T_Preempt = 362,
-     T_Prefer = 363,
-     T_Pw = 364,
-     T_RandFile = 365,
-     T_Rawstats = 366,
-     T_Refid = 367,
-     T_Requestkey = 368,
-     T_Restrict = 369,
-     T_Revoke = 370,
-     T_Server = 371,
-     T_Setvar = 372,
-     T_Sign = 373,
-     T_Statistics = 374,
-     T_Stats = 375,
-     T_Statsdir = 376,
-     T_Step = 377,
-     T_Stepout = 378,
-     T_Stratum = 379,
-     T_String = 380,
-     T_Sysstats = 381,
-     T_Tick = 382,
-     T_Time1 = 383,
-     T_Time2 = 384,
-     T_Tinker = 385,
-     T_Tos = 386,
-     T_Trap = 387,
-     T_True = 388,
-     T_Trustedkey = 389,
-     T_Ttl = 390,
-     T_Type = 391,
-     T_Version = 392,
-     T_Week = 393,
-     T_Year = 394,
-     T_Flag = 395,
-     T_Void = 396,
-     T_EOC = 397,
-     T_Simulate = 398,
-     T_Beep_Delay = 399,
-     T_Sim_Duration = 400,
-     T_Server_Offset = 401,
-     T_Duration = 402,
-     T_Freq_Offset = 403,
-     T_Wander = 404,
-     T_Jitter = 405,
-     T_Prop_Delay = 406,
-     T_Proc_Delay = 407
-   };
-#endif
-#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_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_Cert 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_DriftMinutes 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_Floor 296
-#define T_Freq 297
-#define T_Fudge 298
-#define T_Gqpar 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_Iffpar 306
-#define T_Ignore 307
-#define T_Includefile 308
-#define T_Integer 309
-#define T_Interface 310
-#define T_Kernel 311
-#define T_Key 312
-#define T_Keys 313
-#define T_Keysdir 314
-#define T_Kod 315
-#define T_Leap 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_Mvpar 339
-#define T_Nolink 340
-#define T_Nomodify 341
-#define T_None 342
-#define T_Nopeer 343
-#define T_Noquery 344
-#define T_Noselect 345
-#define T_Noserve 346
-#define T_Notrap 347
-#define T_Notrust 348
-#define T_Novolley 349
-#define T_Ntp 350
-#define T_Ntpport 351
-#define T_Orphan 352
-#define T_Panic 353
-#define T_Peer 354
-#define T_Peerstats 355
-#define T_Phone 356
-#define T_Pid 357
-#define T_Pidfile 358
-#define T_Pool 359
-#define T_Port 360
-#define T_Pps 361
-#define T_Preempt 362
-#define T_Prefer 363
-#define T_Pw 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_Tinker 385
-#define T_Tos 386
-#define T_Trap 387
-#define T_True 388
-#define T_Trustedkey 389
-#define T_Ttl 390
-#define T_Type 391
-#define T_Version 392
-#define T_Week 393
-#define T_Year 394
-#define T_Flag 395
-#define T_Void 396
-#define T_EOC 397
-#define T_Simulate 398
-#define T_Beep_Delay 399
-#define T_Sim_Duration 400
-#define T_Server_Offset 401
-#define T_Duration 402
-#define T_Freq_Offset 403
-#define T_Wander 404
-#define T_Jitter 405
-#define T_Prop_Delay 406
-#define T_Proc_Delay 407
+# 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_Broadcast	265
+# define	T_Broadcastclient	266
+# define	T_Broadcastdelay	267
+# define	T_Burst	268
+# define	T_Calibrate	269
+# define	T_Calldelay	270
+# define	T_Ceiling	271
+# define	T_Cert	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_DriftMinutes	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_Floor	295
+# define	T_Freq	296
+# define	T_Fudge	297
+# define	T_Gqpar	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_Iffpar	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_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_Mvpar	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_Pw	363
+# define	T_RandFile	364
+# define	T_Rawstats	365
+# define	T_Refid	366
+# define	T_Requestkey	367
+# define	T_Restrict	368
+# define	T_Revoke	369
+# define	T_Server	370
+# define	T_Setvar	371
+# define	T_Sign	372
+# define	T_Statistics	373
+# define	T_Stats	374
+# define	T_Statsdir	375
+# define	T_Step	376
+# define	T_Stepout	377
+# define	T_Stratum	378
+# define	T_String	379
+# define	T_Sysstats	380
+# define	T_Tick	381
+# define	T_Time1	382
+# define	T_Time2	383
+# define	T_Tinker	384
+# define	T_Tos	385
+# define	T_Trap	386
+# define	T_True	387
+# define	T_Trustedkey	388
+# define	T_Ttl	389
+# define	T_Type	390
+# define	T_Version	391
+# define	T_Week	392
+# define	T_Year	393
+# define	T_Flag	394
+# define	T_Void	395
+# define	T_EOC	396
+# define	T_Simulate	397
+# define	T_Beep_Delay	398
+# define	T_Sim_Duration	399
+# define	T_Server_Offset	400
+# define	T_Duration	401
+# define	T_Freq_Offset	402
+# define	T_Wander	403
+# define	T_Jitter	404
+# define	T_Prop_Delay	405
+# define	T_Proc_Delay	406
 
-
-
-
-/* Copy the first part of user declarations.  */
 #line 11 "ntp_parser.y"
 
   #ifdef HAVE_CONFIG_H
@@ -388,6 +185,8 @@
 
 
   struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream */
+
+  #define YYERROR_VERBOSE
   void yyerror (char *msg);
 
   /* SK: The following is a terrible hack to allow the NTP code to be built
@@ -413,22 +212,8 @@
  #define CRYPTO_CONF_IDENT 12    
 #endif
 
-
-/* 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
-
+#line 69 "ntp_parser.y"
 #ifndef YYSTYPE
-#line 67 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -443,146 +228,24 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
-/* Line 193 of /usr/local/share/bison/yacc.c.  */
-#line 448 "ntp_parser.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-
-#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE yyltype
-# define YYLTYPE_IS_TRIVIAL 1
+#ifndef YYDEBUG
+# define YYDEBUG 1
 #endif
 
-/* Copy the second part of user declarations.  */
 
 
-/* Line 213 of /usr/local/share/bison/yacc.c.  */
-#line 469 "ntp_parser.c"
+#define	YYFINAL		361
+#define	YYFLAG		-32768
+#define	YYNTBASE	158
 
-#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
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
+#define YYTRANSLATE(x) ((unsigned)(x) <= 406 ? yytranslate[x] : 220)
 
-# 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) || YYERROR_VERBOSE */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-  };
-
-/* 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.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
-
-/* 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 (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  163
-#define YYLAST   524
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  158
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  63
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  226
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  361
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   407
-
-#define YYTRANSLATE(X) \
-  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char 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,
@@ -609,156 +272,156 @@ static const unsigned char 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
+       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
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const unsigned short 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,    59,    62,    64,
-      66,    69,    71,    73,    75,    77,    80,    83,    86,    88,
-      90,    92,    94,    97,   100,   103,   105,   108,   111,   114,
-     117,   120,   123,   126,   129,   132,   135,   138,   141,   143,
+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,    56,    59,    61,    63,
+      66,    68,    70,    72,    74,    77,    80,    83,    85,    87,
+      89,    91,    94,    97,   100,   102,   105,   108,   111,   114,
+     117,   120,   123,   126,   129,   132,   135,   138,   140,   143,
      146,   149,   152,   155,   158,   161,   164,   167,   170,   173,
-     176,   179,   181,   184,   187,   190,   193,   196,   199,   202,
-     205,   208,   211,   214,   217,   220,   224,   227,   229,   231,
-     233,   235,   237,   239,   241,   244,   246,   249,   252,   254,
-     256,   258,   260,   262,   264,   266,   268,   270,   272,   274,
-     277,   281,   285,   291,   292,   295,   297,   299,   301,   303,
-     305,   307,   309,   311,   313,   315,   317,   319,   322,   324,
-     327,   330,   333,   337,   340,   342,   345,   348,   351,   354,
-     357,   360,   363,   366,   369,   372,   375,   377,   379,   381,
-     383,   385,   387,   389,   391,   394,   397,   399,   402,   405,
-     408,   411,   414,   417,   420,   424,   426,   429,   432,   435,
-     439,   442,   445,   448,   451,   454,   457,   461,   464,   465,
-     467,   472,   476,   479,   481,   484,   487,   490,   492,   495,
-     497,   499,   501,   503,   506,   508,   511,   513,   516,   518,
-     520,   522,   524,   526,   528,   534,   536,   540,   543,   547,
-     551,   554,   556,   562,   567,   571,   573,   575,   578,   580,
-     587,   591,   594,   598,   602,   606,   610
+     176,   178,   181,   184,   187,   190,   193,   196,   199,   202,
+     205,   208,   211,   214,   217,   221,   224,   226,   228,   230,
+     232,   234,   236,   238,   241,   243,   246,   249,   251,   253,
+     255,   257,   259,   261,   263,   265,   267,   269,   271,   274,
+     278,   282,   288,   289,   292,   294,   296,   298,   300,   302,
+     304,   306,   308,   310,   312,   314,   316,   319,   321,   324,
+     327,   330,   334,   337,   339,   342,   345,   348,   351,   354,
+     357,   360,   363,   366,   369,   372,   374,   376,   378,   380,
+     382,   384,   386,   388,   391,   394,   396,   399,   402,   405,
+     408,   411,   414,   417,   421,   423,   426,   429,   432,   436,
+     439,   442,   445,   448,   451,   454,   458,   461,   462,   464,
+     469,   473,   476,   478,   481,   484,   487,   489,   492,   494,
+     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,   570,   572,   575,   577,   584,
+     588,   591,   595,   599,   603,   607
 };
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short yyrhs[] =
 {
-     159,     0,    -1,   160,    -1,   160,   161,   142,    -1,   161,
-     142,    -1,     1,   142,    -1,    -1,   162,    -1,   168,    -1,
-     169,    -1,   175,    -1,   181,    -1,   172,    -1,   186,    -1,
-     189,    -1,   192,    -1,   195,    -1,   208,    -1,   163,   164,
-     166,    -1,   163,   164,    -1,   116,    -1,   104,    -1,    99,
-      -1,    11,    -1,    68,    -1,   165,    -1,   125,    -1,    54,
-     125,    -1,    47,    -1,    48,    -1,   166,   167,    -1,   167,
-      -1,     6,    -1,    14,    -1,    49,    -1,    57,    54,    -1,
-      78,    54,    -1,    74,    54,    -1,    90,    -1,   107,    -1,
-     108,    -1,   133,    -1,   135,    54,    -1,    80,    54,    -1,
-     137,    54,    -1,    12,    -1,    12,    94,    -1,    69,   205,
-      -1,    83,   205,    -1,     6,    54,    -1,    21,    54,    -1,
-      22,   170,    -1,    58,   125,    -1,    59,   125,    -1,   113,
-      54,    -1,   115,    54,    -1,   134,   203,    -1,   170,   171,
-      -1,   171,    -1,    18,   125,    -1,    61,   125,    -1,   110,
-     125,    -1,    45,   125,    -1,   118,   125,    -1,    50,   125,
-      -1,    51,   125,    -1,    44,   125,    -1,    84,   125,    -1,
-     109,   125,    -1,   131,   173,    -1,   173,   174,    -1,   174,
-      -1,    17,    54,    -1,    41,    54,    -1,    20,   206,    -1,
-      97,    54,    -1,    76,   207,    -1,    72,   207,    -1,    75,
-     207,    -1,    71,   207,    -1,    79,    54,    -1,    10,    54,
-      -1,    73,    54,    -1,   119,   176,    -1,   121,   125,    -1,
-      36,   177,   178,    -1,   176,   177,    -1,   177,    -1,    19,
-      -1,    23,    -1,    66,    -1,   100,    -1,   111,    -1,   126,
-      -1,   178,   179,    -1,   179,    -1,    35,   125,    -1,   136,
-     180,    -1,    63,    -1,    85,    -1,    32,    -1,    26,    -1,
-      87,    -1,   102,    -1,    24,    -1,   138,    -1,    82,    -1,
-     139,    -1,     3,    -1,    27,   184,    -1,   114,   164,   182,
-      -1,   114,    25,   182,    -1,   114,   165,    70,   165,   182,
-      -1,    -1,   182,   183,    -1,    52,    -1,    60,    -1,    62,
-      -1,    67,    -1,    86,    -1,    88,    -1,    89,    -1,    91,
-      -1,    92,    -1,    93,    -1,    96,    -1,   137,    -1,   184,
-     185,    -1,   185,    -1,     8,    54,    -1,    77,    54,    -1,
-      81,    54,    -1,    43,   164,   187,    -1,   187,   188,    -1,
-     188,    -1,   128,   207,    -1,   129,   207,    -1,   124,    54,
-      -1,   112,   125,    -1,    37,   206,    -1,    38,   206,    -1,
-      39,   206,    -1,    40,   206,    -1,    32,   190,    -1,    26,
-     190,    -1,   190,   191,    -1,   191,    -1,     5,    -1,     9,
-      -1,    15,    -1,    56,    -1,    81,    -1,    95,    -1,   120,
-      -1,   130,   193,    -1,   193,   194,    -1,   194,    -1,     4,
-     207,    -1,    28,   207,    -1,    42,   207,    -1,    46,   207,
-      -1,    98,   207,    -1,   122,   207,    -1,   123,   207,    -1,
-      53,   125,   161,    -1,    33,    -1,    13,   207,    -1,    16,
-      54,    -1,   127,   207,    -1,    30,   125,   196,    -1,   103,
-     125,    -1,    65,   125,    -1,     7,    54,    -1,    64,   200,
-      -1,   101,   204,    -1,   117,   197,    -1,   132,   165,   198,
-      -1,   135,   203,    -1,    -1,    54,    -1,   125,   153,   125,
-      25,    -1,   125,   153,   125,    -1,   198,   199,    -1,   199,
-      -1,   105,    54,    -1,    55,   165,    -1,   200,   201,    -1,
-     201,    -1,   202,   125,    -1,   125,    -1,   154,    -1,   155,
-      -1,   153,    -1,   203,    54,    -1,    54,    -1,   204,   125,
-      -1,   125,    -1,   205,   164,    -1,   164,    -1,    54,    -1,
-     133,    -1,    34,    -1,    54,    -1,    29,    -1,   209,   156,
-     210,   212,   157,    -1,   143,    -1,   210,   211,   142,    -1,
-     211,   142,    -1,   144,   153,   207,    -1,   145,   153,   207,
-      -1,   212,   213,    -1,   213,    -1,   215,   156,   214,   217,
-     157,    -1,   146,   153,   207,   142,    -1,   116,   153,   216,
-      -1,   165,    -1,   125,    -1,   217,   218,    -1,   218,    -1,
-     147,   153,   207,   156,   219,   157,    -1,   219,   220,   142,
-      -1,   220,   142,    -1,   148,   153,   207,    -1,   149,   153,
-     207,    -1,   150,   153,   207,    -1,   151,   153,   207,    -1,
-     152,   153,   207,    -1
+     159,     0,   159,   160,   142,     0,   160,   142,     0,     1,
+     142,     0,     0,   161,     0,   167,     0,   168,     0,   174,
+       0,   180,     0,   171,     0,   185,     0,   188,     0,   191,
+       0,   194,     0,   207,     0,   162,   163,   165,     0,   162,
+     163,     0,   116,     0,   104,     0,    99,     0,    11,     0,
+      68,     0,   164,     0,   125,     0,    54,   125,     0,    47,
+       0,    48,     0,   165,   166,     0,   166,     0,     6,     0,
+      14,     0,    49,     0,    57,    54,     0,    78,    54,     0,
+      74,    54,     0,    90,     0,   107,     0,   108,     0,   133,
+       0,   135,    54,     0,    80,    54,     0,   137,    54,     0,
+      12,     0,    12,    94,     0,    69,   204,     0,    83,   204,
+       0,     6,    54,     0,    21,    54,     0,    22,   169,     0,
+      58,   125,     0,    59,   125,     0,   113,    54,     0,   115,
+      54,     0,   134,   202,     0,   169,   170,     0,   170,     0,
+      18,   125,     0,    61,   125,     0,   110,   125,     0,    45,
+     125,     0,   118,   125,     0,    50,   125,     0,    51,   125,
+       0,    44,   125,     0,    84,   125,     0,   109,   125,     0,
+     131,   172,     0,   172,   173,     0,   173,     0,    17,    54,
+       0,    41,    54,     0,    20,   205,     0,    97,    54,     0,
+      76,   206,     0,    72,   206,     0,    75,   206,     0,    71,
+     206,     0,    79,    54,     0,    10,    54,     0,    73,    54,
+       0,   119,   175,     0,   121,   125,     0,    36,   176,   177,
+       0,   175,   176,     0,   176,     0,    19,     0,    23,     0,
+      66,     0,   100,     0,   111,     0,   126,     0,   177,   178,
+       0,   178,     0,    35,   125,     0,   136,   179,     0,    63,
+       0,    85,     0,    32,     0,    26,     0,    87,     0,   102,
+       0,    24,     0,   138,     0,    82,     0,   139,     0,     3,
+       0,    27,   183,     0,   114,   163,   181,     0,   114,    25,
+     181,     0,   114,   164,    70,   164,   181,     0,     0,   181,
+     182,     0,    52,     0,    60,     0,    62,     0,    67,     0,
+      86,     0,    88,     0,    89,     0,    91,     0,    92,     0,
+      93,     0,    96,     0,   137,     0,   183,   184,     0,   184,
+       0,     8,    54,     0,    77,    54,     0,    81,    54,     0,
+      43,   163,   186,     0,   186,   187,     0,   187,     0,   128,
+     206,     0,   129,   206,     0,   124,    54,     0,   112,   125,
+       0,    37,   205,     0,    38,   205,     0,    39,   205,     0,
+      40,   205,     0,    32,   189,     0,    26,   189,     0,   189,
+     190,     0,   190,     0,     5,     0,     9,     0,    15,     0,
+      56,     0,    81,     0,    95,     0,   120,     0,   130,   192,
+       0,   192,   193,     0,   193,     0,     4,   206,     0,    28,
+     206,     0,    42,   206,     0,    46,   206,     0,    98,   206,
+       0,   122,   206,     0,   123,   206,     0,    53,   125,   160,
+       0,    33,     0,    13,   206,     0,    16,    54,     0,   127,
+     206,     0,    30,   125,   195,     0,   103,   125,     0,    65,
+     125,     0,     7,    54,     0,    64,   199,     0,   101,   203,
+       0,   117,   196,     0,   132,   164,   197,     0,   135,   202,
+       0,     0,    54,     0,   125,   153,   125,    25,     0,   125,
+     153,   125,     0,   197,   198,     0,   198,     0,   105,    54,
+       0,    55,   164,     0,   199,   200,     0,   200,     0,   201,
+     125,     0,   125,     0,   154,     0,   155,     0,   153,     0,
+     202,    54,     0,    54,     0,   203,   125,     0,   125,     0,
+     204,   163,     0,   163,     0,    54,     0,   133,     0,    34,
+       0,    54,     0,    29,     0,   208,   156,   209,   211,   157,
+       0,   143,     0,   209,   210,   142,     0,   210,   142,     0,
+     144,   153,   206,     0,   145,   153,   206,     0,   211,   212,
+       0,   212,     0,   214,   156,   213,   216,   157,     0,   146,
+     153,   206,   142,     0,   116,   153,   215,     0,   164,     0,
+     125,     0,   216,   217,     0,   217,     0,   147,   153,   206,
+     156,   218,   157,     0,   218,   219,   142,     0,   219,   142,
+       0,   148,   153,   206,     0,   149,   153,   206,     0,   150,
+     153,   206,     0,   151,   153,   206,     0,   152,   153,   206,
+       0
 };
 
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+#endif
+
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
 {
-       0,   298,   298,   302,   303,   308,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   335,   341,
-     350,   351,   352,   353,   354,   358,   359,   360,   376,   377,
-     381,   382,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   409,   411,   413,   415,   426,
-     428,   430,   436,   438,   440,   442,   444,   449,   450,   454,
-     456,   458,   460,   462,   464,   466,   468,   470,   472,   482,
-     487,   488,   492,   494,   496,   498,   500,   502,   504,   506,
-     508,   510,   512,   522,   524,   526,   534,   535,   539,   541,
-     543,   545,   547,   549,   554,   555,   559,   560,   561,   562,
-     563,   564,   568,   569,   570,   571,   572,   573,   574,   583,
-     585,   590,   595,   603,   604,   608,   609,   610,   611,   612,
-     613,   614,   615,   616,   617,   618,   619,   623,   624,   628,
-     629,   630,   638,   643,   644,   648,   650,   652,   654,   656,
-     658,   660,   662,   671,   673,   678,   679,   683,   684,   685,
-     686,   687,   688,   690,   698,   702,   703,   707,   708,   709,
-     710,   711,   712,   713,   721,   737,   743,   745,   747,   749,
-     752,   754,   756,   759,   761,   763,   765,   767,   771,   772,
-     777,   779,   785,   786,   790,   791,   796,   797,   801,   802,
-     819,   820,   821,   830,   831,   835,   836,   840,   841,   845,
-     854,   855,   859,   860,   868,   883,   887,   888,   892,   893,
-     897,   898,   902,   907,   911,   915,   916,   920,   921,   925,
-     930,   931,   935,   937,   939,   941,   943
+       0,   300,   304,   305,   310,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   337,   343,   352,
+     353,   354,   355,   356,   360,   361,   362,   378,   379,   383,
+     384,   389,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   411,   413,   415,   417,   428,   430,
+     432,   438,   440,   442,   444,   446,   451,   452,   456,   458,
+     460,   462,   464,   466,   468,   470,   472,   474,   484,   489,
+     490,   494,   496,   498,   500,   502,   504,   506,   508,   510,
+     512,   514,   524,   526,   528,   536,   537,   541,   543,   545,
+     547,   549,   551,   556,   557,   561,   562,   563,   564,   565,
+     566,   570,   571,   572,   573,   574,   575,   576,   585,   587,
+     592,   597,   605,   606,   610,   611,   612,   613,   614,   615,
+     616,   617,   618,   619,   620,   621,   625,   626,   630,   631,
+     632,   640,   645,   646,   650,   652,   654,   656,   658,   660,
+     662,   664,   673,   675,   680,   681,   685,   686,   687,   688,
+     689,   690,   692,   700,   704,   705,   709,   710,   711,   712,
+     713,   714,   715,   723,   739,   745,   747,   749,   751,   754,
+     756,   758,   761,   763,   765,   767,   769,   773,   774,   779,
+     781,   787,   788,   792,   793,   798,   799,   803,   804,   821,
+     822,   823,   832,   833,   837,   838,   842,   843,   847,   856,
+     857,   861,   862,   870,   885,   889,   890,   894,   895,   899,
+     900,   904,   909,   913,   917,   918,   922,   923,   927,   932,
+     933,   937,   939,   941,   943,   945
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[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", 
+  "$", "error", "$undefined.", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
   "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Broadcast", 
   "T_Broadcastclient", "T_Broadcastdelay", "T_Burst", "T_Calibrate", 
   "T_Calldelay", "T_Ceiling", "T_Cert", "T_Clockstats", "T_Cohort", 
@@ -787,382 +450,445 @@ static const char *const yytname[] =
   "T_Week", "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_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", "log_config_prefix", "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_address", "sim_act_list", "sim_act", "sim_act_stmt_list", 
-  "sim_act_stmt", 0
+  "'='", "'+'", "'-'", "'{'", "'}'", "configuration", "command_list", 
+  "command", "server_command", "client_type", "address", "ip_address", 
+  "option_list", "option", "other_mode_command", "authentication_command", 
+  "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", "log_config_prefix", 
+  "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_address", "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 unsigned short 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,    61,    43,    45,   123,   125
-};
-# endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char 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,   165,
-     166,   166,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   167,   167,   167,   167,   168,   168,   168,   168,   169,
-     169,   169,   169,   169,   169,   169,   169,   170,   170,   171,
-     171,   171,   171,   171,   171,   171,   171,   171,   171,   172,
-     173,   173,   174,   174,   174,   174,   174,   174,   174,   174,
-     174,   174,   174,   175,   175,   175,   176,   176,   177,   177,
-     177,   177,   177,   177,   178,   178,   179,   179,   179,   179,
-     179,   179,   180,   180,   180,   180,   180,   180,   180,   181,
-     181,   181,   181,   182,   182,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   183,   183,   183,   184,   184,   185,
-     185,   185,   186,   187,   187,   188,   188,   188,   188,   188,
-     188,   188,   188,   189,   189,   190,   190,   191,   191,   191,
-     191,   191,   191,   191,   192,   193,   193,   194,   194,   194,
-     194,   194,   194,   194,   195,   195,   195,   195,   195,   195,
-     195,   195,   195,   195,   195,   195,   195,   195,   196,   196,
-     197,   197,   198,   198,   199,   199,   200,   200,   201,   201,
-     202,   202,   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,   217,   218,
-     219,   219,   220,   220,   220,   220,   220
+       0,   158,   159,   159,   159,   160,   160,   160,   160,   160,
+     160,   160,   160,   160,   160,   160,   160,   161,   161,   162,
+     162,   162,   162,   162,   163,   163,   163,   164,   164,   165,
+     165,   166,   166,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   166,   166,   167,   167,   167,   167,   168,   168,
+     168,   168,   168,   168,   168,   168,   169,   169,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   171,   172,
+     172,   173,   173,   173,   173,   173,   173,   173,   173,   173,
+     173,   173,   174,   174,   174,   175,   175,   176,   176,   176,
+     176,   176,   176,   177,   177,   178,   178,   178,   178,   178,
+     178,   179,   179,   179,   179,   179,   179,   179,   180,   180,
+     180,   180,   181,   181,   182,   182,   182,   182,   182,   182,
+     182,   182,   182,   182,   182,   182,   183,   183,   184,   184,
+     184,   185,   186,   186,   187,   187,   187,   187,   187,   187,
+     187,   187,   188,   188,   189,   189,   190,   190,   190,   190,
+     190,   190,   190,   191,   192,   192,   193,   193,   193,   193,
+     193,   193,   193,   194,   194,   194,   194,   194,   194,   194,
+     194,   194,   194,   194,   194,   194,   194,   195,   195,   196,
+     196,   197,   197,   198,   198,   199,   199,   200,   200,   201,
+     201,   201,   202,   202,   203,   203,   204,   204,   205,   205,
+     205,   206,   206,   207,   208,   209,   209,   210,   210,   211,
+     211,   212,   213,   214,   215,   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 unsigned char 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,     1,     2,     1,     1,
-       2,     1,     1,     1,     1,     2,     2,     2,     1,     1,
-       1,     1,     2,     2,     2,     1,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
-       2,     2,     2,     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,     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,     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,     3,
-       2,     2,     2,     2,     2,     2,     3,     2,     0,     1,
-       4,     3,     2,     1,     2,     2,     2,     1,     2,     1,
-       1,     1,     1,     2,     1,     2,     1,     2,     1,     1,
-       1,     1,     1,     1,     5,     1,     3,     2,     3,     3,
-       2,     1,     5,     4,     3,     1,     1,     2,     1,     6,
-       3,     2,     3,     3,     3,     3,     3
+       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,     1,     2,     1,     1,     2,
+       1,     1,     1,     1,     2,     2,     2,     1,     1,     1,
+       1,     2,     2,     2,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     1,     2,     2,
+       2,     2,     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,     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,     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,     3,     2,
+       2,     2,     2,     2,     2,     3,     2,     0,     1,     4,
+       3,     2,     1,     2,     2,     2,     1,     2,     1,     1,
+       1,     1,     2,     1,     2,     1,     2,     1,     1,     1,
+       1,     1,     1,     5,     1,     3,     2,     3,     3,     2,
+       1,     5,     4,     3,     1,     1,     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 unsigned char yydefact[] =
-{
-       0,     0,     0,     0,    23,    45,     0,     0,     0,     0,
-       0,     0,     0,     0,   165,     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,
-      49,   172,    46,   203,   202,   166,   167,    50,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    51,    58,
-     147,   148,   149,   150,   151,   152,   153,   144,   146,     0,
-       0,     0,   109,   128,   178,   143,    88,    89,    90,    91,
-      92,    93,     0,    28,    29,     0,    26,     0,    25,     6,
-      52,    53,   189,   192,   190,   191,   173,   187,     0,   171,
-     198,    47,    48,   196,   174,   170,    54,   113,   113,    25,
-      55,     0,   175,    83,    87,    84,   168,     0,     0,     0,
-       0,     0,     0,     0,   154,   156,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,    71,     0,
-     194,    56,   177,     1,     0,     4,    19,     0,    59,    66,
-      62,    64,    65,    60,    67,    68,    61,    63,    57,   145,
-     129,   130,   131,   127,   179,   169,   101,   100,     0,    98,
-      99,     0,    85,    95,    27,     0,     0,     0,     0,     0,
-       0,     0,     0,   132,   134,   164,   186,   188,   197,   195,
-     111,   110,     0,     0,    86,   157,   158,   159,   160,   161,
-     162,   163,   155,    81,    72,   201,   199,   200,    74,    73,
-      79,    77,    82,    78,    76,    80,    75,    70,     0,     0,
-     176,   183,   193,     3,    32,    33,    34,     0,     0,     0,
-       0,    38,    39,    40,    41,     0,     0,    18,    31,     0,
-       0,     0,     0,    96,   108,   104,   106,   102,   103,   105,
-     107,    97,    94,   139,   140,   141,   142,   138,   137,   135,
-     136,   133,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   114,   113,   181,   185,   184,   182,
-      35,    37,    36,    43,    42,    44,    30,     0,     0,     0,
-       0,     0,   211,     0,   207,   112,   180,   208,   209,     0,
-     206,   204,   210,     0,   216,   215,   214,     0,     0,     0,
-       0,     0,   218,     0,     0,   212,   217,   213,     0,     0,
+/* 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,    44,     0,     0,     0,     0,
+       0,     0,     0,     0,   164,     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,    48,
+     171,    45,   202,   201,   165,   166,    49,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    50,    57,   146,
+     147,   148,   149,   150,   151,   152,   143,   145,     0,     0,
+       0,   108,   127,   177,   142,    87,    88,    89,    90,    91,
+      92,     0,    27,    28,     0,    25,     0,    24,     5,    51,
+      52,   188,   191,   189,   190,   172,   186,     0,   170,   197,
+      46,    47,   195,   173,   169,    53,   112,   112,    24,    54,
+       0,   174,    82,    86,    83,   167,     0,     0,     0,     0,
+       0,     0,     0,   153,   155,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    68,    70,     0,   193,
+      55,   176,     0,     3,    18,     0,    58,    65,    61,    63,
+      64,    59,    66,    67,    60,    62,    56,   144,   128,   129,
+     130,   126,   178,   168,   100,    99,     0,    97,    98,     0,
+      84,    94,    26,     0,     0,     0,     0,     0,     0,     0,
+       0,   131,   133,   163,   185,   187,   196,   194,   110,   109,
+       0,     0,    85,   156,   157,   158,   159,   160,   161,   162,
+     154,    80,    71,   200,   198,   199,    73,    72,    78,    76,
+      81,    77,    75,    79,    74,    69,     0,     0,   175,   182,
+     192,     2,    31,    32,    33,     0,     0,     0,     0,    37,
+      38,    39,    40,     0,     0,    17,    30,     0,     0,     0,
+       0,    95,   107,   103,   105,   101,   102,   104,   106,    96,
+      93,   138,   139,   140,   141,   137,   136,   134,   135,   132,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   113,   112,   180,   184,   183,   181,    34,    36,
+      35,    42,    41,    43,    29,     0,     0,     0,     0,     0,
+     210,     0,   206,   111,   179,   207,   208,     0,   205,   203,
+     209,     0,   215,   214,   213,     0,     0,     0,     0,     0,
+     217,     0,     0,   211,   216,   212,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   219,     0,   221,   222,   223,   224,   225,   226,
-     220
+     218,     0,   220,   221,   222,   223,   224,   225,   219,     0,
+       0,     0
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
 static const short yydefgoto[] =
 {
-      -1,    43,    44,    45,    46,    47,   120,   108,   257,   258,
-      48,    49,    78,    79,    50,   157,   158,    51,   133,   102,
-     192,   193,   271,    52,   210,   294,    92,    93,    53,   203,
-     204,    54,    87,    88,    55,   144,   145,    56,   185,   132,
-     240,   241,   116,   117,   118,   161,   124,   121,   228,    65,
-      57,    58,   261,   262,   311,   312,   328,   313,   326,   331,
-     332,   345,   346
+     359,    43,    44,    45,    46,   119,   107,   255,   256,    47,
+      48,    77,    78,    49,   156,   157,    50,   132,   101,   190,
+     191,   269,    51,   208,   292,    91,    92,    52,   201,   202,
+      53,    86,    87,    54,   143,   144,    55,   183,   131,   238,
+     239,   115,   116,   117,   160,   123,   120,   226,    64,    56,
+      57,   259,   260,   309,   310,   326,   311,   324,   329,   330,
+     343,   344
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -133
 static const short yypact[] =
 {
-      25,  -120,   -30,   -14,  -133,   -55,   -24,   -10,    -9,   192,
-      54,    -2,   -76,    54,  -133,    53,   -40,   -75,   -72,   -63,
-      86,   -61,  -133,   -40,   -40,  -133,   -60,   -58,  -133,    17,
-     178,    19,  -133,   -48,    53,   -45,   -24,    14,   141,   -19,
-      28,    28,  -133,    87,   165,   -56,  -133,   -40,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -64,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -37,   -28,
-     -27,   -25,   -16,     0,     2,     6,     7,     8,   192,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,    54,  -133,    41,
-      62,    69,    -2,  -133,    89,    54,  -133,  -133,  -133,  -133,
-    -133,  -133,   -15,  -133,  -133,    20,  -133,   223,  -133,   310,
-    -133,  -133,  -133,  -133,  -133,  -133,    86,  -133,    29,  -133,
-    -133,   -40,   -40,  -133,    45,  -133,  -133,  -133,  -133,    80,
-    -133,    22,  -133,    53,  -133,  -133,  -133,   -24,   -24,   -24,
-     -24,   -24,   -24,   -24,    14,  -133,   119,   126,   -11,   130,
-     -24,   -24,   131,   -24,   -24,   134,   135,   141,  -133,   -39,
-    -133,   136,   136,  -133,    51,  -133,   327,  -110,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,    71,  -133,
-    -133,     9,   -15,  -133,  -133,   -11,   -11,   -11,   -11,    74,
-     140,   -24,   -24,   223,  -133,  -133,  -133,  -133,  -133,  -133,
-     387,   387,   -19,    75,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -19,   148,
-     -39,  -133,  -133,  -133,  -133,  -133,  -133,   152,   153,   161,
-     167,  -133,  -133,  -133,  -133,   168,   173,   327,  -133,    66,
-      78,    18,    93,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,   203,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,   -24,   -24,    96,
-     108,  -103,  -133,    95,  -133,   387,  -133,  -133,  -133,   -44,
-    -133,  -133,  -133,   113,  -133,  -133,  -133,    99,   118,   -24,
-     114,  -132,  -133,   128,   -24,  -133,  -133,  -133,   117,   106,
-     121,   122,   124,   132,   138,   207,   145,   -24,   -24,   -24,
-     -24,   -24,  -133,   146,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133
+       8,  -130,   -31,   -27,-32768,   -62,   -18,   -11,    -8,   190,
+      -2,    -3,   -77,    -2,-32768,    62,    40,   -66,   -60,   -54,
+      47,   -45,-32768,    40,    40,-32768,   -35,   -33,-32768,    30,
+      35,    32,-32768,   -17,    62,    -6,   -18,    22,   139,    15,
+      80,    80,-32768,   163,    -5,-32768,    40,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -15,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    21,    23,    33,
+      36,    46,    52,    53,    57,    58,    61,   190,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    -2,-32768,    93,   103,
+     133,    -3,-32768,   137,    -2,-32768,-32768,-32768,-32768,-32768,
+  -32768,   -10,-32768,-32768,    67,-32768,   221,-32768,   308,-32768,
+  -32768,-32768,-32768,-32768,-32768,    47,-32768,    69,-32768,-32768,
+      40,    40,-32768,    72,-32768,-32768,-32768,-32768,   128,-32768,
+      50,-32768,    62,-32768,-32768,-32768,   -18,   -18,   -18,   -18,
+     -18,   -18,   -18,    22,-32768,   150,   151,     3,   155,   -18,
+     -18,   159,   -18,   -18,   165,   166,   139,-32768,   -49,-32768,
+     169,   169,    75,-32768,   325,   -48,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    99,-32768,-32768,    28,
+     -10,-32768,-32768,     3,     3,     3,     3,   100,   172,   -18,
+     -18,   221,-32768,-32768,-32768,-32768,-32768,-32768,   385,   385,
+      15,   105,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    15,   175,   -49,-32768,
+  -32768,-32768,-32768,-32768,-32768,   179,   183,   184,   185,-32768,
+  -32768,-32768,-32768,   188,   189,   325,-32768,    91,    92,   -46,
+     106,-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,   222,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,   -18,   -18,    96,   108,  -108,
+  -32768,   101,-32768,   385,-32768,-32768,-32768,   -30,-32768,-32768,
+  -32768,   117,-32768,-32768,-32768,   112,   121,   -18,   118,  -102,
+  -32768,   130,   -18,-32768,-32768,-32768,   119,   104,   120,   132,
+     134,   136,   148,   205,   141,   -18,   -18,   -18,   -18,   -18,
+  -32768,   144,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   281,
+     292,-32768
 };
 
-/* YYPGOTO[NTERM-NUM].  */
 static const short yypgoto[] =
 {
-    -133,  -133,  -133,   -35,  -133,  -133,    83,   -29,  -133,    26,
-    -133,  -133,  -133,   211,  -133,  -133,   137,  -133,  -133,   -13,
-    -133,   112,  -133,  -133,  -126,  -133,  -133,   213,  -133,  -133,
-     103,  -133,   296,   -68,  -133,  -133,   174,  -133,  -133,  -133,
-    -133,    79,  -133,   204,  -133,   283,  -133,   301,    49,   -36,
-    -133,  -133,  -133,    67,  -133,    16,  -133,  -133,  -133,  -133,
-      -1,  -133,    -7
+  -32768,-32768,   -39,-32768,-32768,    12,   -29,-32768,    48,-32768,
+  -32768,-32768,   225,-32768,-32768,   160,-32768,-32768,    -1,-32768,
+     114,-32768,-32768,  -125,-32768,-32768,   216,-32768,-32768,   116,
+  -32768,   305,   -47,-32768,-32768,   180,-32768,-32768,-32768,-32768,
+      84,-32768,   210,-32768,   285,-32768,   303,   -41,   -36,-32768,
+  -32768,-32768,    73,-32768,    19,-32768,-32768,-32768,-32768,     7,
+  -32768,     0
 };
 
-/* 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, parse error.  */
-#define YYTABLE_NINF -7
+
+#define	YYLAST		522
+
+
 static const short yytable[] =
 {
-     136,   129,   211,   103,   104,    63,    89,   103,   104,   164,
-     159,   186,   264,   309,   105,   330,   238,   187,   137,   179,
-     188,   134,    59,   225,    60,   335,     1,   179,   103,   104,
-      64,     2,     3,   265,   259,   260,     4,     5,     6,    62,
-      61,     7,   138,   226,    66,    67,     8,     9,   189,    94,
-     109,    10,    11,   110,   321,    12,   139,    13,    14,    80,
-     140,    15,   111,    81,   119,   123,   239,   125,    16,    82,
-     190,   126,    96,   130,   205,    90,    97,   131,    17,    91,
-     135,   324,   160,    18,    19,   106,   165,   163,   168,    20,
-      21,   266,   167,    22,    23,   180,   267,   169,   170,   107,
-     171,   215,   216,   217,   218,   219,   220,   221,    24,   172,
-      83,   268,   141,   128,   230,   231,   181,   233,   234,    98,
-     214,   191,   227,   182,    25,   173,    26,   174,    27,    28,
-     166,   175,   176,   177,   309,    84,   142,   143,    29,    30,
-      31,    32,    33,   184,    34,   194,    35,   269,   270,    85,
-     212,   146,    36,    99,   207,    37,    38,    39,   147,    40,
-      41,   148,   259,   260,   100,   279,   280,    -6,    42,   315,
-     209,     2,     3,   223,    86,   213,     4,     5,     6,   101,
-     224,     7,   149,   295,   229,   232,     8,     9,   235,   236,
-     242,    10,    11,   243,   278,    12,   263,    13,    14,   277,
-     296,    15,   298,   127,   208,   208,   300,   301,    16,   297,
-      68,   112,   150,   151,   152,   302,   153,   154,    17,   307,
-     155,   303,   304,    18,    19,   103,   104,   305,   316,    20,
-      21,   308,   105,    22,    23,   314,    69,    70,   156,   113,
-     114,   115,    71,    72,   273,   274,   275,   276,    24,   319,
-     320,   323,   329,    73,   340,   341,   342,   343,   344,   327,
-     195,   196,   197,   198,    25,   330,    26,   334,    27,    28,
-     337,   317,   318,   339,   347,   348,    74,   349,    29,    30,
-      31,    32,    33,   306,    34,   350,    35,   354,   360,   178,
-     325,   351,    36,   333,   237,    37,    38,    39,   338,    40,
-      41,    75,    76,   106,   272,   183,   281,    -6,    42,    95,
-      77,   355,   356,   357,   358,   359,     2,     3,   222,   299,
-     206,     4,     5,     6,   162,   122,     7,   322,   310,     0,
-     336,     8,     9,   244,     0,   199,    10,    11,   353,     0,
-      12,   245,    13,    14,     0,     0,    15,   200,     0,     0,
-       0,   201,   202,    16,     0,   340,   341,   342,   343,   344,
-       0,     0,     0,    17,   352,     0,     0,     0,    18,    19,
-       0,     0,     0,     0,    20,    21,   246,     0,    22,    23,
-       0,     0,     0,     0,   247,     0,     0,     0,     0,     0,
-       0,     0,     0,    24,     0,     0,     0,     0,     0,     0,
-       0,   248,     0,     0,     0,   249,     0,   250,     0,    25,
-       0,    26,     0,    27,    28,     0,     0,   251,     0,     0,
-       0,     0,     0,    29,    30,    31,    32,    33,     0,    34,
-       0,    35,     0,     0,   252,   253,     0,    36,     0,   282,
-      37,    38,    39,     0,    40,    41,     0,   283,     0,   284,
-       0,     0,     0,    42,   285,     0,     0,     0,     0,     0,
-     254,     0,   255,     0,   256,     0,     0,     0,     0,     0,
-       0,     0,     0,   286,     0,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,     0,     0,     0,     0,     0,     0,
+     135,   128,   209,    79,   162,    88,   236,    80,   307,     1,
+     158,    62,    58,    81,     2,     3,   184,   102,   103,     4,
+       5,     6,   185,    59,     7,   186,   136,    60,   106,     8,
+       9,   262,    61,   133,    10,    11,    63,   223,    12,   177,
+      13,    14,   127,    65,    15,   328,    66,   177,    93,   319,
+     137,    16,   263,   187,    82,   333,   237,   224,   164,   108,
+     126,    17,   102,   103,   138,   109,    18,    19,   139,   203,
+     307,   110,    20,    21,    89,   188,    22,    23,    90,    83,
+     118,    95,   102,   103,   125,    96,   129,   102,   103,   104,
+     122,    24,   124,    84,   104,   322,   257,   258,   257,   258,
+     213,   214,   215,   216,   217,   218,   219,    25,   130,    26,
+     264,    27,    28,   228,   229,   265,   231,   232,    85,   134,
+     140,    29,    30,    31,    32,    33,   189,    34,    97,    35,
+     266,   212,   206,   206,   159,    36,   225,   163,    37,    38,
+      39,   165,    40,    41,   141,   142,   166,   178,   167,   145,
+      -5,    42,   271,   272,   273,   274,   146,   179,   168,   147,
+     105,   169,    98,   277,   278,   105,   267,   268,   313,     2,
+       3,   170,   111,    99,     4,     5,     6,   171,   172,     7,
+     148,   293,   173,   174,     8,     9,   175,   180,   100,    10,
+      11,   182,   192,    12,   205,    13,    14,   207,   210,    15,
+     112,   113,   114,   211,   221,   222,    16,   295,    67,   227,
+     149,   150,   151,   230,   152,   153,    17,   241,   154,   233,
+     234,    18,    19,   240,   261,   275,   276,    20,    21,   296,
+     294,    22,    23,   298,    68,    69,   155,   299,   300,   301,
+      70,    71,   302,   303,   305,   306,    24,   314,   312,   317,
+     318,    72,   338,   339,   340,   341,   342,   321,   193,   194,
+     195,   196,    25,   325,    26,   327,    27,    28,   328,   315,
+     316,   332,   335,   345,    73,   337,    29,    30,    31,    32,
+      33,   360,    34,   352,    35,   346,   358,   347,   323,   348,
+      36,   331,   361,    37,    38,    39,   336,    40,    41,    74,
+      75,   349,   176,   304,   270,    -5,    42,   181,    76,   353,
+     354,   355,   356,   357,     2,     3,   235,   279,    94,     4,
+       5,     6,   297,   220,     7,   204,   161,   121,   320,     8,
+       9,   242,   308,   197,    10,    11,   334,     0,    12,   243,
+      13,    14,     0,   351,    15,   198,     0,     0,     0,   199,
+     200,    16,     0,   338,   339,   340,   341,   342,     0,     0,
+       0,    17,   350,     0,     0,     0,    18,    19,     0,     0,
+       0,     0,    20,    21,   244,     0,    22,    23,     0,     0,
+       0,     0,   245,     0,     0,     0,     0,     0,     0,     0,
+       0,    24,     0,     0,     0,     0,     0,     0,     0,   246,
+       0,     0,     0,   247,     0,   248,     0,    25,     0,    26,
+       0,    27,    28,     0,     0,   249,     0,     0,     0,     0,
+       0,    29,    30,    31,    32,    33,     0,    34,     0,    35,
+       0,     0,   250,   251,     0,    36,     0,   280,    37,    38,
+      39,     0,    40,    41,     0,   281,     0,   282,     0,     0,
+       0,    42,   283,     0,     0,     0,     0,     0,   252,     0,
+     253,     0,   254,     0,     0,     0,     0,     0,     0,     0,
+       0,   284,     0,   285,   286,     0,   287,   288,   289,     0,
+       0,   290,     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,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   293
+       0,     0,   291
 };
 
 static const short yycheck[] =
 {
-      36,    30,   128,    47,    48,    29,     8,    47,    48,    44,
-      39,    26,     3,   116,    54,   147,    55,    32,     4,    87,
-      35,    34,   142,    34,    54,   157,     1,    95,    47,    48,
-      54,     6,     7,    24,   144,   145,    11,    12,    13,    94,
-      54,    16,    28,    54,    54,    54,    21,    22,    63,   125,
-     125,    26,    27,   125,   157,    30,    42,    32,    33,     5,
-      46,    36,   125,     9,   125,   125,   105,   125,    43,    15,
-      85,    54,    19,    54,   109,    77,    23,   125,    53,    81,
-     125,   125,    54,    58,    59,   125,   142,     0,   125,    64,
-      65,    82,   156,    68,    69,    54,    87,   125,   125,    16,
-     125,   137,   138,   139,   140,   141,   142,   143,    83,   125,
-      56,   102,    98,    30,   150,   151,    54,   153,   154,    66,
-     133,   136,   133,    54,    99,   125,   101,   125,   103,   104,
-      47,   125,   125,   125,   116,    81,   122,   123,   113,   114,
-     115,   116,   117,    54,   119,   125,   121,   138,   139,    95,
-      70,    10,   127,   100,   125,   130,   131,   132,    17,   134,
-     135,    20,   144,   145,   111,   201,   202,   142,   143,   295,
-     125,     6,     7,    54,   120,   153,    11,    12,    13,   126,
-      54,    16,    41,   212,    54,    54,    21,    22,    54,    54,
-      54,    26,    27,   142,    54,    30,   125,    32,    33,   125,
-     125,    36,    54,    25,   121,   122,    54,    54,    43,   238,
-      18,   125,    71,    72,    73,    54,    75,    76,    53,   153,
-      79,    54,    54,    58,    59,    47,    48,    54,    25,    64,
-      65,   153,    54,    68,    69,   142,    44,    45,    97,   153,
-     154,   155,    50,    51,   195,   196,   197,   198,    83,   153,
-     142,   156,   153,    61,   148,   149,   150,   151,   152,   146,
-      37,    38,    39,    40,    99,   147,   101,   153,   103,   104,
-     142,   307,   308,   156,   153,   153,    84,   153,   113,   114,
-     115,   116,   117,   257,   119,   153,   121,   142,   142,    78,
-     319,   153,   127,   329,   157,   130,   131,   132,   334,   134,
-     135,   109,   110,   125,   192,    92,   203,   142,   143,    13,
-     118,   347,   348,   349,   350,   351,     6,     7,   144,   240,
-     116,    11,    12,    13,    41,    24,    16,   311,   261,    -1,
-     331,    21,    22,     6,    -1,   112,    26,    27,   345,    -1,
-      30,    14,    32,    33,    -1,    -1,    36,   124,    -1,    -1,
-      -1,   128,   129,    43,    -1,   148,   149,   150,   151,   152,
-      -1,    -1,    -1,    53,   157,    -1,    -1,    -1,    58,    59,
-      -1,    -1,    -1,    -1,    64,    65,    49,    -1,    68,    69,
-      -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    74,    -1,    -1,    -1,    78,    -1,    80,    -1,    99,
-      -1,   101,    -1,   103,   104,    -1,    -1,    90,    -1,    -1,
-      -1,    -1,    -1,   113,   114,   115,   116,   117,    -1,   119,
-      -1,   121,    -1,    -1,   107,   108,    -1,   127,    -1,    52,
-     130,   131,   132,    -1,   134,   135,    -1,    60,    -1,    62,
-      -1,    -1,    -1,   143,    67,    -1,    -1,    -1,    -1,    -1,
-     133,    -1,   135,    -1,   137,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    88,    89,    -1,    91,    92,
-      93,    -1,    -1,    96,    -1,    -1,    -1,    -1,    -1,    -1,
+      36,    30,   127,     5,    43,     8,    55,     9,   116,     1,
+      39,    29,   142,    15,     6,     7,    26,    47,    48,    11,
+      12,    13,    32,    54,    16,    35,     4,    54,    16,    21,
+      22,     3,    94,    34,    26,    27,    54,    34,    30,    86,
+      32,    33,    30,    54,    36,   147,    54,    94,   125,   157,
+      28,    43,    24,    63,    56,   157,   105,    54,    46,   125,
+      25,    53,    47,    48,    42,   125,    58,    59,    46,   108,
+     116,   125,    64,    65,    77,    85,    68,    69,    81,    81,
+     125,    19,    47,    48,    54,    23,    54,    47,    48,    54,
+     125,    83,   125,    95,    54,   125,   144,   145,   144,   145,
+     136,   137,   138,   139,   140,   141,   142,    99,   125,   101,
+      82,   103,   104,   149,   150,    87,   152,   153,   120,   125,
+      98,   113,   114,   115,   116,   117,   136,   119,    66,   121,
+     102,   132,   120,   121,    54,   127,   133,   142,   130,   131,
+     132,   156,   134,   135,   122,   123,   125,    54,   125,    10,
+     142,   143,   193,   194,   195,   196,    17,    54,   125,    20,
+     125,   125,   100,   199,   200,   125,   138,   139,   293,     6,
+       7,   125,   125,   111,    11,    12,    13,   125,   125,    16,
+      41,   210,   125,   125,    21,    22,   125,    54,   126,    26,
+      27,    54,   125,    30,   125,    32,    33,   125,    70,    36,
+     153,   154,   155,   153,    54,    54,    43,   236,    18,    54,
+      71,    72,    73,    54,    75,    76,    53,   142,    79,    54,
+      54,    58,    59,    54,   125,   125,    54,    64,    65,    54,
+     125,    68,    69,    54,    44,    45,    97,    54,    54,    54,
+      50,    51,    54,    54,   153,   153,    83,    25,   142,   153,
+     142,    61,   148,   149,   150,   151,   152,   156,    37,    38,
+      39,    40,    99,   146,   101,   153,   103,   104,   147,   305,
+     306,   153,   142,   153,    84,   156,   113,   114,   115,   116,
+     117,     0,   119,   142,   121,   153,   142,   153,   317,   153,
+     127,   327,     0,   130,   131,   132,   332,   134,   135,   109,
+     110,   153,    77,   255,   190,   142,   143,    91,   118,   345,
+     346,   347,   348,   349,     6,     7,   156,   201,    13,    11,
+      12,    13,   238,   143,    16,   115,    41,    24,   309,    21,
+      22,     6,   259,   112,    26,    27,   329,    -1,    30,    14,
+      32,    33,    -1,   343,    36,   124,    -1,    -1,    -1,   128,
+     129,    43,    -1,   148,   149,   150,   151,   152,    -1,    -1,
+      -1,    53,   157,    -1,    -1,    -1,    58,    59,    -1,    -1,
+      -1,    -1,    64,    65,    49,    -1,    68,    69,    -1,    -1,
+      -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    83,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    74,
+      -1,    -1,    -1,    78,    -1,    80,    -1,    99,    -1,   101,
+      -1,   103,   104,    -1,    -1,    90,    -1,    -1,    -1,    -1,
+      -1,   113,   114,   115,   116,   117,    -1,   119,    -1,   121,
+      -1,    -1,   107,   108,    -1,   127,    -1,    52,   130,   131,
+     132,    -1,   134,   135,    -1,    60,    -1,    62,    -1,    -1,
+      -1,   143,    67,    -1,    -1,    -1,    -1,    -1,   133,    -1,
+     135,    -1,   137,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    86,    -1,    88,    89,    -1,    91,    92,    93,    -1,
+      -1,    96,    -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,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   137
+      -1,    -1,   137
 };
+/* -*-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.  */
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
-{
-       0,     1,     6,     7,    11,    12,    13,    16,    21,    22,
-      26,    27,    30,    32,    33,    36,    43,    53,    58,    59,
-      64,    65,    68,    69,    83,    99,   101,   103,   104,   113,
-     114,   115,   116,   117,   119,   121,   127,   130,   131,   132,
-     134,   135,   143,   159,   160,   161,   162,   163,   168,   169,
-     172,   175,   181,   186,   189,   192,   195,   208,   209,   142,
-      54,    54,    94,    29,    54,   207,    54,    54,    18,    44,
-      45,    50,    51,    61,    84,   109,   110,   118,   170,   171,
-       5,     9,    15,    56,    81,    95,   120,   190,   191,     8,
-      77,    81,   184,   185,   125,   190,    19,    23,    66,   100,
-     111,   126,   177,    47,    48,    54,   125,   164,   165,   125,
-     125,   125,   125,   153,   154,   155,   200,   201,   202,   125,
-     164,   205,   205,   125,   204,   125,    54,    25,   164,   165,
-      54,   125,   197,   176,   177,   125,   207,     4,    28,    42,
-      46,    98,   122,   123,   193,   194,    10,    17,    20,    41,
-      71,    72,    73,    75,    76,    79,    97,   173,   174,   165,
-      54,   203,   203,     0,   161,   142,   164,   156,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   171,   191,
-      54,    54,    54,   185,    54,   196,    26,    32,    35,    63,
-      85,   136,   178,   179,   125,    37,    38,    39,    40,   112,
-     124,   128,   129,   187,   188,   161,   201,   125,   164,   125,
-     182,   182,    70,   153,   177,   207,   207,   207,   207,   207,
-     207,   207,   194,    54,    54,    34,    54,   133,   206,    54,
-     207,   207,    54,   207,   207,    54,    54,   174,    55,   105,
-     198,   199,    54,   142,     6,    14,    49,    57,    74,    78,
-      80,    90,   107,   108,   133,   135,   137,   166,   167,   144,
-     145,   210,   211,   125,     3,    24,    82,    87,   102,   138,
-     139,   180,   179,   206,   206,   206,   206,   125,    54,   207,
-     207,   188,    52,    60,    62,    67,    86,    88,    89,    91,
-      92,    93,    96,   137,   183,   165,   125,   165,    54,   199,
-      54,    54,    54,    54,    54,    54,   167,   153,   153,   116,
-     211,   212,   213,   215,   142,   182,    25,   207,   207,   153,
-     142,   157,   213,   156,   125,   165,   216,   146,   214,   153,
-     147,   217,   218,   207,   153,   157,   218,   142,   207,   156,
-     148,   149,   150,   151,   152,   219,   220,   153,   153,   153,
-     153,   153,   157,   220,   142,   207,   207,   207,   207,   207,
-     142
+/* 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)))
+
+/* 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
@@ -1183,19 +909,14 @@ static const unsigned char yystos[] =
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
+#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)				\
@@ -1216,20 +937,41 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
+
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
+   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.  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)           \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# 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.  */
 
-#define YYLEX	yylex ()
+#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
@@ -1244,17 +986,11 @@ do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
 } while (0)
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} 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 YYDSYMPRINT(Args)
 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
@@ -1276,10 +1012,8 @@ int yydebug;
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
-
 
-
-#if YYERROR_VERBOSE
+#ifdef YYERROR_VERBOSE
 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)
@@ -1329,73 +1063,10 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
-
-#endif /* !YYERROR_VERBOSE */
-
-
-
-#if YYDEBUG
-/*-----------------------------.
-| Print this symbol on YYOUT.  |
-`-----------------------------*/
-
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue)
-#else
-yysymprint (yyout, yytype, yyvalue)
-    FILE* yyout;
-    int yytype;
-    YYSTYPE yyvalue;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
-
-  if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyout, yytoknum[yytype], yyvalue);
-# endif
-    }
-  else
-    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-  YYFPRINTF (yyout, ")");
-}
-#endif /* YYDEBUG. */
-
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yydestruct (int yytype, YYSTYPE yyvalue)
-#else
-yydestruct (yytype, yyvalue)
-    int yytype;
-    YYSTYPE yyvalue;
 #endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
-
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-}
-
 
+#line 315 "/usr/local/gnu/share/bison/bison.simple"
+
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -1425,22 +1096,46 @@ int yyparse (void);
 # endif
 #endif
 
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
 
-/* The lookahead symbol.  */
-int yychar;
+#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;
 
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES			\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES
+#endif
 
-/* Number of parse errors so far.  */
-int yynerrs;
 
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
 
 int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
-  
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
   int yyresult;
@@ -1457,7 +1152,7 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack.  */
+  /* The state stack. */
   short	yyssa[YYINITDEPTH];
   short *yyss = yyssa;
   register short *yyssp;
@@ -1467,19 +1162,31 @@ yyparse (YYPARSE_PARAM_ARG)
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+#endif
 
-
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#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
 
   /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
+     rule. */
   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1496,7 +1203,9 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
-
+#if YYLSP_NEEDED
+  yylsp = yyls;
+#endif
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1524,17 +1233,24 @@ yyparse (YYPARSE_PARAM_ARG)
 	YYSTYPE *yyvs1 = yyvs;
 	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.  */
+	   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;
       }
@@ -1557,8 +1273,10 @@ yyparse (YYPARSE_PARAM_ARG)
 	  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);
       }
@@ -1567,7 +1285,9 @@ 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));
@@ -1580,6 +1300,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
@@ -1592,7 +1313,7 @@ yybackup:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yyn == YYFLAG)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1606,12 +1327,12 @@ yybackup:
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with.  */
+  /* Convert token to internal form (in yychar1) for indexing tables with */
 
-  if (yychar <= 0)		/* This means end of input.  */
+  if (yychar <= 0)		/* This means end of input. */
     {
       yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more.  */
+      yychar = YYEOF;		/* Don't call YYLEX any more */
 
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
@@ -1619,26 +1340,45 @@ yybackup:
     {
       yychar1 = YYTRANSLATE (yychar);
 
-      /* We have to keep this `#if YYDEBUG', since we use variables
-	 which are defined only if `YYDEBUG' is set.  */
-      YYDPRINTF ((stderr, "Next token is "));
-      YYDSYMPRINT ((stderr, yychar1, yylval));
-      YYDPRINTF ((stderr, "\n"));
+#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 YYCHAR1 is to reduce or to
-     detect an error, take that action.  */
   yyn += yychar1;
-  if (yyn < 0 || YYLAST < yyn || yycheck[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;
@@ -1652,7 +1392,9 @@ yybackup:
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
@@ -1683,14 +1425,19 @@ 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
 
 #if YYDEBUG
   /* We have to keep this `#if YYDEBUG', since we use variables which
@@ -1700,81 +1447,72 @@ yyreduce:
       int yyi;
 
       YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn - 1, yyrline[yyn]);
+		 yyn, yyrline[yyn]);
 
       /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
+      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 5:
-#line 309 "ntp_parser.y"
-    { 
+
+  switch (yyn) {
+
+case 4:
+#line 311 "ntp_parser.y"
+{ 
                     fprintf(stderr, "PARSE ERROR!! At Line: %d\n", 
                             ip_file->line_no);
                     fprintf(stderr, "Line Ignored!!\n");
                 }
     break;
-
-  case 18:
-#line 336 "ntp_parser.y"
-    { 
+case 17:
+#line 338 "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 342 "ntp_parser.y"
-    { 
+case 18:
+#line 344 "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 350 "ntp_parser.y"
-    { yyval.Integer = T_Server; }
-    break;
-
-  case 21:
-#line 351 "ntp_parser.y"
-    { yyval.Integer = T_Pool; }
-    break;
-
-  case 22:
+case 19:
 #line 352 "ntp_parser.y"
-    { yyval.Integer = T_Peer; }
+{ yyval.Integer = T_Server; }
     break;
-
-  case 23:
+case 20:
 #line 353 "ntp_parser.y"
-    { yyval.Integer = T_Broadcast; }
+{ yyval.Integer = T_Pool; }
     break;
-
-  case 24:
+case 21:
 #line 354 "ntp_parser.y"
-    { yyval.Integer = T_Manycastclient; }
+{ yyval.Integer = T_Peer; }
     break;
-
-  case 25:
-#line 358 "ntp_parser.y"
-    { yyval.Address_node = yyvsp[0].Address_node; }
+case 22:
+#line 355 "ntp_parser.y"
+{ yyval.Integer = T_Broadcast; }
     break;
-
-  case 26:
-#line 359 "ntp_parser.y"
-    { yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+case 23:
+#line 356 "ntp_parser.y"
+{ yyval.Integer = T_Manycastclient; }
     break;
-
-  case 27:
+case 24:
+#line 360 "ntp_parser.y"
+{ yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+case 25:
 #line 361 "ntp_parser.y"
-    {
+{ yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+    break;
+case 26:
+#line 363 "ntp_parser.y"
+{
                         if (yyvsp[-1].Integer == -4)
                             yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET);
                         else if (yyvsp[-1].Integer == -6)
@@ -1785,706 +1523,569 @@ yyreduce:
                         }
                     }
     break;
-
-  case 28:
-#line 376 "ntp_parser.y"
-    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
-    break;
-
-  case 29:
-#line 377 "ntp_parser.y"
-    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
-    break;
-
-  case 30:
-#line 381 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
-    break;
-
-  case 31:
-#line 382 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
-    break;
-
-  case 32:
-#line 387 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
+case 27:
+#line 378 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
+    break;
+case 28:
+#line 379 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
+    break;
+case 29:
+#line 383 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+case 30:
+#line 384 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 33:
-#line 388 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
-    break;
-
-  case 34:
+case 31:
 #line 389 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
     break;
-
-  case 35:
+case 32:
 #line 390 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
-
-  case 36:
+case 33:
 #line 391 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
-
-  case 37:
+case 34:
 #line 392 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
-
-  case 38:
+case 35:
 #line 393 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
+{ yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
-
-  case 39:
+case 36:
 #line 394 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
+{ yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
-
-  case 40:
+case 37:
 #line 395 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
-
-  case 41:
+case 38:
 #line 396 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
-
-  case 42:
+case 39:
 #line 397 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
-
-  case 43:
+case 40:
 #line 398 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
-
-  case 44:
+case 41:
 #line 399 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
-
-  case 45:
-#line 410 "ntp_parser.y"
-    { my_config.broadcastclient = SIMPLE; }
+case 42:
+#line 400 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
     break;
-
-  case 46:
+case 43:
+#line 401 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    break;
+case 44:
 #line 412 "ntp_parser.y"
-    { my_config.broadcastclient = NOVOLLEY;  }
+{ my_config.broadcastclient = SIMPLE; }
     break;
-
-  case 47:
+case 45:
 #line 414 "ntp_parser.y"
-    { append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
+{ my_config.broadcastclient = NOVOLLEY;  }
     break;
-
-  case 48:
+case 46:
 #line 416 "ntp_parser.y"
-    { append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
+{ append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
     break;
-
-  case 49:
-#line 427 "ntp_parser.y"
-    { my_config.auth.autokey = yyvsp[0].Integer;  }
+case 47:
+#line 418 "ntp_parser.y"
+{ append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
     break;
-
-  case 50:
+case 48:
 #line 429 "ntp_parser.y"
-    { my_config.auth.control_key = yyvsp[0].Integer;  }
+{ my_config.auth.autokey = yyvsp[0].Integer;  }
     break;
-
-  case 51:
+case 49:
 #line 431 "ntp_parser.y"
-    { if (my_config.auth.crypto_cmd_list != NULL) 
+{ my_config.auth.control_key = yyvsp[0].Integer;  }
+    break;
+case 50:
+#line 433 "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[0].Queue;
 			}
     break;
-
-  case 52:
-#line 437 "ntp_parser.y"
-    { my_config.auth.keys = yyvsp[0].String;  }
-    break;
-
-  case 53:
+case 51:
 #line 439 "ntp_parser.y"
-    { my_config.auth.keysdir = yyvsp[0].String;  }
+{ my_config.auth.keys = yyvsp[0].String;  }
     break;
-
-  case 54:
+case 52:
 #line 441 "ntp_parser.y"
-    { my_config.auth.requested_key = yyvsp[0].Integer;  }
+{ my_config.auth.keysdir = yyvsp[0].String;  }
     break;
-
-  case 55:
+case 53:
 #line 443 "ntp_parser.y"
-    { my_config.auth.revoke = yyvsp[0].Integer;  }
+{ my_config.auth.requested_key = yyvsp[0].Integer;  }
     break;
-
-  case 56:
+case 54:
 #line 445 "ntp_parser.y"
-    { my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+{ my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
-
-  case 57:
-#line 449 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 55:
+#line 447 "ntp_parser.y"
+{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
     break;
-
-  case 58:
-#line 450 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 56:
+#line 451 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 59:
-#line 455 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
+case 57:
+#line 452 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 60:
+case 58:
 #line 457 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
     break;
-
-  case 61:
+case 59:
 #line 459 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
     break;
-
-  case 62:
+case 60:
 #line 461 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
-
-  case 63:
+case 61:
 #line 463 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
-
-  case 64:
+case 62:
 #line 465 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
-
-  case 65:
+case 63:
 #line 467 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
-
-  case 66:
+case 64:
 #line 469 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
     break;
-
-  case 67:
+case 65:
 #line 471 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
     break;
-
-  case 68:
+case 66:
 #line 473 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
     break;
-
-  case 69:
-#line 483 "ntp_parser.y"
-    { append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
+case 67:
+#line 475 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
-
-  case 70:
-#line 487 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 68:
+#line 485 "ntp_parser.y"
+{ append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
-
-  case 71:
-#line 488 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 69:
+#line 489 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 72:
-#line 493 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
+case 70:
+#line 490 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 73:
+case 71:
 #line 495 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
     break;
-
-  case 74:
+case 72:
 #line 497 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
     break;
-
-  case 75:
+case 73:
 #line 499 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
     break;
-
-  case 76:
+case 74:
 #line 501 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
     break;
-
-  case 77:
+case 75:
 #line 503 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
     break;
-
-  case 78:
+case 76:
 #line 505 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
     break;
-
-  case 79:
+case 77:
 #line 507 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
     break;
-
-  case 80:
+case 78:
 #line 509 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
     break;
-
-  case 81:
+case 79:
 #line 511 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
     break;
-
-  case 82:
+case 80:
 #line 513 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
     break;
-
-  case 83:
-#line 523 "ntp_parser.y"
-    { append_queue(my_config.stats_list, yyvsp[0].Queue);  }
+case 81:
+#line 515 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
     break;
-
-  case 84:
+case 82:
 #line 525 "ntp_parser.y"
-    { my_config.stats_dir = yyvsp[0].String;  }
+{ append_queue(my_config.stats_list, yyvsp[0].Queue);  }
     break;
-
-  case 85:
+case 83:
 #line 527 "ntp_parser.y"
-    {
+{ my_config.stats_dir = yyvsp[0].String;  }
+    break;
+case 84:
+#line 529 "ntp_parser.y"
+{
                         enqueue(my_config.filegen_opts, 
                                 create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));                         
                     }
     break;
-
-  case 86:
-#line 534 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
-    break;
-
-  case 87:
-#line 535 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
-    break;
-
-  case 88:
-#line 540 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("clockstats"); }
+case 85:
+#line 536 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
+    break;
+case 86:
+#line 537 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
-
-  case 89:
+case 87:
 #line 542 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("cryptostats"); }
+{ yyval.VoidPtr = create_pval("clockstats"); }
     break;
-
-  case 90:
+case 88:
 #line 544 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("loopstats"); }
+{ yyval.VoidPtr = create_pval("cryptostats"); }
     break;
-
-  case 91:
+case 89:
 #line 546 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("peerstats"); }
+{ yyval.VoidPtr = create_pval("loopstats"); }
     break;
-
-  case 92:
+case 90:
 #line 548 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("rawstats"); }
+{ yyval.VoidPtr = create_pval("peerstats"); }
     break;
-
-  case 93:
+case 91:
 #line 550 "ntp_parser.y"
-    { yyval.VoidPtr = create_pval("sysstats"); }
+{ yyval.VoidPtr = create_pval("rawstats"); }
     break;
-
-  case 94:
-#line 554 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 92:
+#line 552 "ntp_parser.y"
+{ yyval.VoidPtr = create_pval("sysstats"); }
     break;
-
-  case 95:
-#line 555 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 93:
+#line 556 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 96:
-#line 559 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
+case 94:
+#line 557 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 97:
-#line 560 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
-    break;
-
-  case 98:
+case 95:
 #line 561 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
+{ yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
-
-  case 99:
+case 96:
 #line 562 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
+{ yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
-
-  case 100:
+case 97:
 #line 563 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
-
-  case 101:
+case 98:
 #line 564 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
-
-  case 102:
-#line 568 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_NONE; }
+case 99:
+#line 565 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
-
-  case 103:
-#line 569 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_PID; }
+case 100:
+#line 566 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
-
-  case 104:
+case 101:
 #line 570 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_DAY; }
+{ yyval.Integer = FILEGEN_NONE; }
     break;
-
-  case 105:
+case 102:
 #line 571 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_WEEK; }
+{ yyval.Integer = FILEGEN_PID; }
     break;
-
-  case 106:
+case 103:
 #line 572 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_MONTH; }
+{ yyval.Integer = FILEGEN_DAY; }
     break;
-
-  case 107:
+case 104:
 #line 573 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_YEAR; }
+{ yyval.Integer = FILEGEN_WEEK; }
     break;
-
-  case 108:
+case 105:
 #line 574 "ntp_parser.y"
-    { yyval.Integer = FILEGEN_AGE; }
+{ yyval.Integer = FILEGEN_MONTH; }
     break;
-
-  case 109:
-#line 584 "ntp_parser.y"
-    {   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+case 106:
+#line 575 "ntp_parser.y"
+{ yyval.Integer = FILEGEN_YEAR; }
     break;
-
-  case 110:
+case 107:
+#line 576 "ntp_parser.y"
+{ yyval.Integer = FILEGEN_AGE; }
+    break;
+case 108:
 #line 586 "ntp_parser.y"
-    { 
+{   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+    break;
+case 109:
+#line 588 "ntp_parser.y"
+{ 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(yyvsp[-1].Address_node, NULL, yyvsp[0].Queue, ip_file->line_no));                          
                     }
     break;
-
-  case 111:
-#line 591 "ntp_parser.y"
-    { 
+case 110:
+#line 593 "ntp_parser.y"
+{ 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no)); 
                     }
     break;
-
-  case 112:
-#line 596 "ntp_parser.y"
-    { 
+case 111:
+#line 598 "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)); 
                     }
     break;
-
-  case 113:
-#line 603 "ntp_parser.y"
-    { yyval.Queue = create_queue(); }
-    break;
-
-  case 114:
-#line 604 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
-    break;
-
-  case 115:
-#line 608 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_IGNORE); }
-    break;
-
-  case 116:
-#line 609 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
+case 112:
+#line 605 "ntp_parser.y"
+{ yyval.Queue = create_queue(); }
+    break;
+case 113:
+#line 606 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-
-  case 117:
+case 114:
 #line 610 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_LIMITED); }
+{ yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
-
-  case 118:
+case 115:
 #line 611 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_LPTRAP); }
+{ yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
     break;
-
-  case 119:
+case 116:
 #line 612 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_NOMODIFY); }
+{ yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
-
-  case 120:
+case 117:
 #line 613 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_NOPEER); }
+{ yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
-
-  case 121:
+case 118:
 #line 614 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_NOQUERY); }
+{ yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
-
-  case 122:
+case 119:
 #line 615 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_DONTSERVE); }
+{ yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
-
-  case 123:
+case 120:
 #line 616 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_NOTRAP); }
+{ yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
-
-  case 124:
+case 121:
 #line 617 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_DONTTRUST); }
+{ yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
-
-  case 125:
+case 122:
 #line 618 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RESM_NTPONLY); }
+{ yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
-
-  case 126:
+case 123:
 #line 619 "ntp_parser.y"
-    { yyval.VoidPtr = create_ival(RES_VERSION); }
+{ yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
-
-  case 127:
-#line 623 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 124:
+#line 620 "ntp_parser.y"
+{ yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
-
-  case 128:
-#line 624 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 125:
+#line 621 "ntp_parser.y"
+{ yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
-
-  case 129:
-#line 628 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
+case 126:
+#line 625 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 130:
-#line 629 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
+case 127:
+#line 626 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 131:
+case 128:
 #line 630 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
-
-  case 132:
-#line 639 "ntp_parser.y"
-    { enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+case 129:
+#line 631 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
-
-  case 133:
-#line 643 "ntp_parser.y"
-    { enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 130:
+#line 632 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
-
-  case 134:
-#line 644 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 131:
+#line 641 "ntp_parser.y"
+{ enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-
-  case 135:
-#line 649 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
+case 132:
+#line 645 "ntp_parser.y"
+{ enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 136:
+case 133:
+#line 646 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    break;
+case 134:
 #line 651 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
-
-  case 137:
+case 135:
 #line 653 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
-
-  case 138:
+case 136:
 #line 655 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
-
-  case 139:
+case 137:
 #line 657 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
-
-  case 140:
+case 138:
 #line 659 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
-
-  case 141:
+case 139:
 #line 661 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
-
-  case 142:
+case 140:
 #line 663 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
-
-  case 143:
-#line 672 "ntp_parser.y"
-    { append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
+case 141:
+#line 665 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
-
-  case 144:
+case 142:
 #line 674 "ntp_parser.y"
-    { append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
-    break;
-
-  case 145:
-#line 678 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+{ append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
-
-  case 146:
-#line 679 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 143:
+#line 676 "ntp_parser.y"
+{ append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
-
-  case 147:
-#line 683 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
+case 144:
+#line 680 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 148:
-#line 684 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
+case 145:
+#line 681 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 149:
+case 146:
 #line 685 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
-
-  case 150:
+case 147:
 #line 686 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
-
-  case 151:
+case 148:
 #line 687 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
-
-  case 152:
+case 149:
 #line 688 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
-
-  case 153:
-#line 690 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
+case 150:
+#line 689 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
-
-  case 154:
-#line 698 "ntp_parser.y"
-    { append_queue(my_config.tinker, yyvsp[0].Queue);  }
+case 151:
+#line 690 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
-
-  case 155:
-#line 702 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 152:
+#line 692 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
-
-  case 156:
-#line 703 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 153:
+#line 700 "ntp_parser.y"
+{ append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
-
-  case 157:
-#line 707 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
+case 154:
+#line 704 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 158:
-#line 708 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
+case 155:
+#line 705 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 159:
+case 156:
 #line 709 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
-
-  case 160:
+case 157:
 #line 710 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
-
-  case 161:
+case 158:
 #line 711 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
-
-  case 162:
+case 159:
 #line 712 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
-
-  case 163:
+case 160:
 #line 713 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
     break;
-
-  case 164:
-#line 722 "ntp_parser.y"
-    {
+case 161:
+#line 714 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+    break;
+case 162:
+#line 715 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    break;
+case 163:
+#line 724 "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.");
@@ -2500,133 +2101,108 @@ yyreduce:
                     }
                 }
     break;
-
-  case 165:
-#line 738 "ntp_parser.y"
-    {
+case 164:
+#line 740 "ntp_parser.y"
+{
                     while (curr_include_level != -1) 
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
-
-  case 166:
-#line 744 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
-    break;
-
-  case 167:
+case 165:
 #line 746 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
+{ enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
     break;
-
-  case 168:
+case 166:
 #line 748 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
+{ enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
     break;
-
-  case 169:
+case 167:
 #line 750 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
+{ enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
     break;
-
-  case 170:
-#line 753 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
+case 168:
+#line 752 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
     break;
-
-  case 171:
+case 169:
 #line 755 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
+{ enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
     break;
-
-  case 172:
+case 170:
 #line 757 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
+{ enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
     break;
-
-  case 173:
-#line 760 "ntp_parser.y"
-    { append_queue(my_config.logconfig, yyvsp[0].Queue);  }
+case 171:
+#line 759 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
     break;
-
-  case 174:
+case 172:
 #line 762 "ntp_parser.y"
-    { append_queue(my_config.phone, yyvsp[0].Queue);  }
+{ append_queue(my_config.logconfig, yyvsp[0].Queue);  }
     break;
-
-  case 175:
+case 173:
 #line 764 "ntp_parser.y"
-    { enqueue(my_config.setvar, yyvsp[0].Set_var);  }
+{ append_queue(my_config.phone, yyvsp[0].Queue);  }
     break;
-
-  case 176:
+case 174:
 #line 766 "ntp_parser.y"
-    { enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+{ enqueue(my_config.setvar, yyvsp[0].Set_var);  }
     break;
-
-  case 177:
+case 175:
 #line 768 "ntp_parser.y"
-    { append_queue(my_config.ttl, yyvsp[0].Queue); }
+{ enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-
-  case 178:
-#line 771 "ntp_parser.y"
-    { /* Null command */ }
+case 176:
+#line 770 "ntp_parser.y"
+{ append_queue(my_config.ttl, yyvsp[0].Queue); }
     break;
-
-  case 179:
+case 177:
 #line 773 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); }
+{ /* Null command */ }
     break;
-
-  case 180:
-#line 778 "ntp_parser.y"
-    { yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+case 178:
+#line 775 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); }
     break;
-
-  case 181:
+case 179:
 #line 780 "ntp_parser.y"
-    { yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
     break;
-
-  case 182:
-#line 785 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 180:
+#line 782 "ntp_parser.y"
+{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
     break;
-
-  case 183:
-#line 786 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 181:
+#line 787 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 184:
-#line 790 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+case 182:
+#line 788 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 185:
-#line 791 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+case 183:
+#line 792 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
     break;
-
-  case 186:
-#line 796 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+case 184:
+#line 793 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
     break;
-
-  case 187:
-#line 797 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+case 185:
+#line 798 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-
-  case 188:
-#line 801 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+case 186:
+#line 799 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-
-  case 189:
+case 187:
 #line 803 "ntp_parser.y"
-    { 
+{ yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+    break;
+case 188:
+#line 805 "ntp_parser.y"
+{ 
                     /* YUCK!! This is needed because '+' and '-' are not special characters 
                      * while '=' is. 
                      * We really need a better way of defining strings
@@ -2640,55 +2216,45 @@ yyreduce:
                         yyval.Attr_val = create_attr_sval(prefix, type);
                 }
     break;
-
-  case 190:
-#line 819 "ntp_parser.y"
-    { yyval.Integer = '+'; }
-    break;
-
-  case 191:
-#line 820 "ntp_parser.y"
-    { yyval.Integer = '-'; }
-    break;
-
-  case 192:
+case 189:
 #line 821 "ntp_parser.y"
-    { yyval.Integer = '='; }
-    break;
-
-  case 193:
-#line 830 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+{ yyval.Integer = '+'; }
     break;
-
-  case 194:
-#line 831 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
-    break;
-
-  case 195:
-#line 835 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
-    break;
-
-  case 196:
-#line 836 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
-    break;
-
-  case 197:
-#line 840 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
-    break;
-
-  case 198:
-#line 841 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
-    break;
-
-  case 199:
-#line 846 "ntp_parser.y"
-    { 
+case 190:
+#line 822 "ntp_parser.y"
+{ yyval.Integer = '-'; }
+    break;
+case 191:
+#line 823 "ntp_parser.y"
+{ yyval.Integer = '='; }
+    break;
+case 192:
+#line 832 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+    break;
+case 193:
+#line 833 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
+    break;
+case 194:
+#line 837 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
+    break;
+case 195:
+#line 838 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
+    break;
+case 196:
+#line 842 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
+    break;
+case 197:
+#line 843 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
+    break;
+case 198:
+#line 848 "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;
@@ -2697,156 +2263,129 @@ yyreduce:
                         yyval.Integer = yyvsp[0].Integer; 
                 }
     break;
-
-  case 200:
-#line 854 "ntp_parser.y"
-    { yyval.Integer = 1; }
-    break;
-
-  case 201:
-#line 855 "ntp_parser.y"
-    { yyval.Integer = 0; }
-    break;
-
-  case 202:
-#line 859 "ntp_parser.y"
-    { yyval.Double = (double)yyvsp[0].Integer; }
+case 199:
+#line 856 "ntp_parser.y"
+{ yyval.Integer = 1; }
+    break;
+case 200:
+#line 857 "ntp_parser.y"
+{ yyval.Integer = 0; }
+    break;
+case 201:
+#line 861 "ntp_parser.y"
+{ yyval.Double = (double)yyvsp[0].Integer; }
+    break;
+case 202:
+#line 862 "ntp_parser.y"
+{ yyval.Double = yyvsp[0].Double; }
     break;
-
-  case 203:
-#line 860 "ntp_parser.y"
-    { yyval.Double = yyvsp[0].Double; }
-    break;
-
-  case 204:
-#line 869 "ntp_parser.y"
-    {
+case 203:
+#line 871 "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 205:
-#line 883 "ntp_parser.y"
-    { old_config_style = 0; }
-    break;
-
-  case 206:
-#line 887 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-
-  case 207:
-#line 888 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+case 204:
+#line 885 "ntp_parser.y"
+{ old_config_style = 0; }
+    break;
+case 205:
+#line 889 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+case 206:
+#line 890 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    break;
+case 207:
+#line 894 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+    break;
+case 208:
+#line 895 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+    break;
+case 209:
+#line 899 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+    break;
+case 210:
+#line 900 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+    break;
+case 211:
+#line 905 "ntp_parser.y"
+{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
+    break;
+case 212:
+#line 909 "ntp_parser.y"
+{ yyval.Double = yyvsp[-1].Double; }
+    break;
+case 213:
+#line 913 "ntp_parser.y"
+{ yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+case 214:
+#line 917 "ntp_parser.y"
+{ yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+case 215:
+#line 918 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
+    break;
+case 216:
+#line 922 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+    break;
+case 217:
+#line 923 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+    break;
+case 218:
+#line 928 "ntp_parser.y"
+{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+    break;
+case 219:
+#line 932 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+case 220:
+#line 933 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
-
-  case 208:
-#line 892 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
-    break;
-
-  case 209:
-#line 893 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
-    break;
-
-  case 210:
-#line 897 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
-    break;
-
-  case 211:
-#line 898 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
-    break;
-
-  case 212:
-#line 903 "ntp_parser.y"
-    { yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
-    break;
-
-  case 213:
-#line 907 "ntp_parser.y"
-    { yyval.Double = yyvsp[-1].Double; }
-    break;
-
-  case 214:
-#line 911 "ntp_parser.y"
-    { yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-
-  case 215:
-#line 915 "ntp_parser.y"
-    { yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-
-  case 216:
-#line 916 "ntp_parser.y"
-    { yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
-    break;
-
-  case 217:
-#line 920 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
-    break;
-
-  case 218:
-#line 921 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
-    break;
-
-  case 219:
-#line 926 "ntp_parser.y"
-    { yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
-    break;
-
-  case 220:
-#line 930 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-
-  case 221:
-#line 931 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
-    break;
-
-  case 222:
-#line 936 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
-    break;
-
-  case 223:
+case 221:
 #line 938 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
     break;
-
-  case 224:
+case 222:
 #line 940 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
     break;
-
-  case 225:
+case 223:
 #line 942 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
     break;
-
-  case 226:
+case 224:
 #line 944 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
     break;
+case 225:
+#line 946 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+    break;
+}
 
+#line 705 "/usr/local/gnu/share/bison/bison.simple"
 
-    }
-
-/* Line 1016 of /usr/local/share/bison/yacc.c.  */
-#line 2846 "ntp_parser.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-
+#if YYLSP_NEEDED
+  yylsp -= yylen;
+#endif
 
 #if YYDEBUG
   if (yydebug)
@@ -2860,7 +2399,9 @@ yyreduce:
 #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
@@ -2868,11 +2409,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;
 
@@ -2885,13 +2426,13 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
+
+#ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
+      if (yyn > YYFLAG && yyn < YYLAST)
 	{
 	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
 	  char *yymsg;
 	  int yyx, yycount;
 
@@ -2900,15 +2441,15 @@ yyerrlab:
 	     YYCHECK.  */
 	  for (yyx = yyn < 0 ? -yyn : 0;
 	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	    if (yycheck[yyx + yyn] == yyx)
 	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
 	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
+	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
 	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
+	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
 
 	      if (yycount < 5)
 		{
@@ -2916,7 +2457,7 @@ yyerrlab:
 		  for (yyx = yyn < 0 ? -yyn : 0;
 		       yyx < (int) (sizeof (yytname) / sizeof (char *));
 		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+		    if (yycheck[yyx + yyn] == yyx)
 		      {
 			const char *yyq = ! yycount ? ", expecting " : " or ";
 			yyp = yystpcpy (yyp, yyq);
@@ -2931,90 +2472,99 @@ yyerrlab:
 	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* YYERROR_VERBOSE */
+#endif /* defined (YYERROR_VERBOSE) */
 	yyerror ("parse error");
     }
   goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
 yyerrlab1:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
+      /* return failure if at end of input */
       if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyssp > yyss)
-	    {
-	      YYDPRINTF ((stderr, "Error: popping "));
-	      YYDSYMPRINT ((stderr,
-			    yystos[*yyssp],
-			    *yyvsp));
-	      YYDPRINTF ((stderr, "\n"));
-	      yydestruct (yystos[*yyssp], *yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
+	YYABORT;
       YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
 		  yychar, yytname[yychar1]));
-      yydestruct (yychar1, yylval);
       yychar = YYEMPTY;
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
 
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+  goto yyerrhandle;
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-	YYABORT;
 
-      YYDPRINTF ((stderr, "Error: popping "));
-      YYDSYMPRINT ((stderr,
-		    yystos[*yyssp], *yyvsp));
-      YYDPRINTF ((stderr, "\n"));
-
-      yydestruct (yystos[yystate], *yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
+/*-------------------------------------------------------------------.
+| 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
+
 #if YYDEBUG
-      if (yydebug)
-	{
-	  short *yyssp1 = yyss - 1;
-	  YYFPRINTF (stderr, "Error: state stack now");
-	  while (yyssp1 != yyssp)
-	    YYFPRINTF (stderr, " %d", *++yyssp1);
-	  YYFPRINTF (stderr, "\n");
-	}
+  if (yydebug)
+    {
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
+    }
 #endif
+
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
+yyerrhandle:
+  yyn = yypact[yystate];
+  if (yyn == YYFLAG)
+    goto yyerrdefault;
+
+  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;
     }
+  else if (yyn == 0)
+    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
@@ -3022,7 +2572,9 @@ yyerrlab1:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-
+#if YYLSP_NEEDED
+  *++yylsp = yylloc;
+#endif
 
   yystate = yyn;
   goto yynewstate;
@@ -3042,15 +2594,13 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
-#endif
 
 yyreturn:
 #ifndef yyoverflow
@@ -3059,9 +2609,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-
-
-#line 948 "ntp_parser.y"
+#line 950 "ntp_parser.y"
 
 
 /* KEYWORDS
@@ -3102,5 +2650,4 @@ int main(int argc, char *argv[])
     return 0;
 }
 */
-
 

==== ntpd/ntp_parser.h ====
2007-06-17 01:22:04-04:00, stenn at whimsy.udel.edu +155 -345
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

--- 1.3/ntpd/ntp_parser.h	2007-06-07 10:45:39 -04:00
+++ 1.4/ntpd/ntp_parser.h	2007-06-17 01:22:04 -04:00
@@ -1,345 +1,7 @@
-/* A Bison parser, made from /ntpdev/ntpd/ntp_parser.y, by GNU bison 1.75.  */
-
-/* Skeleton parser for Yacc-like parsing with 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.  */
-
-#ifndef BISON_NTP_PARSER_H
-# define BISON_NTP_PARSER_H
-
-/* 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_Broadcast = 266,
-     T_Broadcastclient = 267,
-     T_Broadcastdelay = 268,
-     T_Burst = 269,
-     T_Calibrate = 270,
-     T_Calldelay = 271,
-     T_Ceiling = 272,
-     T_Cert = 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_DriftMinutes = 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_Floor = 296,
-     T_Freq = 297,
-     T_Fudge = 298,
-     T_Gqpar = 299,
-     T_Host = 300,
-     T_Huffpuff = 301,
-     T_IPv4_address = 302,
-     T_IPv6_address = 303,
-     T_Iburst = 304,
-     T_Ident = 305,
-     T_Iffpar = 306,
-     T_Ignore = 307,
-     T_Includefile = 308,
-     T_Integer = 309,
-     T_Interface = 310,
-     T_Kernel = 311,
-     T_Key = 312,
-     T_Keys = 313,
-     T_Keysdir = 314,
-     T_Kod = 315,
-     T_Leap = 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_Mvpar = 339,
-     T_Nolink = 340,
-     T_Nomodify = 341,
-     T_None = 342,
-     T_Nopeer = 343,
-     T_Noquery = 344,
-     T_Noselect = 345,
-     T_Noserve = 346,
-     T_Notrap = 347,
-     T_Notrust = 348,
-     T_Novolley = 349,
-     T_Ntp = 350,
-     T_Ntpport = 351,
-     T_Orphan = 352,
-     T_Panic = 353,
-     T_Peer = 354,
-     T_Peerstats = 355,
-     T_Phone = 356,
-     T_Pid = 357,
-     T_Pidfile = 358,
-     T_Pool = 359,
-     T_Port = 360,
-     T_Pps = 361,
-     T_Preempt = 362,
-     T_Prefer = 363,
-     T_Pw = 364,
-     T_RandFile = 365,
-     T_Rawstats = 366,
-     T_Refid = 367,
-     T_Requestkey = 368,
-     T_Restrict = 369,
-     T_Revoke = 370,
-     T_Server = 371,
-     T_Setvar = 372,
-     T_Sign = 373,
-     T_Statistics = 374,
-     T_Stats = 375,
-     T_Statsdir = 376,
-     T_Step = 377,
-     T_Stepout = 378,
-     T_Stratum = 379,
-     T_String = 380,
-     T_Sysstats = 381,
-     T_Tick = 382,
-     T_Time1 = 383,
-     T_Time2 = 384,
-     T_Tinker = 385,
-     T_Tos = 386,
-     T_Trap = 387,
-     T_True = 388,
-     T_Trustedkey = 389,
-     T_Ttl = 390,
-     T_Type = 391,
-     T_Version = 392,
-     T_Week = 393,
-     T_Year = 394,
-     T_Flag = 395,
-     T_Void = 396,
-     T_EOC = 397,
-     T_Simulate = 398,
-     T_Beep_Delay = 399,
-     T_Sim_Duration = 400,
-     T_Server_Offset = 401,
-     T_Duration = 402,
-     T_Freq_Offset = 403,
-     T_Wander = 404,
-     T_Jitter = 405,
-     T_Prop_Delay = 406,
-     T_Proc_Delay = 407
-   };
-#endif
-#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_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_Cert 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_DriftMinutes 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_Floor 296
-#define T_Freq 297
-#define T_Fudge 298
-#define T_Gqpar 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_Iffpar 306
-#define T_Ignore 307
-#define T_Includefile 308
-#define T_Integer 309
-#define T_Interface 310
-#define T_Kernel 311
-#define T_Key 312
-#define T_Keys 313
-#define T_Keysdir 314
-#define T_Kod 315
-#define T_Leap 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_Mvpar 339
-#define T_Nolink 340
-#define T_Nomodify 341
-#define T_None 342
-#define T_Nopeer 343
-#define T_Noquery 344
-#define T_Noselect 345
-#define T_Noserve 346
-#define T_Notrap 347
-#define T_Notrust 348
-#define T_Novolley 349
-#define T_Ntp 350
-#define T_Ntpport 351
-#define T_Orphan 352
-#define T_Panic 353
-#define T_Peer 354
-#define T_Peerstats 355
-#define T_Phone 356
-#define T_Pid 357
-#define T_Pidfile 358
-#define T_Pool 359
-#define T_Port 360
-#define T_Pps 361
-#define T_Preempt 362
-#define T_Prefer 363
-#define T_Pw 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_Tinker 385
-#define T_Tos 386
-#define T_Trap 387
-#define T_True 388
-#define T_Trustedkey 389
-#define T_Ttl 390
-#define T_Type 391
-#define T_Version 392
-#define T_Week 393
-#define T_Year 394
-#define T_Flag 395
-#define T_Void 396
-#define T_EOC 397
-#define T_Simulate 398
-#define T_Beep_Delay 399
-#define T_Sim_Duration 400
-#define T_Server_Offset 401
-#define T_Duration 402
-#define T_Freq_Offset 403
-#define T_Wander 404
-#define T_Jitter 405
-#define T_Prop_Delay 406
-#define T_Proc_Delay 407
-
-
-
+#ifndef BISON_______NTPD_NTP_PARSER_H
+# define BISON_______NTPD_NTP_PARSER_H
 
 #ifndef YYSTYPE
-#line 67 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -354,13 +16,161 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
-/* Line 1281 of /usr/local/share/bison/yacc.c.  */
-#line 359 "ntp_parser.h"
 # define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
-
-extern YYSTYPE yylval;
+# 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_Broadcast	265
+# define	T_Broadcastclient	266
+# define	T_Broadcastdelay	267
+# define	T_Burst	268
+# define	T_Calibrate	269
+# define	T_Calldelay	270
+# define	T_Ceiling	271
+# define	T_Cert	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_DriftMinutes	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_Floor	295
+# define	T_Freq	296
+# define	T_Fudge	297
+# define	T_Gqpar	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_Iffpar	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_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_Mvpar	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_Pw	363
+# define	T_RandFile	364
+# define	T_Rawstats	365
+# define	T_Refid	366
+# define	T_Requestkey	367
+# define	T_Restrict	368
+# define	T_Revoke	369
+# define	T_Server	370
+# define	T_Setvar	371
+# define	T_Sign	372
+# define	T_Statistics	373
+# define	T_Stats	374
+# define	T_Statsdir	375
+# define	T_Step	376
+# define	T_Stepout	377
+# define	T_Stratum	378
+# define	T_String	379
+# define	T_Sysstats	380
+# define	T_Tick	381
+# define	T_Time1	382
+# define	T_Time2	383
+# define	T_Tinker	384
+# define	T_Tos	385
+# define	T_Trap	386
+# define	T_True	387
+# define	T_Trustedkey	388
+# define	T_Ttl	389
+# define	T_Type	390
+# define	T_Version	391
+# define	T_Week	392
+# define	T_Year	393
+# define	T_Flag	394
+# define	T_Void	395
+# define	T_EOC	396
+# define	T_Simulate	397
+# define	T_Beep_Delay	398
+# define	T_Sim_Duration	399
+# define	T_Server_Offset	400
+# define	T_Duration	401
+# define	T_Freq_Offset	402
+# define	T_Wander	403
+# define	T_Jitter	404
+# define	T_Prop_Delay	405
+# define	T_Proc_Delay	406
 
 
-#endif /* not BISON_NTP_PARSER_H */
+extern YYSTYPE yylval;
 
+#endif /* not BISON_______NTPD_NTP_PARSER_H */

==== ntpd/ntp_parser.y ====
2007-06-17 01:22:06-04:00, stenn at whimsy.udel.edu +2 -0
  Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES

--- 1.8/ntpd/ntp_parser.y	2007-06-07 10:45:55 -04:00
+++ 1.9/ntpd/ntp_parser.y	2007-06-17 01:22:06 -04:00
@@ -38,6 +38,8 @@
 
 
   struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream */
+
+  #define YYERROR_VERBOSE
   void yyerror (char *msg);
 
   /* SK: The following is a terrible hack to allow the NTP code to be built


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