Imported Upstream version 7.2.1upstream/7.2.1

1 files changed, 78 insertions, 70 deletions

diff --git a/grammar/grammar.c b/grammar/grammar.c
index 4a73ff0..c9a7cc6 100644
--- a/grammar/grammar.c
+++ b/grammar/grammar.c
@@ -447,7 +447,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   267
+#define YYLAST   305
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  58
@@ -521,7 +521,7 @@ static const yytype_int8 yyrhs[] =
       59,     0,    -1,    -1,    59,    60,    -1,    59,    68,    -1,
       59,    18,    -1,    59,    21,    -1,    59,    22,    -1,     5,
       64,     6,    -1,    10,    64,     6,    -1,    10,    64,     6,
-      49,    61,    50,    -1,    11,    64,     6,    49,    68,    50,
+      49,    61,    50,    -1,    11,    64,     6,    49,    67,    50,
       -1,    -1,    61,    62,    -1,    61,    63,    -1,     8,    64,
        6,    -1,     9,    64,     6,    -1,    -1,    64,    65,    -1,
        3,    51,    66,    -1,    30,    -1,    74,    -1,    68,    -1,
@@ -649,30 +649,30 @@ static const yytype_int8 yydefgoto[] =
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -23
+#define YYPACT_NINF -34
 static const yytype_int16 yypact[] =
 {
-     -23,   222,   -23,   -23,   -23,   -23,   -23,   -23,   -22,   -17,
-     -23,    28,   -23,   -23,   108,   108,   -23,   -23,    51,   -23,
-     -23,   -16,   -23,     5,    17,    21,    23,    -1,    31,   -23,
-      25,   -23,   -23,   -23,     1,    51,   -23,   -23,   -23,    51,
-      51,    59,   174,   -23,    36,    45,   -23,   -23,   -23,    49,
-      50,    51,   -23,     2,   -23,    47,   -23,   -23,   127,   -23,
-      40,   108,    51,    51,    51,    51,    51,    51,    51,    51,
+     -34,   266,   -34,   -34,   -34,   -34,   -34,   -34,    11,    17,
+     -34,    22,   -34,   -34,   129,   129,   -34,   -34,    51,   -34,
+     -34,     6,   -34,     5,    20,    21,    32,     7,    25,   -34,
+     143,   -34,   -34,   -34,    31,    51,   -34,   -34,   -34,    51,
+      51,    48,   218,   -34,    -1,    34,   -34,   -34,   -34,     3,
+      37,    51,   -34,    76,   -34,     0,   -34,   -34,   171,   -34,
+     -10,   129,    51,    51,    51,    51,    51,    51,    51,    51,
       51,    51,    51,    51,    51,    51,    51,    51,    51,    51,
-     -23,   -20,   -23,    25,   150,   -23,   -23,   -23,   103,    48,
-     -23,    75,   -23,    83,   214,   214,   220,   220,   220,   220,
-     220,   220,   220,   220,   220,   220,    46,    46,    46,   -23,
-     -23,   -23,   -23,   -23,   -23,    -3,    56,   -23,    51,   -23,
-     -23,   108,   -23,   -23,   -23,   -23,   -23,   -23,   -23,   -23,
-      81,    82,   -23,   -23
+     -34,   -23,   -34,   143,   194,   -34,   -34,   -34,   147,    43,
+     -34,    68,   -34,    75,   258,   258,   -25,   -25,   -25,   -25,
+     -25,   -25,   -25,   -25,   -25,   -25,   -33,   -33,   -33,   -34,
+     -34,   -34,   -34,   -34,   -34,     1,   115,   -34,    51,   -34,
+     -34,   129,   -34,   -34,   -34,   -34,   -34,   -34,   -34,   -34,
+      36,    38,   -34,   -34
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -23,   -23,   -23,   -23,   -23,   -23,    -4,   -23,   -23,   -23,
-       3,   -12,   -23,    66,    -5,    -7,    32,   -23
+     -34,   -34,   -34,   -34,   -34,   -34,    -4,   -34,   -34,    18,
+       4,   -12,   -34,    58,    -3,   -15,    24,   -34
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -682,64 +682,72 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      24,    25,    26,    33,    20,   122,   123,    27,    45,     4,
-     112,    46,    28,    42,     7,     8,     9,    10,    11,    12,
-      45,    14,    15,    48,    45,    18,    45,    49,    44,    50,
-      56,    29,     4,    54,    57,    58,    41,     7,     8,     9,
-      10,    11,    12,     4,    14,    15,    84,   124,    18,    93,
-      51,    34,    85,    12,    55,    34,    86,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,    35,    36,    37,    38,    35,
-      36,    37,    38,    52,    45,    45,   116,   132,   133,    59,
-      39,    77,    78,    79,    39,    91,    81,    92,    82,    83,
-      40,    87,   119,    41,    40,   120,   127,    41,   121,   129,
-      80,   128,     0,   114,     0,     4,     0,     0,   130,   131,
-       7,     8,     9,    10,    11,    12,     0,    14,    15,    62,
-      63,    18,     0,     0,     0,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,     0,     0,    62,    63,     0,     0,    30,   118,    64,
+      24,    25,    26,    33,    34,    20,     4,   112,    45,   122,
+     123,    46,    77,    78,    79,    42,    12,    74,    75,    76,
+      77,    78,    79,    45,    45,    29,    48,    49,    35,    36,
+      37,    38,    56,    41,    54,    45,    57,    58,    50,    45,
+      27,    45,   132,    39,   133,    91,    28,    92,    84,    93,
+      44,   124,    82,    40,    87,    34,    41,    86,    51,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,    52,    59,    35,
+      36,    37,    38,     4,    55,    81,    83,    54,     7,     8,
+       9,    10,    11,    12,    39,    14,    15,   119,   120,    18,
+     121,   116,    80,   128,    40,   114,     0,    41,     0,   129,
+       0,     0,     0,     0,     0,     0,     0,     0,   130,   131,
+      86,     0,     4,     0,     0,     0,    85,     7,     8,     9,
+      10,    11,    12,     0,    14,    15,     4,     0,    18,     0,
+       0,     7,     8,     9,    10,    11,    12,     0,    14,    15,
+       4,     0,    18,     0,     0,     7,     8,     9,    10,    11,
+      12,     0,    14,    15,     0,   127,    18,     0,     0,     0,
+       0,     0,     0,    62,    63,     0,     0,     0,    30,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,     0,    62,    63,     0,     0,
-       0,    90,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    61,     0,
-      62,    63,   117,     0,     0,     0,    64,    65,    66,    67,
+      75,    76,    77,    78,    79,     0,     0,    62,    63,     0,
+       0,     0,   118,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,     0,
+      62,    63,     0,     0,     0,    90,    64,    65,    66,    67,
       68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,     2,     0,     0,     0,     0,     3,     0,     4,
-       0,     0,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    74,    75,    76,    77,    78,    79
+      78,    79,    61,     0,    62,    63,   117,     0,     0,     0,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,     2,     0,     0,     0,
+       0,     3,     0,     4,     0,     0,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79
 };
 
 static const yytype_int8 yycheck[] =
 {
-       4,     5,     6,    15,     1,     8,     9,    29,     3,     7,
-      30,     6,    29,    18,    12,    13,    14,    15,    16,    17,
-       3,    19,    20,     6,     3,    23,     3,     6,    44,     6,
-      35,     3,     7,    30,    39,    40,    56,    12,    13,    14,
-      15,    16,    17,     7,    19,    20,    51,    50,    23,    61,
-      51,     4,    50,    17,    53,     4,    53,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    28,    29,    30,    31,    28,
-      29,    30,    31,    52,     3,     3,    83,     6,     6,    30,
-      43,    45,    46,    47,    43,    55,    51,    57,    49,    49,
-      53,    54,    54,    56,    53,    30,    50,    56,    25,   121,
-      44,   118,    -1,    81,    -1,     7,    -1,    -1,   122,   123,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    26,
-      27,    23,    -1,    -1,    -1,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    -1,    -1,    26,    27,    -1,    -1,    49,    55,    32,
+       4,     5,     6,    15,     4,     1,     7,    30,     3,     8,
+       9,     6,    45,    46,    47,    18,    17,    42,    43,    44,
+      45,    46,    47,     3,     3,     3,     6,     6,    28,    29,
+      30,    31,    35,    56,    30,     3,    39,    40,     6,     3,
+      29,     3,     6,    43,     6,    55,    29,    57,    51,    61,
+      44,    50,    49,    53,    54,     4,    56,    53,    51,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    52,    30,    28,
+      29,    30,    31,     7,    53,    51,    49,    83,    12,    13,
+      14,    15,    16,    17,    43,    19,    20,    54,    30,    23,
+      25,    83,    44,   118,    53,    81,    -1,    56,    -1,   121,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   122,   123,
+     116,    -1,     7,    -1,    -1,    -1,    50,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,     7,    -1,    23,    -1,
+      -1,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+       7,    -1,    23,    -1,    -1,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    50,    23,    -1,    -1,    -1,
+      -1,    -1,    -1,    26,    27,    -1,    -1,    -1,    49,    32,
       33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    -1,    26,    27,    -1,    -1,
-      -1,    54,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    24,    -1,
-      26,    27,    52,    -1,    -1,    -1,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,     0,    -1,    -1,    -1,    -1,     5,    -1,     7,
-      -1,    -1,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    32,    33,    34,    35,
+      43,    44,    45,    46,    47,    -1,    -1,    26,    27,    -1,
+      -1,    -1,    55,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    -1,
+      26,    27,    -1,    -1,    -1,    54,    32,    33,    34,    35,
       36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    42,    43,    44,    45,    46,    47
+      46,    47,    24,    -1,    26,    27,    52,    -1,    -1,    -1,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,     0,    -1,    -1,    -1,
+      -1,     5,    -1,     7,    -1,    -1,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -757,7 +765,7 @@ static const yytype_uint8 yystos[] =
       71,    51,    49,    49,    72,    50,    68,    54,    72,    73,
       54,    55,    57,    69,    72,    72,    72,    72,    72,    72,
       72,    72,    72,    72,    72,    72,    72,    72,    72,    72,
-      72,    72,    30,    66,    74,    61,    68,    52,    55,    54,
+      72,    72,    30,    66,    74,    61,    67,    52,    55,    54,
       30,    25,     8,     9,    50,    62,    63,    50,    73,    69,
       64,    64,     6,     6
 };
@@ -2066,7 +2074,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 2070 "grammar.c"
+#line 2078 "grammar.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);