puppet 0.23.0 → 0.23.1

data/lib/puppet/network/handler/report.rb

@@ -52,6 +52,7 @@ class Puppet::Network::Handler
             docs = ""
 
             # Use this method so they all get loaded
+            instance_loader(:report).loadall
             loaded_instances(:report).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
                 mod = self.report(name)
                 docs += "%s\n%s\n" % [name, "-" * name.to_s.length]
@@ -141,4 +142,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: report.rb 2517 2007-05-15 19:22:36Z luke $
+# $Id: report.rb 2637 2007-06-20 00:16:41Z luke $

data/lib/puppet/network/server/mongrel.rb

@@ -30,9 +30,10 @@
 require 'rubygems'
 require 'mongrel'
 require 'xmlrpc/server'
-require 'puppet/network/server'
 require 'puppet/network/xmlrpc/server'
+require 'puppet/network/server'
 require 'puppet/network/client_request'
+require 'puppet/daemon'
 
 require 'resolv'
 
@@ -49,6 +50,7 @@ require 'resolv'
 # </pre>
 module Puppet::Network
     class Server::Mongrel < ::Mongrel::HttpHandler
+        include Puppet::Daemon
         attr_reader :xmlrpc_server
 
         def initialize(handlers)
@@ -135,4 +137,4 @@ module Puppet::Network
     end
 end
 
-# $Id: mongrel.rb 2558 2007-06-11 18:07:34Z luke $
+# $Id: mongrel.rb 2659 2007-07-08 23:02:06Z luke $

data/lib/puppet/network/xmlrpc/client.rb

@@ -99,6 +99,13 @@ module Puppet::Network
             hash[:Path] ||= "/RPC2"
             hash[:Server] ||= Puppet[:server]
             hash[:Port] ||= Puppet[:masterport]
+            hash[:HTTPProxyHost] ||= Puppet[:http_proxy_host]
+            hash[:HTTPProxyPort] ||= Puppet[:http_proxy_port]
+
+            if "none" == hash[:HTTPProxyHost]
+                hash[:HTTPProxyHost] = nil
+                hash[:HTTPProxyPort] = nil
+            end
 
             @puppet_server = hash[:Server]
             @puppet_port = hash[:Port]
@@ -107,8 +114,8 @@ module Puppet::Network
                 hash[:Server],
                 hash[:Path],
                 hash[:Port],
-                nil, # proxy_host
-                nil, # proxy_port
+                hash[:HTTPProxyHost], # proxy_host
+                hash[:HTTPProxyPort], # proxy_port
                 nil, # user
                 nil, # password
                 true, # use_ssl
@@ -126,4 +133,4 @@ module Puppet::Network
     end
 end
 
-# $Id: client.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: client.rb 2661 2007-07-08 23:57:56Z luke $

data/lib/puppet/parameter.rb

@@ -1,10 +1,17 @@
 require 'puppet/util/methodhelper'
-
-class Puppet::Parameter < Puppet::Element
+require 'puppet/util/log_paths'
+require 'puppet/util/logging'
+
+class Puppet::Parameter
+    include Puppet::Util
+    include Puppet::Util::Errors
+    include Puppet::Util::LogPaths
+    include Puppet::Util::Logging
     include Puppet::Util::MethodHelper
     class << self
+        include Puppet::Util
         attr_reader :validater, :munger, :name, :default, :required_features
-        attr_accessor :metaparam, :element
+        attr_accessor :metaparam
 
         # Define the default value for a given parameter or parameter.  This
         # means that 'nil' is an invalid default value.  This defines
@@ -477,4 +484,4 @@ class Puppet::Parameter < Puppet::Element
     end
 end
 
-# $Id: parameter.rb 2503 2007-05-10 21:46:59Z luke $
+# $Id: parameter.rb 2647 2007-07-04 22:25:23Z luke $

data/lib/puppet/parser/ast/collexpr.rb

@@ -43,7 +43,11 @@ class CollExpr < AST::Branch
         end
 
         case @oper
-        when "and", "or": oper = @oper.upcase
+        when "and", "or":
+            if form == :exported
+                raise Puppet::ParseError, "Puppet does not currently support collecting exported resources with more than one condition"
+            end
+            oper = @oper.upcase
         when "==": oper = "="
         else
             oper = @oper
@@ -54,17 +58,13 @@ class CollExpr < AST::Branch
             if str1 == "title"
                 str = "title #{oper} '#{str2}'"
             else
-                unless self.form == :virtual or str1 == "title"
-                    parsefail "Collection from the database only supports " +
-                        "title matching currently"
-                end
-                str = "rails_parameters.name = '#{str1}' and " +
-                    "rails_parameters.value #{oper} '#{str2}'"
+                str = "param_values.value #{oper} '#{str2}' and " +
+                    "param_names.name = '#{str1}'"
             end
         else
-            str = [str1, oper, str2].join(" ")
+            str = "(%s) %s (%s)" % [str1, oper, str2]
         end
-
+        
         return str, code
     end
 
@@ -78,4 +78,4 @@ class CollExpr < AST::Branch
 end
 end
 
-# $Id: collexpr.rb 1726 2006-10-04 18:24:24Z luke $
+# $Id: collexpr.rb 2714 2007-07-19 18:12:20Z luke $

data/lib/puppet/parser/ast/hostclass.rb

@@ -25,7 +25,7 @@ class Puppet::Parser::AST
             args = hash[:arguments]
 
             # Verify that we haven't already been evaluated
-            if scope.setclass?(self)
+            if scope.class_scope(self)
                 Puppet.debug "%s class already evaluated" % @type
                 return nil
             end
@@ -75,4 +75,4 @@ class Puppet::Parser::AST
     end
 end
 
-# $Id: hostclass.rb 2511 2007-05-14 15:19:48Z luke $
+# $Id: hostclass.rb 2646 2007-07-04 21:06:26Z luke $

data/lib/puppet/parser/ast/resourceparam.rb

@@ -3,7 +3,7 @@ require 'puppet/parser/ast/branch'
 class Puppet::Parser::AST
     # The AST object for the parameters inside ResourceDefs and Selectors.
     class ResourceParam < AST::Branch
-        attr_accessor :value, :param
+        attr_accessor :value, :param, :add
 
         def each
             [@param,@value].each { |child| yield child }
@@ -16,7 +16,8 @@ class Puppet::Parser::AST
             return Puppet::Parser::Resource::Param.new(
                 :name => @param,
                 :value => @value.safeevaluate(:scope => scope),
-                :source => scope.source, :line => self.line, :file => self.file
+                :source => scope.source, :line => self.line, :file => self.file,
+                :add => self.add
             )
         end
 
@@ -34,4 +35,4 @@ class Puppet::Parser::AST
     end
 end
 
-# $Id: resourceparam.rb 1739 2006-10-06 03:13:15Z luke $
+# $Id: resourceparam.rb 2670 2007-07-10 15:31:19Z luke $

data/lib/puppet/parser/ast/resourceref.rb

@@ -19,9 +19,23 @@ class Puppet::Parser::AST
 
             # We want a lower-case type.
             objtype = @type.downcase
-
             title = @title.safeevaluate(:scope => scope)
 
+            if scope.builtintype?(objtype)
+                # nothing
+            elsif dtype = scope.finddefine(objtype)
+                objtype = dtype.classname
+            elsif objtype == "class"
+                # Look up the full path to the class
+                if classobj = scope.findclass(title)
+                    title = classobj.classname
+                else
+                    raise Puppet::ParseError, "Could not find class %s" % title
+                end
+            else
+                raise Puppet::ParseError, "Could not find resource type %s" % objtype
+            end
+
             return Puppet::Parser::Resource::Reference.new(
                 :type => objtype, :title => title
             )
@@ -41,4 +55,4 @@ class Puppet::Parser::AST
     end
 end
 
-# $Id: resourceref.rb 1726 2006-10-04 18:24:24Z luke $
+# $Id: resourceref.rb 2715 2007-07-19 19:23:56Z luke $

data/lib/puppet/parser/collector.rb

@@ -22,9 +22,13 @@ class Puppet::Parser::Collector
         end
         host = Puppet::Rails::Host.find_by_name(@scope.host)
 
-        args = {}
+        args = {:include => {:param_values => :param_name}}
+        args[:conditions] = "restype = '%s'" % [@type]
+        if @equery
+            args[:conditions] += " AND (%s)" % [@equery]
+        end
         if host
-            args[:conditions] = "host_id != #{host.id}"
+            args[:conditions] = "host_id != %s AND %s" % [host.id, args[:conditions]]
         else
             #Puppet.info "Host %s is uninitialized" % @scope.host
         end
@@ -33,7 +37,7 @@ class Puppet::Parser::Collector
         # and such, we'll need to vary the conditions, but this works with no
         # attributes, anyway.
         time = Puppet::Util.thinmark do
-            Puppet::Rails::Resource.find_all_by_restype_and_exported(@type, true,
+            Puppet::Rails::Resource.find(:all, @type, true,
                 args
             ).each do |obj|
                 if resource = export_resource(obj)
@@ -178,4 +182,4 @@ class Puppet::Parser::Collector
     end
 end
 
-# $Id: collector.rb 2215 2007-02-18 20:09:35Z luke $
+# $Id: collector.rb 2705 2007-07-18 17:32:46Z luke $

data/lib/puppet/parser/functions.rb

@@ -160,7 +160,10 @@ module Functions
     # Test whether a given class or definition is defined
     newfunction(:defined, :type => :rvalue, :doc => "Determine whether a given
     type is defined, either as a native type or a defined type, or whether a class is defined.
-    This is useful for checking whether a class is defined and only including it if it is.") do |vals|
+    This is useful for checking whether a class is defined and only including it if it is.
+    This function can also test whether a resource has been defined, using resource references
+    (e.g., ``if defined(File['/tmp/myfile'] { ... }``).  This function is unfortunately
+    dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals|
         result = false
         vals.each do |val|
             case val
@@ -300,4 +303,4 @@ module Functions
 end
 end
 
-# $Id: functions.rb 2502 2007-05-10 21:27:40Z luke $
+# $Id: functions.rb 2681 2007-07-12 14:35:45Z luke $

data/lib/puppet/parser/interpreter.rb

@@ -1,7 +1,3 @@
-# The interepreter's job is to convert from a parsed file to the configuration
-# for a given client.  It really doesn't do any work on its own, it just collects
-# and calls out to other objects.
-
 require 'puppet'
 require 'timeout'
 require 'puppet/rails'
@@ -9,6 +5,9 @@ require 'puppet/util/methodhelper'
 require 'puppet/parser/parser'
 require 'puppet/parser/scope'
 
+# The interpreter's job is to convert from a parsed file to the configuration
+# for a given client.  It really doesn't do any work on its own, it just collects
+# and calls out to other objects.
 class Puppet::Parser::Interpreter
     class NodeDef
         include Puppet::Util::MethodHelper
@@ -29,7 +28,7 @@ class Puppet::Parser::Interpreter
 
             # Then evaluate the classes.
             begin
-                options[:scope].function_include(classes)
+                options[:scope].function_include(classes.find_all { |c| options[:scope].findclass(c) })
             rescue => detail
                 raise Puppet::ParseError, "Could not evaluate classes for %s: %s" % [name, detail]
             end
@@ -267,11 +266,13 @@ class Puppet::Parser::Interpreter
 
     # Find a class definition, relative to the current namespace.
     def findclass(namespace, name)
+        #find_or_load namespace, name, @classtable
         fqfind namespace, name, @classtable
     end
 
     # Find a component definition, relative to the current namespace.
     def finddefine(namespace, name)
+        #find_or_load namespace, name, @definetable
         fqfind namespace, name, @definetable
     end
 
@@ -280,13 +281,17 @@ class Puppet::Parser::Interpreter
         namespace = namespace.downcase
         name = name.downcase
         if name =~ /^::/ or namespace == ""
-            return table[name.sub(/^::/, '')]
+            classname = name.sub(/^::/, '')
+            unless table[classname]
+                self.load(classname)
+            end
+            return table[classname]
         end
         ary = namespace.split("::")
 
         while ary.length > 0
             newname = (ary + [name]).join("::").sub(/^::/, '')
-            if obj = table[newname]
+            if obj = table[newname] or (self.load(newname) and obj = table[newname])
                 return obj
             end
 
@@ -296,7 +301,7 @@ class Puppet::Parser::Interpreter
 
         # If we've gotten to this point without finding it, see if the name
         # exists at the top namespace
-        if obj = table[name]
+        if obj = table[name] or (self.load(name) and obj = table[name])
             return obj
         end
 
@@ -356,6 +361,7 @@ class Puppet::Parser::Interpreter
         end
 
         @files = []
+        @loaded = []
 
         # Create our parser object
         parsefiles
@@ -371,6 +377,39 @@ class Puppet::Parser::Interpreter
         @definetable = {}
     end
 
+    # Try to load a class, since we could not find it.
+    def load(classname)
+        return false if classname == ""
+        filename = classname.gsub("::", File::SEPARATOR)
+
+        loaded = false
+        # First try to load the top-level module
+        mod = filename.scan(/^[\w-]+/).shift
+        unless @loaded.include?(mod)
+            @loaded << mod
+            begin
+                @parser.import(mod)
+                Puppet.info "Autoloaded module %s" % mod
+                loaded = true
+            rescue Puppet::ImportError => detail
+                # We couldn't load the module
+            end
+        end
+
+        unless filename == mod and ! @loaded.include?(mod)
+            @loaded << mod
+            # Then the individual file
+            begin
+                @parser.import(filename)
+                Puppet.info "Autoloaded file %s from module %s" % [filename, mod]
+                loaded = true
+            rescue Puppet::ImportError => detail
+                # We couldn't load the file
+            end
+        end
+        return loaded
+    end
+
     # Find the ldap node, return the class list and parent node specially,
     # and everything else in a parameter hash.
     def ldapsearch(node)
@@ -843,4 +882,4 @@ class Puppet::Parser::Interpreter
     end
 end
 
-# $Id: interpreter.rb 2626 2007-06-19 01:58:49Z luke $
+# $Id: interpreter.rb 2720 2007-07-20 03:36:54Z luke $

data/lib/puppet/parser/lexer.rb

@@ -46,6 +46,7 @@ module Puppet
                 %r{\?} => :QMARK,
                 %r{\\} => :BACKSLASH,
                 %r{=>} => :FARROW,
+                %r{\+>} => :PARROW,
                 %r{[a-z][-\w]*} => :NAME,
                 %r{([a-z][-\w]*::)+[a-z][-\w]*} => :CLASSNAME,
                 %r{([A-Z][-\w]*::)+[A-Z][-\w]*} => :CLASSREF,
@@ -330,4 +331,4 @@ module Puppet
     end
 end
 
-# $Id: lexer.rb 2531 2007-05-25 00:31:28Z luke $
+# $Id: lexer.rb 2670 2007-07-10 15:31:19Z luke $

data/lib/puppet/parser/parser.rb

@@ -15,8 +15,8 @@ require 'puppet/parser/ast'
 
 module Puppet
     class ParseError < Puppet::Error; end
-
     class ImportError < Racc::ParseError; end
+    class AlreadyImportedError < ImportError; end
 end
 
 Puppet[:typecheck] = true
@@ -29,7 +29,7 @@ module Puppet
 
     class Parser < Racc::Parser
 
-module_eval <<'..end grammar.ra modeval..id8685abbbb8', 'grammar.ra', 614
+module_eval <<'..end grammar.ra modeval..id72fb6a61b8', 'grammar.ra', 640
 require 'puppet/parser/functions'
 
 attr_reader :file, :interp
@@ -102,7 +102,7 @@ def file=(file)
         end
     end
     if @files.detect { |f| f.file == file }
-        raise Puppet::ImportError.new("Import loop detected")
+        raise Puppet::AlreadyImportedError.new("Import loop detected")
     else
         @files << Puppet::Util::LoadedFile.new(file)
         @lexer.file = file
@@ -151,11 +151,8 @@ def import(file)
         end
         begin
             parser.file = file
-        rescue Puppet::ImportError
-            Puppet.warning(
-                "Importing %s would result in an import loop" %
-                    File.join(dir, file)
-            )
+        rescue Puppet::AlreadyImportedError
+            # This file has already been imported to just move on
             next
         end
 
@@ -259,503 +256,536 @@ end
 # mode: ruby
 # End:
 
-# $Id: parser.rb 2599 2007-06-18 06:26:01Z luke $
+# $Id: parser.rb 2694 2007-07-14 18:09:26Z luke $
 
-..end grammar.ra modeval..id8685abbbb8
+..end grammar.ra modeval..id72fb6a61b8
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 52, :_reduce_1,
- 1, 52, :_reduce_none,
+ 1, 53, :_reduce_1,
  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, 54, :_reduce_none,
+ 2, 54, :_reduce_4,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 1, 56, :_reduce_none,
+ 4, 64, :_reduce_17,
+ 3, 64, :_reduce_18,
+ 2, 64, :_reduce_19,
+ 1, 69, :_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, 85, :_reduce_39,
- 2, 85, :_reduce_40,
- 2, 58, :_reduce_41,
- 1, 86, :_reduce_none,
- 1, 86, :_reduce_none,
- 3, 87, :_reduce_44,
- 3, 87, :_reduce_45,
- 1, 88, :_reduce_none,
- 1, 88, :_reduce_none,
- 3, 88, :_reduce_48,
+ 3, 70, :_reduce_23,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_none,
+ 1, 72, :_reduce_31,
+ 1, 71, :_reduce_none,
+ 3, 71, :_reduce_33,
+ 5, 57, :_reduce_34,
+ 5, 57, :_reduce_35,
+ 5, 57, :_reduce_36,
+ 5, 68, :_reduce_37,
+ 2, 58, :_reduce_38,
+ 1, 88, :_reduce_39,
+ 2, 88, :_reduce_40,
+ 2, 59, :_reduce_41,
  1, 89, :_reduce_none,
- 3, 89, :_reduce_50,
- 1, 90, :_reduce_none,
- 1, 90, :_reduce_none,
- 3, 91, :_reduce_53,
- 3, 91, :_reduce_54,
- 1, 92, :_reduce_none,
+ 1, 89, :_reduce_none,
+ 3, 90, :_reduce_44,
+ 3, 90, :_reduce_45,
+ 1, 91, :_reduce_none,
+ 1, 91, :_reduce_none,
+ 3, 91, :_reduce_48,
  1, 92, :_reduce_none,
- 4, 94, :_reduce_57,
- 1, 81, :_reduce_none,
- 3, 81, :_reduce_59,
- 0, 82, :_reduce_none,
- 1, 82, :_reduce_none,
- 1, 96, :_reduce_62,
- 1, 72, :_reduce_63,
- 1, 74, :_reduce_64,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 1, 95, :_reduce_none,
- 3, 59, :_reduce_71,
- 0, 83, :_reduce_72,
- 1, 83, :_reduce_73,
- 3, 83, :_reduce_74,
- 3, 99, :_reduce_75,
- 1, 100, :_reduce_none,
- 3, 100, :_reduce_77,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
- 1, 93, :_reduce_none,
+ 3, 92, :_reduce_50,
  1, 93, :_reduce_none,
  1, 93, :_reduce_none,
+ 3, 94, :_reduce_53,
+ 3, 94, :_reduce_54,
+ 1, 95, :_reduce_none,
+ 1, 95, :_reduce_none,
+ 4, 97, :_reduce_57,
+ 1, 82, :_reduce_none,
+ 3, 82, :_reduce_59,
+ 0, 83, :_reduce_none,
+ 1, 83, :_reduce_none,
+ 1, 99, :_reduce_62,
+ 1, 73, :_reduce_63,
+ 1, 75, :_reduce_64,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
  1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 1, 98, :_reduce_none,
- 4, 76, :_reduce_94,
- 3, 76, :_reduce_95,
- 1, 78, :_reduce_96,
- 1, 78, :_reduce_97,
- 1, 75, :_reduce_98,
- 4, 79, :_reduce_99,
- 4, 79, :_reduce_100,
- 6, 61, :_reduce_101,
- 0, 103, :_reduce_none,
- 4, 103, :_reduce_103,
- 1, 102, :_reduce_none,
- 5, 60, :_reduce_105,
+ 3, 60, :_reduce_71,
+ 0, 84, :_reduce_72,
+ 1, 84, :_reduce_73,
+ 3, 84, :_reduce_74,
+ 3, 102, :_reduce_75,
+ 3, 103, :_reduce_76,
  1, 104, :_reduce_none,
- 2, 104, :_reduce_107,
- 5, 105, :_reduce_108,
- 4, 105, :_reduce_109,
- 1, 106, :_reduce_none,
- 3, 106, :_reduce_111,
- 3, 77, :_reduce_112,
- 1, 108, :_reduce_none,
- 4, 108, :_reduce_114,
- 1, 110, :_reduce_none,
- 3, 110, :_reduce_116,
- 3, 109, :_reduce_117,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_none,
+ 1, 104, :_reduce_none,
+ 0, 87, :_reduce_79,
+ 1, 87, :_reduce_80,
+ 3, 87, :_reduce_81,
+ 1, 105, :_reduce_none,
+ 3, 105, :_reduce_83,
+ 1, 96, :_reduce_none,
+ 1, 96, :_reduce_none,
+ 1, 96, :_reduce_none,
+ 1, 96, :_reduce_none,
+ 1, 96, :_reduce_none,
+ 1, 96, :_reduce_none,
+ 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, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 1, 101, :_reduce_none,
+ 4, 77, :_reduce_100,
+ 3, 77, :_reduce_101,
+ 1, 79, :_reduce_102,
+ 1, 79, :_reduce_103,
+ 1, 76, :_reduce_104,
+ 4, 80, :_reduce_105,
+ 4, 80, :_reduce_106,
+ 6, 62, :_reduce_107,
+ 0, 108, :_reduce_none,
+ 4, 108, :_reduce_109,
  1, 107, :_reduce_none,
- 1, 107, :_reduce_125,
- 1, 111, :_reduce_126,
- 3, 111, :_reduce_127,
- 2, 62, :_reduce_128,
- 6, 64, :_reduce_129,
- 5, 64, :_reduce_130,
- 6, 65, :_reduce_131,
- 5, 65, :_reduce_132,
- 6, 66, :_reduce_133,
- 5, 66, :_reduce_134,
- 1, 80, :_reduce_none,
- 1, 80, :_reduce_none,
- 1, 114, :_reduce_none,
- 3, 114, :_reduce_138,
- 1, 116, :_reduce_none,
- 1, 116, :_reduce_none,
- 1, 116, :_reduce_none,
- 0, 54, :_reduce_142,
- 0, 117, :_reduce_143,
- 1, 112, :_reduce_none,
- 3, 112, :_reduce_145,
- 3, 112, :_reduce_146,
- 1, 118, :_reduce_none,
- 3, 118, :_reduce_148,
- 3, 119, :_reduce_149,
- 1, 119, :_reduce_150,
- 3, 119, :_reduce_151,
- 1, 119, :_reduce_152,
- 1, 115, :_reduce_none,
- 2, 115, :_reduce_154,
+ 5, 61, :_reduce_111,
+ 1, 109, :_reduce_none,
+ 2, 109, :_reduce_113,
+ 5, 110, :_reduce_114,
+ 4, 110, :_reduce_115,
+ 1, 111, :_reduce_none,
+ 3, 111, :_reduce_117,
+ 3, 78, :_reduce_118,
  1, 113, :_reduce_none,
- 2, 113, :_reduce_156,
- 1, 120, :_reduce_none,
+ 4, 113, :_reduce_120,
+ 1, 115, :_reduce_none,
+ 3, 115, :_reduce_122,
+ 3, 114, :_reduce_123,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_none,
+ 1, 112, :_reduce_131,
+ 1, 116, :_reduce_132,
+ 3, 116, :_reduce_133,
+ 2, 63, :_reduce_134,
+ 6, 65, :_reduce_135,
+ 5, 65, :_reduce_136,
+ 6, 66, :_reduce_137,
+ 5, 66, :_reduce_138,
+ 6, 67, :_reduce_139,
+ 5, 67, :_reduce_140,
+ 1, 86, :_reduce_none,
+ 1, 86, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 81, :_reduce_none,
+ 1, 119, :_reduce_none,
+ 3, 119, :_reduce_146,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 1, 121, :_reduce_none,
+ 0, 55, :_reduce_151,
+ 0, 122, :_reduce_152,
+ 1, 117, :_reduce_none,
+ 3, 117, :_reduce_154,
+ 3, 117, :_reduce_155,
+ 1, 123, :_reduce_none,
+ 3, 123, :_reduce_157,
+ 3, 124, :_reduce_158,
+ 1, 124, :_reduce_159,
+ 3, 124, :_reduce_160,
+ 1, 124, :_reduce_161,
  1, 120, :_reduce_none,
- 1, 73, :_reduce_159,
- 3, 97, :_reduce_160,
- 2, 97, :_reduce_161,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 0, 84, :_reduce_none,
- 1, 84, :_reduce_165 ]
+ 2, 120, :_reduce_163,
+ 1, 118, :_reduce_none,
+ 2, 118, :_reduce_165,
+ 1, 125, :_reduce_none,
+ 1, 125, :_reduce_none,
+ 1, 74, :_reduce_168,
+ 3, 100, :_reduce_169,
+ 2, 100, :_reduce_170,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_none,
+ 0, 85, :_reduce_none,
+ 1, 85, :_reduce_174 ]
 
-racc_reduce_n = 166
+racc_reduce_n = 175
 
-racc_shift_n = 267
+racc_shift_n = 279
 
 racc_action_table = [
-    69,    50,    53,    86,   201,    89,    69,    50,    53,    36,
-    36,   203,   191,   104,    47,   152,   113,   192,    92,    36,
-   202,   163,    59,    34,    69,    50,    53,  -124,   124,    90,
-     4,    42,   199,   200,   124,    52,   108,    42,   101,    61,
-    59,    52,    55,    38,    38,    61,    40,    40,    57,    69,
-    50,    53,   234,    38,    57,    42,    40,   225,    81,    52,
-    55,   168,    82,    61,   224,    59,   231,    69,    50,    53,
-   127,   138,    57,    69,    50,    53,  -119,   199,   200,   230,
-    42,   167,    42,    59,    52,    55,  -121,   143,    61,    59,
-  -118,    47,    50,    53,   138,  -135,   204,    57,    42,   161,
-   199,   200,    52,    55,    42,    42,    61,    59,    52,    55,
-   143,    44,    61,   138,   191,    57,    69,    50,    53,   192,
-   138,    57,    42,   129,    42,  -120,    52,    55,    34,   143,
-    61,    42,    59,   188,    45,     4,   143,    34,   154,    57,
-    69,    50,    53,    34,     4,  -121,   149,    42,   154,   180,
-     4,    52,    55,   181,   182,    61,    59,   196,    69,    50,
-    53,    50,    53,  -118,    57,    69,    50,    53,    50,    53,
-  -122,    42,   181,   249,   113,    52,    55,   159,  -120,    61,
-  -123,    59,  -119,    69,    50,    53,   208,    99,    57,    42,
-   125,   212,  -121,    52,   164,   214,    42,    61,    99,    59,
-    52,    55,    50,    53,    61,   124,    57,    69,    50,    53,
-    47,    81,   216,    57,    42,    81,   219,   113,    52,    55,
-  -118,  -119,    61,    59,   123,    69,    50,    53,   156,   122,
-   227,    57,    42,    50,    53,   228,    52,   164,    42,   229,
-    61,    59,    52,    55,    50,    53,    61,  -123,   113,    57,
-  -120,    50,    53,   154,   152,    57,    42,   151,    99,   113,
-    52,    55,    95,    42,    61,   162,   113,    52,   164,    50,
-    53,    61,   173,    57,    42,    50,    53,   154,    52,   164,
-    57,    42,    61,   130,   113,    52,   164,   135,   252,    61,
-   113,    57,   253,    50,    53,   134,    87,    82,    57,    42,
-   133,    99,  -120,    52,   164,    42,  -118,    61,   113,    52,
-   164,    50,    53,    61,  -121,   223,    57,    50,    53,  -119,
-  -123,    41,    57,    42,   260,  -165,   113,    52,   164,   261,
-    35,    61,    59,    50,    53,    50,    53,   119,  -122,    32,
-    57,    42,   226,   nil,   nil,    52,   164,    42,    59,    61,
-   113,    52,    55,   169,   nil,    61,   nil,   nil,    57,    45,
-   nil,   nil,   nil,    42,    57,    42,   nil,    52,    55,    52,
-   164,    61,   266,    61,   nil,    45,   nil,    45,   nil,   nil,
-    57,   nil,    57,    19,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   232,   nil,    16,   nil,    21,    25,   nil,     1,     5,
-   nil,    10,    19,    14,   nil,    18,   nil,    27,   nil,   nil,
-     4,   nil,    16,   nil,    21,    25,   221,     1,     5,   nil,
-    10,   nil,    14,   nil,    18,   nil,    27,    19,   nil,     4,
-   nil,   nil,   nil,   nil,   nil,   244,   nil,    16,   nil,    21,
-    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,
-   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,
-   258,     1,     5,   nil,    10,   nil,    14,   nil,    18,   nil,
-    27,    19,   nil,     4,   nil,   nil,   nil,   nil,   nil,   245,
-   nil,    16,   nil,    21,    25,   nil,     1,     5,   nil,    10,
-    19,    14,   nil,    18,   nil,    27,   nil,   nil,     4,   nil,
-    16,   nil,    21,    25,   262,     1,     5,   nil,    10,   nil,
-    14,   nil,    18,   nil,    27,    19,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   265,   nil,    16,   nil,    21,    25,   nil,
-     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,    27,
-   nil,   nil,     4,   nil,    16,   nil,    21,    25,   205,     1,
-     5,   nil,    10,   nil,    14,   nil,    18,   nil,    27,    19,
-   nil,     4,   nil,   nil,   nil,   nil,   nil,   210,   nil,    16,
-   nil,    21,    25,   nil,     1,     5,   nil,    10,    19,    14,
-   nil,    18,   nil,    27,   nil,   nil,     4,   nil,    16,   nil,
-    21,    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,
-    18,   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,
-    25,   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,
-   nil,    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,
-   nil,     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,
-    27,   nil,   nil,     4,   nil,    16,   nil,    21,    25,   nil,
-     1,     5,   nil,    10,    19,    14,   nil,    18,   nil,    27,
-   nil,   nil,     4,   nil,    16,   nil,    21,    25,   nil,     1,
-     5,   nil,    10,   nil,    14,   nil,    18,   nil,    27,   nil,
-   nil,     4 ]
+    81,    60,    64,   103,   173,   165,    81,    60,    64,   145,
+    37,   167,    58,  -141,    51,    97,    70,  -141,   115,   107,
+   166,  -125,    70,    41,    81,    60,    64,    44,    45,    37,
+   196,    51,   142,   162,   163,    63,    66,    51,    10,    72,
+   130,    63,    66,   114,    10,    72,   172,    42,    68,    36,
+    10,    81,    60,    64,    68,    51,     5,    10,   217,    63,
+   127,   173,    46,    72,   180,    47,   251,    70,   207,    81,
+    60,    64,    68,   211,   142,    81,    60,    64,   103,   250,
+    44,    45,    51,   162,   163,    70,    63,    66,   197,    51,
+    72,    70,   199,   200,   107,    10,    81,    60,    64,    68,
+    51,   181,   245,    95,    63,    66,    51,    96,    72,   244,
+    63,    66,    70,    10,    72,    46,  -130,    68,    47,    10,
+    81,    60,    64,    68,   199,   262,    36,    51,   191,   159,
+    36,    63,    66,     5,  -129,    72,    70,     5,  -125,    36,
+    10,    58,    60,    64,    68,  -143,     5,    81,    60,    64,
+    95,    51,    44,    45,   179,    63,    66,    70,   103,    72,
+  -127,    54,  -124,    70,    10,    81,    60,    64,    68,    51,
+   207,  -124,    51,   176,   107,   211,    63,    66,    51,   212,
+    72,    70,    63,    66,    55,    10,    72,    46,   213,    68,
+    47,    10,    81,    60,    64,    68,    51,    60,    64,   173,
+    63,    66,   168,   103,    72,   179,   162,   163,    70,    10,
+    81,    60,    64,    68,    51,  -141,    81,    60,    64,   107,
+    60,    64,  -126,    51,   175,   143,    70,    63,    66,  -128,
+   141,    72,    70,  -126,   139,   231,    10,    81,    60,    64,
+    68,    51,   120,  -128,   234,    63,    66,    51,   235,    72,
+   154,    63,    66,   130,    10,    72,    60,    64,    68,   154,
+    10,   238,    60,    64,    68,   142,   120,   241,    51,   171,
+  -126,   130,    63,   186,  -124,   147,    72,   130,    60,    64,
+    60,    64,   101,   248,   249,    68,    51,   160,   252,    96,
+    63,   186,    51,   130,    72,   130,    63,   186,   255,  -127,
+    72,  -126,  -124,    68,    60,    64,    60,    64,    51,    68,
+    51,  -127,    63,   186,    63,   186,    72,  -125,    72,    70,
+  -129,   130,    60,    64,   193,    68,   247,    68,    60,    64,
+  -125,   187,   179,    94,    51,   156,    51,   130,    63,    66,
+    63,   186,    72,   130,    72,   263,    55,    10,   265,   154,
+  -127,    68,    51,    68,   150,   149,    63,   186,    51,    50,
+    72,    49,    63,   186,    60,    64,    72,   272,  -174,    68,
+    60,    64,   273,   148,  -129,    68,    34,    58,   nil,    70,
+    60,    64,   nil,   nil,   137,   130,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    51,   130,   nil,   nil,    63,    66,
+    51,   nil,    72,   nil,    63,   186,    55,    10,    72,   278,
+    51,    68,   nil,   nil,    63,   186,   nil,    68,    72,   nil,
+    23,   nil,    55,   nil,   nil,   nil,   nil,    68,   243,   nil,
+    20,   nil,    25,    27,   nil,     1,     6,   nil,    13,    23,
+    18,   nil,    22,   nil,    28,   nil,   nil,     5,    10,    20,
+   nil,    25,    27,   253,     1,     6,   nil,    13,   nil,    18,
+   nil,    22,   nil,    28,    23,   nil,     5,    10,   nil,   nil,
+   nil,   nil,   274,   nil,    20,   nil,    25,    27,   nil,     1,
+     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,
+   nil,     5,    10,    20,   nil,    25,    27,   227,     1,     6,
+   nil,    13,   nil,    18,   nil,    22,   nil,    28,    23,   nil,
+     5,    10,   nil,   nil,   nil,   nil,   256,   nil,    20,   nil,
+    25,    27,   nil,     1,     6,   nil,    13,    23,    18,   nil,
+    22,   nil,    28,   nil,   nil,     5,    10,    20,   nil,    25,
+    27,   257,     1,     6,   nil,    13,   nil,    18,   nil,    22,
+   nil,    28,    23,   nil,     5,    10,   nil,   nil,   nil,   nil,
+   277,   nil,    20,   nil,    25,    27,   nil,     1,     6,   nil,
+    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,     5,
+    10,    20,   nil,    25,    27,   270,     1,     6,   nil,    13,
+   nil,    18,   nil,    22,   nil,    28,    23,   nil,     5,    10,
+   nil,   nil,   nil,   nil,   215,   nil,    20,   nil,    25,    27,
+   nil,     1,     6,   nil,    13,    23,    18,   nil,    22,   nil,
+    28,   nil,   nil,     5,    10,    20,   nil,    25,    27,   nil,
+     1,     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,
+   nil,   nil,     5,    10,    20,   nil,    25,    27,   nil,     1,
+     6,   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,
+   nil,     5,    10,    20,   nil,    25,    27,   nil,     1,     6,
+   nil,    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,
+     5,    10,    20,   nil,    25,    27,   nil,     1,     6,   nil,
+    13,    23,    18,   nil,    22,   nil,    28,   nil,   nil,     5,
+    10,    20,   nil,    25,    27,   nil,     1,     6,   nil,    13,
+   nil,    18,   nil,    22,   nil,    28,   nil,   nil,     5,    10 ]
 
 racc_action_check = [
-    41,    41,    41,    22,   139,    26,    47,    47,    47,   104,
-    10,   142,   135,    37,    55,   108,    41,   135,    27,   101,
-   142,   121,    47,    22,    81,    81,    81,    74,   108,    26,
-    22,    41,   139,   139,    55,    41,    41,    47,    37,    41,
-    81,    47,    47,   104,    10,    47,   104,    10,    41,   179,
-   179,   179,   197,   101,    47,    81,   101,   186,    19,    81,
-    81,   123,    19,    81,   186,   179,   194,    69,    69,    69,
-    69,    89,    81,    32,    32,    32,   115,   197,   197,   194,
-   179,   123,    89,    69,   179,   179,    73,    89,   179,    32,
-    72,    14,    14,    14,   138,    14,   147,   179,    69,   114,
-   147,   147,    69,    69,    32,   138,    69,    14,    32,    32,
-   138,    14,    32,   198,   231,    69,    16,    16,    16,   231,
-    90,    32,    14,    71,   198,    68,    14,    14,    25,   198,
-    14,    90,    16,   131,    14,    25,    90,     5,   132,    14,
-    18,    18,    18,    95,     5,   112,    95,    16,   111,   126,
-    95,    16,    16,   126,   126,    16,    18,   136,   159,   159,
-   159,    21,    21,   109,    16,   228,   228,   228,   133,   133,
-    66,    18,   217,   217,   159,    18,    18,   107,   106,    18,
-    65,   228,    64,   152,   152,   152,   153,   154,    18,   159,
-    63,   158,    60,   159,   159,   160,   228,   159,   161,   152,
-   228,   228,   225,   225,   228,   164,   159,   219,   219,   219,
-   167,   168,   170,   228,   152,    59,   176,   225,   152,   152,
-    58,    75,   152,   219,    54,   227,   227,   227,   102,    51,
-   191,   152,   225,   130,   130,   192,   225,   225,   219,   193,
-   225,   227,   219,   219,   173,   173,   219,    77,   130,   225,
-    46,   247,   247,   100,    99,   219,   227,    96,    35,   173,
-   227,   227,    33,   130,   227,   120,   247,   130,   130,   125,
-   125,   130,   125,   227,   173,   203,   203,   215,   173,   173,
-   130,   247,   173,    80,   125,   247,   247,    88,   221,   247,
-   203,   173,   224,   202,   202,    87,    24,    86,   247,   125,
-    83,    82,   237,   125,   125,   203,   239,   125,   202,   203,
-   203,   184,   184,   203,   240,   184,   125,    44,    44,   241,
-   242,    11,   203,   202,   248,   249,   184,   202,   202,   252,
-     8,   202,    44,   124,   124,   122,   122,    44,    79,     1,
-   202,   184,   189,   nil,   nil,   184,   184,    44,   124,   184,
-   122,    44,    44,   124,   nil,    44,   nil,   nil,   184,    44,
-   nil,   nil,   nil,   124,    44,   122,   nil,   124,   124,   122,
-   122,   124,   264,   122,   nil,   124,   nil,   122,   nil,   nil,
-   124,   nil,   122,   264,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   196,   nil,   264,   nil,   264,   264,   nil,   264,   264,
-   nil,   264,   196,   264,   nil,   264,   nil,   264,   nil,   nil,
-   264,   nil,   196,   nil,   196,   196,   183,   196,   196,   nil,
-   196,   nil,   196,   nil,   196,   nil,   196,   183,   nil,   196,
-   nil,   nil,   nil,   nil,   nil,   206,   nil,   183,   nil,   183,
-   183,   nil,   183,   183,   nil,   183,   206,   183,   nil,   183,
-   nil,   183,   nil,   nil,   183,   nil,   206,   nil,   206,   206,
-   233,   206,   206,   nil,   206,   nil,   206,   nil,   206,   nil,
-   206,   233,   nil,   206,   nil,   nil,   nil,   nil,   nil,   211,
-   nil,   233,   nil,   233,   233,   nil,   233,   233,   nil,   233,
-   211,   233,   nil,   233,   nil,   233,   nil,   nil,   233,   nil,
-   211,   nil,   211,   211,   253,   211,   211,   nil,   211,   nil,
-   211,   nil,   211,   nil,   211,   253,   nil,   211,   nil,   nil,
-   nil,   nil,   nil,   263,   nil,   253,   nil,   253,   253,   nil,
-   253,   253,   nil,   253,   263,   253,   nil,   253,   nil,   253,
-   nil,   nil,   253,   nil,   263,   nil,   263,   263,   151,   263,
-   263,   nil,   263,   nil,   263,   nil,   263,   nil,   263,   151,
-   nil,   263,   nil,   nil,   nil,   nil,   nil,   156,   nil,   151,
-   nil,   151,   151,   nil,   151,   151,   nil,   151,   156,   151,
-   nil,   151,   nil,   151,   nil,   nil,   151,   nil,   156,   nil,
-   156,   156,   nil,   156,   156,   nil,   156,   261,   156,   nil,
-   156,   nil,   156,   nil,   nil,   156,   nil,   261,   nil,   261,
-   261,   nil,   261,   261,   nil,   261,    29,   261,   nil,   261,
-   nil,   261,   nil,   nil,   261,   nil,    29,   nil,    29,    29,
-   nil,    29,    29,   nil,    29,   129,    29,   nil,    29,   nil,
-    29,   nil,   nil,    29,   nil,   129,   nil,   129,   129,   nil,
-   129,   129,   nil,   129,     0,   129,   nil,   129,   nil,   129,
-   nil,   nil,   129,   nil,     0,   nil,     0,     0,   nil,     0,
-     0,   nil,     0,   nil,     0,   nil,     0,   nil,     0,   nil,
-   nil,     0 ]
+    95,    95,    95,    41,   120,   105,    81,    81,    81,    81,
+   143,   110,    66,    23,    41,    31,    95,    23,    48,    41,
+   110,   133,    81,     7,    50,    50,    50,   115,   115,     2,
+   143,    95,    66,   105,   105,    95,    95,    81,   143,    95,
+    50,    81,    81,    48,    95,    81,   120,     7,    95,     2,
+    81,   198,   198,   198,    81,    50,     2,     2,   161,    50,
+    50,   127,   115,    50,   136,   115,   209,   198,   251,   173,
+   173,   173,    50,   251,   127,    58,    58,    58,    42,   209,
+    13,    13,   198,   161,   161,   173,   198,   198,   146,    42,
+   198,    58,   146,   146,    42,   198,    34,    34,    34,   198,
+   173,   138,   203,    29,   173,   173,    58,    29,   173,   203,
+    58,    58,    34,   173,    58,    13,    77,   173,    13,    58,
+   172,   172,   172,    58,   240,   240,   101,    34,   140,   101,
+     6,    34,    34,   101,    76,    34,   172,     6,    75,    27,
+    34,    18,    18,    18,    34,    18,    27,    20,    20,    20,
+    74,   172,   114,   114,   131,   172,   172,    18,   164,   172,
+    73,    18,    71,    20,   172,    22,    22,    22,   172,   164,
+   150,   129,    18,   128,   164,   150,    18,    18,    20,   152,
+    18,    22,    20,    20,    18,    18,    20,   114,   153,    18,
+   114,    20,   252,   252,   252,    20,    22,   149,   149,   154,
+    22,    22,   112,   103,    22,   155,   112,   112,   252,    22,
+   248,   248,   248,    22,   103,    70,   238,   238,   238,   103,
+    25,    25,   125,   252,   121,    67,   248,   252,   252,    78,
+    65,   252,   238,    59,    57,   174,   252,   176,   176,   176,
+   252,   248,   175,    53,   177,   248,   248,   238,   178,   248,
+   179,   238,   238,   176,   248,   238,   166,   166,   248,   180,
+   238,   183,   167,   167,   238,   186,    49,   194,   176,   116,
+    83,   166,   176,   176,    85,    86,   176,   167,   148,   148,
+   260,   260,    39,   207,   208,   176,   166,   102,   211,    38,
+   166,   166,   167,   148,   166,   260,   167,   167,   214,   132,
+   167,   220,   221,   166,   142,   142,   245,   245,   148,   167,
+   260,   222,   148,   148,   260,   260,   148,   224,   260,   142,
+   225,   245,   205,   205,   142,   148,   205,   260,   139,   139,
+    88,   139,   237,    28,   142,    97,   245,   205,   142,   142,
+   245,   245,   142,   139,   245,   243,   142,   142,   244,    96,
+    87,   142,   205,   245,    93,    92,   205,   205,   139,    16,
+   205,    14,   139,   139,    54,    54,   139,   261,   262,   205,
+   187,   187,   263,    90,    89,   139,     1,   196,   nil,    54,
+   141,   141,   nil,   nil,    54,   187,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    54,   141,   nil,   nil,    54,    54,
+   187,   nil,    54,   nil,   187,   187,    54,    54,   187,   276,
+   141,    54,   nil,   nil,   141,   141,   nil,   187,   141,   nil,
+   276,   nil,   141,   nil,   nil,   nil,   nil,   141,   201,   nil,
+   276,   nil,   276,   276,   nil,   276,   276,   nil,   276,   201,
+   276,   nil,   276,   nil,   276,   nil,   nil,   276,   276,   201,
+   nil,   201,   201,   212,   201,   201,   nil,   201,   nil,   201,
+   nil,   201,   nil,   201,   212,   nil,   201,   201,   nil,   nil,
+   nil,   nil,   265,   nil,   212,   nil,   212,   212,   nil,   212,
+   212,   nil,   212,   265,   212,   nil,   212,   nil,   212,   nil,
+   nil,   212,   212,   265,   nil,   265,   265,   171,   265,   265,
+   nil,   265,   nil,   265,   nil,   265,   nil,   265,   171,   nil,
+   265,   265,   nil,   nil,   nil,   nil,   216,   nil,   171,   nil,
+   171,   171,   nil,   171,   171,   nil,   171,   216,   171,   nil,
+   171,   nil,   171,   nil,   nil,   171,   171,   216,   nil,   216,
+   216,   228,   216,   216,   nil,   216,   nil,   216,   nil,   216,
+   nil,   216,   228,   nil,   216,   216,   nil,   nil,   nil,   nil,
+   275,   nil,   228,   nil,   228,   228,   nil,   228,   228,   nil,
+   228,   275,   228,   nil,   228,   nil,   228,   nil,   nil,   228,
+   228,   275,   nil,   275,   275,   254,   275,   275,   nil,   275,
+   nil,   275,   nil,   275,   nil,   275,   254,   nil,   275,   275,
+   nil,   nil,   nil,   nil,   160,   nil,   254,   nil,   254,   254,
+   nil,   254,   254,   nil,   254,   160,   254,   nil,   254,   nil,
+   254,   nil,   nil,   254,   254,   160,   nil,   160,   160,   nil,
+   160,   160,   nil,   160,   273,   160,   nil,   160,   nil,   160,
+   nil,   nil,   160,   160,   273,   nil,   273,   273,   nil,   273,
+   273,   nil,   273,   147,   273,   nil,   273,   nil,   273,   nil,
+   nil,   273,   273,   147,   nil,   147,   147,   nil,   147,   147,
+   nil,   147,    33,   147,   nil,   147,   nil,   147,   nil,   nil,
+   147,   147,    33,   nil,    33,    33,   nil,    33,    33,   nil,
+    33,     0,    33,   nil,    33,   nil,    33,   nil,   nil,    33,
+    33,     0,   nil,     0,     0,   nil,     0,     0,   nil,     0,
+   nil,     0,   nil,     0,   nil,     0,   nil,   nil,     0,     0 ]
 
 racc_action_pointer = [
-   636,   326,   nil,   nil,   nil,    99,   nil,   nil,   324,   nil,
-     6,   315,   nil,   nil,    89,   nil,   114,   nil,   138,    56,
-   nil,   158,   -15,   nil,   296,    90,   -14,   -24,   nil,   598,
-   nil,   nil,    71,   227,   nil,   220,   nil,     3,   nil,   nil,
-   nil,    -2,   nil,   nil,   314,   nil,   229,     4,   nil,   nil,
-   nil,   219,   nil,   nil,   214,    12,   nil,   nil,   199,   213,
-   171,   nil,   nil,   169,   161,   159,   149,   nil,   104,    65,
-   nil,   117,    69,    65,     6,   200,   nil,   226,   nil,   317,
-   277,    22,   263,   290,   nil,   nil,   291,   295,   265,    49,
-    98,   nil,   nil,   nil,   nil,   105,   251,   nil,   nil,   245,
-   243,    15,   222,   nil,     5,   nil,   157,   138,     6,   142,
-   nil,   138,   124,   nil,    82,    55,   nil,   nil,   nil,   nil,
-   242,    16,   332,    43,   330,   266,   144,   nil,   nil,   617,
-   230,   128,   128,   165,   nil,   -21,   151,   nil,    72,   -16,
-   nil,   nil,    -4,   nil,   nil,   nil,   nil,    52,   nil,   nil,
-   nil,   541,   181,   179,   149,   nil,   560,   nil,   184,   156,
-   188,   160,   nil,   nil,   183,   nil,   nil,   208,   209,   nil,
-   189,   nil,   nil,   241,   nil,   nil,   207,   nil,   nil,    47,
-   nil,   nil,   nil,   409,   308,   nil,    47,   nil,   nil,   335,
-   nil,   217,   222,   216,    56,   nil,   384,    29,    91,   nil,
-   nil,   nil,   290,   272,   nil,   nil,   428,   nil,   nil,   nil,
-   nil,   472,   nil,   nil,   nil,   267,   nil,   163,   nil,   205,
-   nil,   259,   nil,   nil,   286,   199,   nil,   223,   163,   nil,
-   nil,    81,   nil,   453,   nil,   nil,   nil,   281,   nil,   285,
-   293,   298,   299,   nil,   nil,   nil,   nil,   248,   317,   318,
-   nil,   nil,   323,   497,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   579,   nil,   516,   365,   nil,   nil ]
+   673,   363,    11,   nil,   nil,   nil,    92,     4,   nil,   nil,
+   nil,   nil,   nil,    77,   355,   nil,   353,   nil,   139,   nil,
+   145,   nil,   163,    11,   nil,   217,   nil,   101,   291,   101,
+   nil,    15,   nil,   654,    94,   nil,   nil,   nil,   283,   247,
+   nil,   -19,    56,   nil,   nil,   nil,   nil,   nil,     8,   228,
+    22,   nil,   nil,   222,   361,   nil,   nil,   213,    73,   212,
+   nil,   nil,   nil,   nil,   nil,   220,    10,   215,   nil,   nil,
+   213,   141,   nil,   139,   148,   117,   113,    95,   208,   nil,
+   nil,     4,   nil,   249,   nil,   253,   269,   329,   309,   353,
+   367,   nil,   345,   332,   nil,    -2,   311,   335,   nil,   nil,
+   nil,    88,   281,   181,   nil,   -15,   nil,   nil,   nil,   nil,
+    -4,   nil,   158,   nil,   149,    24,   263,   nil,   nil,   nil,
+    -5,   214,   nil,   nil,   nil,   201,   nil,    52,   134,   150,
+   nil,   144,   278,     0,   nil,   nil,    47,   nil,    78,   325,
+   123,   377,   301,    -8,   nil,   nil,    83,   635,   275,   194,
+   137,   nil,   173,   183,   190,   195,   nil,   nil,   nil,   nil,
+   597,    35,   nil,   nil,   136,   nil,   253,   259,   nil,   nil,
+   nil,   490,   118,    67,   228,   204,   235,   237,   241,   212,
+   221,   nil,   nil,   252,   nil,   nil,   243,   367,   nil,   nil,
+   nil,   nil,   nil,   nil,   244,   nil,   375,   nil,    49,   nil,
+   nil,   421,   nil,    92,   nil,   319,   nil,   270,   261,    56,
+   nil,   275,   446,   nil,   291,   nil,   509,   nil,   nil,   nil,
+   280,   281,   290,   nil,   296,   299,   nil,   nil,   534,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   322,   214,   nil,
+   115,   nil,   nil,   316,   342,   303,   nil,   nil,   208,   nil,
+   nil,    35,   190,   nil,   578,   nil,   nil,   nil,   nil,   nil,
+   277,   360,   361,   366,   nil,   465,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   616,   nil,   553,   402,   nil,   nil ]
 
 racc_action_default = [
-  -142,  -166,   -15,    -3,  -136,  -166,   -16,    -5,  -166,    -6,
-  -166,  -166,    -7,    -8,   -43,    -9,  -166,   -10,  -166,   -42,
-   -11,  -166,  -166,   -12,  -166,  -166,  -166,   -39,   -13,    -1,
-   -14,    -2,  -166,  -142,  -135,   -72,  -140,  -142,  -139,  -137,
-  -141,   -72,  -159,   -29,  -166,   -31,   -30,  -166,   -32,   -19,
-   -96,   -20,   -98,   -97,   -21,   -63,   -22,   -62,   -24,   -64,
-   -25,  -125,  -124,  -166,   -26,   -27,   -28,   -88,   -84,  -166,
-   -91,  -166,   -85,   -89,   -93,   -86,   -90,   -87,  -104,   -92,
-  -166,  -166,   -72,  -128,  -126,   -38,  -166,  -166,  -142,  -142,
-  -142,   -41,   -40,    -4,   -71,  -166,  -166,  -155,   -73,  -166,
-  -164,  -166,  -166,  -153,  -166,   -68,   -65,   -60,   -63,   -66,
-   -58,  -164,   -69,   -64,  -166,   -67,  -123,   -70,  -122,   -18,
-  -166,  -166,  -166,  -166,  -166,  -166,  -166,  -161,   -76,  -166,
-  -166,  -166,  -164,  -166,   267,  -143,  -166,  -144,  -142,  -166,
-   -47,   -49,  -166,   -63,   -56,   -55,   -46,  -166,  -157,  -158,
-  -156,  -166,  -166,  -166,  -165,  -154,  -166,  -138,  -166,   -61,
-  -166,   -72,   -17,   -99,   -63,   -23,   -33,  -166,  -166,   -95,
-  -166,  -120,  -118,  -166,  -121,  -119,  -166,  -112,  -113,  -166,
-  -160,  -162,  -163,  -166,  -166,  -106,  -166,  -110,  -100,  -166,
-  -127,  -152,  -150,  -166,  -166,  -147,  -166,  -166,  -166,   -52,
-   -51,   -45,  -166,  -166,   -44,  -132,  -166,   -75,   -37,   -74,
-  -134,  -166,   -34,   -59,   -35,  -164,   -94,  -164,  -115,  -166,
-   -77,  -102,  -107,  -105,  -166,  -166,   -36,  -166,  -166,  -145,
-  -146,  -166,  -130,  -166,   -50,   -48,   -82,   -78,   -53,   -79,
-   -83,   -80,   -81,   -54,  -131,  -133,   -57,  -166,  -166,  -163,
-  -117,  -101,  -166,  -166,  -111,  -151,  -149,  -148,  -129,  -116,
-  -114,  -166,  -109,  -166,  -166,  -108,  -103 ]
+  -151,  -175,  -175,   -14,    -2,  -144,  -175,  -175,   -15,    -3,
+  -142,   -16,    -5,  -175,  -175,    -6,  -175,    -7,   -43,    -8,
+  -175,    -9,  -175,   -42,   -10,  -175,   -11,  -175,   -39,  -175,
+   -12,  -175,   -13,    -1,  -175,   -38,  -143,  -141,  -175,  -151,
+   -41,  -151,  -151,  -145,  -149,  -148,  -147,  -150,  -151,   -79,
+   -72,  -168,  -130,   -28,  -175,   -31,   -29,  -175,  -175,   -30,
+  -102,   -32,   -19,  -104,  -103,   -20,   -63,   -21,   -62,   -22,
+   -64,   -24,  -131,   -25,  -175,   -26,   -27,   -99,   -98,   -96,
+   -94,  -175,  -110,   -90,   -97,   -91,  -175,   -95,   -92,   -93,
+  -175,  -132,  -134,  -151,   -40,  -175,   -72,  -175,    -4,   -71,
+  -164,  -175,  -175,  -151,   -46,  -175,   -47,   -63,   -49,   -56,
+  -175,   -55,  -175,  -162,  -175,  -175,  -175,   -77,   -78,   -80,
+  -175,  -173,  -128,   -70,   -68,   -65,   -73,   -63,   -60,   -66,
+   -64,  -173,   -69,   -67,   -58,  -129,  -175,   -18,  -175,  -175,
+  -175,  -175,  -175,  -175,   -82,  -170,  -175,  -175,  -175,  -175,
+  -152,  -153,  -175,  -175,  -175,  -173,   279,  -166,  -165,  -167,
+  -175,  -175,   -52,   -51,  -175,   -45,  -175,  -175,   -44,  -163,
+  -146,  -175,  -175,  -175,  -175,  -174,   -61,  -175,  -175,  -174,
+   -72,   -17,  -126,  -175,  -118,  -119,   -63,  -175,  -124,  -127,
+  -125,  -105,   -23,  -101,  -175,   -33,  -175,  -169,  -175,  -171,
+  -172,  -175,  -112,  -175,  -116,  -175,  -133,  -161,  -175,  -175,
+  -156,  -159,  -175,  -106,  -175,  -138,  -175,   -50,   -48,   -88,
+   -84,   -85,   -89,   -53,   -86,   -87,   -54,  -140,  -175,   -76,
+   -75,   -37,   -81,   -59,   -34,   -35,   -74,  -173,  -175,  -121,
+  -173,  -100,   -83,  -108,  -175,  -175,  -113,  -111,  -175,  -154,
+  -155,  -175,  -175,  -136,  -175,   -36,  -137,  -139,   -57,  -123,
+  -175,  -175,  -172,  -175,  -107,  -175,  -117,  -160,  -157,  -158,
+  -135,  -122,  -120,  -175,  -115,  -175,  -175,  -114,  -109 ]
 
 racc_goto_table = [
-    29,    93,   100,   110,    46,   178,   195,    39,   111,    43,
-   176,    84,   179,   117,    66,   187,    49,    33,   153,   185,
-    24,   139,   147,   238,   243,   209,   126,   235,    71,   160,
-    65,   106,   251,   184,    46,    91,   105,    88,   158,    43,
-   177,   118,   107,   217,    66,    83,   120,   136,    96,   132,
-   189,    37,   102,   218,    64,   165,    31,   116,   176,   193,
-    65,    60,   194,    85,   150,   nil,   nil,   nil,   nil,   187,
-   197,   nil,   nil,   222,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   115,   nil,   nil,    64,   nil,   nil,   nil,   112,    97,
-   nil,    60,   nil,   103,   nil,   nil,   nil,   nil,   155,   nil,
-   nil,   157,   257,   247,   nil,   nil,   nil,   148,   nil,   nil,
-   254,   nil,    46,   nil,    46,   171,   nil,    43,   nil,    43,
-   171,   213,    66,   190,    66,   118,   170,   259,   215,   183,
-   118,   117,   176,   246,   nil,   248,   145,   145,    65,   nil,
-    65,   116,   nil,   nil,   137,   nil,   116,   nil,   nil,   106,
-   nil,   206,   nil,   nil,   105,    93,   211,   nil,   nil,   118,
-   nil,   nil,    64,   171,    64,   175,   nil,   nil,   nil,    60,
-   175,    60,   174,   118,   171,   116,   nil,   174,    93,   nil,
-    58,   nil,   nil,    93,   118,   145,   nil,   nil,   nil,   116,
-   nil,   nil,   237,   237,   nil,   nil,   233,   236,   236,   115,
-   116,   nil,   118,   118,   nil,    93,   112,   109,   nil,   nil,
-    58,   nil,   nil,   175,   nil,   171,   nil,   nil,   242,   242,
-   174,   nil,   nil,   nil,   175,   118,   nil,   nil,   nil,   nil,
-   nil,   174,   nil,   nil,   nil,    93,    93,   171,   nil,   nil,
-   nil,   116,   241,   241,    48,   145,    70,   118,    70,   240,
-   240,   nil,    78,   263,    80,   144,   144,   nil,   nil,   nil,
-   nil,   264,    70,   116,   nil,   175,   nil,   nil,    94,    74,
-   nil,    74,   174,   nil,    48,   nil,   nil,    70,   nil,   nil,
-   nil,   nil,   nil,   121,   nil,    74,   nil,   175,    58,   nil,
-    58,   172,   nil,   nil,   174,   nil,   172,   nil,   nil,    70,
-    74,   nil,   nil,   nil,   144,   128,   nil,   nil,   nil,   nil,
-   nil,    70,   nil,   nil,   nil,   nil,   nil,   131,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   109,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,   nil,   172,
+    29,    33,    38,   131,   185,    98,   117,    53,   123,   119,
+   174,    43,   134,    31,   210,    62,    39,   105,   112,   202,
+   178,   218,   198,   223,   226,     4,   146,    40,    86,   264,
+   205,   121,    77,    29,    77,   177,   184,    93,   128,   122,
+   240,    92,   152,    53,   214,   102,    77,    48,   183,   155,
+   116,   138,   239,   192,   208,   209,    59,   204,    35,   158,
+   nil,   nil,   nil,    91,   100,   nil,   nil,   nil,   nil,    76,
+    77,   nil,   nil,   113,   nil,   nil,   246,   nil,   nil,   161,
+   nil,   nil,   nil,   nil,    82,   nil,    90,   nil,   125,   nil,
+   nil,   nil,    59,    77,   nil,   nil,   183,   nil,    99,   nil,
+   nil,   135,   nil,   nil,   nil,    76,   nil,    77,   nil,   nil,
+   nil,   157,   169,   170,   204,   268,   260,   nil,   151,   nil,
+   nil,    75,   140,   nil,   nil,   271,   258,   nil,   122,   261,
+    53,    53,   117,   237,   123,   232,   236,   122,   233,   194,
+   nil,   nil,   nil,   nil,   nil,   144,   nil,    29,   201,   nil,
+   nil,   nil,   nil,   133,   266,   122,   122,    75,   nil,   153,
+    29,   216,   nil,   nil,   nil,   122,   nil,   nil,   nil,   183,
+   nil,    29,   228,    98,   nil,   nil,   122,   182,   nil,    59,
+    59,   nil,   nil,    71,    77,    77,   182,   206,    98,   nil,
+   135,   nil,    76,    76,   122,   nil,   nil,    73,   nil,   135,
+    98,    29,   nil,   nil,   220,   220,   109,   109,   nil,   nil,
+    77,   nil,    29,   254,   125,   129,    29,   225,   225,    71,
+   111,   111,   nil,   nil,   nil,   182,    98,   135,    29,   132,
+   nil,   nil,   nil,    73,   122,   nil,   229,   230,   135,   nil,
+   nil,   nil,   190,   182,    75,    75,   nil,    98,    98,   122,
+    77,   190,   nil,    56,    29,   nil,   135,   nil,   nil,   nil,
+    77,   nil,   242,   nil,    77,    29,   275,   nil,   109,   224,
+   224,   nil,   nil,    29,   276,    29,    29,   nil,   nil,   133,
+   nil,   nil,   111,   182,   nil,   124,   nil,   nil,   nil,    56,
+   190,   nil,   nil,   nil,   nil,   nil,   135,   nil,   182,   nil,
+   nil,   nil,   259,   nil,   188,   nil,    71,    71,   190,   nil,
+   nil,   135,   267,   188,   nil,   nil,   269,   nil,   189,   nil,
+    73,    73,    61,   nil,    84,   nil,    84,   189,   nil,   109,
+   nil,   221,   221,   nil,   nil,   nil,   nil,   nil,    84,   nil,
+   nil,   129,   nil,   111,   nil,   222,   222,   nil,   190,   nil,
+   nil,   nil,   188,   nil,   nil,   132,   nil,   nil,    61,   nil,
+   nil,   nil,    84,   190,   nil,   nil,   189,   nil,   nil,   nil,
+   188,   nil,   nil,   nil,   nil,   nil,    56,    56,   nil,   nil,
+   nil,   nil,   nil,   nil,   189,    84,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    84,
+   nil,   219,   219,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   188,   124,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   189,   188,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   189,
+   nil,   nil,   nil,   nil,   nil,   nil,    61,   195,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   172,   nil,   nil,   166,    48,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   144,   nil,   nil,   nil,   239,   239,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    70,   nil,   nil,   nil,   nil,   nil,   207,   nil,
-   nil,   172,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    74,   nil,   nil,   nil,    70,
-   nil,   nil,   nil,   172,   nil,   220,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    84,    84,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    70,
-   nil,   nil,   nil,   nil,   nil,   250,   nil,    70,    70,   nil,
-   nil,   nil,   nil,   255,   256,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    74,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    74,    74 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    84,   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,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    84,   nil,   nil,   nil,    84 ]
 
 racc_goto_check = [
-     2,     4,    32,    43,    27,    58,    68,    65,    32,    26,
-    56,    27,    50,    46,    25,    56,    17,    29,    33,    54,
-     1,    37,    37,    42,    42,    48,    49,    38,    51,    33,
-    24,    27,    52,    53,    27,    36,    26,    29,    31,    26,
-    57,    25,    30,    59,    25,    60,    17,    61,    62,    32,
-    33,    63,    64,    58,    23,    20,     3,    24,    56,    66,
-    24,    22,    67,     5,    69,   nil,   nil,   nil,   nil,    56,
-    37,   nil,   nil,    54,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    23,   nil,   nil,    23,   nil,   nil,   nil,    22,     3,
-   nil,    22,   nil,     3,   nil,   nil,   nil,   nil,    65,   nil,
-   nil,    65,    68,    50,   nil,   nil,   nil,    29,   nil,   nil,
-    56,   nil,    27,   nil,    27,    27,   nil,    26,   nil,    26,
-    27,    43,    25,    27,    25,    25,    17,    58,    32,     2,
-    25,    46,    56,    33,   nil,    33,    22,    22,    24,   nil,
-    24,    24,   nil,   nil,     3,   nil,    24,   nil,   nil,    27,
-   nil,     2,   nil,   nil,    26,     4,     2,   nil,   nil,    25,
-   nil,   nil,    23,    27,    23,    23,   nil,   nil,   nil,    22,
-    23,    22,    22,    25,    27,    24,   nil,    22,     4,   nil,
-    21,   nil,   nil,     4,    25,    22,   nil,   nil,   nil,    24,
-   nil,   nil,    27,    27,   nil,   nil,     2,    26,    26,    23,
-    24,   nil,    25,    25,   nil,     4,    22,    21,   nil,   nil,
-    21,   nil,   nil,    23,   nil,    27,   nil,   nil,    24,    24,
-    22,   nil,   nil,   nil,    23,    25,   nil,   nil,   nil,   nil,
-   nil,    22,   nil,   nil,   nil,     4,     4,    27,   nil,   nil,
-   nil,    24,    23,    23,    28,    22,    28,    25,    28,    22,
-    22,   nil,    47,     2,    47,    21,    21,   nil,   nil,   nil,
-   nil,     2,    28,    24,   nil,    23,   nil,   nil,    47,    45,
-   nil,    45,    22,   nil,    28,   nil,   nil,    28,   nil,   nil,
-   nil,   nil,   nil,    47,   nil,    45,   nil,    23,    21,   nil,
-    21,    21,   nil,   nil,    22,   nil,    21,   nil,   nil,    28,
-    45,   nil,   nil,   nil,    21,    47,   nil,   nil,   nil,   nil,
-   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,   nil,    21,
+    34,     2,    34,    32,    62,     4,    50,    25,    48,    52,
+    33,    69,    45,     1,    72,    17,    29,    39,    39,    58,
+    33,    40,    54,    44,    44,     3,    53,    38,    55,    56,
+    57,    35,    47,    34,    47,    31,    61,    29,    30,    25,
+    63,    64,    65,    25,    33,    66,    47,    67,    60,    32,
+    68,    17,    62,    20,    70,    71,    27,    60,     5,    73,
+   nil,   nil,   nil,    27,     3,   nil,   nil,   nil,   nil,    24,
+    47,   nil,   nil,     3,   nil,   nil,    58,   nil,   nil,    39,
+   nil,   nil,   nil,   nil,    49,   nil,    49,   nil,    27,   nil,
+   nil,   nil,    27,    47,   nil,   nil,    60,   nil,    49,   nil,
+   nil,    24,   nil,   nil,   nil,    24,   nil,    47,   nil,   nil,
+   nil,    29,    69,    69,    60,    72,    54,   nil,     3,   nil,
+   nil,    23,    49,   nil,   nil,    62,    33,   nil,    25,    33,
+    25,    25,    50,    32,    48,    52,    50,    25,    45,    17,
+   nil,   nil,   nil,   nil,   nil,    49,   nil,    34,     2,   nil,
+   nil,   nil,   nil,    23,    60,    25,    25,    23,   nil,    49,
+    34,     2,   nil,   nil,   nil,    25,   nil,   nil,   nil,    60,
+   nil,    34,     2,     4,   nil,   nil,    25,    27,   nil,    27,
+    27,   nil,   nil,    21,    47,    47,    27,    27,     4,   nil,
+    24,   nil,    24,    24,    25,   nil,   nil,    22,   nil,    24,
+     4,    34,   nil,   nil,    27,    27,    21,    21,   nil,   nil,
+    47,   nil,    34,     2,    27,    21,    34,    24,    24,    21,
+    22,    22,   nil,   nil,   nil,    27,     4,    24,    34,    22,
+   nil,   nil,   nil,    22,    25,   nil,    49,    49,    24,   nil,
+   nil,   nil,    23,    27,    23,    23,   nil,     4,     4,    25,
+    47,    23,   nil,    26,    34,   nil,    24,   nil,   nil,   nil,
+    47,   nil,    49,   nil,    47,    34,     2,   nil,    21,    23,
+    23,   nil,   nil,    34,     2,    34,    34,   nil,   nil,    23,
+   nil,   nil,    22,    27,   nil,    26,   nil,   nil,   nil,    26,
+    23,   nil,   nil,   nil,   nil,   nil,    24,   nil,    27,   nil,
+   nil,   nil,    49,   nil,    21,   nil,    21,    21,    23,   nil,
+   nil,    24,    49,    21,   nil,   nil,    49,   nil,    22,   nil,
+    22,    22,    28,   nil,    28,   nil,    28,    22,   nil,    21,
+   nil,    21,    21,   nil,   nil,   nil,   nil,   nil,    28,   nil,
+   nil,    21,   nil,    22,   nil,    22,    22,   nil,    23,   nil,
+   nil,   nil,    21,   nil,   nil,    22,   nil,   nil,    28,   nil,
+   nil,   nil,    28,    23,   nil,   nil,    22,   nil,   nil,   nil,
+    21,   nil,   nil,   nil,   nil,   nil,    26,    26,   nil,   nil,
+   nil,   nil,   nil,   nil,    22,    28,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,
+   nil,    26,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    21,    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    22,    21,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    21,   nil,   nil,    28,    28,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    21,   nil,   nil,   nil,    21,    21,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,    47,   nil,
-   nil,    21,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    45,   nil,   nil,   nil,    28,
-   nil,   nil,   nil,    21,   nil,    47,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,    28,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    28,
-   nil,   nil,   nil,   nil,   nil,    47,   nil,    28,    28,   nil,
-   nil,   nil,   nil,    47,    47,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    45,    45 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    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,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    28,   nil,   nil,   nil,    28 ]
 
 racc_goto_pointer = [
-   nil,    20,     0,    56,   -28,    41,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,
-   -67,   166,    47,    40,    16,     0,    -5,   -10,   230,    12,
-     1,   -69,   -33,   -82,   nil,   nil,     9,   -68,  -171,   nil,
-   nil,   nil,  -179,   -38,   nil,   253,   -28,   236,  -129,   -43,
-  -114,    12,  -189,   -97,  -111,   nil,  -115,   -85,  -120,  -130,
-    24,   -41,    15,    41,    15,    -3,   -76,   -73,  -129,   -31 ]
+   nil,    13,     1,    25,   -28,    56,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    -3,   nil,   nil,
+   -88,   165,   179,   103,    51,   -11,   235,    38,   304,    10,
+   -12,   -93,   -47,  -111,     0,   -18,   nil,   nil,    20,   -24,
+  -143,   nil,   nil,   nil,  -143,   -38,   nil,    12,   -42,    64,
+   -43,   nil,   -40,   -55,  -124,     8,  -214,  -118,  -129,   nil,
+   -91,  -103,  -135,  -147,    16,   -51,     6,    34,     2,    -2,
+   -96,   -95,  -136,   -42 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   146,     3,     7,     9,    12,    13,    15,
-    17,    20,    23,    28,    30,     2,     6,   nil,    51,    54,
-    56,    72,    73,    75,    77,    79,    67,    68,     8,    11,
-   nil,   nil,   nil,   nil,    22,    26,   nil,   nil,   140,   198,
-   141,   142,   nil,   nil,   114,    62,    76,   nil,    98,   nil,
-   nil,   nil,   nil,   nil,   nil,   186,    63,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   104,     9,    12,    15,    17,    19,    21,
+    24,    26,    30,    32,     3,     8,    11,   nil,    65,    67,
+    69,    85,    87,    88,    89,    78,    80,    83,    14,    16,
+   nil,   nil,   nil,   nil,    74,   nil,     2,     7,   nil,   nil,
+   106,   164,   108,   110,   nil,   nil,   136,    52,    79,   nil,
+   126,   118,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   203,
+    57,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -808,11 +838,12 @@ racc_token_table = {
  :NOT => 47,
  :OR => 48,
  :AND => 49,
- :UNDEF => 50 }
+ :UNDEF => 50,
+ :PARROW => 51 }
 
 racc_use_result_var = true
 
-racc_nt_base = 51
+racc_nt_base = 52
 
 Racc_arg = [
  racc_action_table,
@@ -882,6 +913,7 @@ Racc_token_to_s_table = [
 'OR',
 'AND',
 'UNDEF',
+'PARROW',
 '$start',
 'program',
 'statements',
@@ -916,6 +948,8 @@ Racc_token_to_s_table = [
 'endsemi',
 'params',
 'endcomma',
+'classref',
+'anyparams',
 'at',
 'collectname',
 'collectrhand',
@@ -931,6 +965,8 @@ Racc_token_to_s_table = [
 'array',
 'rvalue',
 'param',
+'addparam',
+'anyparam',
 'rvalues',
 'comma',
 'iftest',
@@ -1397,30 +1433,56 @@ module_eval <<'.,.,', 'grammar.ra', 311
   end
 .,.,
 
- # reduce 76 omitted
-
-module_eval <<'.,.,', 'grammar.ra', 320
-  def _reduce_77( val, _values, result )
-    if val[0].instance_of?(AST::ASTArray)
-        result = val[0].push(val[2])
-    else
-        result = ast AST::ASTArray, :children => [val[0],val[2]]
-    end
+module_eval <<'.,.,', 'grammar.ra', 316
+  def _reduce_76( val, _values, result )
+    result = ast AST::ResourceParam, :param => val[0], :value => val[2],
+                                     :add => true
    result
   end
 .,.,
 
+ # reduce 77 omitted
+
  # reduce 78 omitted
 
- # reduce 79 omitted
+module_eval <<'.,.,', 'grammar.ra', 324
+  def _reduce_79( val, _values, result )
+    result = ast AST::ASTArray
+   result
+  end
+.,.,
 
- # reduce 80 omitted
+module_eval <<'.,.,', 'grammar.ra', 324
+  def _reduce_80( val, _values, result )
+ result = val[0]
+   result
+  end
+.,.,
 
- # reduce 81 omitted
+module_eval <<'.,.,', 'grammar.ra', 333
+  def _reduce_81( val, _values, result )
+    if val[0].instance_of?(AST::ASTArray)
+        val[0].push(val[2])
+        result = val[0]
+    else
+        result = ast AST::ASTArray, :children => [val[0],val[2]]
+    end
+   result
+  end
+.,.,
 
  # reduce 82 omitted
 
- # reduce 83 omitted
+module_eval <<'.,.,', 'grammar.ra', 342
+  def _reduce_83( val, _values, result )
+    if val[0].instance_of?(AST::ASTArray)
+        result = val[0].push(val[2])
+    else
+        result = ast AST::ASTArray, :children => [val[0],val[2]]
+    end
+   result
+  end
+.,.,
 
  # reduce 84 omitted
 
@@ -1442,8 +1504,20 @@ module_eval <<'.,.,', 'grammar.ra', 320
 
  # reduce 93 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 347
-  def _reduce_94( val, _values, result )
+ # reduce 94 omitted
+
+ # reduce 95 omitted
+
+ # reduce 96 omitted
+
+ # reduce 97 omitted
+
+ # reduce 98 omitted
+
+ # reduce 99 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 369
+  def _reduce_100( val, _values, result )
     args = aryfy(val[2])
     result = ast AST::Function,
         :name => val[0],
@@ -1453,8 +1527,8 @@ module_eval <<'.,.,', 'grammar.ra', 347
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 352
-  def _reduce_95( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 374
+  def _reduce_101( val, _values, result )
     result = ast AST::Function,
         :name => val[0],
         :arguments => AST::ASTArray.new({}),
@@ -1463,44 +1537,44 @@ module_eval <<'.,.,', 'grammar.ra', 352
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 356
-  def _reduce_96( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 378
+  def _reduce_102( val, _values, result )
     result = ast AST::String, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 358
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 380
+  def _reduce_103( val, _values, result )
     result = ast AST::FlatString, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 362
-  def _reduce_98( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 384
+  def _reduce_104( val, _values, result )
     result = ast AST::Boolean, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 367
-  def _reduce_99( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 389
+  def _reduce_105( val, _values, result )
     Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 369
-  def _reduce_100( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 391
+  def _reduce_106( val, _values, result )
     result = ast AST::ResourceRef, :type => val[0], :title => val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 382
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 404
+  def _reduce_107( val, _values, result )
     args = {
         :test => val[1],
         :statements => val[3]
@@ -1515,19 +1589,19 @@ module_eval <<'.,.,', 'grammar.ra', 382
   end
 .,.,
 
- # reduce 102 omitted
+ # reduce 108 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 387
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 409
+  def _reduce_109( val, _values, result )
     result = ast AST::Else, :statements => val[2]
    result
   end
 .,.,
 
- # reduce 104 omitted
+ # reduce 110 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 399
-  def _reduce_105( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 421
+  def _reduce_111( val, _values, result )
     options = val[3]
     unless options.instance_of?(AST::ASTArray)
         options = ast AST::ASTArray, :children => [val[3]]
@@ -1537,10 +1611,10 @@ module_eval <<'.,.,', 'grammar.ra', 399
   end
 .,.,
 
- # reduce 106 omitted
+ # reduce 112 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 409
-  def _reduce_107( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 431
+  def _reduce_113( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push val[1]
         result = val[0]
@@ -1551,15 +1625,15 @@ module_eval <<'.,.,', 'grammar.ra', 409
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 413
-  def _reduce_108( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 435
+  def _reduce_114( val, _values, result )
     result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 418
-  def _reduce_109( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 440
+  def _reduce_115( val, _values, result )
     result = ast(AST::CaseOpt,
         :value => val[0],
         :statements => ast(AST::ASTArray)
@@ -1568,10 +1642,10 @@ module_eval <<'.,.,', 'grammar.ra', 418
   end
 .,.,
 
- # reduce 110 omitted
+ # reduce 116 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 428
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 450
+  def _reduce_117( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1582,26 +1656,26 @@ module_eval <<'.,.,', 'grammar.ra', 428
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 432
-  def _reduce_112( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 454
+  def _reduce_118( val, _values, result )
     result = ast AST::Selector, :param => val[0], :values => val[2]
    result
   end
 .,.,
 
- # reduce 113 omitted
+ # reduce 119 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 434
-  def _reduce_114( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 456
+  def _reduce_120( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 115 omitted
+ # reduce 121 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 445
-  def _reduce_116( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 467
+  def _reduce_122( val, _values, result )
     if val[0].instance_of?(AST::ASTArray)
         val[0].push(val[2])
         result = val[0]
@@ -1612,50 +1686,50 @@ module_eval <<'.,.,', 'grammar.ra', 445
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 449
-  def _reduce_117( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 471
+  def _reduce_123( val, _values, result )
     result = ast AST::ResourceParam, :param => val[0], :value => val[2]
    result
   end
 .,.,
 
- # reduce 118 omitted
+ # reduce 124 omitted
 
- # reduce 119 omitted
+ # reduce 125 omitted
 
- # reduce 120 omitted
+ # reduce 126 omitted
 
- # reduce 121 omitted
+ # reduce 127 omitted
 
- # reduce 122 omitted
+ # reduce 128 omitted
 
- # reduce 123 omitted
+ # reduce 129 omitted
 
- # reduce 124 omitted
+ # reduce 130 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 460
-  def _reduce_125( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 482
+  def _reduce_131( val, _values, result )
     result = ast AST::Default, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 462
-  def _reduce_126( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 484
+  def _reduce_132( val, _values, result )
  result = [val[0].value]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 466
-  def _reduce_127( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 488
+  def _reduce_133( val, _values, result )
     results = val[0] << val[2].value
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 474
-  def _reduce_128( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 496
+  def _reduce_134( val, _values, result )
     val[1].each do |file|
         import(file)
     end
@@ -1665,8 +1739,8 @@ module_eval <<'.,.,', 'grammar.ra', 474
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 484
-  def _reduce_129( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 506
+  def _reduce_135( val, _values, result )
     interp.newdefine classname(val[1]), :arguments => val[2], :code => val[4]
     @lexer.indefine = false
     result = nil
@@ -1676,8 +1750,8 @@ module_eval <<'.,.,', 'grammar.ra', 484
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 488
-  def _reduce_130( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 510
+  def _reduce_136( val, _values, result )
     interp.newdefine classname(val[1]), :arguments => val[2]
     @lexer.indefine = false
     result = nil
@@ -1685,8 +1759,8 @@ module_eval <<'.,.,', 'grammar.ra', 488
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 496
-  def _reduce_131( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 518
+  def _reduce_137( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     interp.newclass classname(val[1]), :code => val[4], :parent => val[2]
@@ -1695,8 +1769,8 @@ module_eval <<'.,.,', 'grammar.ra', 496
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 501
-  def _reduce_132( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 523
+  def _reduce_138( val, _values, result )
     # Our class gets defined in the parent namespace, not our own.
     @lexer.namepop
     interp.newclass classname(val[1]), :parent => val[2]
@@ -1705,30 +1779,34 @@ module_eval <<'.,.,', 'grammar.ra', 501
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 506
-  def _reduce_133( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 528
+  def _reduce_139( val, _values, result )
     interp.newnode val[1], :parent => val[2], :code => val[4]
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 509
-  def _reduce_134( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 531
+  def _reduce_140( val, _values, result )
     interp.newnode val[1], :parent => val[2]
     result = nil
    result
   end
 .,.,
 
- # reduce 135 omitted
+ # reduce 141 omitted
 
- # reduce 136 omitted
+ # reduce 142 omitted
 
- # reduce 137 omitted
+ # reduce 143 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 521
-  def _reduce_138( val, _values, result )
+ # reduce 144 omitted
+
+ # reduce 145 omitted
+
+module_eval <<'.,.,', 'grammar.ra', 546
+  def _reduce_146( val, _values, result )
     result = val[0]
     result = [result] unless result.is_a?(Array)
     result << val[2]
@@ -1736,47 +1814,49 @@ module_eval <<'.,.,', 'grammar.ra', 521
   end
 .,.,
 
- # reduce 139 omitted
+ # reduce 147 omitted
 
- # reduce 140 omitted
+ # reduce 148 omitted
 
- # reduce 141 omitted
+ # reduce 149 omitted
+
+ # reduce 150 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 529
-  def _reduce_142( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 555
+  def _reduce_151( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 533
-  def _reduce_143( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 559
+  def _reduce_152( val, _values, result )
     result = ast AST::ASTArray, :children => []
    result
   end
 .,.,
 
- # reduce 144 omitted
+ # reduce 153 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 538
-  def _reduce_145( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 564
+  def _reduce_154( val, _values, result )
     result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 542
-  def _reduce_146( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 568
+  def _reduce_155( val, _values, result )
     result = val[1]
     result = [result] unless result[0].is_a?(Array)
    result
   end
 .,.,
 
- # reduce 147 omitted
+ # reduce 156 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 549
-  def _reduce_148( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 575
+  def _reduce_157( val, _values, result )
     result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -1784,67 +1864,67 @@ module_eval <<'.,.,', 'grammar.ra', 549
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 554
-  def _reduce_149( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 580
+  def _reduce_158( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 558
-  def _reduce_150( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 584
+  def _reduce_159( val, _values, result )
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 560
-  def _reduce_151( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 586
+  def _reduce_160( val, _values, result )
     result = [val[0], val[2]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 562
-  def _reduce_152( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 588
+  def _reduce_161( val, _values, result )
     result = [val[0]]
    result
   end
 .,.,
 
- # reduce 153 omitted
+ # reduce 162 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 567
-  def _reduce_154( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 593
+  def _reduce_163( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 155 omitted
+ # reduce 164 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 572
-  def _reduce_156( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 598
+  def _reduce_165( val, _values, result )
     result = val[1]
    result
   end
 .,.,
 
- # reduce 157 omitted
+ # reduce 166 omitted
 
- # reduce 158 omitted
+ # reduce 167 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 578
-  def _reduce_159( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 604
+  def _reduce_168( val, _values, result )
     result = ast AST::Variable, :value => val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 586
-  def _reduce_160( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 612
+  def _reduce_169( val, _values, result )
     if val[1].instance_of?(AST::ASTArray)
         result = val[1]
     else
@@ -1854,21 +1934,21 @@ module_eval <<'.,.,', 'grammar.ra', 586
   end
 .,.,
 
-module_eval <<'.,.,', 'grammar.ra', 588
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 614
+  def _reduce_170( val, _values, result )
     result = ast AST::ASTArray
    result
   end
 .,.,
 
- # reduce 162 omitted
+ # reduce 171 omitted
 
- # reduce 163 omitted
+ # reduce 172 omitted
 
- # reduce 164 omitted
+ # reduce 173 omitted
 
-module_eval <<'.,.,', 'grammar.ra', 593
-  def _reduce_165( val, _values, result )
+module_eval <<'.,.,', 'grammar.ra', 619
+  def _reduce_174( val, _values, result )
  result = nil
    result
   end