puppet 0.24.5 → 0.24.6

data/lib/puppet/parser/functions/tagged.rb

@@ -0,0 +1,18 @@
+# Test whether a given tag is set.  This functions as a big OR -- if any of the specified tags are unset, we return false.
+Puppet::Parser::Functions::newfunction(:tagged, :type => :rvalue, :doc => "A boolean function that
+    tells you whether the current container is tagged with the specified tags.
+    The tags are ANDed, so that all of the specified tags must be included for
+    the function to return true.") do |vals|
+        configtags = compiler.catalog.tags
+        resourcetags = resource.tags
+
+        retval = true
+        vals.each do |val|
+            unless configtags.include?(val) or resourcetags.include?(val)
+                retval = false
+                break
+            end
+        end
+
+        return retval
+end

data/lib/puppet/parser/functions/template.rb

@@ -0,0 +1,22 @@
+Puppet::Parser::Functions::newfunction(:template, :type => :rvalue, :doc => 
+    "Evaluate a template and return its value.  See `the templating docs 
+    </trac/puppet/wiki/PuppetTemplating>`_ for more information.  Note that 
+    if multiple templates are specified, their output is all concatenated 
+    and returned as the output of the function.") do |vals|
+        require 'erb'
+
+        vals.collect do |file|
+            # Use a wrapper, so the template can't get access to the full
+            # Scope object.
+            debug "Retrieving template %s" % file
+            wrapper = Puppet::Parser::TemplateWrapper.new(self, file)
+
+            begin
+                wrapper.result()
+            rescue => detail
+                raise Puppet::ParseError,
+                    "Failed to parse template %s: %s" %
+                        [file, detail]
+            end
+        end.join("")
+end

data/lib/puppet/parser/lexer.rb

@@ -105,6 +105,7 @@ class Puppet::Parser::Lexer
         '(' => :LPAREN,
         ')' => :RPAREN,
         '=' => :EQUALS,
+        '+=' => :APPENDS,
         '==' => :ISEQUAL,
         '>=' => :GREATEREQUAL,
         '>' => :GREATERTHAN,
@@ -125,13 +126,23 @@ class Puppet::Parser::Lexer
         '\\' => :BACKSLASH,
         '=>' => :FARROW,
         '+>' => :PARROW,
+        '+' => :PLUS,
+        '-' => :MINUS,
+        '/' => :DIV,
+        '*' => :TIMES,
+        '<<' => :LSHIFT,
+        '>>' => :RSHIFT,
         %r{([a-z][-\w]*::)+[a-z][-\w]*} => :CLASSNAME,
         %r{((::){0,1}[A-Z][-\w]*)+} => :CLASSREF
     )
 
     TOKENS.add_tokens "Whatever" => :DQTEXT, "Nomatter" => :SQTEXT, "alsonomatter" => :BOOLEAN
 
-    TOKENS.add_token :NAME, %r{[a-z][-\w]*} do |lexer, value|
+    TOKENS.add_token :NUMBER, %r{\b(?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?)\b} do |lexer, value|
+        [TOKENS[:NAME], value]
+    end
+
+    TOKENS.add_token :NAME, %r{[a-z0-9][-\w]*} do |lexer, value|
         string_token = self
         # we're looking for keywords here
         if tmp = KEYWORDS.lookup(value)
@@ -144,10 +155,6 @@ class Puppet::Parser::Lexer
         [string_token, value]
     end
 
-    TOKENS.add_token :NUMBER, %r{[0-9]+} do |lexer, value|
-        [TOKENS[:NAME], value]
-    end
-
     TOKENS.add_token :COMMENT, %r{#.*}, :skip => true
 
     TOKENS.add_token :RETURN, "\n", :skip => true, :incr_line => true, :skip_text => true
@@ -431,6 +438,9 @@ class Puppet::Parser::Lexer
             str.gsub!(/\\#{quote}/,quote)
         end
 
+        # Add to our line count for every carriage return in multi-line strings.
+        @line += str.count("\n")
+
         return str
     end
 

data/lib/puppet/parser/parser.rb

@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id9145566289', 'grammar.ra', 638
+module_eval <<'..end grammar.ra modeval..id5cb4445525', 'grammar.ra', 741
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -41,517 +41,690 @@ require 'puppet/parser/parser_support'
 
 # $Id$
 
-..end grammar.ra modeval..id9145566289
+..end grammar.ra modeval..id5cb4445525
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 52, :_reduce_1,
- 1, 52, :_reduce_none,
- 1, 53, :_reduce_none,
- 2, 53, :_reduce_4,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 1, 55, :_reduce_none,
- 4, 63, :_reduce_17,
- 3, 63, :_reduce_18,
- 2, 63, :_reduce_19,
- 1, 68, :_reduce_none,
- 1, 68, :_reduce_none,
- 1, 69, :_reduce_none,
- 3, 69, :_reduce_23,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_none,
- 1, 71, :_reduce_31,
- 1, 70, :_reduce_none,
- 3, 70, :_reduce_33,
- 5, 56, :_reduce_34,
- 5, 56, :_reduce_35,
- 5, 56, :_reduce_36,
- 5, 67, :_reduce_37,
- 2, 57, :_reduce_38,
- 1, 87, :_reduce_39,
- 2, 87, :_reduce_40,
- 2, 58, :_reduce_41,
- 3, 88, :_reduce_42,
- 3, 88, :_reduce_43,
- 1, 89, :_reduce_none,
- 1, 89, :_reduce_none,
- 3, 89, :_reduce_46,
- 1, 90, :_reduce_none,
- 3, 90, :_reduce_48,
- 1, 91, :_reduce_none,
- 1, 91, :_reduce_none,
- 3, 92, :_reduce_51,
- 3, 92, :_reduce_52,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 4, 95, :_reduce_55,
- 1, 81, :_reduce_none,
- 3, 81, :_reduce_57,
- 0, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 97, :_reduce_60,
- 1, 72, :_reduce_61,
- 1, 74, :_reduce_62,
- 1, 96, :_reduce_none,
- 1, 96, :_reduce_none,
- 1, 96, :_reduce_none,
+ 1, 60, :_reduce_1,
+ 1, 60, :_reduce_none,
+ 1, 61, :_reduce_none,
+ 2, 61, :_reduce_4,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 1, 63, :_reduce_none,
+ 4, 71, :_reduce_18,
+ 5, 71, :_reduce_19,
+ 3, 71, :_reduce_20,
+ 2, 71, :_reduce_21,
+ 1, 77, :_reduce_none,
+ 1, 77, :_reduce_none,
+ 3, 77, :_reduce_24,
+ 3, 77, :_reduce_25,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_none,
+ 1, 78, :_reduce_33,
+ 5, 64, :_reduce_34,
+ 5, 64, :_reduce_35,
+ 5, 64, :_reduce_36,
+ 5, 75, :_reduce_37,
+ 2, 65, :_reduce_38,
+ 1, 94, :_reduce_39,
+ 2, 94, :_reduce_40,
+ 2, 66, :_reduce_41,
+ 3, 95, :_reduce_42,
+ 3, 95, :_reduce_43,
  1, 96, :_reduce_none,
  1, 96, :_reduce_none,
- 1, 96, :_reduce_none,
- 3, 59, :_reduce_69,
- 0, 83, :_reduce_70,
- 1, 83, :_reduce_71,
- 3, 83, :_reduce_72,
- 3, 100, :_reduce_73,
- 3, 101, :_reduce_74,
- 1, 102, :_reduce_none,
- 1, 102, :_reduce_none,
- 0, 86, :_reduce_77,
- 1, 86, :_reduce_78,
- 3, 86, :_reduce_79,
+ 3, 96, :_reduce_46,
+ 1, 97, :_reduce_none,
+ 3, 97, :_reduce_48,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 3, 99, :_reduce_51,
+ 3, 99, :_reduce_52,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 4, 102, :_reduce_55,
+ 1, 88, :_reduce_none,
+ 3, 88, :_reduce_57,
+ 0, 89, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 1, 104, :_reduce_60,
+ 1, 80, :_reduce_61,
+ 1, 82, :_reduce_62,
  1, 103, :_reduce_none,
- 3, 103, :_reduce_81,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 94, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 4, 76, :_reduce_98,
- 3, 76, :_reduce_99,
- 1, 78, :_reduce_100,
- 1, 78, :_reduce_101,
- 1, 75, :_reduce_102,
- 4, 79, :_reduce_103,
- 4, 79, :_reduce_104,
- 6, 61, :_reduce_105,
- 0, 106, :_reduce_none,
- 4, 106, :_reduce_107,
- 1, 105, :_reduce_none,
- 5, 60, :_reduce_109,
- 1, 107, :_reduce_none,
- 2, 107, :_reduce_111,
- 5, 108, :_reduce_112,
- 4, 108, :_reduce_113,
- 1, 109, :_reduce_none,
- 3, 109, :_reduce_115,
- 3, 77, :_reduce_116,
- 1, 111, :_reduce_none,
- 4, 111, :_reduce_118,
- 1, 113, :_reduce_none,
- 3, 113, :_reduce_120,
- 3, 112, :_reduce_121,
- 1, 110, :_reduce_none,
- 1, 110, :_reduce_none,
- 1, 110, :_reduce_none,
- 1, 110, :_reduce_none,
- 1, 110, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 1, 103, :_reduce_none,
+ 3, 67, :_reduce_69,
+ 3, 76, :_reduce_70,
+ 0, 90, :_reduce_71,
+ 1, 90, :_reduce_72,
+ 3, 90, :_reduce_73,
+ 3, 107, :_reduce_74,
+ 3, 109, :_reduce_75,
  1, 110, :_reduce_none,
  1, 110, :_reduce_none,
- 1, 110, :_reduce_129,
- 1, 114, :_reduce_130,
- 3, 114, :_reduce_131,
- 2, 62, :_reduce_132,
- 6, 64, :_reduce_133,
- 5, 64, :_reduce_134,
- 6, 65, :_reduce_135,
- 5, 65, :_reduce_136,
- 6, 66, :_reduce_137,
- 5, 66, :_reduce_138,
- 1, 85, :_reduce_none,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 1, 117, :_reduce_none,
- 3, 117, :_reduce_143,
- 1, 119, :_reduce_none,
- 1, 119, :_reduce_none,
- 1, 119, :_reduce_none,
- 1, 119, :_reduce_none,
- 0, 54, :_reduce_148,
- 0, 120, :_reduce_149,
- 1, 115, :_reduce_none,
- 3, 115, :_reduce_151,
- 3, 115, :_reduce_152,
- 1, 121, :_reduce_none,
- 3, 121, :_reduce_154,
- 3, 122, :_reduce_155,
- 1, 122, :_reduce_156,
- 3, 122, :_reduce_157,
- 1, 122, :_reduce_158,
- 1, 118, :_reduce_none,
- 2, 118, :_reduce_160,
+ 0, 93, :_reduce_78,
+ 1, 93, :_reduce_79,
+ 3, 93, :_reduce_80,
+ 1, 111, :_reduce_none,
+ 3, 111, :_reduce_82,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 1, 108, :_reduce_none,
+ 4, 84, :_reduce_99,
+ 3, 84, :_reduce_100,
+ 1, 86, :_reduce_101,
+ 1, 86, :_reduce_102,
+ 1, 83, :_reduce_103,
+ 4, 79, :_reduce_104,
+ 4, 79, :_reduce_105,
+ 6, 69, :_reduce_106,
+ 5, 69, :_reduce_107,
+ 0, 113, :_reduce_none,
+ 4, 113, :_reduce_109,
+ 3, 113, :_reduce_110,
+ 1, 106, :_reduce_none,
+ 3, 106, :_reduce_112,
+ 3, 106, :_reduce_113,
+ 3, 106, :_reduce_114,
+ 3, 106, :_reduce_115,
+ 3, 106, :_reduce_116,
+ 3, 106, :_reduce_117,
+ 2, 106, :_reduce_118,
+ 3, 106, :_reduce_119,
+ 3, 106, :_reduce_120,
+ 3, 106, :_reduce_121,
+ 3, 106, :_reduce_122,
+ 3, 106, :_reduce_123,
+ 3, 106, :_reduce_124,
+ 2, 106, :_reduce_125,
+ 3, 106, :_reduce_126,
+ 3, 106, :_reduce_127,
+ 3, 106, :_reduce_128,
+ 5, 68, :_reduce_129,
+ 1, 114, :_reduce_none,
+ 2, 114, :_reduce_131,
+ 5, 115, :_reduce_132,
+ 4, 115, :_reduce_133,
  1, 116, :_reduce_none,
- 2, 116, :_reduce_162,
- 1, 123, :_reduce_none,
+ 3, 116, :_reduce_135,
+ 3, 85, :_reduce_136,
+ 1, 118, :_reduce_none,
+ 4, 118, :_reduce_138,
+ 1, 120, :_reduce_none,
+ 3, 120, :_reduce_140,
+ 3, 119, :_reduce_141,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_none,
+ 1, 117, :_reduce_149,
+ 1, 121, :_reduce_150,
+ 3, 121, :_reduce_151,
+ 2, 70, :_reduce_152,
+ 6, 72, :_reduce_153,
+ 5, 72, :_reduce_154,
+ 6, 73, :_reduce_155,
+ 5, 73, :_reduce_156,
+ 6, 74, :_reduce_157,
+ 5, 74, :_reduce_158,
+ 1, 92, :_reduce_none,
+ 1, 87, :_reduce_none,
+ 1, 87, :_reduce_none,
+ 1, 124, :_reduce_none,
+ 3, 124, :_reduce_163,
+ 1, 126, :_reduce_none,
+ 1, 126, :_reduce_none,
+ 1, 126, :_reduce_none,
+ 1, 126, :_reduce_none,
+ 0, 62, :_reduce_168,
+ 0, 127, :_reduce_169,
+ 1, 122, :_reduce_none,
+ 3, 122, :_reduce_171,
+ 3, 122, :_reduce_172,
+ 1, 128, :_reduce_none,
+ 3, 128, :_reduce_174,
+ 3, 129, :_reduce_175,
+ 1, 129, :_reduce_176,
+ 3, 129, :_reduce_177,
+ 1, 129, :_reduce_178,
+ 1, 125, :_reduce_none,
+ 2, 125, :_reduce_180,
  1, 123, :_reduce_none,
- 1, 73, :_reduce_165,
- 3, 98, :_reduce_166,
- 2, 98, :_reduce_167,
- 1, 104, :_reduce_none,
- 1, 104, :_reduce_none,
- 0, 84, :_reduce_none,
- 1, 84, :_reduce_171 ]
-
-racc_reduce_n = 172
-
-racc_shift_n = 276
+ 2, 123, :_reduce_182,
+ 1, 130, :_reduce_none,
+ 1, 130, :_reduce_none,
+ 1, 81, :_reduce_185,
+ 3, 105, :_reduce_186,
+ 4, 105, :_reduce_187,
+ 2, 105, :_reduce_188,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 0, 91, :_reduce_none,
+ 1, 91, :_reduce_192 ]
+
+racc_reduce_n = 193
+
+racc_shift_n = 317
 
 racc_action_table = [
-    71,    51,    53,   184,   162,   102,    71,    51,    53,   132,
-   149,     5,   209,    47,  -127,    87,    71,    51,    53,    88,
-   208,    65,    71,    51,    53,   162,   144,    34,    35,    99,
-    65,    89,   126,  -127,    50,    54,    65,   126,    59,  -123,
-    50,    54,   207,    45,    59,   161,    65,    56,  -126,    45,
-    50,    54,    65,    56,    59,    90,    50,    54,   185,    45,
-    59,    36,   169,    56,    37,    45,    71,    51,    53,    56,
-   204,   206,    47,    51,    53,   200,   149,    51,    53,    33,
-   199,  -122,    71,    51,    53,   238,     1,    65,    71,    51,
-    53,    67,   144,    34,    35,    87,    65,   237,   234,  -123,
-    50,    54,    65,   200,    59,   233,    50,    54,   199,    45,
-    59,   252,    65,    56,    43,    45,    50,    54,    65,    56,
-    59,    33,    50,    54,   156,    45,    59,    36,     1,    56,
-    37,    45,    71,    51,    53,    56,   204,   206,    71,    51,
-    53,   149,   149,    34,    35,   188,   259,   196,    71,    51,
-    53,  -125,    65,    65,    71,    51,    53,   144,   144,    51,
-    53,   202,    65,   162,    33,   168,    50,    54,    65,   137,
-    59,     1,    50,    54,   168,    45,    59,    36,    65,    56,
-    37,    45,    50,   174,    65,    56,    59,  -122,    50,    54,
-   165,   111,    59,  -125,  -122,    56,   127,    45,    71,    51,
-    53,    56,    33,   211,    71,    51,    53,   204,   206,     1,
-     5,   135,   218,   186,    71,    51,    53,   188,   189,   106,
-   125,    51,    53,   221,   222,   231,   140,   140,    65,   225,
-   126,  -124,    50,    54,    65,   228,    59,    47,    50,    54,
-  -139,    45,    59,   123,    65,    56,   106,    45,    50,   112,
-    65,    56,    59,  -124,    50,   174,   134,   111,    59,    51,
-    53,    56,   164,   111,   239,    51,    53,    56,   240,   241,
-   242,  -124,    96,   140,  -126,    51,    53,    93,   179,   168,
-    91,    51,    53,   159,   181,   260,   262,    85,    65,   157,
-    88,   133,    50,   174,    65,    41,    59,  -124,    50,    54,
-   128,   111,    59,  -122,    65,    56,    43,    45,    50,   174,
-    65,    56,    59,  -125,    50,    54,  -123,   111,    59,    51,
-    53,    56,    43,    45,  -127,    51,    53,    56,   176,    40,
-   269,  -171,   270,  -128,  -123,    51,    53,   152,  -125,   nil,
-   nil,    51,    53,   nil,   nil,   nil,   nil,   nil,    65,   nil,
-   nil,   nil,    50,   174,    65,   nil,    59,   nil,    50,   174,
-    43,   111,    59,   nil,    65,    56,   nil,   111,    50,   174,
-    65,    56,    59,   254,    50,   174,   nil,   111,    59,    51,
-    53,    56,   nil,   111,   nil,    51,    53,    56,   nil,   nil,
-   nil,   nil,   nil,    15,   nil,    19,    21,   nil,    28,     2,
-   nil,     8,   nil,    13,   nil,    17,   nil,    22,    65,   nil,
-     1,     5,    50,   174,    65,   264,    59,   nil,    50,   174,
-   nil,   111,    59,   nil,   nil,    56,   nil,   111,   nil,   nil,
-   nil,    56,   nil,   nil,   271,    15,   nil,    19,    21,   nil,
-    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
-   nil,   nil,     1,     5,    15,   212,    19,    21,   nil,    28,
-     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
-   nil,     1,     5,   nil,   230,    15,   nil,    19,    21,   nil,
-    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
-   nil,   nil,     1,     5,    15,   253,    19,    21,   nil,    28,
-     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
-   nil,     1,     5,   nil,   214,    15,   nil,    19,    21,   nil,
-    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
-   nil,   nil,     1,     5,    15,   274,    19,    21,   nil,    28,
-     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
-   nil,     1,     5,   nil,   235,    15,   nil,    19,    21,   nil,
-    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
-   nil,   nil,     1,     5,    15,   275,    19,    21,   nil,    28,
-     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
-   nil,     1,     5,   nil,   nil,    15,   nil,    19,    21,   nil,
-    28,     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,
-   nil,   nil,     1,     5,    15,   nil,    19,    21,   nil,    28,
-     2,   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,
-   nil,     1,     5,    15,   nil,    19,    21,   nil,    28,     2,
-   nil,     8,   nil,    13,   nil,    17,   nil,    22,   nil,   nil,
-     1,     5,    15,   nil,    19,    21,   nil,    28,     2,   nil,
-     8,   nil,    13,   nil,    17,   nil,    22,   nil,   nil,     1,
-     5,    15,   nil,    19,    21,   nil,    28,     2,   nil,     8,
-   nil,    13,   nil,    17,   nil,    22,   nil,   nil,     1,     5 ]
+    75,    57,    61,   260,   179,    38,    40,    35,    44,   196,
+    54,   287,    45,   239,     3,     6,   187,   298,   240,  -145,
+    74,    75,    57,    61,   286,    47,    38,    40,   194,   195,
+   132,    49,    38,    40,   112,    60,    64,   194,   195,    70,
+    41,    74,   149,    43,    55,    77,   178,   118,    66,    48,
+   141,    87,    49,    75,    57,    61,    60,    64,    49,   109,
+    70,    41,   253,   123,    43,    55,    77,    41,   105,    66,
+    43,  -146,    87,    74,    75,    57,    61,   202,   151,   152,
+   153,   139,   140,   142,    49,   282,   128,   133,    60,    64,
+   201,   239,    70,   281,    74,   149,   240,    55,    77,   271,
+   118,    66,   179,   141,    87,    49,    75,    57,    61,    60,
+    64,    49,   193,    70,    35,   132,   123,   174,    55,    77,
+   192,     3,    66,    35,   258,    87,    74,    75,    57,    61,
+     3,   151,   152,   153,   139,   140,   142,    49,   116,    35,
+   155,    60,    64,   153,   139,    70,     3,    74,   149,  -147,
+    55,    77,  -143,   118,    66,   156,   141,    87,    49,    75,
+    57,    61,    60,    64,    49,   157,    70,   153,   139,   123,
+   134,    55,    77,    57,    61,    66,    33,    34,    87,    74,
+    75,    57,    61,   132,   151,   152,   153,   139,   140,   142,
+    49,  -145,   203,   274,    60,    64,   187,   188,    70,   275,
+    74,   149,  -142,    55,    77,  -144,   118,    66,    45,   141,
+    87,    49,    75,    57,    61,    60,    64,    49,    44,    70,
+    57,    61,   123,  -142,    55,    77,  -159,   128,    66,   177,
+   181,    87,    74,    75,    57,    61,  -143,   151,   152,   153,
+   139,   140,   142,    49,   116,   198,   278,    60,    64,   194,
+   195,    70,   248,    74,   186,  -145,    55,    77,   187,   188,
+    66,   216,   183,    87,    49,   187,   217,  -142,    60,    64,
+   150,   283,    70,   151,   152,   153,   139,    55,    77,   145,
+   149,    66,   284,   285,    87,   190,   105,   290,   141,   143,
+   146,   148,   101,   190,    75,    57,    61,   151,   152,   153,
+   139,   140,   142,   151,   152,   153,   139,   140,   142,   116,
+    98,    97,   144,   147,    74,  -142,   151,   152,   153,   139,
+   140,   142,  -144,  -143,  -147,    49,    75,    57,    61,    60,
+    64,  -144,   246,    70,   151,   152,   153,   139,    55,    77,
+   244,   278,    66,   301,   302,    87,    74,    75,    57,    61,
+  -144,   179,  -145,  -148,    73,   190,  -143,    49,   310,  -192,
+    37,    60,    64,  -147,  -146,    70,   292,    74,   nil,   nil,
+    55,    77,   nil,   nil,    66,   nil,   nil,    87,    49,    75,
+    57,    61,    60,    64,   nil,   nil,    70,   nil,   nil,   nil,
+   nil,    55,    77,   nil,   nil,    66,   nil,   nil,    87,    74,
+    75,    57,    61,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    49,   nil,   nil,   nil,    60,    64,   nil,   nil,    70,   nil,
+    74,   nil,   nil,    55,    77,   nil,   nil,    66,   nil,   nil,
+    87,    49,    75,    57,    61,    60,    64,   nil,   nil,    70,
+   nil,   nil,   nil,   nil,    55,    77,   nil,   nil,    66,   nil,
+   nil,    87,    74,    75,    57,    61,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    49,   nil,   nil,   nil,    60,    64,   nil,
+   nil,    70,   nil,    74,   nil,   nil,    55,    77,   nil,   nil,
+    66,   nil,   nil,    87,    49,    75,    57,    61,    60,    64,
+   nil,   nil,    70,   nil,   nil,   nil,   nil,    55,    77,   nil,
+   nil,    66,   nil,   nil,    87,    74,    75,    57,    61,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    49,    75,    57,    61,
+    60,    64,   nil,   nil,    70,   nil,    74,   nil,   nil,    55,
+    77,   nil,   nil,    66,   nil,   nil,    87,    49,    75,    57,
+    61,    60,    64,   nil,   nil,    70,   nil,   nil,    49,   nil,
+    55,    77,    60,    64,    66,   nil,    70,    87,    74,   nil,
+   nil,    55,   nil,   nil,   nil,    66,   nil,   nil,   nil,    49,
+    54,    57,    61,    60,    64,   nil,   nil,    70,   nil,   nil,
+   nil,   nil,    55,    77,   nil,   nil,    66,   nil,   nil,    87,
+    51,    75,    57,    61,   nil,   nil,   nil,    75,    57,    61,
+   nil,    49,   nil,   nil,   nil,    60,    64,   nil,   nil,    70,
+   nil,   nil,   nil,    52,    55,    75,    57,    61,    66,   nil,
+   nil,   nil,    49,   nil,   nil,   nil,    60,   168,    49,   nil,
+    70,   nil,    60,   209,   nil,   161,    70,   nil,   nil,    66,
+   nil,   161,   nil,   nil,   nil,    66,    49,   nil,   nil,   nil,
+    60,    64,   nil,   nil,    70,    75,    57,    61,   137,    55,
+   nil,   nil,   nil,    66,   nil,    75,    57,    61,   nil,   nil,
+   nil,    75,    57,    61,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    75,    57,    61,   nil,   nil,    49,    75,    57,    61,
+    60,    64,   nil,   nil,    70,   nil,    49,   nil,   nil,    55,
+    60,    64,    49,    66,    70,   nil,    60,    64,   nil,    55,
+    70,   nil,    49,    66,   nil,    55,    60,    64,    49,    66,
+    70,   nil,    60,    64,   nil,    55,    70,   nil,   nil,    66,
+   nil,    55,    75,    57,    61,    66,   nil,   nil,    75,    57,
+    61,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    75,    57,
+    61,   nil,   nil,   nil,   nil,    57,    61,   nil,   nil,   nil,
+   nil,   nil,   nil,    49,   nil,    57,    61,    60,    64,    49,
+   nil,    70,   nil,    60,    64,   nil,    55,    70,   nil,    49,
+    66,   nil,    55,    60,    64,    49,    66,    70,   nil,    60,
+   209,   nil,    55,    70,   nil,    49,    66,   nil,   161,    60,
+   209,   nil,    66,    70,    57,    61,    57,    61,   161,   nil,
+   nil,   nil,    66,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    57,    61,    57,    61,   270,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    49,   nil,    49,   nil,    60,    64,
+    60,   209,    70,   nil,    70,   nil,    52,    55,   nil,   161,
+    49,    66,    49,    66,    60,   209,    60,    64,    70,   nil,
+    70,    57,    61,   161,    52,    55,   nil,    66,   nil,    66,
+   nil,    57,    61,   nil,   nil,   280,   nil,    57,    61,   nil,
+   nil,   130,   nil,   nil,   nil,   nil,   nil,    57,    61,   nil,
+   nil,    49,   nil,   nil,   nil,    60,    64,    57,    61,    70,
+   210,    49,   nil,    52,    55,    60,   209,    49,    66,    70,
+   nil,    60,   209,   nil,   161,    70,   nil,    49,    66,   nil,
+   161,    60,   209,   nil,    66,    70,   nil,    49,    57,    61,
+   161,    60,   209,   nil,    66,    70,   nil,   nil,   nil,   nil,
+   161,   nil,   nil,   nil,    66,   145,   149,   nil,   205,   nil,
+   nil,   nil,   nil,   nil,   141,   143,   146,   148,    49,   nil,
+   nil,   nil,    60,    64,   nil,   nil,    70,   nil,   nil,   nil,
+    52,    55,   nil,   nil,   nil,    66,   nil,   nil,   144,   147,
+   145,   149,   151,   152,   153,   139,   140,   142,   215,   141,
+   143,   146,   148,   145,   149,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   141,   143,   146,   148,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   144,   147,   145,   149,   151,   152,   153,
+   139,   140,   142,   nil,   141,   143,   146,   148,   145,   149,
+   151,   152,   153,   139,   140,   142,   nil,   141,   143,   146,
+   148,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   147,
+   289,   nil,   151,   152,   153,   139,   140,   142,   nil,   nil,
+   nil,   144,   147,   nil,   nil,   151,   152,   153,   139,   140,
+   142,    16,   294,    23,    26,   nil,     1,     4,   nil,     9,
+   nil,    13,   nil,    20,   nil,    27,   nil,   nil,     3,     6,
+   nil,   295,   nil,    16,   nil,    23,    26,   nil,     1,     4,
+   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,
+     3,     6,    16,   276,    23,    26,   nil,     1,     4,   nil,
+     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,     3,
+     6,   nil,   307,   nil,    16,   nil,    23,    26,   nil,     1,
+     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,
+   nil,     3,     6,    16,   230,    23,    26,   nil,     1,     4,
+   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,   nil,
+     3,     6,   nil,   312,   nil,    16,   nil,    23,    26,   nil,
+     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,
+   nil,   nil,     3,     6,    16,   314,    23,    26,   nil,     1,
+     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,   nil,
+   nil,     3,     6,   nil,   256,   nil,    16,   nil,    23,    26,
+   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
+    27,   nil,   nil,     3,     6,    16,   315,    23,    26,   nil,
+     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,    27,
+   nil,   nil,     3,     6,   nil,   250,   nil,    16,   nil,    23,
+    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,
+   nil,    27,   nil,   nil,     3,     6,    16,   316,    23,    26,
+   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
+    27,   nil,   nil,     3,     6,   nil,   nil,   nil,    16,   nil,
+    23,    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,
+    20,   nil,    27,   nil,   nil,     3,     6,    16,   nil,    23,
+    26,   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,
+   nil,    27,   nil,   nil,     3,     6,    16,   nil,    23,    26,
+   nil,     1,     4,   nil,     9,   nil,    13,   nil,    20,   nil,
+    27,   nil,   nil,     3,     6 ]
 
 racc_action_check = [
-    93,    93,    93,   127,   106,    38,    71,    71,    71,    71,
-    90,   127,   146,    54,    78,    23,    87,    87,    87,    23,
-   146,    90,   161,   161,   161,   112,    90,   102,   102,    38,
-    93,    23,    54,    64,    93,    93,    71,   112,    93,    62,
-    71,    71,   142,    93,    71,   106,    87,    93,    66,    71,
-    87,    87,   161,    71,    87,    23,   161,   161,   129,    87,
-   161,   102,   119,    87,   102,   161,   240,   240,   240,   161,
-   142,   142,    13,    13,    13,   238,   149,   135,   135,     2,
-   238,    74,    15,    15,    15,   197,     2,   149,    17,    17,
-    17,    13,   149,    99,    99,    61,   240,   197,   194,   118,
-   240,   240,    13,   137,   240,   194,    13,    13,   137,   240,
-    13,   210,    15,   240,    13,    13,    15,    15,    17,    13,
-    15,    96,    17,    17,    96,    15,    17,    99,    96,    15,
-    99,    17,   239,   239,   239,    17,   210,   210,   162,   162,
-   162,    89,   205,     8,     8,   227,   227,   136,   165,   165,
-   165,   116,    89,   205,    47,    47,    47,    89,   205,    19,
-    19,   139,   239,   140,    21,   141,   239,   239,   162,    84,
-   239,    21,   162,   162,   115,   239,   162,     8,   165,   239,
-     8,   162,   165,   165,    47,   162,   165,   114,    47,    47,
-   113,   165,    47,    60,    58,   165,    55,    47,   225,   225,
-   225,    47,    29,   151,   187,   187,   187,   151,   151,    29,
-    29,    83,   163,   131,    41,    41,    41,   131,   131,   164,
-    52,   192,   192,   166,   167,   192,   168,   169,   225,   170,
-   174,    46,   225,   225,   187,   182,   225,   184,   187,   187,
-    45,   225,   187,    42,    41,   225,    40,   187,    41,    41,
-   192,   187,    41,   110,   192,   192,    81,    41,   192,   208,
-   208,    41,   107,   192,   199,   126,   126,   192,   200,   201,
-   203,    70,    32,    88,    79,   209,   209,    28,   124,   224,
-    25,    67,    67,   100,   126,   230,   233,    22,   208,    97,
-    95,    73,   208,   208,   126,    11,   208,   245,   126,   126,
-    67,   208,   126,   246,   209,   208,   126,   126,   209,   209,
-    67,   126,   209,   248,    67,    67,   249,   209,    67,   125,
-   125,   209,    67,    67,   250,   123,   123,    67,   123,     9,
-   258,   259,   260,    77,    76,   176,   176,    91,    75,   nil,
-   nil,   134,   134,   nil,   nil,   nil,   nil,   nil,   125,   nil,
-   nil,   nil,   125,   125,   123,   nil,   125,   nil,   123,   123,
-   125,   125,   123,   nil,   176,   125,   nil,   123,   176,   176,
-   134,   123,   176,   215,   134,   134,   nil,   176,   134,   234,
-   234,   176,   nil,   134,   nil,   257,   257,   134,   nil,   nil,
-   nil,   nil,   nil,   215,   nil,   215,   215,   nil,   215,   215,
-   nil,   215,   nil,   215,   nil,   215,   nil,   215,   234,   nil,
-   215,   215,   234,   234,   257,   236,   234,   nil,   257,   257,
-   nil,   234,   257,   nil,   nil,   234,   nil,   257,   nil,   nil,
-   nil,   257,   nil,   nil,   262,   236,   nil,   236,   236,   nil,
-   236,   236,   nil,   236,   nil,   236,   nil,   236,   nil,   236,
-   nil,   nil,   236,   236,   262,   157,   262,   262,   nil,   262,
-   262,   nil,   262,   nil,   262,   nil,   262,   nil,   262,   nil,
-   nil,   262,   262,   nil,   190,   157,   nil,   157,   157,   nil,
-   157,   157,   nil,   157,   nil,   157,   nil,   157,   nil,   157,
-   nil,   nil,   157,   157,   190,   213,   190,   190,   nil,   190,
-   190,   nil,   190,   nil,   190,   nil,   190,   nil,   190,   nil,
-   nil,   190,   190,   nil,   159,   213,   nil,   213,   213,   nil,
-   213,   213,   nil,   213,   nil,   213,   nil,   213,   nil,   213,
-   nil,   nil,   213,   213,   159,   272,   159,   159,   nil,   159,
-   159,   nil,   159,   nil,   159,   nil,   159,   nil,   159,   nil,
-   nil,   159,   159,   nil,   196,   272,   nil,   272,   272,   nil,
-   272,   272,   nil,   272,   nil,   272,   nil,   272,   nil,   272,
-   nil,   nil,   272,   272,   196,   273,   196,   196,   nil,   196,
-   196,   nil,   196,   nil,   196,   nil,   196,   nil,   196,   nil,
-   nil,   196,   196,   nil,   nil,   273,   nil,   273,   273,   nil,
-   273,   273,   nil,   273,   nil,   273,   nil,   273,   nil,   273,
-   nil,   nil,   273,   273,   133,   nil,   133,   133,   nil,   133,
-   133,   nil,   133,   nil,   133,   nil,   133,   nil,   133,   nil,
-   nil,   133,   133,   270,   nil,   270,   270,   nil,   270,   270,
-   nil,   270,   nil,   270,   nil,   270,   nil,   270,   nil,   nil,
-   270,   270,    27,   nil,    27,    27,   nil,    27,    27,   nil,
-    27,   nil,    27,   nil,    27,   nil,    27,   nil,   nil,    27,
-    27,     0,   nil,     0,     0,   nil,     0,     0,   nil,     0,
-   nil,     0,   nil,     0,   nil,     0,   nil,   nil,     0,     0 ]
+    34,    34,    34,   191,   105,   112,   112,    17,    11,   125,
+    64,   242,    11,   287,    17,    17,   273,   273,   287,   263,
+    34,   153,   153,   153,   242,    11,     9,     9,   191,   191,
+    64,    34,   109,   109,    39,    34,    34,   125,   125,    34,
+   112,   153,   222,   112,    34,    34,   105,    48,    34,    11,
+   222,    34,   153,   139,   139,   139,   153,   153,    48,    39,
+   153,     9,   180,    48,     9,   153,   153,   109,   181,   153,
+   109,    69,   153,   139,   140,   140,   140,   129,   222,   222,
+   222,   222,   222,   222,   139,   236,   204,    68,   139,   139,
+   129,   157,   139,   236,   140,   227,   157,   139,   139,   204,
+   197,   139,   168,   227,   139,   140,   151,   151,   151,   140,
+   140,   197,   120,   140,   101,   168,   197,   101,   140,   140,
+   120,   101,   140,    26,   189,   140,   151,   141,   141,   141,
+    26,   227,   227,   227,   227,   227,   227,   151,   190,     4,
+    93,   151,   151,   232,   232,   151,     4,   141,   225,    67,
+   151,   151,    65,   118,   151,    94,   225,   151,   141,    77,
+    77,    77,   141,   141,   118,    96,   141,   231,   231,   118,
+    73,   141,   141,    23,    23,   141,     1,     1,   141,    77,
+   142,   142,   142,   209,   225,   225,   225,   225,   225,   225,
+    77,    62,   131,   211,    77,    77,   131,   131,    77,   217,
+   142,   224,    78,    77,    77,   173,    47,    77,    90,   224,
+    77,   142,    16,    16,    16,   142,   142,    47,    59,   142,
+   156,   156,    47,    58,   142,   142,    55,    50,   142,   102,
+   106,   142,    16,    74,    74,    74,   167,   224,   224,   224,
+   224,   224,   224,    16,    45,   127,   230,    16,    16,   127,
+   127,    16,   166,    74,   113,   165,    16,    16,   113,   113,
+    16,   136,   110,    16,    74,   136,   136,   163,    74,    74,
+    84,   239,    74,   221,   221,   221,   221,    74,    74,    84,
+    84,    74,   240,   241,    74,   162,    37,   245,    84,    84,
+    84,    84,    36,   115,    87,    87,    87,   220,   220,   220,
+   220,   220,   220,   228,   228,   228,   228,   228,   228,   248,
+    30,    27,    84,    84,    87,   262,    84,    84,    84,    84,
+    84,    84,    72,   264,   265,    87,   149,   149,   149,    87,
+    87,   267,   160,    87,   219,   219,   219,   219,    87,    87,
+   158,   276,    87,   278,   281,    87,   149,   148,   148,   148,
+    89,   116,    79,    80,    15,   293,    81,   149,   297,   298,
+     7,   149,   149,    83,    85,   149,   247,   148,   nil,   nil,
+   149,   149,   nil,   nil,   149,   nil,   nil,   149,   148,   143,
+   143,   143,   148,   148,   nil,   nil,   148,   nil,   nil,   nil,
+   nil,   148,   148,   nil,   nil,   148,   nil,   nil,   148,   143,
+   144,   144,   144,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   143,   nil,   nil,   nil,   143,   143,   nil,   nil,   143,   nil,
+   144,   nil,   nil,   143,   143,   nil,   nil,   143,   nil,   nil,
+   143,   144,    33,    33,    33,   144,   144,   nil,   nil,   144,
+   nil,   nil,   nil,   nil,   144,   144,   nil,   nil,   144,   nil,
+   nil,   144,    33,   152,   152,   152,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    33,   nil,   nil,   nil,    33,    33,   nil,
+   nil,    33,   nil,   152,   nil,   nil,    33,    33,   nil,   nil,
+    33,   nil,   nil,    33,   152,   147,   147,   147,   152,   152,
+   nil,   nil,   152,   nil,   nil,   nil,   nil,   152,   152,   nil,
+   nil,   152,   nil,   nil,   152,   147,   146,   146,   146,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   147,    44,    44,    44,
+   147,   147,   nil,   nil,   147,   nil,   146,   nil,   nil,   147,
+   147,   nil,   nil,   147,   nil,   nil,   147,   146,   145,   145,
+   145,   146,   146,   nil,   nil,   146,   nil,   nil,    44,   nil,
+   146,   146,    44,    44,   146,   nil,    44,   146,   145,   nil,
+   nil,    44,   nil,   nil,   nil,    44,   nil,   nil,   nil,   145,
+    13,    13,    13,   145,   145,   nil,   nil,   145,   nil,   nil,
+   nil,   nil,   145,   145,   nil,   nil,   145,   nil,   nil,   145,
+    13,    98,    98,    98,   nil,   nil,   nil,   246,   246,   246,
+   nil,    13,   nil,   nil,   nil,    13,    13,   nil,   nil,    13,
+   nil,   nil,   nil,    13,    13,   274,   274,   274,    13,   nil,
+   nil,   nil,    98,   nil,   nil,   nil,    98,    98,   246,   nil,
+    98,   nil,   246,   246,   nil,    98,   246,   nil,   nil,    98,
+   nil,   246,   nil,   nil,   nil,   246,   274,   nil,   nil,   nil,
+   274,   274,   nil,   nil,   274,    75,    75,    75,    75,   274,
+   nil,   nil,   nil,   274,   nil,    54,    54,    54,   nil,   nil,
+   nil,   284,   284,   284,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   178,   178,   178,   nil,   nil,    75,    20,    20,    20,
+    75,    75,   nil,   nil,    75,   nil,    54,   nil,   nil,    75,
+    54,    54,   284,    75,    54,   nil,   284,   284,   nil,    54,
+   284,   nil,   178,    54,   nil,   284,   178,   178,    20,   284,
+   178,   nil,    20,    20,   nil,   178,    20,   nil,   nil,   178,
+   nil,    20,   179,   179,   179,    20,   nil,   nil,   283,   283,
+   283,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   185,   185,
+   185,   nil,   nil,   nil,   nil,   193,   193,   nil,   nil,   nil,
+   nil,   nil,   nil,   179,   nil,   192,   192,   179,   179,   283,
+   nil,   179,   nil,   283,   283,   nil,   179,   283,   nil,   185,
+   179,   nil,   283,   185,   185,   193,   283,   185,   nil,   193,
+   193,   nil,   185,   193,   nil,   192,   185,   nil,   193,   192,
+   192,   nil,   193,   192,   202,   202,   210,   210,   192,   nil,
+   nil,   nil,   192,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   282,   282,   128,   128,   202,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   202,   nil,   210,   nil,   202,   202,
+   210,   210,   202,   nil,   210,   nil,   202,   202,   nil,   210,
+   282,   202,   128,   210,   282,   282,   128,   128,   282,   nil,
+   128,    51,    51,   282,   128,   128,   nil,   282,   nil,   128,
+   nil,   234,   234,   nil,   nil,   234,   nil,   296,   296,   nil,
+   nil,    51,   nil,   nil,   nil,   nil,   nil,   155,   155,   nil,
+   nil,    51,   nil,   nil,   nil,    51,    51,   133,   133,    51,
+   133,   234,   nil,    51,    51,   234,   234,   296,    51,   234,
+   nil,   296,   296,   nil,   234,   296,   nil,   155,   234,   nil,
+   296,   155,   155,   nil,   296,   155,   nil,   133,   132,   132,
+   155,   133,   133,   nil,   155,   133,   nil,   nil,   nil,   nil,
+   133,   nil,   nil,   nil,   133,   100,   100,   nil,   132,   nil,
+   nil,   nil,   nil,   nil,   100,   100,   100,   100,   132,   nil,
+   nil,   nil,   132,   132,   nil,   nil,   132,   nil,   nil,   nil,
+   132,   132,   nil,   nil,   nil,   132,   nil,   nil,   100,   100,
+   135,   135,   100,   100,   100,   100,   100,   100,   135,   135,
+   135,   135,   135,   226,   226,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   226,   226,   226,   226,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   135,   135,   223,   223,   135,   135,   135,
+   135,   135,   135,   nil,   223,   223,   223,   223,    99,    99,
+   226,   226,   226,   226,   226,   226,   nil,    99,    99,    99,
+    99,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   223,
+   244,   nil,   223,   223,   223,   223,   223,   223,   nil,   nil,
+   nil,    99,    99,   nil,   nil,    99,    99,    99,    99,    99,
+    99,   244,   249,   244,   244,   nil,   244,   244,   nil,   244,
+   nil,   244,   nil,   244,   nil,   244,   nil,   nil,   244,   244,
+   nil,   255,   nil,   249,   nil,   249,   249,   nil,   249,   249,
+   nil,   249,   nil,   249,   nil,   249,   nil,   249,   nil,   nil,
+   249,   249,   255,   229,   255,   255,   nil,   255,   255,   nil,
+   255,   nil,   255,   nil,   255,   nil,   255,   nil,   nil,   255,
+   255,   nil,   288,   nil,   229,   nil,   229,   229,   nil,   229,
+   229,   nil,   229,   nil,   229,   nil,   229,   nil,   229,   nil,
+   nil,   229,   229,   288,   150,   288,   288,   nil,   288,   288,
+   nil,   288,   nil,   288,   nil,   288,   nil,   288,   nil,   nil,
+   288,   288,   nil,   301,   nil,   150,   nil,   150,   150,   nil,
+   150,   150,   nil,   150,   nil,   150,   nil,   150,   nil,   150,
+   nil,   nil,   150,   150,   301,   302,   301,   301,   nil,   301,
+   301,   nil,   301,   nil,   301,   nil,   301,   nil,   301,   nil,
+   nil,   301,   301,   nil,   183,   nil,   302,   nil,   302,   302,
+   nil,   302,   302,   nil,   302,   nil,   302,   nil,   302,   nil,
+   302,   nil,   nil,   302,   302,   183,   311,   183,   183,   nil,
+   183,   183,   nil,   183,   nil,   183,   nil,   183,   nil,   183,
+   nil,   nil,   183,   183,   nil,   177,   nil,   311,   nil,   311,
+   311,   nil,   311,   311,   nil,   311,   nil,   311,   nil,   311,
+   nil,   311,   nil,   nil,   311,   311,   177,   313,   177,   177,
+   nil,   177,   177,   nil,   177,   nil,   177,   nil,   177,   nil,
+   177,   nil,   nil,   177,   177,   nil,   nil,   nil,   313,   nil,
+   313,   313,   nil,   313,   313,   nil,   313,   nil,   313,   nil,
+   313,   nil,   313,   nil,   nil,   313,   313,    19,   nil,    19,
+    19,   nil,    19,    19,   nil,    19,   nil,    19,   nil,    19,
+   nil,    19,   nil,   nil,    19,    19,     0,   nil,     0,     0,
+   nil,     0,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
+     0,   nil,   nil,     0,     0 ]
 
 racc_action_pointer = [
-   644,   nil,    42,   nil,   nil,   nil,   nil,   nil,   140,   323,
-   nil,   289,   nil,    70,   nil,    80,   nil,    86,   nil,   156,
-   nil,   127,   246,    13,   nil,   280,   nil,   625,   264,   165,
-   nil,   nil,   238,   nil,   nil,   nil,   nil,   nil,    -5,   nil,
-   209,   212,   223,   nil,   nil,   238,   211,   152,   nil,   nil,
-   nil,   nil,   210,   nil,    11,   186,   nil,   nil,   174,   nil,
-   173,    93,    19,   nil,    13,   nil,    28,   278,   nil,   nil,
-   251,     4,   nil,   285,    61,   318,   314,   313,    -6,   254,
-   nil,   250,   nil,   201,   148,   nil,   nil,    14,   236,   120,
-   -11,   337,   nil,    -2,   nil,   284,    84,   283,   nil,    90,
-   277,   nil,    24,   nil,   nil,   nil,    -5,   252,   nil,   nil,
-   233,   nil,    16,   152,   167,   164,   131,   nil,    79,    45,
-   nil,   nil,   nil,   322,   273,   316,   262,   -34,   nil,    36,
-   nil,   208,   nil,   587,   338,    74,   141,    71,   nil,   156,
-   154,   155,    23,   nil,   nil,   nil,    -3,   nil,   nil,    55,
-   nil,   160,   nil,   nil,   nil,   nil,   nil,   448,   nil,   507,
-   nil,    20,   136,   205,   182,   146,   216,   217,   189,   190,
-   220,   nil,   nil,   nil,   209,   nil,   332,   nil,   nil,   nil,
-   nil,   nil,   213,   nil,   235,   nil,   nil,   202,   nil,   nil,
-   467,   nil,   218,   nil,    88,   nil,   547,    75,   nil,   251,
-   255,   247,   nil,   263,   nil,   121,   nil,   nil,   256,   272,
-    89,   nil,   nil,   488,   nil,   366,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   269,   196,   nil,   136,   nil,   nil,
-   257,   nil,   nil,   280,   376,   nil,   408,   nil,    43,   130,
-    64,   nil,   nil,   nil,   nil,   277,   283,   nil,   293,   296,
-   304,   nil,   nil,   nil,   nil,   nil,   nil,   382,   323,   324,
-   326,   nil,   427,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   606,   nil,   528,   568,   nil,   nil ]
+  1308,   163,   nil,   nil,   101,   nil,   nil,   354,   nil,    23,
+   nil,     6,   nil,   568,   nil,   354,   210,   -31,   nil,  1289,
+   685,   nil,   nil,   170,   nil,   nil,    85,   269,   nil,   nil,
+   304,   nil,   nil,   430,    -2,   nil,   257,   248,   nil,    24,
+   nil,   nil,   nil,   nil,   515,   206,   nil,   184,    25,   nil,
+   217,   858,   nil,   nil,   663,   224,   nil,   nil,   202,   216,
+   nil,   nil,   170,   nil,     8,   131,   nil,   128,    66,    50,
+   nil,   nil,   301,   170,   231,   653,   nil,   157,   181,   331,
+   332,   335,   nil,   342,   264,   343,   nil,   292,   nil,   329,
+   202,   nil,   nil,   134,   145,   nil,   143,   nil,   589,  1013,
+   930,    76,   223,   nil,   nil,    -5,   220,   nil,   nil,    29,
+   256,   nil,     2,   249,   nil,   283,   342,   nil,   131,   nil,
+    96,   nil,   nil,   nil,   nil,   -11,   nil,   201,   819,    67,
+   nil,   187,   925,   894,   nil,   965,   256,   nil,   nil,    51,
+    72,   125,   178,   377,   398,   536,   504,   483,   345,   324,
+  1147,   104,   451,    19,   nil,   884,   217,    58,   334,   nil,
+   293,   nil,   275,   246,   nil,   234,   234,   215,    93,   nil,
+   nil,   nil,   nil,   184,   nil,   nil,   nil,  1248,   679,   730,
+    55,    30,   nil,  1207,   nil,   746,   nil,   nil,   nil,   117,
+   100,   -20,   762,   752,   nil,   nil,   nil,    78,   nil,   nil,
+   nil,   nil,   801,   nil,    76,   nil,   nil,   nil,   nil,   161,
+   803,   184,   nil,   nil,   nil,   nil,   nil,   194,   nil,   282,
+   245,   221,    26,  1000,   185,   132,   978,    79,   251,  1106,
+   217,   113,    89,   nil,   868,   nil,    75,   nil,   nil,   258,
+   269,   260,     1,   nil,  1043,   280,   595,   359,   271,  1065,
+   nil,   nil,   nil,   nil,   nil,  1084,   nil,   nil,   nil,   nil,
+   nil,   nil,   294,    -2,   302,   303,   nil,   310,   nil,   nil,
+   nil,   nil,   nil,     7,   613,   nil,   312,   nil,   337,   nil,
+   nil,   338,   817,   736,   669,   nil,   nil,   -20,  1125,   nil,
+   nil,   nil,   nil,   345,   nil,   nil,   874,   351,   352,   nil,
+   nil,  1166,  1188,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,  1229,   nil,  1270,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -148,  -141,  -172,   -15,    -3,  -139,   -16,    -5,  -172,  -172,
-    -6,  -172,    -7,  -140,    -8,  -172,    -9,  -172,   -10,  -172,
-   -11,  -172,   -39,  -172,   -12,  -172,   -13,    -1,  -172,  -172,
-   -14,    -2,  -148,  -140,  -146,  -145,  -144,  -147,  -148,  -142,
-   -77,   -70,  -172,   -31,   -29,   -62,   -30,  -172,   -32,   -19,
-  -102,  -100,   -20,  -101,   -61,   -21,   -60,   -22,   -24,  -129,
-   -25,  -172,   -26,  -128,   -27,  -165,   -28,  -172,  -108,   -92,
-   -88,  -172,   -95,  -172,   -89,   -93,   -90,   -97,   -91,   -96,
-   -94,  -172,  -130,  -132,  -148,   -40,   -41,  -172,   -70,  -148,
-  -148,  -172,    -4,  -172,   -38,  -172,  -172,  -172,  -161,  -172,
-  -172,  -159,  -172,   -75,   -76,   -78,  -172,  -170,   -66,   -71,
-   -63,   -62,   -61,   -58,   -64,  -170,   -67,   -56,   -65,  -172,
-  -127,  -126,   -68,  -172,  -172,  -172,  -172,  -172,   -18,  -172,
-   -80,  -172,  -167,  -172,  -172,  -172,  -172,  -149,  -150,  -172,
-  -172,  -170,  -172,   -45,   -61,   -47,  -172,   -54,   -53,  -148,
-   -44,  -172,   276,   -69,  -162,  -163,  -164,  -172,  -160,  -172,
-  -143,  -172,  -172,  -172,  -171,   -59,  -172,  -172,  -171,   -70,
-  -172,  -124,  -116,  -117,   -61,  -122,  -172,  -125,  -123,  -103,
-   -23,   -99,  -172,   -33,  -172,   -17,  -166,  -172,  -168,  -169,
-  -172,  -114,  -172,  -110,  -172,  -131,  -172,  -172,  -153,  -156,
-  -158,  -172,  -104,  -172,   -50,  -172,   -49,   -43,  -172,  -172,
-  -172,   -42,  -136,  -172,  -138,  -172,   -74,   -73,   -37,   -79,
-   -57,   -34,   -35,   -72,  -170,  -172,  -119,  -170,   -98,   -81,
-  -106,  -109,  -111,  -172,  -172,  -134,  -172,  -152,  -172,  -172,
-  -172,  -151,   -36,   -46,   -86,   -82,   -83,   -51,   -87,   -84,
-   -85,   -52,   -48,  -135,  -137,   -55,  -121,  -172,  -172,  -169,
-  -172,  -105,  -172,  -115,  -133,  -154,  -155,  -157,  -120,  -118,
-  -172,  -113,  -172,  -172,  -112,  -107 ]
+  -168,  -193,    -7,  -161,  -193,    -8,  -159,  -193,    -9,  -193,
+   -10,  -193,   -11,  -160,   -12,  -193,  -193,  -193,   -13,    -1,
+  -193,   -14,    -2,  -193,   -15,    -3,  -193,   -39,   -16,    -5,
+  -193,   -17,    -6,  -193,  -193,  -160,  -168,   -78,  -166,  -168,
+  -165,  -164,  -162,  -167,  -193,   -71,   -41,  -168,  -168,  -185,
+   -21,  -193,   -33,   -22,  -193,   -62,   -23,  -101,   -26,  -193,
+  -103,  -102,   -27,  -148,   -61,   -28,   -60,   -29,  -193,   -30,
+  -149,   -31,   -32,  -193,  -193,  -193,   -96,  -193,   -90,   -94,
+   -98,   -91,   -95,   -92,  -193,   -97,   -93,  -193,  -111,   -89,
+  -193,   -38,    -4,  -193,  -152,  -150,  -168,   -40,   -71,   -69,
+   -70,  -193,  -193,  -181,   -79,  -193,  -191,   -76,   -77,  -193,
+  -193,  -179,  -193,  -193,   -81,  -191,  -193,   -72,  -168,   -47,
+  -193,   -54,   -53,   -61,   -44,  -193,   -45,  -193,  -193,  -193,
+   -20,  -193,  -193,  -193,   317,  -193,  -193,  -188,  -125,  -193,
+  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,  -193,
+  -193,  -193,  -193,  -193,  -118,  -193,  -193,  -169,  -193,  -170,
+   -58,   -62,  -191,   -64,   -56,   -67,  -193,   -65,   -61,  -147,
+   -68,  -146,   -66,   -63,  -184,  -182,  -183,  -193,  -193,  -193,
+  -193,  -192,  -180,  -193,  -163,  -193,  -105,  -189,  -190,  -193,
+  -192,  -193,  -193,  -193,   -50,   -49,   -43,  -193,   -42,   -24,
+   -25,   -18,  -193,  -104,  -193,  -100,  -142,  -145,  -143,   -61,
+  -193,  -193,  -136,  -144,  -137,  -128,  -186,  -190,  -114,  -116,
+  -120,  -117,  -122,  -127,  -124,  -121,  -126,  -123,  -119,  -193,
+  -108,  -112,  -113,  -115,  -193,  -130,  -193,  -134,  -151,  -178,
+  -176,  -193,  -193,  -173,  -193,  -193,   -59,  -193,   -71,  -193,
+  -156,   -75,   -74,   -37,   -80,  -193,  -158,   -82,   -36,   -73,
+   -48,   -51,   -84,   -88,   -85,   -86,   -87,   -83,   -52,   -46,
+   -19,   -99,  -139,  -191,  -193,  -187,  -108,  -107,  -193,  -131,
+  -129,  -193,  -193,  -193,  -193,  -171,  -172,  -193,  -193,  -154,
+   -34,   -57,   -35,  -191,  -155,  -157,  -193,  -193,  -190,  -141,
+  -106,  -193,  -193,  -135,  -177,  -175,  -174,  -153,   -55,  -140,
+  -138,  -193,  -110,  -193,  -133,  -109,  -132 ]
 
 racc_goto_table = [
-    23,    27,   122,    92,   173,   105,   198,    49,   117,    46,
-   187,    39,    31,   170,    32,    82,   193,   103,   115,    25,
-   142,   151,   243,    44,   191,   247,   251,    23,   131,    95,
-    64,    86,    73,    84,   261,   192,   107,   110,   166,   172,
-   113,   227,    83,    62,    98,   163,   136,    97,    38,   100,
-   101,   108,   180,   167,   201,   197,    94,   226,   120,   154,
-   nil,   129,   nil,    46,    66,   141,   170,   nil,   nil,   nil,
-   nil,   118,   nil,   nil,   232,   nil,   nil,    44,   nil,   203,
-   210,   nil,   191,   nil,    64,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   121,   nil,   nil,   nil,   138,    62,   nil,   nil,
-   nil,   nil,   158,   nil,   nil,   160,   257,   265,   155,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    66,   171,
-   182,    46,    46,   nil,   263,   nil,   122,   nil,   nil,   219,
-   171,   195,   220,    23,   190,    44,    44,   nil,   268,   nil,
-   120,   103,    64,    64,   nil,   223,   224,   170,   nil,   nil,
-   nil,   120,   nil,   178,   nil,    62,    62,    23,   213,    23,
-   215,   110,   255,   nil,   178,   258,    92,   nil,   nil,   nil,
-    60,   nil,   171,   nil,   121,   108,    66,    66,   nil,   nil,
-    58,   nil,   120,   nil,   nil,   121,   nil,   nil,   171,    92,
-    23,    92,   nil,   120,   nil,   118,    23,   236,   116,   nil,
-   nil,   nil,   nil,   nil,   245,   245,   178,   nil,   114,   120,
-   nil,   nil,    92,    23,   nil,    23,   121,   nil,   244,   244,
-   nil,   nil,   178,   nil,    60,   250,   250,   121,   nil,   nil,
-   171,   nil,   nil,   nil,    58,   nil,    23,   nil,   249,   249,
-   nil,   nil,   nil,   121,   nil,   nil,   148,   148,    92,    92,
-   nil,   120,   nil,   171,   nil,   nil,   147,   147,   nil,   121,
-   121,   nil,    23,   272,   178,   nil,   nil,   nil,   nil,   nil,
-    23,   273,    23,    23,   120,    68,   nil,    81,   nil,    77,
-   177,    77,    60,    60,    48,   121,    72,   178,    72,   nil,
-   175,   177,    58,    58,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   175,   nil,   nil,   nil,   nil,   148,   124,   121,   nil,
-   nil,    77,   nil,   nil,   nil,   nil,   147,   nil,    72,   nil,
-   nil,   nil,   116,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   130,   114,   177,   nil,    77,   nil,   nil,    48,   nil,
-   nil,   nil,    72,   175,   nil,   nil,   nil,   139,   nil,   177,
-   nil,    77,   nil,   153,   nil,   nil,   nil,    77,    72,   175,
-   nil,   nil,   148,   nil,    72,   248,   248,   nil,   nil,   nil,
-   nil,   nil,   147,   nil,   nil,   246,   246,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   177,   nil,   nil,   nil,   nil,   nil,    48,   183,   nil,
-   nil,   175,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   177,   nil,   nil,   nil,   nil,   nil,
-   nil,   216,   217,   nil,   175,    77,    77,   nil,   nil,   nil,
-   nil,   nil,    72,    72,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   229,   nil,   nil,
-   nil,    77,   nil,   nil,   nil,   nil,   nil,   nil,    72,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   256,   nil,   nil,   nil,    77,
-   nil,   nil,   nil,   nil,   nil,   nil,    72,   nil,   nil,   266,
-   267,   nil,   nil,    77,    77,   nil,   nil,   nil,   nil,   nil,
-    72,    72 ]
+     7,    92,    65,    11,   214,   115,   180,    19,   170,   243,
+   107,   164,   211,    56,    50,   189,   104,    36,   235,     7,
+    90,    71,    11,    15,    42,   199,   277,    63,   261,   268,
+    22,   296,   125,   127,   237,   269,   113,   234,    46,    96,
+    65,   106,   212,   245,   273,    94,   131,   158,   102,    39,
+   110,    56,   129,   160,   241,   242,    91,   175,   162,    71,
+   nil,   nil,   247,   nil,   nil,    63,   103,   136,    93,   111,
+   nil,   nil,   300,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   272,   nil,   nil,   nil,   nil,   nil,   167,   nil,   211,
+   nil,   nil,   114,   nil,   nil,   nil,   nil,   279,   nil,   199,
+    62,   nil,   114,   191,   nil,   nil,   172,   nil,   nil,   nil,
+   nil,   nil,    63,   237,   176,   nil,   nil,    65,   nil,   nil,
+   nil,    65,   208,   114,   182,   nil,   159,   184,   200,   nil,
+   nil,   nil,    56,   204,   122,   122,    71,   nil,    62,   306,
+    71,   nil,    63,   nil,   208,   nil,    63,    63,   nil,   nil,
+     7,   nil,   nil,    11,   107,   nil,   170,   229,    69,   291,
+   254,   303,   nil,   259,   nil,   nil,   nil,   309,   nil,    63,
+   nil,   nil,   nil,   297,   nil,   211,   nil,     7,   nil,   nil,
+    11,   264,   264,     7,   249,   165,    11,   nil,   nil,   nil,
+   255,    65,   nil,   308,   nil,   nil,    69,   nil,   nil,   208,
+   266,   266,   200,   nil,   nil,   122,    63,    63,   293,   nil,
+    71,    92,   nil,   nil,   nil,    62,    63,   nil,   nil,    62,
+   207,   nil,   nil,   208,    63,   nil,   251,   252,   nil,     7,
+   nil,    92,    11,   257,    58,   167,   nil,    92,   nil,   nil,
+   nil,   nil,   207,   171,     7,    67,   nil,    11,    63,     7,
+   nil,   288,    11,   nil,   172,     7,   nil,   nil,    11,   nil,
+    63,   nil,   nil,   nil,   nil,    72,   nil,   nil,   121,   121,
+    92,   208,    58,    69,   nil,    95,   nil,    69,   171,   263,
+   263,   nil,   nil,    67,   122,   208,   nil,   nil,     7,    62,
+   nil,    11,   nil,    92,   nil,    92,    63,   207,   nil,   nil,
+   171,     7,     7,    72,    11,    11,   nil,   nil,   311,   313,
+    63,     7,   nil,     7,    11,   nil,    11,   nil,   nil,   163,
+   nil,   207,   299,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   169,   304,   305,   165,   nil,   nil,   nil,   171,   171,   121,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    69,   nil,    58,
+   173,   nil,   nil,    58,   206,   171,   nil,   nil,   nil,   nil,
+    67,   nil,   nil,   nil,    67,   169,   nil,   nil,   nil,   207,
+   nil,   nil,   nil,   nil,   nil,   nil,   206,   nil,   nil,   171,
+    72,   nil,   nil,   207,    72,   213,   nil,   169,   nil,   nil,
+   nil,   171,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   213,   238,   nil,
+   nil,   nil,   nil,   262,   262,   nil,   nil,   nil,   121,   nil,
+   nil,   nil,   nil,    58,   265,   265,   nil,   171,   nil,    84,
+   nil,   206,   nil,   nil,    67,   nil,   nil,   nil,   nil,   nil,
+   nil,   171,   169,   nil,   267,   267,    99,   100,   nil,   nil,
+   nil,   nil,   nil,   nil,    72,   206,   nil,   nil,   nil,   nil,
+   nil,   nil,   213,   nil,   nil,   nil,   169,   163,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   213,   135,   nil,   nil,
+   138,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   173,   nil,
+   154,   nil,   nil,   206,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   169,   nil,   nil,   206,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   169,   nil,
+   nil,   nil,   nil,   nil,   213,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   213,   nil,
+   nil,   nil,   218,   219,   220,   221,   222,   223,   224,   225,
+   226,   227,   228,   nil,   231,   232,   233 ]
 
 racc_goto_check = [
-    34,     2,    47,     4,    61,    51,    71,    17,    44,    27,
-    53,    68,     3,    59,    29,    27,    57,    49,    32,     1,
-    38,    38,    39,    26,    59,    43,    43,    34,    52,    34,
-    24,    37,    54,    29,    55,    56,    35,    27,    31,    60,
-    30,    62,    63,    23,     3,    33,    64,    65,    66,    67,
-     3,    26,    20,    33,    69,    70,     5,    61,    24,    72,
-   nil,    17,   nil,    27,    25,    32,    59,   nil,   nil,   nil,
-   nil,    23,   nil,   nil,    57,   nil,   nil,    26,   nil,    33,
-    38,   nil,    59,   nil,    24,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    25,   nil,   nil,   nil,     3,    23,   nil,   nil,
-   nil,   nil,    68,   nil,   nil,    68,    53,    71,    29,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,    27,
-    17,    27,    27,   nil,    59,   nil,    47,   nil,   nil,    51,
-    27,    27,    44,    34,     2,    26,    26,   nil,    61,   nil,
-    24,    49,    24,    24,   nil,    49,    32,    59,   nil,   nil,
-   nil,    24,   nil,    23,   nil,    23,    23,    34,     2,    34,
-     2,    27,    33,   nil,    23,    33,     4,   nil,   nil,   nil,
-    22,   nil,    27,   nil,    25,    26,    25,    25,   nil,   nil,
-    21,   nil,    24,   nil,   nil,    25,   nil,   nil,    27,     4,
-    34,     4,   nil,    24,   nil,    23,    34,     2,    22,   nil,
-   nil,   nil,   nil,   nil,    27,    27,    23,   nil,    21,    24,
-   nil,   nil,     4,    34,   nil,    34,    25,   nil,    26,    26,
-   nil,   nil,    23,   nil,    22,    24,    24,    25,   nil,   nil,
-    27,   nil,   nil,   nil,    21,   nil,    34,   nil,    23,    23,
-   nil,   nil,   nil,    25,   nil,   nil,    22,    22,     4,     4,
-   nil,    24,   nil,    27,   nil,   nil,    21,    21,   nil,    25,
-    25,   nil,    34,     2,    23,   nil,   nil,   nil,   nil,   nil,
-    34,     2,    34,    34,    24,    48,   nil,    48,   nil,    46,
-    22,    46,    22,    22,    28,    25,    28,    23,    28,   nil,
-    21,    22,    21,    21,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    21,   nil,   nil,   nil,   nil,    22,    48,    25,   nil,
-   nil,    46,   nil,   nil,   nil,   nil,    21,   nil,    28,   nil,
-   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    48,    21,    22,   nil,    46,   nil,   nil,    28,   nil,
-   nil,   nil,    28,    21,   nil,   nil,   nil,    48,   nil,    22,
-   nil,    46,   nil,    48,   nil,   nil,   nil,    46,    28,    21,
-   nil,   nil,    22,   nil,    28,    22,    22,   nil,   nil,   nil,
-   nil,   nil,    21,   nil,   nil,    21,    21,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    22,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,
-   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,
-   nil,    48,    48,   nil,    21,    46,    46,   nil,   nil,   nil,
-   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,
-   nil,    46,   nil,   nil,   nil,   nil,   nil,   nil,    28,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    48,   nil,   nil,   nil,    46,
-   nil,   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,    48,
-    48,   nil,   nil,    46,    46,   nil,   nil,   nil,   nil,   nil,
-    28,    28 ]
+    20,     4,    23,    33,    60,    31,    32,     2,    46,    70,
+    48,    43,    58,    20,    18,    32,    51,    28,    56,    20,
+    33,    26,    33,     1,    67,    19,    54,    45,    42,    42,
+     3,    53,    37,    37,    58,    38,    52,    55,    36,    28,
+    23,    34,    59,    30,    61,    62,    52,    63,    64,    65,
+    66,    20,    18,    29,    68,    69,     5,    71,    31,    26,
+   nil,   nil,    32,   nil,   nil,    45,     3,    52,    49,     3,
+   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    60,   nil,   nil,   nil,   nil,   nil,    23,   nil,    58,
+   nil,   nil,    49,   nil,   nil,   nil,   nil,    56,   nil,    19,
+    22,   nil,    49,    37,   nil,   nil,    26,   nil,   nil,   nil,
+   nil,   nil,    45,    58,    28,   nil,   nil,    23,   nil,   nil,
+   nil,    23,    23,    49,    67,   nil,     3,    67,    20,   nil,
+   nil,   nil,    20,    18,    22,    22,    26,   nil,    22,    70,
+    26,   nil,    45,   nil,    23,   nil,    45,    45,   nil,   nil,
+    20,   nil,   nil,    33,    48,   nil,    46,     2,    25,    43,
+    51,    58,   nil,    48,   nil,   nil,   nil,    60,   nil,    45,
+   nil,   nil,   nil,    32,   nil,    58,   nil,    20,   nil,   nil,
+    33,    23,    23,    20,     2,    22,    33,   nil,   nil,   nil,
+     2,    23,   nil,    32,   nil,   nil,    25,   nil,   nil,    23,
+    26,    26,    20,   nil,   nil,    22,    45,    45,    31,   nil,
+    26,     4,   nil,   nil,   nil,    22,    45,   nil,   nil,    22,
+    22,   nil,   nil,    23,    45,   nil,    49,    49,   nil,    20,
+   nil,     4,    33,    49,    21,    23,   nil,     4,   nil,   nil,
+   nil,   nil,    22,    25,    20,    24,   nil,    33,    45,    20,
+   nil,     2,    33,   nil,    26,    20,   nil,   nil,    33,   nil,
+    45,   nil,   nil,   nil,   nil,    27,   nil,   nil,    21,    21,
+     4,    23,    21,    25,   nil,    27,   nil,    25,    25,    22,
+    22,   nil,   nil,    24,    22,    23,   nil,   nil,    20,    22,
+   nil,    33,   nil,     4,   nil,     4,    45,    22,   nil,   nil,
+    25,    20,    20,    27,    33,    33,   nil,   nil,     2,     2,
+    45,    20,   nil,    20,    33,   nil,    33,   nil,   nil,    21,
+   nil,    22,    49,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    24,    49,    49,    22,   nil,   nil,   nil,    25,    25,    21,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,   nil,    21,
+    27,   nil,   nil,    21,    21,    25,   nil,   nil,   nil,   nil,
+    24,   nil,   nil,   nil,    24,    24,   nil,   nil,   nil,    22,
+   nil,   nil,   nil,   nil,   nil,   nil,    21,   nil,   nil,    25,
+    27,   nil,   nil,    22,    27,    27,   nil,    24,   nil,   nil,
+   nil,    25,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,    27,   nil,
+   nil,   nil,   nil,    21,    21,   nil,   nil,   nil,    21,   nil,
+   nil,   nil,   nil,    21,    24,    24,   nil,    25,   nil,    47,
+   nil,    21,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,
+   nil,    25,    24,   nil,    27,    27,    47,    47,   nil,   nil,
+   nil,   nil,   nil,   nil,    27,    21,   nil,   nil,   nil,   nil,
+   nil,   nil,    27,   nil,   nil,   nil,    24,    21,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    27,    47,   nil,   nil,
+    47,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
+    47,   nil,   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    24,   nil,   nil,    21,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,   nil,
+   nil,   nil,   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
+   nil,   nil,    47,    47,    47,    47,    47,    47,    47,    47,
+    47,    47,    47,   nil,    47,    47,    47 ]
 
 racc_goto_pointer = [
-   nil,    19,     1,    12,   -24,    27,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -6,   nil,   nil,
-   -73,   167,   157,    30,    17,    51,    10,    -4,   271,    12,
-    -1,   -75,   -23,   -62,     0,    -4,   nil,     8,   -69,  -183,
-   nil,   nil,   nil,  -183,   -33,   nil,   264,   -39,   260,   -23,
-   nil,   -35,   -43,  -121,    17,  -196,   -99,  -118,   nil,  -110,
-   -84,  -119,  -135,    23,   -38,    15,    40,    11,     3,   -83,
-   -82,  -131,   -37 ]
+   nil,    23,     7,    30,   -18,    39,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,  -103,
+     0,   221,    87,   -11,   232,   145,     8,   252,    13,   -45,
+  -117,   -40,  -100,     3,     4,   nil,    27,   -15,  -162,   nil,
+   nil,   nil,  -164,   -87,   nil,    14,   -90,   413,   -27,    48,
+   nil,   -21,    -8,  -242,  -204,  -118,  -137,   nil,  -121,   -91,
+  -129,  -166,    22,   -49,    12,    40,    11,    15,  -103,  -102,
+  -148,   -44 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   150,     4,     7,    10,    12,    14,    16,
-    18,    20,    24,    26,    30,     3,     6,   nil,    52,    55,
-    57,    74,    75,    76,    78,    79,    69,    70,     9,    11,
-   nil,   nil,   nil,   nil,    61,   nil,    29,   nil,   nil,   143,
-   205,   145,   146,   nil,   nil,   119,    63,    80,   nil,   109,
-   104,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   194,    42,
+   nil,   nil,   nil,   124,    25,    29,    32,     2,     5,     8,
+    10,    12,    14,    18,    21,    24,    28,    31,   nil,    53,
+    76,    78,    79,    81,    83,    85,    86,    89,    30,   nil,
+   nil,   nil,   nil,    59,   nil,    17,   nil,   nil,   126,   197,
+   119,   120,   nil,   nil,   166,    80,    82,   nil,   117,    88,
+   108,   nil,   nil,   185,   nil,   nil,   nil,   236,    68,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil ]
+   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -568,47 +741,55 @@ racc_token_table = {
  :TRUE => 11,
  :FALSE => 12,
  :EQUALS => 13,
- :LESSEQUAL => 14,
- :NOTEQUAL => 15,
- :DOT => 16,
- :COLON => 17,
- :LLCOLLECT => 18,
- :RRCOLLECT => 19,
- :QMARK => 20,
- :LPAREN => 21,
- :RPAREN => 22,
- :ISEQUAL => 23,
- :GREATEREQUAL => 24,
- :GREATERTHAN => 25,
- :LESSTHAN => 26,
- :IF => 27,
- :ELSE => 28,
- :IMPORT => 29,
- :DEFINE => 30,
- :ELSIF => 31,
- :VARIABLE => 32,
- :CLASS => 33,
- :INHERITS => 34,
- :NODE => 35,
- :BOOLEAN => 36,
- :NAME => 37,
- :SEMIC => 38,
- :CASE => 39,
- :DEFAULT => 40,
- :AT => 41,
- :LCOLLECT => 42,
- :RCOLLECT => 43,
- :CLASSNAME => 44,
- :CLASSREF => 45,
- :NOT => 46,
- :OR => 47,
- :AND => 48,
- :UNDEF => 49,
- :PARROW => 50 }
+ :APPENDS => 14,
+ :LESSEQUAL => 15,
+ :NOTEQUAL => 16,
+ :DOT => 17,
+ :COLON => 18,
+ :LLCOLLECT => 19,
+ :RRCOLLECT => 20,
+ :QMARK => 21,
+ :LPAREN => 22,
+ :RPAREN => 23,
+ :ISEQUAL => 24,
+ :GREATEREQUAL => 25,
+ :GREATERTHAN => 26,
+ :LESSTHAN => 27,
+ :IF => 28,
+ :ELSE => 29,
+ :IMPORT => 30,
+ :DEFINE => 31,
+ :ELSIF => 32,
+ :VARIABLE => 33,
+ :CLASS => 34,
+ :INHERITS => 35,
+ :NODE => 36,
+ :BOOLEAN => 37,
+ :NAME => 38,
+ :SEMIC => 39,
+ :CASE => 40,
+ :DEFAULT => 41,
+ :AT => 42,
+ :LCOLLECT => 43,
+ :RCOLLECT => 44,
+ :CLASSNAME => 45,
+ :CLASSREF => 46,
+ :NOT => 47,
+ :OR => 48,
+ :AND => 49,
+ :UNDEF => 50,
+ :PARROW => 51,
+ :PLUS => 52,
+ :MINUS => 53,
+ :TIMES => 54,
+ :DIV => 55,
+ :LSHIFT => 56,
+ :RSHIFT => 57,
+ :UMINUS => 58 }
 
 racc_use_result_var = true
 
-racc_nt_base = 51
+racc_nt_base = 59
 
 Racc_arg = [
  racc_action_table,
@@ -641,6 +822,7 @@ Racc_token_to_s_table = [
 'TRUE',
 'FALSE',
 'EQUALS',
+'APPENDS',
 'LESSEQUAL',
 'NOTEQUAL',
 'DOT',
@@ -678,6 +860,13 @@ Racc_token_to_s_table = [
 'AND',
 'UNDEF',
 'PARROW',
+'PLUS',
+'MINUS',
+'TIMES',
+'DIV',
+'LSHIFT',
+'RSHIFT',
+'UMINUS',
 '$start',
 'program',
 'statements',
@@ -695,10 +884,10 @@ Racc_token_to_s_table = [
 'hostclass',
 'nodedef',
 'resourceoverride',
+'append',
 'funcvalues',
-'namestrings',
-'resourcerefs',
 'namestring',
+'resourceref',
 'name',
 'variable',
 'type',
@@ -706,7 +895,6 @@ Racc_token_to_s_table = [
 'funcrvalue',
 'selector',
 'quotedtext',
-'resourceref',
 'classname',
 'resourceinstances',
 'endsemi',
@@ -726,13 +914,13 @@ Racc_token_to_s_table = [
 'resourcename',
 'undef',
 'array',
-'rvalue',
+'expression',
 'param',
+'rvalue',
 'addparam',
 'anyparam',
 'rvalues',
 'comma',
-'iftest',
 'else',
 'caseopts',
 'caseopt',
@@ -758,7 +946,7 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 30
+module_eval <<'.,.,', 'grammar.ra', 42
   def _reduce_1( val, _values, result )
     if val[0]
         # Make sure we always return an array.
@@ -782,7 +970,7 @@ module_eval <<'.,.,', 'grammar.ra', 30
 
  # reduce 3 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 46
+module_eval <<'.,.,', 'grammar.ra', 58
   def _reduce_4( val, _values, result )
     if val[0] and val[1]
         if val[0].instance_of?(AST::ASTArray)
@@ -823,8 +1011,10 @@ module_eval <<'.,.,', 'grammar.ra', 46
 
  # reduce 16 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 68
-  def _reduce_17( val, _values, result )
+ # reduce 17 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 81
+  def _reduce_18( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -834,8 +1024,19 @@ module_eval <<'.,.,', 'grammar.ra', 68
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 74
-  def _reduce_18( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 88
+  def _reduce_19( val, _values, result )
+    args = aryfy(val[2])
+    result = ast AST::Function,
+        :name => val[0],
+        :arguments => args,
+        :ftype => :statement
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 93
+  def _reduce_20( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
         :arguments => AST::ASTArray.new({}),
@@ -844,8 +1045,8 @@ module_eval <<'.,.,', 'grammar.ra', 74
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 81
-  def _reduce_19( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 100
+  def _reduce_21( val, _values, result )
     args = aryfy(val[1])
     result = ast AST::Function,
         :name => val[0],
@@ -855,14 +1056,12 @@ module_eval <<'.,.,', 'grammar.ra', 81
   end
 .,.,
 
- # reduce 20 omitted
-
- # reduce 21 omitted
-
  # reduce 22 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 91
-  def _reduce_23( val, _values, result )
+ # reduce 23 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 108
+  def _reduce_24( val, _values, result )
     result = aryfy(val[0], val[2])
     result.line = @lexer.line
     result.file = @lexer.file
@@ -870,9 +1069,18 @@ module_eval <<'.,.,', 'grammar.ra', 91
   end
 .,.,
 
- # reduce 24 omitted
+module_eval <<'.,.,', 'grammar.ra', 117
+  def _reduce_25( val, _values, result )
+    unless val[0].is_a?(AST::ASTArray)
+        val[0] = aryfy(val[0])
+    end
 
- # reduce 25 omitted
+    val[0].push(val[2])
+
+    result = val[0]
+   result
+  end
+.,.,
 
  # reduce 26 omitted
 
@@ -884,29 +1092,18 @@ module_eval <<'.,.,', 'grammar.ra', 91
 
  # reduce 30 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 104
-  def _reduce_31( val, _values, result )
-                    result = ast AST::Name, :value => val[0]
-   result
-  end
-.,.,
+ # reduce 31 omitted
 
  # reduce 32 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 115
+module_eval <<'.,.,', 'grammar.ra', 130
   def _reduce_33( val, _values, result )
-    unless val[0].is_a?(AST::ASTArray)
-        val[0] = aryfy(val[0])
-    end
-
-    val[0].push(val[2])
-
-    result = val[0]
+                    result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 136
+module_eval <<'.,.,', 'grammar.ra', 151
   def _reduce_34( val, _values, result )
     array = val[2]
     if array.instance_of?(AST::ResourceInstance)
@@ -930,7 +1127,7 @@ module_eval <<'.,.,', 'grammar.ra', 136
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 139
+module_eval <<'.,.,', 'grammar.ra', 154
   def _reduce_35( val, _values, result )
     # This is a deprecated syntax.
     error "All resource specifications require names"
@@ -938,7 +1135,7 @@ module_eval <<'.,.,', 'grammar.ra', 139
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 142
+module_eval <<'.,.,', 'grammar.ra', 157
   def _reduce_36( val, _values, result )
     # a defaults setting for a type
     result = ast(AST::ResourceDefaults, :type => val[0], :params => val[2])
@@ -946,14 +1143,14 @@ module_eval <<'.,.,', 'grammar.ra', 142
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 147
+module_eval <<'.,.,', 'grammar.ra', 162
   def _reduce_37( val, _values, result )
     result = ast AST::ResourceOverride, :object => val[0], :params => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 174
+module_eval <<'.,.,', 'grammar.ra', 189
   def _reduce_38( val, _values, result )
     type = val[0]
 
@@ -981,21 +1178,21 @@ module_eval <<'.,.,', 'grammar.ra', 174
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 175
+module_eval <<'.,.,', 'grammar.ra', 190
   def _reduce_39( val, _values, result )
  result = :virtual
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 176
+module_eval <<'.,.,', 'grammar.ra', 191
   def _reduce_40( val, _values, result )
  result = :exported
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 199
+module_eval <<'.,.,', 'grammar.ra', 214
   def _reduce_41( val, _values, result )
     if val[0] =~ /^[a-z]/
         Puppet.warning addcontext("Collection names must now be capitalized")
@@ -1018,7 +1215,7 @@ module_eval <<'.,.,', 'grammar.ra', 199
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 209
+module_eval <<'.,.,', 'grammar.ra', 224
   def _reduce_42( val, _values, result )
     if val[1]
         result = val[1]
@@ -1030,7 +1227,7 @@ module_eval <<'.,.,', 'grammar.ra', 209
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 217
+module_eval <<'.,.,', 'grammar.ra', 232
   def _reduce_43( val, _values, result )
     if val[1]
         result = val[1]
@@ -1046,7 +1243,7 @@ module_eval <<'.,.,', 'grammar.ra', 217
 
  # reduce 45 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 225
+module_eval <<'.,.,', 'grammar.ra', 240
   def _reduce_46( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
    result
@@ -1055,7 +1252,7 @@ module_eval <<'.,.,', 'grammar.ra', 225
 
  # reduce 47 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 231
+module_eval <<'.,.,', 'grammar.ra', 246
   def _reduce_48( val, _values, result )
     result = val[1]
     result.parens = true
@@ -1067,7 +1264,7 @@ module_eval <<'.,.,', 'grammar.ra', 231
 
  # reduce 50 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 239
+module_eval <<'.,.,', 'grammar.ra', 254
   def _reduce_51( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
@@ -1076,7 +1273,7 @@ module_eval <<'.,.,', 'grammar.ra', 239
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 244
+module_eval <<'.,.,', 'grammar.ra', 259
   def _reduce_52( val, _values, result )
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
     #result = ast AST::CollExpr
@@ -1089,7 +1286,7 @@ module_eval <<'.,.,', 'grammar.ra', 244
 
  # reduce 54 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 251
+module_eval <<'.,.,', 'grammar.ra', 266
   def _reduce_55( val, _values, result )
     result = ast AST::ResourceInstance, :children => [val[0],val[2]]
    result
@@ -1098,7 +1295,7 @@ module_eval <<'.,.,', 'grammar.ra', 251
 
  # reduce 56 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 261
+module_eval <<'.,.,', 'grammar.ra', 276
   def _reduce_57( val, _values, result )
     if val[0].instance_of?(AST::ResourceInstance)
         result = ast AST::ASTArray, :children => [val[0],val[2]]
@@ -1114,21 +1311,21 @@ module_eval <<'.,.,', 'grammar.ra', 261
 
  # reduce 59 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 268
+module_eval <<'.,.,', 'grammar.ra', 283
   def _reduce_60( val, _values, result )
     result = ast AST::Undef, :value => :undef
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 272
+module_eval <<'.,.,', 'grammar.ra', 287
   def _reduce_61( val, _values, result )
     result = ast AST::Name, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 276
+module_eval <<'.,.,', 'grammar.ra', 291
   def _reduce_62( val, _values, result )
     result = ast AST::Type, :value => val[0]
    result
@@ -1147,7 +1344,7 @@ module_eval <<'.,.,', 'grammar.ra', 276
 
  # reduce 68 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 292
+module_eval <<'.,.,', 'grammar.ra', 307
   def _reduce_69( val, _values, result )
     if val[0] =~ /::/
         raise Puppet::ParseError, "Cannot assign to variables in other namespaces"
@@ -1159,22 +1356,30 @@ module_eval <<'.,.,', 'grammar.ra', 292
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 297
+module_eval <<'.,.,', 'grammar.ra', 312
   def _reduce_70( val, _values, result )
-    result = ast AST::ASTArray
+    variable = ast AST::Name, :value => val[0]
+    result = ast AST::VarDef, :name => variable, :value => val[2], :append => true
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 297
+module_eval <<'.,.,', 'grammar.ra', 317
   def _reduce_71( val, _values, result )
- result = val[0]
+    result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 306
+module_eval <<'.,.,', 'grammar.ra', 317
   def _reduce_72( val, _values, result )
+ result = val[0]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 326
+  def _reduce_73( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1185,41 +1390,41 @@ module_eval <<'.,.,', 'grammar.ra', 306
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 310
-  def _reduce_73( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 330
+  def _reduce_74( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 315
-  def _reduce_74( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 335
+  def _reduce_75( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2],
                                      :add => true
    result
   end
 .,.,
 
- # reduce 75 omitted
-
  # reduce 76 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 323
-  def _reduce_77( val, _values, result )
+ # reduce 77 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 343
+  def _reduce_78( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 323
-  def _reduce_78( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 343
+  def _reduce_79( val, _values, result )
  result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 332
-  def _reduce_79( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 352
+  def _reduce_80( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1230,10 +1435,10 @@ module_eval <<'.,.,', 'grammar.ra', 332
   end
 .,.,
 
- # reduce 80 omitted
+ # reduce 81 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 341
-  def _reduce_81( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 361
+  def _reduce_82( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         result = val[0].push(val[2])
     else
@@ -1243,8 +1448,6 @@ module_eval <<'.,.,', 'grammar.ra', 341
   end
 .,.,
 
- # reduce 82 omitted
-
  # reduce 83 omitted
 
  # reduce 84 omitted
@@ -1275,8 +1478,10 @@ module_eval <<'.,.,', 'grammar.ra', 341
 
  # reduce 97 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 368
-  def _reduce_98( val, _values, result )
+ # reduce 98 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 388
+  def _reduce_99( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -1286,8 +1491,8 @@ module_eval <<'.,.,', 'grammar.ra', 368
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 373
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 393
+  def _reduce_100( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
         :arguments => AST::ASTArray.new({}),
@@ -1296,44 +1501,44 @@ module_eval <<'.,.,', 'grammar.ra', 373
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 377
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 397
+  def _reduce_101( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 379
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 399
+  def _reduce_102( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 383
-  def _reduce_102( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 403
+  def _reduce_103( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 388
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 408
+  def _reduce_104( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 390
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 410
+  def _reduce_105( val, _values, result )
     result = ast AST::ResourceReference, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 403
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 423
+  def _reduce_106( val, _values, result )
     args = {
         :test => val[1],
         :statements => val[3]
@@ -1348,19 +1553,161 @@ module_eval <<'.,.,', 'grammar.ra', 403
   end
 .,.,
 
- # reduce 106 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 408
+module_eval <<'.,.,', 'grammar.ra', 435
   def _reduce_107( val, _values, result )
-    result = ast AST::Else, :statements => val[2]
+    args = {
+        :test => val[1],
+        :statements => ast(AST::Nop)
+    }
+
+    if val[4]
+        args[:else] = val[4]
+    end
+
+    result = ast AST::IfStatement, args
    result
   end
 .,.,
 
  # reduce 108 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 420
+module_eval <<'.,.,', 'grammar.ra', 440
   def _reduce_109( val, _values, result )
+    result = ast AST::Else, :statements => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 443
+  def _reduce_110( val, _values, result )
+    result = ast AST::Else, :statements => ast(AST::Nop)
+   result
+  end
+.,.,
+
+ # reduce 111 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 460
+  def _reduce_112( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 463
+  def _reduce_113( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 466
+  def _reduce_114( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 469
+  def _reduce_115( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 472
+  def _reduce_116( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 475
+  def _reduce_117( val, _values, result )
+    result = ast AST::ArithmeticOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 478
+  def _reduce_118( val, _values, result )
+    result = ast AST::Minus, :value => val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 481
+  def _reduce_119( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 484
+  def _reduce_120( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 487
+  def _reduce_121( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 490
+  def _reduce_122( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 493
+  def _reduce_123( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 496
+  def _reduce_124( val, _values, result )
+    result = ast AST::ComparisonOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 499
+  def _reduce_125( val, _values, result )
+    result = ast AST::Not, :value => val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 502
+  def _reduce_126( val, _values, result )
+    result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 505
+  def _reduce_127( val, _values, result )
+    result = ast AST::BooleanOperator, :operator => val[1], :lval => val[0], :rval => val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 508
+  def _reduce_128( val, _values, result )
+    result = val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 516
+  def _reduce_129( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = ast AST::ASTArray, :children => [val[3]]
@@ -1370,10 +1717,10 @@ module_eval <<'.,.,', 'grammar.ra', 420
   end
 .,.,
 
- # reduce 110 omitted
+ # reduce 130 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 430
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 526
+  def _reduce_131( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1384,15 +1731,15 @@ module_eval <<'.,.,', 'grammar.ra', 430
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 434
-  def _reduce_112( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 530
+  def _reduce_132( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 439
-  def _reduce_113( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 535
+  def _reduce_133( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
         :statements => ast(AST::ASTArray)
@@ -1401,10 +1748,10 @@ module_eval <<'.,.,', 'grammar.ra', 439
   end
 .,.,
 
- # reduce 114 omitted
+ # reduce 134 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 449
-  def _reduce_115( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 545
+  def _reduce_135( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1415,26 +1762,26 @@ module_eval <<'.,.,', 'grammar.ra', 449
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 453
-  def _reduce_116( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 549
+  def _reduce_136( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 117 omitted
+ # reduce 137 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 455
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 551
+  def _reduce_138( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 119 omitted
+ # reduce 139 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 466
-  def _reduce_120( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 562
+  def _reduce_140( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1445,50 +1792,50 @@ module_eval <<'.,.,', 'grammar.ra', 466
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 470
-  def _reduce_121( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 566
+  def _reduce_141( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 122 omitted
+ # reduce 142 omitted
 
- # reduce 123 omitted
+ # reduce 143 omitted
 
- # reduce 124 omitted
+ # reduce 144 omitted
 
- # reduce 125 omitted
+ # reduce 145 omitted
 
- # reduce 126 omitted
+ # reduce 146 omitted
 
- # reduce 127 omitted
+ # reduce 147 omitted
 
- # reduce 128 omitted
+ # reduce 148 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 481
-  def _reduce_129( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 577
+  def _reduce_149( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 483
-  def _reduce_130( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 579
+  def _reduce_150( val, _values, result )
  result = [val[0].value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 487
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 583
+  def _reduce_151( val, _values, result )
     results = val[0] << val[2].value
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 495
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 591
+  def _reduce_152( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1498,8 +1845,8 @@ module_eval <<'.,.,', 'grammar.ra', 495
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 505
-  def _reduce_133( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 601
+  def _reduce_153( val, _values, result )
     newdefine classname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
     result = nil
@@ -1509,8 +1856,8 @@ module_eval <<'.,.,', 'grammar.ra', 505
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 509
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 605
+  def _reduce_154( val, _values, result )
     newdefine classname(val[1]), :arguments => val[2]
     @lexer.indefine = false
     result = nil
@@ -1518,8 +1865,8 @@ module_eval <<'.,.,', 'grammar.ra', 509
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 517
-  def _reduce_135( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 613
+  def _reduce_155( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     newclass classname(val[1]), :code => val[4], :parent => val[2]
@@ -1528,8 +1875,8 @@ module_eval <<'.,.,', 'grammar.ra', 517
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 522
-  def _reduce_136( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 618
+  def _reduce_156( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     newclass classname(val[1]), :parent => val[2]
@@ -1538,32 +1885,32 @@ module_eval <<'.,.,', 'grammar.ra', 522
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 527
-  def _reduce_137( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 623
+  def _reduce_157( val, _values, result )
     newnode val[1], :parent => val[2], :code => val[4]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 530
-  def _reduce_138( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 626
+  def _reduce_158( val, _values, result )
     newnode val[1], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
- # reduce 139 omitted
+ # reduce 159 omitted
 
- # reduce 140 omitted
+ # reduce 160 omitted
 
- # reduce 141 omitted
+ # reduce 161 omitted
 
- # reduce 142 omitted
+ # reduce 162 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 544
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 640
+  def _reduce_163( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1571,49 +1918,49 @@ module_eval <<'.,.,', 'grammar.ra', 544
   end
 .,.,
 
- # reduce 144 omitted
+ # reduce 164 omitted
 
- # reduce 145 omitted
+ # reduce 165 omitted
 
- # reduce 146 omitted
+ # reduce 166 omitted
 
- # reduce 147 omitted
+ # reduce 167 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 553
-  def _reduce_148( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 649
+  def _reduce_168( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 557
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 653
+  def _reduce_169( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 150 omitted
+ # reduce 170 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 562
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 658
+  def _reduce_171( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 566
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 662
+  def _reduce_172( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 153 omitted
+ # reduce 173 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 573
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 669
+  def _reduce_174( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1621,67 +1968,67 @@ module_eval <<'.,.,', 'grammar.ra', 573
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_155( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 674
+  def _reduce_175( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 582
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 678
+  def _reduce_176( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 584
-  def _reduce_157( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 680
+  def _reduce_177( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 586
-  def _reduce_158( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 682
+  def _reduce_178( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 159 omitted
+ # reduce 179 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 591
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 687
+  def _reduce_180( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 161 omitted
+ # reduce 181 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 596
-  def _reduce_162( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 692
+  def _reduce_182( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 163 omitted
+ # reduce 183 omitted
 
- # reduce 164 omitted
+ # reduce 184 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 602
-  def _reduce_165( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 698
+  def _reduce_185( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 610
-  def _reduce_166( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 706
+  def _reduce_186( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1691,21 +2038,32 @@ module_eval <<'.,.,', 'grammar.ra', 610
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 612
-  def _reduce_167( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 713
+  def _reduce_187( val, _values, result )
+    if val[1].instance_of?(AST::ASTArray)
+        result = val[1]
+    else
+        result = ast AST::ASTArray, :children => [val[1]]
+    end
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'grammar.ra', 715
+  def _reduce_188( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 168 omitted
+ # reduce 189 omitted
 
- # reduce 169 omitted
+ # reduce 190 omitted
 
- # reduce 170 omitted
+ # reduce 191 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 617
-  def _reduce_171( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 720
+  def _reduce_192( val, _values, result )
  result = nil
    result
   end