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

Harlan Stenn stenn at whimsy.udel.edu
Fri Jun 1 21:29:45 PDT 2007


#### ChangeSet ####
2007-06-02 00:27:35-04:00, stenn at whimsy.udel.edu 
  Updated from the recent change to ntp_parser.y

==== ntpd/ntp_parser.c ====
2007-06-02 00:27:23-04:00, stenn at whimsy.udel.edu +196 -182
  Updated from the recent change to ntp_parser.y

--- 1.8/ntpd/ntp_parser.c	2007-05-31 01:31:54 -04:00
+++ 1.9/ntpd/ntp_parser.c	2007-06-02 00:27:23 -04:00
@@ -234,7 +234,7 @@ typedef union {
 
 
 
-#define	YYFINAL		358
+#define	YYFINAL		359
 #define	YYFLAG		-32768
 #define	YYNTBASE	157
 
@@ -306,13 +306,13 @@ static const short yyprhs[] =
      327,   330,   334,   337,   339,   342,   345,   348,   351,   354,
      357,   360,   363,   366,   369,   372,   374,   376,   378,   380,
      382,   384,   386,   388,   391,   394,   396,   399,   402,   405,
-     408,   411,   414,   417,   420,   422,   425,   428,   431,   434,
-     437,   440,   443,   446,   449,   452,   456,   459,   464,   468,
-     471,   473,   476,   479,   482,   484,   487,   489,   491,   493,
-     495,   498,   500,   503,   505,   508,   510,   512,   514,   516,
-     518,   520,   526,   528,   532,   535,   539,   543,   546,   548,
-     554,   559,   563,   565,   567,   570,   572,   579,   583,   586,
-     590,   594,   598,   602
+     408,   411,   414,   417,   421,   423,   426,   429,   432,   435,
+     438,   441,   444,   447,   450,   453,   457,   460,   465,   469,
+     472,   474,   477,   480,   483,   485,   488,   490,   492,   494,
+     496,   499,   501,   504,   506,   509,   511,   513,   515,   517,
+     519,   521,   527,   529,   533,   536,   540,   544,   547,   549,
+     555,   560,   564,   566,   568,   571,   573,   580,   584,   587,
+     591,   595,   599,   603
 };
 static const short yyrhs[] =
 {
@@ -357,26 +357,26 @@ static const short yyrhs[] =
       55,     0,    80,     0,    94,     0,   119,     0,   129,   191,
        0,   191,   192,     0,   192,     0,     4,   204,     0,    28,
      204,     0,    41,   204,     0,    45,   204,     0,    97,   204,
-       0,   121,   204,     0,   122,   204,     0,    52,   124,     0,
-      32,     0,    13,   204,     0,    16,    53,     0,   126,   204,
-       0,    30,   124,     0,   102,   124,     0,    64,   124,     0,
-       7,    53,     0,    63,   197,     0,   100,   201,     0,   116,
-     194,     0,   131,   163,   195,     0,   134,   200,     0,   124,
-     152,   124,    25,     0,   124,   152,   124,     0,   195,   196,
-       0,   196,     0,   104,    53,     0,    54,   163,     0,   197,
-     198,     0,   198,     0,   199,   124,     0,   124,     0,   153,
-       0,   154,     0,   152,     0,   200,    53,     0,    53,     0,
-     201,   124,     0,   124,     0,   202,   162,     0,   162,     0,
-      53,     0,   132,     0,    33,     0,    53,     0,    29,     0,
-     206,   155,   207,   209,   156,     0,   142,     0,   207,   208,
-     141,     0,   208,   141,     0,   143,   152,   204,     0,   144,
-     152,   204,     0,   209,   210,     0,   210,     0,   212,   155,
-     211,   214,   156,     0,   145,   152,   204,   141,     0,   115,
-     152,   213,     0,   163,     0,   124,     0,   214,   215,     0,
-     215,     0,   146,   152,   204,   155,   216,   156,     0,   216,
-     217,   141,     0,   217,   141,     0,   147,   152,   204,     0,
-     148,   152,   204,     0,   149,   152,   204,     0,   150,   152,
-     204,     0,   151,   152,   204,     0
+       0,   121,   204,     0,   122,   204,     0,    52,   124,   159,
+       0,    32,     0,    13,   204,     0,    16,    53,     0,   126,
+     204,     0,    30,   124,     0,   102,   124,     0,    64,   124,
+       0,     7,    53,     0,    63,   197,     0,   100,   201,     0,
+     116,   194,     0,   131,   163,   195,     0,   134,   200,     0,
+     124,   152,   124,    25,     0,   124,   152,   124,     0,   195,
+     196,     0,   196,     0,   104,    53,     0,    54,   163,     0,
+     197,   198,     0,   198,     0,   199,   124,     0,   124,     0,
+     153,     0,   154,     0,   152,     0,   200,    53,     0,    53,
+       0,   201,   124,     0,   124,     0,   202,   162,     0,   162,
+       0,    53,     0,   132,     0,    33,     0,    53,     0,    29,
+       0,   206,   155,   207,   209,   156,     0,   142,     0,   207,
+     208,   141,     0,   208,   141,     0,   143,   152,   204,     0,
+     144,   152,   204,     0,   209,   210,     0,   210,     0,   212,
+     155,   211,   214,   156,     0,   145,   152,   204,   141,     0,
+     115,   152,   213,     0,   163,     0,   124,     0,   214,   215,
+       0,   215,     0,   146,   152,   204,   155,   216,   156,     0,
+     216,   217,   141,     0,   217,   141,     0,   147,   152,   204,
+       0,   148,   152,   204,     0,   149,   152,   204,     0,   150,
+     152,   204,     0,   151,   152,   204,     0
 };
 
 #endif
@@ -514,7 +514,7 @@ static const short yyr2[] =
        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,     2,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     3,     1,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     3,     2,     4,     3,     2,
        1,     2,     2,     2,     1,     2,     1,     1,     1,     1,
        2,     1,     2,     1,     2,     1,     1,     1,     1,     1,
@@ -538,7 +538,7 @@ static const short yydefact[] =
        0,     0,     0,     0,     0,     0,     0,    50,    57,   146,
      147,   148,   149,   150,   151,   152,   143,   145,     0,     0,
        0,   108,   127,   168,   142,    87,    88,    89,    90,    91,
-      92,     0,    27,    28,     0,    25,     0,    24,   163,    51,
+      92,     0,    27,    28,     0,    25,     0,    24,     5,    51,
       52,   186,   189,   187,   188,   172,   184,     0,   170,   195,
       46,    47,   193,   173,   169,    53,   112,   112,    24,    54,
        0,   174,    82,    86,    83,   167,     0,     0,     0,     0,
@@ -548,184 +548,198 @@ static const short yydefact[] =
       64,    59,    66,    67,    60,    62,    56,   144,   128,   129,
      130,   126,   100,    99,     0,    97,    98,     0,    84,    94,
       26,     0,     0,     0,     0,     0,     0,     0,     0,   131,
-     133,   183,   185,   194,   192,   110,   109,     0,     0,    85,
-     156,   157,   158,   159,   160,   161,   162,   154,    80,    71,
-     198,   196,   197,    73,    72,    78,    76,    81,    77,    75,
-      79,    74,    69,     0,     0,   175,   180,   190,     2,    31,
-      32,    33,     0,     0,     0,     0,    37,    38,    39,    40,
-       0,     0,    17,    30,     0,     0,     0,     0,    95,   107,
-     103,   105,   101,   102,   104,   106,    96,    93,   138,   139,
-     140,   141,   137,   136,   134,   135,   132,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   113,
-     112,   178,   182,   181,   179,    34,    36,    35,    42,    41,
-      43,    29,     0,     0,     0,     0,     0,   208,     0,   204,
-     111,   177,   205,   206,     0,   203,   201,   207,     0,   213,
-     212,   211,     0,     0,     0,     0,     0,   215,     0,     0,
-     209,   214,   210,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   216,     0,   218,
-     219,   220,   221,   222,   223,   217,     0,     0,     0
+     133,   163,   183,   185,   194,   192,   110,   109,     0,     0,
+      85,   156,   157,   158,   159,   160,   161,   162,   154,    80,
+      71,   198,   196,   197,    73,    72,    78,    76,    81,    77,
+      75,    79,    74,    69,     0,     0,   175,   180,   190,     2,
+      31,    32,    33,     0,     0,     0,     0,    37,    38,    39,
+      40,     0,     0,    17,    30,     0,     0,     0,     0,    95,
+     107,   103,   105,   101,   102,   104,   106,    96,    93,   138,
+     139,   140,   141,   137,   136,   134,   135,   132,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
+     113,   112,   178,   182,   181,   179,    34,    36,    35,    42,
+      41,    43,    29,     0,     0,     0,     0,     0,   208,     0,
+     204,   111,   177,   205,   206,     0,   203,   201,   207,     0,
+     213,   212,   211,     0,     0,     0,     0,     0,   215,     0,
+       0,   209,   214,   210,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   216,     0,
+     218,   219,   220,   221,   222,   223,   217,     0,     0,     0
 };
 
 static const short yydefgoto[] =
 {
-     356,    43,    44,    45,    46,   119,   107,   252,   253,    47,
+     357,    43,    44,    45,    46,   119,   107,   253,   254,    47,
       48,    77,    78,    49,   156,   157,    50,   132,   101,   188,
-     189,   266,    51,   205,   289,    91,    92,    52,   199,   200,
-      53,    86,    87,    54,   143,   144,    55,   131,   235,   236,
-     115,   116,   117,   160,   123,   120,   223,    64,    56,    57,
-     256,   257,   306,   307,   323,   308,   321,   326,   327,   340,
-     341
+     189,   267,    51,   206,   290,    91,    92,    52,   199,   200,
+      53,    86,    87,    54,   143,   144,    55,   131,   236,   237,
+     115,   116,   117,   160,   123,   120,   224,    64,    56,    57,
+     257,   258,   307,   308,   324,   309,   322,   327,   328,   341,
+     342
 };
 
 static const short yypact[] =
 {
-      25,  -136,   -35,   -18,-32768,   -50,   -14,    12,    15,   229,
-      14,    -4,   -54,    14,-32768,   125,   -25,   -53,   -51,   -46,
-      28,   -43,-32768,   -25,   -25,-32768,   -40,   -37,-32768,    21,
-      33,    38,-32768,   -27,   125,   -26,   -14,    -1,   280,     2,
-      56,    56,-32768,   201,   -22,-32768,   -25,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -33,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -12,     0,     6,
-       7,     8,    10,    11,    18,    39,    40,   229,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,    14,-32768,    83,   100,
-     116,    -4,-32768,-32768,    14,-32768,-32768,-32768,-32768,-32768,
-  -32768,   -20,-32768,-32768,    55,-32768,   134,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,    28,-32768,    59,-32768,-32768,
-     -25,   -25,-32768,    60,-32768,-32768,-32768,-32768,   117,-32768,
-      35,-32768,   125,-32768,-32768,-32768,   -14,   -14,   -14,   -14,
-     -14,   -14,   -14,    -1,-32768,   135,   139,    -3,   145,   -14,
-     -14,   146,   -14,   -14,   147,   150,   280,-32768,   -38,-32768,
-     152,   152,    65,-32768,   112,   -81,-32768,-32768,-32768,-32768,
+      26,  -126,   -32,   -27,-32768,   -75,   -24,   -13,    -4,   361,
+      15,    -5,   -73,    15,-32768,   126,    39,   -61,   -57,   -55,
+      29,   -50,-32768,    39,    39,-32768,   -47,   -45,-32768,    35,
+      34,    45,-32768,    -9,   126,    -6,   -24,     0,   413,    -3,
+      46,    46,-32768,   202,   -59,-32768,    39,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -43,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,     1,     6,     7,
+       9,    11,    12,    13,    19,    40,    41,   361,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    15,-32768,    66,    67,
+      74,    -5,-32768,-32768,    15,-32768,-32768,-32768,-32768,-32768,
+  -32768,   -12,-32768,-32768,    56,-32768,   134,-32768,   334,-32768,
+  -32768,-32768,-32768,-32768,-32768,    29,-32768,    65,-32768,-32768,
+      39,    39,-32768,    68,-32768,-32768,-32768,-32768,    85,-32768,
+      17,-32768,   126,-32768,-32768,-32768,   -24,   -24,   -24,   -24,
+     -24,   -24,   -24,     0,-32768,   137,   145,   -22,   146,   -24,
+     -24,   147,   -24,   -24,   148,   149,   413,-32768,   -42,-32768,
+     150,   150,    63,-32768,   366,   -78,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    85,-32768,-32768,     9,   -20,-32768,
-  -32768,    -3,    -3,    -3,    -3,    86,   158,   -14,   -14,   134,
-  -32768,-32768,-32768,-32768,-32768,   298,   298,     2,    91,-32768,
+  -32768,-32768,-32768,-32768,    82,-32768,-32768,    10,   -12,-32768,
+  -32768,   -22,   -22,   -22,   -22,    83,   157,   -24,   -24,   134,
+  -32768,-32768,-32768,-32768,-32768,-32768,   187,   187,    -3,    87,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,     2,   163,   -38,-32768,-32768,-32768,-32768,
-  -32768,-32768,   167,   168,   172,   173,-32768,-32768,-32768,-32768,
-     176,   177,   112,-32768,    82,    97,   -90,   101,-32768,-32768,
+  -32768,-32768,-32768,-32768,    -3,   159,   -42,-32768,-32768,-32768,
+  -32768,-32768,-32768,   163,   164,   166,   167,-32768,-32768,-32768,
+  -32768,   168,   169,   366,-32768,    75,    78,  -108,    90,-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,   226,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,   -14,   -14,   102,   111,   -95,-32768,   105,-32768,
-     298,-32768,-32768,-32768,   -39,-32768,-32768,-32768,   110,-32768,
-  -32768,-32768,   104,   124,   -14,   119,  -122,-32768,   122,   -14,
-  -32768,-32768,-32768,   120,    90,   128,   129,   130,   132,   140,
-      46,   133,   -14,   -14,   -14,   -14,   -14,-32768,   136,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,   276,   286,-32768
+  -32768,-32768,   201,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,   -24,   -24,    88,    94,   -92,-32768,    84,
+  -32768,   187,-32768,-32768,-32768,     8,-32768,-32768,-32768,    96,
+  -32768,-32768,-32768,    91,   101,   -24,    97,  -140,-32768,   109,
+     -24,-32768,-32768,-32768,   100,    27,   104,   106,   111,   112,
+     119,    37,   132,   -24,   -24,   -24,   -24,   -24,-32768,   135,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   242,   252,-32768
 };
 
 static const short yypgoto[] =
 {
-  -32768,-32768,   244,-32768,-32768,    29,   -29,-32768,    42,-32768,
-  -32768,-32768,   214,-32768,-32768,   142,-32768,-32768,   -21,-32768,
-     107,-32768,-32768,  -125,-32768,-32768,   205,-32768,-32768,   103,
-  -32768,   292,   -77,-32768,-32768,   175,-32768,-32768,-32768,    76,
-  -32768,   207,-32768,   282,-32768,   300,   -17,   -36,-32768,-32768,
-  -32768,    69,-32768,    20,-32768,-32768,-32768,-32768,     3,-32768,
-      -7
+  -32768,-32768,   -35,-32768,-32768,    30,   -29,-32768,    28,-32768,
+  -32768,-32768,   203,-32768,-32768,   127,-32768,-32768,   -25,-32768,
+      99,-32768,-32768,  -125,-32768,-32768,   194,-32768,-32768,    89,
+  -32768,   277,   -69,-32768,-32768,   152,-32768,-32768,-32768,    55,
+  -32768,   177,-32768,   255,-32768,   269,     3,   -36,-32768,-32768,
+  -32768,    42,-32768,   -10,-32768,-32768,-32768,-32768,   -26,-32768,
+     -38
 };
 
 
-#define	YYLAST		434
+#define	YYLAST		509
 
 
 static const short yytable[] =
 {
-     135,   128,   206,   136,    88,    58,   182,   102,   103,   177,
-     158,   183,   259,   133,   184,    62,   233,   177,    59,    79,
-     304,   102,   103,    80,   325,   304,     1,   137,   104,    81,
-     220,     2,     3,   260,   330,    60,     4,     5,     6,    63,
-     138,     7,   185,    61,   139,   106,     8,     9,   102,   103,
-     221,    10,    11,   254,   255,    12,    13,    14,   126,   127,
-      15,   316,   254,   255,   186,    65,   234,    16,    66,    82,
-      93,   108,    89,   109,   125,   164,    90,    17,   110,   102,
-     103,   118,    18,    19,   122,   319,   104,   124,    20,    21,
-     261,   129,    22,    23,    83,   262,   140,   130,   134,   105,
-     210,   211,   212,   213,   214,   215,   216,    24,    84,   159,
-     263,   209,   166,   225,   226,   187,   228,   229,   239,   163,
-     141,   142,   165,    25,   167,    26,   240,    27,    28,   222,
-     168,   169,   170,    85,   171,   172,   178,    29,    30,    31,
-      32,    33,   173,    34,    95,    35,   264,   265,    96,   203,
-     203,    36,   111,   179,    37,    38,    39,   105,    40,    41,
-     241,   274,   275,   174,   175,   310,    -5,    42,   242,   180,
-     191,   192,   193,   194,   268,   269,   270,   271,   290,   190,
-     112,   113,   114,   202,   204,   243,   207,   208,   218,   244,
-      97,   245,   219,   335,   336,   337,   338,   339,   224,   227,
-     230,   246,   347,   231,   292,   237,   238,     2,     3,   258,
-     272,   273,     4,     5,     6,   291,   293,     7,   247,   248,
-     295,   296,     8,     9,    98,   297,   298,    10,    11,   299,
-     300,    12,    13,    14,   302,    99,    15,   335,   336,   337,
-     338,   339,   309,    16,   249,   195,   250,    67,   251,   303,
-     100,   311,   315,    17,   314,   322,   324,   196,    18,    19,
-     318,   197,   198,   332,    20,    21,   312,   313,    22,    23,
-     325,   329,    68,    69,   349,   334,   357,   355,    70,    71,
-     342,   343,   344,    24,   345,   320,   358,   162,   328,    72,
-     145,   176,   346,   333,   301,   267,   181,   146,   232,    25,
-     147,    26,   276,    27,    28,    94,   350,   351,   352,   353,
-     354,   294,    73,    29,    30,    31,    32,    33,   217,    34,
-     148,    35,   201,   161,   121,   305,   317,    36,     0,   331,
-      37,    38,    39,   348,    40,    41,     0,    74,    75,     0,
-       0,     0,    -5,    42,     0,     0,    76,     0,     0,   277,
-     149,   150,   151,     0,   152,   153,     0,   278,   154,   279,
-       0,     0,     0,     0,   280,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   155,     0,     0,     0,
-       0,     0,     0,   281,     0,   282,   283,     0,   284,   285,
-     286,     0,     0,   287,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   288
+     135,   128,   207,    88,   136,    62,   326,   305,   162,   133,
+     158,   221,   234,   260,   182,    58,   331,   177,    61,   183,
+      79,    59,   184,   305,    80,   177,    60,     1,   137,    63,
+      81,   222,     2,     3,   261,   255,   256,     4,     5,     6,
+      65,   138,     7,   102,   103,   139,   106,     8,     9,    66,
+     185,    93,    10,    11,   102,   103,    12,    13,    14,   126,
+     127,    15,   235,   108,   317,   255,   256,   109,    16,   110,
+      82,    89,   186,   201,   118,    90,   164,   122,    17,   124,
+     102,   103,   163,    18,    19,   102,   103,   104,   125,    20,
+      21,   262,   104,    22,    23,    83,   263,   140,   129,   159,
+     211,   212,   213,   214,   215,   216,   217,   210,    24,    84,
+     223,   264,   165,   226,   227,   130,   229,   230,   134,   178,
+     179,   141,   142,   187,    25,   166,    26,   180,    27,    28,
+     167,   168,   320,   169,    85,   170,   171,   172,    29,    30,
+      31,    32,    33,   173,    34,    95,    35,   265,   266,    96,
+     204,   204,    36,   111,   208,    37,    38,    39,   105,    40,
+      41,   275,   276,   105,   174,   175,   311,    -5,    42,   209,
+     191,   192,   193,   194,   336,   337,   338,   339,   340,   291,
+     190,   112,   113,   114,   336,   337,   338,   339,   340,   203,
+     219,    97,   205,   348,   269,   270,   271,   272,   220,   225,
+     228,   231,   232,   238,   239,   293,   259,   273,     2,     3,
+     274,   292,   294,     4,     5,     6,   296,   297,     7,   298,
+     299,   300,   301,     8,     9,    98,   312,   303,    10,    11,
+     304,   310,    12,    13,    14,   316,    99,    15,   278,   319,
+     315,   323,   358,   325,    16,   195,   279,   326,   280,   330,
+     333,   100,   359,   281,    17,   335,   343,   196,   344,    18,
+      19,   197,   198,   345,   346,    20,    21,   313,   314,    22,
+      23,   347,   282,   350,   283,   284,   356,   285,   286,   287,
+     176,   302,   288,   233,    24,   181,   321,   268,   277,   329,
+      94,   295,   202,   121,   334,   218,   161,   318,     0,   306,
+      25,   332,    26,   349,    27,    28,     0,   351,   352,   353,
+     354,   355,     0,     0,    29,    30,    31,    32,    33,     0,
+      34,     0,    35,   289,     0,     0,     0,     0,    36,     0,
+       0,    37,    38,    39,     0,    40,    41,     0,     0,     0,
+       2,     3,     0,    -5,    42,     4,     5,     6,     0,     0,
+       7,     0,     0,     0,     0,     8,     9,     0,     0,     0,
+      10,    11,     0,     0,    12,    13,    14,     0,     0,    15,
+       0,     0,   240,     0,     0,     0,    16,     0,     0,    67,
+     241,     0,     0,     0,     0,     0,    17,     0,     0,     0,
+       0,    18,    19,     0,     0,     0,     0,    20,    21,     0,
+       0,    22,    23,     0,    68,    69,     0,     0,     0,     0,
+      70,    71,     0,     0,   242,     0,    24,     0,     0,     0,
+       0,    72,   243,   145,     0,     0,     0,     0,     0,     0,
+     146,     0,    25,   147,    26,     0,    27,    28,     0,   244,
+       0,     0,     0,   245,    73,   246,    29,    30,    31,    32,
+      33,     0,    34,   148,    35,   247,     0,     0,     0,     0,
+      36,     0,     0,    37,    38,    39,     0,    40,    41,    74,
+      75,     0,   248,   249,     0,     0,    42,     0,    76,     0,
+       0,     0,     0,   149,   150,   151,     0,   152,   153,     0,
+       0,   154,     0,     0,     0,     0,     0,     0,   250,     0,
+     251,     0,   252,     0,     0,     0,     0,     0,     0,   155
 };
 
 static const short yycheck[] =
 {
-      36,    30,   127,     4,     8,   141,    26,    46,    47,    86,
-      39,    31,     3,    34,    34,    29,    54,    94,    53,     5,
-     115,    46,    47,     9,   146,   115,     1,    28,    53,    15,
-      33,     6,     7,    24,   156,    53,    11,    12,    13,    53,
-      41,    16,    62,    93,    45,    16,    21,    22,    46,    47,
-      53,    26,    27,   143,   144,    30,    31,    32,    25,    30,
-      35,   156,   143,   144,    84,    53,   104,    42,    53,    55,
-     124,   124,    76,   124,    53,    46,    80,    52,   124,    46,
-      47,   124,    57,    58,   124,   124,    53,   124,    63,    64,
-      81,    53,    67,    68,    80,    86,    97,   124,   124,   124,
-     136,   137,   138,   139,   140,   141,   142,    82,    94,    53,
-     101,   132,   124,   149,   150,   135,   152,   153,     6,   141,
-     121,   122,   155,    98,   124,   100,    14,   102,   103,   132,
-     124,   124,   124,   119,   124,   124,    53,   112,   113,   114,
-     115,   116,   124,   118,    19,   120,   137,   138,    23,   120,
-     121,   126,   124,    53,   129,   130,   131,   124,   133,   134,
-      48,   197,   198,   124,   124,   290,   141,   142,    56,    53,
-      36,    37,    38,    39,   191,   192,   193,   194,   207,   124,
-     152,   153,   154,   124,   124,    73,    69,   152,    53,    77,
-      65,    79,    53,   147,   148,   149,   150,   151,    53,    53,
-      53,    89,   156,    53,   233,    53,   141,     6,     7,   124,
-     124,    53,    11,    12,    13,   124,    53,    16,   106,   107,
-      53,    53,    21,    22,    99,    53,    53,    26,    27,    53,
-      53,    30,    31,    32,   152,   110,    35,   147,   148,   149,
-     150,   151,   141,    42,   132,   111,   134,    18,   136,   152,
-     125,    25,   141,    52,   152,   145,   152,   123,    57,    58,
-     155,   127,   128,   141,    63,    64,   302,   303,    67,    68,
-     146,   152,    43,    44,   141,   155,     0,   141,    49,    50,
-     152,   152,   152,    82,   152,   314,     0,    43,   324,    60,
-      10,    77,   152,   329,   252,   188,    91,    17,   156,    98,
-      20,   100,   199,   102,   103,    13,   342,   343,   344,   345,
-     346,   235,    83,   112,   113,   114,   115,   116,   143,   118,
-      40,   120,   115,    41,    24,   256,   306,   126,    -1,   326,
-     129,   130,   131,   340,   133,   134,    -1,   108,   109,    -1,
-      -1,    -1,   141,   142,    -1,    -1,   117,    -1,    -1,    51,
-      70,    71,    72,    -1,    74,    75,    -1,    59,    78,    61,
-      -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    96,    -1,    -1,    -1,
-      -1,    -1,    -1,    85,    -1,    87,    88,    -1,    90,    91,
-      92,    -1,    -1,    95,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   136
+      36,    30,   127,     8,     4,    29,   146,   115,    43,    34,
+      39,    33,    54,     3,    26,   141,   156,    86,    93,    31,
+       5,    53,    34,   115,     9,    94,    53,     1,    28,    53,
+      15,    53,     6,     7,    24,   143,   144,    11,    12,    13,
+      53,    41,    16,    46,    47,    45,    16,    21,    22,    53,
+      62,   124,    26,    27,    46,    47,    30,    31,    32,    25,
+      30,    35,   104,   124,   156,   143,   144,   124,    42,   124,
+      55,    76,    84,   108,   124,    80,    46,   124,    52,   124,
+      46,    47,   141,    57,    58,    46,    47,    53,    53,    63,
+      64,    81,    53,    67,    68,    80,    86,    97,    53,    53,
+     136,   137,   138,   139,   140,   141,   142,   132,    82,    94,
+     132,   101,   155,   149,   150,   124,   152,   153,   124,    53,
+      53,   121,   122,   135,    98,   124,   100,    53,   102,   103,
+     124,   124,   124,   124,   119,   124,   124,   124,   112,   113,
+     114,   115,   116,   124,   118,    19,   120,   137,   138,    23,
+     120,   121,   126,   124,    69,   129,   130,   131,   124,   133,
+     134,   197,   198,   124,   124,   124,   291,   141,   142,   152,
+      36,    37,    38,    39,   147,   148,   149,   150,   151,   208,
+     124,   152,   153,   154,   147,   148,   149,   150,   151,   124,
+      53,    65,   124,   156,   191,   192,   193,   194,    53,    53,
+      53,    53,    53,    53,   141,   234,   124,   124,     6,     7,
+      53,   124,    53,    11,    12,    13,    53,    53,    16,    53,
+      53,    53,    53,    21,    22,    99,    25,   152,    26,    27,
+     152,   141,    30,    31,    32,   141,   110,    35,    51,   155,
+     152,   145,     0,   152,    42,   111,    59,   146,    61,   152,
+     141,   125,     0,    66,    52,   155,   152,   123,   152,    57,
+      58,   127,   128,   152,   152,    63,    64,   303,   304,    67,
+      68,   152,    85,   141,    87,    88,   141,    90,    91,    92,
+      77,   253,    95,   156,    82,    91,   315,   188,   199,   325,
+      13,   236,   115,    24,   330,   143,    41,   307,    -1,   257,
+      98,   327,   100,   341,   102,   103,    -1,   343,   344,   345,
+     346,   347,    -1,    -1,   112,   113,   114,   115,   116,    -1,
+     118,    -1,   120,   136,    -1,    -1,    -1,    -1,   126,    -1,
+      -1,   129,   130,   131,    -1,   133,   134,    -1,    -1,    -1,
+       6,     7,    -1,   141,   142,    11,    12,    13,    -1,    -1,
+      16,    -1,    -1,    -1,    -1,    21,    22,    -1,    -1,    -1,
+      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    35,
+      -1,    -1,     6,    -1,    -1,    -1,    42,    -1,    -1,    18,
+      14,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,
+      -1,    57,    58,    -1,    -1,    -1,    -1,    63,    64,    -1,
+      -1,    67,    68,    -1,    43,    44,    -1,    -1,    -1,    -1,
+      49,    50,    -1,    -1,    48,    -1,    82,    -1,    -1,    -1,
+      -1,    60,    56,    10,    -1,    -1,    -1,    -1,    -1,    -1,
+      17,    -1,    98,    20,   100,    -1,   102,   103,    -1,    73,
+      -1,    -1,    -1,    77,    83,    79,   112,   113,   114,   115,
+     116,    -1,   118,    40,   120,    89,    -1,    -1,    -1,    -1,
+     126,    -1,    -1,   129,   130,   131,    -1,   133,   134,   108,
+     109,    -1,   106,   107,    -1,    -1,   142,    -1,   117,    -1,
+      -1,    -1,    -1,    70,    71,    72,    -1,    74,    75,    -1,
+      -1,    78,    -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,
+     134,    -1,   136,    -1,    -1,    -1,    -1,    -1,    -1,    96
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/local/gnu/share/bison/bison.simple"
@@ -2067,13 +2081,13 @@ case 163:
                         msyslog(LOG_INFO, "getconfig: Maximum include file level exceeded.");
                     }
                     else {
-                        fp[curr_include_level + 1] = F_OPEN(FindConfig(yyvsp[0].String), "r");
+                        fp[curr_include_level + 1] = F_OPEN(FindConfig(yyvsp[-1].String), "r");
                         if (fp[curr_include_level + 1] == NULL) {
-                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(yyvsp[0].String));
-                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig(yyvsp[0].String));
+                            fprintf(stderr, "getconfig: Couldn't open <%s>\n", FindConfig(yyvsp[-1].String));
+                            msyslog(LOG_INFO, "getconfig: Couldn't open <%s>", FindConfig(yyvsp[-1].String));
                         }
                         else
-                            ++curr_include_level;
+                            ip_file = fp[++curr_include_level];
                     }
                 }
     break;


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