Allowing trailing commas in selectors

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2247 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 155 insertions, 151 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 6ff75d384..e0629fe9a 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -421,7 +421,7 @@ selector:     selectlhand QMARK svalues {
 }
 
 svalues:      selectval
-            | LBRACE sintvalues RBRACE { result = val[1] }
+            | LBRACE sintvalues endcomma RBRACE { result = val[1] }
 
 sintvalues:   selectval
             | sintvalues comma selectval {
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 785d12547..0f6bb0384 100644
--- a/lib/puppet/parser/parser.rb
+++ b/lib/puppet/parser/parser.rb
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id05e5ea581f', 'grammar.ra', 644
+module_eval <<'..end grammar.ra modeval..id379b61d0b2', 'grammar.ra', 644
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id05e5ea581f
+..end grammar.ra modeval..id379b61d0b2
 
 ##### racc 1.4.5 generates ###
 
@@ -312,7 +312,7 @@ racc_reduce_table = [
  3, 104, :_reduce_105,
  3, 92, :_reduce_106,
  1, 106, :_reduce_none,
- 3, 106, :_reduce_108,
+ 4, 106, :_reduce_108,
  1, 108, :_reduce_none,
  3, 108, :_reduce_110,
  3, 107, :_reduce_111,
@@ -366,12 +366,12 @@ racc_reduce_table = [
 
 racc_reduce_n = 159
 
-racc_shift_n = 258
+racc_shift_n = 260
 
 racc_action_table = [
     49,    51,    53,    41,  -126,    51,    53,    51,    53,    51,
     53,   186,    49,    95,    58,   230,    58,    63,    51,    53,
-    46,    43,    58,    33,   115,   168,   154,   106,   229,    90,
+    46,    43,    58,    33,   115,   168,   154,   106,   229,  -113,
      4,    45,   115,    74,   161,    45,    55,    45,    92,    45,
     97,   188,    55,    47,    97,    44,   190,    47,    45,    47,
     37,    47,    65,    69,   151,   152,    75,    63,    51,    53,
@@ -380,32 +380,32 @@ racc_action_table = [
    156,    63,    51,    53,    38,    74,   185,    39,    45,   155,
    188,    74,    65,    69,    45,   190,    75,    74,    65,    69,
     45,   195,    75,  -113,    65,    69,    45,  -112,    75,   185,
-    65,    69,    45,  -115,    75,    96,    65,    69,    51,    53,
+    65,    69,    45,  -115,    75,    96,    65,    69,   165,   244,
     75,    63,    51,    53,  -114,   202,    45,    63,    51,    53,
    197,    97,  -112,    63,    51,    53,  -113,    74,   183,    63,
     51,    53,   116,    74,   111,    63,    51,    53,  -116,    74,
-   151,   152,    45,    49,    79,    74,    65,    69,    45,    49,
-    75,   138,    65,    69,    45,  -115,    75,   115,    65,    69,
-    45,   215,    75,   110,    65,    69,    45,   109,    75,   238,
-    65,   172,   221,  -114,    75,    63,    51,    53,    33,   220,
-    18,    63,    51,    53,   222,     4,   120,    37,    51,    53,
-    15,    74,    21,    25,    79,     1,     5,   138,     8,   159,
-    13,   226,    17,   138,    26,   227,    45,     4,   237,   228,
-    65,    69,    45,   158,    75,    80,    65,   135,    45,    18,
+   151,   152,    45,    51,    53,    74,    65,    69,    45,    49,
+    75,   138,    65,    69,    45,    79,    75,    49,    65,    69,
+    45,  -115,    75,   115,    65,    69,    45,   215,    75,   238,
+    65,   172,   221,   110,    75,    63,    51,    53,    33,   220,
+    18,    63,    51,    53,   109,     4,  -114,    37,    51,    53,
+    15,    74,    21,    25,   222,     1,     5,   138,     8,   120,
+    13,    79,    17,   138,    26,   225,    45,     4,   237,   226,
+    65,    69,    45,   159,    75,   228,    65,   135,    45,    18,
     75,    38,    65,   172,    39,   145,    75,   231,   147,    15,
-   233,    21,    25,    96,     1,     5,   120,     8,    18,    13,
-   235,    17,  -117,    26,    45,   185,     4,    87,    15,    97,
-    21,    25,   257,     1,     5,  -113,     8,  -112,    13,  -115,
-    17,    96,    26,    18,   157,     4,  -114,    33,   151,   152,
-   142,   249,    45,    15,     4,    21,    25,    97,     1,     5,
-    96,     8,    18,    13,  -117,    17,   240,    26,    51,    53,
-     4,    45,    15,    86,    21,    25,    97,     1,     5,   117,
-     8,   244,    13,   138,    17,   148,    26,    83,   253,     4,
-    51,    53,   164,   122,   219,   141,   165,   167,    45,    18,
-    81,   185,    65,   172,   251,   138,    75,    51,    53,    15,
-   120,    21,    25,   124,     1,     5,   120,     8,    32,    13,
-    45,    17,   138,    26,    65,   172,     4,   256,    75,   242,
-   225,   165,   167,   nil,   nil,   nil,   nil,    45,    18,   nil,
+   158,    21,    25,    96,     1,     5,    80,     8,    18,    13,
+   233,    17,   120,    26,    45,   235,     4,  -117,    15,    97,
+    21,    25,   259,     1,     5,    90,     8,    87,    13,   185,
+    17,    96,    26,    18,   157,     4,  -112,    33,   151,   152,
+   142,   250,    45,    15,     4,    21,    25,    97,     1,     5,
+    96,     8,    18,    13,  -115,    17,  -114,    26,    51,    53,
+     4,    45,    15,  -117,    21,    25,    97,     1,     5,   240,
+     8,    86,    13,   138,    17,   117,    26,   245,   255,     4,
+    51,    53,   164,   148,   219,    83,   165,   167,    45,    18,
+   122,   141,    65,   172,    81,   138,    75,    51,    53,    15,
+   185,    21,    25,   252,     1,     5,   253,     8,   120,    13,
+    45,    17,   138,    26,    65,   172,     4,   258,    75,  -158,
+   124,   120,    32,   227,   nil,   nil,   nil,    45,    18,   nil,
    nil,    65,   172,   nil,   nil,    75,   212,   nil,    15,   nil,
     21,    25,   nil,     1,     5,   nil,     8,    18,    13,   nil,
     17,   nil,    26,    51,    53,     4,   nil,    15,   nil,    21,
@@ -432,7 +432,7 @@ racc_action_table = [
 racc_action_check = [
     13,    13,    13,     9,    13,   115,   115,    46,    46,   109,
    109,   135,    69,    35,   110,   191,    13,    17,    17,    17,
-    13,    11,    46,     9,   135,   115,   100,    46,   191,    34,
+    13,    11,    46,     9,   135,   115,   100,    46,   191,   205,
      9,    13,    69,    17,   110,   115,    13,    46,    35,   109,
    115,   230,    46,    13,   109,    11,   230,   115,    17,    46,
      8,   109,    17,    17,   100,   100,    17,    49,    49,    49,
@@ -441,35 +441,35 @@ racc_action_check = [
    104,    79,    79,    79,     8,    15,   129,     8,    49,   104,
    124,   166,    49,    49,    63,   124,    49,    79,    63,    63,
     15,   130,    63,   131,    15,    15,   166,   134,    15,   119,
-   166,   166,    79,   136,   166,    43,    79,    79,    21,    21,
+   166,   166,    79,   136,   166,    43,    79,    79,   217,   217,
     79,   186,   186,   186,   137,   150,    43,   228,   228,   228,
    140,    43,    68,   226,   226,   226,    64,   186,   118,    32,
     32,    32,    70,   228,    62,   197,   197,   197,    61,   226,
-   150,   150,   186,   161,    58,    32,   186,   186,   228,    55,
-   186,   197,   228,   228,   226,    72,   228,   172,   226,   226,
-    32,   174,   226,    52,    32,    32,   197,    50,    32,   201,
-   197,   197,   181,    73,   197,   215,   215,   215,     5,   181,
-   201,    87,    87,    87,   184,     5,   185,    95,   221,   221,
-   201,   215,   201,   201,    74,   201,   201,    87,   201,   108,
-   201,   188,   201,   221,   201,   189,   215,   201,   199,   190,
-   215,   215,    87,   107,   215,    41,    87,    87,   221,   199,
+   150,   150,   186,    21,    21,    32,   186,   186,   228,   161,
+   186,   197,   228,   228,   226,    58,   228,    55,   226,   226,
+    32,    72,   226,   172,    32,    32,   197,   174,    32,   201,
+   197,   197,   181,    52,   197,   215,   215,   215,     5,   181,
+   201,    87,    87,    87,    50,     5,    73,    95,   221,   221,
+   201,   215,   201,   201,   184,   201,   201,    87,   201,   185,
+   201,    74,   201,   221,   201,   187,   215,   201,   199,   188,
+   215,   215,    87,   108,   215,   190,    87,    87,   221,   199,
     87,    95,   221,   221,    95,    92,   221,   193,    92,   199,
-   194,   199,   199,   153,   199,   199,   195,   199,   193,   199,
-   196,   199,    77,   199,   153,   123,   199,    27,   193,   153,
-   193,   193,   255,   193,   193,   205,   193,   207,   193,   208,
-   193,    96,   193,   255,   105,   193,   209,    90,   105,   105,
-    90,   232,    96,   255,    90,   255,   255,    96,   255,   255,
-    44,   255,   232,   255,   210,   255,   212,   255,   243,   243,
-   255,    44,   232,    26,   232,   232,    44,   232,   232,    78,
-   232,   220,   232,   243,   232,    93,   232,    22,   244,   232,
-   179,   179,   114,    81,   179,    89,   114,   114,   243,   244,
-    20,   234,   243,   243,   240,   179,   243,   175,   175,   244,
-    80,   244,   244,    85,   244,   244,    83,   244,     1,   244,
-   179,   244,   175,   244,   179,   179,   244,   254,   179,   217,
-   187,   217,   217,   nil,   nil,   nil,   nil,   175,   254,   nil,
-   nil,   175,   175,   nil,   nil,   175,   163,   nil,   254,   nil,
-   254,   254,   nil,   254,   254,   nil,   254,   163,   254,   nil,
-   254,   nil,   254,   117,   117,   254,   nil,   163,   nil,   163,
+   107,   199,   199,   153,   199,   199,    41,   199,   193,   199,
+   194,   199,   195,   199,   153,   196,   199,    77,   193,   153,
+   193,   193,   257,   193,   193,    34,   193,    27,   193,   123,
+   193,    96,   193,   257,   105,   193,   207,    90,   105,   105,
+    90,   232,    96,   257,    90,   257,   257,    96,   257,   257,
+    44,   257,   232,   257,   208,   257,   209,   257,   243,   243,
+   257,    44,   232,   210,   232,   232,    44,   232,   232,   212,
+   232,    26,   232,   243,   232,    78,   232,   220,   245,   232,
+   179,   179,   114,    93,   179,    22,   114,   114,   243,   245,
+    81,    89,   243,   243,    20,   179,   243,   175,   175,   245,
+   234,   245,   245,   240,   245,   245,   242,   245,    80,   245,
+   179,   245,   175,   245,   179,   179,   245,   256,   179,   244,
+    85,    83,     1,   189,   nil,   nil,   nil,   175,   256,   nil,
+   nil,   175,   175,   nil,   nil,   175,   163,   nil,   256,   nil,
+   256,   256,   nil,   256,   256,   nil,   256,   163,   256,   nil,
+   256,   nil,   256,   117,   117,   256,   nil,   163,   nil,   163,
    163,   nil,   163,   163,   nil,   163,   nil,   163,   117,   163,
    nil,   163,   nil,   nil,   163,   155,   155,   116,   116,   nil,
    116,   nil,   nil,   117,   nil,   nil,   nil,   117,   117,   nil,
@@ -481,42 +481,42 @@ racc_action_check = [
    nil,   141,   141,   nil,   141,   141,   nil,   141,   156,   141,
    nil,   141,   nil,   141,   nil,   nil,   141,   nil,   nil,   nil,
    111,   nil,   nil,   156,   nil,   nil,   nil,   156,   156,   nil,
-   111,   156,   111,   111,   nil,   111,   111,   nil,   111,   251,
-   111,   nil,   111,   nil,   111,   nil,   nil,   111,   nil,   251,
-   nil,   251,   251,   nil,   251,   251,   nil,   251,    24,   251,
-   nil,   251,   nil,   251,   nil,   nil,   251,   nil,    24,   nil,
+   111,   156,   111,   111,   nil,   111,   111,   nil,   111,   252,
+   111,   nil,   111,   nil,   111,   nil,   nil,   111,   nil,   252,
+   nil,   252,   252,   nil,   252,   252,   nil,   252,    24,   252,
+   nil,   252,   nil,   252,   nil,   nil,   252,   nil,    24,   nil,
     24,    24,   nil,    24,    24,   nil,    24,     0,    24,   nil,
     24,   nil,    24,   nil,   nil,    24,   nil,     0,   nil,     0,
      0,   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,
    nil,     0,   nil,   nil,     0 ]
 
 racc_action_pointer = [
-   539,   335,   nil,   nil,   nil,   150,   nil,   nil,    46,   -15,
+   539,   349,   nil,   nil,   nil,   150,   nil,   nil,    46,   -15,
    nil,     2,   nil,    -2,   nil,    67,   nil,    15,    66,   nil,
-   330,   115,   311,   nil,   520,    22,   261,   251,   nil,   nil,
-   nil,   nil,   137,   nil,    -6,     3,   nil,   nil,   nil,   nil,
-   nil,   219,   nil,    93,   268,   nil,     4,   nil,   nil,    55,
-   167,   nil,   163,   nil,   nil,   157,   nil,   nil,   152,   nil,
+   334,   150,   319,   nil,   520,    22,   269,   261,   nil,   nil,
+   nil,   nil,   137,   nil,   230,     3,   nil,   nil,   nil,   nil,
+   nil,   240,   nil,    93,   268,   nil,     4,   nil,   nil,    55,
+   184,   nil,   173,   nil,   nil,   165,   nil,   nil,   163,   nil,
    nil,   127,   138,    61,   115,   nil,   nil,   nil,   111,    10,
-   121,   nil,   144,   162,   202,   nil,   nil,   231,   303,    79,
-   302,   323,   nil,   308,   nil,   321,   nil,   189,   nil,   319,
-   239,   nil,   197,   309,   nil,   193,   249,   nil,   nil,   nil,
-     6,   nil,   nil,   nil,    65,   230,   nil,   200,   204,     6,
+   121,   nil,   150,   175,   209,   nil,   nil,   236,   309,    79,
+   310,   330,   nil,   323,   nil,   338,   nil,   189,   nil,   325,
+   239,   nil,   197,   317,   nil,   193,   249,   nil,   nil,   nil,
+     6,   nil,   nil,   nil,    65,   230,   nil,   217,   218,     6,
     -4,   482,   nil,   nil,   317,     2,   414,   390,   133,    99,
-    53,   nil,   nil,   245,    57,   nil,    72,   nil,   nil,    76,
+    53,   nil,   nil,   259,    57,   nil,    72,   nil,   nil,    76,
     84,    82,   nil,   nil,    86,     2,    92,   103,   nil,   nil,
     91,   451,   nil,   nil,   nil,   nil,   nil,   nil,   426,   nil,
    102,   nil,   nil,   221,   nil,   412,   470,   nil,   nil,   nil,
-   nil,   151,   nil,   369,   nil,   nil,    73,   nil,   nil,    51,
-   nil,   nil,   145,   nil,   162,   334,   nil,   nil,   nil,   317,
-   nil,   172,   nil,   nil,   187,   158,   119,   353,   198,   192,
-   206,     5,   nil,   230,   233,   208,   243,   143,   nil,   211,
-   nil,   172,   nil,   nil,   nil,   244,   nil,   246,   248,   255,
-   273,   nil,   267,   nil,   nil,   183,   nil,   352,   nil,   nil,
-   305,   195,   nil,   nil,   nil,   nil,   131,   nil,   125,   nil,
-     8,   nil,   274,   nil,   321,   nil,   nil,   nil,   nil,   nil,
-   328,   nil,   nil,   295,   311,   nil,   nil,   nil,   nil,   nil,
-   nil,   501,   nil,   nil,   350,   255,   nil,   nil ]
+   nil,   157,   nil,   369,   nil,   nil,    73,   nil,   nil,    51,
+   nil,   nil,   151,   nil,   168,   334,   nil,   nil,   nil,   317,
+   nil,   172,   nil,   nil,   197,   171,   119,   208,   206,   340,
+   212,     5,   nil,   230,   243,   214,   248,   143,   nil,   211,
+   nil,   172,   nil,   nil,   nil,     8,   nil,   255,   273,   275,
+   282,   nil,   280,   nil,   nil,   183,   nil,   109,   nil,   nil,
+   311,   195,   nil,   nil,   nil,   nil,   131,   nil,   125,   nil,
+     8,   nil,   274,   nil,   330,   nil,   nil,   nil,   nil,   nil,
+   337,   nil,   339,   295,   352,   311,   nil,   nil,   nil,   nil,
+   nil,   nil,   501,   nil,   nil,   nil,   350,   255,   nil,   nil ]
 
 racc_action_default = [
   -133,  -159,   -16,    -5,  -127,  -159,    -6,    -7,  -159,  -159,
@@ -531,7 +531,7 @@ racc_action_default = [
   -159,  -146,  -159,  -159,  -144,  -159,  -133,   -58,   -52,   -51,
   -159,   -43,   -45,   -42,  -159,  -159,   -18,  -159,  -159,  -159,
   -159,  -159,  -154,   -71,  -159,  -159,  -159,  -159,  -159,  -157,
-  -159,   -68,   258,  -157,  -134,  -135,  -159,  -116,   -54,  -157,
+  -159,   -68,   260,  -157,  -134,  -135,  -159,  -116,   -54,  -157,
   -159,   -62,   -63,   -65,   -61,   -58,   -64,   -60,   -59,  -117,
    -56,  -159,  -151,  -147,  -150,  -148,  -145,  -149,  -159,  -129,
   -159,   -48,   -47,  -159,   -41,  -159,  -159,   -40,   -17,   -93,
@@ -540,90 +540,94 @@ racc_action_default = [
   -100,  -159,  -104,   -94,  -159,  -158,  -159,  -159,  -143,  -159,
   -141,  -159,  -138,  -159,  -159,   -67,  -159,   -57,  -123,  -159,
   -125,  -159,   -46,   -44,   -49,   -75,   -77,   -74,   -78,   -73,
-   -76,   -50,   -96,   -72,   -88,  -159,  -109,  -159,  -101,   -99,
+   -76,   -50,   -96,   -72,   -88,  -159,  -109,  -157,  -101,   -99,
   -159,  -159,   -32,   -69,   -70,   -33,  -159,  -136,  -159,  -137,
   -159,  -121,  -159,   -31,  -157,   -30,   -55,  -122,  -124,   -95,
-  -159,  -111,  -108,  -159,  -159,  -105,  -142,  -140,  -139,  -120,
-   -53,  -159,  -110,  -103,  -159,  -159,  -102,   -97 ]
+  -159,  -111,  -159,  -159,  -156,  -159,  -105,  -142,  -140,  -139,
+  -120,   -53,  -159,  -108,  -110,  -103,  -159,  -159,  -102,   -97 ]
 
 racc_goto_table = [
-    24,    84,   178,    59,   184,   166,    36,   192,   187,    48,
-    34,    82,   119,    57,   194,   123,   128,    20,    56,   129,
-   174,   182,   180,   114,   133,    29,   223,   100,   105,   203,
-    85,   204,   211,    42,    62,   239,    59,   179,   196,   140,
-   177,   160,   107,    99,    99,   217,    57,   126,    98,    98,
-    89,    56,    60,    35,    76,    93,    76,   169,   189,    91,
-    94,   216,   191,    40,    71,   146,    78,   132,   143,   nil,
-   nil,    76,   nil,   nil,   nil,   nil,   nil,   137,   nil,   174,
-   150,    88,   nil,   182,   218,    60,   nil,   136,    76,   nil,
-   nil,   nil,   134,   149,   127,   144,    99,   nil,   108,    59,
-   nil,    98,    76,   139,   nil,    59,   176,   176,   243,    57,
-   125,   163,   113,   248,    56,    57,   173,   173,    76,   250,
-    56,   171,   171,   127,   127,   245,   236,   234,   118,   252,
-   nil,   nil,   139,   139,   133,   206,   206,   nil,   nil,   nil,
-    84,   199,   nil,   nil,   nil,   209,   209,   174,   201,   162,
-   nil,   nil,   nil,    99,   nil,   208,   208,   nil,    98,   nil,
-   207,   207,   127,   127,   nil,   176,   nil,   nil,   nil,   176,
-   131,   210,   210,   nil,   nil,   173,    84,   132,    84,   173,
-   171,   nil,   127,   nil,   171,   nil,   127,   137,   nil,   nil,
-   nil,   139,   nil,   232,   nil,   139,   nil,   136,   nil,   170,
-   170,   nil,   134,   nil,   127,    76,   nil,   nil,   nil,    84,
-   nil,   176,   nil,   139,   nil,   213,   nil,   nil,   nil,   nil,
-   nil,   173,   nil,   nil,   nil,    76,   171,   nil,   127,   nil,
-   nil,    84,    84,   176,   nil,   224,   nil,   139,   205,   205,
-   nil,   nil,   nil,   173,   254,   nil,   nil,   nil,   171,   nil,
-   127,   255,   nil,   nil,    76,   nil,   nil,   nil,   170,   139,
-   nil,   nil,   170,   nil,   241,    76,   nil,    76,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   246,   nil,   247,   nil,   nil,
-   131,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    24,    84,    59,    36,    71,   166,    78,   178,   180,   128,
+    82,    57,    60,   132,    76,   133,    76,    48,   192,    20,
+   184,    88,   204,   211,   187,    29,   114,    34,   127,   223,
+   194,    76,   203,    42,    62,    59,   239,   179,   108,   100,
+   105,    99,    99,   196,    57,    60,   119,    85,    76,   123,
+   107,   140,   113,   129,   177,   160,    56,   127,   127,    91,
+    94,   217,    76,   126,    89,    35,   216,    93,   118,   169,
+   218,   189,   191,    40,   174,   182,   137,   146,    76,   143,
+   nil,   206,   206,   nil,   nil,   136,    98,    98,   nil,    56,
+   149,   nil,   150,   nil,    99,   nil,   127,   127,    59,   nil,
+   nil,   nil,   139,   nil,    59,   176,   176,    57,   243,   162,
+   125,   163,   144,    57,   173,   173,   127,   nil,   242,   236,
+   127,   nil,   nil,   132,   249,   133,   nil,   nil,   nil,   nil,
+   134,   139,   139,   174,   254,   251,   nil,   182,   127,    98,
+    84,   199,   nil,   nil,   209,   209,   nil,   nil,   201,   nil,
+   nil,    99,    56,   208,   208,   213,   nil,   nil,    56,   171,
+   171,   234,   127,   nil,   176,    76,   nil,   nil,   176,   nil,
+   210,   210,   nil,   173,   nil,   224,    84,   173,    84,   246,
+   nil,   nil,   nil,   nil,   127,    76,   137,   nil,   nil,   nil,
+   139,   131,   nil,   232,   139,   136,    98,   nil,   207,   207,
+   nil,   174,   nil,   nil,   241,   nil,   nil,   nil,   nil,    84,
+   176,   nil,   139,   nil,    76,   247,   nil,   248,   171,   173,
+   170,   170,   171,   nil,   nil,    76,   nil,    76,   nil,   nil,
+   nil,   nil,   176,    84,    84,   nil,   139,   nil,   nil,   nil,
+   134,   173,   nil,   nil,   nil,   256,   nil,   nil,   nil,   nil,
+   nil,   nil,   257,   nil,   nil,   nil,   nil,   nil,   139,   205,
+   205,   nil,   nil,   nil,   171,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   170,
+   nil,   nil,   nil,   170,   nil,   nil,   171,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   170,   nil,   nil,   nil,   nil,   nil,
+   nil,   131,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   170 ]
+   nil,   nil,   nil,   nil,   nil,   170,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   170 ]
 
 racc_goto_check = [
-     2,     4,    57,    23,    29,    47,    63,    66,    29,    17,
-    25,    23,    28,    22,    29,    28,    39,     1,    21,    28,
-    55,    55,    53,    46,    43,     3,    45,    33,    33,    34,
-    25,    38,    38,    32,    50,    51,    23,    52,    27,    26,
-    56,    20,    17,    22,    22,    58,    22,    59,    21,    21,
-    60,    21,    24,    61,    24,    62,    24,    18,    64,     3,
-     3,    57,    65,     5,    44,    67,    44,    42,    68,   nil,
-   nil,    24,   nil,   nil,   nil,   nil,   nil,    23,   nil,    55,
-    33,    44,   nil,    55,    53,    24,   nil,    22,    24,   nil,
-   nil,   nil,    21,    63,    49,    25,    22,   nil,    44,    23,
-   nil,    21,    24,    48,   nil,    23,    23,    23,    47,    22,
-     3,     2,    44,    66,    21,    22,    22,    22,    24,    29,
-    21,    21,    21,    49,    49,    55,    39,    28,    44,    57,
-   nil,   nil,    48,    48,    43,    42,    42,   nil,   nil,   nil,
-     4,     2,   nil,   nil,   nil,    23,    23,    55,     2,    24,
-   nil,   nil,   nil,    22,   nil,    22,    22,   nil,    21,   nil,
-    21,    21,    49,    49,   nil,    23,   nil,   nil,   nil,    23,
-    41,    48,    48,   nil,   nil,    22,     4,    42,     4,    22,
-    21,   nil,    49,   nil,    21,   nil,    49,    23,   nil,   nil,
-   nil,    48,   nil,     2,   nil,    48,   nil,    22,   nil,    41,
-    41,   nil,    21,   nil,    49,    24,   nil,   nil,   nil,     4,
-   nil,    23,   nil,    48,   nil,    44,   nil,   nil,   nil,   nil,
-   nil,    22,   nil,   nil,   nil,    24,    21,   nil,    49,   nil,
-   nil,     4,     4,    23,   nil,    44,   nil,    48,    41,    41,
-   nil,   nil,   nil,    22,     2,   nil,   nil,   nil,    21,   nil,
-    49,     2,   nil,   nil,    24,   nil,   nil,   nil,    41,    48,
-   nil,   nil,    41,   nil,    44,    24,   nil,    24,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    44,   nil,    44,   nil,   nil,
-    41,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,     4,    23,    63,    44,    47,    44,    57,    53,    39,
+    23,    22,    24,    42,    24,    43,    24,    17,    66,     1,
+    29,    44,    38,    38,    29,     3,    46,    25,    49,    45,
+    29,    24,    34,    32,    50,    23,    51,    52,    44,    33,
+    33,    22,    22,    27,    22,    24,    28,    25,    24,    28,
+    17,    26,    44,    28,    56,    20,    21,    49,    49,     3,
+     3,    58,    24,    59,    60,    61,    57,    62,    44,    18,
+    53,    64,    65,     5,    55,    55,    23,    67,    24,    68,
+   nil,    42,    42,   nil,   nil,    22,    21,    21,   nil,    21,
+    63,   nil,    33,   nil,    22,   nil,    49,    49,    23,   nil,
+   nil,   nil,    48,   nil,    23,    23,    23,    22,    47,    24,
+     3,     2,    25,    22,    22,    22,    49,   nil,    29,    39,
+    49,   nil,   nil,    42,    66,    43,   nil,   nil,   nil,   nil,
+    21,    48,    48,    55,    57,    29,   nil,    55,    49,    21,
+     4,     2,   nil,   nil,    23,    23,   nil,   nil,     2,   nil,
+   nil,    22,    21,    22,    22,    44,   nil,   nil,    21,    21,
+    21,    28,    49,   nil,    23,    24,   nil,   nil,    23,   nil,
+    48,    48,   nil,    22,   nil,    44,     4,    22,     4,    55,
+   nil,   nil,   nil,   nil,    49,    24,    23,   nil,   nil,   nil,
+    48,    41,   nil,     2,    48,    22,    21,   nil,    21,    21,
+   nil,    55,   nil,   nil,    44,   nil,   nil,   nil,   nil,     4,
+    23,   nil,    48,   nil,    24,    44,   nil,    44,    21,    22,
+    41,    41,    21,   nil,   nil,    24,   nil,    24,   nil,   nil,
+   nil,   nil,    23,     4,     4,   nil,    48,   nil,   nil,   nil,
+    21,    22,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+   nil,   nil,     2,   nil,   nil,   nil,   nil,   nil,    48,    41,
+    41,   nil,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    41,
+   nil,   nil,   nil,    41,   nil,   nil,    21,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    41,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    41,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    41,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    41 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    41 ]
 
 racc_goto_pointer = [
-   nil,    17,     0,    25,   -23,    54,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -4,   -58,   nil,
-   -68,     5,     0,   -10,    39,     5,   -48,  -102,   -68,  -115,
-   nil,   nil,    22,   -16,  -124,   nil,   nil,   nil,  -124,   -71,
-   nil,    83,   -20,   -63,    49,  -159,   -40,  -109,    16,     7,
-    19,  -177,   -80,   -95,   nil,   -96,   -76,  -114,  -130,   -38,
-    16,    45,    20,    -2,   -66,   -62,  -117,   -27,   -22 ]
+   nil,    19,     0,    25,   -23,    64,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,     4,   -46,   nil,
+   -54,    43,    -2,   -11,    -1,    22,   -36,   -97,   -34,   -99,
+   nil,   nil,    22,    -4,  -121,   nil,   nil,   nil,  -133,   -78,
+   nil,   104,   -74,   -72,   -11,  -156,   -37,  -109,    15,   -59,
+    19,  -176,   -80,  -109,   nil,   -42,   -62,  -109,  -114,   -22,
+    30,    57,    32,    -5,   -53,   -52,  -106,   -15,   -11 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   103,    31,     3,     6,     7,    10,    12,