puppet 2.7.11 → 2.7.12

data/lib/puppet/module_tool/applications/searcher.rb

@@ -4,36 +4,12 @@ module Puppet::Module::Tool
 
       def initialize(term, options = {})
         @term = term
+        @forge = Puppet::Forge::Forge.new
         super(options)
       end
 
       def run
-        request = Net::HTTP::Get.new("/modules.json?q=#{URI.escape(@term)}")
-        response = repository.make_http_request(request)
-        case response
-        when Net::HTTPOK
-          matches = PSON.parse(response.body)
-        else
-          raise RuntimeError, "Could not execute search (HTTP #{response.code})"
-          matches = []
-        end
-
-        # Return a list of module metadata hashes that match the search query.
-        # This return value is used by the module_tool face install search,
-        # and displayed to on the console.
-        #
-        # Example return value:
-        #
-        # [
-        #   {
-        #     "name"        => "nginx",
-        #     "project_url" => "http://github.com/puppetlabs/puppetlabs-nginx",
-        #     "version"     => "0.0.1",
-        #     "full_name"   => "puppetlabs/nginx" # full_name comes back from
-        #   }                                     # API all to the forge.
-        # ]
-        #
-        matches
+        @forge.search(@term)
       end
     end
   end

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -2,29 +2,55 @@ module Puppet::Module::Tool
   module Applications
     class Uninstaller < Application
 
-      def initialize(name, options = {})
+      def initialize(name, options)
         @name = name
-        @target_directories = options[:target_directories]
-        @removed_dirs = []
+        @options = options
+        @errors = Hash.new {|h, k| h[k] = []}
+        @removed_mods = []
+        @environment = Puppet::Node::Environment.new(options[:environment])
       end
 
       def run
-        uninstall
-        Puppet.notice "#{@name} is not installed" if @removed_dirs.empty?
-        @removed_dirs
+        if module_installed?
+          uninstall
+        else
+          @errors[@name] << "Module #{@name} is not installed"
+        end
+        { :removed_mods => @removed_mods, :errors => @errors, :options => @options }
       end
 
       private
 
+      def version_match?(mod)
+        if @options[:version]
+          mod.version == @options[:version]
+        else
+          true
+        end
+      end
+
+      def module_installed?
+        @environment.module(@name)
+      end
+
+      def has_changes?
+        Puppet::Module::Tool::Applications::Checksummer.run(@module.path)
+      end
+
       def uninstall
         # TODO: #11803 Check for broken dependencies before uninstalling modules.
-        #
-        # Search each path in the target directories for the specified module
-        # and delete the directory.
-        @target_directories.each do |target|
-          if File.directory? target
-            module_path = File.join(target, @name)
-            @removed_dirs << FileUtils.rm_rf(module_path).first if File.directory?(module_path)
+        @environment.modules_by_path.each do |path, modules|
+          modules.each do |mod|
+            if mod.name == @name
+              unless version_match?(mod)
+                @errors[@name] << "Installed version of #{mod.name} (v#{mod.version}) does not match version range"
+              end
+
+              if @errors[@name].empty?
+                FileUtils.rm_rf(mod.path)
+                @removed_mods << mod
+              end
+            end
           end
         end
       end

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -36,7 +36,7 @@ module Puppet::Module::Tool
       def extract_module_to_install_dir
         delete_existing_installation_or_abort!
 
-        build_dir = Puppet::Module::Tool::Cache.base_path + "tmp-unpacker-#{Digest::SHA1.hexdigest(@filename.basename.to_s)}"
+        build_dir = Puppet::Forge::Cache.base_path + "tmp-unpacker-#{Digest::SHA1.hexdigest(@filename.basename.to_s)}"
         build_dir.mkpath
         begin
           Puppet.notice "Installing #{@filename.basename} to #{@module_dir.expand_path}"

data/lib/puppet/module_tool/dependency.rb

@@ -10,7 +10,7 @@ module Puppet::Module::Tool
       # TODO: add error checking, the next line raises ArgumentError when +full_module_name+ is invalid
       @username, @name = Puppet::Module::Tool.username_and_modname_from(full_module_name)
       @version_requirement = version_requirement
-      @repository = repository ? Repository.new(repository) : nil
+      @repository = repository ? Puppet::Forge::Repository.new(repository) : nil
     end
 
     # Return PSON representation of this data.

data/lib/puppet/network/authconfig.rb

@@ -89,7 +89,7 @@ module Puppet
         File.open(@file) { |f|
           right = nil
           count = 1
-          f.each { |line|
+          f.each_line { |line|
             case line
             when /^\s*#/ # skip comments
               count += 1

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

@@ -255,7 +255,7 @@ class Puppet::Network::Handler
         File.open(@configuration.file) { |f|
           mount = nil
           count = 1
-          f.each { |line|
+          f.each_line { |line|
             case line
             when /^\s*#/; next # skip comments
             when /^\s*$/; next # skip blank lines

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

@@ -89,7 +89,10 @@ module Puppet::Network::HTTP::Handler
       status = 403 if status == 400
     end
     if exception.is_a?(Exception)
-      puts exception.backtrace if Puppet[:trace]
+      if Puppet[:trace] then
+        puts exception.backtrace
+        Puppet.err(exception.backtrace.join("\n"))
+      end
       Puppet.err(exception)
     end
     set_content_type(response, "text/plain")

data/lib/puppet/network/http/webrick.rb

@@ -78,8 +78,10 @@ class Puppet::Network::HTTP::WEBrick
 
     # open the log manually to prevent file descriptor leak
     file_io = ::File.open(file, "a+")
-    file_io.sync
-    file_io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+    file_io.sync = true
+    if defined?(Fcntl::FD_CLOEXEC)
+      file_io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+    end
 
     args = [file_io]
     args << WEBrick::Log::DEBUG if Puppet::Util::Log.level == :debug

data/lib/puppet/node/environment.rb

@@ -1,3 +1,4 @@
+require 'puppet/util'
 require 'puppet/util/cacher'
 require 'monitor'
 
@@ -92,6 +93,14 @@ class Puppet::Node::Environment
     mod
   end
 
+  def module_by_forge_name(forge_name)
+    author, modname = forge_name.split('/')
+    found_mod = self.module(modname)
+    found_mod and found_mod.forge_name == forge_name ?
+      found_mod :
+      nil
+  end
+
   # Cache the modulepath, so that we aren't searching through
   # all known directories all the time.
   cached_attr(:modulepath, Puppet[:filetimeout]) do
@@ -127,6 +136,27 @@ class Puppet::Node::Environment
     modules_by_path
   end
 
+  def module_requirements
+    deps = {}
+    modules.each do |mod|
+      next unless mod.forge_name
+      deps[mod.forge_name] ||= []
+      mod.dependencies and mod.dependencies.each do |mod_dep|
+        deps[mod_dep['name']] ||= []
+        dep_details = {
+          'name'                => mod.forge_name,
+          'version'             => mod.version,
+          'version_requirement' => mod_dep['version_requirement']
+        }
+        deps[mod_dep['name']] << dep_details
+      end
+    end
+    deps.each do |mod, mod_deps|
+      deps[mod] = mod_deps.sort_by {|d| d['name']}
+    end
+    deps
+  end
+
   def to_s
     name.to_s
   end
@@ -143,18 +173,14 @@ class Puppet::Node::Environment
   end
 
   def validate_dirs(dirs)
-    dir_regex = Puppet.features.microsoft_windows? ? /^[A-Za-z]:#{File::SEPARATOR}/ : /^#{File::SEPARATOR}/
-    # REMIND: Dir.getwd on windows returns a path containing backslashes, which when joined with
-    # dir containing forward slashes, breaks our regex matching. In general, path validation needs
-    # to be refactored which will be handled in a future commit.
     dirs.collect do |dir|
-      if dir !~ dir_regex
+      unless Puppet::Util.absolute_path?(dir)
         File.expand_path(File.join(Dir.getwd, dir))
       else
         dir
       end
     end.find_all do |p|
-      p =~ dir_regex && FileTest.directory?(p)
+      Puppet::Util.absolute_path?(p) && FileTest.directory?(p)
     end
   end
 

data/lib/puppet/parameter/path.rb

@@ -13,10 +13,6 @@ class Puppet::Parameter::Path < Puppet::Parameter
       fail "#{name} only accepts a single path, not an array of paths"
     end
 
-    # We *always* support Unix path separators, as Win32 does now too.
-    absolute = "[/#{::Regexp.quote(::File::SEPARATOR)}]"
-    win32    = Puppet.features.microsoft_windows?
-
     fail("#{name} must be a fully qualified path") unless Array(paths).all? {|path| absolute_path?(path)}
 
     paths

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

@@ -7,24 +7,15 @@ class Puppet::Parser::AST::Relationship < Puppet::Parser::AST::Branch
 
   attr_accessor :left, :right, :arrow, :type
 
-  def actual_left
-    chained? ? left.right : left
-  end
-
   # Evaluate our object, but just return a simple array of the type
   # and name.
   def evaluate(scope)
-    if chained?
-      real_left = left.safeevaluate(scope)
-      left_dep = left_dep.shift if left_dep.is_a?(Array)
-    else
-      real_left = left.safeevaluate(scope)
-    end
+    real_left = left.safeevaluate(scope)
     real_right = right.safeevaluate(scope)
 
     source, target = sides2edge(real_left, real_right)
-    result = Puppet::Parser::Relationship.new(source, target, type)
-    scope.compiler.add_relationship(result)
+    scope.compiler.add_relationship Puppet::Parser::Relationship.new(source, target, type)
+
     real_right
   end
 
@@ -46,10 +37,6 @@ class Puppet::Parser::AST::Relationship < Puppet::Parser::AST::Branch
 
   private
 
-  def chained?
-    left.is_a?(self.class)
-  end
-
   def out_edge?
     ["->", "~>"].include?(arrow)
   end

data/lib/puppet/parser/collector.rb

@@ -102,14 +102,16 @@ class Puppet::Parser::Collector
 
       # key is '#{type}/#{name}', and host and filter.
       found = Puppet::Resource.indirection.
-        search(@type, :host => @scope.host, :filter => @equery)
+        search(@type, :host => @scope.host, :filter => @equery, :scope => @scope)
 
-      found.map {|x| x.to_resource(@scope) }.each do |item|
+      found_resources = found.map {|x| x.is_a?(Puppet::Parser::Resource) ? x : x.to_resource(@scope)}
+
+      found_resources.each do |item|
         if existing = @scope.findresource(item.type, item.title)
           unless existing.collector_id == item.collector_id
             # unless this is the one we've already collected
             raise Puppet::ParseError,
-              "Exported resource #{item.ref} cannot override local resource"
+              "Another local or imported resource exists with the type and title #{item.ref}"
           end
         else
           item.exported = false

data/lib/puppet/parser/compiler.rb

@@ -462,10 +462,11 @@ class Puppet::Parser::Compiler
     end
 
     settings_resource = Puppet::Parser::Resource.new("class", "settings", :scope => @topscope)
-    settings_type.evaluate_code(settings_resource)
 
     @catalog.add_resource(settings_resource)
 
+    settings_type.evaluate_code(settings_resource)
+
     scope = @topscope.class_scope(settings_type)
 
     Puppet.settings.each do |name, setting|

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

@@ -7,7 +7,7 @@
     can be passed, and the first file that exists will be read in.") do |vals|
       ret = nil
       vals.each do |file|
-        unless file =~ /^#{File::SEPARATOR}/
+        unless Puppet::Util.absolute_path?(file)
           raise Puppet::ParseError, "Files must be fully qualified"
         end
         if FileTest.exists?(file)

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

@@ -11,9 +11,15 @@ Puppet::Parser::Functions::newfunction(:generate, :type => :rvalue,
     generators, so all shell metacharacters are passed directly to
     the generator.") do |args|
 
-      raise Puppet::ParseError, "Generators must be fully qualified" unless args[0] =~ /^#{File::SEPARATOR}/
+      raise Puppet::ParseError, "Generators must be fully qualified" unless Puppet::Util.absolute_path?(args[0])
 
-      unless args[0] =~ /^[-#{File::SEPARATOR}\w.]+$/
+      if Puppet.features.microsoft_windows?
+        valid = args[0] =~ /^[a-z]:(?:[\/\\][\w.-]+)+$/i
+      else
+        valid = args[0] =~ /^[-\/\w.]+$/
+      end
+
+      unless valid
         raise Puppet::ParseError,
           "Generators can only contain alphanumerics, file separators, and dashes"
       end

data/lib/puppet/parser/grammar.ra

@@ -76,7 +76,14 @@ relationship: relationship_side edge relationship_side {
     result = AST::Relationship.new(val[0], val[2], val[1][:value], ast_context)
 }
 
-relationship_side: resource | resourceref | collection
+relationship_side: resource
+  | resourceref
+  | collection
+  | variable
+  | quotedtext
+  | selector
+  | casestatement
+  | hasharrayaccesses
 
 edge: IN_EDGE | OUT_EDGE | IN_EDGE_SUB | OUT_EDGE_SUB
 
@@ -136,10 +143,10 @@ resource:       classname LBRACE resourceinstances endsemi RBRACE {
 }           | classname LBRACE params endcomma RBRACE {
   # This is a deprecated syntax.
   error "All resource specifications require names"
-}           | classref LBRACE params endcomma RBRACE {
+}           | type LBRACE params endcomma RBRACE {
   # a defaults setting for a type
   @lexer.commentpop
-  result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
+  result = ast(AST::ResourceDefaults, :type => val[0].value, :parameters => val[2])
 }
 
 # Override a value set elsewhere in the configuration.
@@ -172,10 +179,9 @@ at:   AT { result = :virtual }
 
 # A collection statement.  Currently supports no arguments at all, but eventually
 # will, I assume.
-collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
+collection:     type collectrhand LBRACE anyparams endcomma RBRACE {
   @lexer.commentpop
-  Puppet.warning addcontext("Collection names must now be capitalized") if val[0] =~ /^[a-z]/
-  type = val[0].downcase
+  type = val[0].value.downcase
   args = {:type => type}
 
   if val[1].is_a?(AST::CollExpr)
@@ -191,11 +197,8 @@ collection:     classref collectrhand LBRACE anyparams endcomma RBRACE {
   args[:override] = val[3]
   result = ast AST::Collection, args
 }
-  | classref collectrhand {
-    if val[0] =~ /^[a-z]/
-    Puppet.warning addcontext("Collection names must now be capitalized")
-  end
-  type = val[0].downcase
+  | type collectrhand {
+  type = val[0].value.downcase
   args = {:type => type }
 
   if val[1].is_a?(AST::CollExpr)
@@ -368,8 +371,8 @@ boolean:    BOOLEAN {
 resourceref: NAME LBRACK expressions RBRACK {
   Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
   result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
-}               | classref LBRACK expressions RBRACK {
-  result = ast AST::ResourceReference, :type => val[0], :title => val[2]
+}               | type LBRACK expressions RBRACK {
+  result = ast AST::ResourceReference, :type => val[0].value, :title => val[2]
 }
 
 ifstatement_begin: IF ifstatement {
@@ -612,8 +615,6 @@ nodedef: NODE hostnames nodeparent LBRACE statements RBRACE {
   result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 }
 
-classref:       CLASSREF { result = val[0][:value] }
-
 classname:      NAME { result = val[0][:value] }
   | CLASS { result = "class" }
 

data/lib/puppet/parser/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.6
+# This file is automatically generated by Racc 1.4.7
 # from Racc grammer file "".
 #
 
@@ -21,7 +21,7 @@ module Puppet
   module Parser
     class Parser < Racc::Parser
 
-module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 763)
+module_eval(<<'...end grammar.ra/module_eval...', 'grammar.ra', 764)
 
 # It got too annoying having code in a file that needs to be compiled.
 require 'puppet/parser/parser_support'
@@ -34,89 +34,94 @@ require 'puppet/parser/parser_support'
 ##### State transition tables begin ###
 
 clist = [
-'255,256,225,47,228,48,221,222,175,73,78,342,207,189,193,145,338,211',
-'49,343,331,227,184,186,190,192,174,221,243,73,78,215,216,73,78,336,201',
-'98,334,101,147,244,45,232,-154,185,188,197,302,195,196,179,180,182,183',
-'95,187,191,73,78,221,356,98,181,101,120,72,197,73,78,86,88,215,216,93',
-'219,118,309,79,96,95,124,89,218,60,103,73,78,60,225,98,72,207,63,35',
-'86,88,211,36,93,120,72,174,79,96,86,250,89,35,93,103,118,36,154,187',
-'191,124,89,63,72,132,181,64,86,88,66,64,93,63,66,52,79,73,78,120,89',
-'98,311,101,50,51,142,73,78,63,118,63,171,63,231,124,120,73,78,95,262',
-'98,35,101,35,35,114,118,36,114,72,316,124,11,86,88,11,317,93,95,72,170',
-'79,96,86,250,89,132,93,103,72,-170,154,322,86,88,89,63,93,323,324,325',
-'79,96,73,78,89,63,98,103,101,174,35,167,73,78,36,63,98,288,101,-153',
-'287,11,73,78,95,52,98,330,101,47,187,191,73,78,95,72,98,181,-106,86',
-'88,-152,-150,93,95,72,-151,79,96,86,88,89,205,93,103,72,299,79,96,86',
-'88,89,63,93,103,72,298,79,96,86,88,89,63,93,103,73,78,79,296,85,-157',
-'89,63,214,73,78,215,216,98,-155,101,144,63,-106,-106,-106,-106,76,48',
-'60,336,73,78,334,109,98,95,101,72,142,223,295,86,88,221,222,93,72,105',
-'333,79,86,88,95,89,93,289,266,212,79,96,221,260,89,72,63,103,64,86,88',
-'66,175,93,63,63,132,79,96,73,78,89,261,98,103,101,221,260,128,142,63',
-'63,63,179,180,345,73,78,187,191,98,95,101,-156,225,181,348,195,196,179',
-'180,109,72,227,187,191,86,88,95,349,93,181,332,231,79,96,221,222,89',
-'72,105,103,233,86,88,67,352,93,227,63,237,79,96,73,78,89,239,98,103',
-'101,-153,229,195,196,179,180,63,57,360,187,191,189,193,179,180,95,181',
-'170,187,191,184,186,190,192,-152,181,72,362,53,240,86,88,44,364,93,-204',
-'-150,38,79,96,-151,370,89,185,188,103,371,195,196,179,180,182,183,63',
-'187,191,73,78,,,98,181,101,,,,73,78,,,98,,101,,,,73,78,95,,98,,101,-22',
-'-22,-22,-22,,95,72,,,,86,88,,,93,95,72,,79,96,86,88,89,,93,103,72,,79',
-'96,86,88,89,63,93,103,,,79,96,73,78,89,63,,103,,341,,,73,78,,63,98,',
-'101,,,,73,78,,,98,,101,,,,73,78,95,72,98,,101,86,250,,,93,95,72,,154',
-',86,88,89,,93,95,72,,79,96,86,88,89,63,93,103,72,,79,96,86,88,89,63',
-'93,103,,,79,96,73,78,89,63,,103,252,,,,73,78,,63,98,,101,,,,73,78,,',
-'98,,101,,,,73,78,95,72,98,,101,86,250,,,93,95,72,,154,,86,88,89,,93',
-'95,72,,79,96,86,88,89,63,93,103,72,,79,96,86,88,89,63,93,103,,,79,96',
-'73,78,89,63,98,103,101,,,,73,78,,63,98,,101,,,,73,78,95,,98,173,101',
-'41,42,43,39,,95,72,,,,86,88,,,93,95,72,,79,96,86,88,89,,93,103,72,,79',
-'96,86,88,89,63,93,103,,,79,96,73,78,89,63,98,103,101,,,,73,78,,63,98',
-'-24,-24,-24,-24,,73,78,95,,98,,101,41,42,43,39,,,72,,,,86,88,,,93,95',
-'72,,79,96,86,158,89,,93,103,72,,154,,86,88,89,63,93,,,,79,96,73,78,89',
-'63,98,103,101,,,,73,78,,63,98,,101,,,,,,95,,,,,,,,,,95,72,,,,86,88,',
-',93,,72,,79,96,86,88,89,,93,103,329,,79,96,,,89,63,,103,189,193,,,,',
-',63,,184,186,190,192,,,,,,,,73,78,,,98,,101,,,,,,185,188,,,195,196,179',
-'180,182,183,95,187,191,73,78,,,98,181,101,,72,,73,78,86,88,,,93,,,,79',
-'96,95,165,89,,,103,73,78,,,98,72,101,63,,86,88,,,93,,72,,79,96,86,250',
-'89,95,93,103,73,78,154,,98,,89,63,72,,,,86,88,,,93,63,,,79,96,,,89,73',
-'78,103,,98,,101,,72,,63,,86,250,,,93,73,78,,154,98,95,101,89,,,,,,,',
-',72,,63,,86,88,95,,93,,,,79,96,,,89,72,,103,,86,88,,,93,,63,,79,96,73',
-'78,89,,98,103,101,,,,73,78,,63,98,173,101,,,,73,78,95,,98,,101,,,,73',
-'78,95,72,,,,86,88,,,93,95,72,,79,96,86,88,89,,93,103,72,,79,96,86,88',
-'89,63,93,103,72,,79,96,86,250,89,63,93,103,,,154,,73,78,89,63,98,,101',
-',,,73,78,,63,98,,101,,,,73,78,95,,98,,101,,,,,,95,72,,,,86,88,,,93,95',
-'72,,79,96,86,88,89,,93,103,72,,79,96,86,88,89,63,93,103,,,79,96,73,78',
-'89,63,98,103,101,,,,73,78,,63,98,,101,,,,73,78,95,,98,,101,,,,,,95,72',
-',,,86,88,,,93,95,72,,79,96,86,88,89,,93,103,72,,79,96,86,88,89,63,93',
-'103,,194,79,96,,,89,63,,103,189,193,,,,,204,63,,184,186,190,192,,,189',
-'193,,,,,,,,184,186,190,192,,,,,185,188,,,195,196,179,180,182,183,,187',
-'191,,,185,188,,181,195,196,179,180,182,183,,187,191,189,193,,,,181,',
-',,184,186,190,192,,,189,193,,,,,,,,184,186,190,192,,,,,185,188,,,195',
-'196,179,180,182,183,,187,191,,,185,188,,181,195,196,179,180,182,183',
-',187,191,189,193,,,,181,,,,184,186,190,192,,,189,193,,,,,,,,184,186',
-'190,192,,,,,185,188,,,195,196,179,180,182,183,,187,191,,,185,188,,181',
-'195,196,179,180,182,183,,187,191,189,193,,,,181,,,,184,186,190,192,',
-',189,193,,,,,,,265,184,186,190,192,,,,,185,188,,,195,196,179,180,182',
-'183,,187,191,,,185,188,,181,195,196,179,180,182,183,,187,191,189,193',
-',,,181,,,,184,186,190,192,,,189,193,,,,,,,,184,186,190,192,,,,,185,188',
-',,195,196,179,180,182,183,,187,191,,,,188,,181,195,196,179,180,182,183',
-',187,191,189,193,,,,181,,,,184,186,190,192,,,189,193,,,,,,,,184,186',
-'190,192,,,,,185,188,,,195,196,179,180,182,183,,187,191,,,,,,181,195',
-'196,179,180,182,183,,187,191,189,193,,,,181,,,,184,186,190,192,,,189',
-'193,,,,,,,,184,186,190,192,,,,,,,,,195,196,179,180,182,183,,187,191',
-',,,,,181,195,196,179,180,182,183,,187,191,189,193,,,,181,,,,184,186',
-'190,192,,,189,193,,,,,,,,184,186,190,192,,,,,185,188,,,195,196,179,180',
-'182,183,,187,191,,,185,188,,181,195,196,179,180,182,183,,187,191,189',
-'193,,,,181,,,,184,186,190,192,,,,193,,,,,,,,184,,,,,,,,185,188,193,',
-'195,196,179,180,182,183,184,187,191,,,,,193,181,195,196,179,180,182',
-'183,184,187,191,,,,,,181,,193,,195,196,179,180,182,183,184,187,191,',
-',,,,181,195,196,179,180,182,183,,187,191,,284,,,,181,,,,195,196,179',
-'180,182,183,,187,191,,369,,,26,181,32,1,,8,12,,18,,24,,29,319,2,,,11',
-'26,,32,1,,8,12,,18,,24,367,29,,2,,26,11,32,1,,8,12,,18,,24,301,29,,2',
-',26,11,32,1,,8,12,,18,,24,363,29,,2,,26,11,32,1,,8,12,,18,,24,351,29',
-',2,,26,11,32,1,,8,12,,18,,24,,29,,2,,26,11,32,1,,8,12,,18,,24,,29,26',
-'2,32,1,11,8,12,,18,,24,,29,26,2,32,1,11,8,12,,18,,24,,29,26,2,32,1,11',
-'8,12,,18,,24,,29,,2,,,11,195,196,179,180,182,183,,187,191,,,,,,181,195',
-'196,179,180,182,183,,187,191,,,,,,181' ]
-        racc_action_table = arr = Array.new(2074, nil)
+'183,187,245,69,248,70,241,290,169,9,17,69,351,190,194,199,333,169,71',
+'-175,291,305,182,185,191,193,168,100,-156,9,17,235,236,9,17,168,175',
+'88,166,92,200,345,67,251,343,184,189,171,100,195,196,177,178,180,181',
+'77,186,192,9,17,245,143,88,179,92,102,76,171,104,303,31,91,142,168,48',
+'241,312,148,18,82,77,313,36,9,17,95,102,35,302,104,371,76,346,35,51',
+'31,91,-111,52,48,347,9,17,18,82,235,236,36,35,345,95,40,343,47,1,143',
+'10,15,35,25,31,38,100,44,48,3,142,115,18,9,17,148,36,88,76,92,51,54',
+'31,136,52,239,48,35,51,-162,18,18,52,238,36,77,-111,-111,-111,-111,262',
+'9,17,261,102,35,76,104,369,250,31,91,143,-104,48,247,241,243,18,82,51',
+'320,36,142,52,95,35,327,148,40,330,47,1,35,10,15,143,25,31,38,155,44',
+'48,3,9,17,18,142,223,322,36,296,148,227,9,17,234,64,88,235,236,35,195',
+'196,177,178,62,63,223,186,192,162,40,227,47,1,179,10,15,288,25,31,38',
+'286,44,48,3,76,328,18,329,31,91,36,106,48,9,17,-157,18,88,-158,92,36',
+'35,195,196,177,178,180,181,-156,186,192,35,-155,186,192,77,179,282,9',
+'17,179,195,196,177,178,367,76,35,186,192,31,91,35,263,48,179,186,192',
+'18,82,252,250,36,179,247,95,40,245,47,1,162,10,15,35,25,31,38,244,44',
+'48,3,241,243,18,9,17,168,36,88,257,92,177,178,241,256,331,186,192,35',
+'241,243,9,17,179,229,88,77,92,177,178,228,292,221,186,192,241,256,76',
+'218,197,179,31,91,77,338,48,155,340,341,18,82,-103,106,36,76,-161,95',
+'342,31,91,-159,-157,48,-160,35,-158,18,82,9,17,36,306,88,95,92,64,-155',
+'354,9,17,-162,35,88,356,92,-208,119,162,9,17,77,-28,-28,-28,-28,58,59',
+'60,56,357,77,76,155,151,70,31,91,119,115,48,360,76,247,18,82,31,91,36',
+'107,48,95,76,106,18,82,31,136,36,35,48,95,9,17,18,364,-157,366,36,35',
+'97,-158,9,17,72,61,88,55,92,35,-24,-24,-24,-24,58,59,60,56,372,373,40',
+',47,1,77,10,15,,25,31,38,,44,48,3,76,,18,,31,91,36,,48,,285,,18,82,',
+',36,35,,95,190,194,-22,-22,-22,-22,,35,,182,185,191,193,,,,,,,,9,17',
+',,109,,-175,,,,,,184,189,,,195,196,177,178,180,181,108,186,192,9,17',
+',,88,179,92,,76,,,,31,91,,,48,9,17,,18,88,77,92,36,,,,,,,,,76,,35,,31',
+'91,77,,48,,,,18,82,,,36,76,,95,,31,91,,,48,,35,,18,82,9,17,36,,88,95',
+'92,,,,9,17,,35,88,,92,,,,,,77,,,,,,,,,,77,76,,9,17,31,91,,,48,359,76',
+',18,82,31,91,36,,48,95,,,18,82,,,36,35,,95,40,,47,1,,10,15,35,25,31',
+'38,,44,48,3,,,18,9,17,,36,88,,92,,,,9,17,,,35,,,,,,9,17,77,,,,137,,',
+',,,,76,,,,31,91,,,48,,76,51,18,82,31,126,36,44,48,95,76,,18,,31,136',
+'36,35,48,9,17,,18,88,,92,36,35,,9,17,,,88,,92,,35,,9,17,77,,88,,92,',
+',,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91,36,,48,95,76,,18,82,31,91',
+'36,35,48,95,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,,,,,,,9,17,77,,88',
+',92,,,,,,,76,,,,31,91,,,48,77,76,,18,82,31,136,36,,48,95,76,,18,,31',
+'91,36,35,48,,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,88,,92,,,,9,17',
+'77,,88,,92,,,,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91,36,,48,95,76',
+',18,82,31,91,36,35,48,95,,,18,82,9,17,36,35,88,95,92,,,,9,17,,35,88',
+',92,,,,9,17,77,,,,,,,,,,77,76,,,,31,91,,,48,,76,,18,82,31,91,36,,48',
+'95,76,,18,82,31,136,36,35,48,95,,,18,,9,17,36,35,88,,92,,,,9,17,,35',
+'88,,92,,,,9,17,77,,88,,92,,,,,,77,76,,,,31,91,,,48,77,76,,18,82,31,91',
+'36,,48,95,76,,18,82,31,91,36,35,48,95,,,18,82,9,17,36,35,88,95,92,,',
+',9,17,,35,88,,92,,,,9,17,77,,,,,349,,,,,77,76,,,,31,91,,,48,,76,,18',
+'82,31,91,36,,48,95,76,,18,82,31,136,36,35,48,95,,,18,,9,17,36,35,88',
+',92,,,,9,17,,35,88,,92,,,,9,17,77,,88,,92,,,,,,77,76,,,,31,91,,,48,77',
+'76,,18,82,31,91,36,,48,95,76,,18,82,31,91,36,35,48,95,,,18,82,9,17,36',
+'35,,95,,308,,,,,,35,,195,196,177,178,180,181,,186,192,,9,17,,40,179',
+'47,1,,10,15,,25,31,38,,44,48,3,,,18,9,17,,36,88,,92,40,,47,1,,10,15',
+'35,25,31,38,,44,48,3,77,,18,9,17,,36,88,,92,,76,,,,31,91,35,,48,,,,18',
+'82,77,,36,9,17,95,,88,,92,,76,,35,,31,91,,,48,,,,18,82,77,,36,9,17,95',
+',88,,92,,76,,35,,31,91,,,48,,,,18,82,77,,36,9,17,95,,,,,,76,,35,,31',
+'91,9,17,48,,88,,18,82,,,36,,,95,40,,47,1,,10,15,35,25,31,38,,44,48,3',
+',,18,,76,,36,,31,136,,,48,,,,18,35,9,17,36,,88,,92,,,,9,17,,35,88,,92',
+',,,9,17,77,,88,,,,,,,,77,76,,,,31,91,,,48,,76,,18,82,31,91,36,,48,95',
+'76,,18,82,31,210,36,35,48,95,,,18,,9,17,36,35,88,,92,,,,9,17,,35,88',
+'166,92,,,,,,77,215,,,,,,,,,77,76,,9,17,31,91,,,48,336,76,,18,82,31,91',
+'36,,48,95,,,18,82,,,36,35,,95,40,,47,1,,10,15,35,25,31,38,,44,48,3,',
+',18,9,17,,36,88,,92,,,,,,,,35,,,9,17,,,88,77,92,,,,,,,,,,76,,,,31,91',
+'77,258,48,,,,18,82,,,36,76,,95,,31,91,9,17,48,,35,232,18,82,,,36,,,95',
+',190,194,,,,,35,,,182,185,191,193,,,,9,17,76,51,88,,31,126,,44,48,,',
+',18,,184,189,36,,195,196,177,178,180,181,,186,192,35,,,,76,179,,,31',
+'91,,,48,,219,,18,,,,36,,,190,194,,,,,220,,35,182,185,191,193,,,190,194',
+',,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192',
+',,184,189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182',
+'185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,,,,,195,196,177,178',
+'180,181,,186,192,,,184,189,,179,195,196,177,178,180,181,,186,192,190',
+'194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,184',
+'189,,,195,196,177,178,180,181,,186,192,,,184,189,,179,195,196,177,178',
+'180,181,,186,192,190,194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,',
+'182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192,,,184',
+'189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182,185',
+'191,193,,,190,194,,,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178',
+'180,181,,186,192,,,184,189,,179,195,196,177,178,180,181,,186,192,190',
+'194,,,,179,,,,182,185,191,193,,,190,194,,,,,,,255,182,185,191,193,,',
+',,184,189,,,195,196,177,178,180,181,,186,192,,,184,189,,179,195,196',
+'177,178,180,181,,186,192,190,194,,,,179,,,,182,185,191,193,,,190,194',
+',,,,,,,182,185,191,193,,,,,184,189,,,195,196,177,178,180,181,,186,192',
+',,184,189,,179,195,196,177,178,180,181,,186,192,190,194,,,,179,,,,182',
+'185,191,193,,,190,194,,,,,,,,182,185,191,193,,,,,,189,,,195,196,177',
+'178,180,181,,186,192,,,,,,179,195,196,177,178,180,181,,186,192,190,194',
+',,,179,,,,182,185,191,193,,,,194,,,,,,,,182,,,,,,,,,,194,,195,196,177',
+'178,180,181,182,186,192,,,,,194,179,195,196,177,178,180,181,182,186',
+'192,,,,,,179,,194,,195,196,177,178,180,181,182,186,192,,,,,,179,195',
+'196,177,178,180,181,,186,192,,,,,,179,,,,195,196,177,178,180,181,,186',
+'192,,,,,,179' ]
+        racc_action_table = arr = Array.new(2325, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -126,95 +131,102 @@ clist = [
         end
 
 clist = [
-'169,169,142,6,134,6,263,263,88,287,287,292,298,169,169,59,287,298,6',
-'292,263,164,169,169,169,169,88,166,166,101,101,134,134,50,50,333,101',
-'50,333,50,59,166,6,142,83,169,169,287,213,169,169,169,169,169,169,50',
-'169,169,170,170,327,327,170,169,170,217,50,101,357,357,50,50,213,213',
-'50,127,217,226,50,50,170,217,50,127,18,50,171,171,147,158,171,170,109',
-'50,12,170,170,109,12,170,49,357,158,170,170,357,357,170,1,357,170,49',
-'1,357,268,268,49,357,170,171,227,268,18,171,171,18,147,171,357,147,8',
-'171,174,174,120,171,174,230,174,8,8,231,342,342,18,120,171,82,147,220',
-'120,45,175,175,174,174,175,108,175,233,40,108,45,233,40,174,233,45,108',
-'174,174,40,235,174,175,342,81,174,174,342,342,174,239,342,174,175,79',
-'342,241,175,175,342,174,175,242,243,247,175,175,179,179,175,342,179',
-'175,179,250,13,77,180,180,13,175,180,199,180,75,199,13,334,334,179,72',
-'334,260,334,70,267,267,325,325,180,179,325,267,261,179,179,90,91,179',
-'334,180,94,179,179,180,180,179,107,180,179,334,211,180,180,334,334,180',
-'179,334,180,325,209,334,334,325,325,334,180,325,334,24,24,325,208,24',
-'69,325,334,122,26,26,122,122,26,68,26,57,325,261,261,261,261,24,55,145',
-'284,181,181,284,54,181,26,181,24,53,129,207,24,24,129,129,24,26,205',
-'283,24,26,26,181,24,26,202,178,111,26,26,178,178,26,181,24,26,145,181',
-'181,145,114,181,191,26,48,181,181,29,29,181,172,29,181,29,172,172,46',
-'128,145,187,181,285,285,297,182,182,285,285,182,29,182,87,132,285,300',
-'270,270,270,270,37,29,133,270,270,29,29,182,306,29,270,264,139,29,29',
-'264,264,29,182,32,29,143,182,182,23,318,182,320,29,146,182,182,183,183',
-'182,150,183,182,183,152,137,271,271,271,271,182,15,336,271,271,137,137',
-'286,286,183,271,155,286,286,137,137,137,137,159,286,183,343,9,160,183',
-'183,5,355,183,356,161,2,183,183,162,366,183,137,137,183,368,137,137',
-'137,137,137,137,183,137,137,299,299,,,299,137,299,,,,44,44,,,44,,44',
-',,,295,295,299,,295,,295,28,28,28,28,,44,299,,,,299,299,,,299,295,44',
-',299,299,44,44,299,,44,299,295,,44,44,295,295,44,299,295,44,,,295,295',
-'290,290,295,44,,295,,290,,,47,47,,295,47,,47,,,,289,289,,,289,,289,',
-',,184,184,47,290,184,,184,290,290,,,290,289,47,,290,,47,47,290,,47,184',
-'289,,47,47,289,289,47,290,289,47,184,,289,289,184,184,289,47,184,289',
-',,184,184,167,167,184,289,,184,167,,,,51,51,,184,51,,51,,,,52,52,,,52',
-',52,,,,185,185,51,167,185,,185,167,167,,,167,52,51,,167,,51,51,167,',
-'51,185,52,,51,51,52,52,51,167,52,51,185,,52,52,185,185,52,51,185,52',
-',,185,185,186,186,185,52,186,185,186,,,,188,188,,185,188,,188,,,,98',
-'98,186,,98,98,98,33,33,33,33,,188,186,,,,186,186,,,186,98,188,,186,186',
-'188,188,186,,188,186,98,,188,188,98,98,188,186,98,188,,,98,98,190,190',
-'98,188,190,98,190,,,,67,67,,98,67,34,34,34,34,,192,192,190,,192,,192',
-'3,3,3,3,,,190,,,,190,190,,,190,192,67,,190,190,67,67,190,,67,190,192',
-',67,,192,192,67,190,192,,,,192,192,193,193,192,67,193,192,193,,,,195',
-'195,,192,195,,195,,,,,,193,,,,,,,,,,195,193,,,,193,193,,,193,,195,,193',
-'193,195,195,193,,195,193,258,,195,195,,,195,193,,195,258,258,,,,,,195',
-',258,258,258,258,,,,,,,,255,255,,,255,,255,,,,,,258,258,,,258,258,258',
-'258,258,258,255,258,258,76,76,,,76,258,76,,255,,252,252,255,255,,,255',
-',,,255,255,76,76,255,,,255,78,78,,,78,76,78,255,,76,76,,,76,,252,,76',
-'76,252,252,76,78,252,76,240,240,252,,240,,252,76,78,,,,78,78,,,78,252',
-',,78,78,,,78,196,196,78,,196,,196,,240,,78,,240,240,,,240,232,232,,240',
-'232,196,232,240,,,,,,,,,196,,240,,196,196,232,,196,,,,196,196,,,196',
-'232,,196,,232,232,,,232,,196,,232,232,225,225,232,,225,232,225,,,,85',
-'85,,232,85,85,85,,,,224,224,225,,224,,224,,,,204,204,85,225,,,,225,225',
-',,225,224,85,,225,225,85,85,225,,85,225,224,,85,85,224,224,85,225,224',
-'85,204,,224,224,204,204,224,85,204,224,,,204,,219,219,204,224,219,,219',
-',,,218,218,,204,218,,218,,,,103,103,219,,103,,103,,,,,,218,219,,,,219',
-'219,,,219,103,218,,219,219,218,218,219,,218,219,103,,218,218,103,103',
-'218,219,103,218,,,103,103,95,95,103,218,95,103,95,,,,96,96,,103,96,',
-'96,,,,189,189,95,,189,,189,,,,,,96,95,,,,95,95,,,95,189,96,,95,95,96',
-'96,95,,96,95,189,,96,96,189,189,96,95,189,96,,99,189,189,,,189,96,,189',
-'99,99,,,,,104,189,,99,99,99,99,,,104,104,,,,,,,,104,104,104,104,,,,',
-'99,99,,,99,99,99,99,99,99,,99,99,,,104,104,,99,104,104,104,104,104,104',
-',104,104,308,308,,,,104,,,,308,308,308,308,,,344,344,,,,,,,,344,344',
-'344,344,,,,,308,308,,,308,308,308,308,308,308,,308,308,,,344,344,,308',
-'344,344,344,344,344,344,,344,344,339,339,,,,344,,,,339,339,339,339,',
-',313,313,,,,,,,,313,313,313,313,,,,,339,339,,,339,339,339,339,339,339',
-',339,339,,,313,313,,339,313,313,313,313,313,313,,313,313,347,347,,,',
-'313,,,,347,347,347,347,,,176,176,,,,,,,176,176,176,176,176,,,,,347,347',
-',,347,347,347,347,347,347,,347,347,,,176,176,,347,176,176,176,176,176',
-'176,,176,176,117,117,,,,176,,,,117,117,117,117,,,273,273,,,,,,,,273',
-'273,273,273,,,,,117,117,,,117,117,117,117,117,117,,117,117,,,,273,,117',
-'273,273,273,273,273,273,,273,273,307,307,,,,273,,,,307,307,307,307,',
-',305,305,,,,,,,,305,305,305,305,,,,,307,307,,,307,307,307,307,307,307',
-',307,307,,,,,,307,305,305,305,305,305,305,,305,305,276,276,,,,305,,',
-',276,276,276,276,,,304,304,,,,,,,,304,304,304,304,,,,,,,,,276,276,276',
-'276,276,276,,276,276,,,,,,276,304,304,304,304,304,304,,304,304,130,130',
-',,,304,,,,130,130,130,130,,,136,136,,,,,,,,136,136,136,136,,,,,130,130',
-',,130,130,130,130,130,130,,130,130,,,136,136,,130,136,136,136,136,136',
-'136,,136,136,135,135,,,,136,,,,135,135,135,135,,,,280,,,,,,,,280,,,',
-',,,,135,135,274,,135,135,135,135,135,135,274,135,135,,,,,278,135,280',
-'280,280,280,280,280,278,280,280,,,,,,280,,277,,274,274,274,274,274,274',
-'277,274,274,,,,,,274,278,278,278,278,278,278,,278,278,,194,,,,278,,',
-',277,277,277,277,277,277,,277,277,,362,,,194,277,194,194,,194,194,,194',
-',194,,194,237,194,,,194,362,,362,362,,362,362,,362,,362,360,362,,362',
-',237,362,237,237,,237,237,,237,,237,212,237,,237,,360,237,360,360,,360',
-'360,,360,,360,350,360,,360,,212,360,212,212,,212,212,,212,,212,317,212',
-',212,,350,212,350,350,,350,350,,350,,350,,350,,350,,317,350,317,317',
-',317,317,,317,,317,,317,0,317,0,0,317,0,0,,0,,0,,0,17,0,17,17,0,17,17',
-',17,,17,,17,282,17,282,282,17,282,282,,282,,282,,282,,282,,,282,281',
-'281,281,281,281,281,,281,281,,,,,,281,272,272,272,272,272,272,,272,272',
-',,,,,272' ]
-        racc_action_check = arr = Array.new(2074, nil)
+'96,96,162,12,157,12,216,216,91,261,261,79,304,96,96,105,261,126,12,126',
+'216,225,96,96,96,96,91,25,79,92,92,157,157,88,88,126,92,88,88,88,105',
+'296,12,162,296,96,96,261,200,96,96,96,96,96,96,88,96,96,238,238,210',
+'71,238,96,238,25,88,92,25,224,88,88,71,210,88,231,231,71,88,88,238,233',
+'88,366,366,88,200,25,223,200,366,238,298,88,1,238,238,292,1,238,298',
+'220,220,238,238,233,233,238,200,342,238,366,342,366,366,143,366,366',
+'238,366,366,366,199,366,366,366,143,221,366,239,239,143,366,239,220',
+'239,11,2,220,220,11,150,220,366,15,2,220,11,15,150,220,239,292,292,292',
+'292,172,364,364,172,199,220,239,199,364,240,239,239,237,215,239,214',
+'259,259,239,239,252,246,239,237,252,239,199,252,237,364,259,364,364',
+'239,364,364,67,364,364,364,247,364,364,364,219,219,364,67,119,249,364',
+'219,67,119,218,218,145,10,218,145,145,364,268,268,268,268,10,10,305',
+'268,268,250,219,305,219,219,268,219,219,213,219,219,219,211,219,219',
+'219,218,254,219,256,218,218,219,209,218,242,242,207,218,242,205,242',
+'218,219,279,279,279,279,279,279,204,279,279,218,203,264,264,242,279',
+'198,358,358,264,267,267,267,267,358,242,192,267,267,242,242,186,174',
+'242,267,265,265,242,242,163,159,242,265,156,242,358,155,358,358,151',
+'358,358,242,358,358,358,152,358,358,358,152,152,358,245,245,136,358',
+'245,167,245,280,280,167,167,260,280,280,358,260,260,17,17,280,131,17',
+'245,17,281,281,121,217,117,281,281,217,217,245,110,97,281,245,245,17',
+'287,245,288,289,290,245,245,291,90,245,17,89,245,295,17,17,86,85,17',
+'81,245,80,17,17,251,251,17,227,251,17,251,76,75,307,263,263,74,17,263',
+'311,263,312,73,72,346,346,251,7,7,7,7,4,4,4,4,317,263,251,70,68,65,251',
+'251,53,47,251,335,263,339,251,251,263,263,251,37,263,251,346,32,263',
+'263,346,346,263,251,346,263,24,24,346,345,22,347,346,263,21,19,343,343',
+'13,8,343,3,343,346,50,50,50,50,49,49,49,49,368,370,24,,24,24,343,24',
+'24,,24,24,24,,24,24,24,343,,24,,343,343,24,,343,,202,,343,343,,,343',
+'24,,343,202,202,42,42,42,42,,343,,202,202,202,202,,,,,,,,38,38,,,38',
+',38,,,,,,202,202,,,202,202,202,202,202,202,38,202,202,40,40,,,40,202',
+'40,,38,,,,38,38,,,38,44,44,,38,44,40,44,38,,,,,,,,,40,,38,,40,40,44',
+',40,,,,40,40,,,40,44,,40,,44,44,,,44,,40,,44,44,196,196,44,,196,44,196',
+',,,195,195,,44,195,,195,,,,,,196,,,,,,,,,,195,196,,328,328,196,196,',
+',196,328,195,,196,196,195,195,196,,195,196,,,195,195,,,195,196,,195',
+'328,,328,328,,328,328,195,328,328,328,,328,328,328,,,328,54,54,,328',
+'54,,54,,,,57,57,,,328,,,,,,61,61,54,,,,61,,,,,,,54,,,,54,54,,,54,,57',
+'57,54,54,57,57,54,57,57,54,61,,57,,61,61,57,54,61,62,62,,61,62,,62,61',
+'57,,63,63,,,63,,63,,61,,64,64,62,,64,,64,,,,,,63,62,,,,62,62,,,62,64',
+'63,,62,62,63,63,62,,63,62,64,,63,63,64,64,63,62,64,63,,,64,64,194,194',
+'64,63,194,64,194,,,,137,137,,64,,,,,,,193,193,194,,193,,193,,,,,,,194',
+',,,194,194,,,194,193,137,,194,194,137,137,194,,137,194,193,,137,,193',
+'193,137,194,193,,,,193,193,69,69,193,137,69,193,69,,,,191,191,,193,191',
+',191,,,,190,190,69,,190,,190,,,,,,191,69,,,,69,69,,,69,190,191,,69,69',
+'191,191,69,,191,69,190,,191,191,190,190,191,69,190,191,,,190,190,189',
+'189,190,191,189,190,189,,,,185,185,,190,185,,185,,,,310,310,189,,,,',
+',,,,,185,189,,,,189,189,,,189,,185,,189,189,185,185,189,,185,189,310',
+',185,185,310,310,185,189,310,185,,,310,,306,306,310,185,306,,306,,,',
+'184,184,,310,184,,184,,,,77,77,306,,77,,77,,,,,,184,306,,,,306,306,',
+',306,77,184,,306,306,184,184,306,,184,306,77,,184,184,77,77,184,306',
+'77,184,,,77,77,183,183,77,184,183,77,183,,,,302,302,,77,302,,302,,,',
+'300,300,183,,,,,300,,,,,302,183,,,,183,183,,,183,,302,,183,183,302,302',
+'183,,302,183,300,,302,302,300,300,302,183,300,302,,,300,,82,82,300,302',
+'82,,82,,,,182,182,,300,182,,182,,,,181,181,82,,181,,181,,,,,,182,82',
+',,,82,82,,,82,181,182,,82,82,182,182,82,,182,82,181,,182,182,181,181',
+'182,82,181,182,,,181,181,228,228,181,182,,181,,228,,,,,,181,,269,269',
+'269,269,269,269,,269,269,,294,294,,228,269,228,228,,228,228,,228,228',
+'228,,228,228,228,,,228,180,180,,228,180,,180,294,,294,294,,294,294,228',
+'294,294,294,,294,294,294,180,,294,179,179,,294,179,,179,,180,,,,180',
+'180,294,,180,,,,180,180,179,,180,178,178,180,,178,,178,,179,,180,,179',
+'179,,,179,,,,179,179,178,,179,95,95,179,,95,,95,,178,,179,,178,178,',
+',178,,,,178,178,95,,178,0,0,178,,,,,,95,,178,,95,95,286,286,95,,286',
+',95,95,,,95,,,95,0,,0,0,,0,0,95,0,0,0,,0,0,0,,,0,,286,,0,,286,286,,',
+'286,,,,286,0,177,177,286,,177,,177,,,,106,106,,286,106,,106,,,,107,107',
+'177,,107,,,,,,,,106,177,,,,177,177,,,177,,106,,177,177,106,106,177,',
+'106,177,107,,106,106,107,107,106,177,107,106,,,107,,108,108,107,106',
+'108,,108,,,,109,109,,107,109,109,109,,,,,,108,108,,,,,,,,,109,108,,282',
+'282,108,108,,,108,282,109,,108,108,109,109,108,,109,108,,,109,109,,',
+'109,108,,109,282,,282,282,,282,282,109,282,282,282,,282,282,282,,,282',
+'169,169,,282,169,,169,,,,,,,,282,,,168,168,,,168,169,168,,,,,,,,,,169',
+',,,169,169,168,168,169,,,,169,169,,,169,168,,169,,168,168,118,118,168',
+',169,140,168,168,,,168,,,168,,140,140,,,,,168,,,140,140,140,140,,,,229',
+'229,118,118,229,,118,118,,118,118,,,,118,,140,140,118,,140,140,140,140',
+'140,140,,140,140,118,,,,229,140,,,229,229,,,229,,113,,229,,,,229,,,113',
+'113,,,,,114,,229,113,113,113,113,,,114,114,,,,,,,,114,114,114,114,,',
+',,113,113,,,113,113,113,113,113,113,,113,113,,,114,114,,113,114,114',
+'114,114,114,114,,114,114,316,316,,,,114,,,,316,316,316,316,,,319,319',
+',,,,,,,319,319,319,319,,,,,,,,,316,316,316,316,316,316,,316,316,,,319',
+'319,,316,319,319,319,319,319,319,,319,319,324,324,,,,319,,,,324,324',
+'324,324,,,138,138,,,,,,,,138,138,138,138,,,,,324,324,,,324,324,324,324',
+'324,324,,324,324,,,138,138,,324,138,138,138,138,138,138,,138,138,139',
+'139,,,,138,,,,139,139,139,139,,,318,318,,,,,,,,318,318,318,318,,,,,139',
+'139,,,139,139,139,139,139,139,,139,139,,,318,318,,139,318,318,318,318',
+'318,318,,318,318,122,122,,,,318,,,,122,122,122,122,,,353,353,,,,,,,',
+'353,353,353,353,,,,,122,122,,,122,122,122,122,122,122,,122,122,,,353',
+'353,,122,353,353,353,353,353,353,,353,353,334,334,,,,353,,,,334,334',
+'334,334,,,164,164,,,,,,,164,164,164,164,164,,,,,334,334,,,334,334,334',
+'334,334,334,,334,334,,,164,164,,334,164,164,164,164,164,164,,164,164',
+'350,350,,,,164,,,,350,350,350,350,,,153,153,,,,,,,,153,153,153,153,',
+',,,350,350,,,350,350,350,350,350,350,,350,350,,,153,153,,350,153,153',
+'153,153,153,153,,153,153,271,271,,,,153,,,,271,271,271,271,,,274,274',
+',,,,,,,274,274,274,274,,,,,,271,,,271,271,271,271,271,271,,271,271,',
+',,,,271,274,274,274,274,274,274,,274,274,315,315,,,,274,,,,315,315,315',
+'315,,,,272,,,,,,,,272,,,,,,,,,,276,,315,315,315,315,315,315,276,315',
+'315,,,,,275,315,272,272,272,272,272,272,275,272,272,,,,,,272,,278,,276',
+'276,276,276,276,276,278,276,276,,,,,,276,275,275,275,275,275,275,,275',
+'275,,,,,,275,,,,278,278,278,278,278,278,,278,278,,,,,,278' ]
+        racc_action_check = arr = Array.new(2325, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -224,218 +236,282 @@ clist = [
         end
 
 racc_action_pointer = [
-  1970,    72,   409,   724,   nil,   433,    -3,   nil,   124,   436,
-   nil,   nil,    58,   171,   nil,   423,   nil,  1983,    82,   nil,
-   nil,   nil,   nil,   393,   270,   nil,   279,   nil,   436,   343,
-   nil,   nil,   394,   657,   712,   nil,   nil,   353,   nil,   nil,
-   124,   nil,   nil,   nil,   480,   127,   346,   547,   302,    76,
-    31,   624,   634,   266,   277,   287,   nil,   288,   nil,     3,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   768,   263,   254,
-   220,   nil,   216,   nil,   nil,   193,   933,   185,   961,   180,
-   nil,   170,   135,    21,   nil,  1085,   nil,   346,     2,   nil,
-   215,   216,   nil,   nil,   220,  1219,  1229,   nil,   711,  1277,
-   nil,    27,   nil,  1172,  1292,   nil,   nil,   237,   121,    57,
-   nil,   317,   nil,   nil,   332,   nil,   nil,  1517,   nil,   nil,
-   110,   nil,   234,   nil,   nil,   nil,   nil,    57,   315,   300,
-  1697,   nil,   359,   367,   -18,  1757,  1712,   410,   nil,   377,
-   nil,   nil,    -9,   361,   nil,   294,   398,    86,   nil,   nil,
-   392,   nil,   393,   nil,   nil,   427,   nil,   nil,    78,   417,
-   404,   429,   433,   nil,     9,   nil,    16,   614,   nil,    -4,
-    56,    84,   341,   nil,   130,   150,  1472,   nil,   317,   197,
-   207,   296,   360,   407,   567,   644,   691,   295,   701,  1239,
-   758,   278,   778,   825,  1859,   835,  1011,   nil,   nil,   205,
-   nil,   nil,   312,   nil,  1105,   313,   nil,   293,   250,   251,
-   nil,   238,  1925,    23,   nil,   nil,   nil,    41,  1162,  1152,
-   137,   nil,   nil,   nil,  1095,  1075,    68,    80,   nil,   nil,
-   128,   101,  1028,   123,   nil,   164,   nil,  1893,   nil,   142,
-   986,   179,   185,   170,   nil,   nil,   nil,   185,   nil,   nil,
-   182,   nil,   943,   nil,   nil,   908,   nil,   nil,   873,   nil,
-   217,   227,   nil,    -5,   381,   nil,   nil,   167,    54,   nil,
-   320,   365,  2006,  1532,  1790,   nil,  1637,  1823,  1805,   nil,
-  1772,  1991,  1996,   307,   266,   304,   374,     7,   nil,   557,
-   537,   nil,    -1,   nil,   nil,   490,   nil,   336,   -23,   470,
-   363,   nil,   nil,   nil,  1652,  1592,   376,  1577,  1337,   nil,
-   nil,   nil,   nil,  1412,   nil,   nil,   nil,  1957,   393,   nil,
-   392,   nil,   nil,   nil,   nil,   227,   nil,    49,   nil,   nil,
-   nil,   nil,   nil,     4,   217,   nil,   416,   nil,   nil,  1397,
-   nil,   nil,   140,   435,  1352,   nil,   nil,  1457,   nil,   nil,
-  1941,   nil,   nil,   nil,   nil,   440,   442,    66,   nil,   nil,
-  1909,   nil,  1877,   nil,   nil,   nil,   448,   nil,   453,   nil,
-   nil,   nil ]
+  1378,    58,   122,   421,   351,   nil,   nil,   347,   440,   nil,
+   207,   100,    -3,   454,   nil,   108,   nil,   338,   nil,   436,
+   nil,   458,   431,   nil,   448,    25,   nil,   nil,   nil,   nil,
+   nil,   nil,   435,   nil,   nil,   nil,   nil,   429,   531,   nil,
+   556,   nil,   452,   nil,   573,   nil,   nil,   425,   nil,   409,
+   405,   nil,   nil,   402,   701,   nil,   nil,   711,   nil,   nil,
+   nil,   721,   763,   773,   783,   415,   nil,   168,   414,   897,
+   381,    37,   366,   381,   376,   372,   388,  1051,   nil,     5,
+   361,   359,  1165,   nil,   nil,   357,   356,   nil,    31,   351,
+   365,     2,    27,   nil,   nil,  1353,    -4,   358,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     3,  1449,  1459,  1506,  1516,
+   345,   nil,   nil,  1711,  1726,   nil,   nil,   339,  1643,   169,
+   nil,   341,  1951,   nil,   nil,   nil,    11,   nil,   nil,   nil,
+   nil,   332,   nil,   nil,   nil,   nil,   301,   840,  1846,  1891,
+  1643,   nil,   nil,    91,   nil,   166,   nil,   nil,   nil,   nil,
+   123,   269,   309,  2086,   nil,   295,   291,   -18,   nil,   288,
+   nil,   nil,    -9,   262,  2026,   nil,   nil,   321,  1604,  1587,
+   nil,   nil,   147,   nil,   281,   nil,   nil,  1439,  1328,  1303,
+  1278,  1185,  1175,  1098,  1041,   974,   229,   nil,   nil,   964,
+   917,   907,   224,   850,   830,   630,   620,   nil,   268,   120,
+    46,   nil,   496,   248,   244,   234,   nil,   231,   nil,   244,
+    49,   198,   nil,   215,   159,   146,    -5,   343,   208,   198,
+    99,   125,   nil,    73,    44,     9,   nil,   375,  1232,  1674,
+   nil,    64,   nil,    56,   nil,   nil,   nil,   144,    56,   127,
+   153,   nil,   250,   nil,   nil,   321,   168,   156,   nil,   196,
+   187,   385,   140,   nil,   236,   nil,   239,   nil,   nil,   161,
+   327,     7,   nil,   395,   212,   235,   nil,   227,   165,  1196,
+   nil,  2131,  2206,   nil,  2146,  2239,  2224,   nil,  2257,   208,
+   275,   292,  1541,   nil,   nil,   nil,  1392,   354,   325,   357,
+   342,   347,    89,   nil,  1257,   367,    10,   nil,    80,   nil,
+  1118,   nil,  1108,   nil,   -13,   189,  1031,   387,   nil,   nil,
+   984,   393,   395,   nil,   nil,  2191,  1771,   409,  1906,  1786,
+   nil,   nil,   nil,   nil,  1831,   nil,   nil,   nil,   655,   nil,
+   nil,   nil,   nil,   nil,  2011,   420,   nil,   nil,   nil,   419,
+   nil,   nil,    78,   458,   nil,   445,   405,   447,   nil,   nil,
+  2071,   nil,   nil,  1966,   nil,   nil,   nil,   nil,   275,   nil,
+   nil,   nil,   nil,   nil,   155,   nil,    81,   nil,   467,   nil,
+   468,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -180,  -217,   -53,  -217,    -9,  -217,  -217,   -10,  -217,   -23,
-   -11,  -170,  -172,  -217,   -12,  -217,   -13,    -1,  -217,   -14,
-    -2,   -15,    -3,  -217,  -171,   -16,  -217,   -17,    -6,  -217,
-   -18,    -7,  -217,   -19,    -8,  -172,  -171,  -180,   -54,   -28,
-  -217,   -25,   -26,   -27,  -217,  -180,   -56,  -217,   -88,  -180,
-  -217,  -217,  -217,   -95,  -180,  -217,   -52,  -217,    -4,  -180,
-  -177,  -173,  -175,  -205,  -176,  -179,  -178,   -88,   -40,  -215,
-  -217,   -41,  -197,  -100,   -45,   -42,  -217,  -217,  -217,   -77,
-   -43,   -44,   -32,   -46,   -33,  -217,  -105,   -47,   -76,   -75,
-   -37,   -38,  -159,  -158,   -39,  -217,  -217,  -115,  -217,  -217,
-  -108,  -217,  -116,  -217,  -217,  -160,  -161,  -163,  -217,  -181,
-  -182,  -217,   -20,   -23,  -171,   -22,   -24,   -86,  -197,   -68,
-  -180,   -59,  -217,   -60,   -76,   -62,   -69,  -217,   -95,  -217,
-   -35,   -89,  -217,  -203,  -217,   -85,   -87,  -217,   -93,  -203,
-   -94,   -96,  -217,  -180,   372,  -217,  -217,  -217,  -191,  -155,
-  -217,   -81,   -82,   -83,   -77,   -84,  -154,  -156,   -76,   -78,
-   -73,   -79,   -80,   -71,  -203,   -31,  -217,  -217,  -101,  -217,
-  -217,  -217,  -217,  -200,  -217,  -217,  -217,  -133,  -217,  -217,
-  -217,  -217,  -217,  -217,  -217,  -217,  -217,  -217,  -217,  -217,
-  -217,  -217,  -217,  -217,  -217,  -217,  -217,  -212,  -213,  -217,
-  -209,  -208,  -217,  -126,  -217,  -217,   -21,  -190,  -217,  -203,
-  -185,  -188,  -217,  -217,   -57,   -65,   -64,  -217,  -217,  -217,
-  -203,  -201,  -202,  -107,  -217,  -217,  -217,  -204,   -58,  -214,
-  -217,  -204,  -217,  -217,  -193,  -217,  -174,  -217,  -192,   -88,
-   -74,  -217,  -217,  -202,   -29,  -157,  -153,  -217,  -144,  -145,
-   -76,  -152,  -217,  -150,  -151,  -217,  -103,  -102,  -217,   -34,
-  -202,  -198,   -99,  -217,  -217,  -136,  -198,  -123,  -122,  -117,
-  -124,  -125,  -128,  -135,  -130,  -118,  -134,  -132,  -129,  -119,
-  -131,  -127,    -5,  -217,  -111,  -120,  -121,  -217,  -206,  -217,
-  -217,  -138,  -217,  -142,  -162,  -217,  -183,  -217,  -204,  -217,
-  -217,  -165,   -63,   -61,   -66,   -67,  -217,   -36,   -91,   -50,
-   -90,   -51,   -97,   -92,  -195,  -194,  -196,  -217,  -217,  -169,
-  -203,   -72,   -48,   -49,   -30,  -217,  -147,  -203,  -104,  -216,
-  -199,   -98,  -106,  -111,  -217,  -110,  -217,  -210,  -207,  -211,
-  -139,  -137,  -217,  -217,  -189,  -184,  -186,  -187,  -164,   -55,
-  -217,  -167,  -168,   -70,  -149,  -217,  -202,  -217,  -109,  -112,
-  -217,  -143,  -217,  -166,  -146,  -148,  -217,  -114,  -217,  -141,
-  -113,  -140 ]
+  -184,  -221,  -219,   -58,  -221,    -9,  -155,   -10,  -221,  -105,
+  -201,  -221,  -156,   -23,   -11,  -176,  -160,  -221,   -82,   -25,
+   -12,  -221,   -26,   -13,    -1,  -221,  -159,   -27,   -14,    -2,
+  -161,  -110,   -29,   -15,    -3,  -209,   -80,  -221,   -81,   -16,
+  -221,   -17,    -6,  -164,  -221,   -18,    -7,  -221,  -163,   -19,
+    -8,  -176,  -175,  -184,  -221,   -59,   -33,  -221,   -30,   -31,
+   -32,  -221,  -221,  -221,  -221,  -221,   -57,  -184,   -61,  -221,
+   -93,  -184,  -100,  -184,  -219,   -43,  -201,  -221,   -50,   -44,
+   -47,   -45,  -221,  -106,   -48,   -42,   -51,   -46,  -221,   -52,
+   -49,   -81,  -221,  -121,  -120,  -221,  -221,  -221,    -4,  -177,
+  -181,  -179,  -180,  -183,  -182,  -184,  -221,   -93,  -221,  -221,
+   -37,   -38,  -113,  -221,  -221,  -165,  -166,  -168,  -221,  -185,
+  -186,  -221,   -91,   -20,   -28,   -23,   -81,   -22,   -24,  -162,
+  -156,  -221,  -158,  -149,  -157,  -150,   -81,  -221,   -90,   -92,
+  -221,   -74,  -201,  -184,   -73,  -221,   -65,   -64,   -81,   -67,
+  -221,  -100,  -221,   -40,   -94,  -221,  -207,  -221,   -98,  -207,
+   -99,  -101,  -221,  -184,  -221,  -138,  -204,  -221,  -221,  -221,
+  -217,  -216,  -221,  -213,  -221,  -212,  -131,  -221,  -221,  -221,
+  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -108,  -107,  -221,
+  -221,  -221,  -221,  -221,  -221,  -221,  -221,   374,  -221,  -221,
+  -221,  -195,  -221,   -84,   -85,   -87,   -88,   -83,   -86,   -89,
+   -81,   -78,   -76,  -221,  -207,   -36,  -221,  -221,  -221,  -221,
+  -221,  -221,   -21,  -194,  -221,  -207,  -189,  -192,  -221,  -221,
+  -152,  -207,  -218,  -221,   -62,   -70,   -69,  -221,  -221,  -221,
+  -207,  -205,  -221,  -206,  -112,  -221,  -221,  -208,   -63,  -221,
+  -208,  -221,  -221,  -197,  -221,  -141,  -206,  -202,  -104,  -221,
+  -221,  -221,  -210,  -221,  -128,  -127,  -122,  -129,  -130,  -133,
+  -109,  -140,  -135,  -123,  -139,  -137,  -134,  -124,  -136,  -132,
+  -125,  -126,  -221,  -178,  -196,  -220,   -79,  -221,   -93,  -221,
+  -206,   -34,  -202,   -39,    -5,  -221,  -116,  -143,  -221,  -147,
+  -221,  -167,  -221,  -187,  -221,  -208,  -221,  -221,  -170,  -154,
+  -221,  -221,  -206,   -68,   -66,   -71,   -72,  -221,   -41,   -96,
+   -55,   -95,   -56,  -102,   -97,  -198,  -199,  -200,  -221,  -203,
+  -103,  -111,  -214,  -211,  -215,  -221,  -174,   -77,   -53,  -207,
+   -54,   -35,  -116,  -221,  -115,  -221,  -221,  -221,  -144,  -142,
+  -193,  -188,  -190,  -191,  -169,  -153,  -151,   -60,  -221,  -172,
+  -173,   -75,  -114,  -117,  -221,  -148,  -221,  -171,  -221,  -119,
+  -221,  -146,  -118,  -145 ]
 
 racc_goto_table = [
-     6,     5,    58,    17,     9,   100,    84,   119,   133,   138,
-   249,   119,   126,    55,    37,   210,   126,     6,     5,   168,
-   106,     9,   129,   283,   162,    54,    20,   164,   151,   152,
-   163,    61,   291,   157,   161,   149,   139,   156,   153,   226,
-     6,   300,   247,   200,   113,   230,   122,    56,   155,   116,
-   134,   166,   112,   335,   111,   159,    40,   248,   290,   257,
-   172,    65,   241,   110,   160,   312,   318,   327,   357,   107,
-   242,   143,    82,   178,   115,   235,    59,   146,   303,   293,
-   110,   238,   119,   208,   138,   148,   108,   126,   209,   198,
-    46,   315,   199,    15,   nil,   326,   nil,   nil,   nil,   nil,
-   nil,   nil,   358,   nil,   nil,   nil,   nil,   nil,     6,   nil,
-   nil,   220,   113,   nil,   nil,   297,   nil,   116,   340,   nil,
-   206,   213,   nil,   nil,   254,   nil,   306,   247,   nil,   246,
-   nil,   nil,   nil,   157,   253,   149,   nil,   156,   nil,   nil,
-   nil,   nil,   115,   nil,   nil,   nil,   nil,   nil,   nil,   263,
-   264,   nil,   nil,   259,   nil,   251,   nil,   nil,   236,   nil,
-   nil,   254,   nil,   nil,   nil,   293,   246,   nil,   245,   234,
-   157,   253,   149,   nil,   156,   nil,   nil,   nil,   nil,   119,
-   nil,   nil,   nil,   310,   126,   nil,   nil,   138,    65,   366,
-    65,   368,   251,   294,     6,     5,   328,   162,     9,   320,
-   365,   151,   152,   321,   346,   245,   157,   161,   149,   254,
-   156,   153,     6,     5,   246,   nil,     9,   361,   157,   253,
-   149,   155,   156,   nil,    99,   nil,   353,   104,   159,   337,
-   275,   nil,   247,   355,   279,   nil,   nil,     6,     5,   nil,
-   251,     9,   117,   nil,   nil,   nil,   314,   254,   135,   136,
-   137,   nil,   246,   245,   nil,   nil,   157,   253,   149,   nil,
-   156,   nil,   nil,   nil,   nil,   nil,   nil,    58,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   198,   169,   nil,   251,   nil,
-   nil,   nil,     6,     5,   nil,   nil,     9,   nil,   nil,   nil,
-   nil,   245,   nil,   176,   177,   nil,   nil,   nil,   nil,   254,
-   nil,   203,   nil,   nil,   246,   nil,   nil,   354,   157,   253,
-   149,   nil,   156,   359,   254,   nil,   nil,     6,     5,   246,
-   350,     9,   nil,   157,   253,   149,   nil,   156,   nil,   nil,
-   251,   nil,   nil,   nil,   nil,    58,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   245,   nil,   251,   nil,   nil,   nil,   nil,
-     6,     5,   nil,   nil,     9,   nil,   nil,   nil,   245,   nil,
-     6,     5,     6,     5,     9,   nil,     9,   nil,   258,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   267,   268,   269,
-   270,   271,   272,   273,   274,   nil,   276,   277,   278,   nil,
-   280,   281,   nil,   285,   286,   nil,   nil,   nil,   nil,   nil,
+    12,   112,    24,    30,    98,   135,   156,   131,    53,   111,
+   246,    65,   226,   249,    99,   212,   206,   173,   116,    83,
+    66,   297,    73,   159,    12,    26,   158,    30,   295,   123,
+   344,   124,    16,    57,   152,   145,   103,   307,   128,   157,
+    68,   300,    29,   214,   323,   121,   314,    13,   133,    26,
+   188,   231,   287,   167,   117,   211,    16,    12,   254,   105,
+    30,   130,   198,   310,    30,   163,   127,   284,   289,   224,
+   225,    13,   110,   216,   217,   325,   362,   172,   118,   304,
+    21,   230,    26,   131,   nil,   311,    26,   nil,   nil,    16,
+   222,   335,   124,    16,   317,   120,   nil,   nil,   nil,   128,
+   nil,   348,   240,   nil,   125,   158,   nil,   204,   nil,   nil,
+    30,   233,   nil,   nil,   nil,   120,   nil,   nil,    12,   nil,
+     6,    30,   nil,   nil,   nil,   nil,   nil,   127,   nil,   nil,
+   nil,   nil,    26,   259,   260,     2,   nil,   130,   nil,    16,
+    30,   nil,   nil,    26,     6,   nil,   nil,   201,   nil,   nil,
+    16,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
+    27,   nil,    26,   nil,   nil,   125,   299,   nil,   nil,    16,
+   nil,   nil,   nil,   368,   nil,   370,   nil,     6,   nil,   nil,
+   nil,     6,   nil,   nil,    27,   270,   332,   141,   283,   293,
+   nil,   141,   301,   361,   337,   206,   129,   273,   352,   nil,
+   309,   321,   nil,   277,   158,   253,   nil,   nil,   nil,   nil,
+   103,   103,   nil,   nil,   nil,   nil,   nil,    27,   nil,    12,
+   130,   nil,    30,    30,   339,   nil,   nil,   203,    12,   nil,
+   nil,    30,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,
+   nil,   nil,   nil,   nil,    26,    26,   299,   nil,   nil,   nil,
+   nil,    16,    16,    26,   355,    22,   131,     6,   nil,   326,
+    16,   nil,   nil,   141,   nil,   nil,    13,   208,   nil,   nil,
+   nil,   nil,   129,   nil,    98,    13,   nil,    32,    27,    22,
+   nil,   nil,    12,   nil,   nil,    30,   204,   nil,   nil,    30,
+   nil,   nil,   365,   nil,    12,   nil,   nil,    30,   nil,   nil,
+   130,    32,   nil,    30,   363,   nil,   nil,    26,   nil,   nil,
+   130,    26,    22,    30,    16,   nil,   134,   nil,    16,    26,
+   nil,   nil,   nil,   nil,   nil,    26,    16,   nil,    12,    13,
+   358,    30,    16,   nil,    32,    26,   nil,   nil,    98,     6,
+     6,    13,    16,   nil,   nil,   nil,   130,   170,     6,    30,
+   nil,   nil,   nil,    26,     2,   129,   nil,   141,    12,   nil,
+    16,    30,   207,     2,    12,   nil,    12,    30,   nil,    30,
+   nil,    26,   nil,    22,   nil,    13,   nil,   nil,    16,    27,
+    19,   nil,   nil,    26,   209,   nil,   nil,   nil,    27,    26,
+    16,    26,   134,   nil,   nil,    32,    16,   nil,    16,   nil,
+   nil,   nil,     6,   nil,    19,    13,   203,   nil,   nil,   nil,
+   nil,    13,   nil,    13,     6,   nil,   nil,     2,   nil,   nil,
+     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,
+     6,   nil,   nil,   nil,   nil,   129,   nil,    19,   nil,   nil,
+   nil,   132,    27,   nil,   nil,   129,   208,   144,     6,   nil,
+   nil,   144,   nil,   nil,    27,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     2,   nil,   nil,     6,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    22,   134,   nil,   nil,     6,   nil,
+   nil,   129,   nil,    22,     6,   nil,     6,   205,    27,   nil,
+   nil,   nil,   nil,     2,   nil,   nil,    32,   nil,    19,     2,
+   nil,     2,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   170,   132,    27,   nil,
+   nil,   nil,   nil,   144,    27,   nil,    27,   nil,   nil,   nil,
+   nil,   nil,   nil,    96,   nil,   nil,   nil,    22,   nil,   nil,
+   nil,   207,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
+   nil,   nil,   nil,   nil,   nil,   134,   113,   nil,   nil,    32,
+   114,   nil,   nil,   209,   nil,   134,   nil,   nil,   nil,   nil,
+   122,    32,   nil,   nil,   nil,   nil,   nil,   nil,   138,   139,
+   140,   nil,   nil,    22,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   164,   nil,   nil,   nil,   nil,   165,    19,
+   132,   134,   nil,   nil,   nil,    32,   nil,   nil,    19,   nil,
+   nil,   176,   nil,    22,   nil,   nil,   nil,   144,   nil,    22,
+   nil,    22,   202,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    32,   nil,   nil,   nil,   nil,
+   nil,    32,   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   304,   305,   nil,   nil,
-   nil,   nil,   307,   308,   nil,   nil,   nil,   nil,   nil,   nil,
-   313,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    19,   nil,   nil,   nil,   205,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    19,   nil,   nil,   nil,   nil,   nil,
+   132,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   132,   nil,   nil,   264,   265,   266,   267,   268,   269,    96,
+   271,   272,   nil,   nil,   nil,   274,   275,   276,    19,   278,
+   279,   280,   281,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   132,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    19,   nil,
+   nil,   nil,   nil,   nil,    19,   nil,    19,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   315,   316,   nil,   nil,   318,   nil,
+   nil,   319,   nil,   nil,   nil,   nil,   nil,   324,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   334,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   169,   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,   339,   nil,   nil,
-   nil,   nil,   nil,   344,   nil,   nil,   nil,   347,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   350,   nil,
+   nil,   nil,   353,   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,    99 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   113 ]
 
 racc_goto_check = [
-    43,    54,     4,     2,    22,    60,    25,    33,    41,    55,
-    69,    33,    29,    43,    38,    81,    29,    43,    54,    58,
-    71,    22,    23,     5,    30,    38,     3,    41,    32,    33,
-    52,    77,    65,    37,    29,    31,    44,    36,    34,    42,
-    43,     5,    67,    84,    22,    42,    47,     6,    35,     8,
-    47,    23,    20,    61,    73,    28,    21,    68,    64,    59,
-    23,    63,    40,     3,    39,    57,     5,    70,    27,    72,
-    42,    73,    24,    23,     6,    74,    75,    76,    48,    67,
-     3,    78,    33,    79,    55,     3,    21,    29,    80,    28,
-    46,    82,    83,     1,   nil,    69,   nil,   nil,   nil,   nil,
-   nil,   nil,    61,   nil,   nil,   nil,   nil,   nil,    43,   nil,
-   nil,    44,    22,   nil,   nil,    42,   nil,     8,    65,   nil,
-    20,    47,   nil,   nil,    30,   nil,    42,    67,   nil,    33,
-   nil,   nil,   nil,    37,    29,    31,   nil,    36,   nil,   nil,
-   nil,   nil,     6,   nil,   nil,   nil,   nil,   nil,   nil,    23,
-    23,   nil,   nil,    25,   nil,    28,   nil,   nil,    77,   nil,
-   nil,    30,   nil,   nil,   nil,    67,    33,   nil,    54,     3,
-    37,    29,    31,   nil,    36,   nil,   nil,   nil,   nil,    33,
-   nil,   nil,   nil,    55,    29,   nil,   nil,    55,    63,     5,
-    63,     5,    28,    71,    43,    54,    58,    30,    22,    41,
-    69,    32,    33,    52,    81,    54,    37,    29,    31,    30,
-    36,    34,    43,    54,    33,   nil,    22,    67,    37,    29,
-    31,    35,    36,   nil,    26,   nil,    42,    26,    28,    84,
-    63,   nil,    67,    42,    63,   nil,   nil,    43,    54,   nil,
-    28,    22,    26,   nil,   nil,   nil,    38,    30,    26,    26,
-    26,   nil,    33,    54,   nil,   nil,    37,    29,    31,   nil,
-    36,   nil,   nil,   nil,   nil,   nil,   nil,     4,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    28,    26,   nil,    28,   nil,
-   nil,   nil,    43,    54,   nil,   nil,    22,   nil,   nil,   nil,
-   nil,    54,   nil,    26,    26,   nil,   nil,   nil,   nil,    30,
-   nil,    26,   nil,   nil,    33,   nil,   nil,    25,    37,    29,
-    31,   nil,    36,    60,    30,   nil,   nil,    43,    54,    33,
-     2,    22,   nil,    37,    29,    31,   nil,    36,   nil,   nil,
-    28,   nil,   nil,   nil,   nil,     4,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    54,   nil,    28,   nil,   nil,   nil,   nil,
-    43,    54,   nil,   nil,    22,   nil,   nil,   nil,    54,   nil,
-    43,    54,    43,    54,    22,   nil,    22,   nil,    26,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,    26,    26,
-    26,    26,    26,    26,    26,   nil,    26,    26,    26,   nil,
-    26,    26,   nil,    26,    26,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    26,    26,   nil,   nil,
-   nil,   nil,    26,    26,   nil,   nil,   nil,   nil,   nil,   nil,
-    26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    33,    59,     2,    37,     4,    68,    41,    66,    38,    29,
+    42,    33,    80,    42,    76,    51,    35,    83,    70,    57,
+     6,    64,    38,    43,    33,    36,    54,    37,     5,    20,
+    60,    10,    34,    21,    27,    46,    62,     5,     8,    46,
+    45,    63,     3,    41,    56,    72,    47,    22,    67,    36,
+    58,    69,    40,    27,    71,    39,    34,    33,    73,    74,
+    37,    33,    75,    31,    37,    72,     6,    77,    42,    78,
+    79,    22,    28,    27,    27,    81,    60,    82,    21,    42,
+     1,    68,    36,    66,   nil,    42,    36,   nil,   nil,    34,
+    20,     5,    10,    34,    42,     3,   nil,   nil,   nil,     8,
+   nil,    64,    43,   nil,    22,    54,   nil,    33,   nil,   nil,
+    37,    46,   nil,   nil,   nil,     3,   nil,   nil,    33,   nil,
+    32,    37,   nil,   nil,   nil,   nil,   nil,     6,   nil,   nil,
+   nil,   nil,    36,    27,    27,    53,   nil,    33,   nil,    34,
+    37,   nil,   nil,    36,    32,   nil,   nil,     3,   nil,   nil,
+    34,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
+    25,   nil,    36,   nil,   nil,    22,    66,   nil,   nil,    34,
+   nil,   nil,   nil,     5,   nil,     5,   nil,    32,   nil,   nil,
+   nil,    32,   nil,   nil,    25,    57,    83,    32,    76,    29,
+   nil,    32,    70,    42,    51,    35,    53,    62,    80,   nil,
+    29,    54,   nil,    62,    54,     3,   nil,   nil,   nil,   nil,
+    62,    62,   nil,   nil,   nil,   nil,   nil,    25,   nil,    33,
+    33,   nil,    37,    37,    41,   nil,   nil,    32,    33,   nil,
+   nil,    37,   nil,   nil,   nil,   nil,   nil,   nil,    32,   nil,
+   nil,   nil,   nil,   nil,    36,    36,    66,   nil,   nil,   nil,
+   nil,    34,    34,    36,    68,    24,    66,    32,   nil,    38,
+    34,   nil,   nil,    32,   nil,   nil,    22,    25,   nil,   nil,
+   nil,   nil,    53,   nil,     4,    22,   nil,    26,    25,    24,
+   nil,   nil,    33,   nil,   nil,    37,    33,   nil,   nil,    37,
+   nil,   nil,    66,   nil,    33,   nil,   nil,    37,   nil,   nil,
+    33,    26,   nil,    37,    59,   nil,   nil,    36,   nil,   nil,
+    33,    36,    24,    37,    34,   nil,    24,   nil,    34,    36,
+   nil,   nil,   nil,   nil,   nil,    36,    34,   nil,    33,    22,
+     2,    37,    34,   nil,    26,    36,   nil,   nil,     4,    32,
+    32,    22,    34,   nil,   nil,   nil,    33,    24,    32,    37,
+   nil,   nil,   nil,    36,    53,    53,   nil,    32,    33,   nil,
+    34,    37,    24,    53,    33,   nil,    33,    37,   nil,    37,
+   nil,    36,   nil,    24,   nil,    22,   nil,   nil,    34,    25,
+    23,   nil,   nil,    36,    26,   nil,   nil,   nil,    25,    36,
+    34,    36,    24,   nil,   nil,    26,    34,   nil,    34,   nil,
+   nil,   nil,    32,   nil,    23,    22,    32,   nil,   nil,   nil,
+   nil,    22,   nil,    22,    32,   nil,   nil,    53,   nil,   nil,
+    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53,
+    32,   nil,   nil,   nil,   nil,    53,   nil,    23,   nil,   nil,
+   nil,    23,    25,   nil,   nil,    53,    25,    23,    32,   nil,
+   nil,    23,   nil,   nil,    25,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    53,   nil,   nil,    32,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    24,    24,   nil,   nil,    32,   nil,
+   nil,    53,   nil,    24,    32,   nil,    32,    23,    25,   nil,
+   nil,   nil,   nil,    53,   nil,   nil,    26,   nil,    23,    53,
+   nil,    53,   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    24,    23,    25,   nil,
+   nil,   nil,   nil,    23,    25,   nil,    25,   nil,   nil,   nil,
+   nil,   nil,   nil,    30,   nil,   nil,   nil,    24,   nil,   nil,
+   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    24,
+   nil,   nil,   nil,   nil,   nil,    24,    30,   nil,   nil,    26,
+    30,   nil,   nil,    26,   nil,    24,   nil,   nil,   nil,   nil,
+    30,    26,   nil,   nil,   nil,   nil,   nil,   nil,    30,    30,
+    30,   nil,   nil,    24,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    30,   nil,   nil,   nil,   nil,    30,    23,
+    23,    24,   nil,   nil,   nil,    26,   nil,   nil,    23,   nil,
+   nil,    30,   nil,    24,   nil,   nil,   nil,    23,   nil,    24,
+   nil,    24,    30,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,
+   nil,    26,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    23,   nil,   nil,   nil,    23,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,   nil,   nil,
+    23,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    23,   nil,   nil,    30,    30,    30,    30,    30,    30,    30,
+    30,    30,   nil,   nil,   nil,    30,    30,    30,    23,    30,
+    30,    30,    30,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,   nil,
+   nil,   nil,   nil,   nil,    23,   nil,    23,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    30,    30,   nil,   nil,    30,   nil,
+   nil,    30,   nil,   nil,   nil,   nil,   nil,    30,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,
    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,    26,   nil,   nil,
-   nil,   nil,   nil,    26,   nil,   nil,   nil,    26,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,   nil,
+   nil,   nil,    30,   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,    26 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30 ]
 
 racc_goto_pointer = [
-   nil,    93,     3,    26,   -15,  -171,    34,   nil,     9,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    12,    53,     4,   -25,    48,   -18,   198,  -259,   -12,   -33,
-   -43,   -32,   -39,   -38,   -29,   -19,   -30,   -34,    13,    -3,
-   -98,   -40,   -94,     0,   -17,   nil,    84,     1,  -139,   nil,
-   nil,   nil,   -37,   nil,     1,   -44,   nil,  -166,   -59,  -110,
-   -21,  -231,   nil,    43,  -146,  -172,   nil,  -125,  -110,  -157,
-  -185,   -12,    37,    17,   -68,    58,    18,    13,   -66,   -26,
-   -21,   -94,  -142,    -9,   -58,   nil ]
+   nil,    80,     2,    42,   -20,  -191,     9,   nil,   -19,   nil,
+   -26,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   -28,    29,    47,   380,   255,   160,   277,   -35,    34,   -29,
+   516,  -168,   120,     0,    32,   -91,    25,     3,     7,   -52,
+  -159,   -64,  -146,   -49,   nil,    28,   -32,  -191,   nil,   nil,
+   nil,   -92,   nil,   135,   -46,   nil,  -206,     2,   -46,   -39,
+  -266,   nil,    11,  -179,  -199,   nil,   -54,   -13,   -56,   -86,
+   -29,     7,    -8,  -105,    34,   -43,   -11,  -133,   -50,   -49,
+  -107,  -177,   -15,   -75,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   282,   121,    22,   nil,    28,    31,    34,     4,
-     7,    10,    14,    16,    19,    21,    25,    27,    30,    33,
-     3,   nil,    74,   nil,   nil,    97,   130,   224,    90,    91,
-    94,    68,    71,    75,    80,    81,    83,    87,    23,   nil,
-   nil,   nil,   nil,    70,   nil,    13,   nil,   nil,   123,   217,
-   125,   127,   nil,   150,    69,   131,   140,   141,   nil,   nil,
-   nil,   nil,   102,    92,   nil,   nil,   292,    77,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    62,   nil,
-   nil,   nil,   nil,   nil,   nil,   202 ]
+   nil,   nil,   294,   147,    34,   nil,    42,    46,    50,     5,
+     7,    14,    20,    23,    28,    33,    39,    41,    45,    49,
+     4,   nil,    78,    80,    85,    87,    90,   nil,   nil,    94,
+   153,   242,    75,    79,    81,    84,    86,    89,    37,   nil,
+   nil,   nil,   nil,   nil,    11,   nil,   nil,   146,   237,   149,
+   150,   nil,   213,    74,   154,   160,   161,   nil,   nil,   nil,
+   nil,    93,    43,   nil,   nil,   298,     8,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   101,   nil,   nil,
+   nil,   nil,   nil,   nil,   174 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -463,202 +539,206 @@ racc_reduce_table = [
   1, 88, :_reduce_none,
   1, 88, :_reduce_none,
   1, 88, :_reduce_none,
+  1, 88, :_reduce_none,
+  1, 88, :_reduce_none,
+  1, 88, :_reduce_none,
+  1, 88, :_reduce_none,
+  1, 88, :_reduce_none,
   1, 89, :_reduce_none,
   1, 89, :_reduce_none,
   1, 89, :_reduce_none,
   1, 89, :_reduce_none,
-  4, 81, :_reduce_29,
-  5, 81, :_reduce_30,
-  3, 81, :_reduce_31,
-  2, 81, :_reduce_32,
-  1, 92, :_reduce_33,
-  3, 92, :_reduce_34,
-  1, 91, :_reduce_35,
-  3, 91, :_reduce_36,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  1, 93, :_reduce_none,
-  5, 74, :_reduce_48,
-  5, 74, :_reduce_49,
-  5, 74, :_reduce_50,
-  5, 85, :_reduce_51,
-  2, 75, :_reduce_52,
-  1, 113, :_reduce_53,
-  2, 113, :_reduce_54,
-  6, 76, :_reduce_55,
-  2, 76, :_reduce_56,
-  3, 114, :_reduce_57,
-  3, 114, :_reduce_58,
-  1, 115, :_reduce_none,
+  4, 81, :_reduce_34,
+  5, 81, :_reduce_35,
+  3, 81, :_reduce_36,
+  2, 81, :_reduce_37,
+  1, 96, :_reduce_38,
+  3, 96, :_reduce_39,
+  1, 95, :_reduce_40,
+  3, 95, :_reduce_41,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  1, 97, :_reduce_none,
+  5, 74, :_reduce_53,
+  5, 74, :_reduce_54,
+  5, 74, :_reduce_55,
+  5, 85, :_reduce_56,
+  2, 75, :_reduce_57,
+  1, 112, :_reduce_58,
+  2, 112, :_reduce_59,
+  6, 76, :_reduce_60,
+  2, 76, :_reduce_61,
+  3, 113, :_reduce_62,
+  3, 113, :_reduce_63,
+  1, 114, :_reduce_none,
+  1, 114, :_reduce_none,
+  3, 114, :_reduce_66,
   1, 115, :_reduce_none,
-  3, 115, :_reduce_61,
-  1, 116, :_reduce_none,
-  3, 116, :_reduce_63,
-  1, 117, :_reduce_64,
-  1, 117, :_reduce_65,
-  3, 118, :_reduce_66,
-  3, 118, :_reduce_67,
-  1, 119, :_reduce_none,
-  1, 119, :_reduce_none,
-  4, 120, :_reduce_70,
-  1, 107, :_reduce_71,
-  3, 107, :_reduce_72,
+  3, 115, :_reduce_68,
+  1, 116, :_reduce_69,
+  1, 116, :_reduce_70,
+  3, 117, :_reduce_71,
+  3, 117, :_reduce_72,
+  1, 118, :_reduce_none,
+  1, 118, :_reduce_none,
+  4, 119, :_reduce_75,
+  1, 107, :_reduce_76,
+  3, 107, :_reduce_77,
   0, 108, :_reduce_none,
   1, 108, :_reduce_none,
-  1, 105, :_reduce_75,
-  1, 97, :_reduce_76,
-  1, 98, :_reduce_77,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  3, 77, :_reduce_85,
-  3, 77, :_reduce_86,
-  3, 86, :_reduce_87,
-  0, 109, :_reduce_88,
-  1, 109, :_reduce_89,
-  3, 109, :_reduce_90,
-  3, 123, :_reduce_91,
-  3, 124, :_reduce_92,
-  1, 125, :_reduce_none,
-  1, 125, :_reduce_none,
-  0, 112, :_reduce_95,
-  1, 112, :_reduce_96,
-  3, 112, :_reduce_97,
-  4, 104, :_reduce_98,
-  3, 104, :_reduce_99,
-  1, 96, :_reduce_100,
-  2, 96, :_reduce_101,
-  2, 126, :_reduce_102,
-  1, 127, :_reduce_103,
-  2, 127, :_reduce_104,
-  1, 99, :_reduce_105,
-  4, 90, :_reduce_106,
-  4, 90, :_reduce_107,
-  2, 79, :_reduce_108,
-  5, 128, :_reduce_109,
-  4, 128, :_reduce_110,
-  0, 129, :_reduce_none,
-  2, 129, :_reduce_112,
-  4, 129, :_reduce_113,
-  3, 129, :_reduce_114,
-  1, 94, :_reduce_none,
-  1, 94, :_reduce_none,
-  3, 94, :_reduce_117,
-  3, 94, :_reduce_118,
-  3, 94, :_reduce_119,
-  3, 94, :_reduce_120,
-  3, 94, :_reduce_121,
-  3, 94, :_reduce_122,
-  3, 94, :_reduce_123,
-  3, 94, :_reduce_124,
-  3, 94, :_reduce_125,
-  2, 94, :_reduce_126,
-  3, 94, :_reduce_127,
-  3, 94, :_reduce_128,
-  3, 94, :_reduce_129,
-  3, 94, :_reduce_130,
-  3, 94, :_reduce_131,
-  3, 94, :_reduce_132,
-  2, 94, :_reduce_133,
-  3, 94, :_reduce_134,
-  3, 94, :_reduce_135,
-  3, 94, :_reduce_136,
-  5, 78, :_reduce_137,
-  1, 132, :_reduce_138,
-  2, 132, :_reduce_139,
-  5, 133, :_reduce_140,
-  4, 133, :_reduce_141,
-  1, 134, :_reduce_142,
-  3, 134, :_reduce_143,
-  3, 100, :_reduce_144,
-  1, 136, :_reduce_none,
-  4, 136, :_reduce_146,
-  1, 138, :_reduce_none,
-  3, 138, :_reduce_148,
-  3, 137, :_reduce_149,
+  1, 105, :_reduce_80,
+  1, 100, :_reduce_81,
+  1, 101, :_reduce_82,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  1, 120, :_reduce_none,
+  3, 77, :_reduce_90,
+  3, 77, :_reduce_91,
+  3, 86, :_reduce_92,
+  0, 109, :_reduce_93,
+  1, 109, :_reduce_94,
+  3, 109, :_reduce_95,
+  3, 122, :_reduce_96,
+  3, 123, :_reduce_97,
+  1, 124, :_reduce_none,
+  1, 124, :_reduce_none,
+  0, 111, :_reduce_100,
+  1, 111, :_reduce_101,
+  3, 111, :_reduce_102,
+  4, 104, :_reduce_103,
+  3, 104, :_reduce_104,
+  1, 92, :_reduce_105,
+  2, 92, :_reduce_106,
+  2, 125, :_reduce_107,
+  1, 126, :_reduce_108,
+  2, 126, :_reduce_109,
+  1, 102, :_reduce_110,
+  4, 90, :_reduce_111,
+  4, 90, :_reduce_112,
+  2, 79, :_reduce_113,
+  5, 127, :_reduce_114,
+  4, 127, :_reduce_115,
+  0, 128, :_reduce_none,
+  2, 128, :_reduce_117,
+  4, 128, :_reduce_118,
+  3, 128, :_reduce_119,
+  1, 98, :_reduce_none,
+  1, 98, :_reduce_none,
+  3, 98, :_reduce_122,
+  3, 98, :_reduce_123,
+  3, 98, :_reduce_124,
+  3, 98, :_reduce_125,
+  3, 98, :_reduce_126,
+  3, 98, :_reduce_127,
+  3, 98, :_reduce_128,
+  3, 98, :_reduce_129,
+  3, 98, :_reduce_130,
+  2, 98, :_reduce_131,
+  3, 98, :_reduce_132,
+  3, 98, :_reduce_133,
+  3, 98, :_reduce_134,
+  3, 98, :_reduce_135,
+  3, 98, :_reduce_136,
+  3, 98, :_reduce_137,
+  2, 98, :_reduce_138,
+  3, 98, :_reduce_139,
+  3, 98, :_reduce_140,
+  3, 98, :_reduce_141,
+  5, 78, :_reduce_142,
+  1, 131, :_reduce_143,
+  2, 131, :_reduce_144,
+  5, 132, :_reduce_145,
+  4, 132, :_reduce_146,
+  1, 133, :_reduce_147,
+  3, 133, :_reduce_148,
+  3, 93, :_reduce_149,
   1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_none,
-  1, 135, :_reduce_158,
-  1, 135, :_reduce_none,
-  1, 139, :_reduce_160,
+  4, 135, :_reduce_151,
+  1, 137, :_reduce_none,
+  3, 137, :_reduce_153,
+  3, 136, :_reduce_154,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_none,
+  1, 134, :_reduce_163,
+  1, 134, :_reduce_none,
+  1, 138, :_reduce_165,
+  1, 139, :_reduce_none,
+  3, 139, :_reduce_167,
+  2, 80, :_reduce_168,
+  6, 82, :_reduce_169,
+  5, 82, :_reduce_170,
+  7, 83, :_reduce_171,
+  6, 83, :_reduce_172,
+  6, 84, :_reduce_173,
+  5, 84, :_reduce_174,
+  1, 106, :_reduce_175,
+  1, 106, :_reduce_176,
+  1, 142, :_reduce_177,
+  3, 142, :_reduce_178,
+  1, 144, :_reduce_179,
+  1, 145, :_reduce_180,
+  1, 145, :_reduce_181,
+  1, 145, :_reduce_182,
+  1, 145, :_reduce_none,
+  0, 71, :_reduce_184,
+  0, 146, :_reduce_185,
   1, 140, :_reduce_none,
-  3, 140, :_reduce_162,
-  2, 80, :_reduce_163,
-  6, 82, :_reduce_164,
-  5, 82, :_reduce_165,
-  7, 83, :_reduce_166,
-  6, 83, :_reduce_167,
-  6, 84, :_reduce_168,
-  5, 84, :_reduce_169,
-  1, 111, :_reduce_170,
-  1, 106, :_reduce_171,
-  1, 106, :_reduce_172,
-  1, 143, :_reduce_173,
-  3, 143, :_reduce_174,
-  1, 145, :_reduce_175,
-  1, 146, :_reduce_176,
-  1, 146, :_reduce_177,
-  1, 146, :_reduce_178,
-  1, 146, :_reduce_none,
-  0, 71, :_reduce_180,
-  0, 147, :_reduce_181,
+  3, 140, :_reduce_187,
+  4, 140, :_reduce_188,
+  1, 147, :_reduce_none,
+  3, 147, :_reduce_190,
+  3, 148, :_reduce_191,
+  1, 148, :_reduce_192,
+  3, 148, :_reduce_193,
+  1, 148, :_reduce_194,
+  1, 143, :_reduce_none,
+  2, 143, :_reduce_196,
   1, 141, :_reduce_none,
-  3, 141, :_reduce_183,
-  4, 141, :_reduce_184,
-  1, 148, :_reduce_none,
-  3, 148, :_reduce_186,
-  3, 149, :_reduce_187,
-  1, 149, :_reduce_188,
-  3, 149, :_reduce_189,
-  1, 149, :_reduce_190,
-  1, 144, :_reduce_none,
-  2, 144, :_reduce_192,
-  1, 142, :_reduce_none,
-  2, 142, :_reduce_194,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 101, :_reduce_197,
-  3, 102, :_reduce_198,
-  4, 102, :_reduce_199,
-  2, 102, :_reduce_200,
-  1, 95, :_reduce_none,
-  1, 95, :_reduce_none,
+  2, 141, :_reduce_198,
+  1, 149, :_reduce_none,
+  1, 149, :_reduce_none,
+  1, 91, :_reduce_201,
+  3, 103, :_reduce_202,
+  4, 103, :_reduce_203,
+  2, 103, :_reduce_204,
+  1, 99, :_reduce_none,
+  1, 99, :_reduce_none,
   0, 110, :_reduce_none,
-  1, 110, :_reduce_204,
-  1, 131, :_reduce_205,
-  3, 130, :_reduce_206,
-  4, 130, :_reduce_207,
-  2, 130, :_reduce_208,
-  1, 151, :_reduce_none,
-  3, 151, :_reduce_210,
-  3, 152, :_reduce_211,
-  1, 153, :_reduce_212,
-  1, 153, :_reduce_213,
-  4, 122, :_reduce_214,
-  1, 103, :_reduce_none,
-  4, 103, :_reduce_216 ]
-
-racc_reduce_n = 217
-
-racc_shift_n = 372
+  1, 110, :_reduce_208,
+  1, 130, :_reduce_209,
+  3, 129, :_reduce_210,
+  4, 129, :_reduce_211,
+  2, 129, :_reduce_212,
+  1, 150, :_reduce_none,
+  3, 150, :_reduce_214,
+  3, 151, :_reduce_215,
+  1, 152, :_reduce_216,
+  1, 152, :_reduce_217,
+  4, 121, :_reduce_218,
+  1, 94, :_reduce_none,
+  4, 94, :_reduce_220 ]
+
+racc_reduce_n = 221
+
+racc_shift_n = 374
 
 racc_token_table = {
   false => 0,
@@ -842,19 +922,19 @@ Racc_token_to_s_table = [
   "relationship_side",
   "edge",
   "resourceref",
+  "variable",
+  "quotedtext",
+  "selector",
+  "hasharrayaccesses",
   "expressions",
   "funcvalues",
   "rvalue",
   "expression",
   "comma",
-  "quotedtext",
   "name",
   "type",
   "boolean",
-  "selector",
-  "variable",
   "array",
-  "hasharrayaccesses",
   "funcrvalue",
   "undef",
   "classname",
@@ -862,7 +942,6 @@ Racc_token_to_s_table = [
   "endsemi",
   "params",
   "endcomma",
-  "classref",
   "anyparams",
   "at",
   "collectrhand",
@@ -1007,8 +1086,18 @@ module_eval(<<'.,.,', 'grammar.ra', 75)
 
 # reduce 28 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 83)
-  def _reduce_29(val, _values, result)
+# reduce 29 omitted
+
+# reduce 30 omitted
+
+# reduce 31 omitted
+
+# reduce 32 omitted
+
+# reduce 33 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 90)
+  def _reduce_34(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1019,8 +1108,8 @@ module_eval(<<'.,.,', 'grammar.ra', 83)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 90)
-  def _reduce_30(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 97)
+  def _reduce_35(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1031,8 +1120,8 @@ module_eval(<<'.,.,', 'grammar.ra', 90)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 96)
-  def _reduce_31(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 103)
+  def _reduce_36(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1043,8 +1132,8 @@ module_eval(<<'.,.,', 'grammar.ra', 96)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 103)
-  def _reduce_32(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 110)
+  def _reduce_37(val, _values, result)
         result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -1055,15 +1144,15 @@ module_eval(<<'.,.,', 'grammar.ra', 103)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 110)
-  def _reduce_33(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 117)
+  def _reduce_38(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 113)
-  def _reduce_34(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 120)
+  def _reduce_39(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1071,30 +1160,20 @@ module_eval(<<'.,.,', 'grammar.ra', 113)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 117)
-  def _reduce_35(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 124)
+  def _reduce_40(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 118)
-  def _reduce_36(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 125)
+  def _reduce_41(val, _values, result)
      result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 37 omitted
-
-# reduce 38 omitted
-
-# reduce 39 omitted
-
-# reduce 40 omitted
-
-# reduce 41 omitted
-
 # reduce 42 omitted
 
 # reduce 43 omitted
@@ -1107,8 +1186,18 @@ module_eval(<<'.,.,', 'grammar.ra', 118)
 
 # reduce 47 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 133)
-  def _reduce_48(val, _values, result)
+# reduce 48 omitted
+
+# reduce 49 omitted
+
+# reduce 50 omitted
+
+# reduce 51 omitted
+
+# reduce 52 omitted
+
+module_eval(<<'.,.,', 'grammar.ra', 140)
+  def _reduce_53(val, _values, result)
       @lexer.commentpop
   result = ast(AST::Resource, :type => val[0], :instances => val[2])
 
@@ -1116,8 +1205,8 @@ module_eval(<<'.,.,', 'grammar.ra', 133)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 136)
-  def _reduce_49(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 143)
+  def _reduce_54(val, _values, result)
       # This is a deprecated syntax.
   error "All resource specifications require names"
 
@@ -1125,18 +1214,18 @@ module_eval(<<'.,.,', 'grammar.ra', 136)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 139)
-  def _reduce_50(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 146)
+  def _reduce_55(val, _values, result)
       # a defaults setting for a type
   @lexer.commentpop
-  result = ast(AST::ResourceDefaults, :type => val[0], :parameters => val[2])
+  result = ast(AST::ResourceDefaults, :type => val[0].value, :parameters => val[2])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 146)
-  def _reduce_51(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 153)
+  def _reduce_56(val, _values, result)
       @lexer.commentpop
   result = ast AST::ResourceOverride, :object => val[0], :parameters => val[2]
 
@@ -1144,8 +1233,8 @@ module_eval(<<'.,.,', 'grammar.ra', 146)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 153)
-  def _reduce_52(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 160)
+  def _reduce_57(val, _values, result)
       type = val[0]
 
   if (type == :exported and ! Puppet[:storeconfigs])
@@ -1165,25 +1254,24 @@ module_eval(<<'.,.,', 'grammar.ra', 153)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 169)
-  def _reduce_53(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 176)
+  def _reduce_58(val, _values, result)
      result = :virtual 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 170)
-  def _reduce_54(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 177)
+  def _reduce_59(val, _values, result)
      result = :exported 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 175)
-  def _reduce_55(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 182)
+  def _reduce_60(val, _values, result)
       @lexer.commentpop
-  Puppet.warning addcontext("Collection names must now be capitalized") if val[0] =~ /^[a-z]/
-  type = val[0].downcase
+  type = val[0].value.downcase
   args = {:type => type}
 
   if val[1].is_a?(AST::CollExpr)
@@ -1203,12 +1291,9 @@ module_eval(<<'.,.,', 'grammar.ra', 175)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 194)
-  def _reduce_56(val, _values, result)
-        if val[0] =~ /^[a-z]/
-    Puppet.warning addcontext("Collection names must now be capitalized")
-  end
-  type = val[0].downcase
+module_eval(<<'.,.,', 'grammar.ra', 200)
+  def _reduce_61(val, _values, result)
+      type = val[0].value.downcase
   args = {:type => type }
 
   if val[1].is_a?(AST::CollExpr)
@@ -1227,8 +1312,8 @@ module_eval(<<'.,.,', 'grammar.ra', 194)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 215)
-  def _reduce_57(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 218)
+  def _reduce_62(val, _values, result)
       if val[1]
     result = val[1]
     result.form = :virtual
@@ -1240,8 +1325,8 @@ module_eval(<<'.,.,', 'grammar.ra', 215)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 223)
-  def _reduce_58(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 226)
+  def _reduce_63(val, _values, result)
         if val[1]
     result = val[1]
     result.form = :exported
@@ -1253,22 +1338,22 @@ module_eval(<<'.,.,', 'grammar.ra', 223)
   end
 .,.,
 
-# reduce 59 omitted
+# reduce 64 omitted
 
-# reduce 60 omitted
+# reduce 65 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 236)
-  def _reduce_61(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 239)
+  def _reduce_66(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1], :test2 => val[2]
 
     result
   end
 .,.,
 
-# reduce 62 omitted
+# reduce 67 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 241)
-  def _reduce_63(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 244)
+  def _reduce_68(val, _values, result)
         result = val[1]
     result.parens = true
 
@@ -1276,22 +1361,22 @@ module_eval(<<'.,.,', 'grammar.ra', 241)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 245)
-  def _reduce_64(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 248)
+  def _reduce_69(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 246)
-  def _reduce_65(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 249)
+  def _reduce_70(val, _values, result)
      result=val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 249)
-  def _reduce_66(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 252)
+  def _reduce_71(val, _values, result)
       result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
   #result = ast AST::CollExpr
   #result.push *val
@@ -1300,8 +1385,8 @@ module_eval(<<'.,.,', 'grammar.ra', 249)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 254)
-  def _reduce_67(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 257)
+  def _reduce_72(val, _values, result)
         result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -1310,27 +1395,27 @@ module_eval(<<'.,.,', 'grammar.ra', 254)
   end
 .,.,
 
-# reduce 68 omitted
+# reduce 73 omitted
 
-# reduce 69 omitted
+# reduce 74 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 263)
-  def _reduce_70(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 266)
+  def _reduce_75(val, _values, result)
       result = ast AST::ResourceInstance, :title => val[0], :parameters => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 266)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 269)
+  def _reduce_76(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 268)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 271)
+  def _reduce_77(val, _values, result)
         val[0].push val[2]
     result = val[0]
 
@@ -1338,50 +1423,50 @@ module_eval(<<'.,.,', 'grammar.ra', 268)
   end
 .,.,
 
-# reduce 73 omitted
+# reduce 78 omitted
 
-# reduce 74 omitted
+# reduce 79 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 276)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 279)
+  def _reduce_80(val, _values, result)
       result = ast AST::Undef, :value => :undef
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 280)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 283)
+  def _reduce_81(val, _values, result)
       result = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 284)
-  def _reduce_77(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 287)
+  def _reduce_82(val, _values, result)
       result = ast AST::Type, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 78 omitted
+# reduce 83 omitted
 
-# reduce 79 omitted
+# reduce 84 omitted
 
-# reduce 80 omitted
+# reduce 85 omitted
 
-# reduce 81 omitted
+# reduce 86 omitted
 
-# reduce 82 omitted
+# reduce 87 omitted
 
-# reduce 83 omitted
+# reduce 88 omitted
 
-# reduce 84 omitted
+# reduce 89 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 296)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 299)
+  def _reduce_90(val, _values, result)
       raise Puppet::ParseError, "Cannot assign to variables in other namespaces" if val[0][:value] =~ /::/
   # this is distinct from referencing a variable
   variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
@@ -1391,16 +1476,16 @@ module_eval(<<'.,.,', 'grammar.ra', 296)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 302)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 305)
+  def _reduce_91(val, _values, result)
         result = ast AST::VarDef, :name => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 306)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 309)
+  def _reduce_92(val, _values, result)
       variable = ast AST::Name, :value => val[0][:value], :line => val[0][:line]
   result = ast AST::VarDef, :name => variable, :value => val[2], :append => true, :line => val[0][:line]
 
@@ -1408,23 +1493,23 @@ module_eval(<<'.,.,', 'grammar.ra', 306)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 312)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 315)
+  def _reduce_93(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 314)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 317)
+  def _reduce_94(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 316)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 319)
+  def _reduce_95(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1432,16 +1517,16 @@ module_eval(<<'.,.,', 'grammar.ra', 316)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 321)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 324)
+  def _reduce_96(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 325)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 328)
+  def _reduce_97(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
     :add => true
 
@@ -1449,27 +1534,27 @@ module_eval(<<'.,.,', 'grammar.ra', 325)
   end
 .,.,
 
-# reduce 93 omitted
+# reduce 98 omitted
 
-# reduce 94 omitted
+# reduce 99 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 334)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 337)
+  def _reduce_100(val, _values, result)
       result = ast AST::ASTArray
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 336)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 339)
+  def _reduce_101(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 338)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 341)
+  def _reduce_102(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1477,8 +1562,8 @@ module_eval(<<'.,.,', 'grammar.ra', 338)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 344)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 347)
+  def _reduce_103(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => val[2],
@@ -1488,8 +1573,8 @@ module_eval(<<'.,.,', 'grammar.ra', 344)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 349)
-  def _reduce_99(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 352)
+  def _reduce_104(val, _values, result)
       result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => AST::ASTArray.new({}),
@@ -1499,51 +1584,51 @@ module_eval(<<'.,.,', 'grammar.ra', 349)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 355)
-  def _reduce_100(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 358)
+  def _reduce_105(val, _values, result)
      result = ast AST::String, :value => val[0][:value],                  :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 356)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 359)
+  def _reduce_106(val, _values, result)
      result = ast AST::Concat, :value => [ast(AST::String,val[0])]+val[1], :line => val[0][:line] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 358)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 361)
+  def _reduce_107(val, _values, result)
      result = [val[0]] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 360)
-  def _reduce_103(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 363)
+  def _reduce_108(val, _values, result)
      result = [ast(AST::String,val[0])]          
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 361)
-  def _reduce_104(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 364)
+  def _reduce_109(val, _values, result)
      result = [ast(AST::String,val[0])] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 364)
-  def _reduce_105(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 367)
+  def _reduce_110(val, _values, result)
       result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 368)
-  def _reduce_106(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 371)
+  def _reduce_111(val, _values, result)
       Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
   result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
 
@@ -1551,24 +1636,24 @@ module_eval(<<'.,.,', 'grammar.ra', 368)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 371)
-  def _reduce_107(val, _values, result)
-      result = ast AST::ResourceReference, :type => val[0], :title => val[2]
+module_eval(<<'.,.,', 'grammar.ra', 374)
+  def _reduce_112(val, _values, result)
+      result = ast AST::ResourceReference, :type => val[0].value, :title => val[2]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 375)
-  def _reduce_108(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 378)
+  def _reduce_113(val, _values, result)
       result = val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 379)
-  def _reduce_109(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 382)
+  def _reduce_114(val, _values, result)
       @lexer.commentpop
   args = {
     :test => val[0],
@@ -1583,8 +1668,8 @@ module_eval(<<'.,.,', 'grammar.ra', 379)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 390)
-  def _reduce_110(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 393)
+  def _reduce_115(val, _values, result)
         @lexer.commentpop
     args = {
       :test => val[0],
@@ -1599,18 +1684,18 @@ module_eval(<<'.,.,', 'grammar.ra', 390)
   end
 .,.,
 
-# reduce 111 omitted
+# reduce 116 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 403)
-  def _reduce_112(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 406)
+  def _reduce_117(val, _values, result)
         result = ast AST::Else, :statements => val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 406)
-  def _reduce_113(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 409)
+  def _reduce_118(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => val[2]
 
@@ -1618,8 +1703,8 @@ module_eval(<<'.,.,', 'grammar.ra', 406)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 410)
-  def _reduce_114(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 413)
+  def _reduce_119(val, _values, result)
         @lexer.commentpop
     result = ast AST::Else, :statements => ast(AST::Nop)
 
@@ -1627,28 +1712,20 @@ module_eval(<<'.,.,', 'grammar.ra', 410)
   end
 .,.,
 
-# reduce 115 omitted
-
-# reduce 116 omitted
-
-module_eval(<<'.,.,', 'grammar.ra', 429)
-  def _reduce_117(val, _values, result)
-        result = ast AST::InOperator, :lval => val[0], :rval => val[2]
+# reduce 120 omitted
 
-    result
-  end
-.,.,
+# reduce 121 omitted
 
 module_eval(<<'.,.,', 'grammar.ra', 432)
-  def _reduce_118(val, _values, result)
-        result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+  def _reduce_122(val, _values, result)
+        result = ast AST::InOperator, :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 435)
-  def _reduce_119(val, _values, result)
+  def _reduce_123(val, _values, result)
         result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1656,15 +1733,15 @@ module_eval(<<'.,.,', 'grammar.ra', 435)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 438)
-  def _reduce_120(val, _values, result)
-        result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+  def _reduce_124(val, _values, result)
+        result = ast AST::MatchOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 441)
-  def _reduce_121(val, _values, result)
+  def _reduce_125(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1672,7 +1749,7 @@ module_eval(<<'.,.,', 'grammar.ra', 441)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 444)
-  def _reduce_122(val, _values, result)
+  def _reduce_126(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1680,7 +1757,7 @@ module_eval(<<'.,.,', 'grammar.ra', 444)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 447)
-  def _reduce_123(val, _values, result)
+  def _reduce_127(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1688,7 +1765,7 @@ module_eval(<<'.,.,', 'grammar.ra', 447)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 450)
-  def _reduce_124(val, _values, result)
+  def _reduce_128(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1696,7 +1773,7 @@ module_eval(<<'.,.,', 'grammar.ra', 450)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 453)
-  def _reduce_125(val, _values, result)
+  def _reduce_129(val, _values, result)
         result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1704,23 +1781,23 @@ module_eval(<<'.,.,', 'grammar.ra', 453)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 456)
-  def _reduce_126(val, _values, result)
-        result = ast AST::Minus, :value => val[1]
+  def _reduce_130(val, _values, result)
+        result = ast AST::ArithmeticOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 459)
-  def _reduce_127(val, _values, result)
-        result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+  def _reduce_131(val, _values, result)
+        result = ast AST::Minus, :value => val[1]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 462)
-  def _reduce_128(val, _values, result)
+  def _reduce_132(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1728,7 +1805,7 @@ module_eval(<<'.,.,', 'grammar.ra', 462)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 465)
-  def _reduce_129(val, _values, result)
+  def _reduce_133(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1736,7 +1813,7 @@ module_eval(<<'.,.,', 'grammar.ra', 465)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 468)
-  def _reduce_130(val, _values, result)
+  def _reduce_134(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1744,7 +1821,7 @@ module_eval(<<'.,.,', 'grammar.ra', 468)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 471)
-  def _reduce_131(val, _values, result)
+  def _reduce_135(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1752,7 +1829,7 @@ module_eval(<<'.,.,', 'grammar.ra', 471)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 474)
-  def _reduce_132(val, _values, result)
+  def _reduce_136(val, _values, result)
         result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1760,23 +1837,23 @@ module_eval(<<'.,.,', 'grammar.ra', 474)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 477)
-  def _reduce_133(val, _values, result)
-        result = ast AST::Not, :value => val[1]
+  def _reduce_137(val, _values, result)
+        result = ast AST::ComparisonOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 480)
-  def _reduce_134(val, _values, result)
-        result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+  def _reduce_138(val, _values, result)
+        result = ast AST::Not, :value => val[1]
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 483)
-  def _reduce_135(val, _values, result)
+  def _reduce_139(val, _values, result)
         result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
 
     result
@@ -1784,15 +1861,23 @@ module_eval(<<'.,.,', 'grammar.ra', 483)
 .,.,
 
 module_eval(<<'.,.,', 'grammar.ra', 486)
-  def _reduce_136(val, _values, result)
+  def _reduce_140(val, _values, result)
+        result = ast AST::BooleanOperator, :operator => val[1][:value], :lval => val[0], :rval => val[2]
+
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'grammar.ra', 489)
+  def _reduce_141(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 490)
-  def _reduce_137(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 493)
+  def _reduce_142(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 
@@ -1800,15 +1885,15 @@ module_eval(<<'.,.,', 'grammar.ra', 490)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 494)
-  def _reduce_138(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 497)
+  def _reduce_143(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 496)
-  def _reduce_139(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 499)
+  def _reduce_144(val, _values, result)
         val[0].push val[1]
     result = val[0]
 
@@ -1816,8 +1901,8 @@ module_eval(<<'.,.,', 'grammar.ra', 496)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 501)
-  def _reduce_140(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 504)
+  def _reduce_145(val, _values, result)
       @lexer.commentpop
   result = ast AST::CaseOpt, :value => val[0], :statements => val[3]
 
@@ -1825,8 +1910,8 @@ module_eval(<<'.,.,', 'grammar.ra', 501)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 504)
-  def _reduce_141(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 507)
+  def _reduce_146(val, _values, result)
       @lexer.commentpop
 
     result = ast(
@@ -1840,15 +1925,15 @@ module_eval(<<'.,.,', 'grammar.ra', 504)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 514)
-  def _reduce_142(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 517)
+  def _reduce_147(val, _values, result)
      result = aryfy(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 516)
-  def _reduce_143(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 519)
+  def _reduce_148(val, _values, result)
         val[0].push(val[2])
     result = val[0]
 
@@ -1856,18 +1941,18 @@ module_eval(<<'.,.,', 'grammar.ra', 516)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 521)
-  def _reduce_144(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 524)
+  def _reduce_149(val, _values, result)
       result = ast AST::Selector, :param => val[0], :values => val[2]
 
     result
   end
 .,.,
 
-# reduce 145 omitted
+# reduce 150 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 526)
-  def _reduce_146(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 529)
+  def _reduce_151(val, _values, result)
         @lexer.commentpop
     result = val[1]
 
@@ -1875,10 +1960,10 @@ module_eval(<<'.,.,', 'grammar.ra', 526)
   end
 .,.,
 
-# reduce 147 omitted
+# reduce 152 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 532)
-  def _reduce_148(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 535)
+  def _reduce_153(val, _values, result)
         if val[0].instance_of?(AST::ASTArray)
     val[0].push(val[2])
     result = val[0]
@@ -1890,58 +1975,58 @@ module_eval(<<'.,.,', 'grammar.ra', 532)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 541)
-  def _reduce_149(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 544)
+  def _reduce_154(val, _values, result)
       result = ast AST::ResourceParam, :param => val[0], :value => val[2]
 
     result
   end
 .,.,
 
-# reduce 150 omitted
+# reduce 155 omitted
 
-# reduce 151 omitted
+# reduce 156 omitted
 
-# reduce 152 omitted
+# reduce 157 omitted
 
-# reduce 153 omitted
+# reduce 158 omitted
 
-# reduce 154 omitted
+# reduce 159 omitted
 
-# reduce 155 omitted
+# reduce 160 omitted
 
-# reduce 156 omitted
+# reduce 161 omitted
 
-# reduce 157 omitted
+# reduce 162 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 553)
-  def _reduce_158(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 556)
+  def _reduce_163(val, _values, result)
         result = ast AST::Default, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-# reduce 159 omitted
+# reduce 164 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 558)
-  def _reduce_160(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 561)
+  def _reduce_165(val, _values, result)
      result = [val[0][:value]] 
     result
   end
 .,.,
 
-# reduce 161 omitted
+# reduce 166 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 560)
-  def _reduce_162(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 563)
+  def _reduce_167(val, _values, result)
      result = val[0] += val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 563)
-  def _reduce_163(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 566)
+  def _reduce_168(val, _values, result)
       val[1].each do |file|
     import(file)
   end
@@ -1952,8 +2037,8 @@ module_eval(<<'.,.,', 'grammar.ra', 563)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 573)
-  def _reduce_164(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 576)
+  def _reduce_169(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Definition.new(classname(val[1]),
                                                ast_context(true).merge(:arguments => val[2], :code => val[4],
@@ -1966,8 +2051,8 @@ module_eval(<<'.,.,', 'grammar.ra', 573)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 581)
-  def _reduce_165(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 584)
+  def _reduce_170(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Definition.new(classname(val[1]),
                                                ast_context(true).merge(:arguments => val[2], :line => val[0][:line]))
@@ -1977,8 +2062,8 @@ module_eval(<<'.,.,', 'grammar.ra', 581)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 589)
-  def _reduce_166(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 592)
+  def _reduce_171(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -1990,8 +2075,8 @@ module_eval(<<'.,.,', 'grammar.ra', 589)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 596)
-  def _reduce_167(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 599)
+  def _reduce_172(val, _values, result)
       @lexer.commentpop
   # Our class gets defined in the parent namespace, not our own.
   @lexer.namepop
@@ -2003,8 +2088,8 @@ module_eval(<<'.,.,', 'grammar.ra', 596)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 605)
-  def _reduce_168(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 608)
+  def _reduce_173(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1],
                                          ast_context(true).merge(:parent => val[2], :code => val[4],
@@ -2014,8 +2099,8 @@ module_eval(<<'.,.,', 'grammar.ra', 605)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 610)
-  def _reduce_169(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 613)
+  def _reduce_174(val, _values, result)
       @lexer.commentpop
   result = Puppet::Parser::AST::Node.new(val[1], ast_context(true).merge(:parent => val[2], :line => val[0][:line]))
 
@@ -2023,37 +2108,30 @@ module_eval(<<'.,.,', 'grammar.ra', 610)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 614)
-  def _reduce_170(val, _values, result)
-     result = val[0][:value] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'grammar.ra', 616)
-  def _reduce_171(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 617)
+  def _reduce_175(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 617)
-  def _reduce_172(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 618)
+  def _reduce_176(val, _values, result)
      result = "class" 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 622)
-  def _reduce_173(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 623)
+  def _reduce_177(val, _values, result)
         result = [result]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 625)
-  def _reduce_174(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 626)
+  def _reduce_178(val, _values, result)
         result = val[0]
     result << val[2]
 
@@ -2061,65 +2139,65 @@ module_eval(<<'.,.,', 'grammar.ra', 625)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 630)
-  def _reduce_175(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 631)
+  def _reduce_179(val, _values, result)
       result = ast AST::HostName, :value => val[0]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 633)
-  def _reduce_176(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 634)
+  def _reduce_180(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 634)
-  def _reduce_177(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 635)
+  def _reduce_181(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 635)
-  def _reduce_178(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 636)
+  def _reduce_182(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-# reduce 179 omitted
+# reduce 183 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 639)
-  def _reduce_180(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 640)
+  def _reduce_184(val, _values, result)
       result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 643)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 644)
+  def _reduce_185(val, _values, result)
       result = ast AST::ASTArray, :children => []
 
     result
   end
 .,.,
 
-# reduce 182 omitted
+# reduce 186 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 648)
-  def _reduce_183(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 649)
+  def _reduce_187(val, _values, result)
         result = nil
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 651)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 652)
+  def _reduce_188(val, _values, result)
         result = val[1]
     result = [result] unless result[0].is_a?(Array)
 
@@ -2127,10 +2205,10 @@ module_eval(<<'.,.,', 'grammar.ra', 651)
   end
 .,.,
 
-# reduce 185 omitted
+# reduce 189 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 657)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 658)
+  def _reduce_190(val, _values, result)
         result = val[0]
     result = [result] unless result[0].is_a?(Array)
     result << val[2]
@@ -2139,8 +2217,8 @@ module_eval(<<'.,.,', 'grammar.ra', 657)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 663)
-  def _reduce_187(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 664)
+  def _reduce_191(val, _values, result)
       Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
   result = [val[0][:value], val[2]]
 
@@ -2148,8 +2226,8 @@ module_eval(<<'.,.,', 'grammar.ra', 663)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 667)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 668)
+  def _reduce_192(val, _values, result)
         Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0][:value]]
 
@@ -2157,98 +2235,98 @@ module_eval(<<'.,.,', 'grammar.ra', 667)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 670)
-  def _reduce_189(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 671)
+  def _reduce_193(val, _values, result)
       result = [val[0][:value], val[2]]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 672)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 673)
+  def _reduce_194(val, _values, result)
       result = [val[0][:value]]
 
     result
   end
 .,.,
 
-# reduce 191 omitted
+# reduce 195 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 677)
-  def _reduce_192(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 678)
+  def _reduce_196(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 193 omitted
+# reduce 197 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 682)
-  def _reduce_194(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 683)
+  def _reduce_198(val, _values, result)
         result = val[1]
 
     result
   end
 .,.,
 
-# reduce 195 omitted
+# reduce 199 omitted
 
-# reduce 196 omitted
+# reduce 200 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 688)
-  def _reduce_197(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 689)
+  def _reduce_201(val, _values, result)
       result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 691)
-  def _reduce_198(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 692)
+  def _reduce_202(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 692)
-  def _reduce_199(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 693)
+  def _reduce_203(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 693)
-  def _reduce_200(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 694)
+  def _reduce_204(val, _values, result)
      result = ast AST::ASTArray 
     result
   end
 .,.,
 
-# reduce 201 omitted
+# reduce 205 omitted
 
-# reduce 202 omitted
+# reduce 206 omitted
 
-# reduce 203 omitted
+# reduce 207 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 699)
-  def _reduce_204(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 700)
+  def _reduce_208(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 702)
-  def _reduce_205(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 703)
+  def _reduce_209(val, _values, result)
       result = ast AST::Regex, :value => val[0][:value]
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 706)
-  def _reduce_206(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 707)
+  def _reduce_210(val, _values, result)
       if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2259,8 +2337,8 @@ module_eval(<<'.,.,', 'grammar.ra', 706)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 713)
-  def _reduce_207(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 714)
+  def _reduce_211(val, _values, result)
         if val[1].instance_of?(AST::ASTHash)
     result = val[1]
   else
@@ -2271,18 +2349,18 @@ module_eval(<<'.,.,', 'grammar.ra', 713)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 719)
-  def _reduce_208(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 720)
+  def _reduce_212(val, _values, result)
       result = ast AST::ASTHash
 
     result
   end
 .,.,
 
-# reduce 209 omitted
+# reduce 213 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 724)
-  def _reduce_210(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 725)
+  def _reduce_214(val, _values, result)
         if val[0].instance_of?(AST::ASTHash)
     result = val[0].merge(val[2])
   else
@@ -2294,40 +2372,40 @@ module_eval(<<'.,.,', 'grammar.ra', 724)
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 733)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 734)
+  def _reduce_215(val, _values, result)
       result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 736)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 737)
+  def _reduce_216(val, _values, result)
      result = val[0][:value] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 737)
-  def _reduce_213(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 738)
+  def _reduce_217(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'grammar.ra', 740)
-  def _reduce_214(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 741)
+  def _reduce_218(val, _values, result)
       result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
 
     result
   end
 .,.,
 
-# reduce 215 omitted
+# reduce 219 omitted
 
-module_eval(<<'.,.,', 'grammar.ra', 745)
-  def _reduce_216(val, _values, result)
+module_eval(<<'.,.,', 'grammar.ra', 746)
+  def _reduce_220(val, _values, result)
         result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
 
     result