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

Harlan Stenn stenn at whimsy.udel.edu
Tue Oct 30 05:25:58 UTC 2007


#### ChangeSet ####
2007-10-29 17:17:35-04:00, neal at pogo.udel.edu 
  ntp_scanner.c:
    [Bug 828] use is_ip_address from ntp_io.c in scanner

==== ntpd/ntp_scanner.c ====
2007-10-29 17:16:40-04:00, neal at pogo.udel.edu +5 -43
  [Bug 828] use is_ip_address from ntp_io.c in scanner

--- 1.10/ntpd/ntp_scanner.c	2007-10-29 09:27:34 -05:00
+++ 1.11/ntpd/ntp_scanner.c	2007-10-29 16:16:40 -05:00
@@ -395,32 +395,6 @@ static int is_double(char *lexeme)
 }
 
 
-/* IPv4 Address */
-static int is_ipv4_address(char *lexeme)
-{
-    int i;
-    int octet_no = 1;
-    int digits_read = 0;
-
-    for (i = 0;lexeme[i];++i) {
-        if (isdigit(lexeme[i]))
-            ++digits_read;
-        else if (lexeme[i] == '.') {
-            ++octet_no;            
-            if (digits_read < 1 || digits_read > 3)
-                return 0;
-            digits_read = 0;
-        }
-        else
-            return 0;
-    }
-    if (octet_no == 4 && digits_read >= 1 && digits_read <= 3)
-        return 1;
-    else
-        return 0;
-}
-
-
 
 /* Host Name */
 /* static int is_host_name (char *lexeme) */
@@ -469,7 +443,7 @@ int yylex()
     int i, instring = 0;
     int token;                 /* The return value/the recognized token */
     int ch;
-	struct in_addr temp_inaddr;
+	struct isc_netaddr temp_isc_netaddr;
     static int expect_string = NO_ARG;
 
     do {
@@ -573,20 +547,7 @@ int yylex()
         else
             return T_Double;
     }
-    else if (is_ipv4_address(yytext) && (!instring)) {
-        if (expect_string == SINGLE_ARG)
-            expect_string = NO_ARG;
-        errno = 0;
-        if ((yylval.String = strdup(yytext)) == NULL &&
-            errno == ENOMEM) {
-            fprintf(stderr, "Could not allocate memory for: %s\n",
-                    yytext);
-            exit(1);
-        }
-        else
-            return T_IPv4_address;
-    }
-    else if ((inet_pton(AF_INET6, yytext, &temp_inaddr) == 1) && (!instring)) {
+    else if ((is_ip_address(yytext, &temp_isc_netaddr)) && (!instring)) {
         if (expect_string == SINGLE_ARG)
             expect_string = NO_ARG;
         errno = 0;
@@ -596,8 +557,9 @@ int yylex()
                     yytext);
             exit(1);
         }
-        else
-            return T_IPv6_address;
+        else return 
+            temp_isc_netaddr.family == AF_INET ? T_IPv4_address :
+											 T_IPv6_address ;
     }
     else { /* Default: Everything is a string */
         instring = 0;

#### ChangeSet ####
2007-10-29 10:28:31-04:00, neal at pogo.udel.edu 
  ntp_scanner.c:
    [Bug 828] correct IPv6 address parsing

==== ntpd/ntp_scanner.c ====
2007-10-29 10:27:34-04:00, neal at pogo.udel.edu +2 -42
  [Bug 828] correct IPv6 address parsing

--- 1.9/ntpd/ntp_scanner.c	2007-09-30 12:06:19 -04:00
+++ 1.10/ntpd/ntp_scanner.c	2007-10-29 09:27:34 -05:00
@@ -420,47 +420,6 @@ static int is_ipv4_address(char *lexeme)
         return 0;
 }
 
-/* IPv6 Address 
- * See RFC 3513, Section 2.2 for details
- * Note: full error checking is not being done
- */
-static int is_ipv6_address(char *lexeme)
-{
-    int i;
-    int quad_no = 1;
-    int digits_read = 0;
-    int group_seen = 0;  
-    
-    for (i = 0;lexeme[i];++i) {
-        if (isxdigit(lexeme[i]))
-            ++digits_read;
-        else if (lexeme[i] == ':') {
-            ++quad_no;            
-            if (digits_read == 0 && !group_seen)
-                group_seen = 1;
-            else if (digits_read > 4 ||
-                     (digits_read == 0 && group_seen))
-                return 0;
-            digits_read = 0;
-        }
-        else if (lexeme[i] == '.') {
-            /* A IPv4 address has been mixed with an IPv6 Address
-             * Ensure that less than 6 quads have been read and that
-             * the IPv4 address is valid 
-             */
-            while (i >= 0 && lexeme[i-1] != ':')
-                --i;
-            return ((quad_no <= 6) && is_ipv4_address(&lexeme[i]));
-        }
-        else
-            return 0;
-    }
-    /* Make sure that we don't end with a single ':' */
-    if (lexeme[i-1] == ':' && lexeme[i-2] != ':')
-        return 0;
-    
-    return ((quad_no <= 7 && digits_read <= 4) ? 1 : 0);
-}
 
 
 /* Host Name */
@@ -510,6 +469,7 @@ int yylex()
     int i, instring = 0;
     int token;                 /* The return value/the recognized token */
     int ch;
+	struct in_addr temp_inaddr;
     static int expect_string = NO_ARG;
 
     do {
@@ -626,7 +586,7 @@ int yylex()
         else
             return T_IPv4_address;
     }
-    else if (is_ipv6_address(yytext) && (!instring)) {
+    else if ((inet_pton(AF_INET6, yytext, &temp_inaddr) == 1) && (!instring)) {
         if (expect_string == SINGLE_ARG)
             expect_string = NO_ARG;
         errno = 0;

#### ChangeSet ####
2007-10-28 20:40:12-04:00, neal at pogo.udel.edu 
  copyright.html:
    add self to copyright notice

==== html/copyright.html ====
2007-10-28 20:39:37-04:00, neal at pogo.udel.edu +1 -0
  add self to copyright notice

--- 1.36/html/copyright.html	2007-01-06 18:23:45 -05:00
+++ 1.37/html/copyright.html	2007-10-28 19:39:37 -05:00
@@ -88,6 +88,7 @@
 			<li class="inline"><a href="mailto:%20tsuruoka at nc.fukuoka-u.ac.jp">Tomoaki TSURUOKA &lt;tsuruoka at nc.fukuoka-u.ac.jp&gt;</a>TRAK clock driver
 			<li class="inline"><a href="mailto:%20vixie at vix.com">Paul A Vixie &lt;vixie at vix.com&gt;</a> TrueTime GPS driver, generic TrueTime clock driver
 			<li class="inline"><a href="mailto:%20Ulrich.Windl at rz.uni-regensburg.de">Ulrich Windl &lt;Ulrich.Windl at rz.uni-regensburg.de&gt;</a> corrected and validated HTML documents according to the HTML DTD
+			<li class="inline"><a href="mailto:%20neal at ntp.org">Rob Neal &lt;neal at ntp.org&gt;</a> Bancomm refclock and config/parse code maintenance
 		</ol>
 		<hr>
 		<script type="text/javascript" language="javascript" src="scripts/footer.txt"></script>

#### ChangeSet ####
2007-10-27 12:27:18-04:00, neal at pogo.udel.edu 
  ntp_io.c:
    [Bug 752] QoS: add parser/config support.
  Many files:
    [Bug 752] QoS: add parser/config support.

==== ChangeLog ====
2007-10-27 12:24:10-04:00, neal at pogo.udel.edu +1 -0
  [Bug 752] QoS: add parser/config support.

--- 1.136/ChangeLog	2007-10-26 17:40:16 -04:00
+++ 1.137/ChangeLog	2007-10-27 12:24:10 -04:00
@@ -1,3 +1,4 @@
+* [Bug 752] QoS: add parse/config handling code. 
 * Fix the #include order in tickadj.c for picky machines.
 * [Bug 752] QoS: On some systems, netinet/ip.h needs netinet/ip_systm.h.
 * [Bug 752] Update the QoS tagging (code only - configuration to follow).

==== include/ntp_config.h ====
2007-10-27 12:26:20-04:00, neal at pogo.udel.edu +24 -0
  [Bug 752] QoS: add parser/config support.

--- 1.45/include/ntp_config.h	2007-05-16 03:38:40 -04:00
+++ 1.46/include/ntp_config.h	2007-10-27 12:26:20 -04:00
@@ -18,6 +18,29 @@
 # endif /* SYS_WINNT */
 #endif /* not CONFIG_FILE */
 
+#ifdef HAVE_IPTOS_SUPPORT
+/* 
+ * "qos" modified keywords 
+ */
+#define	CONF_QOS_LOWDELAY		1
+#define CONF_QOS_THROUGHPUT		2
+#define CONF_QOS_RELIABILITY	3
+#define CONF_QOS_MINCOST		4
+
+#ifdef 		IPTOS_PREC_INTERNETCONTROL
+#define CONF_QOS_CS0			5
+#define CONF_QOS_CS1			6
+#define CONF_QOS_CS2			7
+#define CONF_QOS_CS3			8
+#define CONF_QOS_CS4			9
+#define CONF_QOS_CS5			10
+#define CONF_QOS_CS6			11
+#define CONF_QOS_CS7			12
+#endif		/* IPTOS_PREC_INTERNETCONTROL */
+
+#endif	/* HAVE_IPTOS_SUPPORT */
+
+
 
 /* Limits */
 #define MAXLINE 1024
@@ -123,6 +146,7 @@ struct config_tree {
     struct auth_node auth;
 
     queue *logconfig;
+    queue *qos;
     queue *phone;
     queue *setvar;
     queue *ttl;

==== ntpd/ntp_config.c ====
2007-10-27 12:25:16-04:00, neal at pogo.udel.edu +67 -1
  [Bug 752] QoS: add parser/config support.

--- 1.168/ntpd/ntp_config.c	2007-10-18 01:51:59 -04:00
+++ 1.169/ntpd/ntp_config.c	2007-10-27 12:25:16 -04:00
@@ -189,6 +189,9 @@ int	cryptosw;		/* crypto command called 
 extern int sys_maxclock;
 extern char *stats_drift_file;	/* name of the driftfile */
 extern char *leapseconds_file_name; /*name of the leapseconds file */
+#ifdef HAVE_IPTOS_SUPPORT
+extern unsigned int qos;				/* QoS setting */
+#endif /* HAVE_IPTOS_SUPPORT */
 
 /* FUNCTION PROTOTYPES */
 
@@ -208,6 +211,7 @@ static void config_tinker(void);
 static void config_system_opts(void);
 static void config_logconfig(void);
 static void config_phone(void);
+static void config_qos(void);
 static void config_setvar(void);
 static void config_ttl(void);
 static void config_trap(void);
@@ -295,6 +299,7 @@ init_syntax_tree(void)
 
 	my_config.logconfig = create_queue();
 	my_config.phone = create_queue();
+	my_config.qos = create_queue();
 	my_config.setvar = create_queue();
 	my_config.ttl = create_queue();
 	my_config.trap = create_queue();
@@ -887,7 +892,8 @@ struct key_tok keyword_list[] = {
 /* miscellaneous_command */
 	{ "port",		T_Port,            NO_ARG },
 	{ "interface",		T_Interface,       SINGLE_ARG },
-/* simulator commands */
+	{ "qos",		T_Qos,            NO_ARG },
+/* simulaor commands */
 	{ "simulate",		T_Simulate,        NO_ARG },
 	{ "simulation_duration",T_Sim_Duration,	   NO_ARG },
 	{ "beep_delay",     	T_Beep_Delay,      NO_ARG },
@@ -1331,6 +1337,60 @@ config_phone(void)
 		sys_phone[i] = NULL;
 }
 
+static void 
+config_qos(void)
+{
+	struct attr_val *my_qosconfig;
+	char *s; 
+	unsigned int qtos = 0;
+
+	while(!empty(my_config.qos)) {
+		my_qosconfig = (struct attr_val *) 
+			dequeue(my_config.qos);
+		s = my_qosconfig->value.s;
+#ifdef HAVE_IPTOS_SUPPORT
+		if (!strcmp(s, "lowdelay"))  
+			qtos = CONF_QOS_LOWDELAY;
+		else if (!strcmp(s, "throughput")) 
+			qtos = CONF_QOS_THROUGHPUT; 
+		else if (!strcmp(s, "reliability"))
+			qtos = CONF_QOS_RELIABILITY;
+		else if (!strcmp(s, "mincost"))
+			qtos = CONF_QOS_MINCOST;
+#ifdef IPTOS_PREC_INTERNETCONTROL
+		else if (!strcmp(s, "routine") || !strcmp(s, "cs0"))
+			qtos = CONF_QOS_CS0;
+		else if (!strcmp(s, "priority") || !strcmp(s, "cs1"))
+			qtos = CONF_QOS_CS1;
+		else if (!strcmp(s, "immediate") || !strcmp(s, "cs2"))
+			qtos = CONF_QOS_CS2;
+		else if (!strcmp(s, "flash") || !strcmp(s, "cs3"))				
+			qtos = CONF_QOS_CS3; 	/* overlapping prefix on keyword */
+		if (!strcmp(s, "flashoverride") || !strcmp(s, "cs4"))
+			qtos = CONF_QOS_CS4;
+		else if (!strcmp(s, "critical") || !strcmp(s, "cs5"))
+			qtos = CONF_QOS_CS5;
+		else if(!strcmp(s, "internetcontrol") || !strcmp(s, "cs6"))
+			qtos = CONF_QOS_CS6;
+		else if (!strcmp(s, "netcontrol") || !strcmp(s, "cs7"))
+			qtos = CONF_QOS_CS7;
+#endif  /* IPTOS_PREC_INTERNETCONTROL */
+		if (qtos == 0) 
+			msyslog(LOG_INFO, "parse error, qos %s not accepted\n", s);
+		else 
+			qos = qtos;
+#endif  /* HAVE IPTOS_SUPPORT */
+		/* 
+		 * value is set, but not being effective. Need code to change  
+         * the current connections to notice. Might also 
+		 * consider logging a message about the action.
+		 * XXX msyslog(LOG_INFO, "QoS %s requested by config\n", s); 
+		 */
+		free(s);
+		free_node(my_qosconfig); 
+	}
+}
+
 static void
 config_setvar(void)
 {
@@ -1426,6 +1486,11 @@ config_trap(void)
 		 */
 		if (!err_flag) {
 			memset((char *)&peeraddr, 0, sizeof(peeraddr));
+			if (getnetnum(curr_trap->addr->address, &peeraddr, 1, t_UNK) != 1) {
+                err_flag = 1;
+                break;
+            }
+
 			if (port_no != 0)
 				((struct sockaddr_in6*)&peeraddr)->sin6_port = htons((u_short) port_no);
 			else
@@ -1893,6 +1958,7 @@ config_ntpd(void)
 	config_other_modes();
 	config_peers();
 	config_fudge();
+	config_qos();
 }
 
 #ifdef SIM

==== ntpd/ntp_io.c ====
2007-10-27 12:25:38-04:00, neal at pogo.udel.edu +5 -5
  [Bug 752] QoS: add parser/config support.
  ,

--- 1.264/ntpd/ntp_io.c	2007-10-25 01:14:20 -04:00
+++ 1.265/ntpd/ntp_io.c	2007-10-27 12:25:38 -04:00
@@ -172,9 +172,9 @@ static	struct refclockio *refio;
 #if defined(HAVE_IPTOS_SUPPORT)
 /* set IP_TOS to minimize packet delay */
 # if defined(IPTOS_PREC_INTERNETCONTROL)
-const int tos = IPTOS_PREC_INTERNETCONTROL;
+	unsigned int qos = IPTOS_PREC_INTERNETCONTROL;
 # else
-const int tos = IPTOS_LOWDELAY;
+	 unsigned int qos = IPTOS_LOWDELAY;
 # endif
 #endif
 
@@ -2521,11 +2521,11 @@ open_socket(
 	 */
 	if (addr->ss_family == AF_INET) {
 #if defined(HAVE_IPTOS_SUPPORT)
-		if (setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &tos,
-		    sizeof(tos)) < 0) {
+		if (setsockopt(fd, IPPROTO_IP, IP_TOS, (char *) &qos,
+		    sizeof(qos)) < 0) {
 			netsyslog(LOG_ERR,
 			    "setsockopt IP_TOS (%02x) fails on address %s: %m",
-			    tos, stoa(addr));
+			    qos, stoa(addr));
   		}
 #endif /* HAVE_IPTOS_SUPPORT */
 		if ((flags & INT_BROADCAST))

==== ntpd/ntp_parser.c ====
2007-10-27 12:25:52-04:00, neal at pogo.udel.edu +2031 -1577
  [Bug 752] QoS: add parser/config support.

--- 1.22/ntpd/ntp_parser.c	2007-10-03 21:34:26 -04:00
+++ 1.23/ntpd/ntp_parser.c	2007-10-27 12:25:52 -04:00
@@ -1,156 +1,358 @@
-/* A Bison parser, made from /deacon/backroom/ntp-dev/A.deacon/ntpd/../../ntpd/ntp_parser.y
-   by GNU bison 1.35.  */
+/* A Bison parser, made from /ntpdev/ntpd/ntp_parser.y, by GNU bison 1.75.  */
 
-#define YYBISON 1  /* Identify Bison output.  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_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_Clockstats	272
-# define	T_Cohort	273
-# define	T_ControlKey	274
-# define	T_Crypto	275
-# define	T_Cryptostats	276
-# define	T_Day	277
-# define	T_Default	278
-# define	T_Disable	279
-# define	T_Discard	280
-# define	T_Dispersion	281
-# define	T_Double	282
-# define	T_Driftfile	283
-# define	T_WanderThreshold	284
-# define	T_Enable	285
-# define	T_End	286
-# define	T_False	287
-# define	T_File	288
-# define	T_Filegen	289
-# define	T_Flag1	290
-# define	T_Flag2	291
-# define	T_Flag3	292
-# define	T_Flag4	293
-# define	T_Floor	294
-# define	T_Freq	295
-# define	T_Fudge	296
-# define	T_Host	297
-# define	T_Huffpuff	298
-# define	T_IPv4_address	299
-# define	T_IPv6_address	300
-# define	T_Iburst	301
-# define	T_Ident	302
-# define	T_Ignore	303
-# define	T_Includefile	304
-# define	T_Integer	305
-# define	T_Interface	306
-# define	T_Kernel	307
-# define	T_Key	308
-# define	T_Keys	309
-# define	T_Keysdir	310
-# define	T_Kod	311
-# define	T_Leap	312
-# define	T_Leapfile	313
-# define	T_Limited	314
-# define	T_Link	315
-# define	T_Logconfig	316
-# define	T_Logfile	317
-# define	T_Loopstats	318
-# define	T_Lowpriotrap	319
-# define	T_Manycastclient	320
-# define	T_Manycastserver	321
-# define	T_Mask	322
-# define	T_Maxclock	323
-# define	T_Maxdist	324
-# define	T_Maxhop	325
-# define	T_Maxpoll	326
-# define	T_Minclock	327
-# define	T_Mindist	328
-# define	T_Minimum	329
-# define	T_Minpoll	330
-# define	T_Minsane	331
-# define	T_Mode	332
-# define	T_Monitor	333
-# define	T_Month	334
-# define	T_Multicastclient	335
-# define	T_Nolink	336
-# define	T_Nomodify	337
-# define	T_None	338
-# define	T_Nopeer	339
-# define	T_Noquery	340
-# define	T_Noselect	341
-# define	T_Noserve	342
-# define	T_Notrap	343
-# define	T_Notrust	344
-# define	T_Novolley	345
-# define	T_Ntp	346
-# define	T_Ntpport	347
-# define	T_Orphan	348
-# define	T_Panic	349
-# define	T_Peer	350
-# define	T_Peerstats	351
-# define	T_Phone	352
-# define	T_Pid	353
-# define	T_Pidfile	354
-# define	T_Pool	355
-# define	T_Port	356
-# define	T_Pps	357
-# define	T_Preempt	358
-# define	T_Prefer	359
-# define	T_Pw	360
-# define	T_RandFile	361
-# define	T_Rawstats	362
-# define	T_Refid	363
-# define	T_Requestkey	364
-# define	T_Restrict	365
-# define	T_Revoke	366
-# define	T_Server	367
-# define	T_Setvar	368
-# define	T_Sign	369
-# define	T_Statistics	370
-# define	T_Stats	371
-# define	T_Statsdir	372
-# define	T_Step	373
-# define	T_Stepout	374
-# define	T_Stratum	375
-# define	T_String	376
-# define	T_Sysstats	377
-# define	T_Tick	378
-# define	T_Time1	379
-# define	T_Time2	380
-# define	T_Tinker	381
-# define	T_Tos	382
-# define	T_Trap	383
-# define	T_True	384
-# define	T_Trustedkey	385
-# define	T_Ttl	386
-# define	T_Type	387
-# define	T_Version	388
-# define	T_Week	389
-# define	T_Year	390
-# define	T_Flag	391
-# define	T_Void	392
-# define	T_EOC	393
-# define	T_Simulate	394
-# define	T_Beep_Delay	395
-# define	T_Sim_Duration	396
-# define	T_Server_Offset	397
-# define	T_Duration	398
-# define	T_Freq_Offset	399
-# define	T_Wander	400
-# define	T_Jitter	401
-# define	T_Prop_Delay	402
-# define	T_Proc_Delay	403
+   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_Clockstats = 273,
+     T_Cohort = 274,
+     T_ControlKey = 275,
+     T_Crypto = 276,
+     T_Cryptostats = 277,
+     T_Day = 278,
+     T_Default = 279,
+     T_Disable = 280,
+     T_Discard = 281,
+     T_Dispersion = 282,
+     T_Double = 283,
+     T_Driftfile = 284,
+     T_WanderThreshold = 285,
+     T_Enable = 286,
+     T_End = 287,
+     T_False = 288,
+     T_File = 289,
+     T_Filegen = 290,
+     T_Flag1 = 291,
+     T_Flag2 = 292,
+     T_Flag3 = 293,
+     T_Flag4 = 294,
+     T_Floor = 295,
+     T_Freq = 296,
+     T_Fudge = 297,
+     T_Host = 298,
+     T_Huffpuff = 299,
+     T_IPv4_address = 300,
+     T_IPv6_address = 301,
+     T_Iburst = 302,
+     T_Ident = 303,
+     T_Ignore = 304,
+     T_Includefile = 305,
+     T_Integer = 306,
+     T_Interface = 307,
+     T_Kernel = 308,
+     T_Key = 309,
+     T_Keys = 310,
+     T_Keysdir = 311,
+     T_Kod = 312,
+     T_Leap = 313,
+     T_Leapfile = 314,
+     T_Limited = 315,
+     T_Link = 316,
+     T_Logconfig = 317,
+     T_Logfile = 318,
+     T_Loopstats = 319,
+     T_Lowpriotrap = 320,
+     T_Manycastclient = 321,
+     T_Manycastserver = 322,
+     T_Mask = 323,
+     T_Maxclock = 324,
+     T_Maxdist = 325,
+     T_Maxhop = 326,
+     T_Maxpoll = 327,
+     T_Minclock = 328,
+     T_Mindist = 329,
+     T_Minimum = 330,
+     T_Minpoll = 331,
+     T_Minsane = 332,
+     T_Mode = 333,
+     T_Monitor = 334,
+     T_Month = 335,
+     T_Multicastclient = 336,
+     T_Nolink = 337,
+     T_Nomodify = 338,
+     T_None = 339,
+     T_Nopeer = 340,
+     T_Noquery = 341,
+     T_Noselect = 342,
+     T_Noserve = 343,
+     T_Notrap = 344,
+     T_Notrust = 345,
+     T_Novolley = 346,
+     T_Ntp = 347,
+     T_Ntpport = 348,
+     T_Orphan = 349,
+     T_Panic = 350,
+     T_Peer = 351,
+     T_Peerstats = 352,
+     T_Phone = 353,
+     T_Pid = 354,
+     T_Pidfile = 355,
+     T_Pool = 356,
+     T_Port = 357,
+     T_Pps = 358,
+     T_Preempt = 359,
+     T_Prefer = 360,
+     T_Pw = 361,
+     T_Qos = 362,
+     T_RandFile = 363,
+     T_Rawstats = 364,
+     T_Refid = 365,
+     T_Requestkey = 366,
+     T_Restrict = 367,
+     T_Revoke = 368,
+     T_Server = 369,
+     T_Setvar = 370,
+     T_Sign = 371,
+     T_Statistics = 372,
+     T_Stats = 373,
+     T_Statsdir = 374,
+     T_Step = 375,
+     T_Stepout = 376,
+     T_Stratum = 377,
+     T_String = 378,
+     T_Sysstats = 379,
+     T_Tick = 380,
+     T_Time1 = 381,
+     T_Time2 = 382,
+     T_Tinker = 383,
+     T_Tos = 384,
+     T_Trap = 385,
+     T_True = 386,
+     T_Trustedkey = 387,
+     T_Ttl = 388,
+     T_Type = 389,
+     T_Version = 390,
+     T_Week = 391,
+     T_Year = 392,
+     T_Flag = 393,
+     T_Void = 394,
+     T_EOC = 395,
+     T_Simulate = 396,
+     T_Beep_Delay = 397,
+     T_Sim_Duration = 398,
+     T_Server_Offset = 399,
+     T_Duration = 400,
+     T_Freq_Offset = 401,
+     T_Wander = 402,
+     T_Jitter = 403,
+     T_Prop_Delay = 404,
+     T_Proc_Delay = 405
+   };
+#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_Clockstats 273
+#define T_Cohort 274
+#define T_ControlKey 275
+#define T_Crypto 276
+#define T_Cryptostats 277
+#define T_Day 278
+#define T_Default 279
+#define T_Disable 280
+#define T_Discard 281
+#define T_Dispersion 282
+#define T_Double 283
+#define T_Driftfile 284
+#define T_WanderThreshold 285
+#define T_Enable 286
+#define T_End 287
+#define T_False 288
+#define T_File 289
+#define T_Filegen 290
+#define T_Flag1 291
+#define T_Flag2 292
+#define T_Flag3 293
+#define T_Flag4 294
+#define T_Floor 295
+#define T_Freq 296
+#define T_Fudge 297
+#define T_Host 298
+#define T_Huffpuff 299
+#define T_IPv4_address 300
+#define T_IPv6_address 301
+#define T_Iburst 302
+#define T_Ident 303
+#define T_Ignore 304
+#define T_Includefile 305
+#define T_Integer 306
+#define T_Interface 307
+#define T_Kernel 308
+#define T_Key 309
+#define T_Keys 310
+#define T_Keysdir 311
+#define T_Kod 312
+#define T_Leap 313
+#define T_Leapfile 314
+#define T_Limited 315
+#define T_Link 316
+#define T_Logconfig 317
+#define T_Logfile 318
+#define T_Loopstats 319
+#define T_Lowpriotrap 320
+#define T_Manycastclient 321
+#define T_Manycastserver 322
+#define T_Mask 323
+#define T_Maxclock 324
+#define T_Maxdist 325
+#define T_Maxhop 326
+#define T_Maxpoll 327
+#define T_Minclock 328
+#define T_Mindist 329
+#define T_Minimum 330
+#define T_Minpoll 331
+#define T_Minsane 332
+#define T_Mode 333
+#define T_Monitor 334
+#define T_Month 335
+#define T_Multicastclient 336
+#define T_Nolink 337
+#define T_Nomodify 338
+#define T_None 339
+#define T_Nopeer 340
+#define T_Noquery 341
+#define T_Noselect 342
+#define T_Noserve 343
+#define T_Notrap 344
+#define T_Notrust 345
+#define T_Novolley 346
+#define T_Ntp 347
+#define T_Ntpport 348
+#define T_Orphan 349
+#define T_Panic 350
+#define T_Peer 351
+#define T_Peerstats 352
+#define T_Phone 353
+#define T_Pid 354
+#define T_Pidfile 355
+#define T_Pool 356
+#define T_Port 357
+#define T_Pps 358
+#define T_Preempt 359
+#define T_Prefer 360
+#define T_Pw 361
+#define T_Qos 362
+#define T_RandFile 363
+#define T_Rawstats 364
+#define T_Refid 365
+#define T_Requestkey 366
+#define T_Restrict 367
+#define T_Revoke 368
+#define T_Server 369
+#define T_Setvar 370
+#define T_Sign 371
+#define T_Statistics 372
+#define T_Stats 373
+#define T_Statsdir 374
+#define T_Step 375
+#define T_Stepout 376
+#define T_Stratum 377
+#define T_String 378
+#define T_Sysstats 379
+#define T_Tick 380
+#define T_Time1 381
+#define T_Time2 382
+#define T_Tinker 383
+#define T_Tos 384
+#define T_Trap 385
+#define T_True 386
+#define T_Trustedkey 387
+#define T_Ttl 388
+#define T_Type 389
+#define T_Version 390
+#define T_Week 391
+#define T_Year 392
+#define T_Flag 393
+#define T_Void 394
+#define T_EOC 395
+#define T_Simulate 396
+#define T_Beep_Delay 397
+#define T_Sim_Duration 398
+#define T_Server_Offset 399
+#define T_Duration 400
+#define T_Freq_Offset 401
+#define T_Wander 402
+#define T_Jitter 403
+#define T_Prop_Delay 404
+#define T_Proc_Delay 405
+
+
+
+
+/* Copy the first part of user declarations.  */
 #line 11 "ntp_parser.y"
 
   #ifdef HAVE_CONFIG_H
@@ -189,8 +391,22 @@
   extern int input_from_file;  /* 0=input from ntpq>config command buffer */
   extern int cryptosw;
 
-#line 49 "ntp_parser.y"
+
+/* 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
+
 #ifndef YYSTYPE
+#line 49 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -205,38 +421,160 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
+/* Line 193 of /usr/local/share/bison/yacc.c.  */
+#line 426 "ntp_parser.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-#ifndef YYDEBUG
-# define YYDEBUG 1
+
+#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
 #endif
 
+/* Copy the second part of user declarations.  */
+
+
+/* Line 213 of /usr/local/share/bison/yacc.c.  */
+#line 447 "ntp_parser.c"
+
+#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
 
+# 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 */
 
-#define	YYFINAL		354
-#define	YYFLAG		-32768
-#define	YYNTBASE	155
 
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 403 ? yytranslate[x] : 218)
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const short yytranslate[] =
+/* 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   464
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  156
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  64
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  226
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  356
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   405
+
+#define YYTRANSLATE(X) \
+  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   151,     2,   152,     2,     2,     2,     2,
+       2,     2,     2,   152,     2,   153,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   150,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   151,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   153,     2,   154,     2,     2,     2,     2,
+       2,     2,     2,   154,     2,   155,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -249,155 +587,155 @@ static const short 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,     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
+       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
 };
 
 #if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     2,     6,     9,    12,    13,    15,    17,    19,
-      21,    23,    25,    27,    29,    31,    33,    35,    39,    42,
-      44,    46,    48,    50,    52,    54,    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,   134,   135,   138,   140,
-     143,   146,   149,   152,   155,   158,   161,   164,   166,   169,
+/* 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,   137,   138,   141,
+     143,   146,   149,   152,   155,   158,   161,   164,   167,   169,
      172,   175,   178,   181,   184,   187,   190,   193,   196,   199,
-     202,   205,   209,   212,   214,   216,   218,   220,   222,   224,
-     226,   229,   231,   234,   237,   239,   241,   243,   245,   247,
-     249,   251,   253,   255,   257,   259,   262,   266,   270,   276,
-     277,   280,   282,   284,   286,   288,   290,   292,   294,   296,
-     298,   300,   302,   304,   307,   309,   312,   315,   318,   322,
-     325,   327,   330,   333,   336,   339,   342,   345,   348,   351,
-     354,   357,   360,   362,   364,   366,   368,   370,   372,   374,
-     376,   379,   382,   384,   387,   390,   393,   396,   399,   402,
-     405,   409,   411,   414,   417,   420,   423,   426,   429,   432,
-     435,   438,   441,   444,   448,   451,   453,   456,   457,   462,
-     466,   469,   471,   474,   477,   480,   482,   485,   487,   489,
-     491,   493,   496,   498,   501,   503,   506,   508,   510,   512,
-     514,   516,   518,   524,   526,   530,   533,   537,   541,   544,
-     546,   552,   557,   561,   563,   565,   568,   570,   577,   581,
-     584,   588,   592,   596,   600
+     202,   205,   208,   212,   215,   217,   219,   221,   223,   225,
+     227,   229,   232,   234,   237,   240,   242,   244,   246,   248,
+     250,   252,   254,   256,   258,   260,   262,   265,   269,   273,
+     279,   280,   283,   285,   287,   289,   291,   293,   295,   297,
+     299,   301,   303,   305,   307,   310,   312,   315,   318,   321,
+     325,   328,   330,   333,   336,   339,   342,   345,   348,   351,
+     354,   357,   360,   363,   365,   367,   369,   371,   373,   375,
+     377,   379,   382,   385,   387,   390,   393,   396,   399,   402,
+     405,   408,   412,   414,   417,   420,   423,   426,   429,   432,
+     435,   438,   441,   444,   447,   451,   454,   457,   459,   462,
+     463,   468,   472,   475,   477,   480,   483,   486,   488,   491,
+     493,   495,   497,   499,   502,   504,   507,   509,   512,   514,
+     516,   518,   520,   522,   524,   530,   532,   536,   539,   543,
+     547,   550,   552,   558,   563,   567,   569,   571,   574,   576,
+     583,   587,   590,   594,   598,   602,   606
 };
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short yyrhs[] =
 {
-     156,     0,   156,   157,   139,     0,   157,   139,     0,     1,
-     139,     0,     0,   158,     0,   164,     0,   165,     0,   172,
-       0,   178,     0,   169,     0,   183,     0,   186,     0,   189,
-       0,   192,     0,   205,     0,   159,   160,   162,     0,   159,
-     160,     0,   113,     0,   101,     0,    96,     0,    11,     0,
-      66,     0,   161,     0,   122,     0,    51,   122,     0,    45,
-       0,    46,     0,   162,   163,     0,   163,     0,     6,     0,
-      14,     0,    47,     0,    54,    51,     0,    76,    51,     0,
-      72,    51,     0,    87,     0,   104,     0,   105,     0,   130,
-       0,   132,    51,     0,    78,    51,     0,   134,    51,     0,
-      12,     0,    12,    91,     0,    67,   202,     0,    81,   202,
-       0,     6,    51,     0,    20,    51,     0,    21,   166,     0,
-      55,   122,     0,    56,   122,     0,   110,    51,     0,   131,
-     200,     0,   167,     0,     0,   167,   168,     0,   168,     0,
-      43,   122,     0,    48,   122,     0,   106,   122,     0,   107,
-     122,     0,   112,    51,     0,   115,   122,     0,   128,   170,
-       0,   170,   171,     0,   171,     0,    17,    51,     0,    40,
-      51,     0,    19,   203,     0,    94,    51,     0,    74,   204,
-       0,    70,   204,     0,    73,   204,     0,    69,   204,     0,
-      77,    51,     0,    10,    51,     0,    71,    51,     0,   116,
-     173,     0,   118,   122,     0,    35,   174,   175,     0,   173,
-     174,     0,   174,     0,    18,     0,    22,     0,    64,     0,
-      97,     0,   108,     0,   123,     0,   175,   176,     0,   176,
-       0,    34,   122,     0,   133,   177,     0,    61,     0,    82,
-       0,    31,     0,    25,     0,    84,     0,    99,     0,    23,
-       0,   135,     0,    80,     0,   136,     0,     3,     0,    26,
-     181,     0,   111,   160,   179,     0,   111,    24,   179,     0,
-     111,   161,    68,   161,   179,     0,     0,   179,   180,     0,
-      49,     0,    57,     0,    60,     0,    65,     0,    83,     0,
-      85,     0,    86,     0,    88,     0,    89,     0,    90,     0,
-      93,     0,   134,     0,   181,   182,     0,   182,     0,     8,
-      51,     0,    75,    51,     0,    79,    51,     0,    42,   160,
-     184,     0,   184,   185,     0,   185,     0,   125,   204,     0,
-     126,   204,     0,   121,    51,     0,   109,   122,     0,    36,
-     203,     0,    37,   203,     0,    38,   203,     0,    39,   203,
-       0,    31,   187,     0,    25,   187,     0,   187,   188,     0,
-     188,     0,     5,     0,     9,     0,    15,     0,    53,     0,
-      79,     0,    92,     0,   117,     0,   127,   190,     0,   190,
-     191,     0,   191,     0,     4,   204,     0,    27,   204,     0,
-      41,   204,     0,    44,   204,     0,    95,   204,     0,   119,
-     204,     0,   120,   204,     0,    50,   122,   157,     0,    32,
-       0,    13,   204,     0,    16,    51,     0,   124,   204,     0,
-      29,   193,     0,    59,   122,     0,   100,   122,     0,    63,
-     122,     0,     7,    51,     0,    62,   197,     0,    98,   201,
-       0,   114,   194,     0,   129,   161,   195,     0,   132,   200,
-       0,   122,     0,   122,    28,     0,     0,   122,   150,   122,
-      24,     0,   122,   150,   122,     0,   195,   196,     0,   196,
-       0,   102,    51,     0,    52,   161,     0,   197,   198,     0,
-     198,     0,   199,   122,     0,   122,     0,   151,     0,   152,
-       0,   150,     0,   200,    51,     0,    51,     0,   201,   122,
-       0,   122,     0,   202,   160,     0,   160,     0,    51,     0,
-     130,     0,    33,     0,    51,     0,    28,     0,   206,   153,
-     207,   209,   154,     0,   140,     0,   207,   208,   139,     0,
-     208,   139,     0,   141,   150,   204,     0,   142,   150,   204,
-       0,   209,   210,     0,   210,     0,   212,   153,   211,   214,
-     154,     0,   143,   150,   204,   139,     0,   113,   150,   213,
-       0,   161,     0,   122,     0,   214,   215,     0,   215,     0,
-     144,   150,   204,   153,   216,   154,     0,   216,   217,   139,
-       0,   217,   139,     0,   145,   150,   204,     0,   146,   150,
-     204,     0,   147,   150,   204,     0,   148,   150,   204,     0,
-     149,   150,   204,     0
+     157,     0,    -1,   158,    -1,   158,   159,   140,    -1,   159,
+     140,    -1,     1,   140,    -1,    -1,   160,    -1,   166,    -1,
+     167,    -1,   174,    -1,   180,    -1,   171,    -1,   185,    -1,
+     188,    -1,   191,    -1,   194,    -1,   207,    -1,   161,   162,
+     164,    -1,   161,   162,    -1,   114,    -1,   101,    -1,    96,
+      -1,    11,    -1,    66,    -1,   163,    -1,   123,    -1,    51,
+     123,    -1,    45,    -1,    46,    -1,   164,   165,    -1,   165,
+      -1,     6,    -1,    14,    -1,    47,    -1,    54,    51,    -1,
+      76,    51,    -1,    72,    51,    -1,    87,    -1,   104,    -1,
+     105,    -1,   131,    -1,   133,    51,    -1,    78,    51,    -1,
+     135,    51,    -1,    12,    -1,    12,    91,    -1,    67,   204,
+      -1,    81,   204,    -1,     6,    51,    -1,    20,    51,    -1,
+      21,   168,    -1,    55,   123,    -1,    56,   123,    -1,   111,
+      51,    -1,   132,   202,    -1,   169,    -1,    -1,   169,   170,
+      -1,   170,    -1,    43,   123,    -1,    48,   123,    -1,   106,
+     123,    -1,   108,   123,    -1,   113,    51,    -1,   116,   123,
+      -1,   129,   172,    -1,   172,   173,    -1,   173,    -1,    17,
+      51,    -1,    40,    51,    -1,    19,   205,    -1,    94,    51,
+      -1,    74,   206,    -1,    70,   206,    -1,    73,   206,    -1,
+      69,   206,    -1,    77,    51,    -1,    10,    51,    -1,    71,
+      51,    -1,   117,   175,    -1,   119,   123,    -1,    35,   176,
+     177,    -1,   175,   176,    -1,   176,    -1,    18,    -1,    22,
+      -1,    64,    -1,    97,    -1,   109,    -1,   124,    -1,   177,
+     178,    -1,   178,    -1,    34,   123,    -1,   134,   179,    -1,
+      61,    -1,    82,    -1,    31,    -1,    25,    -1,    84,    -1,
+      99,    -1,    23,    -1,   136,    -1,    80,    -1,   137,    -1,
+       3,    -1,    26,   183,    -1,   112,   162,   181,    -1,   112,
+      24,   181,    -1,   112,   163,    68,   163,   181,    -1,    -1,
+     181,   182,    -1,    49,    -1,    57,    -1,    60,    -1,    65,
+      -1,    83,    -1,    85,    -1,    86,    -1,    88,    -1,    89,
+      -1,    90,    -1,    93,    -1,   135,    -1,   183,   184,    -1,
+     184,    -1,     8,    51,    -1,    75,    51,    -1,    79,    51,
+      -1,    42,   162,   186,    -1,   186,   187,    -1,   187,    -1,
+     126,   206,    -1,   127,   206,    -1,   122,    51,    -1,   110,
+     123,    -1,    36,   205,    -1,    37,   205,    -1,    38,   205,
+      -1,    39,   205,    -1,    31,   189,    -1,    25,   189,    -1,
+     189,   190,    -1,   190,    -1,     5,    -1,     9,    -1,    15,
+      -1,    53,    -1,    79,    -1,    92,    -1,   118,    -1,   128,
+     192,    -1,   192,   193,    -1,   193,    -1,     4,   206,    -1,
+      27,   206,    -1,    41,   206,    -1,    44,   206,    -1,    95,
+     206,    -1,   120,   206,    -1,   121,   206,    -1,    50,   123,
+     159,    -1,    32,    -1,    13,   206,    -1,    16,    51,    -1,
+     125,   206,    -1,    29,   195,    -1,    59,   123,    -1,   100,
+     123,    -1,    63,   123,    -1,     7,    51,    -1,    62,   199,
+      -1,    98,   203,    -1,   115,   196,    -1,   130,   163,   197,
+      -1,   133,   202,    -1,   107,   123,    -1,   123,    -1,   123,
+      28,    -1,    -1,   123,   151,   123,    24,    -1,   123,   151,
+     123,    -1,   197,   198,    -1,   198,    -1,   102,    51,    -1,
+      52,   163,    -1,   199,   200,    -1,   200,    -1,   201,   123,
+      -1,   123,    -1,   152,    -1,   153,    -1,   151,    -1,   202,
+      51,    -1,    51,    -1,   203,   123,    -1,   123,    -1,   204,
+     162,    -1,   162,    -1,    51,    -1,   131,    -1,    33,    -1,
+      51,    -1,    28,    -1,   208,   154,   209,   211,   155,    -1,
+     141,    -1,   209,   210,   140,    -1,   210,   140,    -1,   142,
+     151,   206,    -1,   143,   151,   206,    -1,   211,   212,    -1,
+     212,    -1,   214,   154,   213,   216,   155,    -1,   144,   151,
+     206,   140,    -1,   114,   151,   215,    -1,   163,    -1,   123,
+      -1,   216,   217,    -1,   217,    -1,   145,   151,   206,   154,
+     218,   155,    -1,   218,   219,   140,    -1,   219,   140,    -1,
+     146,   151,   206,    -1,   147,   151,   206,    -1,   148,   151,
+     206,    -1,   149,   151,   206,    -1,   150,   151,   206,    -1
 };
 
-#endif
-
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short yyrline[] =
 {
-       0,   278,   282,   283,   288,   299,   300,   301,   302,   303,
-     304,   305,   306,   307,   308,   309,   310,   318,   324,   333,
-     334,   335,   336,   337,   341,   342,   343,   359,   360,   364,
-     365,   370,   371,   372,   373,   374,   375,   376,   377,   378,
-     379,   380,   381,   382,   392,   394,   396,   398,   409,   411,
-     413,   420,   422,   424,   426,   431,   432,   437,   438,   442,
-     444,   446,   448,   450,   452,   462,   467,   468,   472,   474,
-     476,   478,   480,   482,   484,   486,   488,   490,   492,   502,
-     504,   506,   514,   515,   519,   521,   523,   525,   527,   529,
-     534,   535,   539,   540,   541,   542,   543,   544,   548,   549,
-     550,   551,   552,   553,   554,   563,   565,   570,   575,   583,
-     584,   588,   589,   590,   591,   592,   593,   594,   595,   596,
-     597,   598,   599,   603,   604,   608,   609,   610,   618,   623,
-     624,   628,   630,   632,   634,   636,   638,   640,   642,   651,
-     653,   658,   659,   663,   664,   665,   666,   667,   668,   670,
-     678,   682,   683,   687,   688,   689,   690,   691,   692,   693,
-     701,   717,   723,   725,   727,   729,   731,   734,   736,   738,
-     741,   743,   745,   747,   749,   753,   755,   758,   763,   765,
-     771,   772,   776,   777,   782,   783,   787,   788,   805,   806,
-     807,   816,   817,   821,   822,   826,   827,   831,   840,   841,
-     845,   846,   854,   869,   873,   874,   878,   879,   883,   884,
-     888,   893,   897,   901,   902,   906,   907,   911,   916,   917,
-     921,   923,   925,   927,   929
+       0,   279,   279,   283,   284,   289,   300,   301,   302,   303,
+     304,   305,   306,   307,   308,   309,   310,   311,   319,   325,
+     334,   335,   336,   337,   338,   342,   343,   344,   360,   361,
+     365,   366,   371,   372,   373,   374,   375,   376,   377,   378,
+     379,   380,   381,   382,   383,   393,   395,   397,   399,   410,
+     412,   414,   421,   423,   425,   427,   432,   433,   438,   439,
+     443,   445,   447,   449,   451,   453,   463,   468,   469,   473,
+     475,   477,   479,   481,   483,   485,   487,   489,   491,   493,
+     503,   505,   507,   515,   516,   520,   522,   524,   526,   528,
+     530,   535,   536,   540,   541,   542,   543,   544,   545,   549,
+     550,   551,   552,   553,   554,   555,   564,   566,   571,   576,
+     584,   585,   589,   590,   591,   592,   593,   594,   595,   596,
+     597,   598,   599,   600,   604,   605,   609,   610,   611,   619,
+     624,   625,   629,   631,   633,   635,   637,   639,   641,   643,
+     652,   654,   659,   660,   664,   665,   666,   667,   668,   669,
+     671,   679,   683,   684,   688,   689,   690,   691,   692,   693,
+     694,   702,   718,   724,   726,   728,   730,   732,   735,   737,
+     739,   742,   744,   746,   748,   750,   752,   756,   758,   761,
+     766,   768,   774,   775,   779,   780,   785,   786,   790,   791,
+     808,   809,   810,   819,   820,   824,   825,   829,   830,   834,
+     843,   844,   848,   849,   857,   872,   876,   877,   881,   882,
+     886,   887,   891,   896,   900,   904,   905,   909,   910,   914,
+     919,   920,   924,   926,   928,   930,   932
 };
 #endif
 
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$", "error", "$undefined.", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
+  "$end", "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_Clockstats", "T_Cohort", "T_ControlKey", 
@@ -417,442 +755,376 @@ static const char *const yytname[] =
   "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Novolley", 
   "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", "T_Peerstats", 
   "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Pps", 
-  "T_Preempt", "T_Prefer", "T_Pw", "T_RandFile", "T_Rawstats", "T_Refid", 
-  "T_Requestkey", "T_Restrict", "T_Revoke", "T_Server", "T_Setvar", 
-  "T_Sign", "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", 
+  "T_Preempt", "T_Prefer", "T_Pw", "T_Qos", "T_RandFile", "T_Rawstats", 
+  "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke", "T_Server", 
+  "T_Setvar", "T_Sign", "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", 
   "T_Stepout", "T_Stratum", "T_String", "T_Sysstats", "T_Tick", "T_Time1", 
   "T_Time2", "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", 
   "T_Ttl", "T_Type", "T_Version", "T_Week", "T_Year", "T_Flag", "T_Void", 
   "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", 
   "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", 
   "T_Jitter", "T_Prop_Delay", "T_Proc_Delay", "'='", "'+'", "'-'", "'{'", 
-  "'}'", "configuration", "command_list", "command", "server_command", 
-  "client_type", "address", "ip_address", "option_list", "option", 
-  "other_mode_command", "authentication_command", "crypto_command_line", 
-  "crypto_command_list", "crypto_command", "orphan_mode_command", 
-  "tos_option_list", "tos_option", "monitoring_command", "stats_list", 
-  "stat", "filegen_option_list", "filegen_option", "filegen_type", 
-  "access_control_command", "ac_flag_list", "access_control_flag", 
-  "discard_option_list", "discard_option", "fudge_command", 
-  "fudge_factor_list", "fudge_factor", "system_option_command", 
-  "system_option_list", "system_option", "tinker_command", 
-  "tinker_option_list", "tinker_option", "miscellaneous_command", 
-  "drift_parm", "variable_assign", "trap_option_list", "trap_option", 
-  "log_config_list", "log_config_command", "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
+  "'}'", "$accept", "configuration", "command_list", "command", 
+  "server_command", "client_type", "address", "ip_address", "option_list", 
+  "option", "other_mode_command", "authentication_command", 
+  "crypto_command_line", "crypto_command_list", "crypto_command", 
+  "orphan_mode_command", "tos_option_list", "tos_option", 
+  "monitoring_command", "stats_list", "stat", "filegen_option_list", 
+  "filegen_option", "filegen_type", "access_control_command", 
+  "ac_flag_list", "access_control_flag", "discard_option_list", 
+  "discard_option", "fudge_command", "fudge_factor_list", "fudge_factor", 
+  "system_option_command", "system_option_list", "system_option", 
+  "tinker_command", "tinker_option_list", "tinker_option", 
+  "miscellaneous_command", "drift_parm", "variable_assign", 
+  "trap_option_list", "trap_option", "log_config_list", 
+  "log_config_command", "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
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
+# 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,    61,    43,    45,   123,   125
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
 {
-       0,   155,   156,   156,   156,   157,   157,   157,   157,   157,
-     157,   157,   157,   157,   157,   157,   157,   158,   158,   159,
-     159,   159,   159,   159,   160,   160,   160,   161,   161,   162,
-     162,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-     163,   163,   163,   163,   164,   164,   164,   164,   165,   165,
-     165,   165,   165,   165,   165,   166,   166,   167,   167,   168,
-     168,   168,   168,   168,   168,   169,   170,   170,   171,   171,
-     171,   171,   171,   171,   171,   171,   171,   171,   171,   172,
-     172,   172,   173,   173,   174,   174,   174,   174,   174,   174,
-     175,   175,   176,   176,   176,   176,   176,   176,   177,   177,
-     177,   177,   177,   177,   177,   178,   178,   178,   178,   179,
-     179,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   181,   181,   182,   182,   182,   183,   184,
-     184,   185,   185,   185,   185,   185,   185,   185,   185,   186,
-     186,   187,   187,   188,   188,   188,   188,   188,   188,   188,
-     189,   190,   190,   191,   191,   191,   191,   191,   191,   191,
-     192,   192,   192,   192,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   192,   192,   193,   193,   193,   194,   194,
-     195,   195,   196,   196,   197,   197,   198,   198,   199,   199,
-     199,   200,   200,   201,   201,   202,   202,   203,   203,   203,
-     204,   204,   205,   206,   207,   207,   208,   208,   209,   209,
-     210,   211,   212,   213,   213,   214,   214,   215,   216,   216,
-     217,   217,   217,   217,   217
+       0,   156,   157,   158,   158,   158,   159,   159,   159,   159,
+     159,   159,   159,   159,   159,   159,   159,   159,   160,   160,
+     161,   161,   161,   161,   161,   162,   162,   162,   163,   163,
+     164,   164,   165,   165,   165,   165,   165,   165,   165,   165,
+     165,   165,   165,   165,   165,   166,   166,   166,   166,   167,
+     167,   167,   167,   167,   167,   167,   168,   168,   169,   169,
+     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,   194,   194,   195,   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 short yyr2[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
 {
-       0,     1,     3,     2,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     2,     1,
-       1,     1,     1,     1,     1,     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,     1,     0,     2,     1,     2,
-       2,     2,     2,     2,     2,     2,     2,     1,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     3,     2,     1,     1,     1,     1,     1,     1,     1,
-       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,     2,     2,     2,     2,     2,
-       2,     2,     2,     3,     2,     1,     2,     0,     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,     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,     1,     0,     2,     1,
+       2,     2,     2,     2,     2,     2,     2,     2,     1,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     3,     2,     1,     1,     1,     1,     1,     1,
+       1,     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,     2,     2,     2,     2,
+       2,     2,     2,     2,     3,     2,     2,     1,     2,     0,
+       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[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,    56,
-       0,     0,   177,     0,   161,     0,     0,     0,     0,     0,
-       0,     0,     0,    23,     0,     0,    21,     0,     0,    20,
-       0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   203,     1,     0,     6,     0,     7,     8,    11,
-       9,    10,    12,    13,    14,    15,    16,     0,     4,    48,
-     169,    45,   201,   200,   162,   163,    49,     0,     0,     0,
-       0,     0,     0,    50,    55,    58,   143,   144,   145,   146,
-     147,   148,   149,   140,   142,     0,     0,     0,   105,   124,
-     175,   165,   139,    84,    85,    86,    87,    88,    89,     0,
-      27,    28,     0,    25,     0,    24,     5,    51,    52,   166,
-     187,   190,   188,   189,   170,   185,     0,   168,   196,    46,
-      47,   194,   171,   167,    53,   109,   109,    24,     0,   172,
-      79,    83,    80,   164,     0,     0,     0,     0,     0,     0,
-       0,   150,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    65,    67,     0,   192,    54,   174,
-       0,     3,    18,     0,    59,    60,    61,    62,    63,    64,
-      57,   141,   125,   126,   127,   123,   176,    97,    96,     0,
-      94,    95,     0,    81,    91,    26,     0,     0,     0,     0,
-       0,     0,     0,     0,   128,   130,   160,   184,   186,   195,
-     193,   107,   106,     0,     0,    82,   153,   154,   155,   156,
-     157,   158,   159,   151,    77,    68,   199,   197,   198,    70,
-      69,    75,    73,    78,    74,    72,    76,    71,    66,     0,
-       0,   173,   181,   191,     2,    31,    32,    33,     0,     0,
-       0,     0,    37,    38,    39,    40,     0,     0,    17,    30,
-       0,     0,     0,     0,    92,   104,   100,   102,    98,    99,
-     101,   103,    93,    90,   135,   136,   137,   138,   134,   133,
-     131,   132,   129,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   110,   109,   179,   183,   182,
-     180,    34,    36,    35,    42,    41,    43,    29,     0,     0,
-       0,     0,     0,   209,     0,   205,   108,   178,   206,   207,
-       0,   204,   202,   208,     0,   214,   213,   212,     0,     0,
-       0,     0,     0,   216,     0,     0,   210,   215,   211,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   217,     0,   219,   220,   221,   222,   223,
-     224,   218,     0,     0,     0
+/* 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,    57,
+       0,     0,   179,     0,   162,     0,     0,     0,     0,     0,
+       0,     0,     0,    24,     0,     0,    22,     0,     0,    21,
+       0,     0,     0,    20,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   205,     0,     2,     0,     7,     0,     8,
+       9,    12,    10,    11,    13,    14,    15,    16,    17,     0,
+       5,    49,   170,    46,   203,   202,   163,   164,    50,     0,
+       0,     0,     0,     0,     0,    51,    56,    59,   144,   145,
+     146,   147,   148,   149,   150,   141,   143,     0,     0,     0,
+     106,   125,   177,   166,   140,    85,    86,    87,    88,    89,
+      90,     0,    28,    29,     0,    26,     0,    25,     6,    52,
+      53,   167,   189,   192,   190,   191,   171,   187,     0,   169,
+     198,    47,    48,   196,   172,   168,   176,    54,   110,   110,
+      25,     0,   173,    80,    84,    81,   165,     0,     0,     0,
+       0,     0,     0,     0,   151,   153,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    66,    68,     0,
+     194,    55,   175,     1,     0,     4,    19,     0,    60,    61,
+      62,    63,    64,    65,    58,   142,   126,   127,   128,   124,
+     178,    98,    97,     0,    95,    96,     0,    82,    92,    27,
+       0,     0,     0,     0,     0,     0,     0,     0,   129,   131,
+     161,   186,   188,   197,   195,   108,   107,     0,     0,    83,
+     154,   155,   156,   157,   158,   159,   160,   152,    78,    69,
+     201,   199,   200,    71,    70,    76,    74,    79,    75,    73,
+      77,    72,    67,     0,     0,   174,   183,   193,     3,    32,
+      33,    34,     0,     0,     0,     0,    38,    39,    40,    41,
+       0,     0,    18,    31,     0,     0,     0,     0,    93,   105,
+     101,   103,    99,   100,   102,   104,    94,    91,   136,   137,
+     138,   139,   135,   134,   132,   133,   130,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   111,
+     110,   181,   185,   184,   182,    35,    37,    36,    43,    42,
+      44,    30,     0,     0,     0,     0,     0,   211,     0,   207,
+     109,   180,   208,   209,     0,   206,   204,   210,     0,   216,
+     215,   214,     0,     0,     0,     0,     0,   218,     0,     0,
+     212,   217,   213,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   219,     0,   221,
+     222,   223,   224,   225,   226,   220
 };
 
+/* YYDEFGOTO[NTERM-NUM]. */
 static const short yydefgoto[] =
 {
-     352,    43,    44,    45,    46,   118,   105,   248,   249,    47,
-      48,    73,    74,    75,    49,   154,   155,    50,   130,    99,
-     183,   184,   262,    51,   201,   285,    88,    89,    52,   194,
-     195,    53,    83,    84,    54,   141,   142,    55,    91,   129,
-     231,   232,   114,   115,   116,   158,   122,   119,   219,    64,
-      56,    57,   252,   253,   302,   303,   319,   304,   317,   322,
-     323,   336,   337
+      -1,    44,    45,    46,    47,    48,   120,   107,   252,   253,
+      49,    50,    75,    76,    77,    51,   157,   158,    52,   133,
+     101,   187,   188,   266,    53,   205,   289,    90,    91,    54,
+     198,   199,    55,    85,    86,    56,   144,   145,    57,    93,
+     132,   235,   236,   116,   117,   118,   161,   124,   121,   223,
+      66,    58,    59,   256,   257,   306,   307,   323,   308,   321,
+     326,   327,   340,   341
 };
 
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -138
 static const short yypact[] =
 {
-       9,  -115,   -20,   -12,-32768,   -33,    -5,    16,    19,   134,
-      -1,    71,   -41,    -1,-32768,   -15,   -34,   -28,   -16,    -4,
-       4,    41,     7,-32768,   -34,   -34,-32768,    13,    17,-32768,
-      26,     2,-32768,    21,   -15,    22,    -5,    39,   376,    28,
-      38,    38,-32768,   154,   -18,-32768,   -34,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -61,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    25,    30,    31,
-      42,   104,    49,-32768,   134,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,    -1,-32768,   121,   125,   127,    71,-32768,
-     156,-32768,    -1,-32768,-32768,-32768,-32768,-32768,-32768,   120,
-  -32768,-32768,    65,-32768,   220,-32768,   301,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    41,-32768,    66,-32768,-32768,   -34,
-     -34,-32768,    72,-32768,-32768,-32768,-32768,   129,    45,-32768,
-     -15,-32768,-32768,-32768,    -5,    -5,    -5,    -5,    -5,    -5,
-      -5,    39,-32768,   149,   152,    12,   157,    -5,    -5,   160,
-      -5,    -5,   161,   163,   376,-32768,   -47,-32768,   164,   164,
-      68,-32768,   305,   -45,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    83,
-  -32768,-32768,    33,   120,-32768,-32768,    12,    12,    12,    12,
-      96,   168,    -5,    -5,   220,-32768,-32768,-32768,-32768,-32768,
-  -32768,   141,   141,    28,   100,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    28,
-     172,   -47,-32768,-32768,-32768,-32768,-32768,-32768,   174,   177,
-     181,   182,-32768,-32768,-32768,-32768,   185,   186,   305,-32768,
-      88,    89,   -80,   103,-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,   219,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    -5,    -5,
-      94,   106,  -100,-32768,    95,-32768,   141,-32768,-32768,-32768,
-     -27,-32768,-32768,-32768,   108,-32768,-32768,-32768,    97,   116,
-      -5,   111,   -94,-32768,   130,    -5,-32768,-32768,-32768,   113,
-     150,   123,   124,   126,   137,   138,   224,   132,    -5,    -5,
-      -5,    -5,    -5,-32768,   140,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,   277,   290,-32768
+      11,  -137,   -44,   -26,  -138,   -80,     5,   -13,   -10,   132,
+       1,     7,   -68,     1,  -138,   -14,   -32,   -52,   -42,   -33,
+     -29,   -64,   -24,  -138,   -32,   -32,  -138,   -15,    -8,  -138,
+      -2,    82,     6,  -138,    12,   -14,    15,     5,    93,   370,
+      86,    94,    94,  -138,    79,   161,    13,  -138,   -32,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,    -7,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,    43,
+      46,    47,    55,   111,    61,  -138,   132,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,     1,  -138,   134,   138,   140,
+       7,  -138,   155,  -138,     1,  -138,  -138,  -138,  -138,  -138,
+    -138,    14,  -138,  -138,    71,  -138,   336,  -138,   304,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,   -64,  -138,    72,  -138,
+    -138,   -32,   -32,  -138,    74,  -138,  -138,  -138,  -138,  -138,
+     133,    49,  -138,   -14,  -138,  -138,  -138,     5,     5,     5,
+       5,     5,     5,     5,    93,  -138,   153,   154,    -4,   167,
+       5,     5,   170,     5,     5,   171,   174,   370,  -138,   -18,
+    -138,   175,   175,  -138,    95,  -138,   165,    22,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,   110,  -138,  -138,    62,    14,  -138,  -138,
+      -4,    -4,    -4,    -4,   113,   183,     5,     5,   336,  -138,
+    -138,  -138,  -138,  -138,  -138,   293,   293,    86,   116,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,    86,   193,   -18,  -138,  -138,  -138,  -138,
+    -138,  -138,   195,   196,   198,   199,  -138,  -138,  -138,  -138,
+     200,   202,   165,  -138,   103,   104,   -79,   118,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,   232,  -138,  -138,  -138,  -138,  -138,  -138,  -138,  -138,
+    -138,  -138,     5,     5,   109,   123,   -86,  -138,   117,  -138,
+     293,  -138,  -138,  -138,   -25,  -138,  -138,  -138,   120,  -138,
+    -138,  -138,   126,   122,     5,   128,   -83,  -138,   141,     5,
+    -138,  -138,  -138,   130,     8,   131,   137,   144,   146,   148,
+      60,   145,     5,     5,     5,     5,     5,  -138,   163,  -138,
+    -138,  -138,  -138,  -138,  -138,  -138
 };
 
+/* YYPGOTO[NTERM-NUM].  */
 static const short yypgoto[] =
 {
-  -32768,-32768,   -37,-32768,-32768,    11,   -30,-32768,    43,-32768,
-  -32768,-32768,-32768,   218,-32768,-32768,   146,-32768,-32768,    -2,
-  -32768,   118,-32768,-32768,  -124,-32768,-32768,   221,-32768,-32768,
-     122,-32768,   297,   -55,-32768,-32768,   179,-32768,-32768,-32768,
-  -32768,    84,-32768,   204,-32768,   282,-32768,   299,  -102,   -36,
-  -32768,-32768,-32768,    73,-32768,    29,-32768,-32768,-32768,-32768,
-       6,-32768,     1
+    -138,  -138,  -138,   -40,  -138,  -138,    28,   -31,  -138,    52,
+    -138,  -138,  -138,  -138,   236,  -138,  -138,   156,  -138,  -138,
+      -9,  -138,    87,  -138,  -138,  -127,  -138,  -138,   224,  -138,
+    -138,   121,  -138,   305,   -36,  -138,  -138,   177,  -138,  -138,
+    -138,  -138,    88,  -138,   206,  -138,   284,  -138,   302,    39,
+     -37,  -138,  -138,  -138,    75,  -138,    26,  -138,  -138,  -138,
+    -138,     2,  -138,    -6
 };
 
-
-#define	YYLAST		470
-
-
+/* 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
 static const short yytable[] =
 {
-     133,   127,   202,    93,    76,   229,   160,    94,    77,   156,
-       1,   100,   101,   300,    78,     2,     3,   102,   100,   101,
-       4,     5,     6,    62,    58,     7,   125,   104,   171,     8,
-       9,    59,   131,   300,    10,    11,   255,   171,    12,    60,
-      13,    14,   126,   134,    15,   216,    63,   100,   101,    95,
-     321,    16,    79,   102,   312,   230,   256,   162,    61,    17,
-     326,   250,   251,   217,    18,    19,   135,    65,    20,   196,
-      66,    21,    22,   100,   101,    23,    24,   124,    80,    85,
-     136,    90,    96,   137,   264,   265,   266,   267,   103,   157,
-      25,    81,   163,    97,   106,   315,   250,   251,   206,   207,
-     208,   209,   210,   211,   212,    26,   107,    27,    98,    28,
-      29,   221,   222,   257,   224,   225,    82,   258,   108,    30,
-      31,   161,    32,    33,   103,    34,   109,    35,   205,   117,
-     199,   199,   259,    36,   138,   121,    37,    38,    39,   123,
-      40,    41,   218,   128,   132,   177,    86,   164,    -5,    42,
-      87,   178,   165,   166,   179,   168,   270,   271,   139,   140,
-       2,     3,   306,   110,   167,     4,     5,     6,   260,   261,
-       7,   169,   172,   286,     8,     9,   173,    67,   174,    10,
-      11,   180,    68,    12,   176,    13,    14,   185,   198,    15,
-     273,   111,   112,   113,   200,   204,    16,   203,   274,   288,
-     214,   275,   181,   215,    17,   254,   276,   234,   220,    18,
-      19,   223,   226,    20,   227,   233,    21,    22,   268,   269,
-      23,    24,   287,   289,   277,   291,   278,   279,   292,   280,
-     281,   282,   293,   294,   283,    25,   295,   296,   298,   299,
-      69,    70,   305,   307,   310,   311,    71,   320,   314,    72,
-      26,   318,    27,   182,    28,    29,   186,   187,   188,   189,
-     321,   325,   308,   309,    30,    31,   330,    32,    33,   328,
-      34,   345,    35,   338,   339,   284,   340,   353,    36,   351,
-     316,    37,    38,    39,   324,    40,    41,   341,   342,   329,
-     354,   297,   170,    -5,    42,   331,   332,   333,   334,   335,
-     228,   263,   346,   347,   348,   349,   350,     2,     3,   175,
-      92,   235,     4,     5,     6,   290,   272,     7,   197,   236,
-     213,     8,     9,   159,   120,   301,    10,    11,   327,   190,
-      12,   313,    13,    14,     0,     0,    15,   344,     0,     0,
-       0,   191,     0,    16,     0,   192,   193,     0,     0,     0,
-       0,    17,   237,     0,     0,     0,    18,    19,     0,   238,
-      20,     0,     0,    21,    22,     0,     0,    23,    24,   331,
-     332,   333,   334,   335,     0,     0,     0,   239,   343,     0,
-       0,   240,    25,   241,     0,     0,   143,     0,     0,     0,
-       0,     0,   242,   144,     0,   145,     0,    26,     0,    27,
-       0,    28,    29,     0,     0,     0,     0,     0,     0,   243,
-     244,    30,    31,     0,    32,    33,   146,    34,     0,    35,
-       0,     0,     0,     0,     0,    36,     0,     0,    37,    38,
-      39,     0,    40,    41,     0,   245,     0,   246,     0,   247,
-       0,    42,     0,     0,     0,   147,   148,   149,     0,   150,
-     151,     0,     0,   152,     0,     0,     0,     0,     0,     0,
+     136,   130,   206,    60,    95,   164,    78,    61,    96,   159,
+      79,    63,     1,   102,   103,    87,    80,     2,     3,   104,
+     102,   103,     4,     5,     6,    62,   134,     7,   304,   220,
+     128,     8,     9,    64,   233,   304,    10,    11,    67,   181,
+      12,    68,    13,    14,   106,   182,    15,   221,   183,   175,
+      97,   102,   103,    16,    81,    92,    65,   104,   175,   112,
+     129,    17,   325,   254,   255,   259,    18,    19,   200,   316,
+      20,   108,   330,    21,    22,   184,   166,    23,    24,   163,
+      82,   109,    88,    98,   234,   260,    89,   113,   114,   115,
+     110,   105,    25,    83,   111,    99,   185,   137,   319,   119,
+     210,   211,   212,   213,   214,   215,   216,    26,   123,    27,
+     100,    28,    29,   225,   226,   125,   228,   229,    30,    84,
+     138,   126,    31,    32,   209,    33,    34,   222,    35,   105,
+      36,   102,   103,   127,   139,   131,    37,   140,   135,    38,
+      39,    40,   261,    41,    42,   160,   262,   167,   186,   203,
+     203,    -6,    43,   165,   335,   336,   337,   338,   339,   274,
+     275,   263,   172,   310,   254,   255,   168,     2,     3,   169,
+     170,   239,     4,     5,     6,    69,   290,     7,   171,   240,
+      70,     8,     9,   180,   173,   176,    10,    11,   141,   177,
+      12,   178,    13,    14,   189,   202,    15,   204,   264,   265,
+     208,   207,   292,    16,   218,   219,   335,   336,   337,   338,
+     339,    17,   241,   142,   143,   347,    18,    19,   224,   242,
+      20,   227,   230,    21,    22,   231,   237,    23,    24,   268,
+     269,   270,   271,   258,   273,   238,   272,   243,    71,   291,
+      72,   244,    25,   245,   293,    73,   295,   296,    74,   297,
+     298,   299,   246,   300,   302,   303,   311,    26,   309,    27,
+     314,    28,    29,   315,   322,   312,   313,   325,    30,   247,
+     248,   318,    31,    32,   267,    33,    34,   324,    35,   329,
+      36,   332,   342,   320,   334,   349,    37,   328,   343,    38,
+      39,    40,   333,    41,    42,   344,   249,   345,   250,   346,
+     251,    -6,    43,   355,   301,   350,   351,   352,   353,   354,
+       2,     3,   174,   232,   179,     4,     5,     6,    94,   276,
+       7,   217,   201,   294,     8,     9,   162,   122,   331,    10,
+      11,   305,   317,    12,   348,    13,    14,     0,     0,    15,
+       0,     0,   277,     0,     0,     0,    16,     0,     0,     0,
+     278,     0,     0,   279,    17,     0,     0,     0,   280,    18,
+      19,     0,     0,    20,     0,     0,    21,    22,     0,     0,
+      23,    24,   190,   191,   192,   193,   281,     0,   282,   283,
+     146,   284,   285,   286,     0,    25,   287,   147,     0,   148,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     153
+      26,     0,    27,     0,    28,    29,     0,     0,     0,     0,
+     149,    30,     0,     0,     0,    31,    32,     0,    33,    34,
+       0,    35,     0,    36,     0,     0,     0,     0,   288,    37,
+       0,     0,    38,    39,    40,     0,    41,    42,     0,   150,
+     151,   152,     0,   153,   154,    43,   194,   155,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   195,     0,
+       0,     0,   196,   197,   156
 };
 
 static const short yycheck[] =
 {
-      36,    31,   126,    18,     5,    52,    43,    22,     9,    39,
-       1,    45,    46,   113,    15,     6,     7,    51,    45,    46,
-      11,    12,    13,    28,   139,    16,    24,    16,    83,    20,
-      21,    51,    34,   113,    25,    26,     3,    92,    29,    51,
-      31,    32,    31,     4,    35,    33,    51,    45,    46,    64,
-     144,    42,    53,    51,   154,   102,    23,    46,    91,    50,
-     154,   141,   142,    51,    55,    56,    27,    51,    59,   106,
-      51,    62,    63,    45,    46,    66,    67,    51,    79,     8,
-      41,   122,    97,    44,   186,   187,   188,   189,   122,    51,
-      81,    92,   153,   108,   122,   122,   141,   142,   134,   135,
-     136,   137,   138,   139,   140,    96,   122,    98,   123,   100,
-     101,   147,   148,    80,   150,   151,   117,    84,   122,   110,
-     111,   139,   113,   114,   122,   116,   122,   118,   130,   122,
-     119,   120,    99,   124,    95,   122,   127,   128,   129,   122,
-     131,   132,   130,   122,   122,    25,    75,   122,   139,   140,
-      79,    31,   122,   122,    34,    51,   192,   193,   119,   120,
-       6,     7,   286,   122,   122,    11,    12,    13,   135,   136,
-      16,   122,    51,   203,    20,    21,    51,    43,    51,    25,
-      26,    61,    48,    29,    28,    31,    32,   122,   122,    35,
-      49,   150,   151,   152,   122,   150,    42,    68,    57,   229,
-      51,    60,    82,    51,    50,   122,    65,   139,    51,    55,
-      56,    51,    51,    59,    51,    51,    62,    63,   122,    51,
-      66,    67,   122,    51,    83,    51,    85,    86,    51,    88,
-      89,    90,    51,    51,    93,    81,    51,    51,   150,   150,
-     106,   107,   139,    24,   150,   139,   112,   150,   153,   115,
-      96,   143,    98,   133,   100,   101,    36,    37,    38,    39,
-     144,   150,   298,   299,   110,   111,   153,   113,   114,   139,
-     116,   139,   118,   150,   150,   134,   150,     0,   124,   139,
-     310,   127,   128,   129,   320,   131,   132,   150,   150,   325,
-       0,   248,    74,   139,   140,   145,   146,   147,   148,   149,
-     154,   183,   338,   339,   340,   341,   342,     6,     7,    88,
-      13,     6,    11,    12,    13,   231,   194,    16,   114,    14,
-     141,    20,    21,    41,    25,   252,    25,    26,   322,   109,
-      29,   302,    31,    32,    -1,    -1,    35,   336,    -1,    -1,
-      -1,   121,    -1,    42,    -1,   125,   126,    -1,    -1,    -1,
-      -1,    50,    47,    -1,    -1,    -1,    55,    56,    -1,    54,
-      59,    -1,    -1,    62,    63,    -1,    -1,    66,    67,   145,
-     146,   147,   148,   149,    -1,    -1,    -1,    72,   154,    -1,
-      -1,    76,    81,    78,    -1,    -1,    10,    -1,    -1,    -1,
-      -1,    -1,    87,    17,    -1,    19,    -1,    96,    -1,    98,
-      -1,   100,   101,    -1,    -1,    -1,    -1,    -1,    -1,   104,
-     105,   110,   111,    -1,   113,   114,    40,   116,    -1,   118,
-      -1,    -1,    -1,    -1,    -1,   124,    -1,    -1,   127,   128,
-     129,    -1,   131,   132,    -1,   130,    -1,   132,    -1,   134,
-      -1,   140,    -1,    -1,    -1,    69,    70,    71,    -1,    73,
-      74,    -1,    -1,    77,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,    32,   129,   140,    18,    45,     5,    51,    22,    40,
+       9,    91,     1,    45,    46,     8,    15,     6,     7,    51,
+      45,    46,    11,    12,    13,    51,    35,    16,   114,    33,
+      24,    20,    21,    28,    52,   114,    25,    26,    51,    25,
+      29,    51,    31,    32,    16,    31,    35,    51,    34,    85,
+      64,    45,    46,    42,    53,   123,    51,    51,    94,   123,
+      32,    50,   145,   142,   143,     3,    55,    56,   108,   155,
+      59,   123,   155,    62,    63,    61,    48,    66,    67,     0,
+      79,   123,    75,    97,   102,    23,    79,   151,   152,   153,
+     123,   123,    81,    92,   123,   109,    82,     4,   123,   123,
+     137,   138,   139,   140,   141,   142,   143,    96,   123,    98,
+     124,   100,   101,   150,   151,   123,   153,   154,   107,   118,
+      27,   123,   111,   112,   133,   114,   115,   131,   117,   123,
+     119,    45,    46,    51,    41,   123,   125,    44,   123,   128,
+     129,   130,    80,   132,   133,    51,    84,   154,   134,   121,
+     122,   140,   141,   140,   146,   147,   148,   149,   150,   196,
+     197,    99,    51,   290,   142,   143,   123,     6,     7,   123,
+     123,     6,    11,    12,    13,    43,   207,    16,   123,    14,
+      48,    20,    21,    28,   123,    51,    25,    26,    95,    51,
+      29,    51,    31,    32,   123,   123,    35,   123,   136,   137,
+     151,    68,   233,    42,    51,    51,   146,   147,   148,   149,
+     150,    50,    47,   120,   121,   155,    55,    56,    51,    54,
+      59,    51,    51,    62,    63,    51,    51,    66,    67,   190,
+     191,   192,   193,   123,    51,   140,   123,    72,   106,   123,
+     108,    76,    81,    78,    51,   113,    51,    51,   116,    51,
+      51,    51,    87,    51,   151,   151,    24,    96,   140,    98,
+     151,   100,   101,   140,   144,   302,   303,   145,   107,   104,
+     105,   154,   111,   112,   187,   114,   115,   151,   117,   151,
+     119,   140,   151,   314,   154,   140,   125,   324,   151,   128,
+     129,   130,   329,   132,   133,   151,   131,   151,   133,   151,
+     135,   140,   141,   140,   252,   342,   343,   344,   345,   346,
+       6,     7,    76,   157,    90,    11,    12,    13,    13,   198,
+      16,   144,   116,   235,    20,    21,    42,    25,   326,    25,
+      26,   256,   306,    29,   340,    31,    32,    -1,    -1,    35,
+      -1,    -1,    49,    -1,    -1,    -1,    42,    -1,    -1,    -1,
+      57,    -1,    -1,    60,    50,    -1,    -1,    -1,    65,    55,
+      56,    -1,    -1,    59,    -1,    -1,    62,    63,    -1,    -1,
+      66,    67,    36,    37,    38,    39,    83,    -1,    85,    86,
+      10,    88,    89,    90,    -1,    81,    93,    17,    -1,    19,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94
+      96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,    -1,
+      40,   107,    -1,    -1,    -1,   111,   112,    -1,   114,   115,
+      -1,   117,    -1,   119,    -1,    -1,    -1,    -1,   135,   125,
+      -1,    -1,   128,   129,   130,    -1,   132,   133,    -1,    69,
+      70,    71,    -1,    73,    74,   141,   110,    77,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,    -1,
+      -1,    -1,   126,   127,    94
 };
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/gnu/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
-#   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
-#  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
-# endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
-
-
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  short yyss;
-  YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
+/* 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,    20,    21,
+      25,    26,    29,    31,    32,    35,    42,    50,    55,    56,
+      59,    62,    63,    66,    67,    81,    96,    98,   100,   101,
+     107,   111,   112,   114,   115,   117,   119,   125,   128,   129,
+     130,   132,   133,   141,   157,   158,   159,   160,   161,   166,
+     167,   171,   174,   180,   185,   188,   191,   194,   207,   208,
+     140,    51,    51,    91,    28,    51,   206,    51,    51,    43,
+      48,   106,   108,   113,   116,   168,   169,   170,     5,     9,
+      15,    53,    79,    92,   118,   189,   190,     8,    75,    79,
+     183,   184,   123,   195,   189,    18,    22,    64,    97,   109,
+     124,   176,    45,    46,    51,   123,   162,   163,   123,   123,
+     123,   123,   123,   151,   152,   153,   199,   200,   201,   123,
+     162,   204,   204,   123,   203,   123,   123,    51,    24,   162,
+     163,   123,   196,   175,   176,   123,   206,     4,    27,    41,
+      44,    95,   120,   121,   192,   193,    10,    17,    19,    40,
+      69,    70,    71,    73,    74,    77,    94,   172,   173,   163,
+      51,   202,   202,     0,   159,   140,   162,   154,   123,   123,
+     123,   123,    51,   123,   170,   190,    51,    51,    51,   184,
+      28,    25,    31,    34,    61,    82,   134,   177,   178,   123,
+      36,    37,    38,    39,   110,   122,   126,   127,   186,   187,
+     159,   200,   123,   162,   123,   181,   181,    68,   151,   176,
+     206,   206,   206,   206,   206,   206,   206,   193,    51,    51,
+      33,    51,   131,   205,    51,   206,   206,    51,   206,   206,
+      51,    51,   173,    52,   102,   197,   198,    51,   140,     6,
+      14,    47,    54,    72,    76,    78,    87,   104,   105,   131,
+     133,   135,   164,   165,   142,   143,   209,   210,   123,     3,
+      23,    80,    84,    99,   136,   137,   179,   178,   205,   205,
+     205,   205,   123,    51,   206,   206,   187,    49,    57,    60,
+      65,    83,    85,    86,    88,    89,    90,    93,   135,   182,
+     163,   123,   163,    51,   198,    51,    51,    51,    51,    51,
+      51,   165,   151,   151,   114,   210,   211,   212,   214,   140,
+     181,    24,   206,   206,   151,   140,   155,   212,   154,   123,
+     163,   215,   144,   213,   151,   145,   216,   217,   206,   151,
+     155,   217,   140,   206,   154,   146,   147,   148,   149,   150,
+     218,   219,   151,   151,   151,   151,   151,   155,   219,   140,
+     206,   206,   206,   206,   206,   140
 };
 
-/* 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
@@ -873,14 +1145,19 @@ union yyalloc
 #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)				\
@@ -901,41 +1178,20 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
-
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
+   are run).  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)           \
+  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;
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
-#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 */
-
+#define YYLEX	yylex ()
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -950,11 +1206,17 @@ 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.  */
@@ -976,8 +1238,10 @@ int yydebug;
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
+
 
-#ifdef YYERROR_VERBOSE
+
+#if YYERROR_VERBOSE
 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)
@@ -1027,11 +1291,74 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
-#endif
+
+#endif /* !YYERROR_VERBOSE */
+
 
-#line 315 "/usr/local/gnu/share/bison/bison.simple"
+
+#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;
+    }
+}
+
+
+
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
    It should actually point to an object.
@@ -1060,46 +1387,22 @@ int yyparse (void);
 # endif
 #endif
 
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
 
-#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;
-
-#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
+/* The lookahead symbol.  */
+int yychar;
 
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
 
-/* If nonreentrant, generate the variables here. */
+/* Number of parse errors so far.  */
+int yynerrs;
 
-#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;
@@ -1116,7 +1419,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;
@@ -1126,31 +1429,19 @@ 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
 
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+#define YYPOPSTACK   (yyvsp--, yyssp--)
 
+  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"));
@@ -1167,9 +1458,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1197,24 +1486,17 @@ 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.  */
-# 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
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
 	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
-# endif
+
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
@@ -1237,10 +1519,8 @@ yyparse (YYPARSE_PARAM_ARG)
 	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
+
+#  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -1249,9 +1529,7 @@ 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));
@@ -1264,7 +1542,6 @@ yyparse (YYPARSE_PARAM_ARG)
 
   goto yybackup;
 
-
 /*-----------.
 | yybackup.  |
 `-----------*/
@@ -1277,7 +1554,7 @@ yybackup:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1291,12 +1568,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"));
     }
@@ -1304,45 +1581,26 @@ yybackup:
     {
       yychar1 = YYTRANSLATE (yychar);
 
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
+      /* 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 the proper action on seeing token YYCHAR1 is to reduce or to
+     detect an error, take that action.  */
   yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
@@ -1356,9 +1614,7 @@ yybackup:
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
@@ -1389,19 +1645,14 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
+
 
 #if YYDEBUG
   /* We have to keep this `#if YYDEBUG', since we use variables which
@@ -1411,20 +1662,19 @@ yyreduce:
       int yyi;
 
       YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
+		 yyn - 1, 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 4:
-#line 289 "ntp_parser.y"
-{
+  switch (yyn)
+    {
+        case 5:
+#line 290 "ntp_parser.y"
+    {
 					if (input_from_file == 1) {
 			msyslog(LOG_INFO, "parse error %s line %d ignored\n",
                             ip_file->fname, ip_file->line_no);
@@ -1433,53 +1683,63 @@ case 4:
 				    "parse: bad boolean input flag\n");
                 }
     break;
-case 17:
-#line 319 "ntp_parser.y"
-{
+
+  case 18:
+#line 320 "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 18:
-#line 325 "ntp_parser.y"
-{
+
+  case 19:
+#line 326 "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 19:
-#line 333 "ntp_parser.y"
-{ yyval.Integer = T_Server; }
-    break;
-case 20:
+
+  case 20:
 #line 334 "ntp_parser.y"
-{ yyval.Integer = T_Pool; }
+    { yyval.Integer = T_Server; }
     break;
-case 21:
+
+  case 21:
 #line 335 "ntp_parser.y"
-{ yyval.Integer = T_Peer; }
+    { yyval.Integer = T_Pool; }
     break;
-case 22:
+
+  case 22:
 #line 336 "ntp_parser.y"
-{ yyval.Integer = T_Broadcast; }
+    { yyval.Integer = T_Peer; }
     break;
-case 23:
+
+  case 23:
 #line 337 "ntp_parser.y"
-{ yyval.Integer = T_Manycastclient; }
+    { yyval.Integer = T_Broadcast; }
     break;
-case 24:
-#line 341 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
+
+  case 24:
+#line 338 "ntp_parser.y"
+    { yyval.Integer = T_Manycastclient; }
     break;
-case 25:
+
+  case 25:
 #line 342 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+    { yyval.Address_node = yyvsp[0].Address_node; }
     break;
-case 26:
-#line 344 "ntp_parser.y"
-{
+
+  case 26:
+#line 343 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+    break;
+
+  case 27:
+#line 345 "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)
@@ -1490,554 +1750,687 @@ case 26:
                         }
                     }
     break;
-case 27:
-#line 359 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
-    break;
-case 28:
+
+  case 28:
 #line 360 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
+    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
     break;
-case 29:
-#line 364 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 29:
+#line 361 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
     break;
-case 30:
+
+  case 30:
 #line 365 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 31:
-#line 370 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
+
+  case 31:
+#line 366 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 32:
+
+  case 32:
 #line 371 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
     break;
-case 33:
+
+  case 33:
 #line 372 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
-case 34:
+
+  case 34:
 #line 373 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
-case 35:
+
+  case 35:
 #line 374 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
-case 36:
+
+  case 36:
 #line 375 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
-case 37:
+
+  case 37:
 #line 376 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
+    { yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
-case 38:
+
+  case 38:
 #line 377 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
-case 39:
+
+  case 39:
 #line 378 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
-case 40:
+
+  case 40:
 #line 379 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
-case 41:
+
+  case 41:
 #line 380 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
-case 42:
+
+  case 42:
 #line 381 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
-case 43:
+
+  case 43:
 #line 382 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+    break;
+
+  case 44:
+#line 383 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    break;
+
+  case 45:
+#line 394 "ntp_parser.y"
+    { my_config.broadcastclient = SIMPLE; }
+    break;
+
+  case 46:
+#line 396 "ntp_parser.y"
+    { my_config.broadcastclient = NOVOLLEY;  }
+    break;
+
+  case 47:
+#line 398 "ntp_parser.y"
+    { append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
+    break;
+
+  case 48:
+#line 400 "ntp_parser.y"
+    { append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
+    break;
+
+  case 49:
+#line 411 "ntp_parser.y"
+    { my_config.auth.autokey = yyvsp[0].Integer;  }
     break;
-case 44:
-#line 393 "ntp_parser.y"
-{ my_config.broadcastclient = SIMPLE; }
-    break;
-case 45:
-#line 395 "ntp_parser.y"
-{ my_config.broadcastclient = NOVOLLEY;  }
-    break;
-case 46:
-#line 397 "ntp_parser.y"
-{ append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
-    break;
-case 47:
-#line 399 "ntp_parser.y"
-{ append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
-    break;
-case 48:
-#line 410 "ntp_parser.y"
-{ my_config.auth.autokey = yyvsp[0].Integer;  }
-    break;
-case 49:
-#line 412 "ntp_parser.y"
-{ my_config.auth.control_key = yyvsp[0].Integer;  }
-    break;
-case 50:
-#line 414 "ntp_parser.y"
-{ if (my_config.auth.crypto_cmd_list != NULL)
+
+  case 50:
+#line 413 "ntp_parser.y"
+    { my_config.auth.control_key = yyvsp[0].Integer;  }
+    break;
+
+  case 51:
+#line 415 "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;
 			cryptosw++;
 			}
     break;
-case 51:
-#line 421 "ntp_parser.y"
-{ my_config.auth.keys = yyvsp[0].String;  }
-    break;
-case 52:
-#line 423 "ntp_parser.y"
-{ my_config.auth.keysdir = yyvsp[0].String;  }
-    break;
-case 53:
-#line 425 "ntp_parser.y"
-{ my_config.auth.requested_key = yyvsp[0].Integer;  }
-    break;
-case 54:
-#line 427 "ntp_parser.y"
-{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
-    break;
-case 56:
-#line 433 "ntp_parser.y"
-{ yyval.Queue = NULL; }
-    break;
-case 57:
-#line 437 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 52:
+#line 422 "ntp_parser.y"
+    { my_config.auth.keys = yyvsp[0].String;  }
+    break;
+
+  case 53:
+#line 424 "ntp_parser.y"
+    { my_config.auth.keysdir = yyvsp[0].String;  }
+    break;
+
+  case 54:
+#line 426 "ntp_parser.y"
+    { my_config.auth.requested_key = yyvsp[0].Integer;  }
+    break;
+
+  case 55:
+#line 428 "ntp_parser.y"
+    { my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+    break;
+
+  case 57:
+#line 434 "ntp_parser.y"
+    { yyval.Queue = NULL; }
     break;
-case 58:
+
+  case 58:
 #line 438 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 59:
-#line 443 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
+
+  case 59:
+#line 439 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 60:
-#line 445 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
+
+  case 60:
+#line 444 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
-case 61:
-#line 447 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
+
+  case 61:
+#line 446 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
-case 62:
-#line 449 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
+
+  case 62:
+#line 448 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
-case 63:
-#line 451 "ntp_parser.y"
-{ my_config.auth.revoke = yyvsp[0].Integer;  }
+
+  case 63:
+#line 450 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
-case 64:
-#line 453 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
+
+  case 64:
+#line 452 "ntp_parser.y"
+    { my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
-case 65:
-#line 463 "ntp_parser.y"
-{ append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
+
+  case 65:
+#line 454 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
-case 66:
-#line 467 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 66:
+#line 464 "ntp_parser.y"
+    { append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
-case 67:
+
+  case 67:
 #line 468 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+
+  case 68:
+#line 469 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 68:
-#line 473 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
-    break;
-case 69:
-#line 475 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
-    break;
-case 70:
-#line 477 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
-    break;
-case 71:
-#line 479 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
-    break;
-case 72:
-#line 481 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
-    break;
-case 73:
-#line 483 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
-    break;
-case 74:
-#line 485 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
-    break;
-case 75:
-#line 487 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
-    break;
-case 76:
-#line 489 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
-    break;
-case 77:
-#line 491 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
-    break;
-case 78:
-#line 493 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
-    break;
-case 79:
-#line 503 "ntp_parser.y"
-{ append_queue(my_config.stats_list, yyvsp[0].Queue);  }
-    break;
-case 80:
-#line 505 "ntp_parser.y"
-{ my_config.stats_dir = yyvsp[0].String;  }
+
+  case 69:
+#line 474 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
     break;
-case 81:
-#line 507 "ntp_parser.y"
-{
+
+  case 70:
+#line 476 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
+    break;
+
+  case 71:
+#line 478 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
+    break;
+
+  case 72:
+#line 480 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
+    break;
+
+  case 73:
+#line 482 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
+    break;
+
+  case 74:
+#line 484 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
+    break;
+
+  case 75:
+#line 486 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
+    break;
+
+  case 76:
+#line 488 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
+    break;
+
+  case 77:
+#line 490 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
+    break;
+
+  case 78:
+#line 492 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
+    break;
+
+  case 79:
+#line 494 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
+    break;
+
+  case 80:
+#line 504 "ntp_parser.y"
+    { append_queue(my_config.stats_list, yyvsp[0].Queue);  }
+    break;
+
+  case 81:
+#line 506 "ntp_parser.y"
+    { my_config.stats_dir = yyvsp[0].String;  }
+    break;
+
+  case 82:
+#line 508 "ntp_parser.y"
+    {
                         enqueue(my_config.filegen_opts,
                                 create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));
                     }
     break;
-case 82:
-#line 514 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
-    break;
-case 83:
+
+  case 83:
 #line 515 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-case 84:
-#line 520 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("clockstats"); }
+
+  case 84:
+#line 516 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
-case 85:
-#line 522 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("cryptostats"); }
+
+  case 85:
+#line 521 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("clockstats"); }
     break;
-case 86:
-#line 524 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("loopstats"); }
+
+  case 86:
+#line 523 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("cryptostats"); }
     break;
-case 87:
-#line 526 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("peerstats"); }
+
+  case 87:
+#line 525 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("loopstats"); }
     break;
-case 88:
-#line 528 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("rawstats"); }
+
+  case 88:
+#line 527 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("peerstats"); }
     break;
-case 89:
-#line 530 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("sysstats"); }
+
+  case 89:
+#line 529 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("rawstats"); }
     break;
-case 90:
-#line 534 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 90:
+#line 531 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("sysstats"); }
     break;
-case 91:
+
+  case 91:
 #line 535 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 92:
-#line 539 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
+
+  case 92:
+#line 536 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 93:
+
+  case 93:
 #line 540 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
-case 94:
+
+  case 94:
 #line 541 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
+    { yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
-case 95:
+
+  case 95:
 #line 542 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
-case 96:
+
+  case 96:
 #line 543 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
-case 97:
+
+  case 97:
 #line 544 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
-case 98:
-#line 548 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_NONE; }
+
+  case 98:
+#line 545 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
-case 99:
+
+  case 99:
 #line 549 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_PID; }
+    { yyval.Integer = FILEGEN_NONE; }
     break;
-case 100:
+
+  case 100:
 #line 550 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_DAY; }
+    { yyval.Integer = FILEGEN_PID; }
     break;
-case 101:
+
+  case 101:
 #line 551 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_WEEK; }
+    { yyval.Integer = FILEGEN_DAY; }
     break;
-case 102:
+
+  case 102:
 #line 552 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_MONTH; }
+    { yyval.Integer = FILEGEN_WEEK; }
     break;
-case 103:
+
+  case 103:
 #line 553 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_YEAR; }
+    { yyval.Integer = FILEGEN_MONTH; }
     break;
-case 104:
+
+  case 104:
 #line 554 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_AGE; }
+    { yyval.Integer = FILEGEN_YEAR; }
     break;
-case 105:
-#line 564 "ntp_parser.y"
-{   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+
+  case 105:
+#line 555 "ntp_parser.y"
+    { yyval.Integer = FILEGEN_AGE; }
     break;
-case 106:
-#line 566 "ntp_parser.y"
-{
+
+  case 106:
+#line 565 "ntp_parser.y"
+    {   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+    break;
+
+  case 107:
+#line 567 "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 107:
-#line 571 "ntp_parser.y"
-{
+
+  case 108:
+#line 572 "ntp_parser.y"
+    {
                         enqueue(my_config.restrict_opts,
                                 create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no));
                     }
     break;
-case 108:
-#line 576 "ntp_parser.y"
-{
+
+  case 109:
+#line 577 "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 109:
-#line 583 "ntp_parser.y"
-{ yyval.Queue = create_queue(); }
-    break;
-case 110:
+
+  case 110:
 #line 584 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
+    { yyval.Queue = create_queue(); }
     break;
-case 111:
-#line 588 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_IGNORE); }
+
+  case 111:
+#line 585 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-case 112:
+
+  case 112:
 #line 589 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
+    { yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
-case 113:
+
+  case 113:
 #line 590 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LIMITED); }
+    { yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
     break;
-case 114:
+
+  case 114:
 #line 591 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LPTRAP); }
+    { yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
-case 115:
+
+  case 115:
 #line 592 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOMODIFY); }
+    { yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
-case 116:
+
+  case 116:
 #line 593 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOPEER); }
+    { yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
-case 117:
+
+  case 117:
 #line 594 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOQUERY); }
+    { yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
-case 118:
+
+  case 118:
 #line 595 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTSERVE); }
+    { yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
-case 119:
+
+  case 119:
 #line 596 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOTRAP); }
+    { yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
-case 120:
+
+  case 120:
 #line 597 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTTRUST); }
+    { yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
-case 121:
+
+  case 121:
 #line 598 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RESM_NTPONLY); }
+    { yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
-case 122:
+
+  case 122:
 #line 599 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_VERSION); }
+    { yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
-case 123:
-#line 603 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 123:
+#line 600 "ntp_parser.y"
+    { yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
-case 124:
+
+  case 124:
 #line 604 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 125:
-#line 608 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
+
+  case 125:
+#line 605 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 126:
+
+  case 126:
 #line 609 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
-case 127:
+
+  case 127:
 #line 610 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
-case 128:
-#line 619 "ntp_parser.y"
-{ enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+
+  case 128:
+#line 611 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
-case 129:
-#line 623 "ntp_parser.y"
-{ enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 129:
+#line 620 "ntp_parser.y"
+    { enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-case 130:
+
+  case 130:
 #line 624 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 131:
-#line 629 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
+
+  case 131:
+#line 625 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 132:
-#line 631 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
+
+  case 132:
+#line 630 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
-case 133:
-#line 633 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
+
+  case 133:
+#line 632 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
-case 134:
-#line 635 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
+
+  case 134:
+#line 634 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
-case 135:
-#line 637 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
+
+  case 135:
+#line 636 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
-case 136:
-#line 639 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
+
+  case 136:
+#line 638 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
-case 137:
-#line 641 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
+
+  case 137:
+#line 640 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
-case 138:
-#line 643 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
+
+  case 138:
+#line 642 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
-case 139:
-#line 652 "ntp_parser.y"
-{ append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
+
+  case 139:
+#line 644 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
-case 140:
-#line 654 "ntp_parser.y"
-{ append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
+
+  case 140:
+#line 653 "ntp_parser.y"
+    { append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
-case 141:
-#line 658 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 141:
+#line 655 "ntp_parser.y"
+    { append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
-case 142:
+
+  case 142:
 #line 659 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 143:
-#line 663 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
+
+  case 143:
+#line 660 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 144:
+
+  case 144:
 #line 664 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
-case 145:
+
+  case 145:
 #line 665 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
-case 146:
+
+  case 146:
 #line 666 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
-case 147:
+
+  case 147:
 #line 667 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
-case 148:
+
+  case 148:
 #line 668 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
-case 149:
-#line 670 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
+
+  case 149:
+#line 669 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
-case 150:
-#line 678 "ntp_parser.y"
-{ append_queue(my_config.tinker, yyvsp[0].Queue);  }
+
+  case 150:
+#line 671 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
-case 151:
-#line 682 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 151:
+#line 679 "ntp_parser.y"
+    { append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
-case 152:
+
+  case 152:
 #line 683 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 153:
-#line 687 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
+
+  case 153:
+#line 684 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 154:
+
+  case 154:
 #line 688 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
-case 155:
+
+  case 155:
 #line 689 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
-case 156:
+
+  case 156:
 #line 690 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
-case 157:
+
+  case 157:
 #line 691 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
-case 158:
+
+  case 158:
 #line 692 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
     break;
-case 159:
+
+  case 159:
 #line 693 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
     break;
-case 160:
-#line 702 "ntp_parser.y"
-{
+
+  case 160:
+#line 694 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    break;
+
+  case 161:
+#line 703 "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.");
@@ -2053,118 +2446,150 @@ case 160:
                     }
                 }
     break;
-case 161:
-#line 718 "ntp_parser.y"
-{
+
+  case 162:
+#line 719 "ntp_parser.y"
+    {
                     while (curr_include_level != -1)
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
-case 162:
-#line 724 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
-    break;
-case 163:
-#line 726 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
-    break;
-case 164:
-#line 728 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
-    break;
-case 165:
-#line 730 "ntp_parser.y"
-{ /* Null action, possibly all null parms */ }
-    break;
-case 166:
-#line 732 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Leapfile, yyvsp[0].String)); }
-    break;
-case 167:
-#line 735 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
-    break;
-case 168:
-#line 737 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
-    break;
-case 169:
-#line 739 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
-    break;
-case 170:
-#line 742 "ntp_parser.y"
-{ append_queue(my_config.logconfig, yyvsp[0].Queue);  }
-    break;
-case 171:
-#line 744 "ntp_parser.y"
-{ append_queue(my_config.phone, yyvsp[0].Queue);  }
-    break;
-case 172:
-#line 746 "ntp_parser.y"
-{ enqueue(my_config.setvar, yyvsp[0].Set_var);  }
-    break;
-case 173:
-#line 748 "ntp_parser.y"
-{ enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
-    break;
-case 174:
-#line 750 "ntp_parser.y"
-{ append_queue(my_config.ttl, yyvsp[0].Queue); }
-    break;
-case 175:
-#line 754 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
-    break;
-case 176:
-#line 756 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, yyvsp[0].Double));
+
+  case 163:
+#line 725 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
+    break;
+
+  case 164:
+#line 727 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
+    break;
+
+  case 165:
+#line 729 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
+    break;
+
+  case 166:
+#line 731 "ntp_parser.y"
+    { /* Null action, possibly all null parms */ }
+    break;
+
+  case 167:
+#line 733 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_sval(T_Leapfile, yyvsp[0].String)); }
+    break;
+
+  case 168:
+#line 736 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
+    break;
+
+  case 169:
+#line 738 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
+    break;
+
+  case 170:
+#line 740 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
+    break;
+
+  case 171:
+#line 743 "ntp_parser.y"
+    { append_queue(my_config.logconfig, yyvsp[0].Queue);  }
+    break;
+
+  case 172:
+#line 745 "ntp_parser.y"
+    { append_queue(my_config.phone, yyvsp[0].Queue);  }
+    break;
+
+  case 173:
+#line 747 "ntp_parser.y"
+    { enqueue(my_config.setvar, yyvsp[0].Set_var);  }
+    break;
+
+  case 174:
+#line 749 "ntp_parser.y"
+    { enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+    break;
+
+  case 175:
+#line 751 "ntp_parser.y"
+    { append_queue(my_config.ttl, yyvsp[0].Queue); }
+    break;
+
+  case 176:
+#line 753 "ntp_parser.y"
+    { enqueue(my_config.qos, create_attr_sval(T_Qos, yyvsp[0].String)); }
+    break;
+
+  case 177:
+#line 757 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
+    break;
+
+  case 178:
+#line 759 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, yyvsp[0].Double));
 		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
     break;
-case 177:
-#line 758 "ntp_parser.y"
-{ /* Null driftfile,  indicated by null string "\0" */
+
+  case 179:
+#line 761 "ntp_parser.y"
+    { /* Null driftfile,  indicated by null string "\0" */
 		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
     break;
-case 178:
-#line 764 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
-    break;
-case 179:
-#line 766 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
-    break;
-case 180:
-#line 771 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
-    break;
-case 181:
-#line 772 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
-    break;
-case 182:
-#line 776 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
-    break;
-case 183:
-#line 777 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
-    break;
-case 184:
-#line 782 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
-    break;
-case 185:
-#line 783 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
-    break;
-case 186:
-#line 787 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+
+  case 180:
+#line 767 "ntp_parser.y"
+    { yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
     break;
-case 187:
-#line 789 "ntp_parser.y"
-{
+
+  case 181:
+#line 769 "ntp_parser.y"
+    { yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+    break;
+
+  case 182:
+#line 774 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+
+  case 183:
+#line 775 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    break;
+
+  case 184:
+#line 779 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+    break;
+
+  case 185:
+#line 780 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+    break;
+
+  case 186:
+#line 785 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+
+  case 187:
+#line 786 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    break;
+
+  case 188:
+#line 790 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+    break;
+
+  case 189:
+#line 792 "ntp_parser.y"
+    {
                     /* YUCK!! This is needed because '+' and '-' are not special characters
                      * while '=' is.
                      * We really need a better way of defining strings
@@ -2178,45 +2603,55 @@ case 187:
                         yyval.Attr_val = create_attr_sval(prefix, type);
                 }
     break;
-case 188:
-#line 805 "ntp_parser.y"
-{ yyval.Integer = '+'; }
-    break;
-case 189:
-#line 806 "ntp_parser.y"
-{ yyval.Integer = '-'; }
-    break;
-case 190:
-#line 807 "ntp_parser.y"
-{ yyval.Integer = '='; }
-    break;
-case 191:
-#line 816 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
-    break;
-case 192:
-#line 817 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
-    break;
-case 193:
-#line 821 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
-    break;
-case 194:
-#line 822 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
-    break;
-case 195:
-#line 826 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
-    break;
-case 196:
-#line 827 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
+
+  case 190:
+#line 808 "ntp_parser.y"
+    { yyval.Integer = '+'; }
+    break;
+
+  case 191:
+#line 809 "ntp_parser.y"
+    { yyval.Integer = '-'; }
     break;
-case 197:
-#line 832 "ntp_parser.y"
-{
+
+  case 192:
+#line 810 "ntp_parser.y"
+    { yyval.Integer = '='; }
+    break;
+
+  case 193:
+#line 819 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+    break;
+
+  case 194:
+#line 820 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
+    break;
+
+  case 195:
+#line 824 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
+    break;
+
+  case 196:
+#line 825 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
+    break;
+
+  case 197:
+#line 829 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
+    break;
+
+  case 198:
+#line 830 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
+    break;
+
+  case 199:
+#line 835 "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;
@@ -2225,129 +2660,156 @@ case 197:
                         yyval.Integer = yyvsp[0].Integer;
                 }
     break;
-case 198:
-#line 840 "ntp_parser.y"
-{ yyval.Integer = 1; }
-    break;
-case 199:
-#line 841 "ntp_parser.y"
-{ yyval.Integer = 0; }
-    break;
-case 200:
-#line 845 "ntp_parser.y"
-{ yyval.Double = (double)yyvsp[0].Integer; }
-    break;
-case 201:
-#line 846 "ntp_parser.y"
-{ yyval.Double = yyvsp[0].Double; }
+
+  case 200:
+#line 843 "ntp_parser.y"
+    { yyval.Integer = 1; }
     break;
-case 202:
-#line 855 "ntp_parser.y"
-{
+
+  case 201:
+#line 844 "ntp_parser.y"
+    { yyval.Integer = 0; }
+    break;
+
+  case 202:
+#line 848 "ntp_parser.y"
+    { yyval.Double = (double)yyvsp[0].Integer; }
+    break;
+
+  case 203:
+#line 849 "ntp_parser.y"
+    { yyval.Double = yyvsp[0].Double; }
+    break;
+
+  case 204:
+#line 858 "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 203:
-#line 869 "ntp_parser.y"
-{ old_config_style = 0; }
-    break;
-case 204:
-#line 873 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-case 205:
-#line 874 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
-    break;
-case 206:
-#line 878 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
-    break;
-case 207:
-#line 879 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
-    break;
-case 208:
-#line 883 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
-    break;
-case 209:
-#line 884 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
-    break;
-case 210:
-#line 889 "ntp_parser.y"
-{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
-    break;
-case 211:
-#line 893 "ntp_parser.y"
-{ yyval.Double = yyvsp[-1].Double; }
-    break;
-case 212:
-#line 897 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-case 213:
-#line 901 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-case 214:
-#line 902 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
-    break;
-case 215:
-#line 906 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
-    break;
-case 216:
-#line 907 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
-    break;
-case 217:
-#line 912 "ntp_parser.y"
-{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
-    break;
-case 218:
-#line 916 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-case 219:
-#line 917 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
-    break;
-case 220:
-#line 922 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
-    break;
-case 221:
-#line 924 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
-    break;
-case 222:
-#line 926 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
-    break;
-case 223:
-#line 928 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
-    break;
-case 224:
-#line 930 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+
+  case 205:
+#line 872 "ntp_parser.y"
+    { old_config_style = 0; }
     break;
-}
 
-#line 705 "/usr/local/gnu/share/bison/bison.simple"
+  case 206:
+#line 876 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+
+  case 207:
+#line 877 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    break;
+
+  case 208:
+#line 881 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+    break;
+
+  case 209:
+#line 882 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+    break;
+
+  case 210:
+#line 886 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+    break;
+
+  case 211:
+#line 887 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+    break;
+
+  case 212:
+#line 892 "ntp_parser.y"
+    { yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
+    break;
+
+  case 213:
+#line 896 "ntp_parser.y"
+    { yyval.Double = yyvsp[-1].Double; }
+    break;
+
+  case 214:
+#line 900 "ntp_parser.y"
+    { yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+
+  case 215:
+#line 904 "ntp_parser.y"
+    { yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+
+  case 216:
+#line 905 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
+    break;
+
+  case 217:
+#line 909 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+    break;
 
+  case 218:
+#line 910 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+    break;
+
+  case 219:
+#line 915 "ntp_parser.y"
+    { yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+    break;
+
+  case 220:
+#line 919 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+
+  case 221:
+#line 920 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+    break;
+
+  case 222:
+#line 925 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+    break;
+
+  case 223:
+#line 927 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+    break;
+
+  case 224:
+#line 929 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
+    break;
+
+  case 225:
+#line 931 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+    break;
+
+  case 226:
+#line 933 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+    break;
+
+
+    }
+
+/* Line 1016 of /usr/local/share/bison/yacc.c.  */
+#line 2809 "ntp_parser.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
+
 
 #if YYDEBUG
   if (yydebug)
@@ -2361,9 +2823,7 @@ case 224:
 #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
@@ -2371,11 +2831,11 @@ case 224:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
@@ -2388,13 +2848,13 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
 	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
 	  char *yymsg;
 	  int yyx, yycount;
 
@@ -2403,15 +2863,15 @@ yyerrlab:
 	     YYCHECK.  */
 	  for (yyx = yyn < 0 ? -yyn : 0;
 	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
 	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
 	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
+	      yyp = yystpcpy (yyp, yytname[yytype]);
 
 	      if (yycount < 5)
 		{
@@ -2419,7 +2879,7 @@ yyerrlab:
 		  for (yyx = yyn < 0 ? -yyn : 0;
 		       yyx < (int) (sizeof (yytname) / sizeof (char *));
 		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
 			const char *yyq = ! yycount ? ", expecting " : " or ";
 			yyp = yystpcpy (yyp, yyq);
@@ -2434,99 +2894,90 @@ yyerrlab:
 	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* defined (YYERROR_VERBOSE) */
+#endif /* 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)
-	YYABORT;
+        {
+	  /* 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;
+        }
+
       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 */
-
-  goto yyerrhandle;
+  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;
+	    }
+	}
 
-/*-------------------------------------------------------------------.
-| 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
+      /* 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;
 
-/*---------------------------------------------------------------.
-| 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;
@@ -2534,9 +2985,7 @@ yyerrhandle:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   yystate = yyn;
   goto yynewstate;
@@ -2556,13 +3005,15 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
+#endif
 
 yyreturn:
 #ifndef yyoverflow
@@ -2571,7 +3022,9 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 934 "ntp_parser.y"
+
+
+#line 937 "ntp_parser.y"
 
 
 /* KEYWORDS
@@ -2612,4 +3065,5 @@ int main(int argc, char *argv[])
     return 0;
 }
 */
+
 

==== ntpd/ntp_parser.h ====
2007-10-27 12:25:58-04:00, neal at pogo.udel.edu +341 -152
  [Bug 752] QoS: add parser/config support.

--- 1.8/ntpd/ntp_parser.h	2007-10-03 21:34:29 -04:00
+++ 1.9/ntpd/ntp_parser.h	2007-10-27 12:25:58 -04:00
@@ -1,7 +1,341 @@
-#ifndef BISON_______NTPD_NTP_PARSER_H
-# define BISON_______NTPD_NTP_PARSER_H
+/* 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_Clockstats = 273,
+     T_Cohort = 274,
+     T_ControlKey = 275,
+     T_Crypto = 276,
+     T_Cryptostats = 277,
+     T_Day = 278,
+     T_Default = 279,
+     T_Disable = 280,
+     T_Discard = 281,
+     T_Dispersion = 282,
+     T_Double = 283,
+     T_Driftfile = 284,
+     T_WanderThreshold = 285,
+     T_Enable = 286,
+     T_End = 287,
+     T_False = 288,
+     T_File = 289,
+     T_Filegen = 290,
+     T_Flag1 = 291,
+     T_Flag2 = 292,
+     T_Flag3 = 293,
+     T_Flag4 = 294,
+     T_Floor = 295,
+     T_Freq = 296,
+     T_Fudge = 297,
+     T_Host = 298,
+     T_Huffpuff = 299,
+     T_IPv4_address = 300,
+     T_IPv6_address = 301,
+     T_Iburst = 302,
+     T_Ident = 303,
+     T_Ignore = 304,
+     T_Includefile = 305,
+     T_Integer = 306,
+     T_Interface = 307,
+     T_Kernel = 308,
+     T_Key = 309,
+     T_Keys = 310,
+     T_Keysdir = 311,
+     T_Kod = 312,
+     T_Leap = 313,
+     T_Leapfile = 314,
+     T_Limited = 315,
+     T_Link = 316,
+     T_Logconfig = 317,
+     T_Logfile = 318,
+     T_Loopstats = 319,
+     T_Lowpriotrap = 320,
+     T_Manycastclient = 321,
+     T_Manycastserver = 322,
+     T_Mask = 323,
+     T_Maxclock = 324,
+     T_Maxdist = 325,
+     T_Maxhop = 326,
+     T_Maxpoll = 327,
+     T_Minclock = 328,
+     T_Mindist = 329,
+     T_Minimum = 330,
+     T_Minpoll = 331,
+     T_Minsane = 332,
+     T_Mode = 333,
+     T_Monitor = 334,
+     T_Month = 335,
+     T_Multicastclient = 336,
+     T_Nolink = 337,
+     T_Nomodify = 338,
+     T_None = 339,
+     T_Nopeer = 340,
+     T_Noquery = 341,
+     T_Noselect = 342,
+     T_Noserve = 343,
+     T_Notrap = 344,
+     T_Notrust = 345,
+     T_Novolley = 346,
+     T_Ntp = 347,
+     T_Ntpport = 348,
+     T_Orphan = 349,
+     T_Panic = 350,
+     T_Peer = 351,
+     T_Peerstats = 352,
+     T_Phone = 353,
+     T_Pid = 354,
+     T_Pidfile = 355,
+     T_Pool = 356,
+     T_Port = 357,
+     T_Pps = 358,
+     T_Preempt = 359,
+     T_Prefer = 360,
+     T_Pw = 361,
+     T_Qos = 362,
+     T_RandFile = 363,
+     T_Rawstats = 364,
+     T_Refid = 365,
+     T_Requestkey = 366,
+     T_Restrict = 367,
+     T_Revoke = 368,
+     T_Server = 369,
+     T_Setvar = 370,
+     T_Sign = 371,
+     T_Statistics = 372,
+     T_Stats = 373,
+     T_Statsdir = 374,
+     T_Step = 375,
+     T_Stepout = 376,
+     T_Stratum = 377,
+     T_String = 378,
+     T_Sysstats = 379,
+     T_Tick = 380,
+     T_Time1 = 381,
+     T_Time2 = 382,
+     T_Tinker = 383,
+     T_Tos = 384,
+     T_Trap = 385,
+     T_True = 386,
+     T_Trustedkey = 387,
+     T_Ttl = 388,
+     T_Type = 389,
+     T_Version = 390,
+     T_Week = 391,
+     T_Year = 392,
+     T_Flag = 393,
+     T_Void = 394,
+     T_EOC = 395,
+     T_Simulate = 396,
+     T_Beep_Delay = 397,
+     T_Sim_Duration = 398,
+     T_Server_Offset = 399,
+     T_Duration = 400,
+     T_Freq_Offset = 401,
+     T_Wander = 402,
+     T_Jitter = 403,
+     T_Prop_Delay = 404,
+     T_Proc_Delay = 405
+   };
+#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_Clockstats 273
+#define T_Cohort 274
+#define T_ControlKey 275
+#define T_Crypto 276
+#define T_Cryptostats 277
+#define T_Day 278
+#define T_Default 279
+#define T_Disable 280
+#define T_Discard 281
+#define T_Dispersion 282
+#define T_Double 283
+#define T_Driftfile 284
+#define T_WanderThreshold 285
+#define T_Enable 286
+#define T_End 287
+#define T_False 288
+#define T_File 289
+#define T_Filegen 290
+#define T_Flag1 291
+#define T_Flag2 292
+#define T_Flag3 293
+#define T_Flag4 294
+#define T_Floor 295
+#define T_Freq 296
+#define T_Fudge 297
+#define T_Host 298
+#define T_Huffpuff 299
+#define T_IPv4_address 300
+#define T_IPv6_address 301
+#define T_Iburst 302
+#define T_Ident 303
+#define T_Ignore 304
+#define T_Includefile 305
+#define T_Integer 306
+#define T_Interface 307
+#define T_Kernel 308
+#define T_Key 309
+#define T_Keys 310
+#define T_Keysdir 311
+#define T_Kod 312
+#define T_Leap 313
+#define T_Leapfile 314
+#define T_Limited 315
+#define T_Link 316
+#define T_Logconfig 317
+#define T_Logfile 318
+#define T_Loopstats 319
+#define T_Lowpriotrap 320
+#define T_Manycastclient 321
+#define T_Manycastserver 322
+#define T_Mask 323
+#define T_Maxclock 324
+#define T_Maxdist 325
+#define T_Maxhop 326
+#define T_Maxpoll 327
+#define T_Minclock 328
+#define T_Mindist 329
+#define T_Minimum 330
+#define T_Minpoll 331
+#define T_Minsane 332
+#define T_Mode 333
+#define T_Monitor 334
+#define T_Month 335
+#define T_Multicastclient 336
+#define T_Nolink 337
+#define T_Nomodify 338
+#define T_None 339
+#define T_Nopeer 340
+#define T_Noquery 341
+#define T_Noselect 342
+#define T_Noserve 343
+#define T_Notrap 344
+#define T_Notrust 345
+#define T_Novolley 346
+#define T_Ntp 347
+#define T_Ntpport 348
+#define T_Orphan 349
+#define T_Panic 350
+#define T_Peer 351
+#define T_Peerstats 352
+#define T_Phone 353
+#define T_Pid 354
+#define T_Pidfile 355
+#define T_Pool 356
+#define T_Port 357
+#define T_Pps 358
+#define T_Preempt 359
+#define T_Prefer 360
+#define T_Pw 361
+#define T_Qos 362
+#define T_RandFile 363
+#define T_Rawstats 364
+#define T_Refid 365
+#define T_Requestkey 366
+#define T_Restrict 367
+#define T_Revoke 368
+#define T_Server 369
+#define T_Setvar 370
+#define T_Sign 371
+#define T_Statistics 372
+#define T_Stats 373
+#define T_Statsdir 374
+#define T_Step 375
+#define T_Stepout 376
+#define T_Stratum 377
+#define T_String 378
+#define T_Sysstats 379
+#define T_Tick 380
+#define T_Time1 381
+#define T_Time2 382
+#define T_Tinker 383
+#define T_Tos 384
+#define T_Trap 385
+#define T_True 386
+#define T_Trustedkey 387
+#define T_Ttl 388
+#define T_Type 389
+#define T_Version 390
+#define T_Week 391
+#define T_Year 392
+#define T_Flag 393
+#define T_Void 394
+#define T_EOC 395
+#define T_Simulate 396
+#define T_Beep_Delay 397
+#define T_Sim_Duration 398
+#define T_Server_Offset 399
+#define T_Duration 400
+#define T_Freq_Offset 401
+#define T_Wander 402
+#define T_Jitter 403
+#define T_Prop_Delay 404
+#define T_Proc_Delay 405
+
+
+
 
 #ifndef YYSTYPE
+#line 49 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -16,158 +350,13 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
+/* Line 1281 of /usr/local/share/bison/yacc.c.  */
+#line 355 "ntp_parser.h"
 # define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_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_Clockstats	272
-# define	T_Cohort	273
-# define	T_ControlKey	274
-# define	T_Crypto	275
-# define	T_Cryptostats	276
-# define	T_Day	277
-# define	T_Default	278
-# define	T_Disable	279
-# define	T_Discard	280
-# define	T_Dispersion	281
-# define	T_Double	282
-# define	T_Driftfile	283
-# define	T_WanderThreshold	284
-# define	T_Enable	285
-# define	T_End	286
-# define	T_False	287
-# define	T_File	288
-# define	T_Filegen	289
-# define	T_Flag1	290
-# define	T_Flag2	291
-# define	T_Flag3	292
-# define	T_Flag4	293
-# define	T_Floor	294
-# define	T_Freq	295
-# define	T_Fudge	296
-# define	T_Host	297
-# define	T_Huffpuff	298
-# define	T_IPv4_address	299
-# define	T_IPv6_address	300
-# define	T_Iburst	301
-# define	T_Ident	302
-# define	T_Ignore	303
-# define	T_Includefile	304
-# define	T_Integer	305
-# define	T_Interface	306
-# define	T_Kernel	307
-# define	T_Key	308
-# define	T_Keys	309
-# define	T_Keysdir	310
-# define	T_Kod	311
-# define	T_Leap	312
-# define	T_Leapfile	313
-# define	T_Limited	314
-# define	T_Link	315
-# define	T_Logconfig	316
-# define	T_Logfile	317
-# define	T_Loopstats	318
-# define	T_Lowpriotrap	319
-# define	T_Manycastclient	320
-# define	T_Manycastserver	321
-# define	T_Mask	322
-# define	T_Maxclock	323
-# define	T_Maxdist	324
-# define	T_Maxhop	325
-# define	T_Maxpoll	326
-# define	T_Minclock	327
-# define	T_Mindist	328
-# define	T_Minimum	329
-# define	T_Minpoll	330
-# define	T_Minsane	331
-# define	T_Mode	332
-# define	T_Monitor	333
-# define	T_Month	334
-# define	T_Multicastclient	335
-# define	T_Nolink	336
-# define	T_Nomodify	337
-# define	T_None	338
-# define	T_Nopeer	339
-# define	T_Noquery	340
-# define	T_Noselect	341
-# define	T_Noserve	342
-# define	T_Notrap	343
-# define	T_Notrust	344
-# define	T_Novolley	345
-# define	T_Ntp	346
-# define	T_Ntpport	347
-# define	T_Orphan	348
-# define	T_Panic	349
-# define	T_Peer	350
-# define	T_Peerstats	351
-# define	T_Phone	352
-# define	T_Pid	353
-# define	T_Pidfile	354
-# define	T_Pool	355
-# define	T_Port	356
-# define	T_Pps	357
-# define	T_Preempt	358
-# define	T_Prefer	359
-# define	T_Pw	360
-# define	T_RandFile	361
-# define	T_Rawstats	362
-# define	T_Refid	363
-# define	T_Requestkey	364
-# define	T_Restrict	365
-# define	T_Revoke	366
-# define	T_Server	367
-# define	T_Setvar	368
-# define	T_Sign	369
-# define	T_Statistics	370
-# define	T_Stats	371
-# define	T_Statsdir	372
-# define	T_Step	373
-# define	T_Stepout	374
-# define	T_Stratum	375
-# define	T_String	376
-# define	T_Sysstats	377
-# define	T_Tick	378
-# define	T_Time1	379
-# define	T_Time2	380
-# define	T_Tinker	381
-# define	T_Tos	382
-# define	T_Trap	383
-# define	T_True	384
-# define	T_Trustedkey	385
-# define	T_Ttl	386
-# define	T_Type	387
-# define	T_Version	388
-# define	T_Week	389
-# define	T_Year	390
-# define	T_Flag	391
-# define	T_Void	392
-# define	T_EOC	393
-# define	T_Simulate	394
-# define	T_Beep_Delay	395
-# define	T_Sim_Duration	396
-# define	T_Server_Offset	397
-# define	T_Duration	398
-# define	T_Freq_Offset	399
-# define	T_Wander	400
-# define	T_Jitter	401
-# define	T_Prop_Delay	402
-# define	T_Proc_Delay	403
-
 
 extern YYSTYPE yylval;
 
-#endif /* not BISON_______NTPD_NTP_PARSER_H */
+
+#endif /* not BISON_NTP_PARSER_H */
+

==== ntpd/ntp_parser.y ====
2007-10-27 12:26:04-04:00, neal at pogo.udel.edu +3 -0
  [Bug 752] QoS: add parser/config support.

--- 1.18/ntpd/ntp_parser.y	2007-10-03 21:34:30 -04:00
+++ 1.19/ntpd/ntp_parser.y	2007-10-27 12:26:04 -04:00
@@ -166,6 +166,7 @@
 %token		T_Preempt
 %token		T_Prefer
 %token		T_Pw
+%token		T_Qos
 %token		T_RandFile
 %token		T_Rawstats
 %token		T_Refid
@@ -748,6 +749,8 @@ miscellaneous_command
                     { enqueue(my_config.trap, create_addr_opts_node($2, $3));  }
 	|	T_Ttl integer_list
                     { append_queue(my_config.ttl, $2); }
+	|	T_Qos T_String
+                    { enqueue(my_config.qos, create_attr_sval(T_Qos, $2)); }
 	;	
 drift_parm
 	:	T_String


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