Applying patch by DavidS from #697 to allow host names to be double quoted

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

1 files changed, 334 insertions, 329 deletions

diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index f7e05e419..e4752ddf4 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..id8685abbbb8', 'grammar.ra', 614
+module_eval <<'..end grammar.ra modeval..id3cb29d1771', 'grammar.ra', 615
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -261,7 +261,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id8685abbbb8
+..end grammar.ra modeval..id3cb29d1771
 
 ##### racc 1.4.5 generates ###
 
@@ -408,93 +408,94 @@ racc_reduce_table = [
  1, 116, :_reduce_none,
  1, 116, :_reduce_none,
  1, 116, :_reduce_none,
- 0, 54, :_reduce_142,
- 0, 117, :_reduce_143,
+ 1, 116, :_reduce_none,
+ 0, 54, :_reduce_143,
+ 0, 117, :_reduce_144,
  1, 112, :_reduce_none,
- 3, 112, :_reduce_145,
  3, 112, :_reduce_146,
+ 3, 112, :_reduce_147,
  1, 118, :_reduce_none,
- 3, 118, :_reduce_148,
- 3, 119, :_reduce_149,
- 1, 119, :_reduce_150,
- 3, 119, :_reduce_151,
- 1, 119, :_reduce_152,
+ 3, 118, :_reduce_149,
+ 3, 119, :_reduce_150,
+ 1, 119, :_reduce_151,
+ 3, 119, :_reduce_152,
+ 1, 119, :_reduce_153,
  1, 115, :_reduce_none,
- 2, 115, :_reduce_154,
+ 2, 115, :_reduce_155,
  1, 113, :_reduce_none,
- 2, 113, :_reduce_156,
+ 2, 113, :_reduce_157,
  1, 120, :_reduce_none,
  1, 120, :_reduce_none,
- 1, 73, :_reduce_159,
- 3, 97, :_reduce_160,
- 2, 97, :_reduce_161,
+ 1, 73, :_reduce_160,
+ 3, 97, :_reduce_161,
+ 2, 97, :_reduce_162,
  1, 101, :_reduce_none,
  1, 101, :_reduce_none,
  0, 84, :_reduce_none,
- 1, 84, :_reduce_165 ]
+ 1, 84, :_reduce_166 ]
 
-racc_reduce_n = 166
+racc_reduce_n = 167
 
-racc_shift_n = 267
+racc_shift_n = 268
 
 racc_action_table = [
-    69,    50,    53,    86,   201,    89,    69,    50,    53,    36,
-    36,   203,   191,   104,    47,   152,   113,   192,    92,    36,
-   202,   163,    59,    34,    69,    50,    53,  -124,   124,    90,
-     4,    42,   199,   200,   124,    52,   108,    42,   101,    61,
-    59,    52,    55,    38,    38,    61,    40,    40,    57,    69,
-    50,    53,   234,    38,    57,    42,    40,   225,    81,    52,
-    55,   168,    82,    61,   224,    59,   231,    69,    50,    53,
-   127,   138,    57,    69,    50,    53,  -119,   199,   200,   230,
-    42,   167,    42,    59,    52,    55,  -121,   143,    61,    59,
-  -118,    47,    50,    53,   138,  -135,   204,    57,    42,   161,
-   199,   200,    52,    55,    42,    42,    61,    59,    52,    55,
-   143,    44,    61,   138,   191,    57,    69,    50,    53,   192,
-   138,    57,    42,   129,    42,  -120,    52,    55,    34,   143,
-    61,    42,    59,   188,    45,     4,   143,    34,   154,    57,
-    69,    50,    53,    34,     4,  -121,   149,    42,   154,   180,
-     4,    52,    55,   181,   182,    61,    59,   196,    69,    50,
-    53,    50,    53,  -118,    57,    69,    50,    53,    50,    53,
-  -122,    42,   181,   249,   113,    52,    55,   159,  -120,    61,
-  -123,    59,  -119,    69,    50,    53,   208,    99,    57,    42,
-   125,   212,  -121,    52,   164,   214,    42,    61,    99,    59,
-    52,    55,    50,    53,    61,   124,    57,    69,    50,    53,
-    47,    81,   216,    57,    42,    81,   219,   113,    52,    55,
-  -118,  -119,    61,    59,   123,    69,    50,    53,   156,   122,
-   227,    57,    42,    50,    53,   228,    52,   164,    42,   229,
-    61,    59,    52,    55,    50,    53,    61,  -123,   113,    57,
-  -120,    50,    53,   154,   152,    57,    42,   151,    99,   113,
-    52,    55,    95,    42,    61,   162,   113,    52,   164,    50,
-    53,    61,   173,    57,    42,    50,    53,   154,    52,   164,
-    57,    42,    61,   130,   113,    52,   164,   135,   252,    61,
-   113,    57,   253,    50,    53,   134,    87,    82,    57,    42,
-   133,    99,  -120,    52,   164,    42,  -118,    61,   113,    52,
-   164,    50,    53,    61,  -121,   223,    57,    50,    53,  -119,
-  -123,    41,    57,    42,   260,  -165,   113,    52,   164,   261,
-    35,    61,    59,    50,    53,    50,    53,   119,  -122,    32,
-    57,    42,   226,   nil,   nil,    52,   164,    42,    59,    61,
-   113,    52,    55,   169,   nil,    61,   nil,   nil,    57,    45,
-   nil,   nil,   nil,    42,    57,    42,   nil,    52,    55,    52,
-   164,    61,   266,    61,   nil,    45,   nil,    45,   nil,   nil,
-    57,   nil,    57,    19,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   232,   nil,    16,   nil,    21,    25,   nil,     1,     5,
+    70,    51,    54,    87,   202,    90,    70,    51,    54,    36,
+    37,   204,   192,   105,    48,   153,   114,   193,    36,    37,
+   203,    93,    60,    34,    70,    51,    54,   164,   125,    91,
+     4,    43,   200,   201,   125,    53,   109,    43,   102,    62,
+    60,    53,    56,  -124,    39,    62,   169,    41,    58,    70,
+    51,    54,   235,    39,    58,    43,    41,   226,  -119,    53,
+    56,    36,    37,    62,   225,    60,   168,    70,    51,    54,
+   128,   139,    58,    70,    51,    54,   192,   200,   201,    34,
+    43,   193,    43,    60,    53,    56,     4,   144,    62,    60,
+  -121,    48,    51,    54,   139,  -135,    39,    58,    43,    41,
+  -118,   232,    53,    56,    43,    43,    62,    60,    53,    56,
+   144,    45,    62,   139,   231,    58,    70,    51,    54,    82,
+   139,    58,    43,    83,    43,   162,    53,    56,    34,   144,
+    62,    43,    60,   205,    46,     4,   144,   200,   201,    58,
+    70,    51,    54,    34,   181,   130,   150,    43,   182,   183,
+     4,    53,    56,    51,    54,    62,    60,  -120,    70,    51,
+    54,    51,    54,   189,    58,    70,    51,    54,   182,   250,
+   155,    43,  -121,   155,   114,    53,    56,   197,  -118,    62,
+  -122,    60,   160,    70,    51,    54,  -120,  -123,    58,    43,
+  -119,   209,   100,    53,   165,   126,    43,    62,   213,    60,
+    53,    56,    51,    54,    62,  -121,    58,    70,    51,    54,
+   215,   100,   125,    58,    43,    48,    82,   114,    53,    56,
+   217,    82,    62,    60,   220,    70,    51,    54,  -118,  -119,
+   124,    58,    43,    51,    54,   157,    53,   165,    43,   123,
+    62,    60,    53,    56,    51,    54,    62,   228,   114,    58,
+   229,    51,    54,   230,  -123,    58,    43,  -120,   155,   114,
+    53,    56,   153,    43,    62,   152,   114,    53,   165,    51,
+    54,    62,   174,    58,    43,    51,    54,   100,    53,   165,
+    58,    43,    62,    96,   114,    53,   165,   163,   155,    62,
+   114,    58,   131,    51,    54,   136,   253,   254,    58,    43,
+   135,    88,    83,    53,   165,    43,   134,    62,   114,    53,
+   165,    51,    54,    62,   100,   224,    58,    51,    54,  -120,
+  -118,  -121,    58,    43,  -119,  -123,   114,    53,   165,    42,
+   261,    62,    60,    51,    54,    51,    54,   120,  -166,   262,
+    58,    43,    35,  -122,    32,    53,   165,    43,    60,    62,
+   114,    53,    56,   170,   227,    62,   nil,   nil,    58,    46,
+   nil,   nil,   nil,    43,    58,    43,   nil,    53,    56,    53,
+   165,    62,   267,    62,   nil,    46,   nil,    46,   nil,   nil,
+    58,   nil,    58,    19,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   233,   nil,    16,   nil,    21,    25,   nil,     1,     5,
    nil,    10,    19,    14,   nil,    18,   nil,    27,   nil,   nil,
-     4,   nil,    16,   nil,    21,    25,   221,     1,     5,   nil,
+     4,   nil,    16,   nil,    21,    25,   222,     1,     5,   nil,
     10,   nil,    14,   nil,    18,   nil,    27,    19,   nil,     4,
-   nil,   nil,   nil,   nil,   nil,   244,   nil,    16,   nil,    21,
+   nil,   nil,   nil,   nil,   nil,   245,   nil,    16,   nil,    21,
     25,   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,
    nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,
-   258,     1,     5,   nil,    10,   nil,    14,   nil,    18,   nil,
-    27,    19,   nil,     4,   nil,   nil,   nil,   nil,   nil,   245,
+   246,     1,     5,   nil,    10,   nil,    14,   nil,    18,   nil,
+    27,    19,   nil,     4,   nil,   nil,   nil,   nil,   nil,   211,
    nil,    16,   nil,    21,    25,   nil,     1,     5,   nil,    10,
     19,    14,   nil,    18,   nil,    27,   nil,   nil,     4,   nil,
-    16,   nil,    21,    25,   262,     1,     5,   nil,    10,   nil,
+    16,   nil,    21,    25,   266,     1,     5,   nil,    10,   nil,
     14,   nil,    18,   nil,    27,    19,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   265,   nil,    16,   nil,    21,    25,   nil,
+   nil,   nil,   nil,   206,   nil,    16,   nil,    21,    25,   nil,
      1,     5,   nil,    10,    19,    14,   nil,    18,   nil,    27,
-   nil,   nil,     4,   nil,    16,   nil,    21,    25,   205,     1,
+   nil,   nil,     4,   nil,    16,   nil,    21,    25,   263,     1,
      5,   nil,    10,   nil,    14,   nil,    18,   nil,    27,    19,
-   nil,     4,   nil,   nil,   nil,   nil,   nil,   210,   nil,    16,
+   nil,     4,   nil,   nil,   nil,   nil,   nil,   259,   nil,    16,
    nil,    21,    25,   nil,     1,     5,   nil,    10,    19,    14,
    nil,    18,   nil,    27,   nil,   nil,     4,   nil,    16,   nil,
     21,    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,
@@ -509,252 +510,254 @@ racc_action_table = [
    nil,     4 ]
 
 racc_action_check = [
-    41,    41,    41,    22,   139,    26,    47,    47,    47,   104,
-    10,   142,   135,    37,    55,   108,    41,   135,    27,   101,
-   142,   121,    47,    22,    81,    81,    81,    74,   108,    26,
-    22,    41,   139,   139,    55,    41,    41,    47,    37,    41,
-    81,    47,    47,   104,    10,    47,   104,    10,    41,   179,
-   179,   179,   197,   101,    47,    81,   101,   186,    19,    81,
-    81,   123,    19,    81,   186,   179,   194,    69,    69,    69,
-    69,    89,    81,    32,    32,    32,   115,   197,   197,   194,
-   179,   123,    89,    69,   179,   179,    73,    89,   179,    32,
-    72,    14,    14,    14,   138,    14,   147,   179,    69,   114,
-   147,   147,    69,    69,    32,   138,    69,    14,    32,    32,
-   138,    14,    32,   198,   231,    69,    16,    16,    16,   231,
-    90,    32,    14,    71,   198,    68,    14,    14,    25,   198,
-    14,    90,    16,   131,    14,    25,    90,     5,   132,    14,
-    18,    18,    18,    95,     5,   112,    95,    16,   111,   126,
-    95,    16,    16,   126,   126,    16,    18,   136,   159,   159,
-   159,    21,    21,   109,    16,   228,   228,   228,   133,   133,
-    66,    18,   217,   217,   159,    18,    18,   107,   106,    18,
-    65,   228,    64,   152,   152,   152,   153,   154,    18,   159,
-    63,   158,    60,   159,   159,   160,   228,   159,   161,   152,
-   228,   228,   225,   225,   228,   164,   159,   219,   219,   219,
-   167,   168,   170,   228,   152,    59,   176,   225,   152,   152,
-    58,    75,   152,   219,    54,   227,   227,   227,   102,    51,
-   191,   152,   225,   130,   130,   192,   225,   225,   219,   193,
-   225,   227,   219,   219,   173,   173,   219,    77,   130,   225,
-    46,   247,   247,   100,    99,   219,   227,    96,    35,   173,
-   227,   227,    33,   130,   227,   120,   247,   130,   130,   125,
-   125,   130,   125,   227,   173,   203,   203,   215,   173,   173,
-   130,   247,   173,    80,   125,   247,   247,    88,   221,   247,
-   203,   173,   224,   202,   202,    87,    24,    86,   247,   125,
-    83,    82,   237,   125,   125,   203,   239,   125,   202,   203,
-   203,   184,   184,   203,   240,   184,   125,    44,    44,   241,
-   242,    11,   203,   202,   248,   249,   184,   202,   202,   252,
-     8,   202,    44,   124,   124,   122,   122,    44,    79,     1,
-   202,   184,   189,   nil,   nil,   184,   184,    44,   124,   184,
-   122,    44,    44,   124,   nil,    44,   nil,   nil,   184,    44,
-   nil,   nil,   nil,   124,    44,   122,   nil,   124,   124,   122,
-   122,   124,   264,   122,   nil,   124,   nil,   122,   nil,   nil,
-   124,   nil,   122,   264,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   196,   nil,   264,   nil,   264,   264,   nil,   264,   264,
-   nil,   264,   196,   264,   nil,   264,   nil,   264,   nil,   nil,
-   264,   nil,   196,   nil,   196,   196,   183,   196,   196,   nil,
-   196,   nil,   196,   nil,   196,   nil,   196,   183,   nil,   196,
-   nil,   nil,   nil,   nil,   nil,   206,   nil,   183,   nil,   183,
-   183,   nil,   183,   183,   nil,   183,   206,   183,   nil,   183,
-   nil,   183,   nil,   nil,   183,   nil,   206,   nil,   206,   206,
-   233,   206,   206,   nil,   206,   nil,   206,   nil,   206,   nil,
-   206,   233,   nil,   206,   nil,   nil,   nil,   nil,   nil,   211,
-   nil,   233,   nil,   233,   233,   nil,   233,   233,   nil,   233,
-   211,   233,   nil,   233,   nil,   233,   nil,   nil,   233,   nil,
-   211,   nil,   211,   211,   253,   211,   211,   nil,   211,   nil,
-   211,   nil,   211,   nil,   211,   253,   nil,   211,   nil,   nil,
-   nil,   nil,   nil,   263,   nil,   253,   nil,   253,   253,   nil,
-   253,   253,   nil,   253,   263,   253,   nil,   253,   nil,   253,
-   nil,   nil,   253,   nil,   263,   nil,   263,   263,   151,   263,
-   263,   nil,   263,   nil,   263,   nil,   263,   nil,   263,   151,
-   nil,   263,   nil,   nil,   nil,   nil,   nil,   156,   nil,   151,
-   nil,   151,   151,   nil,   151,   151,   nil,   151,   156,   151,
-   nil,   151,   nil,   151,   nil,   nil,   151,   nil,   156,   nil,
-   156,   156,   nil,   156,   156,   nil,   156,   261,   156,   nil,
-   156,   nil,   156,   nil,   nil,   156,   nil,   261,   nil,   261,
-   261,   nil,   261,   261,   nil,   261,    29,   261,   nil,   261,
-   nil,   261,   nil,   nil,   261,   nil,    29,   nil,    29,    29,
-   nil,    29,    29,   nil,    29,   129,    29,   nil,    29,   nil,
-    29,   nil,   nil,    29,   nil,   129,   nil,   129,   129,   nil,
-   129,   129,   nil,   129,     0,   129,   nil,   129,   nil,   129,
-   nil,   nil,   129,   nil,     0,   nil,     0,     0,   nil,     0,
+    42,    42,    42,    22,   140,    26,    48,    48,    48,   105,
+   105,   143,   136,    38,    56,   109,    42,   136,    10,    10,
+   143,    27,    48,    22,    82,    82,    82,   122,   109,    26,
+    22,    42,   140,   140,    56,    42,    42,    48,    38,    42,
+    82,    48,    48,    75,   105,    48,   124,   105,    42,   180,
+   180,   180,   198,    10,    48,    82,    10,   187,   116,    82,
+    82,   102,   102,    82,   187,   180,   124,    70,    70,    70,
+    70,    90,    82,    32,    32,    32,   232,   198,   198,    25,
+   180,   232,    90,    70,   180,   180,    25,    90,   180,    32,
+    74,    14,    14,    14,   139,    14,   102,   180,    70,   102,
+    73,   195,    70,    70,    32,   139,    70,    14,    32,    32,
+   139,    14,    32,   199,   195,    70,    16,    16,    16,    19,
+    91,    32,    14,    19,   199,   115,    14,    14,     5,   199,
+    14,    91,    16,   148,    14,     5,    91,   148,   148,    14,
+    18,    18,    18,    96,   127,    72,    96,    16,   127,   127,
+    96,    16,    16,    21,    21,    16,    18,    69,   160,   160,
+   160,   134,   134,   132,    16,   229,   229,   229,   218,   218,
+   133,    18,   113,   112,   160,    18,    18,   137,   110,    18,
+    67,   229,   108,   153,   153,   153,   107,    66,    18,   160,
+    65,   154,   155,   160,   160,    64,   229,   160,   159,   153,
+   229,   229,   226,   226,   229,    61,   160,   220,   220,   220,
+   161,   162,   165,   229,   153,   168,   169,   226,   153,   153,
+   171,    60,   153,   220,   177,   228,   228,   228,    59,    76,
+    55,   153,   226,   131,   131,   103,   226,   226,   220,    52,
+   226,   228,   220,   220,   174,   174,   220,   192,   131,   226,
+   193,   248,   248,   194,    78,   220,   228,    47,   101,   174,
+   228,   228,   100,   131,   228,    97,   248,   131,   131,   126,
+   126,   131,   126,   228,   174,   204,   204,    35,   174,   174,
+   131,   248,   174,    33,   126,   248,   248,   121,   216,   248,
+   204,   174,    81,   203,   203,    89,   222,   225,   248,   126,
+    88,    24,    87,   126,   126,   204,    84,   126,   203,   204,
+   204,   185,   185,   204,    83,   185,   126,    45,    45,   238,
+   240,   241,   204,   203,   242,   243,   185,   203,   203,    11,
+   249,   203,    45,   125,   125,   123,   123,    45,   250,   253,
+   203,   185,     8,    80,     1,   185,   185,    45,   125,   185,
+   123,    45,    45,   125,   190,    45,   nil,   nil,   185,    45,
+   nil,   nil,   nil,   125,    45,   123,   nil,   125,   125,   123,
+   123,   125,   265,   123,   nil,   125,   nil,   123,   nil,   nil,
+   125,   nil,   123,   265,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   197,   nil,   265,   nil,   265,   265,   nil,   265,   265,
+   nil,   265,   197,   265,   nil,   265,   nil,   265,   nil,   nil,
+   265,   nil,   197,   nil,   197,   197,   184,   197,   197,   nil,
+   197,   nil,   197,   nil,   197,   nil,   197,   184,   nil,   197,
+   nil,   nil,   nil,   nil,   nil,   207,   nil,   184,   nil,   184,
+   184,   nil,   184,   184,   nil,   184,   207,   184,   nil,   184,
+   nil,   184,   nil,   nil,   184,   nil,   207,   nil,   207,   207,
+   212,   207,   207,   nil,   207,   nil,   207,   nil,   207,   nil,
+   207,   212,   nil,   207,   nil,   nil,   nil,   nil,   nil,   157,
+   nil,   212,   nil,   212,   212,   nil,   212,   212,   nil,   212,
+   157,   212,   nil,   212,   nil,   212,   nil,   nil,   212,   nil,
+   157,   nil,   157,   157,   264,   157,   157,   nil,   157,   nil,
+   157,   nil,   157,   nil,   157,   264,   nil,   157,   nil,   nil,
+   nil,   nil,   nil,   152,   nil,   264,   nil,   264,   264,   nil,
+   264,   264,   nil,   264,   152,   264,   nil,   264,   nil,   264,
+   nil,   nil,   264,   nil,   152,   nil,   152,   152,   254,   152,
+   152,   nil,   152,   nil,   152,   nil,   152,   nil,   152,   254,
+   nil,   152,   nil,   nil,   nil,   nil,   nil,   234,   nil,   254,
+   nil,   254,   254,   nil,   254,   254,   nil,   254,   234,   254,
+   nil,   254,   nil,   254,   nil,   nil,   254,   nil,   234,   nil,
+   234,   234,   nil,   234,   234,   nil,   234,   262,   234,   nil,
+   234,   nil,   234,   nil,   nil,   234,   nil,   262,   nil,   262,
+   262,   nil,   262,   262,   nil,   262,    29,   262,   nil,   262,
+   nil,   262,   nil,   nil,   262,   nil,    29,   nil,    29,    29,
+   nil,    29,    29,   nil,    29,   130,    29,   nil,    29,   nil,
+    29,   nil,   nil,    29,   nil,   130,   nil,   130,   130,   nil,
+   130,   130,   nil,   130,     0,   130,   nil,   130,   nil,   130,
+   nil,   nil,   130,   nil,     0,   nil,     0,     0,   nil,     0,
      0,   nil,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
    nil,     0 ]
 
 racc_action_pointer = [
-   636,   326,   nil,   nil,   nil,    99,   nil,   nil,   324,   nil,
-     6,   315,   nil,   nil,    89,   nil,   114,   nil,   138,    56,
-   nil,   158,   -15,   nil,   296,    90,   -14,   -24,   nil,   598,
-   nil,   nil,    71,   227,   nil,   220,   nil,     3,   nil,   nil,
-   nil,    -2,   nil,   nil,   314,   nil,   229,     4,   nil,   nil,
-   nil,   219,   nil,   nil,   214,    12,   nil,   nil,   199,   213,
-   171,   nil,   nil,   169,   161,   159,   149,   nil,   104,    65,
-   nil,   117,    69,    65,     6,   200,   nil,   226,   nil,   317,
-   277,    22,   263,   290,   nil,   nil,   291,   295,   265,    49,
-    98,   nil,   nil,   nil,   nil,   105,   251,   nil,   nil,   245,
-   243,    15,   222,   nil,     5,   nil,   157,   138,     6,   142,
-   nil,   138,   124,   nil,    82,    55,   nil,   nil,   nil,   nil,
-   242,    16,   332,    43,   330,   266,   144,   nil,   nil,   617,
-   230,   128,   128,   165,   nil,   -21,   151,   nil,    72,   -16,
-   nil,   nil,    -4,   nil,   nil,   nil,   nil,    52,   nil,   nil,
-   nil,   541,   181,   179,   149,   nil,   560,   nil,   184,   156,
-   188,   160,   nil,   nil,   183,   nil,   nil,   208,   209,   nil,
-   189,   nil,   nil,   241,   nil,   nil,   207,   nil,   nil,    47,
-   nil,   nil,   nil,   409,   308,   nil,    47,   nil,   nil,   335,
-   nil,   217,   222,   216,    56,   nil,   384,    29,    91,   nil,
-   nil,   nil,   290,   272,   nil,   nil,   428,   nil,   nil,   nil,
-   nil,   472,   nil,   nil,   nil,   267,   nil,   163,   nil,   205,
-   nil,   259,   nil,   nil,   286,   199,   nil,   223,   163,   nil,
-   nil,    81,   nil,   453,   nil,   nil,   nil,   281,   nil,   285,
-   293,   298,   299,   nil,   nil,   nil,   nil,   248,   317,   318,
-   nil,   nil,   323,   497,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   579,   nil,   516,   365,   nil,   nil ]
+   636,   331,   nil,   nil,   nil,    90,   nil,   nil,   336,   nil,
+    15,   323,   nil,   nil,    89,   nil,   114,   nil,   138,   117,
+   nil,   150,   -15,   nil,   301,    41,   -14,   -21,   nil,   598,
+   nil,   nil,    71,   248,   nil,   239,   nil,   nil,     3,   nil,
+   nil,   nil,    -2,   nil,   nil,   314,   nil,   236,     4,   nil,
+   nil,   nil,   229,   nil,   nil,   220,    12,   nil,   nil,   207,
+   219,   184,   nil,   nil,   174,   169,   166,   159,   nil,   136,
+    65,   nil,   139,    79,    69,    22,   208,   nil,   233,   nil,
+   322,   286,    22,   276,   296,   nil,   nil,   296,   300,   273,
+    49,    98,   nil,   nil,   nil,   nil,   105,   259,   nil,   nil,
+   253,   248,    58,   229,   nil,     6,   nil,   165,   143,     6,
+   157,   nil,   163,   151,   nil,   108,    37,   nil,   nil,   nil,
+   nil,   264,    22,   332,    28,   330,   266,   139,   nil,   nil,
+   617,   230,   158,   160,   158,   nil,   -21,   171,   nil,    72,
+   -16,   nil,   nil,    -4,   nil,   nil,   nil,   nil,    89,   nil,
+   nil,   nil,   516,   181,   184,   154,   nil,   472,   nil,   191,
+   156,   203,   173,   nil,   nil,   190,   nil,   nil,   213,   214,
+   nil,   197,   nil,   nil,   241,   nil,   nil,   215,   nil,   nil,
+    47,   nil,   nil,   nil,   409,   308,   nil,    47,   nil,   nil,
+   347,   nil,   234,   237,   230,    91,   nil,   384,    29,    91,
+   nil,   nil,   nil,   290,   272,   nil,   nil,   428,   nil,   nil,
+   nil,   nil,   453,   nil,   nil,   nil,   278,   nil,   159,   nil,
+   205,   nil,   267,   nil,   nil,   291,   199,   nil,   223,   163,
+   nil,   nil,    43,   nil,   560,   nil,   nil,   nil,   298,   nil,
+   299,   300,   303,   304,   nil,   nil,   nil,   nil,   248,   323,
+   331,   nil,   nil,   333,   541,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   579,   nil,   497,   365,   nil,   nil ]
 
 racc_action_default = [
-  -142,  -166,   -15,    -3,  -136,  -166,   -16,    -5,  -166,    -6,
-  -166,  -166,    -7,    -8,   -43,    -9,  -166,   -10,  -166,   -42,
-   -11,  -166,  -166,   -12,  -166,  -166,  -166,   -39,   -13,    -1,
-   -14,    -2,  -166,  -142,  -135,   -72,  -140,  -142,  -139,  -137,
-  -141,   -72,  -159,   -29,  -166,   -31,   -30,  -166,   -32,   -19,
-   -96,   -20,   -98,   -97,   -21,   -63,   -22,   -62,   -24,   -64,
-   -25,  -125,  -124,  -166,   -26,   -27,   -28,   -88,   -84,  -166,
-   -91,  -166,   -85,   -89,   -93,   -86,   -90,   -87,  -104,   -92,
-  -166,  -166,   -72,  -128,  -126,   -38,  -166,  -166,  -142,  -142,
-  -142,   -41,   -40,    -4,   -71,  -166,  -166,  -155,   -73,  -166,
-  -164,  -166,  -166,  -153,  -166,   -68,   -65,   -60,   -63,   -66,
-   -58,  -164,   -69,   -64,  -166,   -67,  -123,   -70,  -122,   -18,
-  -166,  -166,  -166,  -166,  -166,  -166,  -166,  -161,   -76,  -166,
-  -166,  -166,  -164,  -166,   267,  -143,  -166,  -144,  -142,  -166,
-   -47,   -49,  -166,   -63,   -56,   -55,   -46,  -166,  -157,  -158,
-  -156,  -166,  -166,  -166,  -165,  -154,  -166,  -138,  -166,   -61,
-  -166,   -72,   -17,   -99,   -63,   -23,   -33,  -166,  -166,   -95,
-  -166,  -120,  -118,  -166,  -121,  -119,  -166,  -112,  -113,  -166,
-  -160,  -162,  -163,  -166,  -166,  -106,  -166,  -110,  -100,  -166,
-  -127,  -152,  -150,  -166,  -166,  -147,  -166,  -166,  -166,   -52,
-   -51,   -45,  -166,  -166,   -44,  -132,  -166,   -75,   -37,   -74,
-  -134,  -166,   -34,   -59,   -35,  -164,   -94,  -164,  -115,  -166,
-   -77,  -102,  -107,  -105,  -166,  -166,   -36,  -166,  -166,  -145,
-  -146,  -166,  -130,  -166,   -50,   -48,   -82,   -78,   -53,   -79,
-   -83,   -80,   -81,   -54,  -131,  -133,   -57,  -166,  -166,  -163,
-  -117,  -101,  -166,  -166,  -111,  -151,  -149,  -148,  -129,  -116,
-  -114,  -166,  -109,  -166,  -166,  -108,  -103 ]
+  -143,  -167,   -15,    -3,  -136,  -167,   -16,    -5,  -167,    -6,
+  -167,  -167,    -7,    -8,   -43,    -9,  -167,   -10,  -167,   -42,
+   -11,  -167,  -167,   -12,  -167,  -167,  -167,   -39,   -13,    -1,
+   -14,    -2,  -167,  -143,  -135,   -72,  -141,  -140,  -143,  -139,
+  -137,  -142,   -72,  -160,   -29,  -167,   -31,   -30,  -167,   -32,
+   -19,   -96,   -20,   -98,   -97,   -21,   -63,   -22,   -62,   -24,
+   -64,   -25,  -125,  -124,  -167,   -26,   -27,   -28,   -88,   -84,
+  -167,   -91,  -167,   -85,   -89,   -93,   -86,   -90,   -87,  -104,
+   -92,  -167,  -167,   -72,  -128,  -126,   -38,  -167,  -167,  -143,
+  -143,  -143,   -41,   -40,    -4,   -71,  -167,  -167,  -156,   -73,
+  -167,  -165,  -167,  -167,  -154,  -167,   -68,   -65,   -60,   -63,
+   -66,   -58,  -165,   -69,   -64,  -167,   -67,  -123,   -70,  -122,
+   -18,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -162,   -76,
+  -167,  -167,  -167,  -165,  -167,   268,  -144,  -167,  -145,  -143,
+  -167,   -47,   -49,  -167,   -63,   -56,   -55,   -46,  -167,  -158,
+  -159,  -157,  -167,  -167,  -167,  -166,  -155,  -167,  -138,  -167,
+   -61,  -167,   -72,   -17,   -99,   -63,   -23,   -33,  -167,  -167,
+   -95,  -167,  -120,  -118,  -167,  -121,  -119,  -167,  -112,  -113,
+  -167,  -161,  -163,  -164,  -167,  -167,  -106,  -167,  -110,  -100,
+  -167,  -127,  -153,  -151,  -167,  -167,  -148,  -167,  -167,  -167,
+   -52,   -51,   -45,  -167,  -167,   -44,  -132,  -167,   -75,   -37,
+   -74,  -134,  -167,   -34,   -59,   -35,  -165,   -94,  -165,  -115,
+  -167,   -77,  -102,  -107,  -105,  -167,  -167,   -36,  -167,  -167,
+  -146,  -147,  -167,  -130,  -167,   -50,   -48,   -82,   -78,   -53,
+   -79,   -83,   -80,   -81,   -54,  -131,  -133,   -57,  -167,  -167,
+  -164,  -117,  -101,  -167,  -167,  -111,  -152,  -150,  -149,  -129,
+  -116,  -114,  -167,  -109,  -167,  -167,  -108,  -103 ]
 
 racc_goto_table = [
-    29,    93,   100,   110,    46,   178,   195,    39,   111,    43,
-   176,    84,   179,   117,    66,   187,    49,    33,   153,   185,
-    24,   139,   147,   238,   243,   209,   126,   235,    71,   160,
-    65,   106,   251,   184,    46,    91,   105,    88,   158,    43,
-   177,   118,   107,   217,    66,    83,   120,   136,    96,   132,
-   189,    37,   102,   218,    64,   165,    31,   116,   176,   193,
-    65,    60,   194,    85,   150,   nil,   nil,   nil,   nil,   187,
-   197,   nil,   nil,   222,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   115,   nil,   nil,    64,   nil,   nil,   nil,   112,    97,
-   nil,    60,   nil,   103,   nil,   nil,   nil,   nil,   155,   nil,
-   nil,   157,   257,   247,   nil,   nil,   nil,   148,   nil,   nil,
-   254,   nil,    46,   nil,    46,   171,   nil,    43,   nil,    43,
-   171,   213,    66,   190,    66,   118,   170,   259,   215,   183,
-   118,   117,   176,   246,   nil,   248,   145,   145,    65,   nil,
-    65,   116,   nil,   nil,   137,   nil,   116,   nil,   nil,   106,
-   nil,   206,   nil,   nil,   105,    93,   211,   nil,   nil,   118,
-   nil,   nil,    64,   171,    64,   175,   nil,   nil,   nil,    60,
-   175,    60,   174,   118,   171,   116,   nil,   174,    93,   nil,
-    58,   nil,   nil,    93,   118,   145,   nil,   nil,   nil,   116,
-   nil,   nil,   237,   237,   nil,   nil,   233,   236,   236,   115,
-   116,   nil,   118,   118,   nil,    93,   112,   109,   nil,   nil,
-    58,   nil,   nil,   175,   nil,   171,   nil,   nil,   242,   242,
-   174,   nil,   nil,   nil,   175,   118,   nil,   nil,   nil,   nil,
-   nil,   174,   nil,   nil,   nil,    93,    93,   171,   nil,   nil,
-   nil,   116,   241,   241,    48,   145,    70,   118,    70,   240,
-   240,   nil,    78,   263,    80,   144,   144,   nil,   nil,   nil,
-   nil,   264,    70,   116,   nil,   175,   nil,   nil,    94,    74,
-   nil,    74,   174,   nil,    48,   nil,   nil,    70,   nil,   nil,
-   nil,   nil,   nil,   121,   nil,    74,   nil,   175,    58,   nil,
-    58,   172,   nil,   nil,   174,   nil,   172,   nil,   nil,    70,
-    74,   nil,   nil,   nil,   144,   128,   nil,   nil,   nil,   nil,
-   nil,    70,   nil,   nil,   nil,   nil,   nil,   131,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   109,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,   nil,   172,
+    29,    94,   154,   196,    47,   101,    40,   179,   186,    44,
+   111,    85,   112,   161,    67,   118,    50,   180,    33,    24,
+   140,   148,   239,   244,   210,   127,   236,    72,   252,   185,
+    66,    92,   107,   159,   190,    47,   178,   106,    89,   108,
+    44,   218,   119,    84,   137,    67,   177,   121,    31,    97,
+    38,   188,   103,   133,    65,   219,   166,   194,   117,   195,
+    86,    66,   223,   151,   nil,   nil,   nil,   nil,    79,   198,
+    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    98,   116,   nil,    95,    65,   104,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   177,   nil,   nil,   nil,   156,   258,
+   122,   158,   nil,   nil,   nil,   188,   nil,   nil,   248,   149,
+   nil,   nil,   nil,    47,   nil,    47,   172,   247,    44,   249,
+    44,   172,   129,    67,   191,    67,   119,   171,   214,   260,
+   184,   119,   216,   118,   132,   nil,   nil,   138,   nil,    66,
+   nil,    66,   117,   nil,   nil,   nil,   255,   117,   nil,   nil,
+   107,   nil,   207,   nil,   nil,   106,    94,   212,    61,   nil,
+   119,   nil,   nil,    65,   172,    65,   176,   nil,   177,   nil,
+   nil,   176,   nil,   nil,   119,   172,   117,   nil,   nil,    94,
+   nil,   nil,    59,   nil,    94,   119,   113,   nil,   nil,    61,
+   117,   nil,   nil,   238,   238,   nil,   nil,   234,   237,   237,
+   116,   117,   nil,   119,   119,   208,    94,   nil,   nil,   nil,
+   110,   nil,   nil,    59,   176,   nil,   172,   nil,   nil,   243,
+   243,   nil,   nil,   nil,   nil,   176,   119,   nil,   nil,    49,
+   nil,    71,   221,    71,   146,   146,    94,    94,   172,   nil,
+   nil,   nil,   117,   242,   242,   nil,   nil,    71,   119,   nil,
+   nil,   nil,   nil,   nil,   264,   nil,   nil,   nil,   145,   145,
+    49,   nil,   265,    71,   117,   nil,   176,    61,   nil,    61,
+   175,   nil,   251,   nil,   nil,   175,   nil,   nil,   nil,   nil,
+   256,   257,   nil,   146,    75,    71,    75,   nil,   176,   nil,
+   nil,    59,   nil,    59,   173,   nil,   nil,    71,   nil,   173,
+    75,   nil,   nil,   nil,   113,   nil,   nil,   145,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    75,   nil,   175,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   110,   175,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,   167,
+    49,   nil,   173,   146,   nil,   nil,   nil,   241,   241,   nil,
+    75,   nil,   nil,   173,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   145,    71,   nil,
+   175,   240,   240,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   175,   nil,   173,    71,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   172,   nil,   nil,   166,    48,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   144,   nil,   nil,   nil,   239,   239,
+   nil,   nil,   nil,   nil,   nil,   nil,   173,   nil,   nil,   nil,
+   nil,    75,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    71,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    71,    71,   nil,   nil,   nil,    75,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    70,   nil,   nil,   nil,   nil,   nil,   207,   nil,
-   nil,   172,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,    70,
-   nil,   nil,   nil,   172,   nil,   220,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    70,
-   nil,   nil,   nil,   nil,   nil,   250,   nil,    70,    70,   nil,
-   nil,   nil,   nil,   255,   256,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    74,    74 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    75,    75 ]
 
 racc_goto_check = [
-     2,     4,    32,    43,    27,    58,    68,    65,    32,    26,
-    56,    27,    50,    46,    25,    56,    17,    29,    33,    54,
-     1,    37,    37,    42,    42,    48,    49,    38,    51,    33,
-    24,    27,    52,    53,    27,    36,    26,    29,    31,    26,
-    57,    25,    30,    59,    25,    60,    17,    61,    62,    32,
-    33,    63,    64,    58,    23,    20,     3,    24,    56,    66,
-    24,    22,    67,     5,    69,   nil,   nil,   nil,   nil,    56,
-    37,   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    23,   nil,   nil,    23,   nil,   nil,   nil,    22,     3,
-   nil,    22,   nil,     3,   nil,   nil,   nil,   nil,    65,   nil,
-   nil,    65,    68,    50,   nil,   nil,   nil,    29,   nil,   nil,
-    56,   nil,    27,   nil,    27,    27,   nil,    26,   nil,    26,
-    27,    43,    25,    27,    25,    25,    17,    58,    32,     2,
-    25,    46,    56,    33,   nil,    33,    22,    22,    24,   nil,
-    24,    24,   nil,   nil,     3,   nil,    24,   nil,   nil,    27,
-   nil,     2,   nil,   nil,    26,     4,     2,   nil,   nil,    25,
-   nil,   nil,    23,    27,    23,    23,   nil,   nil,   nil,    22,
-    23,    22,    22,    25,    27,    24,   nil,    22,     4,   nil,
-    21,   nil,   nil,     4,    25,    22,   nil,   nil,   nil,    24,
-   nil,   nil,    27,    27,   nil,   nil,     2,    26,    26,    23,
-    24,   nil,    25,    25,   nil,     4,    22,    21,   nil,   nil,
-    21,   nil,   nil,    23,   nil,    27,   nil,   nil,    24,    24,
-    22,   nil,   nil,   nil,    23,    25,   nil,   nil,   nil,   nil,
-   nil,    22,   nil,   nil,   nil,     4,     4,    27,   nil,   nil,
-   nil,    24,    23,    23,    28,    22,    28,    25,    28,    22,
-    22,   nil,    47,     2,    47,    21,    21,   nil,   nil,   nil,
-   nil,     2,    28,    24,   nil,    23,   nil,   nil,    47,    45,
-   nil,    45,    22,   nil,    28,   nil,   nil,    28,   nil,   nil,
-   nil,   nil,   nil,    47,   nil,    45,   nil,    23,    21,   nil,
-    21,    21,   nil,   nil,    22,   nil,    21,   nil,   nil,    28,
-    45,   nil,   nil,   nil,    21,    47,   nil,   nil,   nil,   nil,
-   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,   nil,    21,
+     2,     4,    33,    68,    27,    32,    65,    58,    54,    26,
+    43,    27,    32,    33,    25,    46,    17,    50,    29,     1,
+    37,    37,    42,    42,    48,    49,    38,    51,    52,    53,
+    24,    36,    27,    31,    33,    27,    57,    26,    29,    30,
+    26,    59,    25,    60,    61,    25,    56,    17,     3,    62,
+    63,    56,    64,    32,    23,    58,    20,    66,    24,    67,
+     5,    24,    54,    69,   nil,   nil,   nil,   nil,    47,    37,
+    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     3,    23,   nil,    47,    23,     3,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    56,   nil,   nil,   nil,    65,    68,
+    47,    65,   nil,   nil,   nil,    56,   nil,   nil,    50,    29,
+   nil,   nil,   nil,    27,   nil,    27,    27,    33,    26,    33,
+    26,    27,    47,    25,    27,    25,    25,    17,    43,    58,
+     2,    25,    32,    46,    47,   nil,   nil,     3,   nil,    24,
+   nil,    24,    24,   nil,   nil,   nil,    56,    24,   nil,   nil,
+    27,   nil,     2,   nil,   nil,    26,     4,     2,    22,   nil,
+    25,   nil,   nil,    23,    27,    23,    23,   nil,    56,   nil,
+   nil,    23,   nil,   nil,    25,    27,    24,   nil,   nil,     4,
+   nil,   nil,    21,   nil,     4,    25,    22,   nil,   nil,    22,
+    24,   nil,   nil,    27,    27,   nil,   nil,     2,    26,    26,
+    23,    24,   nil,    25,    25,    47,     4,   nil,   nil,   nil,
+    21,   nil,   nil,    21,    23,   nil,    27,   nil,   nil,    24,
+    24,   nil,   nil,   nil,   nil,    23,    25,   nil,   nil,    28,
+   nil,    28,    47,    28,    22,    22,     4,     4,    27,   nil,
+   nil,   nil,    24,    23,    23,   nil,   nil,    28,    25,   nil,
+   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,    21,    21,
+    28,   nil,     2,    28,    24,   nil,    23,    22,   nil,    22,
+    22,   nil,    47,   nil,   nil,    22,   nil,   nil,   nil,   nil,
+    47,    47,   nil,    22,    45,    28,    45,   nil,    23,   nil,
+   nil,    21,   nil,    21,    21,   nil,   nil,    28,   nil,    21,
+    45,   nil,   nil,   nil,    22,   nil,   nil,    21,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,    22,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,    22,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    45,    28,
+    28,   nil,    21,    22,   nil,   nil,   nil,    22,    22,   nil,
+    45,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    21,    28,   nil,
+    22,    21,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    21,    28,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,    21,    21,
+   nil,   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,
+   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    28,    28,   nil,   nil,   nil,    45,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,
-   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,    28,
-   nil,   nil,   nil,    21,   nil,    47,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,
-   nil,   nil,   nil,   nil,   nil,    47,   nil,    28,    28,   nil,
-   nil,   nil,   nil,    47,    47,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    45,    45 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    45,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    45,    45 ]
 
 racc_goto_pointer = [
-   nil,    20,     0,    56,   -28,    41,   nil,   nil,   nil,   nil,
+   nil,    19,     0,    48,   -28,    38,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
-   -67,   166,    47,    40,    16,     0,    -5,   -10,   230,    12,
-     1,   -69,   -33,   -82,   nil,   nil,     9,   -68,  -171,   nil,
-   nil,   nil,  -179,   -38,   nil,   253,   -28,   236,  -129,   -43,
-  -114,    12,  -189,   -97,  -111,   nil,  -115,   -85,  -120,  -130,
-    24,   -41,    15,    41,    15,    -3,   -76,   -73,  -129,   -31 ]
+   -67,   168,   144,    40,    16,     0,    -5,   -10,   215,    13,
+    -3,   -75,   -30,   -99,   nil,   nil,     5,   -70,  -173,   nil,
+   nil,   nil,  -181,   -32,   nil,   268,   -27,    52,  -131,   -45,
+  -110,    11,  -194,  -102,  -123,   nil,   -80,   -90,  -119,  -133,
+    22,   -45,    16,    40,    14,    -4,   -79,   -77,  -133,   -33 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   146,     3,     7,     9,    12,    13,    15,
-    17,    20,    23,    28,    30,     2,     6,   nil,    51,    54,
-    56,    72,    73,    75,    77,    79,    67,    68,     8,    11,
-   nil,   nil,   nil,   nil,    22,    26,   nil,   nil,   140,   198,
-   141,   142,   nil,   nil,   114,    62,    76,   nil,    98,   nil,
-   nil,   nil,   nil,   nil,   nil,   186,    63,   nil,   nil,   nil,
+   nil,   nil,   nil,   147,     3,     7,     9,    12,    13,    15,
+    17,    20,    23,    28,    30,     2,     6,   nil,    52,    55,
+    57,    73,    74,    76,    78,    80,    68,    69,     8,    11,
+   nil,   nil,   nil,   nil,    22,    26,   nil,   nil,   141,   199,
+   142,   143,   nil,   nil,   115,    63,    77,   nil,    99,   nil,
+   nil,   nil,   nil,   nil,   nil,   187,    64,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
@@ -1742,41 +1745,43 @@ module_eval <<'.,.,', 'grammar.ra', 521
 
  # reduce 141 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 529
-  def _reduce_142( val, _values, result )
+ # reduce 142 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 530
+  def _reduce_143( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 533
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 534
+  def _reduce_144( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 144 omitted
+ # reduce 145 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 538
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 539
+  def _reduce_146( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 542
-  def _reduce_146( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 543
+  def _reduce_147( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 147 omitted
+ # reduce 148 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 549
-  def _reduce_148( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 550
+  def _reduce_149( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1784,67 +1789,67 @@ module_eval <<'.,.,', 'grammar.ra', 549
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 554
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 555
+  def _reduce_150( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 558
-  def _reduce_150( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 559
+  def _reduce_151( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 560
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 561
+  def _reduce_152( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 562
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 563
+  def _reduce_153( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 153 omitted
+ # reduce 154 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 567
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 568
+  def _reduce_155( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 155 omitted
+ # reduce 156 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 572
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 573
+  def _reduce_157( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 157 omitted
-
  # reduce 158 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_159( val, _values, result )
+ # reduce 159 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 579
+  def _reduce_160( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 586
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 587
+  def _reduce_161( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1854,21 +1859,21 @@ module_eval <<'.,.,', 'grammar.ra', 586
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 588
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 589
+  def _reduce_162( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 162 omitted
-
  # reduce 163 omitted
 
  # reduce 164 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 593
-  def _reduce_165( val, _values, result )
+ # reduce 165 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 594
+  def _reduce_166( val, _values, result )
  result = nil
    result
   end