Fixing #524. Functions, both statements and rvalues, now support no arguments as long as you use parens.

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

2 files changed, 510 insertions, 475 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 5877439ec..9ecae8869 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -69,6 +69,12 @@ fstatement:   NAME LPAREN funcvalues RPAREN {
         :arguments => args,
         :ftype => :statement
 }
+            | NAME LPAREN RPAREN {
+    result = ast AST::Function,
+        :name => val[0],
+        :arguments => AST::ASTArray.new({}),
+        :ftype => :statement
+}
             | NAME funcvalues {
     args = aryfy(val[1])
     result = ast AST::Function,
@@ -327,6 +333,11 @@ funcrvalue:   NAME LPAREN namestrings RPAREN {
         :name => val[0],
         :arguments => args,
         :ftype => :rvalue
+}           | NAME LPAREN RPAREN {
+    result = ast AST::Function,
+        :name => val[0],
+        :arguments => AST::ASTArray.new({}),
+        :ftype => :rvalue
 }
 
 quotedtext: DQTEXT {
diff --git a/lib/puppet/parser/parser.rb b/lib/puppet/parser/parser.rb
index 94d4f7fad..8004b5604 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..id05c09a2dac', 'grammar.ra', 633
+module_eval <<'..end grammar.ra modeval..id10042e1e81', 'grammar.ra', 644
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -101,7 +101,7 @@ def file=(file)
     if @files.detect { |f| f.file == file }
         raise Puppet::ImportError.new("Import loop detected")
     else
-        @files << Puppet::Util::LoadedFile.new(file)
+        @files << Puppet::LoadedFile.new(file)
         @lexer.file = file
     end
 end
@@ -199,7 +199,7 @@ end
 
 # $Id$
 
-..end grammar.ra modeval..id05c09a2dac
+..end grammar.ra modeval..id10042e1e81
 
 ##### racc 1.4.5 generates ###
 
@@ -222,60 +222,61 @@ racc_reduce_table = [
  1, 54, :_reduce_none,
  1, 54, :_reduce_none,
  4, 62, :_reduce_17,
- 2, 62, :_reduce_18,
+ 3, 62, :_reduce_18,
+ 2, 62, :_reduce_19,
  1, 67, :_reduce_none,
  1, 67, :_reduce_none,
  1, 68, :_reduce_none,
- 3, 68, :_reduce_22,
+ 3, 68, :_reduce_23,
  1, 70, :_reduce_none,
  1, 70, :_reduce_none,
  1, 70, :_reduce_none,
- 1, 70, :_reduce_26,
+ 1, 70, :_reduce_27,
  1, 69, :_reduce_none,
- 3, 69, :_reduce_28,
- 5, 55, :_reduce_29,
+ 3, 69, :_reduce_29,
  5, 55, :_reduce_30,
  5, 55, :_reduce_31,
- 5, 66, :_reduce_32,
- 2, 56, :_reduce_33,
- 1, 80, :_reduce_34,
- 2, 80, :_reduce_35,
- 2, 57, :_reduce_36,
+ 5, 55, :_reduce_32,
+ 5, 66, :_reduce_33,
+ 2, 56, :_reduce_34,
+ 1, 80, :_reduce_35,
+ 2, 80, :_reduce_36,
+ 2, 57, :_reduce_37,
  1, 81, :_reduce_none,
  1, 81, :_reduce_none,
- 3, 82, :_reduce_39,
  3, 82, :_reduce_40,
+ 3, 82, :_reduce_41,
  1, 83, :_reduce_none,
  1, 83, :_reduce_none,
- 3, 83, :_reduce_43,
+ 3, 83, :_reduce_44,
  1, 84, :_reduce_none,
- 3, 84, :_reduce_45,
+ 3, 84, :_reduce_46,
  1, 85, :_reduce_none,
  1, 85, :_reduce_none,
- 3, 86, :_reduce_48,
  3, 86, :_reduce_49,
+ 3, 86, :_reduce_50,
  1, 87, :_reduce_none,
  1, 87, :_reduce_none,
- 4, 89, :_reduce_52,
+ 4, 89, :_reduce_53,
  1, 76, :_reduce_none,
- 3, 76, :_reduce_54,
+ 3, 76, :_reduce_55,
  0, 77, :_reduce_none,
  1, 77, :_reduce_none,
- 1, 71, :_reduce_57,
- 1, 91, :_reduce_58,
+ 1, 71, :_reduce_58,
+ 1, 91, :_reduce_59,
  1, 90, :_reduce_none,
  1, 90, :_reduce_none,
  1, 90, :_reduce_none,
  1, 90, :_reduce_none,
  1, 90, :_reduce_none,
  1, 90, :_reduce_none,
- 3, 58, :_reduce_65,
- 0, 78, :_reduce_66,
- 1, 78, :_reduce_67,
- 3, 78, :_reduce_68,
- 3, 95, :_reduce_69,
+ 3, 58, :_reduce_66,
+ 0, 78, :_reduce_67,
+ 1, 78, :_reduce_68,
+ 3, 78, :_reduce_69,
+ 3, 95, :_reduce_70,
  1, 96, :_reduce_none,
- 3, 96, :_reduce_71,
+ 3, 96, :_reduce_72,
  1, 88, :_reduce_none,
  1, 88, :_reduce_none,
  1, 88, :_reduce_none,
@@ -291,133 +292,134 @@ racc_reduce_table = [
  1, 94, :_reduce_none,
  1, 94, :_reduce_none,
  1, 94, :_reduce_none,
- 4, 99, :_reduce_87,
- 1, 73, :_reduce_88,
- 1, 73, :_reduce_89,
- 1, 98, :_reduce_90,
- 4, 74, :_reduce_91,
- 4, 74, :_reduce_92,
- 6, 60, :_reduce_93,
+ 4, 99, :_reduce_88,
+ 3, 99, :_reduce_89,
+ 1, 73, :_reduce_90,
+ 1, 73, :_reduce_91,
+ 1, 98, :_reduce_92,
+ 4, 74, :_reduce_93,
+ 4, 74, :_reduce_94,
+ 6, 60, :_reduce_95,
  0, 101, :_reduce_none,
- 4, 101, :_reduce_95,
+ 4, 101, :_reduce_97,
  1, 100, :_reduce_none,
- 5, 59, :_reduce_97,
+ 5, 59, :_reduce_99,
  1, 102, :_reduce_none,
- 2, 102, :_reduce_99,
- 5, 103, :_reduce_100,
- 4, 103, :_reduce_101,
+ 2, 102, :_reduce_101,
+ 5, 103, :_reduce_102,
+ 4, 103, :_reduce_103,
  1, 104, :_reduce_none,
- 3, 104, :_reduce_103,
- 3, 92, :_reduce_104,
+ 3, 104, :_reduce_105,
+ 3, 92, :_reduce_106,
  1, 106, :_reduce_none,
- 3, 106, :_reduce_106,
+ 3, 106, :_reduce_108,
  1, 108, :_reduce_none,
- 3, 108, :_reduce_108,
- 3, 107, :_reduce_109,
+ 3, 108, :_reduce_110,
+ 3, 107, :_reduce_111,
  1, 105, :_reduce_none,
  1, 105, :_reduce_none,
  1, 105, :_reduce_none,
  1, 105, :_reduce_none,
  1, 105, :_reduce_none,
  1, 105, :_reduce_none,
- 1, 105, :_reduce_116,
- 2, 61, :_reduce_117,
- 6, 63, :_reduce_118,
- 5, 63, :_reduce_119,
- 6, 64, :_reduce_120,
- 5, 64, :_reduce_121,
- 6, 65, :_reduce_122,
- 5, 65, :_reduce_123,
+ 1, 105, :_reduce_118,
+ 2, 61, :_reduce_119,
+ 6, 63, :_reduce_120,
+ 5, 63, :_reduce_121,
+ 6, 64, :_reduce_122,
+ 5, 64, :_reduce_123,
+ 6, 65, :_reduce_124,
+ 5, 65, :_reduce_125,
  1, 75, :_reduce_none,
  1, 75, :_reduce_none,
  1, 111, :_reduce_none,
- 3, 111, :_reduce_127,
+ 3, 111, :_reduce_129,
  1, 113, :_reduce_none,
  1, 113, :_reduce_none,
  1, 113, :_reduce_none,
- 0, 53, :_reduce_131,
- 0, 114, :_reduce_132,
+ 0, 53, :_reduce_133,
+ 0, 114, :_reduce_134,
  1, 109, :_reduce_none,
- 3, 109, :_reduce_134,
- 3, 109, :_reduce_135,
+ 3, 109, :_reduce_136,
+ 3, 109, :_reduce_137,
  1, 115, :_reduce_none,
- 3, 115, :_reduce_137,
- 3, 116, :_reduce_138,
- 1, 116, :_reduce_139,
+ 3, 115, :_reduce_139,
  3, 116, :_reduce_140,
  1, 116, :_reduce_141,
+ 3, 116, :_reduce_142,
+ 1, 116, :_reduce_143,
  1, 112, :_reduce_none,
- 2, 112, :_reduce_143,
+ 2, 112, :_reduce_145,
  1, 110, :_reduce_none,
- 2, 110, :_reduce_145,
+ 2, 110, :_reduce_147,
  1, 117, :_reduce_none,
  1, 117, :_reduce_none,
  1, 118, :_reduce_none,
  1, 118, :_reduce_none,
- 1, 72, :_reduce_150,
- 3, 93, :_reduce_151,
- 2, 93, :_reduce_152,
+ 1, 72, :_reduce_152,
+ 3, 93, :_reduce_153,
+ 2, 93, :_reduce_154,
  1, 97, :_reduce_none,
  1, 97, :_reduce_none,
  0, 79, :_reduce_none,
- 1, 79, :_reduce_156 ]
+ 1, 79, :_reduce_158 ]
 
-racc_reduce_n = 157
+racc_reduce_n = 159
 
-racc_shift_n = 256
+racc_shift_n = 258
 
 racc_action_table = [
-    49,    51,    53,    41,  -124,    51,    53,    51,    53,    51,
-    53,   184,    49,    95,    58,   228,    58,    63,    51,    53,
-    46,    43,    58,    33,   114,    79,   153,    90,   227,    80,
-     4,    45,   114,    74,   160,    45,    55,    45,    92,    45,
-    97,   186,    55,    47,    97,    44,   188,    47,    45,    47,
-    37,    47,    65,    69,   150,   151,    75,    63,    51,    53,
-    33,   108,   184,    63,    51,    53,   111,     4,   191,    63,
-    51,    53,   183,    74,   212,    63,    51,    53,   193,    74,
-   155,    63,    51,    53,    38,    74,  -111,    39,    45,   154,
-   186,    74,    65,    69,    45,   188,    75,    74,    65,    69,
-    45,  -110,    75,   183,    65,    69,    45,  -113,    75,  -112,
-    65,    69,    45,   195,    75,    96,    65,    69,    51,    53,
-    75,    63,    51,    53,  -110,   200,    45,    63,    51,    53,
-  -111,    97,   181,    63,    51,    53,   115,    74,   110,    63,
-    51,    53,  -114,    74,    49,    63,    51,    53,    79,    74,
-   150,   151,    45,    49,  -113,    74,    65,    69,    45,   114,
-    75,   137,    65,    69,    45,   213,    75,   109,    65,    69,
-    45,   108,    75,  -112,    65,    69,    45,   220,    75,   236,
-    65,   170,   219,   119,    75,    63,    51,    53,    33,   218,
-    18,    63,    51,    53,    79,     4,   158,    37,    51,    53,
-    15,    74,    21,    25,   224,     1,     5,   137,     8,   225,
-    13,   226,    17,   137,    26,   157,    45,     4,   235,    80,
-    65,    69,    45,   231,    75,   119,    65,   134,    45,    18,
-    75,    38,    65,   170,    39,   144,    75,   229,   146,    15,
-   233,    21,    25,    96,     1,     5,  -115,     8,    18,    13,
-   183,    17,    87,    26,    45,  -111,     4,  -110,    15,    97,
-    21,    25,   255,     1,     5,  -113,     8,  -112,    13,  -115,
-    17,    96,    26,    18,   156,     4,   238,    33,   150,   151,
-   141,   247,    45,    15,     4,    21,    25,    97,     1,     5,
-    96,     8,    18,    13,    86,    17,   116,    26,    51,    53,
-     4,    45,    15,   242,    21,    25,    97,     1,     5,   147,
-     8,    83,    13,   137,    17,   121,    26,   140,   251,     4,
-    51,    53,   163,    81,   217,   183,   164,   166,    45,    18,
-   249,   119,    65,   170,   123,   137,    75,    51,    53,    15,
-   119,    21,    25,    32,     1,     5,   223,     8,   nil,    13,
-    45,    17,   137,    26,    65,   170,     4,   254,    75,   240,
-   nil,   164,   166,   nil,   nil,   nil,   nil,    45,    18,   nil,
-   nil,    65,   170,   nil,   nil,    75,   210,   nil,    15,   nil,
+    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,
+     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,
+    33,   109,   186,    63,    51,    53,   112,     4,    79,    63,
+    51,    53,    80,    74,   214,    63,    51,    53,   193,    74,
+   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,
+    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,
+    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,
+   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,
-    25,   nil,     1,     5,   nil,     8,   nil,    13,   137,    17,
+    25,   nil,     1,     5,   nil,     8,   nil,    13,   138,    17,
    nil,    26,   nil,   nil,     4,    51,    53,    51,    53,   nil,
-   173,   nil,   nil,    45,   nil,   nil,   nil,    65,   170,   nil,
-   137,    75,   137,   198,   nil,   nil,   nil,   nil,   nil,   nil,
+   175,   nil,   nil,    45,   nil,   nil,   nil,    65,   172,   nil,
+   138,    75,   138,   200,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    18,    45,   nil,    45,   nil,    65,
-   170,    65,   170,    75,    15,    75,    21,    25,   196,     1,
+   172,    65,   172,    75,    15,    75,    21,    25,   198,     1,
      5,   nil,     8,   nil,    13,   nil,    17,   nil,    26,    18,
    nil,     4,   nil,    51,    53,   nil,   nil,   nil,   nil,    15,
-   nil,    21,    25,   nil,     1,     5,   nil,     8,   137,    13,
+   nil,    21,    25,   nil,     1,     5,   nil,     8,   138,    13,
    nil,    17,   nil,    26,   nil,   nil,     4,   nil,   nil,   nil,
-    18,   nil,   nil,    45,   nil,   nil,   nil,    65,   170,   nil,
+    18,   nil,   nil,    45,   nil,   nil,   nil,    65,   172,   nil,
     15,    75,    21,    25,   nil,     1,     5,   nil,     8,    18,
     13,   nil,    17,   nil,    26,   nil,   nil,     4,   nil,    15,
    nil,    21,    25,   nil,     1,     5,   nil,     8,    18,    13,
@@ -428,206 +430,208 @@ racc_action_table = [
    nil,    26,   nil,   nil,     4 ]
 
 racc_action_check = [
-    13,    13,    13,     9,    13,   114,   114,    46,    46,   108,
-   108,   134,    69,    35,   109,   189,    13,    17,    17,    17,
-    13,    11,    46,     9,   134,    18,   100,    34,   189,    18,
-     9,    13,    69,    17,   109,   114,    13,    46,    35,   108,
-   114,   228,    46,    13,   108,    11,   228,   114,    17,    46,
-     8,   108,    17,    17,   100,   100,    17,    49,    49,    49,
-    25,   167,   119,    63,    63,    63,    63,    25,   125,    15,
-    15,    15,   128,    49,   167,   165,   165,   165,   129,    63,
-   104,    79,    79,    79,     8,    15,   130,     8,    49,   104,
-   123,   165,    49,    49,    63,   123,    49,    79,    63,    63,
-    15,   133,    63,   118,    15,    15,   165,   135,    15,   136,
-   165,   165,    79,   139,   165,    43,    79,    79,    21,    21,
-    79,   184,   184,   184,    68,   149,    43,   226,   226,   226,
-    64,    43,   117,   224,   224,   224,    70,   184,    62,    32,
-    32,    32,    61,   226,   160,   195,   195,   195,    58,   224,
-   149,   149,   184,    55,    72,    32,   184,   184,   226,   170,
-   184,   195,   226,   226,   224,   172,   226,    52,   224,   224,
-    32,    50,   224,    73,    32,    32,   195,   182,    32,   199,
-   195,   195,   179,   183,   195,   213,   213,   213,     5,   179,
-   199,    87,    87,    87,    74,     5,   107,    95,   219,   219,
-   199,   213,   199,   199,   186,   199,   199,    87,   199,   187,
-   199,   188,   199,   219,   199,   106,   213,   199,   197,    41,
-   213,   213,    87,   192,   213,   193,    87,    87,   219,   197,
-    87,    95,   219,   219,    95,    92,   219,   191,    92,   197,
-   194,   197,   197,   152,   197,   197,    77,   197,   191,   197,
-   122,   197,    27,   197,   152,   203,   197,   205,   191,   152,
-   191,   191,   253,   191,   191,   206,   191,   207,   191,   208,
-   191,    96,   191,   253,   105,   191,   210,    90,   105,   105,
-    90,   230,    96,   253,    90,   253,   253,    96,   253,   253,
-    44,   253,   230,   253,    26,   253,    78,   253,   241,   241,
-   253,    44,   230,   218,   230,   230,    44,   230,   230,    93,
-   230,    22,   230,   241,   230,    81,   230,    89,   242,   230,
-   177,   177,   113,    20,   177,   232,   113,   113,   241,   242,
-   238,    80,   241,   241,    85,   177,   241,   173,   173,   242,
-    83,   242,   242,     1,   242,   242,   185,   242,   nil,   242,
-   177,   242,   173,   242,   177,   177,   242,   252,   177,   215,
-   nil,   215,   215,   nil,   nil,   nil,   nil,   173,   252,   nil,
-   nil,   173,   173,   nil,   nil,   173,   162,   nil,   252,   nil,
-   252,   252,   nil,   252,   252,   nil,   252,   162,   252,   nil,
-   252,   nil,   252,   116,   116,   252,   nil,   162,   nil,   162,
-   162,   nil,   162,   162,   nil,   162,   nil,   162,   116,   162,
-   nil,   162,   nil,   nil,   162,   154,   154,   115,   115,   nil,
-   115,   nil,   nil,   116,   nil,   nil,   nil,   116,   116,   nil,
-   154,   116,   115,   147,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   147,   154,   nil,   115,   nil,   154,
-   154,   115,   115,   154,   147,   115,   147,   147,   140,   147,
-   147,   nil,   147,   nil,   147,   nil,   147,   nil,   147,   140,
-   nil,   147,   nil,   155,   155,   nil,   nil,   nil,   nil,   140,
-   nil,   140,   140,   nil,   140,   140,   nil,   140,   155,   140,
-   nil,   140,   nil,   140,   nil,   nil,   140,   nil,   nil,   nil,
-   110,   nil,   nil,   155,   nil,   nil,   nil,   155,   155,   nil,
-   110,   155,   110,   110,   nil,   110,   110,   nil,   110,   249,
-   110,   nil,   110,   nil,   110,   nil,   nil,   110,   nil,   249,
-   nil,   249,   249,   nil,   249,   249,   nil,   249,    24,   249,
-   nil,   249,   nil,   249,   nil,   nil,   249,   nil,    24,   nil,
+    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,
+     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,
+    25,   169,   120,    63,    63,    63,    63,    25,    18,    15,
+    15,    15,    18,    49,   169,   166,   166,   166,   126,    63,
+   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,
+    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,
+    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,
+   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,
+   155,   117,   116,   148,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   148,   155,   nil,   116,   nil,   155,
+   155,   116,   116,   155,   148,   116,   148,   148,   141,   148,
+   148,   nil,   148,   nil,   148,   nil,   148,   nil,   148,   141,
+   nil,   148,   nil,   156,   156,   nil,   nil,   nil,   nil,   141,
+   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,
     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,   330,   nil,   nil,   nil,   150,   nil,   nil,    46,   -15,
-   nil,     2,   nil,    -2,   nil,    67,   nil,    15,    23,   nil,
-   323,   115,   305,   nil,   520,    22,   252,   246,   nil,   nil,
-   nil,   nil,   137,   nil,    -8,     3,   nil,   nil,   nil,   nil,
-   nil,   213,   nil,    93,   268,   nil,     4,   nil,   nil,    55,
-   161,   nil,   157,   nil,   nil,   151,   nil,   nil,   146,   nil,
-   nil,   121,   132,    61,   109,   nil,   nil,   nil,   103,    10,
-   115,   nil,   133,   152,   192,   nil,   nil,   225,   290,    79,
-   293,   315,   nil,   302,   nil,   312,   nil,   189,   nil,   311,
-   239,   nil,   197,   303,   nil,   193,   249,   nil,   nil,   nil,
-     6,   nil,   nil,   nil,    65,   230,   192,   191,     6,    -4,
-   482,   nil,   nil,   317,     2,   414,   390,   127,    93,    53,
-   nil,   nil,   240,    57,   nil,    62,   nil,   nil,    62,    61,
-    65,   nil,   nil,    80,     2,    86,    88,   nil,   nil,    74,
-   451,   nil,   nil,   nil,   nil,   nil,   nil,   426,   nil,   102,
-   nil,   nil,   221,   nil,   412,   470,   nil,   nil,   nil,   nil,
-   142,   nil,   369,   nil,   nil,    73,   nil,    51,   nil,   nil,
-   137,   nil,   156,   334,   nil,   nil,   nil,   317,   nil,   172,
-   nil,   nil,   170,   145,   119,   339,   191,   186,   198,     5,
-   nil,   230,   216,   187,   233,   143,   nil,   211,   nil,   172,
-   nil,   nil,   nil,   234,   nil,   236,   244,   246,   248,   nil,
-   247,   nil,   nil,   183,   nil,   352,   nil,   nil,   297,   195,
-   nil,   nil,   nil,   nil,   131,   nil,   125,   nil,     8,   nil,
-   274,   nil,   315,   nil,   nil,   nil,   nil,   nil,   324,   nil,
-   nil,   295,   311,   nil,   nil,   nil,   nil,   nil,   nil,   501,
-   nil,   nil,   350,   255,   nil,   nil ]
+   539,   335,   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,
+   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,
+    -4,   482,   nil,   nil,   317,     2,   414,   390,   133,    99,
+    53,   nil,   nil,   245,    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 ]
 
 racc_action_default = [
-  -131,  -157,   -16,    -5,  -125,  -157,    -6,    -7,  -157,  -157,
-    -8,  -157,    -9,   -38,   -10,  -157,   -11,  -157,   -37,   -12,
-  -157,  -157,  -157,   -13,    -1,  -157,   -34,  -157,   -14,    -2,
-   -15,    -3,  -157,  -124,  -131,  -131,  -126,  -129,  -128,  -130,
-   -33,  -157,   -36,  -131,  -131,  -150,  -157,   -26,   -18,  -157,
-   -19,   -88,   -20,   -89,   -21,   -57,   -23,   -24,  -157,   -25,
-   -27,   -86,  -157,  -157,   -80,   -90,   -82,   -84,   -79,   -57,
-  -157,   -96,   -83,   -78,   -58,  -116,   -85,   -81,  -157,  -157,
-   -66,  -157,  -117,   -66,    -4,  -131,   -35,   -66,   -65,  -157,
-  -157,  -144,  -157,  -157,  -142,  -157,  -131,   -57,   -51,   -50,
-  -157,   -42,   -44,   -41,  -157,  -157,  -157,  -157,  -157,  -157,
-  -157,  -152,   -70,  -157,  -157,  -157,  -157,  -157,  -155,  -157,
-   -67,   256,  -155,  -132,  -133,  -157,  -114,   -53,  -155,  -157,
-   -61,   -62,   -64,   -60,   -57,   -63,   -59,   -58,  -115,   -55,
-  -157,  -149,  -145,  -148,  -146,  -143,  -147,  -157,  -127,  -157,
-   -47,   -46,  -157,   -40,  -157,  -157,   -39,   -17,   -91,   -22,
-  -157,   -28,  -157,  -151,  -153,  -157,  -154,  -157,  -111,  -110,
-   -57,  -113,  -157,  -157,  -112,  -104,  -105,  -157,   -98,  -157,
-  -102,   -92,  -157,  -156,  -157,  -157,  -141,  -157,  -139,  -157,
-  -136,  -157,  -157,   -66,  -157,   -56,  -121,  -157,  -123,  -157,
-   -45,   -43,   -48,   -74,   -76,   -73,   -77,   -72,   -75,   -49,
-   -94,   -71,   -87,  -157,  -107,  -157,   -99,   -97,  -157,  -157,
-   -31,   -68,   -69,   -32,  -157,  -134,  -157,  -135,  -157,  -119,
-  -157,   -30,  -155,   -29,   -54,  -120,  -122,   -93,  -157,  -109,
-  -106,  -157,  -157,  -103,  -140,  -138,  -137,  -118,   -52,  -157,
-  -108,  -101,  -157,  -157,  -100,   -95 ]
+  -133,  -159,   -16,    -5,  -127,  -159,    -6,    -7,  -159,  -159,
+    -8,  -159,    -9,   -39,   -10,  -159,   -11,  -159,   -38,   -12,
+  -159,  -159,  -159,   -13,    -1,  -159,   -35,  -159,   -14,    -2,
+   -15,    -3,  -159,  -126,  -133,  -133,  -128,  -131,  -130,  -132,
+   -34,  -159,   -37,  -133,  -133,  -152,  -159,   -27,   -19,  -159,
+   -20,   -90,   -21,   -91,   -22,   -58,   -24,   -25,  -159,   -26,
+   -28,   -87,  -159,  -159,   -81,   -92,   -83,   -85,   -80,   -58,
+  -159,   -98,   -84,   -79,   -59,  -118,   -86,   -82,  -159,  -159,
+   -67,  -159,  -119,   -67,    -4,  -133,   -36,   -67,   -66,  -159,
+  -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,   -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,
+   -23,  -159,   -29,  -159,  -153,  -155,  -159,  -156,   -89,  -159,
+  -113,  -112,   -58,  -115,  -159,  -159,  -114,  -106,  -107,  -159,
+  -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,
+  -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 ]
 
 racc_goto_table = [
-    24,    84,   176,    59,    60,   165,    76,   190,    76,   118,
-   127,    82,   122,    57,    34,   182,   128,   132,    56,   185,
-   178,    20,    36,    76,    48,   192,   131,   202,   209,   100,
-   105,   113,    29,   221,    85,   201,    59,    60,    42,    62,
-    76,   237,   177,    99,    99,   194,    57,   139,    98,    98,
-   175,    56,   159,   215,    76,   125,   126,   106,    89,    35,
-   214,    93,   167,    71,   187,    78,    91,    94,   172,   180,
-    76,   189,    40,   145,   142,   nil,   nil,   136,   nil,   nil,
-    88,   216,   149,   nil,   126,   126,   nil,   135,   nil,   nil,
-   nil,   nil,   133,   204,   204,   nil,    99,   107,    59,   143,
-   161,    98,   nil,   138,    59,   174,   174,   241,    57,   148,
-   162,   112,   246,    56,    57,   171,   171,   124,   234,    56,
-   169,   169,   232,   126,   126,   132,   172,   117,   250,   248,
-   180,   138,   138,   nil,   131,   nil,   nil,   nil,   nil,    84,
-   197,   nil,   126,   nil,   207,   207,   126,   199,   nil,   nil,
-   nil,   nil,    99,   nil,   206,   206,    76,    98,   130,   205,
-   205,   nil,   nil,   174,   126,   nil,   nil,   174,   nil,   nil,
-   208,   208,   243,   171,    84,    76,    84,   171,   169,   nil,
-   nil,   nil,   169,   nil,   nil,   136,   168,   168,   126,   138,
-   nil,   230,   nil,   138,   172,   135,   nil,   nil,   nil,   nil,
-   133,   nil,   nil,   nil,    76,   nil,   nil,    84,   nil,   174,
-   126,   138,   nil,   211,   nil,    76,   nil,    76,   nil,   171,
-   nil,   nil,   nil,   nil,   169,   203,   203,   nil,   nil,    84,
-    84,   174,   222,   nil,   nil,   138,   nil,   nil,   nil,   nil,
-   nil,   171,   252,   nil,   168,   nil,   169,   nil,   168,   253,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   138,   nil,   nil,
-   nil,   239,   nil,   nil,   nil,   nil,   130,   nil,   nil,   nil,
-   nil,   nil,   244,   nil,   245,   nil,   nil,   nil,   nil,   nil,
+    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,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   168,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   170,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   168 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   170 ]
 
 racc_goto_check = [
-     2,     4,    57,    23,    24,    47,    24,    66,    24,    28,
-    39,    23,    28,    22,    25,    29,    28,    43,    21,    29,
-    53,     1,    63,    24,    17,    29,    42,    38,    38,    33,
-    33,    46,     3,    45,    25,    34,    23,    24,    32,    50,
-    24,    51,    52,    22,    22,    27,    22,    26,    21,    21,
-    56,    21,    20,    58,    24,    59,    49,    17,    60,    61,
-    57,    62,    18,    44,    64,    44,     3,     3,    55,    55,
-    24,    65,     5,    67,    68,   nil,   nil,    23,   nil,   nil,
-    44,    53,    33,   nil,    49,    49,   nil,    22,   nil,   nil,
-   nil,   nil,    21,    42,    42,   nil,    22,    44,    23,    25,
-    24,    21,   nil,    48,    23,    23,    23,    47,    22,    63,
-     2,    44,    66,    21,    22,    22,    22,     3,    39,    21,
-    21,    21,    28,    49,    49,    43,    55,    44,    57,    29,
-    55,    48,    48,   nil,    42,   nil,   nil,   nil,   nil,     4,
-     2,   nil,    49,   nil,    23,    23,    49,     2,   nil,   nil,
-   nil,   nil,    22,   nil,    22,    22,    24,    21,    41,    21,
-    21,   nil,   nil,    23,    49,   nil,   nil,    23,   nil,   nil,
-    48,    48,    55,    22,     4,    24,     4,    22,    21,   nil,
-   nil,   nil,    21,   nil,   nil,    23,    41,    41,    49,    48,
-   nil,     2,   nil,    48,    55,    22,   nil,   nil,   nil,   nil,
-    21,   nil,   nil,   nil,    24,   nil,   nil,     4,   nil,    23,
-    49,    48,   nil,    44,   nil,    24,   nil,    24,   nil,    22,
-   nil,   nil,   nil,   nil,    21,    41,    41,   nil,   nil,     4,
-     4,    23,    44,   nil,   nil,    48,   nil,   nil,   nil,   nil,
-   nil,    22,     2,   nil,    41,   nil,    21,   nil,    41,     2,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,
-   nil,    44,   nil,   nil,   nil,   nil,    41,   nil,   nil,   nil,
-   nil,   nil,    44,   nil,    44,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     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,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    41 ]
+   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,    41 ]
 
 racc_goto_pointer = [
-   nil,    21,     0,    32,   -23,    63,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    11,   -52,   nil,
-   -56,     5,     0,   -10,    -9,     9,   -40,   -94,   -71,  -103,
-   nil,   nil,    27,   -14,  -117,   nil,   nil,   nil,  -127,   -77,
-   nil,    71,   -61,   -70,    48,  -150,   -32,  -108,    16,   -31,
-    24,  -169,   -74,   -96,   nil,   -47,   -65,  -113,  -120,   -30,
-    24,    51,    26,    14,   -59,   -52,  -116,   -19,   -16 ]
+   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 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   103,    31,     3,     6,     7,    10,    12,
     14,    16,    19,    23,    28,    30,     2,   nil,    50,    52,
     54,    68,    72,    73,    22,    27,   nil,   nil,   nil,   nil,
-     9,    11,   nil,   nil,   101,   152,   102,   104,   nil,   nil,
-   129,    64,    66,    67,   nil,   120,   nil,   nil,    77,    61,
-   nil,   nil,   nil,   nil,   179,    70,   nil,   nil,   nil,   nil,
+     9,    11,   nil,   nil,   101,   153,   102,   104,   nil,   nil,
+   130,    64,    66,    67,   nil,   121,   nil,   nil,    77,    61,
+   nil,   nil,   nil,   nil,   181,    70,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
@@ -905,8 +909,18 @@ module_eval <<'.,.,', 'grammar.ra', 71
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 78
+module_eval <<'.,.,', 'grammar.ra', 77
   def _reduce_18( val, _values, result )
+    result = ast AST::Function,
+        :name => val[0],
+        :arguments => AST::ASTArray.new({}),
+        :ftype => :statement
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 84
+  def _reduce_19( val, _values, result )
     args = aryfy(val[1])
     result = ast AST::Function,
         :name => val[0],
@@ -916,14 +930,14 @@ module_eval <<'.,.,', 'grammar.ra', 78
   end
 .,.,
 
- # reduce 19 omitted
-
  # reduce 20 omitted
 
  # reduce 21 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 88
-  def _reduce_22( val, _values, result )
+ # reduce 22 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 94
+  def _reduce_23( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
     result.file = @lexer.file
@@ -931,23 +945,23 @@ module_eval <<'.,.,', 'grammar.ra', 88
   end
 .,.,
 
- # reduce 23 omitted
-
  # reduce 24 omitted
 
  # reduce 25 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 95
-  def _reduce_26( val, _values, result )
+ # reduce 26 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 101
+  def _reduce_27( val, _values, result )
                     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
- # reduce 27 omitted
+ # reduce 28 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 106
-  def _reduce_28( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 112
+  def _reduce_29( val, _values, result )
     unless val[0].is_a?(AST::ASTArray)
         val[0] = aryfy(val[0])
     end
@@ -959,8 +973,8 @@ module_eval <<'.,.,', 'grammar.ra', 106
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 127
-  def _reduce_29( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 133
+  def _reduce_30( val, _values, result )
     array = val[2]
     if array.instance_of?(AST::ResourceInst)
         array = [array]
@@ -983,31 +997,31 @@ module_eval <<'.,.,', 'grammar.ra', 127
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 130
-  def _reduce_30( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 136
+  def _reduce_31( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 133
-  def _reduce_31( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 139
+  def _reduce_32( val, _values, result )
     # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 138
-  def _reduce_32( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 144
+  def _reduce_33( val, _values, result )
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 165
-  def _reduce_33( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 171
+  def _reduce_34( val, _values, result )
     type = val[0]
 
     if type == :exported and ! Puppet[:storeconfigs]
@@ -1034,22 +1048,22 @@ module_eval <<'.,.,', 'grammar.ra', 165
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 166
-  def _reduce_34( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 172
+  def _reduce_35( val, _values, result )
  result = :virtual
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 167
-  def _reduce_35( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 173
+  def _reduce_36( val, _values, result )
  result = :exported
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 190
-  def _reduce_36( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 196
+  def _reduce_37( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
     end
@@ -1071,12 +1085,12 @@ module_eval <<'.,.,', 'grammar.ra', 190
   end
 .,.,
 
- # reduce 37 omitted
-
  # reduce 38 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 201
-  def _reduce_39( val, _values, result )
+ # reduce 39 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 207
+  def _reduce_40( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :virtual
@@ -1087,8 +1101,8 @@ module_eval <<'.,.,', 'grammar.ra', 201
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 209
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 215
+  def _reduce_41( val, _values, result )
     if val[1]
         result = val[1]
         result.form = :exported
@@ -1099,33 +1113,33 @@ module_eval <<'.,.,', 'grammar.ra', 209
   end
 .,.,
 
- # reduce 41 omitted
-
  # reduce 42 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 217
-  def _reduce_43( val, _values, result )
+ # reduce 43 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 223
+  def _reduce_44( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
   end
 .,.,
 
- # reduce 44 omitted
+ # reduce 45 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 223
-  def _reduce_45( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 229
+  def _reduce_46( val, _values, result )
     result = val[1]
     result.parens = true
    result
   end
 .,.,
 
- # reduce 46 omitted
-
  # reduce 47 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 231
-  def _reduce_48( val, _values, result )
+ # reduce 48 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 237
+  def _reduce_49( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1133,8 +1147,8 @@ module_eval <<'.,.,', 'grammar.ra', 231
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 236
-  def _reduce_49( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 242
+  def _reduce_50( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1142,21 +1156,21 @@ module_eval <<'.,.,', 'grammar.ra', 236
   end
 .,.,
 
- # reduce 50 omitted
-
  # reduce 51 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 243
-  def _reduce_52( val, _values, result )
+ # reduce 52 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 249
+  def _reduce_53( val, _values, result )
     result = ast AST::ResourceInst, :children => [val[0],val[2]]
    result
   end
 .,.,
 
- # reduce 53 omitted
+ # reduce 54 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 253
-  def _reduce_54( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 259
+  def _reduce_55( val, _values, result )
     if val[0].instance_of?(AST::ResourceInst)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
     else
@@ -1167,26 +1181,24 @@ module_eval <<'.,.,', 'grammar.ra', 253
   end
 .,.,
 
- # reduce 55 omitted
-
  # reduce 56 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 260
-  def _reduce_57( val, _values, result )
+ # reduce 57 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 266
+  def _reduce_58( val, _values, result )
     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 264
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 270
+  def _reduce_59( val, _values, result )
     result = ast AST::Type, :value => val[0]
    result
   end
 .,.,
 
- # reduce 59 omitted
-
  # reduce 60 omitted
 
  # reduce 61 omitted
@@ -1197,8 +1209,10 @@ module_eval <<'.,.,', 'grammar.ra', 264
 
  # reduce 64 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 277
-  def _reduce_65( val, _values, result )
+ # reduce 65 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 283
+  def _reduce_66( val, _values, result )
     # this is distinct from referencing a variable
     variable = ast AST::Name, :value => val[0]
     result = ast AST::VarDef, :name => variable, :value => val[2]
@@ -1206,22 +1220,22 @@ module_eval <<'.,.,', 'grammar.ra', 277
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 282
-  def _reduce_66( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 288
+  def _reduce_67( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 282
-  def _reduce_67( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 288
+  def _reduce_68( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 291
-  def _reduce_68( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 297
+  def _reduce_69( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1232,17 +1246,17 @@ module_eval <<'.,.,', 'grammar.ra', 291
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 295
-  def _reduce_69( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 301
+  def _reduce_70( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 70 omitted
+ # reduce 71 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 304
-  def _reduce_71( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 310
+  def _reduce_72( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1252,8 +1266,6 @@ module_eval <<'.,.,', 'grammar.ra', 304
   end
 .,.,
 
- # reduce 72 omitted
-
  # reduce 73 omitted
 
  # reduce 74 omitted
@@ -1282,8 +1294,10 @@ module_eval <<'.,.,', 'grammar.ra', 304
 
  # reduce 86 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 330
-  def _reduce_87( val, _values, result )
+ # reduce 87 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 336
+  def _reduce_88( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -1293,44 +1307,54 @@ module_eval <<'.,.,', 'grammar.ra', 330
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 334
-  def _reduce_88( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 341
+  def _reduce_89( val, _values, result )
+    result = ast AST::Function,
+        :name => val[0],
+        :arguments => AST::ASTArray.new({}),
+        :ftype => :rvalue
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 345
+  def _reduce_90( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 336
-  def _reduce_89( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 347
+  def _reduce_91( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 340
-  def _reduce_90( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 351
+  def _reduce_92( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 345
-  def _reduce_91( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 356
+  def _reduce_93( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 347
-  def _reduce_92( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 358
+  def _reduce_94( val, _values, result )
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 360
-  def _reduce_93( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 371
+  def _reduce_95( val, _values, result )
     args = {
         :test => val[1],
         :statements => val[3]
@@ -1345,19 +1369,19 @@ module_eval <<'.,.,', 'grammar.ra', 360
   end
 .,.,
 
- # reduce 94 omitted
+ # reduce 96 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 365
-  def _reduce_95( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 376
+  def _reduce_97( val, _values, result )
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
 
- # reduce 96 omitted
+ # reduce 98 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 377
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 388
+  def _reduce_99( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = ast AST::ASTArray, :children => [val[3]]
@@ -1367,10 +1391,10 @@ module_eval <<'.,.,', 'grammar.ra', 377
   end
 .,.,
 
- # reduce 98 omitted
+ # reduce 100 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 387
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 398
+  def _reduce_101( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1381,15 +1405,15 @@ module_eval <<'.,.,', 'grammar.ra', 387
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 391
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 402
+  def _reduce_102( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 396
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 407
+  def _reduce_103( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
         :statements => ast(AST::ASTArray)
@@ -1398,10 +1422,10 @@ module_eval <<'.,.,', 'grammar.ra', 396
   end
 .,.,
 
- # reduce 102 omitted
+ # reduce 104 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 406
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 417
+  def _reduce_105( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1412,26 +1436,26 @@ module_eval <<'.,.,', 'grammar.ra', 406
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 410
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 421
+  def _reduce_106( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 105 omitted
+ # reduce 107 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 412
-  def _reduce_106( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 423
+  def _reduce_108( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 107 omitted
+ # reduce 109 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 423
-  def _reduce_108( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 434
+  def _reduce_110( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1442,17 +1466,13 @@ module_eval <<'.,.,', 'grammar.ra', 423
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 427
-  def _reduce_109( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 438
+  def _reduce_111( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 110 omitted
-
- # reduce 111 omitted
-
  # reduce 112 omitted
 
  # reduce 113 omitted
@@ -1461,15 +1481,19 @@ module_eval <<'.,.,', 'grammar.ra', 427
 
  # reduce 115 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 437
-  def _reduce_116( val, _values, result )
+ # reduce 116 omitted
+
+ # reduce 117 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 448
+  def _reduce_118( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 492
-  def _reduce_117( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 503
+  def _reduce_119( val, _values, result )
     # importing files
     # yuk, i hate keywords
     # we'll probably have to have some kind of search path eventually
@@ -1526,8 +1550,8 @@ module_eval <<'.,.,', 'grammar.ra', 492
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 502
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 513
+  def _reduce_120( val, _values, result )
     interp.newdefine fqname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
     result = nil
@@ -1537,8 +1561,8 @@ module_eval <<'.,.,', 'grammar.ra', 502
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 506
-  def _reduce_119( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 517
+  def _reduce_121( val, _values, result )
     interp.newdefine fqname(val[1]), :arguments => val[2]
     @lexer.indefine = false
     result = nil
@@ -1546,8 +1570,8 @@ module_eval <<'.,.,', 'grammar.ra', 506
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 514
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 525
+  def _reduce_122( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     interp.newclass fqname(val[1]), :code => val[4], :parent => val[2]
@@ -1556,8 +1580,8 @@ module_eval <<'.,.,', 'grammar.ra', 514
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 519
-  def _reduce_121( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 530
+  def _reduce_123( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     interp.newclass fqname(val[1]), :parent => val[2]
@@ -1566,30 +1590,30 @@ module_eval <<'.,.,', 'grammar.ra', 519
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 524
-  def _reduce_122( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 535
+  def _reduce_124( val, _values, result )
     interp.newnode val[1], :parent => val[2], :code => val[4]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 527
-  def _reduce_123( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 538
+  def _reduce_125( val, _values, result )
     interp.newnode val[1], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
- # reduce 124 omitted
+ # reduce 126 omitted
 
- # reduce 125 omitted
+ # reduce 127 omitted
 
- # reduce 126 omitted
+ # reduce 128 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 539
-  def _reduce_127( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 550
+  def _reduce_129( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1597,47 +1621,47 @@ module_eval <<'.,.,', 'grammar.ra', 539
   end
 .,.,
 
- # reduce 128 omitted
+ # reduce 130 omitted
 
- # reduce 129 omitted
+ # reduce 131 omitted
 
- # reduce 130 omitted
+ # reduce 132 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 547
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 558
+  def _reduce_133( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 551
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 562
+  def _reduce_134( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 133 omitted
+ # reduce 135 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 556
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 567
+  def _reduce_136( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 560
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 571
+  def _reduce_137( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 136 omitted
+ # reduce 138 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 567
-  def _reduce_137( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 578
+  def _reduce_139( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1645,71 +1669,71 @@ module_eval <<'.,.,', 'grammar.ra', 567
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 572
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 583
+  def _reduce_140( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 576
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 587
+  def _reduce_141( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_140( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 589
+  def _reduce_142( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 580
-  def _reduce_141( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 591
+  def _reduce_143( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 142 omitted
+ # reduce 144 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 585
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 596
+  def _reduce_145( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 144 omitted
+ # reduce 146 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 590
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 601
+  def _reduce_147( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 146 omitted
-
- # reduce 147 omitted
-
  # reduce 148 omitted
 
  # reduce 149 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 597
-  def _reduce_150( val, _values, result )
+ # reduce 150 omitted
+
+ # reduce 151 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 608
+  def _reduce_152( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 605
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 616
+  def _reduce_153( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1719,21 +1743,21 @@ module_eval <<'.,.,', 'grammar.ra', 605
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 607
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 618
+  def _reduce_154( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 153 omitted
+ # reduce 155 omitted
 
- # reduce 154 omitted
+ # reduce 156 omitted
 
- # reduce 155 omitted
+ # reduce 157 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 612
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 623
+  def _reduce_158( val, _values, result )
  result = nil
    result
   end