Fixing #348. Overrides now support an extra end-comma.

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

2 files changed, 188 insertions, 188 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 5bf96c254..2c74546f4 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -136,7 +136,7 @@ resource:       NAME LBRACE resourceinstances endsemi RBRACE {
 }
 
 # Override a value set elsewhere in the configuration.
-resourceoverride:     resourceref LBRACE params RBRACE {
+resourceoverride:     resourceref LBRACE params endcomma RBRACE {
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
 }
 
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 3af74b1fe..764922cad 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..id77a61a6f39', 'grammar.ra', 628
+module_eval <<'..end grammar.ra modeval..idda56e83715', 'grammar.ra', 628
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id77a61a6f39
+..end grammar.ra modeval..idda56e83715
 
 ##### racc 1.4.5 generates ###
 
@@ -235,7 +235,7 @@ racc_reduce_table = [
  5, 55, :_reduce_28,
  5, 55, :_reduce_29,
  5, 55, :_reduce_30,
- 4, 66, :_reduce_31,
+ 5, 66, :_reduce_31,
  2, 56, :_reduce_32,
  1, 79, :_reduce_33,
  2, 79, :_reduce_34,
@@ -360,49 +360,49 @@ racc_reduce_n = 150
 racc_shift_n = 248
 
 racc_action_table = [
-    62,    50,    52,    50,    52,    92,    62,    50,    52,    58,
-   157,    79,    62,    50,    52,    80,    73,  -110,    62,    50,
-    52,   158,    73,   127,    62,    50,    52,    79,    73,   152,
+    62,    50,    52,    50,    52,    92,    62,    50,    52,    48,
+   105,    79,    62,    50,    52,    80,    73,  -110,    62,    50,
+    52,  -114,    73,   213,    62,    50,    52,  -111,    73,   127,
     89,    45,    43,    45,   118,    65,    70,    45,    94,    74,
-   118,    65,    70,    45,  -111,    74,   145,    65,    70,    45,
-  -112,    74,   179,    65,   168,    45,    44,    74,   155,    65,
-   114,    50,    52,    74,    62,    50,    52,    48,   193,   157,
-    62,    50,    52,  -111,   142,   143,    62,    50,    52,  -113,
-    73,   188,    62,    50,    52,  -109,    73,   127,    62,    50,
-    52,    45,    73,   142,   143,    45,    94,   105,    73,    65,
+   118,    65,    70,    45,    79,    74,   145,    65,    70,    45,
+  -111,    74,  -112,    65,   168,    45,    44,    74,   179,    65,
+   114,    50,    52,    74,    62,    50,    52,    58,   192,   155,
+    62,    50,    52,   157,   142,   143,    62,    50,    52,   155,
+    73,  -113,    62,    50,    52,   187,    73,   152,    62,    50,
+    52,    45,    73,   142,   143,    45,    94,   157,    73,    65,
     70,    45,    36,    74,    73,    65,    70,    45,  -109,    74,
-   214,    65,    70,    45,   126,    74,   147,    65,    70,    45,
-   223,    74,    35,    65,    70,   146,  -110,    74,    62,    50,
-    52,   123,    32,   222,    62,    50,    52,  -110,    32,    31,
-    62,    50,    52,   181,    73,    31,   182,    50,    52,   122,
-    73,   218,   183,    50,    52,    48,    73,   186,   217,    45,
-    39,   203,   118,    65,    70,    45,    39,    74,   118,    65,
-    70,    45,   131,    74,   131,    65,    70,    45,    79,    74,
-    48,    65,   168,    45,   208,    74,   106,    65,   168,    50,
-    52,    74,   105,   183,    40,    50,    52,    41,   186,   211,
-    40,    50,    52,    41,   118,   233,   127,   163,   164,   156,
-   118,    50,    52,   155,   170,   128,   118,    50,    52,    45,
-   150,   216,   219,    65,   168,    45,   118,    74,   131,    65,
-   168,    45,   118,    74,   220,    65,   168,    93,   221,    74,
-   149,    45,    50,    52,   224,    65,   168,    45,    45,    74,
-    80,    65,   168,    94,    93,    74,    56,   118,    48,    50,
-    52,    89,    56,  -114,   247,    45,    50,    52,    93,  -109,
-    94,  -112,    45,  -111,    58,    17,    65,   168,    46,    45,
-    74,    58,    50,    52,    94,    14,  -114,    20,    24,    45,
-     1,     4,   209,     8,    54,    12,    45,    16,   155,    25,
-   148,    54,   231,    17,   142,   143,    93,   161,    86,   246,
-   131,   163,   164,    14,   235,    20,    24,    45,     1,     4,
-    17,     8,    94,    12,   131,    16,   225,    25,    83,   132,
-    14,   139,    20,    24,    81,     1,     4,    17,     8,   241,
-    12,   138,    16,   227,    25,   137,   134,    14,    30,    20,
-    24,  -112,     1,     4,    17,     8,   nil,    12,   nil,    16,
+   127,    65,    70,    45,  -109,    74,   147,    65,    70,    45,
+   223,    74,    35,    65,    70,   146,   126,    74,    62,    50,
+    52,   123,   217,   222,    62,    50,    52,  -110,    32,   216,
+    62,    50,    52,  -110,    73,    31,   122,    50,    52,    48,
+    73,    32,   182,    50,    52,   202,    73,   185,    31,    45,
+    39,   131,   118,    65,    70,    45,    39,    74,   118,    65,
+    70,    45,   131,    74,    79,    65,    70,    45,    48,    74,
+   207,    65,   168,    45,   106,    74,   105,    65,   168,    50,
+    52,    74,   210,   182,    40,    50,    52,    41,   185,   127,
+    40,    50,    52,    41,   118,   233,   156,   163,   164,   155,
+   118,    50,    52,   128,   170,   150,   118,    50,    52,    45,
+   218,   215,   219,    65,   168,    45,   118,    74,   220,    65,
+   168,    45,   118,    74,   221,    65,   168,    93,   149,    74,
+   224,    45,    50,    52,    80,    65,   168,    45,    45,    74,
+    56,    65,   168,    94,    93,    74,    89,   118,    48,    50,
+    52,   158,    56,  -109,   247,    45,    50,    52,    93,  -112,
+    94,  -111,    45,  -114,    58,    17,    65,   168,    46,    45,
+    74,    58,    50,    52,    94,    14,   155,    20,    24,    45,
+     1,     4,   208,     8,    54,    12,    45,    16,   231,    25,
+   161,    54,    86,    17,   163,   164,    93,   148,   131,   246,
+   235,   142,   143,    14,   131,    20,    24,    45,     1,     4,
+    17,     8,    94,    12,    83,    16,   225,    25,   132,   139,
+    14,    81,    20,    24,   241,     1,     4,    17,     8,   138,
+    12,   137,    16,   227,    25,   134,    30,    14,  -112,    20,
+    24,   nil,     1,     4,    17,     8,   nil,    12,   nil,    16,
    228,    25,   nil,   nil,    14,   nil,    20,    24,   nil,     1,
      4,    17,     8,   nil,    12,   nil,    16,   240,    25,   nil,
    nil,    14,   nil,    20,    24,   nil,     1,     4,    17,     8,
    nil,    12,   nil,    16,   243,    25,   nil,   nil,    14,   nil,
     20,    24,   nil,     1,     4,    17,     8,   nil,    12,   nil,
-    16,   189,    25,   nil,   nil,    14,   nil,    20,    24,   nil,
-     1,     4,    17,     8,   nil,    12,   nil,    16,   191,    25,
+    16,   188,    25,   nil,   nil,    14,   nil,    20,    24,   nil,
+     1,     4,    17,     8,   nil,    12,   nil,    16,   190,    25,
    nil,   nil,    14,   nil,    20,    24,   nil,     1,     4,    17,
      8,   nil,    12,   nil,    16,   nil,    25,   nil,   nil,    14,
    nil,    20,    24,   nil,     1,     4,    17,     8,   nil,    12,
@@ -416,46 +416,46 @@ racc_action_table = [
    nil,    25 ]
 
 racc_action_check = [
-    48,    48,    48,   105,   105,    37,    79,    79,    79,   106,
-   114,    17,   162,   162,   162,    17,    48,   195,   158,   158,
-   158,   120,    79,   114,    56,    56,    56,    73,   162,   106,
+    48,    48,    48,   105,   105,    37,    79,    79,    79,    70,
+   174,    17,   162,   162,   162,    17,    48,   194,   158,   158,
+   158,    76,    79,   174,    56,    56,    56,   117,   162,    70,
     37,    48,     9,   105,   158,    48,    48,    79,   105,    48,
-    56,    79,    79,   162,    72,    79,    96,   162,   162,   158,
-    71,   162,   129,   158,   158,    56,     9,   158,   130,    56,
-    56,   127,   127,    56,   157,   157,   157,    70,   141,   131,
-    30,    30,    30,   117,    96,    96,    14,    14,    14,    77,
-   157,   136,    16,    16,    16,   113,    30,    70,   211,   211,
-   211,   127,    14,   141,   141,   157,   127,   174,    16,   157,
-   157,    30,     6,   157,   211,    30,    30,    14,    69,    30,
-   174,    14,    14,    16,    67,    14,   100,    16,    16,   211,
-   185,    16,     6,   211,   211,   100,   110,   211,    62,    62,
-    62,    62,     4,   185,   224,   224,   224,    63,    24,     4,
-   220,   220,   220,   133,    62,    24,   133,   146,   146,    61,
-   224,   177,   134,   218,   218,   152,   220,   134,   177,    62,
-     8,   154,   146,    62,    62,   224,    92,    62,   218,   224,
-   224,   220,   155,   224,   156,   220,   220,   146,    58,   220,
-    54,   146,   146,   218,   159,   146,    51,   218,   218,   234,
-   234,   218,    49,   223,     8,   170,   170,     8,   223,   167,
-    92,   147,   147,    92,   234,   213,   168,   213,   213,   109,
-   170,   126,   126,   108,   126,    78,   147,   175,   175,   234,
-   104,   175,   180,   234,   234,   170,   126,   234,   182,   170,
-   170,   147,   175,   170,   183,   147,   147,    44,   184,   147,
-   103,   126,   128,   128,   186,   126,   126,   175,    44,   126,
-    36,   175,   175,    44,    93,   175,    35,   128,    12,    12,
-    12,    33,    12,    76,   245,    93,    46,    46,   144,   197,
-    93,   198,   128,   199,    12,   245,   128,   128,    12,   144,
-   128,    46,    20,    20,   144,   245,   200,   245,   245,    12,
-   245,   245,   160,   245,    12,   245,    46,   245,   205,   245,
-   102,    46,   209,   160,   102,   102,    43,   125,    25,   244,
-    80,   125,   125,   160,   217,   160,   160,    43,   160,   160,
-   244,   160,    43,   160,    83,   160,   188,   160,    21,    81,
-   244,    91,   244,   244,    19,   244,   244,   188,   244,   231,
-   244,    89,   244,   190,   244,    88,    85,   188,     1,   188,
-   188,   116,   188,   188,   190,   188,   nil,   188,   nil,   188,
-   192,   188,   nil,   nil,   190,   nil,   190,   190,   nil,   190,
-   190,   192,   190,   nil,   190,   nil,   190,   226,   190,   nil,
-   nil,   192,   nil,   192,   192,   nil,   192,   192,   226,   192,
-   nil,   192,   nil,   192,   235,   192,   nil,   nil,   226,   nil,
+    56,    79,    79,   162,    73,    79,    96,   162,   162,   158,
+    72,   162,    71,   158,   158,    56,     9,   158,   129,    56,
+    56,   127,   127,    56,   157,   157,   157,   106,   141,   130,
+    30,    30,    30,   131,    96,    96,    14,    14,    14,   133,
+   157,    77,    16,    16,    16,   136,    30,   106,   210,   210,
+   210,   127,    14,   141,   141,   157,   127,   114,    16,   157,
+   157,    30,     6,   157,   210,    30,    30,    14,   113,    30,
+   114,    14,    14,    16,    69,    14,   100,    16,    16,   210,
+   184,    16,     6,   210,   210,   100,    67,   210,    62,    62,
+    62,    62,   177,   184,   224,   224,   224,   110,     4,   177,
+   220,   220,   220,    63,    62,     4,    61,   146,   146,   152,
+   224,    24,   223,   217,   217,   154,   220,   223,    24,    62,
+     8,   155,   146,    62,    62,   224,    92,    62,   217,   224,
+   224,   220,   156,   224,    58,   220,   220,   146,    54,   220,
+   159,   146,   146,   217,    51,   146,    49,   217,   217,   234,
+   234,   217,   167,   134,     8,   170,   170,     8,   134,   168,
+    92,   147,   147,    92,   234,   212,   109,   212,   212,   108,
+   170,   126,   126,    78,   126,   104,   147,   175,   175,   234,
+   180,   175,   181,   234,   234,   170,   126,   234,   182,   170,
+   170,   147,   175,   170,   183,   147,   147,    93,   103,   147,
+   185,   126,   128,   128,    36,   126,   126,   175,    93,   126,
+    35,   175,   175,    93,    43,   175,    33,   128,    12,    12,
+    12,   120,    12,   196,   245,    43,    46,    46,    44,   197,
+    43,   198,   128,   199,    12,   245,   128,   128,    12,    44,
+   128,    46,    20,    20,    44,   245,   204,   245,   245,    12,
+   245,   245,   160,   245,    12,   245,    46,   245,   208,   245,
+   125,    46,    25,   160,   125,   125,   144,   102,    80,   244,
+   216,   102,   102,   160,    83,   160,   160,   144,   160,   160,
+   244,   160,   144,   160,    21,   160,   187,   160,    81,    91,
+   244,    19,   244,   244,   231,   244,   244,   187,   244,    89,
+   244,    88,   244,   189,   244,    85,     1,   187,   116,   187,
+   187,   nil,   187,   187,   189,   187,   nil,   187,   nil,   187,
+   191,   187,   nil,   nil,   189,   nil,   189,   189,   nil,   189,
+   189,   191,   189,   nil,   189,   nil,   189,   226,   189,   nil,
+   nil,   191,   nil,   191,   191,   nil,   191,   191,   226,   191,
+   nil,   191,   nil,   191,   235,   191,   nil,   nil,   226,   nil,
    226,   226,   nil,   226,   226,   235,   226,   nil,   226,   nil,
    226,   137,   226,   nil,   nil,   235,   nil,   235,   235,   nil,
    235,   235,   137,   235,   nil,   235,   nil,   235,   139,   235,
@@ -472,30 +472,30 @@ racc_action_check = [
    nil,     0 ]
 
 racc_action_pointer = [
-   489,   335,   nil,   nil,    94,   nil,    84,   nil,   156,    13,
-   nil,   nil,   256,   nil,    74,   nil,    80,     9,   nil,   334,
-   279,   322,   nil,   455,   100,   266,   nil,   nil,   nil,   nil,
-    68,   nil,   nil,   226,   nil,   250,   244,    -5,   nil,   nil,
-   nil,   nil,   nil,   284,   215,   nil,   263,   nil,    -2,   182,
-   nil,   176,   nil,   nil,   178,   nil,    22,   nil,   176,   nil,
-   nil,   143,   126,   116,   nil,   nil,   nil,    93,   nil,    87,
-    65,    29,    23,    25,   nil,   nil,   242,    58,   209,     4,
-   272,   329,   nil,   286,   nil,   324,   nil,   nil,   339,   303,
-   nil,   325,   162,   232,   nil,   nil,    26,   nil,   nil,   nil,
-   101,   nil,   256,   217,   215,     0,    -9,   nil,   203,   192,
-   105,   nil,   nil,    64,     1,   nil,   330,    52,   nil,   nil,
-   -18,   nil,   472,   nil,   nil,   302,   208,    58,   239,    47,
-    48,    60,   nil,   136,   119,   nil,    75,   404,   nil,   421,
-   nil,    45,   nil,   nil,   246,   nil,   144,   198,   nil,   nil,
-   nil,   nil,   153,   nil,   154,   134,   136,    62,    16,   177,
-   285,   nil,    10,   nil,   nil,   nil,   nil,   190,   184,   nil,
-   192,   nil,   nil,   nil,    87,   214,   nil,   141,   nil,   nil,
-   215,   nil,   190,   221,   215,   110,   231,   nil,   319,   nil,
-   336,   nil,   353,   nil,   nil,    -4,   nil,   248,   250,   252,
-   265,   nil,   nil,   nil,   nil,   288,   nil,   nil,   nil,   273,
-   nil,    86,   nil,   198,   nil,   nil,   nil,   308,   150,   nil,
-   138,   nil,   nil,   160,   132,   nil,   370,   nil,   nil,   nil,
-   nil,   333,   nil,   nil,   186,   387,   nil,   nil,   nil,   nil,
+   489,   333,   nil,   nil,   100,   nil,    84,   nil,   156,    13,
+   nil,   nil,   256,   nil,    74,   nil,    80,     9,   nil,   331,
+   279,   318,   nil,   455,   113,   260,   nil,   nil,   nil,   nil,
+    68,   nil,   nil,   221,   nil,   244,   238,    -5,   nil,   nil,
+   nil,   nil,   nil,   232,   246,   nil,   263,   nil,    -2,   176,
+   nil,   174,   nil,   nil,   176,   nil,    22,   nil,   172,   nil,
+   nil,   140,   126,   122,   nil,   nil,   nil,   105,   nil,    93,
+     7,    31,    29,    42,   nil,   nil,     0,    60,   207,     4,
+   270,   328,   nil,   276,   nil,   323,   nil,   nil,   335,   301,
+   nil,   323,   162,   215,   nil,   nil,    26,   nil,   nil,   nil,
+   101,   nil,   263,   215,   210,     0,    49,   nil,   199,   189,
+   116,   nil,   nil,    87,    88,   nil,   327,     6,   nil,   nil,
+   222,   nil,   472,   nil,   nil,   295,   208,    58,   239,    53,
+    59,    64,   nil,    69,   160,   nil,    79,   404,   nil,   421,
+   nil,    45,   nil,   nil,   284,   nil,   144,   198,   nil,   nil,
+   nil,   nil,   147,   nil,   148,   123,   134,    62,    16,   173,
+   285,   nil,    10,   nil,   nil,   nil,   nil,   183,   177,   nil,
+   192,   nil,   nil,   nil,     0,   214,   nil,   122,   nil,   nil,
+   213,   215,   215,   211,   110,   227,   nil,   319,   nil,   336,
+   nil,   353,   nil,   nil,    -4,   nil,   242,   248,   250,   252,
+   nil,   nil,   nil,   nil,   276,   nil,   nil,   nil,   269,   nil,
+    86,   nil,   198,   nil,   nil,   nil,   304,   150,   nil,   nil,
+   138,   nil,   nil,   119,   132,   nil,   370,   nil,   nil,   nil,
+   nil,   328,   nil,   nil,   186,   387,   nil,   nil,   nil,   nil,
    nil,   438,   nil,   nil,   302,   257,   nil,   nil ]
 
 racc_action_default = [
@@ -512,107 +512,107 @@ racc_action_default = [
   -150,   -40,  -150,  -150,  -150,  -150,  -150,   -52,  -148,  -150,
    -60,   -61,   -63,   -59,   -56,   -66,   -62,   -58,   -57,  -114,
    -54,  -113,  -150,  -145,   -69,  -150,  -150,  -150,  -150,  -150,
-  -148,  -150,   248,  -150,  -131,  -132,  -150,  -150,  -142,  -150,
+  -148,  -150,   248,  -148,  -131,  -132,  -150,  -150,  -142,  -150,
   -126,  -150,   -46,   -45,  -150,   -39,  -150,  -150,   -38,   -17,
    -90,   -22,  -150,   -27,  -150,  -149,   -65,  -150,   -55,  -150,
   -150,  -144,  -150,  -146,  -147,  -110,  -109,  -150,   -56,  -112,
   -150,  -103,  -111,  -104,  -150,  -150,   -97,  -150,  -101,   -91,
-  -150,   -31,  -150,  -140,  -150,  -150,  -138,  -135,  -150,  -120,
-  -150,  -122,  -150,   -44,   -42,   -73,   -75,   -72,   -76,   -71,
-   -74,   -47,   -48,   -29,   -67,  -148,   -68,   -53,   -28,   -93,
-   -70,  -150,  -106,  -150,   -86,   -98,   -96,  -150,  -150,   -30,
+  -150,  -150,  -140,  -150,  -150,  -138,  -135,  -150,  -120,  -150,
+  -122,  -150,   -44,   -42,   -73,   -75,   -72,   -76,   -71,   -74,
+   -47,   -48,   -29,   -67,  -148,   -68,   -53,   -28,   -93,   -70,
+  -150,  -106,  -150,   -86,   -98,   -96,  -150,  -150,   -30,   -31,
   -150,  -133,  -134,  -150,  -150,  -118,  -150,  -119,  -121,   -51,
    -92,  -150,  -108,  -105,  -150,  -150,  -102,  -139,  -136,  -137,
   -117,  -150,  -107,  -100,  -150,  -150,   -99,   -94 ]
 
 racc_goto_table = [
-    23,    59,   173,    84,   107,   108,    38,   187,    33,    82,
-    57,   112,   167,   204,   178,   154,    55,   111,    96,   102,
-   176,    88,   175,   162,    47,    91,   201,   202,    85,   130,
-   125,    61,   133,   230,   174,    59,   151,   180,    27,    34,
-   204,    97,    97,   171,    57,   117,   212,    95,    95,   120,
-    55,   213,   159,    68,   116,    78,   167,   136,   103,    42,
-   113,   178,    37,   194,   184,   185,    19,   215,   141,    87,
-   nil,    90,   nil,   nil,   nil,    90,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,   nil,   nil,
-   140,    97,   nil,   nil,    59,   119,   238,    95,   nil,   nil,
-   nil,   124,   nil,    57,   236,   205,   207,   196,   196,    55,
-   242,   234,   229,   112,   nil,   172,    59,   172,   129,   111,
-   167,   nil,   160,   135,   169,    57,   169,   nil,   nil,   nil,
-   166,    55,   166,   nil,   nil,   199,   199,   190,   nil,   192,
-    84,   nil,    97,   nil,   198,   198,   nil,   117,    95,   nil,
-   197,   197,   nil,    60,   nil,    75,   116,    75,   121,   172,
-   nil,   nil,   113,   nil,   172,   119,   nil,   119,   169,   nil,
-    84,    75,    84,   169,   166,   nil,   nil,   nil,   nil,   166,
-   nil,   nil,   nil,   nil,   nil,   200,   200,    60,   226,    75,
-   nil,   nil,   110,   nil,   nil,   nil,   206,   119,   nil,   nil,
-   nil,   210,   nil,    75,   nil,   nil,    84,   172,   nil,   119,
-   nil,   nil,   nil,   nil,   119,   nil,   169,   nil,   nil,   nil,
-    75,   nil,   166,   172,    84,    84,   nil,   nil,   121,   nil,
-   121,   nil,   169,   nil,   nil,   244,   nil,   nil,   166,   nil,
-   nil,   245,   nil,   nil,   nil,   nil,   nil,   153,   121,   121,
-   232,   nil,   nil,   nil,   nil,   nil,   nil,   119,   nil,   237,
-   121,   nil,   165,   239,   165,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   121,   119,   nil,   nil,   nil,   121,   nil,   nil,
-   nil,   nil,   195,   195,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   110,   nil,   nil,   nil,    75,   nil,
-   nil,   nil,   nil,    75,   nil,   nil,   165,   nil,   nil,   nil,
-   nil,   165,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   121,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,
+    23,    59,   173,   107,    84,   111,   112,    33,    38,    82,
+    57,   186,   108,   167,   162,   178,    55,   176,    68,    88,
+    78,    96,   102,    91,    47,   175,    27,    85,   200,   201,
+   174,   154,   203,    61,    87,    59,   130,   230,   125,   133,
+   151,    97,    97,    34,    57,   117,   211,    95,    95,   171,
+    55,   120,   104,   180,   116,   212,   181,   167,   103,    90,
+   113,   159,   178,    90,   214,   136,   124,    42,    37,   193,
+   183,   141,   184,    19,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   129,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    97,   140,   nil,    59,   195,   195,    95,   nil,   nil,
+   238,   234,   nil,    57,   236,   206,   nil,   111,   112,    55,
+   242,   135,   204,   nil,   nil,   172,    59,   172,   nil,   nil,
+   119,   167,   160,   nil,   169,    57,   169,   229,   nil,   nil,
+   166,    55,   166,   nil,   nil,   198,   198,   189,   nil,   191,
+   nil,    84,    97,   nil,   197,   197,   121,   117,    95,   nil,
+   196,   196,   nil,   nil,   nil,   nil,   116,   nil,   nil,   172,
+   nil,   205,   113,    60,   172,    75,   209,    75,   169,   nil,
+    84,   nil,    84,   169,   166,   nil,   nil,   110,   nil,   166,
+   nil,    75,   nil,   nil,   nil,   nil,   nil,   226,   nil,   nil,
+   119,   nil,   119,   nil,   nil,   nil,   nil,    60,   nil,    75,
+   nil,   nil,   nil,   nil,   nil,   nil,   172,    84,   nil,   nil,
+   199,   199,   nil,    75,   232,   169,   121,   nil,   121,   nil,
+   nil,   166,   119,   172,   237,    84,    84,   nil,   239,   nil,
+    75,   nil,   169,   nil,   119,   244,   121,   121,   166,   119,
+   nil,   245,   nil,   nil,   nil,   nil,   nil,   165,   121,   165,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   153,   nil,   nil,
+   121,   nil,   nil,   nil,   nil,   121,   nil,   194,   194,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   110,
+   nil,   119,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   165,   nil,   nil,   nil,   nil,   165,   nil,   119,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   121,    75,   nil,
+   nil,   nil,   nil,    75,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   121,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   165,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    75,   nil,   165,   nil,   nil,   nil,   nil,   nil,
-   nil,    75,   nil,   nil,   nil,    75,   nil,   nil,   nil,   nil,
-   165 ]
+   nil,   nil,   nil,   nil,   nil,   165,   nil,   nil,   nil,   nil,
+   nil,    75,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    75,   nil,   nil,   nil,    75 ]
 
 racc_goto_check = [
-     2,    23,    56,     4,    38,    27,    62,    65,    58,    23,
-    22,    42,    54,    44,    54,    28,    21,    41,    32,    32,
-    52,    60,    51,    46,    17,    60,    37,    37,    58,    27,
-    45,    49,    27,    50,    18,    23,    20,    28,     3,     5,
-    44,    22,    22,    55,    22,    23,    56,    21,    21,    25,
-    21,    57,    26,    43,    22,    43,    54,    59,    17,    31,
-    21,    54,    61,    33,    63,    64,     1,    52,    32,    43,
-   nil,     3,   nil,   nil,   nil,     3,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,   nil,   nil,
-    62,    22,   nil,   nil,    23,    47,    65,    21,   nil,   nil,
-   nil,    43,   nil,    22,    54,    27,    38,    41,    41,    21,
-    56,    46,    28,    42,   nil,    23,    23,    23,    43,    41,
-    54,   nil,     2,     3,    22,    22,    22,   nil,   nil,   nil,
+     2,    23,    56,    38,     4,    41,    42,    58,    62,    23,
+    22,    65,    27,    54,    46,    54,    21,    52,    43,    60,
+    43,    32,    32,    60,    17,    51,     3,    58,    37,    37,
+    18,    28,    44,    49,    43,    23,    27,    50,    45,    27,
+    20,    22,    22,     5,    22,    23,    56,    21,    21,    55,
+    21,    25,    43,    28,    22,    57,    28,    54,    17,     3,
+    21,    26,    54,     3,    52,    59,    43,    31,    61,    33,
+    63,    32,    64,     1,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    22,    62,   nil,    23,    41,    41,    21,   nil,   nil,
+    65,    46,   nil,    22,    54,    38,   nil,    41,    42,    21,
+    56,     3,    27,   nil,   nil,    23,    23,    23,   nil,   nil,
+    47,    54,     2,   nil,    22,    22,    22,    28,   nil,   nil,
     21,    21,    21,   nil,   nil,    23,    23,     2,   nil,     2,
-     4,   nil,    22,   nil,    22,    22,   nil,    23,    21,   nil,
-    21,    21,   nil,    24,   nil,    24,    22,    24,    48,    23,
-   nil,   nil,    21,   nil,    23,    47,   nil,    47,    22,   nil,
-     4,    24,     4,    22,    21,   nil,   nil,   nil,   nil,    21,
-   nil,   nil,   nil,   nil,   nil,    47,    47,    24,     2,    24,
-   nil,   nil,    40,   nil,   nil,   nil,    43,    47,   nil,   nil,
-   nil,    43,   nil,    24,   nil,   nil,     4,    23,   nil,    47,
-   nil,   nil,   nil,   nil,    47,   nil,    22,   nil,   nil,   nil,
-    24,   nil,    21,    23,     4,     4,   nil,   nil,    48,   nil,
-    48,   nil,    22,   nil,   nil,     2,   nil,   nil,    21,   nil,
-   nil,     2,   nil,   nil,   nil,   nil,   nil,    24,    48,    48,
-    43,   nil,   nil,   nil,   nil,   nil,   nil,    47,   nil,    43,
-    48,   nil,    40,    43,    40,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    48,    47,   nil,   nil,   nil,    48,   nil,   nil,
-   nil,   nil,    40,    40,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    40,   nil,   nil,   nil,    24,   nil,
-   nil,   nil,   nil,    24,   nil,   nil,    40,   nil,   nil,   nil,
-   nil,    40,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    48,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,
+   nil,     4,    22,   nil,    22,    22,    48,    23,    21,   nil,
+    21,    21,   nil,   nil,   nil,   nil,    22,   nil,   nil,    23,
+   nil,    43,    21,    24,    23,    24,    43,    24,    22,   nil,
+     4,   nil,     4,    22,    21,   nil,   nil,    40,   nil,    21,
+   nil,    24,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
+    47,   nil,    47,   nil,   nil,   nil,   nil,    24,   nil,    24,
+   nil,   nil,   nil,   nil,   nil,   nil,    23,     4,   nil,   nil,
+    47,    47,   nil,    24,    43,    22,    48,   nil,    48,   nil,
+   nil,    21,    47,    23,    43,     4,     4,   nil,    43,   nil,
+    24,   nil,    22,   nil,    47,     2,    48,    48,    21,    47,
+   nil,     2,   nil,   nil,   nil,   nil,   nil,    40,    48,    40,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,   nil,
+    48,   nil,   nil,   nil,   nil,    48,   nil,    40,    40,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,
+   nil,    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    40,   nil,   nil,   nil,   nil,    40,   nil,    47,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,    24,   nil,
+   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    40,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    24,   nil,    40,   nil,   nil,   nil,   nil,   nil,
-   nil,    24,   nil,   nil,   nil,    24,   nil,   nil,   nil,   nil,
-    40 ]
+   nil,   nil,   nil,   nil,   nil,    40,   nil,   nil,   nil,   nil,
+   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    24,   nil,   nil,   nil,    24 ]
 
 racc_goto_pointer = [
-   nil,    66,     0,    38,   -20,    33,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,   -93,   nil,
-   -69,     4,    -2,   -11,   141,    -7,   -68,   -51,   -93,   nil,
-   nil,    50,   -25,   -81,   nil,   nil,   nil,  -120,   -52,   nil,
-   136,   -39,   -45,    39,  -142,   -32,  -102,    39,   102,    17,
-  -176,  -106,  -108,   nil,  -114,   -83,  -124,  -119,     4,   -28,
-   -12,    54,    -2,   -70,   -69,  -127 ]
+   nil,    73,     0,    26,   -19,    37,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,   -97,   nil,
+   -65,     4,    -2,   -11,   151,    -5,   -59,   -44,   -77,   nil,
+   nil,    58,   -22,   -75,   nil,   nil,   nil,  -118,   -53,   nil,
+   121,   -51,   -50,     4,  -123,   -24,  -111,    64,    90,    19,
+  -171,  -103,  -111,   nil,  -113,   -77,  -124,  -115,     3,   -20,
+   -14,    60,     0,   -64,   -62,  -123 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   101,    29,     3,     5,     7,    10,    11,