[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/KDE/4.7] khtml/css: Fix problem with first CSS rule being
From:       Allan Sandfeld <kde () carewolf ! com>
Date:       2011-11-24 11:44:15
Message-ID: 20111124114415.52C29A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 84b5ef88ce908d3a1464b9d725a1cca1ce6c31be by Allan Sandfeld.
Committed on 24/11/2011 at 12:43.
Pushed by carewolf into branch 'KDE/4.7'.

Fix problem with first CSS rule being ignored

M  +339  -343  khtml/css/parser.cpp
M  +2    -2    khtml/css/parser.y

http://commits.kde.org/kdelibs/84b5ef88ce908d3a1464b9d725a1cca1ce6c31be

diff --git a/khtml/css/parser.cpp b/khtml/css/parser.cpp
index 9cf78c4..d03211d 100644
--- a/khtml/css/parser.cpp
+++ b/khtml/css/parser.cpp
@@ -544,9 +544,9 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  23
+#define YYFINAL  19
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   633
+#define YYLAST   619
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  76
@@ -555,7 +555,7 @@ union yyalloc
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  199
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  377
+#define YYNSTATES  378
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -606,97 +606,97 @@ static const yytype_uint8 yytranslate[] =
    YYRHS.  */
 static const yytype_uint16 yyprhs[] =
 {
-       0,     0,     3,     9,    12,    15,    18,    21,    24,    26,
-      28,    30,    37,    40,    46,    52,    58,    59,    61,    62,
-      65,    66,    69,    72,    73,    75,    81,    85,    89,    90,
-      94,   101,   105,   109,   110,   114,   119,   123,   127,   131,
-     132,   135,   136,   140,   142,   144,   146,   148,   150,   152,
-     155,   157,   159,   161,   164,   166,   168,   171,   172,   177,
-     185,   187,   193,   194,   198,   199,   201,   203,   205,   210,
-     211,   213,   215,   220,   223,   231,   238,   239,   243,   246,
-     250,   254,   258,   262,   266,   269,   272,   275,   277,   279,
-     282,   284,   289,   292,   294,   297,   301,   305,   308,   310,
-     313,   316,   318,   321,   323,   326,   330,   333,   335,   337,
-     340,   343,   345,   347,   349,   352,   355,   357,   359,   361,
-     363,   366,   369,   374,   383,   389,   399,   401,   403,   405,
-     407,   409,   411,   413,   415,   418,   422,   429,   437,   444,
-     451,   458,   463,   468,   473,   479,   485,   489,   493,   498,
-     503,   509,   512,   515,   518,   519,   521,   525,   528,   531,
-     532,   534,   537,   540,   543,   546,   549,   552,   554,   556,
-     559,   562,   565,   568,   571,   574,   577,   580,   583,   586,
-     589,   592,   595,   598,   601,   604,   607,   610,   613,   616,
-     619,   625,   629,   632,   636,   640,   643,   649,   653,   655
+       0,     0,     3,    10,    13,    16,    19,    22,    25,    27,
+      29,    31,    38,    41,    47,    53,    59,    60,    62,    63,
+      66,    67,    70,    73,    74,    76,    82,    86,    90,    91,
+      95,   102,   106,   110,   111,   115,   120,   124,   128,   132,
+     133,   136,   137,   141,   143,   145,   147,   149,   151,   153,
+     156,   158,   160,   162,   165,   167,   169,   172,   173,   178,
+     186,   188,   194,   195,   199,   200,   202,   204,   206,   211,
+     212,   214,   216,   221,   224,   232,   239,   240,   244,   247,
+     251,   255,   259,   263,   267,   270,   273,   276,   278,   280,
+     283,   285,   290,   293,   295,   298,   302,   306,   309,   311,
+     314,   317,   319,   322,   324,   327,   331,   334,   336,   338,
+     341,   344,   346,   348,   350,   353,   356,   358,   360,   362,
+     364,   367,   370,   375,   384,   390,   400,   402,   404,   406,
+     408,   410,   412,   414,   416,   419,   423,   430,   438,   445,
+     452,   459,   464,   469,   474,   480,   486,   490,   494,   499,
+     504,   510,   513,   516,   519,   520,   522,   526,   529,   532,
+     533,   535,   538,   541,   544,   547,   550,   553,   555,   557,
+     560,   563,   566,   569,   572,   575,   578,   581,   584,   587,
+     590,   593,   596,   599,   602,   605,   608,   611,   614,   617,
+     620,   626,   630,   633,   637,   641,   644,   650,   654,   656
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-      77,     0,    -1,    87,    86,    89,    91,    95,    -1,    79,
-      85,    -1,    80,    85,    -1,    81,    85,    -1,    83,    85,
-      -1,    82,    85,    -1,   115,    -1,    90,    -1,    92,    -1,
-      27,    62,    85,    78,    85,    63,    -1,    28,   130,    -1,
-      29,    62,    85,   135,    63,    -1,    31,    62,    85,   116,
-      63,    -1,    30,     4,    85,   105,    63,    -1,    -1,    64,
-      -1,    -1,    85,     4,    -1,    -1,    86,     5,    -1,    86,
-       4,    -1,    -1,    88,    -1,    25,    85,    11,    85,    65,
-      -1,    25,     1,   143,    -1,    25,     1,    65,    -1,    -1,
-      89,    90,    86,    -1,    21,    85,    98,    85,   106,    65,
-      -1,    21,     1,   143,    -1,    21,     1,    65,    -1,    -1,
-      91,    93,    86,    -1,    26,    85,    94,    98,    -1,    92,
-      85,    65,    -1,    26,     1,   143,    -1,    26,     1,    65,
-      -1,    -1,    12,     4,    -1,    -1,    95,    96,    86,    -1,
-     115,    -1,   108,    -1,   111,    -1,   112,    -1,   142,    -1,
-     141,    -1,    90,     1,    -1,   115,    -1,   142,    -1,   141,
-      -1,    90,     1,    -1,    11,    -1,    58,    -1,    12,    85,
-      -1,    -1,    16,    85,   135,    85,    -1,    66,    85,    99,
-      85,   100,    67,    85,    -1,   101,    -1,   102,    85,    35,
-      85,   101,    -1,    -1,    35,    85,   102,    -1,    -1,    33,
-      -1,    34,    -1,   102,    -1,   104,    85,   110,   103,    -1,
-      -1,   107,    -1,   105,    -1,   107,    68,    85,   105,    -1,
-     107,     1,    -1,    23,    85,   107,    62,    85,   109,    63,
-      -1,    23,    85,    62,    85,   109,    63,    -1,    -1,   109,
-      97,    85,    -1,    12,    85,    -1,    22,     1,   143,    -1,
-      22,     1,    65,    -1,    24,    85,   130,    -1,    24,     1,
-     143,    -1,    24,     1,    65,    -1,    64,    85,    -1,    69,
-      85,    -1,    70,    85,    -1,    71,    -1,    64,    -1,   116,
-     130,    -1,   117,    -1,   116,    68,    85,   117,    -1,   116,
-       1,    -1,   119,    -1,   117,     4,    -1,   117,     4,   119,
-      -1,   117,   113,   119,    -1,   117,     1,    -1,    20,    -1,
-      19,    20,    -1,    12,    20,    -1,   121,    -1,   121,   122,
-      -1,   122,    -1,   118,   121,    -1,   118,   121,   122,    -1,
-     118,   122,    -1,   121,    -1,   123,    -1,   118,   121,    -1,
-     118,   123,    -1,    12,    -1,    19,    -1,   123,    -1,   122,
-     123,    -1,   122,     1,    -1,    14,    -1,   124,    -1,   126,
-      -1,   129,    -1,    17,    12,    -1,    12,    85,    -1,    18,
-      85,   125,    72,    -1,    18,    85,   125,   127,    85,   128,
-      85,    72,    -1,    18,    85,   118,   125,    72,    -1,    18,
-      85,   118,   125,   127,    85,   128,    85,    72,    -1,    73,
-      -1,     6,    -1,     7,    -1,     8,    -1,     9,    -1,    10,
-      -1,    12,    -1,    11,    -1,    16,    12,    -1,    16,    16,
-      12,    -1,    16,    59,    85,    13,    85,    67,    -1,    16,
-      59,    85,    84,    57,    85,    67,    -1,    16,    59,    85,
-      12,    85,    67,    -1,    16,    59,    85,    11,    85,    67,
-      -1,    16,    60,    85,   120,    85,    67,    -1,    62,    85,
-     132,    63,    -1,    62,    85,     1,    63,    -1,    62,    85,
-     131,    63,    -1,    62,    85,   131,   132,    63,    -1,    62,
-      85,   131,     1,    63,    -1,   132,    65,    85,    -1,     1,
-      65,    85,    -1,   131,   132,    65,    85,    -1,   131,     1,
-      65,    85,    -1,   133,    16,    85,   135,   134,    -1,     1,
-     143,    -1,    12,    85,    -1,    32,    85,    -1,    -1,   137,
-      -1,   135,   136,   137,    -1,    74,    85,    -1,    68,    85,
-      -1,    -1,   138,    -1,   114,   138,    -1,    54,    85,    -1,
-      11,    85,    -1,    12,    85,    -1,    58,    85,    -1,    61,
-      85,    -1,   140,    -1,   139,    -1,    57,    85,    -1,    56,
-      85,    -1,    55,    85,    -1,    39,    85,    -1,    40,    85,
-      -1,    41,    85,    -1,    42,    85,    -1,    43,    85,    -1,
-      44,    85,    -1,    45,    85,    -1,    46,    85,    -1,    47,
-      85,    -1,    48,    85,    -1,    49,    85,    -1,    50,    85,
-      -1,    51,    85,    -1,    37,    85,    -1,    36,    85,    -1,
-      38,    85,    -1,    52,    85,    -1,    53,    85,    -1,    59,
-      85,   135,    67,    85,    -1,    59,    85,     1,    -1,    15,
-      85,    -1,    75,     1,   143,    -1,    75,     1,    65,    -1,
-       1,   143,    -1,    62,     1,   144,     1,    63,    -1,    62,
-       1,    63,    -1,   143,    -1,   144,     1,   143,    -1
+      77,     0,    -1,    85,    87,    86,    89,    91,    95,    -1,
+      79,    85,    -1,    80,    85,    -1,    81,    85,    -1,    83,
+      85,    -1,    82,    85,    -1,   115,    -1,    90,    -1,    92,
+      -1,    27,    62,    85,    78,    85,    63,    -1,    28,   130,
+      -1,    29,    62,    85,   135,    63,    -1,    31,    62,    85,
+     116,    63,    -1,    30,     4,    85,   105,    63,    -1,    -1,
+      64,    -1,    -1,    85,     4,    -1,    -1,    86,     5,    -1,
+      86,     4,    -1,    -1,    88,    -1,    25,    85,    11,    85,
+      65,    -1,    25,     1,   143,    -1,    25,     1,    65,    -1,
+      -1,    89,    90,    86,    -1,    21,    85,    98,    85,   106,
+      65,    -1,    21,     1,   143,    -1,    21,     1,    65,    -1,
+      -1,    91,    93,    86,    -1,    26,    85,    94,    98,    -1,
+      92,    85,    65,    -1,    26,     1,   143,    -1,    26,     1,
+      65,    -1,    -1,    12,     4,    -1,    -1,    95,    96,    86,
+      -1,   115,    -1,   108,    -1,   111,    -1,   112,    -1,   142,
+      -1,   141,    -1,    90,     1,    -1,   115,    -1,   142,    -1,
+     141,    -1,    90,     1,    -1,    11,    -1,    58,    -1,    12,
+      85,    -1,    -1,    16,    85,   135,    85,    -1,    66,    85,
+      99,    85,   100,    67,    85,    -1,   101,    -1,   102,    85,
+      35,    85,   101,    -1,    -1,    35,    85,   102,    -1,    -1,
+      33,    -1,    34,    -1,   102,    -1,   104,    85,   110,   103,
+      -1,    -1,   107,    -1,   105,    -1,   107,    68,    85,   105,
+      -1,   107,     1,    -1,    23,    85,   107,    62,    85,   109,
+      63,    -1,    23,    85,    62,    85,   109,    63,    -1,    -1,
+     109,    97,    85,    -1,    12,    85,    -1,    22,     1,   143,
+      -1,    22,     1,    65,    -1,    24,    85,   130,    -1,    24,
+       1,   143,    -1,    24,     1,    65,    -1,    64,    85,    -1,
+      69,    85,    -1,    70,    85,    -1,    71,    -1,    64,    -1,
+     116,   130,    -1,   117,    -1,   116,    68,    85,   117,    -1,
+     116,     1,    -1,   119,    -1,   117,     4,    -1,   117,     4,
+     119,    -1,   117,   113,   119,    -1,   117,     1,    -1,    20,
+      -1,    19,    20,    -1,    12,    20,    -1,   121,    -1,   121,
+     122,    -1,   122,    -1,   118,   121,    -1,   118,   121,   122,
+      -1,   118,   122,    -1,   121,    -1,   123,    -1,   118,   121,
+      -1,   118,   123,    -1,    12,    -1,    19,    -1,   123,    -1,
+     122,   123,    -1,   122,     1,    -1,    14,    -1,   124,    -1,
+     126,    -1,   129,    -1,    17,    12,    -1,    12,    85,    -1,
+      18,    85,   125,    72,    -1,    18,    85,   125,   127,    85,
+     128,    85,    72,    -1,    18,    85,   118,   125,    72,    -1,
+      18,    85,   118,   125,   127,    85,   128,    85,    72,    -1,
+      73,    -1,     6,    -1,     7,    -1,     8,    -1,     9,    -1,
+      10,    -1,    12,    -1,    11,    -1,    16,    12,    -1,    16,
+      16,    12,    -1,    16,    59,    85,    13,    85,    67,    -1,
+      16,    59,    85,    84,    57,    85,    67,    -1,    16,    59,
+      85,    12,    85,    67,    -1,    16,    59,    85,    11,    85,
+      67,    -1,    16,    60,    85,   120,    85,    67,    -1,    62,
+      85,   132,    63,    -1,    62,    85,     1,    63,    -1,    62,
+      85,   131,    63,    -1,    62,    85,   131,   132,    63,    -1,
+      62,    85,   131,     1,    63,    -1,   132,    65,    85,    -1,
+       1,    65,    85,    -1,   131,   132,    65,    85,    -1,   131,
+       1,    65,    85,    -1,   133,    16,    85,   135,   134,    -1,
+       1,   143,    -1,    12,    85,    -1,    32,    85,    -1,    -1,
+     137,    -1,   135,   136,   137,    -1,    74,    85,    -1,    68,
+      85,    -1,    -1,   138,    -1,   114,   138,    -1,    54,    85,
+      -1,    11,    85,    -1,    12,    85,    -1,    58,    85,    -1,
+      61,    85,    -1,   140,    -1,   139,    -1,    57,    85,    -1,
+      56,    85,    -1,    55,    85,    -1,    39,    85,    -1,    40,
+      85,    -1,    41,    85,    -1,    42,    85,    -1,    43,    85,
+      -1,    44,    85,    -1,    45,    85,    -1,    46,    85,    -1,
+      47,    85,    -1,    48,    85,    -1,    49,    85,    -1,    50,
+      85,    -1,    51,    85,    -1,    37,    85,    -1,    36,    85,
+      -1,    38,    85,    -1,    52,    85,    -1,    53,    85,    -1,
+      59,    85,   135,    67,    85,    -1,    59,    85,     1,    -1,
+      15,    85,    -1,    75,     1,   143,    -1,    75,     1,    65,
+      -1,     1,   143,    -1,    62,     1,   144,     1,    63,    -1,
+      62,     1,    63,    -1,   143,    -1,   144,     1,   143,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -805,7 +805,7 @@ static const yytype_uint8 yyr1[] =
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     5,     2,     2,     2,     2,     2,     1,     1,
+       0,     2,     6,     2,     2,     2,     2,     2,     1,     1,
        1,     6,     2,     5,     5,     5,     0,     1,     0,     2,
        0,     2,     2,     0,     1,     5,     3,     3,     0,     3,
        6,     3,     3,     0,     3,     4,     3,     3,     3,     0,
@@ -832,113 +832,113 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-      23,     0,     0,     0,     0,     0,     0,     0,    18,    18,
-      18,    18,    18,    20,    24,     0,     0,    18,    18,    12,
-      18,    18,    18,     1,     3,     4,     5,     7,     6,    28,
-       0,    27,    26,    19,    18,     0,     0,     0,    64,     0,
-      22,    21,    33,     0,     0,   111,   116,     0,     0,    18,
-     112,    98,     0,    18,    18,     9,    10,     8,     0,     0,
-       0,    93,   101,     0,   113,   117,   118,   119,     0,    18,
-       0,     0,     0,    18,    18,    18,    18,    18,    18,    18,
+      18,     0,     0,     0,     0,     0,     0,    18,    18,    18,
+      18,    18,    23,    18,    18,    12,    18,    18,    18,     1,
+       3,     4,     5,     7,     6,    19,     0,    20,    24,     0,
+       0,     0,    64,     0,     0,     0,    28,   111,   116,     0,
+       0,    18,   112,    98,     0,    18,    18,     9,    10,     8,
+       0,     0,     0,    93,   101,     0,   113,   117,   118,   119,
+       0,    18,     0,     0,     0,    18,    18,    18,    18,    18,
       18,    18,    18,    18,    18,    18,    18,    18,    18,    18,
       18,    18,    18,    18,    18,    18,    18,    18,    18,    18,
-      18,    88,    87,     0,   159,   155,   160,   168,   167,    65,
-      66,    18,    60,    67,    18,     0,     0,    20,    41,   197,
-     198,     0,    25,   100,   134,     0,    18,    18,   120,     0,
-      99,     0,     0,    39,     0,    92,    18,    89,    97,    94,
-      18,    18,    18,     0,   111,   112,   104,     0,     0,   115,
-     114,   142,    18,   151,   152,     0,   143,     0,   141,    18,
-      18,   163,   164,   192,   186,   185,   187,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     188,   189,   162,   171,   170,   169,   165,     0,   166,   161,
-      13,    18,    18,     0,     0,     0,     0,    15,    14,    29,
-       0,    18,    20,     0,     0,   135,    16,     0,    18,     0,
-       0,     0,    32,    31,    54,    55,    18,     0,     0,    11,
-       0,    95,    84,    85,    86,    96,     0,   147,   145,    18,
-     144,    18,   146,     0,   191,   159,   158,   157,   156,    18,
-      18,    18,    18,    62,     0,     0,    34,     0,     0,    18,
-       0,     0,     0,    20,    44,    45,    46,    43,    48,    47,
-     196,   199,    18,    18,    18,    17,     0,     0,    18,   107,
-     108,   121,    18,     0,   127,   128,   129,   130,   131,   122,
-     126,    18,    64,    40,    35,     0,   149,   148,   159,    18,
-      56,    57,     0,    78,    18,    68,    38,    37,    36,   195,
-       0,    64,     0,     0,     0,    49,    42,     0,     0,     0,
-      18,   109,   110,     0,   124,    18,     0,    71,     0,     0,
-      18,   150,   190,    18,     0,    61,     0,    80,    79,    18,
-       0,    83,    82,    81,   194,   193,   139,   138,   136,     0,
-     140,     0,   133,   132,    18,    30,    73,    18,   153,     0,
-      18,    63,    76,    18,   137,    18,     0,    64,   159,    59,
-       0,    76,     0,   123,    72,    58,    75,     0,    18,    50,
-      52,    51,     0,   125,    53,    77,    74
+      18,    18,    18,    88,    87,     0,   159,   155,   160,   168,
+     167,    65,    66,    18,    60,    67,    18,     0,     0,     0,
+      27,    26,    18,    22,    21,    33,   100,   134,     0,    18,
+      18,   120,     0,    99,     0,     0,    39,     0,    92,    18,
+      89,    97,    94,    18,    18,    18,     0,   111,   112,   104,
+       0,     0,   115,   114,   142,    18,   151,   152,     0,   143,
+       0,   141,    18,    18,   163,   164,   192,   186,   185,   187,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   188,   189,   162,   171,   170,   169,   165,
+       0,   166,   161,    13,    18,    18,     0,     0,     0,     0,
+      15,    14,     0,     0,    20,    41,   135,    16,     0,    18,
+       0,     0,     0,    32,    31,    54,    55,    18,     0,     0,
+      11,     0,    95,    84,    85,    86,    96,     0,   147,   145,
+      18,   144,    18,   146,     0,   191,   159,   158,   157,   156,
+      18,    18,    18,    18,    62,   197,   198,     0,    25,    29,
+       0,    18,    20,     0,    18,    18,    18,    17,     0,     0,
+      18,   107,   108,   121,    18,     0,   127,   128,   129,   130,
+     131,   122,   126,    18,    64,    40,    35,     0,   149,   148,
+     159,    18,    56,    57,     0,    78,    18,    68,     0,     0,
+       0,    34,     0,     0,    18,     0,     0,     0,    20,    44,
+      45,    46,    43,    48,    47,     0,     0,     0,    18,   109,
+     110,     0,   124,    18,     0,    71,     0,     0,    18,   150,
+     190,    18,     0,    61,     0,   196,   199,    38,    37,    36,
+     195,     0,    64,     0,     0,     0,    49,    42,   139,   138,
+     136,     0,   140,     0,   133,   132,    18,    30,    73,    18,
+     153,     0,    18,    63,    80,    79,    18,     0,    83,    82,
+      81,   194,   193,   137,    18,     0,    64,   159,    59,    76,
+      18,     0,   123,    72,    58,     0,    76,   125,    75,     0,
+      18,    50,    52,    51,     0,    53,    77,    74
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     7,    54,     8,     9,    10,    11,    12,   266,   133,
-      29,    13,    14,    42,   367,   118,    56,   202,   218,   203,
-     253,   368,   216,   240,   324,   112,   113,   295,   114,   317,
-     318,   319,   254,   360,   243,   255,   256,   143,   103,   369,
-      58,    59,    60,    61,   268,    62,    63,    64,    65,   211,
-      66,   281,   344,    67,    19,    70,    71,    72,   321,   104,
-     193,   105,   106,   107,   108,   370,   371,   153,   121
+      -1,     6,    46,     7,     8,     9,    10,    11,   248,   126,
+      36,    27,    28,   115,   369,   195,    48,   242,   209,   243,
+     288,   370,   207,   231,   312,   104,   105,   277,   106,   305,
+     306,   307,   289,   365,   234,   290,   291,   136,    95,   371,
+      50,    51,    52,    53,   250,    54,    55,    56,    57,   202,
+      58,   263,   336,    59,    15,    62,    63,    64,   309,    96,
+     186,    97,    98,    99,   100,   372,   373,   146,   237
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -182
+#define YYPACT_NINF -189
 static const yytype_int16 yypact[] =
 {
-     534,    27,   -32,   -13,     9,   115,    75,   177,  -182,  -182,
-    -182,  -182,  -182,  -182,  -182,   -15,   153,  -182,  -182,  -182,
-    -182,  -182,  -182,  -182,   191,   191,   191,   191,   191,   171,
-     200,  -182,  -182,  -182,  -182,   426,    28,   489,   170,   491,
-    -182,  -182,   212,   232,   114,   215,  -182,   257,   234,  -182,
-     236,  -182,   295,  -182,  -182,  -182,  -182,  -182,    54,   222,
-     500,  -182,   506,   392,  -182,  -182,  -182,  -182,   245,  -182,
-     155,   154,   252,  -182,  -182,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,  -182,   576,   192,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,  -182,    10,  -182,   220,    38,  -182,   277,  -182,
-    -182,   304,  -182,  -182,  -182,   300,  -182,  -182,  -182,   319,
-    -182,   270,   223,    22,   143,  -182,  -182,  -182,  -182,   344,
-    -182,  -182,  -182,   344,  -182,  -182,   506,   401,   410,  -182,
-    -182,  -182,  -182,  -182,   191,   264,  -182,   224,  -182,  -182,
-    -182,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   191,   191,   191,   191,   191,   333,   191,  -182,
-    -182,  -182,  -182,   540,   225,    11,   246,  -182,  -182,   171,
-     253,  -182,  -182,    42,   278,  -182,   240,   491,   215,   236,
-     313,   124,  -182,  -182,  -182,  -182,  -182,   326,   112,  -182,
-     491,  -182,   191,   191,   191,  -182,   419,   191,  -182,  -182,
-    -182,  -182,   191,   489,  -182,    87,   191,   191,  -182,  -182,
-    -182,  -182,  -182,   301,   303,   167,   171,   280,   346,  -182,
-      66,   350,   354,  -182,  -182,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,  -182,  -182,  -182,  -182,   302,   500,  -182,  -182,
-    -182,   191,  -182,   136,  -182,  -182,  -182,  -182,  -182,  -182,
-    -182,  -182,   159,  -182,  -182,   428,   191,   191,   250,  -182,
-     191,    19,   148,   191,  -182,  -182,  -182,  -182,  -182,  -182,
-     336,   132,   338,    65,   351,  -182,   171,   111,   116,   144,
-    -182,  -182,  -182,   145,  -182,  -182,   209,  -182,   330,    56,
-    -182,  -182,   191,  -182,   299,  -182,   148,  -182,  -182,  -182,
-     137,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,   149,
-    -182,   209,  -182,  -182,  -182,  -182,  -182,  -182,   191,   489,
-    -182,    10,   191,  -182,  -182,  -182,    32,   170,    40,   191,
-     168,   191,    33,  -182,  -182,   191,  -182,   398,  -182,  -182,
-    -182,  -182,   258,  -182,  -182,   191,  -182
+     469,   -29,   -11,     1,   182,    95,   201,  -189,  -189,  -189,
+    -189,  -189,    20,  -189,  -189,  -189,  -189,  -189,  -189,  -189,
+     211,   211,   211,   211,   211,  -189,    26,  -189,  -189,   522,
+      52,   466,   209,   444,    -5,   290,   326,   216,  -189,   343,
+     212,  -189,   227,  -189,   263,  -189,  -189,  -189,  -189,  -189,
+      42,    54,   533,  -189,   436,   264,  -189,  -189,  -189,  -189,
+     135,  -189,   124,   100,   245,  -189,  -189,  -189,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,   553,   255,  -189,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,    17,  -189,   229,    58,   271,
+    -189,  -189,  -189,  -189,  -189,   269,  -189,  -189,   288,  -189,
+    -189,  -189,   285,  -189,   257,   262,    30,   151,  -189,  -189,
+    -189,  -189,   599,  -189,  -189,  -189,   599,  -189,  -189,   436,
+     348,   405,  -189,  -189,  -189,  -189,  -189,   211,   306,  -189,
+     223,  -189,  -189,  -189,   211,   211,   211,   211,   211,   211,
+     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
+     211,   211,   211,   211,   211,   211,   211,   211,   211,   211,
+     336,   211,  -189,  -189,  -189,  -189,   517,   213,    27,   275,
+    -189,  -189,   352,   164,  -189,   289,  -189,   198,   444,   216,
+     227,   305,   131,  -189,  -189,  -189,  -189,  -189,   320,   181,
+    -189,   444,  -189,   211,   211,   211,  -189,   423,   211,  -189,
+    -189,  -189,  -189,   211,   466,  -189,   242,   211,   211,  -189,
+    -189,  -189,  -189,  -189,   309,  -189,  -189,   349,  -189,   326,
+     295,  -189,  -189,   159,  -189,  -189,  -189,  -189,   299,   533,
+    -189,  -189,  -189,   211,  -189,   422,  -189,  -189,  -189,  -189,
+    -189,  -189,  -189,  -189,   204,  -189,  -189,   126,   211,   211,
+     381,  -189,   211,    19,    43,   211,  -189,  -189,   363,   273,
+     170,   326,   301,   366,  -189,   166,   397,   404,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,    32,    44,    46,  -189,  -189,
+    -189,   139,  -189,  -189,    28,  -189,   355,   153,  -189,  -189,
+     211,  -189,   341,  -189,    43,  -189,  -189,  -189,  -189,  -189,
+    -189,   296,   279,   334,   165,   339,  -189,   326,  -189,  -189,
+    -189,   152,  -189,    28,  -189,  -189,  -189,  -189,  -189,  -189,
+     211,   466,  -189,    17,  -189,  -189,  -189,    96,  -189,  -189,
+    -189,  -189,  -189,  -189,  -189,    21,   209,    34,   211,   211,
+    -189,    24,  -189,  -189,   211,   130,   211,  -189,  -189,   432,
+    -189,  -189,  -189,  -189,   239,  -189,   211,  -189
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,    -1,
-     -93,  -182,  -182,  -182,   -30,  -182,   289,  -182,  -182,  -182,
-    -182,  -182,   194,  -182,  -182,   129,    96,  -182,  -182,   -37,
-    -182,   130,  -182,    64,  -182,  -182,  -182,  -182,  -182,   -31,
-     395,   219,  -107,   158,  -182,   -57,   -35,   -45,  -182,   231,
-    -182,   175,   108,  -182,   -56,  -182,   380,  -182,  -182,  -181,
-    -182,   260,   348,  -182,  -182,   254,   255,    -2,  -182
+    -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,  -189,     0,
+    -188,  -189,  -189,  -189,   -17,  -189,   240,  -189,  -189,  -189,
+    -189,  -189,   225,  -189,  -189,   162,   128,  -189,  -189,   -31,
+    -189,   116,  -189,    77,  -189,  -189,  -189,  -189,  -189,   -27,
+     412,   236,  -103,    -4,  -189,   -37,   -32,   -26,  -189,   250,
+    -189,   202,   132,  -189,   -47,  -189,   409,  -189,  -189,  -175,
+    -189,   280,   364,  -189,  -189,   233,   237,   -30,  -189
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -947,188 +947,184 @@ static const yytype_int16 yypgoto[] =
 #define YYTABLE_NINF -155
 static const yytype_int16 yytable[] =
 {
-      16,   115,   137,   146,    57,    55,   235,    24,    25,    26,
-      27,    28,   117,    32,   -18,    33,    35,    36,   150,    37,
-      38,    39,   210,    33,   199,   147,    33,   148,    15,    68,
-      17,   -18,    33,    44,   217,   323,    33,    33,   -18,   135,
-      69,   120,    -2,   247,   -18,   -18,   241,    30,   129,    18,
-      31,   132,   288,   134,    45,   135,    46,   346,    47,    48,
-      49,    50,    51,    52,   248,   249,   250,   302,   154,    33,
-     -18,    20,   161,   162,   163,   164,   165,   166,   167,   168,
+      12,   107,    49,   130,   111,   226,   239,    20,    21,    22,
+      23,    24,    47,    29,    30,   139,    31,    32,    33,   201,
+     140,   -18,   141,    25,    25,    25,    35,    34,    25,   143,
+     -18,    25,    25,    13,    25,   311,    25,   -18,   -18,   334,
+     335,   122,   208,   128,   125,    26,   127,    25,    25,   270,
+      25,    14,   -18,    60,   281,   131,    25,   109,   132,   128,
+     110,   147,   232,    16,    61,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
      169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     267,   198,   150,   150,   363,   373,   136,   -18,   191,   246,
-     194,   226,   195,   196,   192,    33,    18,   251,    33,    21,
-      33,   -70,   136,   214,   347,   206,   207,    18,   -18,   213,
-     274,   275,   276,   277,   278,   220,    33,    22,   346,   222,
-     223,   224,   274,   275,   276,   277,   278,    33,    33,    33,
-     269,   227,    33,    33,   289,   191,   155,    33,   232,   233,
-     306,   192,   270,    33,    34,   109,   110,    69,   358,   247,
-     215,    33,   257,   252,    33,    40,    41,    23,   336,   122,
-      45,   150,    46,   337,    47,    48,    49,    50,    51,    52,
-     236,   237,   109,   110,   329,    33,   279,   280,   111,   353,
-     245,    43,   261,   109,   110,   347,   219,   271,   314,   280,
-     311,   338,   340,    33,   111,   282,   354,   158,   156,   159,
-     342,   343,   312,   138,   -69,   111,   139,    33,   286,    33,
-     287,   366,   298,    52,   214,   123,   111,   239,   290,   291,
-     292,   293,   297,   251,    33,   299,   128,   333,   301,   303,
-      33,   262,   263,   264,   244,   190,   130,   -18,   242,   247,
-     191,   307,   308,   309,   -18,   -18,   192,   313,   160,   124,
-      45,   271,    46,   125,    47,    48,    49,    50,    51,    52,
-     316,   215,   320,   197,   -90,   -90,   140,   230,   322,   231,
-     -90,   141,   142,   326,    30,   119,   131,   221,   328,   -18,
-     332,   225,   335,   200,   265,   204,   -18,    30,   151,   339,
-     152,   -18,   205,  -154,   341,  -154,   126,   127,   191,   348,
-     364,   376,   349,    33,   192,   272,    30,   228,   352,   229,
-     283,   208,    30,   251,   234,   212,   294,    33,   209,    51,
-      30,   260,    30,   356,    73,    74,   357,   300,    75,   359,
-     195,   304,   361,   -18,   362,   305,    45,   365,    46,   310,
-      47,    48,    49,    50,    51,    30,   350,   375,   296,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   149,   100,   345,  -103,   101,    30,   374,
-      30,   327,   149,   331,   102,  -106,    46,   201,    47,    48,
-      49,   149,   284,    30,  -102,    46,   334,    47,    48,    49,
-     149,   325,   351,  -105,    46,   372,    47,    48,    49,   138,
-      33,   330,   139,    46,   116,    47,    48,    49,    45,   285,
-      46,   273,    47,    48,    49,    50,    51,    52,   315,   355,
-     157,   189,    53,   238,  -103,  -103,  -103,   258,   259,     0,
-    -103,  -103,  -103,  -106,  -106,  -106,     0,     0,     0,  -106,
-    -106,  -106,  -102,  -102,  -102,     0,     0,     0,  -102,  -102,
-    -102,  -105,  -105,  -105,     0,     0,     0,  -105,  -105,  -105,
-     -91,   -91,   140,    33,     0,    33,   -91,   141,   142,     0,
-      73,    74,     0,    45,    75,    46,     0,    47,    48,    49,
-      50,    51,   144,     0,    46,     0,    47,    48,    49,   145,
-      46,     0,    47,    48,    49,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,     0,
-     100,    73,    74,   101,     0,    75,     0,     0,     0,     1,
-     102,     2,     3,     4,     5,     6,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-       0,   100,     0,     0,   101,     0,     0,     0,     0,     0,
-       0,   102,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-       0,    95,    96,    97
+     179,   180,   181,   362,   204,   249,   367,   338,   194,   328,
+     327,   -18,   184,   187,    14,   188,   189,   217,   185,   103,
+     129,   329,   193,   330,   143,   143,   -90,   -90,   133,   197,
+     198,   191,   -90,   134,   135,   148,   129,   131,   212,   211,
+     132,   282,   216,   213,   214,   215,    61,   256,   257,   258,
+     259,   260,    37,    25,    38,   218,    39,    40,    41,    42,
+      43,    44,   223,   224,   338,    25,    25,    18,   360,    -2,
+     282,   251,   236,   151,   339,   152,   357,   323,    25,    25,
+     -18,    37,   252,    38,    25,    39,    40,    41,    42,    43,
+      44,   283,   284,   285,   227,   228,    17,   149,   -91,   -91,
+     133,   143,   205,   368,   -91,   134,   135,   109,   144,   253,
+     145,    19,    25,   261,   262,   286,   332,   264,    25,   244,
+     245,   246,   299,    25,   210,    25,   292,    25,   -70,   353,
+     268,   339,   269,   300,   121,   230,   287,    14,   -18,   238,
+     272,   273,   274,   275,   286,   319,   116,   101,   102,   206,
+     282,   280,   101,   102,   295,   296,   297,   123,   316,   318,
+     301,    37,   320,    38,   253,    39,    40,    41,    42,    43,
+      44,   153,   247,   304,   124,   142,    25,   -18,  -103,   -69,
+     103,   310,   192,   205,   -18,   103,   314,   350,    38,    25,
+      39,    40,    41,    25,   322,   324,   221,   233,   222,    25,
+      44,   345,   190,   349,    25,   352,   279,   199,   331,   -18,
+     196,   112,   377,   333,   200,    43,   -18,   -18,   340,   271,
+     184,   341,   101,   102,   286,   240,   185,   254,   183,   109,
+     206,   -18,   203,   184,   265,   363,  -103,  -103,  -103,   185,
+     113,   114,  -103,  -103,  -103,   109,   355,   225,   317,   356,
+      25,   346,   358,   188,   276,   103,   359,    65,    66,   142,
+     278,    67,  -106,   -18,   361,   117,   298,   364,   109,   118,
+     366,   344,    38,   109,    39,    40,    41,   321,   109,   219,
+     376,   220,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,   109,    92,   325,   348,
+      93,   109,   119,   120,   351,   326,   142,    94,   342,  -102,
+    -106,  -106,  -106,   308,   109,   235,  -106,  -106,  -106,    38,
+     337,    39,    40,    41,   142,   109,   315,  -105,   256,   257,
+     258,   259,   260,   375,   266,   241,   313,    38,   347,    39,
+      40,    41,   343,   374,  -154,   108,  -154,   267,    25,   184,
+      38,   255,    39,    40,    41,   185,    37,   303,    38,   182,
+      39,    40,    41,    42,    43,   354,   229,  -102,  -102,  -102,
+      25,   150,     0,  -102,  -102,  -102,   293,    65,    66,     0,
+     294,    67,     0,     0,     0,  -105,  -105,  -105,     0,     0,
+       0,  -105,  -105,  -105,   302,   262,     1,     2,     3,     4,
+       5,     0,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    25,    92,    65,    66,
+      93,     0,    67,     0,    37,     0,    38,    94,    39,    40,
+      41,    42,    43,    44,     0,   137,     0,    38,    45,    39,
+      40,    41,   138,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,     0,    92,     0,
+       0,    93,     0,     0,     0,     0,     0,     0,    94,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,     0,    87,    88,
+      89,    37,     0,    38,     0,    39,    40,    41,    42,    43
 };
 
 #define yypact_value_is_default(yystate) \
-  ((yystate) == (-182))
+  ((yystate) == (-189))
 
 #define yytable_value_is_error(yytable_value) \
   YYID (0)
 
 static const yytype_int16 yycheck[] =
 {
-       1,    38,    58,    60,    35,    35,   187,     8,     9,    10,
-      11,    12,    42,    15,     4,     4,    17,    18,    63,    20,
-      21,    22,   129,     4,   117,    60,     4,    62,     1,     1,
-      62,     4,     4,    34,    12,    16,     4,     4,    11,     1,
-      12,    43,     0,     1,     4,    35,    35,    62,    49,    62,
-      65,    52,   233,    54,    12,     1,    14,     1,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,     1,    69,     4,
-       4,    62,    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,
-     207,    63,   147,   148,    72,    72,    68,    67,    68,   202,
-     111,   146,   113,   114,    74,     4,    62,    75,     4,     4,
-       4,    65,    68,    11,    68,   126,   127,    62,    62,   131,
-       6,     7,     8,     9,    10,   136,     4,    62,     1,   140,
-     141,   142,     6,     7,     8,     9,    10,     4,     4,     4,
-     207,   152,     4,     4,    67,    68,     1,     4,   159,   160,
-     253,    74,   207,     4,    11,    33,    34,    12,   349,     1,
-      58,     4,   203,   203,     4,     4,     5,     0,    67,    65,
-      12,   226,    14,    67,    16,    17,    18,    19,    20,    21,
-     191,   192,    33,    34,    62,     4,    72,    73,    66,    62,
-     201,     1,   204,    33,    34,    68,    63,   208,    72,    73,
-     267,    67,    67,     4,    66,   216,    67,    63,    63,    65,
-      11,    12,   267,     1,    65,    66,     4,     4,   229,     4,
-     231,    63,    65,    21,    11,    20,    66,    12,   239,   240,
-     241,   242,   244,    75,     4,   247,    12,   303,   249,   250,
-       4,    11,    12,    13,     1,    63,    20,     4,    12,     1,
-      68,   262,   263,   264,    11,    12,    74,   268,    16,    12,
-      12,   272,    14,    16,    16,    17,    18,    19,    20,    21,
-     281,    58,    32,    63,    62,    63,    64,    63,   289,    65,
-      68,    69,    70,   294,    62,    63,     1,   139,   300,     4,
-     302,   143,   304,    26,    64,     1,    11,    62,    63,   310,
-      65,    58,    12,    63,   315,    65,    59,    60,    68,   320,
-     357,    63,   323,     4,    74,    12,    62,    63,   329,    65,
-       4,    12,    62,    75,     1,    65,    35,     4,    19,    20,
-      62,    63,    62,   344,    11,    12,   347,     1,    15,   350,
-     351,     1,   353,    58,   355,     1,    12,   358,    14,    57,
-      16,    17,    18,    19,    20,    62,    67,   368,    65,    36,
-      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,     1,    61,    65,     4,    64,    62,     1,
-      62,    65,     1,    65,    71,     4,    14,   118,    16,    17,
-      18,     1,   218,    62,     4,    14,    65,    16,    17,    18,
-       1,   292,   326,     4,    14,   361,    16,    17,    18,     1,
-       4,   301,     4,    14,    39,    16,    17,    18,    12,   220,
-      14,   210,    16,    17,    18,    19,    20,    21,   273,   341,
-      70,   103,    26,   193,    62,    63,    64,   203,   203,    -1,
-      68,    69,    70,    62,    63,    64,    -1,    -1,    -1,    68,
-      69,    70,    62,    63,    64,    -1,    -1,    -1,    68,    69,
-      70,    62,    63,    64,    -1,    -1,    -1,    68,    69,    70,
-      62,    63,    64,     4,    -1,     4,    68,    69,    70,    -1,
-      11,    12,    -1,    12,    15,    14,    -1,    16,    17,    18,
-      19,    20,    12,    -1,    14,    -1,    16,    17,    18,    19,
-      14,    -1,    16,    17,    18,    36,    37,    38,    39,    40,
-      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    -1,
-      61,    11,    12,    64,    -1,    15,    -1,    -1,    -1,    25,
-      71,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      -1,    61,    -1,    -1,    64,    -1,    -1,    -1,    -1,    -1,
-      -1,    71,    36,    37,    38,    39,    40,    41,    42,    43,
+       0,    32,    29,    50,    34,   180,   194,     7,     8,     9,
+      10,    11,    29,    13,    14,    52,    16,    17,    18,   122,
+      52,     4,    54,     4,     4,     4,    26,     1,     4,    55,
+       4,     4,     4,    62,     4,    16,     4,    11,     4,    11,
+      12,    41,    12,     1,    44,    25,    46,     4,     4,   224,
+       4,    62,    35,     1,   242,     1,     4,    62,     4,     1,
+      65,    61,    35,    62,    12,    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,    72,   124,   198,    72,     1,   115,    67,
+     288,    67,    68,   103,    62,   105,   106,   139,    74,    66,
+      68,    67,   112,    67,   140,   141,    62,    63,    64,   119,
+     120,    63,    68,    69,    70,     1,    68,     1,   132,   129,
+       4,     1,   136,   133,   134,   135,    12,     6,     7,     8,
+       9,    10,    12,     4,    14,   145,    16,    17,    18,    19,
+      20,    21,   152,   153,     1,     4,     4,    62,    62,     0,
+       1,   198,   192,    63,    68,    65,   341,     1,     4,     4,
+       4,    12,   198,    14,     4,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,   184,   185,     4,    63,    62,    63,
+      64,   217,    11,    63,    68,    69,    70,    62,    63,   199,
+      65,     0,     4,    72,    73,    75,    67,   207,     4,    11,
+      12,    13,   249,     4,    63,     4,   243,     4,    65,    67,
+     220,    68,   222,   249,    12,    12,   243,    62,    62,    65,
+     230,   231,   232,   233,    75,    65,    20,    33,    34,    58,
+       1,   241,    33,    34,   244,   245,   246,    20,   278,   279,
+     250,    12,   282,    14,   254,    16,    17,    18,    19,    20,
+      21,    16,    64,   263,     1,     1,     4,     4,     4,    65,
+      66,   271,     1,    11,    11,    66,   276,   324,    14,     4,
+      16,    17,    18,     4,   284,   285,    63,    12,    65,     4,
+      21,   321,    63,   323,     4,   325,     1,    12,   298,     4,
+      12,    11,    63,   303,    19,    20,    11,    12,   308,    67,
+      68,   311,    33,    34,    75,    26,    74,    12,    63,    62,
+      58,    58,    65,    68,     4,   356,    62,    63,    64,    74,
+       4,     5,    68,    69,    70,    62,   336,     1,    65,   339,
+       4,    62,   342,   343,    35,    66,   346,    11,    12,     1,
+       1,    15,     4,    58,   354,    12,    57,   357,    62,    16,
+     360,    65,    14,    62,    16,    17,    18,     1,    62,    63,
+     370,    65,    36,    37,    38,    39,    40,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-      -1,    55,    56,    57
+      54,    55,    56,    57,    58,    59,    62,    61,     1,    65,
+      64,    62,    59,    60,    65,     1,     1,    71,    67,     4,
+      62,    63,    64,    32,    62,    63,    68,    69,    70,    14,
+      65,    16,    17,    18,     1,    62,    63,     4,     6,     7,
+       8,     9,    10,     1,   209,   195,   274,    14,   322,    16,
+      17,    18,   314,   366,    63,    33,    65,   211,     4,    68,
+      14,   201,    16,    17,    18,    74,    12,   255,    14,    95,
+      16,    17,    18,    19,    20,   333,   186,    62,    63,    64,
+       4,    62,    -1,    68,    69,    70,   243,    11,    12,    -1,
+     243,    15,    -1,    -1,    -1,    62,    63,    64,    -1,    -1,
+      -1,    68,    69,    70,    72,    73,    27,    28,    29,    30,
+      31,    -1,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,     4,    61,    11,    12,
+      64,    -1,    15,    -1,    12,    -1,    14,    71,    16,    17,
+      18,    19,    20,    21,    -1,    12,    -1,    14,    26,    16,
+      17,    18,    19,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    -1,    61,    -1,
+      -1,    64,    -1,    -1,    -1,    -1,    -1,    -1,    71,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    -1,    55,    56,
+      57,    12,    -1,    14,    -1,    16,    17,    18,    19,    20
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    25,    27,    28,    29,    30,    31,    77,    79,    80,
-      81,    82,    83,    87,    88,     1,    85,    62,    62,   130,
-      62,     4,    62,     0,    85,    85,    85,    85,    85,    86,
-      62,    65,   143,     4,    11,    85,    85,    85,    85,    85,
-       4,     5,    89,     1,    85,    12,    14,    16,    17,    18,
-      19,    20,    21,    26,    78,    90,    92,   115,   116,   117,
-     118,   119,   121,   122,   123,   124,   126,   129,     1,    12,
-     131,   132,   133,    11,    12,    15,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      61,    64,    71,   114,   135,   137,   138,   139,   140,    33,
-      34,    66,   101,   102,   104,   105,   116,    90,    91,    63,
-     143,   144,    65,    20,    12,    16,    59,    60,    12,    85,
-      20,     1,    85,    85,    85,     1,    68,   130,     1,     4,
-      64,    69,    70,   113,    12,    19,   121,   122,   122,     1,
-     123,    63,    65,   143,    85,     1,    63,   132,    63,    65,
-      16,    85,    85,    85,    85,    85,    85,    85,    85,    85,
+       0,    27,    28,    29,    30,    31,    77,    79,    80,    81,
+      82,    83,    85,    62,    62,   130,    62,     4,    62,     0,
+      85,    85,    85,    85,    85,     4,    25,    87,    88,    85,
+      85,    85,    85,    85,     1,    85,    86,    12,    14,    16,
+      17,    18,    19,    20,    21,    26,    78,    90,    92,   115,
+     116,   117,   118,   119,   121,   122,   123,   124,   126,   129,
+       1,    12,   131,   132,   133,    11,    12,    15,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    61,    64,    71,   114,   135,   137,   138,   139,
+     140,    33,    34,    66,   101,   102,   104,   105,   116,    62,
+      65,   143,    11,     4,     5,    89,    20,    12,    16,    59,
+      60,    12,    85,    20,     1,    85,    85,    85,     1,    68,
+     130,     1,     4,    64,    69,    70,   113,    12,    19,   121,
+     122,   122,     1,   123,    63,    65,   143,    85,     1,    63,
+     132,    63,    65,    16,    85,    85,    85,    85,    85,    85,
+      85,    85,    85,    85,    85,    85,    85,    85,    85,    85,
       85,    85,    85,    85,    85,    85,    85,    85,    85,    85,
-      85,    85,    85,    85,    85,    85,    85,    85,    85,   138,
-      63,    68,    74,   136,    85,    85,    85,    63,    63,    86,
-      26,    92,    93,    95,     1,    12,    85,    85,    12,    19,
-     118,   125,    65,   143,    11,    58,    98,    12,    94,    63,
-      85,   119,    85,    85,    85,   119,   122,    85,    63,    65,
-      63,    65,    85,    85,     1,   135,    85,    85,   137,    12,
-      99,    35,    12,   110,     1,    85,    86,     1,    22,    23,
-      24,    75,    90,    96,   108,   111,   112,   115,   141,   142,
-      63,   143,    11,    12,    13,    64,    84,   118,   120,   121,
-     123,    85,    12,   125,     6,     7,     8,     9,    10,    72,
-      73,   127,    85,     4,    98,   117,    85,    85,   135,    67,
-      85,    85,    85,    85,    35,   103,    65,   143,    65,   143,
-       1,    85,     1,    85,     1,     1,    86,    85,    85,    85,
-      57,   121,   123,    85,    72,   127,    85,   105,   106,   107,
-      32,   134,    85,    16,   100,   101,    85,    65,   143,    62,
-     107,    65,   143,   130,    65,   143,    67,    67,    67,    85,
-      67,    85,    11,    12,   128,    65,     1,    68,    85,    85,
-      67,   102,    85,    62,    67,   128,    85,    85,   135,    85,
-     109,    85,    85,    72,   105,    85,    63,    90,    97,   115,
-     141,   142,   109,    72,     1,    85,    63
+      85,    85,   138,    63,    68,    74,   136,    85,    85,    85,
+      63,    63,     1,    85,    90,    91,    12,    85,    85,    12,
+      19,   118,   125,    65,   143,    11,    58,    98,    12,    94,
+      63,    85,   119,    85,    85,    85,   119,   122,    85,    63,
+      65,    63,    65,    85,    85,     1,   135,    85,    85,   137,
+      12,    99,    35,    12,   110,    63,   143,   144,    65,    86,
+      26,    92,    93,    95,    11,    12,    13,    64,    84,   118,
+     120,   121,   123,    85,    12,   125,     6,     7,     8,     9,
+      10,    72,    73,   127,    85,     4,    98,   117,    85,    85,
+     135,    67,    85,    85,    85,    85,    35,   103,     1,     1,
+      85,    86,     1,    22,    23,    24,    75,    90,    96,   108,
+     111,   112,   115,   141,   142,    85,    85,    85,    57,   121,
+     123,    85,    72,   127,    85,   105,   106,   107,    32,   134,
+      85,    16,   100,   101,    85,    63,   143,    65,   143,    65,
+     143,     1,    85,     1,    85,     1,     1,    86,    67,    67,
+      67,    85,    67,    85,    11,    12,   128,    65,     1,    68,
+      85,    85,    67,   102,    65,   143,    62,   107,    65,   143,
+     130,    65,   143,    67,   128,    85,    85,   135,    85,    85,
+      62,    85,    72,   105,    85,   109,    85,    72,    63,    90,
+      97,   115,   141,   142,   109,     1,    85,    63
 };
 
 #define yyerrok		(yyerrstatus = 0)
diff --git a/khtml/css/parser.y b/khtml/css/parser.y
index d4ab1b6..89d2ac6 100644
--- a/khtml/css/parser.y
+++ b/khtml/css/parser.y
@@ -108,7 +108,7 @@ int DOM::getValueID(const char *tagStr, int len)
 #define YYLTYPE_IS_TRIVIAL 1
 %}
 
-%expect 38
+%expect 39
 
 %pure_parser
 
@@ -309,7 +309,7 @@ static int cssyylex( YYSTYPE *yylval ) {
 %%
 
 stylesheet:
-    maybe_charset maybe_sgml import_list namespace_list rule_list
+    maybe_space maybe_charset maybe_sgml import_list namespace_list rule_list
   | khtml_rule maybe_space
   | khtml_decls maybe_space
   | khtml_value maybe_space
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic