puppet 4.0.0 → 4.1.0

data/lib/puppet/pops/loader/module_loaders.rb

@@ -30,8 +30,10 @@ module Puppet::Pops::Loader::ModuleLoaders
     Puppet::Pops::Loader::ModuleLoaders::FileBased.new(parent_loader,
                                                        loaders,
                                                        nil,
-                                                       puppet_lib,
-                                                       'puppet_system')
+                                                       puppet_lib,   # may or may not have a 'lib' above 'puppet'
+                                                       'puppet_system',
+                                                        [:func_4x]   # only load ruby functions from "puppet"
+                                                       )
   end
 
   def self.module_loader_from(parent_loader, loaders, module_name, module_path)
@@ -39,7 +41,8 @@ module Puppet::Pops::Loader::ModuleLoaders
                                                        loaders,
                                                        module_name,
                                                        File.join(module_path, 'lib'),
-                                                       module_name)
+                                                       module_name
+                                                       )
   end
 
   class AbstractPathBasedModuleLoader < Puppet::Pops::Loader::BaseLoader
@@ -66,13 +69,21 @@ module Puppet::Pops::Loader::ModuleLoaders
     # @param path [String] the path to the root of the module (semantics defined by subclass)
     # @param loader_name [String] a name that is used for human identification (useful when module_name is nil)
     #
-    def initialize(parent_loader, loaders, module_name, path, loader_name)
+    def initialize(parent_loader, loaders, module_name, path, loader_name, loadables)
       super parent_loader, loader_name
 
       @module_name = module_name
       @path = path
       @smart_paths = Puppet::Pops::Loader::LoaderPaths::SmartPaths.new(self)
       @loaders = loaders
+      @loadables = loadables
+      unless (loadables - LOADABLE_KINDS).empty?
+        raise ArgumentError, 'given loadables are not of supported loadable kind'
+      end
+    end
+
+    def loadables
+      @loadables
     end
 
     # Finds typed/named entity in this module
@@ -176,7 +187,7 @@ module Puppet::Pops::Loader::ModuleLoaders
     #
     def private_loader
       # The system loader has a nil module_name and it does not have a private_loader as there are no functions
-      # that can only by called by puppet runtime - if so, it acts as the privuate loader directly.
+      # that can only by called by puppet runtime - if so, it acts as the private loader directly.
       @private_loader ||= ((module_name.nil? && self) || @loaders.private_loader_for_module(module_name))
     end
   end
@@ -195,7 +206,7 @@ module Puppet::Pops::Loader::ModuleLoaders
     # @param path [String] the path to the root of the module (semantics defined by subclass)
     # @param loader_name [String] a name that identifies the loader
     #
-    def initialize(parent_loader, loaders, module_name, path, loader_name)
+    def initialize(parent_loader, loaders, module_name, path, loader_name, loadables = LOADABLE_KINDS)
       super
       @path_index = Set.new()
     end
@@ -246,9 +257,9 @@ module Puppet::Pops::Loader::ModuleLoaders
     # * gem_ref - [URI, String] gem reference to the root of the module (URI, gem://gemname/optional/path/in/gem), or
     #     just the gem's name as a String.
     #
-    def initialize(parent_loader, loaders, module_name, gem_ref, loader_name)
+    def initialize(parent_loader, loaders, module_name, gem_ref, loader_name, loadables = LOADABLE_KINDS)
       @gem_ref = gem_ref
-      super parent_loader, loaders, module_name, gem_dir(gem_ref), loader_name
+      super parent_loader, loaders, module_name, gem_dir(gem_ref), loader_name, loadables
     end
 
     def to_s()

data/lib/puppet/pops/loader/puppet_function_instantiator.rb

@@ -0,0 +1,78 @@
+# The PuppetFunctionInstantiator instantiates a Puppet::Functions::PuppetFunction given a Puppet Programming language
+# source that when called evaluates the Puppet logic it contains.
+#
+class Puppet::Pops::Loader::PuppetFunctionInstantiator
+  # Produces an instance of the Function class with the given typed_name, or fails with an error if the
+  # given puppet source does not produce this instance when evaluated.
+  #
+  # @param loader [Puppet::Pops::Loader::Loader] The loader the function is associated with
+  # @param typed_name [Puppet::Pops::Loader::TypedName] the type / name of the function to load
+  # @param source_ref [URI, String] a reference to the source / origin of the puppet code to evaluate
+  # @param pp_code_string [String] puppet code in a string
+  #
+  # @return [Puppet::Pops::Functions::Function] - an instantiated function with global scope closure associated with the given loader
+  #
+  def self.create(loader, typed_name, source_ref, pp_code_string)
+    parser = Puppet::Pops::Parser::EvaluatingParser.new()
+
+    # parse and validate
+    result = parser.parse_string(pp_code_string, source_ref)
+    # Only one function is allowed (and no other definitions)
+    case result.model.definitions.size
+    when 0
+      raise ArgumentError, "The code loaded from #{source_ref} does not define the function '#{typed_name.name}' - it is empty."
+    when 1
+      # ok
+    else
+      raise ArgumentError, "The code loaded from #{source_ref} must contain only the function '#{typed_name.name}' - it has additional definitions."
+    end
+    the_function_definition = result.model.definitions[0]
+
+    unless the_function_definition.is_a?(Puppet::Pops::Model::FunctionDefinition)
+      raise ArgumentError, "The code loaded from #{source_ref} does not define the function '#{typed_name.name}' - no function found."
+    end
+    unless the_function_definition.name == typed_name.name
+      expected = typed_name.name
+      actual = the_function_definition.name
+      raise ArgumentError, "The code loaded from #{source_ref} produced function with the wrong name, expected #{expected}, actual #{actual}"
+    end
+    unless result.model().body == the_function_definition
+      raise ArgumentError, "The code loaded from #{source_ref} contains additional logic - can only contain the function #{typed_name.name}"
+    end
+
+    # Adapt the function definition with loader - this is used from logic contained in it body to find the
+    # loader to use when making calls to the new function API. Such logic have a hard time finding the closure (where
+    # the loader is known - hence this mechanism
+    Puppet::Pops::Adapters::LoaderAdapter.adapt(the_function_definition).loader = loader
+
+    # TODO: Cheating wrt. scope - assuming it is found in the context
+    closure_scope = Puppet.lookup(:global_scope) { {} }
+
+    created = create_function_class(the_function_definition, closure_scope)
+    # create the function instance - it needs closure (scope), and loader (i.e. where it should start searching for things
+    # when calling functions etc.
+    # It should be bound to global scope
+
+    created.new(closure_scope, loader)
+  end
+
+  # Creates Function class and instantiates it based on a FunctionDefinition model
+  # @return [Array<Puppet::Pops::Loader::Loader::TypedName, Puppet::Pops::Functions.Function>] - array of 
+  #   typed name, and an instantiated function with global scope closure associated with the given loader
+  #
+  def self.create_from_model(function_definition, loader)
+    closure_scope = Puppet.lookup(:global_scope) { {} }
+    created = create_function_class(function_definition, closure_scope)
+    typed_name = Puppet::Pops::Loader::Loader::TypedName.new(:function, function_definition.name)
+    [typed_name, created.new(closure_scope, loader)]
+  end
+
+  def self.create_function_class(function_definition, closure_scope)
+    # Create a 4x function wrapper around a named closure
+    Puppet::Functions.create_function(function_definition.name, Puppet::Functions::PuppetFunction) do
+      init_dispatch(Puppet::Pops::Evaluator::Closure::Named.new(
+        function_definition.name,
+        Puppet::Pops::Evaluator::EvaluatorImpl.new(), function_definition, closure_scope))
+    end
+  end
+end

data/lib/puppet/pops/loaders.rb

@@ -12,9 +12,11 @@ class Puppet::Pops::Loaders
 
     # Create the set of loaders
     # 1. Puppet, loads from the "running" puppet - i.e. bundled functions, types, extension points and extensions
-    #    Does not change without rebooting the service running puppet.
+    #    These cannot be cached since a  loaded instance will be bound to its closure scope which holds on to
+    #    a compiler and all loaded types. Subsequent request would find remains of the environment that loaded
+    #    the content. PUP-4461.
     #
-    @@puppet_system_loader ||= create_puppet_system_loader()
+    @puppet_system_loader = create_puppet_system_loader()
 
     # 2. Environment loader - i.e. what is bound across the environment, may change for each setup
     #    TODO: loaders need to work when also running in an agent doing catalog application. There is no
@@ -30,7 +32,7 @@ class Puppet::Pops::Loaders
   #
   def self.clear
     @@static_loader = nil
-    @@puppet_system_loader = nil
+    @puppet_system_loader = nil
   end
 
   def static_loader
@@ -38,7 +40,7 @@ class Puppet::Pops::Loaders
   end
 
   def puppet_system_loader
-    @@puppet_system_loader
+    @puppet_system_loader
   end
 
   def public_loader_for_module(module_name)

data/lib/puppet/pops/migration/migration_checker.rb

@@ -0,0 +1,54 @@
+# This class defines the private API of the MigrationChecker support.
+# @api private
+#
+class Puppet::Pops::Migration::MigrationChecker
+
+  def initialize()
+  end
+
+  # Produces a hash of available migrations; a map from a symbolic name in string form to a brief description.
+  # This version has no such supported migrations.
+  def available_migrations()
+    { }
+  end
+
+  # For 3.8/4.0
+  def report_ambiguous_integer(o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_ambiguous_float(o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_empty_string_true(value, o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_uc_bareword_type(value, o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_equality_type_mismatch(left, right, o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_option_type_mismatch(test_value, option_value, option_expr, matching_expr)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_in_expression(o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+
+  # For 3.8/4.0
+  def report_array_last_in_block(o)
+    raise Puppet::DevError, "Unsupported migration method called"
+  end
+end

data/lib/puppet/pops/model/factory.rb

@@ -754,6 +754,10 @@ class Puppet::Pops::Model::Factory
     new(Model::ResourceTypeDefinition, name, parameters, body)
   end
 
+  def self.FUNCTION(name, parameters, body)
+    new(Model::FunctionDefinition, name, parameters, body)
+  end
+
   def self.LAMBDA(parameters, body)
     new(Model::LambdaExpression, parameters, body)
   end
@@ -773,7 +777,7 @@ class Puppet::Pops::Model::Factory
     'info'    => true,
     'notice'  => true,
     'warning' => true,
-    'error'   => true,
+    'err'     => true,
 
     'fail'    => true,
     'import'  => true  # discontinued, but transform it to make it call error reporting function

data/lib/puppet/pops/model/model_label_provider.rb

@@ -86,6 +86,8 @@ class Puppet::Pops::Model::ModelLabelProvider < Puppet::Pops::LabelProvider
   def label_QualifiedReference o          ; "Type-Name"                         end
   def label_PAnyType o                    ; "#{Puppet::Pops::Types::TypeCalculator.string(o)}-Type" end
   def label_ReservedWord o                ; "Reserved Word '#{o.word}'"         end
+  def label_CatalogCollector o            ; "Catalog-Collector"                 end
+  def label_ExportedCollector o           ; "Exported-Collector"                end
 
   def label_PResourceType o
     if o.title

data/lib/puppet/pops/model/model_meta.rb

@@ -258,7 +258,7 @@ module Puppet::Pops::Model
   class CollectExpression < Expression
     contains_one_uni 'type_expr', Expression, :lowerBound => 1
     contains_one_uni 'query', QueryExpression, :lowerBound => 1
-    contains_many_uni 'operations', AttributeOperation
+    contains_many_uni 'operations', AbstractAttributeOperation
   end
 
   class Parameter < Positioned
@@ -282,6 +282,10 @@ module Puppet::Pops::Model
     contains_one_uni 'body', Expression
   end
 
+  # A function written in the Puppet Langauge
+  class FunctionDefinition < NamedDefinition
+  end
+
   # A resource type definition (a 'define' in the DSL).
   #
   class ResourceTypeDefinition < NamedDefinition

data/lib/puppet/pops/parser/egrammar.ra

@@ -21,6 +21,7 @@ token HEREDOC SUBLOCATE
 token RENDER_STRING RENDER_EXPR EPP_START EPP_END EPP_END_TRIM
 token FUNCTION
 token PRIVATE ATTR TYPE
+token FUNCTION
 token LOW
 
 prechigh
@@ -239,6 +240,7 @@ primary_expression
   | hostclass_expression
   | node_definition_expression
   | epp_render_expression
+  | function_definition
   | reserved_word
   | array
   | hash
@@ -354,7 +356,7 @@ unless_expression
       loc result, val[0], val[4]
     }
   | UNLESS expression LBRACE RBRACE unless_else {
-      result = Factory.UNLESS(val[1], nil, nil)
+      result = Factory.UNLESS(val[1], nil, val[4])
       loc result, val[0], val[4]
     }
 
@@ -568,13 +570,11 @@ node_definition_expression
 
 #---FUNCTION DEFINITION
 #
-#function_definition
-  # For now the function word will just be reserved, in the future it will
-  # produce a function definition
-  # FUNCTION classname parameter_list LBRACE opt_statements RBRACE {
-  #   result = add_definition(Factory.FUNCTION(val[1][:value], val[2], val[4]))
-  #   loc result, val[0], val[5]
-  # }
+function_definition
+  : FUNCTION classname parameter_list LBRACE opt_statements RBRACE {
+      result = add_definition(Factory.FUNCTION(val[1][:value], val[2], val[4]))
+      loc result, val[0], val[5]
+    }
 
 #---NAMES AND PARAMETERS COMMON TO SEVERAL RULES
 #   Produces String
@@ -627,8 +627,7 @@ variable
 #---RESERVED WORDS
 #
 reserved_word
-  : FUNCTION  { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
-  | PRIVATE   { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
+  : PRIVATE   { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
   | TYPE      { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
   | ATTR      { result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] }
 

data/lib/puppet/pops/parser/eparser.rb

@@ -20,7 +20,7 @@ module Puppet
     module Parser
       class Parser < Racc::Parser
 
-module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 755)
+module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 754)
 
 # Make emacs happy
 # Local Variables:
@@ -30,220 +30,222 @@ module_eval(<<'...end egrammar.ra/module_eval...', 'egrammar.ra', 755)
 ##### State transition tables begin ###
 
 clist = [
-'58,61,319,-238,59,53,155,54,238,80,-239,-227,335,280,-129,111,320,277',
-'371,336,370,-241,375,101,18,104,394,99,100,239,42,280,45,135,47,12,-240',
-'46,36,39,251,44,37,10,11,-238,113,66,17,103,110,38,-239,-227,15,16,-129',
-'301,112,278,58,61,67,-241,59,53,136,54,43,111,275,81,35,62,111,64,65',
-'63,-240,314,48,49,51,50,18,256,52,-236,111,342,42,107,45,254,47,115',
-'255,46,36,39,113,44,37,79,110,113,344,66,17,110,79,38,112,279,15,16',
-'79,112,280,113,58,61,67,110,59,53,238,54,43,-236,79,112,35,62,111,64',
-'65,269,270,66,48,49,51,50,18,71,52,239,331,371,42,370,45,328,47,12,352',
-'46,36,39,69,44,37,10,11,113,353,66,17,110,275,38,58,61,15,16,59,112',
-'258,257,58,61,67,276,59,53,355,54,43,72,73,74,35,62,111,64,65,256,302',
-'358,48,49,51,50,18,251,52,314,363,364,42,304,45,251,47,12,250,46,36',
-'39,249,44,37,10,11,113,368,66,17,110,308,38,361,372,15,16,374,112,75',
-'77,76,78,67,318,227,230,238,381,43,228,383,238,35,62,275,64,65,238,227',
-'66,48,49,51,50,58,61,52,239,59,53,66,54,324,79,79,217,216,387,239,71',
-'121,231,390,275,121,393,152,315,18,58,61,309,267,59,42,314,45,150,47',
-'12,238,46,36,39,397,44,37,10,11,374,399,66,17,66,400,38,401,122,15,16',
-'404,239,405,406,121,79,67,71,135,414,68,132,43,416,417,418,35,62,304',
-'64,65,,,,48,49,51,50,58,61,52,67,59,53,,54,410,80,,,,136,62,,,,,,,,',
-'101,18,104,,99,100,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,103',
-',38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,81,35,62,,64,65,,,,48,49,51',
-'50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
-',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
-'42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61',
-'67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
-'12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,',
-'54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36',
-'39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
-'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,',
-',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
-'48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38',
-',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
-',52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43',
-',,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,408,,,,,,,,,,,,,',
-',,18,58,61,,,59,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,',
-'15,16,,,,,,,67,,135,,,132,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52',
-'67,59,53,,54,403,80,,,,136,62,,,,,,,,,101,18,104,,99,100,,42,,45,,47',
-'12,,46,36,39,,44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53',
-',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36',
-'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,',
-'15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53',
-',54,337,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
-'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,',
-',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,139,54,43,,,,35,62,,64,65',
-',,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17',
-',,38,,,15,16,,,,,58,61,67,,59,53,141,54,43,,,,35,62,,64,65,,,,48,49',
-'51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,',
-'15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53',
-',54,143,80,,,,,,,,,,,,,,101,18,104,,99,100,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,66,17,103,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
-'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10',
-'11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,',
-',,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,',
-'38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50',
-'18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16',
-',,,,58,61,67,,59,53,,154,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,',
-',42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67',
-',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12',
-',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
-'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
-',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
-',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
-',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42',
-',45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67',
-',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12',
-',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
-'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
-',,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
-',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
-',52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,',
-',58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,171',
-'185,177,186,47,178,188,179,36,170,,173,168,,,,,66,17,189,184,169,,,15',
-'167,,,,,,,67,,,,,187,172,,,,35,62,,64,65,,,,180,181,183,182,58,61,52',
-'80,59,53,,54,,,,,,,,,,101,,104,,99,100,,18,,,,,,42,,45,,47,115,,46,36',
-'39,,44,37,103,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35',
-'62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,',
-',,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,',
-'48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38',
-',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
-',52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
-',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36',
-'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,',
-'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
-'52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
-',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36',
-'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,',
-'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
-'52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
-',54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36',
-'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,',
-'15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,',
-'52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53',
-',54,43,,,213,35,62,,64,65,,,,48,49,51,50,18,215,52,,,,42,,45,,47,12',
-',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
-'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39',
-',44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
-'65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17',
-',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
-'50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16',
-',,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,',
-'42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67',
-',59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115',
-',46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,',
-'276,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39',
-',44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
-'65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17',
-',,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51',
-'50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15',
-'16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52',
-',,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61',
-'67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
-'115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
-'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39',
-',44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48',
-'49,51,50,58,61,52,,59,53,,54,143,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12',
-',46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54',
-'43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39',
-',44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
-'65,,,,48,49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66',
-'17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58,61',
-'52,,59,53,,54,312,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39,,44',
-'37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64',
-'65,,,,48,49,51,50,18,243,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11',
-',,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48',
-'49,51,50,18,,52,,,,42,,45,,47,12,,46,36,39,,44,37,10,11,,,66,17,,,38',
-',,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18',
-',52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58',
-'61,67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45',
-',47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,',
-'35,62,,64,65,,,,48,49,51,50,58,61,52,,59,53,,54,376,,,,,,,,,,,,,,,,18',
-',,,,,42,,45,,47,115,,46,36,39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61',
-'67,,59,53,,54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47',
-'12,,46,36,39,,44,37,10,11,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,',
-'54,43,,,,35,62,,64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36',
-'39,,44,37,,,,,66,17,,,38,,,15,16,,,,,58,61,67,,59,53,,54,43,,,,35,62',
-',64,65,,,,48,49,51,50,18,,52,,,,42,,45,,47,115,,46,36,39,,44,37,,,,',
-'66,17,,,38,,,15,16,,,,,,,67,,,,,,43,,,,35,62,,64,65,,,,48,49,51,50,58',
-'61,52,,59,53,,54,322,,,,,,,,,,,,,,,,18,,,,,,42,,45,,47,12,,46,36,39',
-',44,37,10,11,80,,66,17,,,38,,,15,16,,,91,101,,104,67,99,100,,92,,43',
-',,,35,62,,64,65,,,,48,49,51,50,,103,52,,,,80,,,84,85,87,86,89,90,,82',
-'83,96,91,101,305,104,81,99,100,,92,94,93,95,,58,61,,,59,,,,,,,,88,,103',
-',,,98,97,,,84,85,87,86,89,90,,82,83,80,,246,,,81,,,135,,,132,96,91,101',
-',104,,99,100,,92,94,93,95,,88,,,,,67,,,,,,,,,103,136,62,,98,97,,,84',
-'85,87,86,89,90,,82,83,80,,245,,,81,,,,,,,96,91,101,,104,,99,100,,92',
-'94,93,95,,88,,,,,,,,,,,,,,103,,,,98,97,,,84,85,87,86,89,90,,82,83,80',
-',244,,,81,,,,,,,96,91,101,,104,80,99,100,,92,94,93,95,,88,,,,,101,,104',
-',99,100,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82,83,103,,96,91,101',
-'81,104,,99,100,,92,94,93,95,82,83,,,,,,81,,,,88,,,,103,,,,98,97,,80',
-'84,85,87,86,89,90,,82,83,,,96,91,101,81,104,,99,100,,92,94,93,95,,,',
-',,,,,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82,83,,,96,91,101',
-'81,104,,99,100,,92,94,93,95,,269,270,,,,,,,,,88,,,,103,,58,61,98,97',
-'59,80,84,85,87,86,89,90,,82,83,,,96,91,101,81,104,,99,100,,92,94,93',
-'95,,,,,,,,,,135,,88,132,,,103,,,,98,97,,80,84,85,87,86,89,90,,82,83',
-'67,,,,101,81,104,,99,100,136,62,,,,80,,,,,281,,,,,,88,96,91,101,103',
-'104,,99,100,,92,94,93,95,87,86,,,,82,83,,,,,,81,,,103,,,,98,97,,80,84',
-'85,87,86,89,90,,82,83,,88,96,91,101,81,104,,99,100,,92,94,93,95,,,,',
-',,,,,,,88,,,,103,,,,,97,,80,84,85,87,86,89,90,,82,83,,,96,91,101,81',
-'104,,99,100,,92,94,93,95,80,,,,,,,,,,,88,,,101,103,104,,99,100,80,,',
-'84,85,87,86,89,90,,82,83,96,91,101,273,104,81,99,100,103,92,94,93,95',
-',,,,,,,,,,82,83,,88,,103,,81,,98,97,,80,84,85,87,86,89,90,,82,83,,,96',
-'91,101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,80',
-'84,85,87,86,89,90,,82,83,,,,,101,81,104,,99,100,,,,,,80,,,,,,,,,,,88',
-',91,101,103,104,,99,100,80,92,,84,85,87,86,,,,82,83,,91,101,,104,81',
-'99,100,103,92,,,,80,,,84,85,87,86,89,90,,82,83,,88,101,103,104,81,99',
-'100,,,,84,85,87,86,89,90,80,82,83,,,,,,81,88,,103,96,91,101,,104,,99',
-'100,,92,94,93,95,,82,83,,88,,,,81,,,,,,,103,,,,98,97,,80,84,85,87,86',
-'89,90,,82,83,,,96,91,101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,',
-',,103,,,,98,97,,80,84,85,87,86,89,90,,82,83,,,96,91,101,81,104,,99,100',
-',92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98,97,,80,84,85,87,86,89,90,,82',
-'83,,,96,91,101,81,104,,99,100,,92,94,93,95,,,,,,,,,,,,88,,,,103,,,,98',
-'97,,80,84,85,87,86,89,90,,82,83,,,,91,101,81,104,,99,100,,92,,80,,,',
-',,,,,,,,,88,101,,104,103,99,100,,,,,,84,85,87,86,89,90,,82,83,,,,,,81',
-'103,,,,,80,,,84,85,87,86,89,90,,82,83,,,101,88,104,81,99,100,,,,80,',
-',,,,,,,,,,,,101,88,104,103,99,100,,,,,,84,85,87,86,89,90,,82,83,,,,',
-',81,103,,,,,80,,,,,87,86,,,,82,83,,,101,88,104,81,99,100,,,,80,,,,,',
-',,,,,,96,91,101,88,104,103,99,100,,92,94,93,95,84,85,87,86,,,,82,83',
-',,,,,81,103,,,,98,97,,,84,85,87,86,89,90,,82,83,,,,88,,81,,,293,185',
-'292,186,,290,188,294,,287,,289,291,,,,,,88,189,184,295,,,,288,,,,,,',
-',,,,,187,296,,,,,,,,,,,,299,300,298,297,293,185,292,186,,290,188,294',
-',287,,289,291,,,,,,,189,184,295,,,,288,,,,,,,,,,,,187,296,,,,,,,,,,',
-',299,300,298,297,293,185,292,186,,290,188,294,,287,,289,291,,,,,,,189',
-'184,295,,,,288,,,,,,,,,,,,187,296,,,,,,,,,,,,299,300,298,297,293,185',
-'292,186,,290,188,294,,287,,289,291,,,,,,,189,184,295,,,,288,,,,,,,,',
-',,,187,296,,,,,,,,,,,,299,300,298,297' ]
-        racc_action_table = arr = ::Array.new(6785, nil)
+'59,62,322,-228,60,54,337,55,240,81,-240,-239,229,283,-237,112,323,-130',
+'375,339,374,280,379,102,18,105,399,100,101,241,43,283,46,136,49,12,-242',
+'47,37,40,340,45,38,10,11,-228,114,67,17,104,111,39,-240,-239,15,16,-237',
+'252,113,-130,59,62,68,281,60,54,137,55,44,272,273,82,36,63,112,65,66',
+'64,-242,251,48,50,52,51,18,375,53,374,112,229,43,282,46,317,49,116,283',
+'47,37,40,257,45,38,258,259,114,346,67,17,111,334,39,365,348,15,16,240',
+'113,331,114,59,62,68,111,60,54,240,55,44,67,254,113,36,63,112,65,66',
+'241,232,67,48,50,52,51,18,230,53,241,261,260,43,270,46,254,49,12,321',
+'47,37,40,70,45,38,10,11,114,356,67,17,111,357,39,59,62,15,16,60,113',
+'278,279,59,62,68,359,60,54,240,55,44,73,74,75,36,63,112,65,66,318,362',
+'317,48,50,52,51,18,317,53,367,368,259,43,311,46,229,49,12,112,47,37',
+'40,80,45,38,10,11,114,372,67,17,111,307,39,376,378,15,16,305,113,76',
+'78,77,79,68,112,112,80,108,114,44,219,385,111,36,63,304,65,66,218,388',
+'113,48,50,52,51,59,62,53,122,60,54,278,55,416,72,114,114,157,154,111',
+'111,152,254,392,72,122,395,113,113,18,59,62,278,80,60,43,312,46,398',
+'49,12,240,47,37,40,240,45,38,10,11,123,80,67,17,67,80,39,122,67,15,16',
+'402,241,378,404,405,241,68,406,136,80,409,133,44,410,411,233,36,63,412',
+'65,66,80,278,72,48,50,52,51,59,62,53,68,60,54,420,55,414,81,69,422,423',
+'137,63,424,307,,,,,,,102,18,105,,100,101,,43,,46,,49,12,,47,37,40,,45',
+'38,10,11,,,67,17,104,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,82,36',
+'63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,',
+',,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,',
+'48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,',
+',39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51',
+'18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16',
+',,,,,,68,,,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59,62,53,,60,54,,55',
+'408,81,,,,,,,,,,,,,,102,18,105,,100,101,,43,,46,,49,12,,47,37,40,,45',
+'38,10,11,,,67,17,104,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63',
+',65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,',
+'67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48',
+'50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,',
+'15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,',
+'53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59',
+'62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46',
+',49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60',
+'54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47',
+'37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36',
+'63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,',
+',,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,',
+'48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39',
+',,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18',
+',53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59',
+'62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46',
+',49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54',
+',55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37',
+'40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36',
+'63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,',
+',,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,',
+'48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39',
+',,15,16,,,,,59,62,68,,60,54,141,55,44,,,,36,63,,65,66,,,,48,50,52,51',
+'18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16',
+',,,,59,62,68,,60,54,143,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53',
+',,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,,,68',
+',,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59,62,53,,60,54,,55,145,81,,',
+',,,,,,,,,,,102,18,105,,100,101,,43,,46,,49,12,,47,37,40,,45,38,10,11',
+',,67,17,104,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,',
+',,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17',
+',,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,279,,36,63,,65,66,,,,48,50',
+'52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15',
+'16,,,,,,,68,,,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59,62,53,,60,54,',
+'55,145,81,,,,,,,,,,,,,,102,18,105,,100,101,,43,,46,,49,12,,47,37,40',
+',45,38,10,11,,,67,17,104,,39,,,15,16,,,,,59,62,68,,60,54,,156,44,,,',
+'36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38',
+',,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,',
+',48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39',
+',,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18',
+',53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,',
+',59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43',
+',46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68',
+',60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12',
+',47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55',
+'44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40',
+',45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63',
+',65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11',
+',,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48',
+'50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39',
+',,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18',
+',53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,',
+',59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43',
+',46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68',
+',60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12',
+',47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55',
+'44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40',
+',45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63',
+',65,66,,,,48,50,52,51,18,,53,,,,173,187,179,188,49,180,190,181,37,172',
+',175,170,,,,,67,17,191,186,171,,,15,169,,,,,,,68,,,,,189,174,,,,36,63',
+',65,66,,,,182,183,185,184,59,62,53,81,60,54,,55,,,,,,,,,,102,,105,,100',
+'101,,18,,,,,,43,,46,,49,116,,47,37,40,,45,38,104,,,,67,17,,,39,,,15',
+'16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53',
+',,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62',
+'68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49',
+'116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55',
+'44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40',
+',45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65',
+'66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17',
+',,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52',
+'51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16',
+',,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,',
+'43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68',
+',60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116',
+',47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,',
+',,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45',
+'38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66',
+',,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,',
+',39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51',
+'18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,',
+',59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43',
+',46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60',
+'54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47',
+'37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36',
+'63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,',
+',,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,',
+'48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39',
+',,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18',
+',53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59',
+'62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46',
+',49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54',
+',55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37',
+'40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63',
+',65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,',
+'67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48',
+'50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,',
+'15,16,,,,,59,62,68,,60,54,,55,44,,,215,36,63,,65,66,,,,48,50,52,51,18',
+'217,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16',
+',,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,',
+'43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62',
+'68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49',
+'12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,',
+'55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37',
+'40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63',
+',65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,',
+'67,17,,,39,,,15,16,,,,,,,68,,,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59',
+'62,53,,60,54,,55,380,,,,,,,,,,,,,,,,18,,,,,,43,,46,,49,116,,47,37,40',
+',45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65',
+'66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67',
+'17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50',
+'52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15',
+'16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53',
+',,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62',
+'68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49',
+'116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55',
+'44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40',
+',45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65',
+'66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17',
+',,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52',
+'51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16',
+',,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,',
+'43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68',
+',60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116',
+',47,37,40,,45,38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,',
+',,36,63,,65,66,,,,48,50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45',
+'38,,,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66',
+',,,48,50,52,51,18,245,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67',
+'17,,,39,,,15,16,,,,,,,68,,,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59,62',
+'53,,60,54,,55,315,,,,,,,,,,,,,,,,18,59,62,,,60,43,,46,,49,12,,47,37',
+'40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,,,,68,,136,,,133,44,,,,36,63',
+',65,66,,,,48,50,52,51,59,62,53,68,60,54,,55,325,,,,,137,63,,,,,,,,,',
+'18,59,62,,,60,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15',
+'16,,,,,,,68,,136,,,133,44,,,,36,63,,65,66,,,,48,50,52,51,59,62,53,68',
+'60,54,,55,327,,,,,137,63,,,,,,,,,,18,,,,,,43,,46,,49,12,,47,37,40,,45',
+'38,10,11,,,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65',
+'66,,,,48,50,52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67',
+'17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50',
+'52,51,18,,53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,',
+'15,16,,,,,,,68,,,,,,44,,,,36,63,,65,66,,,,48,50,52,51,59,62,53,,60,54',
+',55,341,,,,,,,,,,,,,,,,18,,,,,,43,,46,,49,12,,47,37,40,,45,38,10,11',
+',,67,17,,,39,,,15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48',
+'50,52,51,18,,53,,,,43,,46,,49,116,,47,37,40,,45,38,,,,,67,17,,,39,,',
+'15,16,,,,,59,62,68,,60,54,,55,44,,,,36,63,,65,66,,,,48,50,52,51,18,',
+'53,,,,43,,46,,49,12,,47,37,40,,45,38,10,11,,,67,17,,,39,,,15,16,,,,',
+',,68,,,,,,44,,,,36,63,,65,66,81,,248,48,50,52,51,,,53,,,97,92,102,,105',
+',100,101,,93,95,94,96,,59,62,,,60,,,,,,,,,,104,,,,99,98,,,85,86,88,87',
+'90,91,,83,84,81,,247,,,82,,,136,,,133,97,92,102,,105,,100,101,,93,95',
+'94,96,,89,,,,,68,,,,,,,,,104,137,63,,99,98,,,85,86,88,87,90,91,,83,84',
+'81,,246,,,82,,,,,,,97,92,102,,105,,100,101,,93,95,94,96,,89,,,,,,,,',
+',,,,,104,,,,99,98,,,85,86,88,87,90,91,81,83,84,,,,,,82,,,,97,92,102',
+'308,105,81,100,101,,93,95,94,96,,,,,89,,102,,105,,100,101,,,,104,,,',
+'99,98,,81,85,86,88,87,90,91,,83,84,104,,97,92,102,82,105,,100,101,,93',
+'95,94,96,83,84,,,,,,82,,,,89,,,,104,,,,99,98,,81,85,86,88,87,90,91,',
+'83,84,,,97,92,102,82,105,,100,101,,93,95,94,96,,,,,,,,,,,,89,,,,104',
+',,,99,98,,81,85,86,88,87,90,91,,83,84,,,97,92,102,82,105,,100,101,,93',
+'95,94,96,,,,,,,,,,,,89,,,,104,,,,99,98,,81,85,86,88,87,90,91,,83,84',
+',,97,92,102,82,105,,100,101,,93,95,94,96,,,,,,,,,,,,89,,,,104,,,,99',
+'98,,81,85,86,88,87,90,91,,83,84,,,97,92,102,82,105,,100,101,,93,95,94',
+'96,,272,273,,,,,,,,,89,,,,104,,,,99,98,,,85,86,88,87,90,91,81,83,84',
+',,284,,,82,,,,97,92,102,,105,81,100,101,,93,95,94,96,,,,,89,,102,,105',
+',100,101,,,,104,,,,99,98,,81,85,86,88,87,90,91,,83,84,104,,97,92,102',
+'82,105,,100,101,,93,95,94,96,83,84,,,,,,82,,,,89,,,,104,,,,,98,,81,85',
+'86,88,87,90,91,,83,84,,,97,92,102,82,105,,100,101,,93,95,94,96,81,,',
+',,,,,,,,89,,92,102,104,105,,100,101,81,93,,85,86,88,87,90,91,,83,84',
+',92,102,,105,82,100,101,104,93,,,,,,,85,86,88,87,90,91,,83,84,,89,,104',
+',82,,,,,,85,86,88,87,90,91,81,83,84,,,,,,82,89,,,97,92,102,276,105,81',
+'100,101,,93,95,94,96,,,,,89,92,102,,105,,100,101,,93,,104,,,,99,98,',
+',85,86,88,87,90,91,,83,84,104,,,,,82,,,85,86,88,87,90,91,,83,84,81,',
+',,,82,,,,89,,,97,92,102,,105,81,100,101,,93,95,94,96,,89,,,,92,102,',
+'105,,100,101,,93,,104,,,,99,98,,,85,86,88,87,90,91,,83,84,104,,,,,82',
+',,85,86,88,87,90,91,81,83,84,,,,,,82,,,,89,,102,,105,81,100,101,,,,',
+',,,,,89,,102,,105,,100,101,,,,104,,,,,,,,85,86,88,87,90,91,,83,84,104',
+',,,,82,,,85,86,88,87,90,91,,83,84,81,,,,,82,,,,89,,,97,92,102,,105,81',
+'100,101,,93,95,94,96,,89,,,,,102,,105,,100,101,,,,104,,,,99,98,,81,85',
+'86,88,87,90,91,,83,84,104,,97,92,102,82,105,,100,101,,93,95,94,96,83',
+'84,,,,,,82,,,,89,,,,104,,,,99,98,,81,85,86,88,87,90,91,,83,84,,,97,92',
+'102,82,105,,100,101,,93,95,94,96,,,,,,,,,,,,89,,,,104,,,,99,98,,81,85',
+'86,88,87,90,91,,83,84,,,,,102,82,105,,100,101,,,,81,,,,,,,,,,,,,89,102',
+',105,104,100,101,,,,,,85,86,88,87,,,,83,84,,,,,,82,104,,,,,81,,,85,86',
+'88,87,,,,83,84,,,102,89,105,82,100,101,,,,81,,,,,,,,,,,,97,92,102,89',
+'105,104,100,101,,93,95,94,96,,,88,87,,,,83,84,,,,,,82,104,,,,99,98,',
+'81,85,86,88,87,90,91,,83,84,,,,89,102,82,105,,100,101,,,296,187,295',
+'188,,293,190,297,,290,,292,294,,89,,,,104,191,186,298,,,,291,,,88,87',
+',,,83,84,,,189,299,,82,,,,,,,,,,302,303,301,300,,,,296,187,295,188,89',
+'293,190,297,,290,,292,294,,,,,,,191,186,298,,,,291,,,,,,,,,,,,189,299',
+',,,,,,,,,,,302,303,301,300,296,187,295,188,,293,190,297,,290,,292,294',
+',,,,,,191,186,298,,,,291,,,,,,,,,,,,189,299,,,,,,,,,,,,302,303,301,300',
+'296,187,295,188,,293,190,297,,290,,292,294,,,,,,,191,186,298,,,,291',
+',,,,,,,,,,,189,299,,,,,,,,,,,,302,303,301,300' ]
+        racc_action_table = arr = ::Array.new(6830, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -253,111 +255,111 @@ clist = [
         end
 
 clist = [
-'0,0,242,182,0,0,68,0,240,193,183,168,252,325,170,45,242,176,368,253',
-'368,181,325,193,0,193,367,193,193,240,0,367,0,250,0,0,180,0,0,0,214',
-'0,0,0,0,182,45,0,0,193,45,0,183,168,0,0,170,219,45,176,405,405,0,181',
-'405,405,250,405,0,178,166,193,0,0,115,0,0,0,180,266,0,0,0,0,405,271',
-'0,169,12,272,405,12,405,142,405,405,142,405,405,405,178,405,405,164',
-'178,115,274,405,405,115,163,405,178,191,405,405,162,115,191,12,4,4,405',
-'12,4,4,314,4,405,169,161,12,405,405,177,405,405,342,342,314,405,405',
-'405,405,4,156,405,314,248,322,4,322,4,247,4,4,282,4,4,4,4,4,4,4,4,177',
-'284,4,4,177,286,4,150,150,4,4,150,177,147,147,400,400,4,288,400,400',
-'303,400,4,7,7,7,4,4,308,4,4,145,221,306,4,4,4,4,400,140,4,310,311,313',
-'400,222,400,138,400,400,130,400,400,400,128,400,400,400,400,308,321',
-'400,400,308,225,400,308,323,400,400,324,308,7,7,7,7,400,241,127,120',
-'121,329,400,118,341,239,400,400,343,400,400,152,108,121,400,400,400',
-'400,245,245,400,121,245,245,152,245,245,106,105,102,101,351,152,70,353',
-'121,354,357,215,362,63,238,245,179,179,227,152,179,245,232,245,62,245',
-'245,227,245,245,245,371,245,245,245,245,372,374,245,245,227,375,245',
-'378,41,245,245,385,227,386,392,40,8,245,5,179,402,1,179,245,407,409',
-'411,245,245,415,245,245,,,,245,245,245,245,399,399,245,179,399,399,',
-'399,399,194,,,,179,179,,,,,,,,,194,399,194,,194,194,,399,,399,,399,399',
-',399,399,399,,399,399,399,399,,,399,399,194,,399,,,399,399,,,,,246,246',
-'399,,246,246,,246,399,,,194,399,399,,399,399,,,,399,399,399,399,246',
-',399,,,,246,,246,,246,246,,246,246,246,,246,246,,,,,246,246,,,246,,',
-'246,246,,,,,10,10,246,,10,10,,10,246,,,,246,246,,246,246,,,,246,246',
-'246,246,10,,246,,,,10,,10,,10,10,,10,10,10,,10,10,10,10,,,10,10,,,10',
-',,10,10,,,,,11,11,10,,11,11,,11,10,,,,10,10,,10,10,,,,10,10,10,10,11',
-',10,,,,11,,11,,11,11,,11,11,11,,11,11,11,11,,,11,11,,,11,,,11,11,,,',
-',251,251,11,,251,251,,251,11,,,,11,11,,11,11,,,,11,11,11,11,251,,11',
-',,,251,,251,,251,251,,251,251,251,,251,251,251,251,,,251,251,,,251,',
-',251,251,,,,,15,15,251,,15,15,,15,251,,,,251,251,,251,251,,,,251,251',
-'251,251,15,,251,,,,15,,15,,15,15,,15,15,15,,15,15,,,,,15,15,,,15,,,15',
-'15,,,,,16,16,15,,16,16,,16,15,,,,15,15,,15,15,,,,15,15,15,15,16,,15',
-',,,16,,16,,16,16,,16,16,16,,16,16,,,,,16,16,,,16,,,16,16,,,,,17,17,16',
-',17,17,,17,16,,,,16,16,,16,16,,,,16,16,16,16,17,,16,,,,17,,17,,17,17',
-',17,17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,18,18,17,,18,18,,18,17,',
-',,17,17,,17,17,,,,17,17,17,17,18,,17,,,,18,,18,,18,18,,18,18,18,,18',
-'18,18,18,,,18,18,,,18,,,18,18,,,,,,,18,,,,,,18,,,,18,18,,18,18,,,,18',
-'18,18,18,397,397,18,,397,397,,397,397,,,,,,,,,,,,,,,,397,46,46,,,46',
-'397,,397,,397,397,,397,397,397,,397,397,397,397,,,397,397,,,397,,,397',
-'397,,,,,,,397,,46,,,46,397,,,,397,397,,397,397,,,,397,397,397,397,381',
-'381,397,46,381,381,,381,381,117,,,,46,46,,,,,,,,,117,381,117,,117,117',
-',381,,381,,381,381,,381,381,381,,381,381,381,381,,,381,381,117,,381',
-',,381,381,,,,,42,42,381,,42,42,,42,381,,,,381,381,,381,381,,,,381,381',
-'381,381,42,,381,,,,42,,42,,42,42,,42,42,42,,42,42,,,,,42,42,,,42,,,42',
-'42,,,,,43,43,42,,43,43,,43,42,,,,42,42,,42,42,,,,42,42,42,42,43,,42',
-',,,43,,43,,43,43,,43,43,43,,43,43,,,,,43,43,,,43,,,43,43,,,,,44,44,43',
-',44,44,,44,43,,,,43,43,,43,43,,,,43,43,43,43,44,,43,,,,44,,44,,44,44',
-',44,44,44,,44,44,,,,,44,44,,,44,,,44,44,,,,,,,44,,,,,,44,,,,44,44,,44',
-'44,,,,44,44,44,44,255,255,44,,255,255,,255,255,192,,,,,,,,,,,,,,192',
-'255,192,,192,192,,255,,255,,255,255,,255,255,255,,255,255,255,255,,',
-'255,255,192,,255,,,255,255,,,,,213,213,255,,213,213,,213,255,,,,255',
-'255,,255,255,,,,255,255,255,255,213,,255,,,,213,,213,,213,213,,213,213',
-'213,,213,213,,,,,213,213,,,213,,,213,213,,,,,52,52,213,,52,52,52,52',
-'213,,,,213,213,,213,213,,,,213,213,213,213,52,,213,,,,52,,52,,52,52',
-',52,52,52,,52,52,52,52,,,52,52,,,52,,,52,52,,,,,53,53,52,,53,53,53,53',
-'52,,,,52,52,,52,52,,,,52,52,52,52,53,,52,,,,53,,53,,53,53,,53,53,53',
-',53,53,53,53,,,53,53,,,53,,,53,53,,,,,,,53,,,,,,53,,,,53,53,,53,53,',
-',,53,53,53,53,54,54,53,,54,54,,54,54,114,,,,,,,,,,,,,,114,54,114,,114',
-'114,,54,,54,,54,54,,54,54,54,,54,54,54,54,,,54,54,114,,54,,,54,54,,',
-',,60,60,54,,60,60,,60,54,,,,54,54,,54,54,,,,54,54,54,54,60,,54,,,,60',
-',60,,60,60,,60,60,60,,60,60,60,60,,,60,60,,,60,,,60,60,,,,,370,370,60',
-',370,370,,370,60,,,,60,60,,60,60,,,,60,60,60,60,370,,60,,,,370,,370',
-',370,370,,370,370,370,,370,370,,,,,370,370,,,370,,,370,370,,,,,256,256',
-'370,,256,256,,256,370,,,,370,370,,370,370,,,,370,370,370,370,256,,370',
-',,,256,,256,,256,256,,256,256,256,,256,256,256,256,,,256,256,,,256,',
-',256,256,,,,,65,65,256,,65,65,,65,256,,,,256,256,,256,256,,,,256,256',
-'256,256,65,,256,,,,65,,65,,65,65,,65,65,65,,65,65,,,,,65,65,,,65,,,65',
-'65,,,,,358,358,65,,358,358,,358,65,,,,65,65,,65,65,,,,65,65,65,65,358',
-',65,,,,358,,358,,358,358,,358,358,358,,358,358,358,358,,,358,358,,,358',
-',,358,358,,,,,69,69,358,,69,69,,69,358,,,,358,358,,358,358,,,,358,358',
-'358,358,69,,358,,,,69,,69,,69,69,,69,69,69,,69,69,69,69,,,69,69,,,69',
-',,69,69,,,,,352,352,69,,352,352,,352,69,,,,69,69,,69,69,,,,69,69,69',
-'69,352,,69,,,,352,,352,,352,352,,352,352,352,,352,352,,,,,352,352,,',
-'352,,,352,352,,,,,71,71,352,,71,71,,71,352,,,,352,352,,352,352,,,,352',
-'352,352,352,71,,352,,,,71,,71,,71,71,,71,71,71,,71,71,71,71,,,71,71',
-',,71,,,71,71,,,,,72,72,71,,72,72,,72,71,,,,71,71,,71,71,,,,71,71,71',
-'71,72,,71,,,,72,,72,,72,72,,72,72,72,,72,72,72,72,,,72,72,,,72,,,72',
-'72,,,,,73,73,72,,73,73,,73,72,,,,72,72,,72,72,,,,72,72,72,72,73,,72',
-',,,73,,73,,73,73,,73,73,73,,73,73,73,73,,,73,73,,,73,,,73,73,,,,,74',
-'74,73,,74,74,,74,73,,,,73,73,,73,73,,,,73,73,73,73,74,,73,,,,74,,74',
-',74,74,,74,74,74,,74,74,74,74,,,74,74,,,74,,,74,74,,,,,75,75,74,,75',
-'75,,75,74,,,,74,74,,74,74,,,,74,74,74,74,75,,74,,,,75,,75,,75,75,,75',
-'75,75,,75,75,75,75,,,75,75,,,75,,,75,75,,,,,76,76,75,,76,76,,76,75,',
-',,75,75,,75,75,,,,75,75,75,75,76,,75,,,,76,,76,,76,76,,76,76,76,,76',
-'76,76,76,,,76,76,,,76,,,76,76,,,,,77,77,76,,77,77,,77,76,,,,76,76,,76',
-'76,,,,76,76,76,76,77,,76,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77',
-'77,,,77,,,77,77,,,,,78,78,77,,78,78,,78,77,,,,77,77,,77,77,,,,77,77',
-'77,77,78,,77,,,,78,,78,,78,78,,78,78,78,,78,78,78,78,,,78,78,,,78,,',
-'78,78,,,,,79,79,78,,79,79,,79,78,,,,78,78,,78,78,,,,78,78,78,78,79,',
-'78,,,,79,79,79,79,79,79,79,79,79,79,,79,79,,,,,79,79,79,79,79,,,79,79',
-',,,,,,79,,,,,79,79,,,,79,79,,79,79,,,,79,79,79,79,80,80,79,116,80,80',
-',80,,,,,,,,,,116,,116,,116,116,,80,,,,,,80,,80,,80,80,,80,80,80,,80',
-'80,116,,,,80,80,,,80,,,80,80,,,,,81,81,80,,81,81,,81,80,,,,80,80,,80',
-'80,,,,80,80,80,80,81,,80,,,,81,,81,,81,81,,81,81,81,,81,81,,,,,81,81',
-',,81,,,81,81,,,,,82,82,81,,82,82,,82,81,,,,81,81,,81,81,,,,81,81,81',
-'81,82,,81,,,,82,,82,,82,82,,82,82,82,,82,82,,,,,82,82,,,82,,,82,82,',
-',,,83,83,82,,83,83,,83,82,,,,82,82,,82,82,,,,82,82,82,82,83,,82,,,,83',
-',83,,83,83,,83,83,83,,83,83,,,,,83,83,,,83,,,83,83,,,,,84,84,83,,84',
-'84,,84,83,,,,83,83,,83,83,,,,83,83,83,83,84,,83,,,,84,,84,,84,84,,84',
-'84,84,,84,84,,,,,84,84,,,84,,,84,84,,,,,85,85,84,,85,85,,85,84,,,,84',
-'84,,84,84,,,,84,84,84,84,85,,84,,,,85,,85,,85,85,,85,85,85,,85,85,,',
-',,85,85,,,85,,,85,85,,,,,86,86,85,,86,86,,86,85,,,,85,85,,85,85,,,,85',
-'85,85,85,86,,85,,,,86,,86,,86,86,,86,86,86,,86,86,,,,,86,86,,,86,,,86',
-'86,,,,,87,87,86,,87,87,,87,86,,,,86,86,,86,86,,,,86,86,86,86,87,,86',
-',,,87,,87,,87,87,,87,87,87,,87,87,,,,,87,87,,,87,,,87,87,,,,,88,88,87',
-',88,88,,88,87,,,,87,87,,87,87,,,,87,87,87,87,88,,87,,,,88,,88,,88,88',
+'0,0,244,170,0,0,253,0,242,195,185,184,138,328,171,46,244,172,325,255',
+'325,178,328,195,0,195,371,195,195,242,0,371,0,252,0,0,183,0,0,0,256',
+'0,0,0,0,170,46,0,0,195,46,0,185,184,0,0,171,131,46,172,411,411,0,178',
+'411,411,252,411,0,346,346,195,0,0,311,0,0,0,183,129,0,0,0,0,411,372',
+'0,372,48,128,411,193,411,269,411,411,193,411,411,411,144,411,411,144',
+'274,311,275,411,411,311,250,411,311,277,411,411,154,311,249,48,4,4,411',
+'48,4,4,317,4,411,154,140,48,411,411,180,411,411,154,121,317,411,411',
+'411,411,4,119,411,317,149,149,4,154,4,142,4,4,243,4,4,4,4,4,4,4,4,180',
+'285,4,4,180,287,4,152,152,4,4,152,180,289,291,405,405,4,306,405,405',
+'241,405,4,7,7,7,4,4,179,4,4,240,309,234,4,4,4,4,405,313,4,314,316,147',
+'405,227,405,109,405,405,182,405,405,405,107,405,405,405,405,179,324',
+'405,405,179,224,405,326,327,405,405,223,179,7,7,7,7,405,12,116,106,12',
+'182,405,103,332,182,405,405,221,405,405,102,345,182,405,405,405,405',
+'404,404,405,217,404,404,347,404,404,71,12,116,69,64,12,116,63,216,355',
+'158,357,358,12,116,404,251,251,361,163,251,404,229,404,366,404,404,122',
+'404,404,404,229,404,404,404,404,42,164,404,404,122,165,404,41,229,404',
+'404,375,122,376,378,379,229,404,382,251,166,387,251,404,390,391,122',
+'404,404,397,404,404,8,168,5,404,404,404,404,402,402,404,251,402,402',
+'407,402,402,196,1,413,415,251,251,417,421,,,,,,,196,402,196,,196,196',
+',402,,402,,402,402,,402,402,402,,402,402,402,402,,,402,402,196,,402',
+',,402,402,,,,,175,175,402,,175,175,,175,402,,,196,402,402,,402,402,',
+',,402,402,402,402,175,,402,,,,175,,175,,175,175,,175,175,175,,175,175',
+',,,,175,175,,,175,,,175,175,,,,,10,10,175,,10,10,,10,175,,,,175,175',
+',175,175,,,,175,175,175,175,10,,175,,,,10,,10,,10,10,,10,10,10,,10,10',
+'10,10,,,10,10,,,10,,,10,10,,,,,11,11,10,,11,11,,11,10,,,,10,10,,10,10',
+',,,10,10,10,10,11,,10,,,,11,,11,,11,11,,11,11,11,,11,11,11,11,,,11,11',
+',,11,,,11,11,,,,,,,11,,,,,,11,,,,11,11,,11,11,,,,11,11,11,11,385,385',
+'11,,385,385,,385,385,194,,,,,,,,,,,,,,194,385,194,,194,194,,385,,385',
+',385,385,,385,385,385,,385,385,385,385,,,385,385,194,,385,,,385,385',
+',,,,15,15,385,,15,15,,15,385,,,,385,385,,385,385,,,,385,385,385,385',
+'15,,385,,,,15,,15,,15,15,,15,15,15,,15,15,,,,,15,15,,,15,,,15,15,,,',
+',16,16,15,,16,16,,16,15,,,,15,15,,15,15,,,,15,15,15,15,16,,15,,,,16',
+',16,,16,16,,16,16,16,,16,16,,,,,16,16,,,16,,,16,16,,,,,17,17,16,,17',
+'17,,17,16,,,,16,16,,16,16,,,,16,16,16,16,17,,16,,,,17,,17,,17,17,,17',
+'17,17,,17,17,,,,,17,17,,,17,,,17,17,,,,,18,18,17,,18,18,,18,17,,,,17',
+'17,,17,17,,,,17,17,17,17,18,,17,,,,18,,18,,18,18,,18,18,18,,18,18,18',
+'18,,,18,18,,,18,,,18,18,,,,,374,374,18,,374,374,,374,18,,,,18,18,,18',
+'18,,,,18,18,18,18,374,,18,,,,374,,374,,374,374,,374,374,374,,374,374',
+',,,,374,374,,,374,,,374,374,,,,,174,174,374,,174,174,,174,374,,,,374',
+'374,,374,374,,,,374,374,374,374,174,,374,,,,174,,174,,174,174,,174,174',
+'174,,174,174,,,,,174,174,,,174,,,174,174,,,,,43,43,174,,43,43,,43,174',
+',,,174,174,,174,174,,,,174,174,174,174,43,,174,,,,43,,43,,43,43,,43',
+'43,43,,43,43,,,,,43,43,,,43,,,43,43,,,,,44,44,43,,44,44,,44,43,,,,43',
+'43,,43,43,,,,43,43,43,43,44,,43,,,,44,,44,,44,44,,44,44,44,,44,44,,',
+',,44,44,,,44,,,44,44,,,,,45,45,44,,45,45,,45,44,,,,44,44,,44,44,,,,44',
+'44,44,44,45,,44,,,,45,,45,,45,45,,45,45,45,,45,45,,,,,45,45,,,45,,,45',
+'45,,,,,362,362,45,,362,362,,362,45,,,,45,45,,45,45,,,,45,45,45,45,362',
+',45,,,,362,,362,,362,362,,362,362,362,,362,362,362,362,,,362,362,,,362',
+',,362,362,,,,,356,356,362,,356,356,,356,362,,,,362,362,,362,362,,,,362',
+'362,362,362,356,,362,,,,356,,356,,356,356,,356,356,356,,356,356,,,,',
+'356,356,,,356,,,356,356,,,,,173,173,356,,173,173,,173,356,,,,356,356',
+',356,356,,,,356,356,356,356,173,,356,,,,173,,173,,173,173,,173,173,173',
+',173,173,,,,,173,173,,,173,,,173,173,,,,,53,53,173,,53,53,53,53,173',
+',,,173,173,,173,173,,,,173,173,173,173,53,,173,,,,53,,53,,53,53,,53',
+'53,53,,53,53,53,53,,,53,53,,,53,,,53,53,,,,,54,54,53,,54,54,54,54,53',
+',,,53,53,,53,53,,,,53,53,53,53,54,,53,,,,54,,54,,54,54,,54,54,54,,54',
+'54,54,54,,,54,54,,,54,,,54,54,,,,,,,54,,,,,,54,,,,54,54,,54,54,,,,54',
+'54,54,54,55,55,54,,55,55,,55,55,117,,,,,,,,,,,,,,117,55,117,,117,117',
+',55,,55,,55,55,,55,55,55,,55,55,55,55,,,55,55,117,,55,,,55,55,,,,,61',
+'61,55,,61,61,,61,55,,,,55,55,,55,55,,,,55,55,55,55,61,,55,,,,61,,61',
+',61,61,,61,61,61,,61,61,61,61,,,61,61,,,61,,,61,61,,,,,169,169,61,,169',
+'169,,169,61,,169,,61,61,,61,61,,,,61,61,61,61,169,,61,,,,169,,169,,169',
+'169,,169,169,169,,169,169,,,,,169,169,,,169,,,169,169,,,,,,,169,,,,',
+',169,,,,169,169,,169,169,,,,169,169,169,169,156,156,169,,156,156,,156',
+'156,118,,,,,,,,,,,,,,118,156,118,,118,118,,156,,156,,156,156,,156,156',
+'156,,156,156,156,156,,,156,156,118,,156,,,156,156,,,,,66,66,156,,66',
+'66,,66,156,,,,156,156,,156,156,,,,156,156,156,156,66,,156,,,,66,,66',
+',66,66,,66,66,66,,66,66,,,,,66,66,,,66,,,66,66,,,,,215,215,66,,215,215',
+',215,66,,,,66,66,,66,66,,,,66,66,66,66,215,,66,,,,215,,215,,215,215',
+',215,215,215,,215,215,,,,,215,215,,,215,,,215,215,,,,,70,70,215,,70',
+'70,,70,215,,,,215,215,,215,215,,,,215,215,215,215,70,,215,,,,70,,70',
+',70,70,,70,70,70,,70,70,70,70,,,70,70,,,70,,,70,70,,,,,153,153,70,,153',
+'153,,153,70,,,,70,70,,70,70,,,,70,70,70,70,153,,70,,,,153,,153,,153',
+'153,,153,153,153,,153,153,153,153,,,153,153,,,153,,,153,153,,,,,72,72',
+'153,,72,72,,72,153,,,,153,153,,153,153,,,,153,153,153,153,72,,153,,',
+',72,,72,,72,72,,72,72,72,,72,72,72,72,,,72,72,,,72,,,72,72,,,,,73,73',
+'72,,73,73,,73,72,,,,72,72,,72,72,,,,72,72,72,72,73,,72,,,,73,,73,,73',
+'73,,73,73,73,,73,73,73,73,,,73,73,,,73,,,73,73,,,,,74,74,73,,74,74,',
+'74,73,,,,73,73,,73,73,,,,73,73,73,73,74,,73,,,,74,,74,,74,74,,74,74',
+'74,,74,74,74,74,,,74,74,,,74,,,74,74,,,,,75,75,74,,75,75,,75,74,,,,74',
+'74,,74,74,,,,74,74,74,74,75,,74,,,,75,,75,,75,75,,75,75,75,,75,75,75',
+'75,,,75,75,,,75,,,75,75,,,,,76,76,75,,76,76,,76,75,,,,75,75,,75,75,',
+',,75,75,75,75,76,,75,,,,76,,76,,76,76,,76,76,76,,76,76,76,76,,,76,76',
+',,76,,,76,76,,,,,77,77,76,,77,77,,77,76,,,,76,76,,76,76,,,,76,76,76',
+'76,77,,76,,,,77,,77,,77,77,,77,77,77,,77,77,77,77,,,77,77,,,77,,,77',
+'77,,,,,78,78,77,,78,78,,78,77,,,,77,77,,77,77,,,,77,77,77,77,78,,77',
+',,,78,,78,,78,78,,78,78,78,,78,78,78,78,,,78,78,,,78,,,78,78,,,,,79',
+'79,78,,79,79,,79,78,,,,78,78,,78,78,,,,78,78,78,78,79,,78,,,,79,,79',
+',79,79,,79,79,79,,79,79,79,79,,,79,79,,,79,,,79,79,,,,,80,80,79,,80',
+'80,,80,79,,,,79,79,,79,79,,,,79,79,79,79,80,,79,,,,80,80,80,80,80,80',
+'80,80,80,80,,80,80,,,,,80,80,80,80,80,,,80,80,,,,,,,80,,,,,80,80,,,',
+'80,80,,80,80,,,,80,80,80,80,81,81,80,115,81,81,,81,,,,,,,,,,115,,115',
+',115,115,,81,,,,,,81,,81,,81,81,,81,81,81,,81,81,115,,,,81,81,,,81,',
+',81,81,,,,,82,82,81,,82,82,,82,81,,,,81,81,,81,81,,,,81,81,81,81,82',
+',81,,,,82,,82,,82,82,,82,82,82,,82,82,,,,,82,82,,,82,,,82,82,,,,,83',
+'83,82,,83,83,,83,82,,,,82,82,,82,82,,,,82,82,82,82,83,,82,,,,83,,83',
+',83,83,,83,83,83,,83,83,,,,,83,83,,,83,,,83,83,,,,,84,84,83,,84,84,',
+'84,83,,,,83,83,,83,83,,,,83,83,83,83,84,,83,,,,84,,84,,84,84,,84,84',
+'84,,84,84,,,,,84,84,,,84,,,84,84,,,,,85,85,84,,85,85,,85,84,,,,84,84',
+',84,84,,,,84,84,84,84,85,,84,,,,85,,85,,85,85,,85,85,85,,85,85,,,,,85',
+'85,,,85,,,85,85,,,,,86,86,85,,86,86,,86,85,,,,85,85,,85,85,,,,85,85',
+'85,85,86,,85,,,,86,,86,,86,86,,86,86,86,,86,86,,,,,86,86,,,86,,,86,86',
+',,,,87,87,86,,87,87,,87,86,,,,86,86,,86,86,,,,86,86,86,86,87,,86,,,',
+'87,,87,,87,87,,87,87,87,,87,87,,,,,87,87,,,87,,,87,87,,,,,88,88,87,',
+'88,88,,88,87,,,,87,87,,87,87,,,,87,87,87,87,88,,87,,,,88,,88,,88,88',
 ',88,88,88,,88,88,,,,,88,88,,,88,,,88,88,,,,,89,89,88,,89,89,,89,88,',
 ',,88,88,,88,88,,,,88,88,88,88,89,,88,,,,89,,89,,89,89,,89,89,89,,89',
 '89,,,,,89,89,,,89,,,89,89,,,,,90,90,89,,90,90,,90,89,,,,89,89,,89,89',
@@ -378,116 +380,120 @@ clist = [
 ',,97,97,,97,97,,,,97,97,97,97,98,,97,,,,98,,98,,98,98,,98,98,98,,98',
 '98,,,,,98,98,,,98,,,98,98,,,,,99,99,98,,99,99,,99,98,,,,98,98,,98,98',
 ',,,98,98,98,98,99,,98,,,,99,,99,,99,99,,99,99,99,,99,99,,,,,99,99,,',
-'99,,,99,99,,,,,100,100,99,,100,100,,100,99,,,99,99,99,,99,99,,,,99,99',
-'99,99,100,100,99,,,,100,,100,,100,100,,100,100,100,,100,100,100,100',
-',,100,100,,,100,,,100,100,,,,,173,173,100,,173,173,,173,100,,,,100,100',
-',100,100,,,,100,100,100,100,173,,100,,,,173,,173,,173,173,,173,173,173',
-',173,173,,,,,173,173,,,173,,,173,173,,,,,172,172,173,,172,172,,172,173',
-',,,173,173,,173,173,,,,173,173,173,173,172,,173,,,,172,,172,,172,172',
-',172,172,172,,172,172,,,,,172,172,,,172,,,172,172,,,,,103,103,172,,103',
-'103,,103,172,,,,172,172,,172,172,,,,172,172,172,172,103,,172,,,,103',
-',103,,103,103,,103,103,103,,103,103,,,,,103,103,,,103,,,103,103,,,,',
-'104,104,103,,104,104,,104,103,,,,103,103,,103,103,,,,103,103,103,103',
-'104,,103,,,,104,,104,,104,104,,104,104,104,,104,104,,,,,104,104,,,104',
-',,104,104,,,,,171,171,104,,171,171,,171,104,,,,104,104,,104,104,,,,104',
-'104,104,104,171,,104,,,,171,,171,,171,171,,171,171,171,,171,171,,,,',
-'171,171,,,171,,,171,171,,,,,167,167,171,,167,167,,167,171,,167,,171',
-'171,,171,171,,,,171,171,171,171,167,,171,,,,167,,167,,167,167,,167,167',
-'167,,167,167,,,,,167,167,,,167,,,167,167,,,,,107,107,167,,107,107,,107',
-'167,,,,167,167,,167,167,,,,167,167,167,167,107,,167,,,,107,,107,,107',
-'107,,107,107,107,,107,107,,,,,107,107,,,107,,,107,107,,,,,261,261,107',
-',261,261,,261,107,,,,107,107,,107,107,,,,107,107,107,107,261,,107,,',
-',261,,261,,261,261,,261,261,261,,261,261,261,261,,,261,261,,,261,,,261',
-'261,,,,,276,276,261,,276,276,,276,261,,,,261,261,,261,261,,,,261,261',
-'261,261,276,,261,,,,276,,276,,276,276,,276,276,276,,276,276,,,,,276',
-'276,,,276,,,276,276,,,,,277,277,276,,277,277,,277,276,,,,276,276,,276',
-'276,,,,276,276,276,276,277,,276,,,,277,,277,,277,277,,277,277,277,,277',
-'277,,,,,277,277,,,277,,,277,277,,,,,278,278,277,,278,278,,278,277,,',
-',277,277,,277,277,,,,277,277,277,277,278,,277,,,,278,,278,,278,278,',
-'278,278,278,,278,278,,,,,278,278,,,278,,,278,278,,,,,,,278,,,,,,278',
-',,,278,278,,278,278,,,,278,278,278,278,154,154,278,,154,154,,154,154',
-',,,,,,,,,,,,,,,154,,,,,,154,,154,,154,154,,154,154,154,,154,154,154',
-'154,,,154,154,,,154,,,154,154,,,,,304,304,154,,304,304,,304,154,,,,154',
-'154,,154,154,,,,154,154,154,154,304,,154,,,,304,,304,,304,304,,304,304',
-'304,,304,304,,,,,304,304,,,304,,,304,304,,,,,328,328,304,,328,328,,328',
-'304,,,,304,304,,304,304,,,,304,304,304,304,328,,304,,,,328,,328,,328',
-'328,,328,328,328,,328,328,328,328,,,328,328,,,328,,,328,328,,,,,,,328',
-',,,,,328,,,,328,328,,328,328,,,,328,328,328,328,230,230,328,,230,230',
-',230,230,,,,,,,,,,,,,,,,230,,,,,,230,,230,,230,230,,230,230,230,,230',
-'230,230,230,,,230,230,,,230,,,230,230,,,,,122,122,230,,122,122,,122',
-'230,,,,230,230,,230,230,,,,230,230,230,230,122,122,230,,,,122,,122,',
-'122,122,,122,122,122,,122,122,122,122,,,122,122,,,122,,,122,122,,,,',
-'151,151,122,,151,151,,151,122,,,,122,122,,122,122,,,,122,122,122,122',
-'151,,122,,,,151,,151,,151,151,,151,151,151,,151,151,151,151,,,151,151',
-',,151,,,151,151,,,,,280,280,151,,280,280,,280,151,,,,151,151,,151,151',
-',,,151,151,151,151,280,,151,,,,280,,280,,280,280,,280,280,280,,280,280',
-',,,,280,280,,,280,,,280,280,,,,,281,281,280,,281,281,,281,280,,,,280',
-'280,,280,280,,,,280,280,280,280,281,,280,,,,281,,281,,281,281,,281,281',
-'281,,281,281,,,,,281,281,,,281,,,281,281,,,,,,,281,,,,,,281,,,,281,281',
-',281,281,,,,281,281,281,281,326,326,281,,326,326,,326,326,,,,,,,,,,',
-',,,,,326,,,,,,326,,326,,326,326,,326,326,326,,326,326,,,,,326,326,,',
-'326,,,326,326,,,,,319,319,326,,319,319,,319,326,,,,326,326,,326,326',
-',,,326,326,326,326,319,,326,,,,319,,319,,319,319,,319,319,319,,319,319',
-'319,319,,,319,319,,,319,,,319,319,,,,,318,318,319,,318,318,,318,319',
-',,,319,319,,319,319,,,,319,319,319,319,318,,319,,,,318,,318,,318,318',
-',318,318,318,,318,318,,,,,318,318,,,318,,,318,318,,,,,315,315,318,,315',
-'315,,315,318,,,,318,318,,318,318,,,,318,318,318,318,315,,318,,,,315',
-',315,,315,315,,315,315,315,,315,315,,,,,315,315,,,315,,,315,315,,,,',
-',,315,,,,,,315,,,,315,315,,315,315,,,,315,315,315,315,244,244,315,,244',
-'244,,244,244,,,,,,,,,,,,,,,,244,,,,,,244,,244,,244,244,,244,244,244',
-',244,244,244,244,205,,244,244,,,244,,,244,244,,,205,205,,205,244,205',
-'205,,205,,244,,,,244,244,,244,244,,,,244,244,244,244,,205,244,,,,223',
-',,205,205,205,205,205,205,,205,205,223,223,223,223,223,205,223,223,',
-'223,223,223,223,,249,249,,,249,,,,,,,,205,,223,,,,223,223,,,223,223',
-'223,223,223,223,,223,223,126,,126,,,223,,,249,,,249,126,126,126,,126',
-',126,126,,126,126,126,126,,223,,,,,249,,,,,,,,,126,249,249,,126,126',
-',,126,126,126,126,126,126,,126,126,125,,125,,,126,,,,,,,125,125,125',
-',125,,125,125,,125,125,125,125,,126,,,,,,,,,,,,,,125,,,,125,125,,,125',
-'125,125,125,125,125,,125,125,123,,123,,,125,,,,,,,123,123,123,,123,199',
-'123,123,,123,123,123,123,,125,,,,,199,,199,,199,199,,,,123,,,,123,123',
-',9,123,123,123,123,123,123,,123,123,199,,9,9,9,123,9,,9,9,,9,9,9,9,199',
-'199,,,,,,199,,,,123,,,,9,,,,9,9,,153,9,9,9,9,9,9,,9,9,,,153,153,153',
-'9,153,,153,153,,153,153,153,153,,,,,,,,,,,,9,,,,153,,,,153,153,,190',
-'153,153,153,153,153,153,,153,153,,,190,190,190,153,190,,190,190,,190',
-'190,190,190,,153,153,,,,,,,,,153,,,,190,,331,331,190,190,331,218,190',
-'190,190,190,190,190,,190,190,,,218,218,218,190,218,,218,218,,218,218',
-'218,218,,,,,,,,,,331,,190,331,,,218,,,,218,218,,195,218,218,218,218',
-'218,218,,218,218,331,,,,195,218,195,,195,195,331,331,,,,210,,,,,210',
-',,,,,218,210,210,210,195,210,,210,210,,210,210,210,210,195,195,,,,195',
-'195,,,,,,195,,,210,,,,210,210,,209,210,210,210,210,210,210,,210,210',
-',195,209,209,209,210,209,,209,209,,209,209,209,209,,,,,,,,,,,,210,,',
-',209,,,,,209,,208,209,209,209,209,209,209,,209,209,,,208,208,208,209',
-'208,,208,208,,208,208,208,208,198,,,,,,,,,,,209,,,198,208,198,,198,198',
-'165,,,208,208,208,208,208,208,,208,208,165,165,165,165,165,208,165,165',
-'198,165,165,165,165,,,,,,,,,,,198,198,,208,,165,,198,,165,165,,346,165',
-'165,165,165,165,165,,165,165,,,346,346,346,165,346,,346,346,,346,346',
-'346,346,,,,,,,,,,,,165,,,,346,,,,346,346,,200,346,346,346,346,346,346',
-',346,346,,,,,200,346,200,,200,200,,,,,,207,,,,,,,,,,,346,,207,207,200',
-'207,,207,207,206,207,,200,200,200,200,,,,200,200,,206,206,,206,200,206',
-'206,207,206,,,,197,,,207,207,207,207,207,207,,207,207,,200,197,206,197',
-'207,197,197,,,,206,206,206,206,206,206,366,206,206,,,,,,206,207,,197',
-'366,366,366,,366,,366,366,,366,366,366,366,,197,197,,206,,,,197,,,,',
-',,366,,,,366,366,,348,366,366,366,366,366,366,,366,366,,,348,348,348',
-'366,348,,348,348,,348,348,348,348,,,,,,,,,,,,366,,,,348,,,,348,348,',
-'349,348,348,348,348,348,348,,348,348,,,349,349,349,348,349,,349,349',
-',349,349,349,349,,,,,,,,,,,,348,,,,349,,,,349,349,,350,349,349,349,349',
-'349,349,,349,349,,,350,350,350,349,350,,350,350,,350,350,350,350,,,',
-',,,,,,,,349,,,,350,,,,350,350,,204,350,350,350,350,350,350,,350,350',
-',,,204,204,350,204,,204,204,,204,,203,,,,,,,,,,,,,350,203,,203,204,203',
-'203,,,,,,204,204,204,204,204,204,,204,204,,,,,,204,203,,,,,202,,,203',
-'203,203,203,203,203,,203,203,,,202,204,202,203,202,202,,,,196,,,,,,',
-',,,,,,,196,203,196,202,196,196,,,,,,202,202,202,202,202,202,,202,202',
-',,,,,202,196,,,,,201,,,,,196,196,,,,196,196,,,201,202,201,196,201,201',
-',,,347,,,,,,,,,,,,347,347,347,196,347,201,347,347,,347,347,347,347,201',
-'201,201,201,,,,201,201,,,,,,201,347,,,,347,347,,,347,347,347,347,347',
-'347,,347,347,,,,201,,347,,,273,273,273,273,,273,273,273,,273,,273,273',
-',,,,,347,273,273,273,,,,273,,,,,,,,,,,,273,273,,,,,,,,,,,,273,273,273',
-'273,275,275,275,275,,275,275,275,,275,,275,275,,,,,,,275,275,275,,,',
-'275,,,,,,,,,,,,275,275,,,,,,,,,,,,275,275,275,275,305,305,305,305,,305',
-'305,305,,305,,305,305,,,,,,,305,305,305,,,,305,,,,,,,,,,,,305,305,,',
-',,,,,,,,,305,305,305,305,217,217,217,217,,217,217,217,,217,,217,217',
-',,,,,,217,217,217,,,,217,,,,,,,,,,,,217,217,,,,,,,,,,,,217,217,217,217' ]
-        racc_action_check = arr = ::Array.new(6785, nil)
+'99,,,99,99,,,,,100,100,99,,100,100,,100,99,,,,99,99,,99,99,,,,99,99',
+'99,99,100,,99,,,,100,,100,,100,100,,100,100,100,,100,100,,,,,100,100',
+',,100,,,100,100,,,,,101,101,100,,101,101,,101,100,,,100,100,100,,100',
+'100,,,,100,100,100,100,101,101,100,,,,101,,101,,101,101,,101,101,101',
+',101,101,101,101,,,101,101,,,101,,,101,101,,,,,337,337,101,,337,337',
+',337,101,,,,101,101,,101,101,,,,101,101,101,101,337,,101,,,,337,,337',
+',337,337,,337,337,337,,337,337,337,337,,,337,337,,,337,,,337,337,,,',
+',331,331,337,,331,331,,331,337,,,,337,337,,337,337,,,,337,337,337,337',
+'331,,337,,,,331,,331,,331,331,,331,331,331,,331,331,331,331,,,331,331',
+',,331,,,331,331,,,,,104,104,331,,104,104,,104,331,,,,331,331,,331,331',
+',,,331,331,331,331,104,,331,,,,104,,104,,104,104,,104,104,104,,104,104',
+',,,,104,104,,,104,,,104,104,,,,,105,105,104,,105,105,,105,104,,,,104',
+'104,,104,104,,,,104,104,104,104,105,,104,,,,105,,105,,105,105,,105,105',
+'105,,105,105,,,,,105,105,,,105,,,105,105,,,,,,,105,,,,,,105,,,,105,105',
+',105,105,,,,105,105,105,105,329,329,105,,329,329,,329,329,,,,,,,,,,',
+',,,,,329,,,,,,329,,329,,329,329,,329,329,329,,329,329,,,,,329,329,,',
+'329,,,329,329,,,,,322,322,329,,322,322,,322,329,,,,329,329,,329,329',
+',,,329,329,329,329,322,,329,,,,322,,322,,322,322,,322,322,322,,322,322',
+'322,322,,,322,322,,,322,,,322,322,,,,,108,108,322,,108,108,,108,322',
+',,,322,322,,322,322,,,,322,322,322,322,108,,322,,,,108,,108,,108,108',
+',108,108,108,,108,108,,,,,108,108,,,108,,,108,108,,,,,321,321,108,,321',
+'321,,321,108,,,,108,108,,108,108,,,,108,108,108,108,321,,108,,,,321',
+',321,,321,321,,321,321,321,,321,321,,,,,321,321,,,321,,,321,321,,,,',
+'318,318,321,,318,318,,318,321,,,,321,321,,321,321,,,,321,321,321,321',
+'318,,321,,,,318,,318,,318,318,,318,318,318,,318,318,,,,,318,318,,,318',
+',,318,318,,,,,307,307,318,,307,307,,307,318,,,,318,318,,318,318,,,,318',
+'318,318,318,307,,318,,,,307,,307,,307,307,,307,307,307,,307,307,,,,',
+'307,307,,,307,,,307,307,,,,,284,284,307,,284,284,,284,307,,,,307,307',
+',307,307,,,,307,307,307,307,284,,307,,,,284,,284,,284,284,,284,284,284',
+',284,284,,,,,284,284,,,284,,,284,284,,,,,283,283,284,,283,283,,283,284',
+',,,284,284,,284,284,,,,284,284,284,284,283,,284,,,,283,,283,,283,283',
+',283,283,283,,283,283,,,,,283,283,,,283,,,283,283,,,,,281,281,283,,281',
+'281,,281,283,,,,283,283,,283,283,,,,283,283,283,283,281,,283,,,,281',
+',281,,281,281,,281,281,281,,281,281,,,,,281,281,,,281,,,281,281,,,,',
+'280,280,281,,280,280,,280,281,,,,281,281,,281,281,,,,281,281,281,281',
+'280,,281,,,,280,,280,,280,280,,280,280,280,,280,280,,,,,280,280,,,280',
+',,280,280,,,,,279,279,280,,279,279,,279,280,,,,280,280,,280,280,,,,280',
+'280,280,280,279,,280,,,,279,,279,,279,279,,279,279,279,,279,279,,,,',
+'279,279,,,279,,,279,279,,,,,123,123,279,,123,123,,123,279,,,,279,279',
+',279,279,,,,279,279,279,279,123,123,279,,,,123,,123,,123,123,,123,123',
+'123,,123,123,123,123,,,123,123,,,123,,,123,123,,,,,,,123,,,,,,123,,',
+',123,123,,123,123,,,,123,123,123,123,232,232,123,,232,232,,232,232,',
+',,,,,,,,,,,,,,232,334,334,,,334,232,,232,,232,232,,232,232,232,,232',
+'232,232,232,,,232,232,,,232,,,232,232,,,,,,,232,,334,,,334,232,,,,232',
+'232,,232,232,,,,232,232,232,232,246,246,232,334,246,246,,246,246,,,',
+',334,334,,,,,,,,,,246,47,47,,,47,246,,246,,246,246,,246,246,246,,246',
+'246,246,246,,,246,246,,,246,,,246,246,,,,,,,246,,47,,,47,246,,,,246',
+'246,,246,246,,,,246,246,246,246,247,247,246,47,247,247,,247,247,,,,',
+'47,47,,,,,,,,,,247,,,,,,247,,247,,247,247,,247,247,247,,247,247,247',
+'247,,,247,247,,,247,,,247,247,,,,,264,264,247,,264,264,,264,247,,,,247',
+'247,,247,247,,,,247,247,247,247,264,,247,,,,264,,264,,264,264,,264,264',
+'264,,264,264,264,264,,,264,264,,,264,,,264,264,,,,,259,259,264,,259',
+'259,,259,264,,,,264,264,,264,264,,,,264,264,264,264,259,,264,,,,259',
+',259,,259,259,,259,259,259,,259,259,259,259,,,259,259,,,259,,,259,259',
+',,,,,,259,,,,,,259,,,,259,259,,259,259,,,,259,259,259,259,258,258,259',
+',258,258,,258,258,,,,,,,,,,,,,,,,258,,,,,,258,,258,,258,258,,258,258',
+'258,,258,258,258,258,,,258,258,,,258,,,258,258,,,,,248,248,258,,248',
+'248,,248,258,,,,258,258,,258,258,,,,258,258,258,258,248,,258,,,,248',
+',248,,248,248,,248,248,248,,248,248,,,,,248,248,,,248,,,248,248,,,,',
+'254,254,248,,254,254,,254,248,,,,248,248,,248,248,,,,248,248,248,248',
+'254,,248,,,,254,,254,,254,254,,254,254,254,,254,254,254,254,,,254,254',
+',,254,,,254,254,,,,,,,254,,,,,,254,,,,254,254,,254,254,127,,127,254',
+'254,254,254,,,254,,,127,127,127,,127,,127,127,,127,127,127,127,,181',
+'181,,,181,,,,,,,,,,127,,,,127,127,,,127,127,127,127,127,127,,127,127',
+'126,,126,,,127,,,181,,,181,126,126,126,,126,,126,126,,126,126,126,126',
+',127,,,,,181,,,,,,,,,126,181,181,,126,126,,,126,126,126,126,126,126',
+',126,126,124,,124,,,126,,,,,,,124,124,124,,124,,124,124,,124,124,124',
+'124,,126,,,,,,,,,,,,,,124,,,,124,124,,,124,124,124,124,124,124,225,124',
+'124,,,,,,124,,,,225,225,225,225,225,200,225,225,,225,225,225,225,,,',
+',124,,200,,200,,200,200,,,,225,,,,225,225,,220,225,225,225,225,225,225',
+',225,225,200,,220,220,220,225,220,,220,220,,220,220,220,220,200,200',
+',,,,,200,,,,225,,,,220,,,,220,220,,350,220,220,220,220,220,220,,220',
+'220,,,350,350,350,220,350,,350,350,,350,350,350,350,,,,,,,,,,,,220,',
+',,350,,,,350,350,,351,350,350,350,350,350,350,,350,350,,,351,351,351',
+'350,351,,351,351,,351,351,351,351,,,,,,,,,,,,350,,,,351,,,,351,351,',
+'155,351,351,351,351,351,351,,351,351,,,155,155,155,351,155,,155,155',
+',155,155,155,155,,,,,,,,,,,,351,,,,155,,,,155,155,,352,155,155,155,155',
+'155,155,,155,155,,,352,352,352,155,352,,352,352,,352,352,352,352,,155',
+'155,,,,,,,,,155,,,,352,,,,352,352,,,352,352,352,352,352,352,212,352',
+'352,,,212,,,352,,,,212,212,212,,212,199,212,212,,212,212,212,212,,,',
+',352,,199,,199,,199,199,,,,212,,,,212,212,,211,212,212,212,212,212,212',
+',212,212,199,,211,211,211,212,211,,211,211,,211,211,211,211,199,199',
+',,,,,199,,,,212,,,,211,,,,,211,,210,211,211,211,211,211,211,,211,211',
+',,210,210,210,211,210,,210,210,,210,210,210,210,209,,,,,,,,,,,211,,209',
+'209,210,209,,209,209,208,209,,210,210,210,210,210,210,,210,210,,208',
+'208,,208,210,208,208,209,208,,,,,,,209,209,209,209,209,209,,209,209',
+',210,,208,,209,,,,,,208,208,208,208,208,208,167,208,208,,,,,,208,209',
+',,167,167,167,167,167,207,167,167,,167,167,167,167,,,,,208,207,207,',
+'207,,207,207,,207,,167,,,,167,167,,,167,167,167,167,167,167,,167,167',
+'207,,,,,167,,,207,207,207,207,207,207,,207,207,353,,,,,207,,,,167,,',
+'353,353,353,,353,206,353,353,,353,353,353,353,,207,,,,206,206,,206,',
+'206,206,,206,,353,,,,353,353,,,353,353,353,353,353,353,,353,353,206',
+',,,,353,,,206,206,206,206,206,206,205,206,206,,,,,,206,,,,353,,205,',
+'205,204,205,205,,,,,,,,,,206,,204,,204,,204,204,,,,205,,,,,,,,205,205',
+'205,205,205,205,,205,205,204,,,,,205,,,204,204,204,204,204,204,,204',
+'204,354,,,,,204,,,,205,,,354,354,354,,354,201,354,354,,354,354,354,354',
+',204,,,,,201,,201,,201,201,,,,354,,,,354,354,,370,354,354,354,354,354',
+'354,,354,354,201,,370,370,370,354,370,,370,370,,370,370,370,370,201',
+'201,,,,,,201,,,,354,,,,370,,,,370,370,,9,370,370,370,370,370,370,,370',
+'370,,,9,9,9,370,9,,9,9,,9,9,9,9,,,,,,,,,,,,370,,,,9,,,,9,9,,203,9,9',
+'9,9,9,9,,9,9,,,,,203,9,203,,203,203,,,,202,,,,,,,,,,,,,9,202,,202,203',
+'202,202,,,,,,203,203,203,203,,,,203,203,,,,,,203,202,,,,,198,,,202,202',
+'202,202,,,,202,202,,,198,203,198,202,198,198,,,,192,,,,,,,,,,,,192,192',
+'192,202,192,198,192,192,,192,192,192,192,,,198,198,,,,198,198,,,,,,198',
+'192,,,,192,192,,197,192,192,192,192,192,192,,192,192,,,,198,197,192',
+'197,,197,197,,,308,308,308,308,,308,308,308,,308,,308,308,,192,,,,197',
+'308,308,308,,,,308,,,197,197,,,,197,197,,,308,308,,197,,,,,,,,,,308',
+'308,308,308,,,,276,276,276,276,197,276,276,276,,276,,276,276,,,,,,,276',
+'276,276,,,,276,,,,,,,,,,,,276,276,,,,,,,,,,,,276,276,276,276,278,278',
+'278,278,,278,278,278,,278,,278,278,,,,,,,278,278,278,,,,278,,,,,,,,',
+',,,278,278,,,,,,,,,,,,278,278,278,278,219,219,219,219,,219,219,219,',
+'219,,219,219,,,,,,,219,219,219,,,,219,,,,,,,,,,,,219,219,,,,,,,,,,,',
+'219,219,219,219' ]
+        racc_action_check = arr = ::Array.new(6830, nil)
         idx = 0
         clist.each do |str|
           str.split(',', -1).each do |i|
@@ -497,200 +503,202 @@ clist = [
         end
 
 racc_action_pointer = [
-    -2,   330,   nil,   nil,   118,   314,   nil,   173,   316,  5605,
-   466,   526,    82,   nil,   nil,   646,   706,   766,   826,   nil,
+    -2,   358,   nil,   nil,   118,   330,   nil,   173,   332,  6397,
+   466,   526,   237,   nil,   nil,   670,   730,   790,   850,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   253,   291,  1054,  1114,  1174,     9,   935,   nil,   nil,   nil,
-   nil,   nil,  1378,  1438,  1522,   nil,   nil,   nil,   nil,   nil,
-  1582,   nil,   221,   215,   nil,  1762,   nil,   nil,     6,  1882,
-   266,  2002,  2062,  2122,  2182,  2242,  2302,  2362,  2422,  2482,
-  2566,  2626,  2686,  2746,  2806,  2866,  2926,  2986,  3046,  3106,
-  3166,  3226,  3286,  3346,  3406,  3466,  3526,  3586,  3646,  3706,
-  3766,   235,   266,  3946,  4006,   265,   264,  4186,   232,   nil,
-   nil,   nil,   nil,   nil,  1526,    68,  2564,   998,   222,   nil,
-   236,   210,  4774,  5558,   nil,  5501,  5444,   218,   207,   nil,
-   195,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   200,   nil,
-   192,   nil,    83,   nil,   nil,   185,   nil,   174,   nil,   nil,
-   170,  4834,   221,  5652,  4510,   nil,   132,   nil,   nil,   nil,
-   nil,   121,   107,   101,    94,  5957,    57,  4126,    -1,    75,
-     2,  4066,  3886,  3826,   nil,   nil,     5,   128,    63,   287,
-    24,     9,    -9,    -2,   nil,   nil,   nil,   nil,   nil,   nil,
-  5699,   105,  1262,     2,   350,  5793,  6429,  6121,  5937,  5575,
-  6051,  6474,  6406,  6361,  6338,  5342,  6096,  6076,  5912,  5865,
-  5818,   nil,   nil,  1318,    27,   213,   nil,  6699,  5746,     9,
-   nil,   174,   169,  5387,   nil,   192,   nil,   264,   nil,   nil,
-  4714,   nil,   282,   nil,   nil,   nil,   nil,   nil,   271,   215,
-   -28,   236,   -11,   nil,  5302,   262,   406,   144,   110,  5418,
-    -8,   586,     4,    11,   nil,  1258,  1702,   nil,   nil,   nil,
-   nil,  4246,   nil,   nil,   nil,   nil,    66,   nil,   nil,   nil,
-   nil,    73,    79,  6537,    96,  6591,  4306,  4366,  4426,   nil,
-  4894,  4954,   143,   nil,   139,   nil,   157,   nil,   171,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   176,  4570,  6645,   190,   nil,   188,   nil,
-   194,   198,   nil,   138,    90,  5218,   nil,   nil,  5158,  5098,
-   nil,   216,   116,   223,   203,     0,  5038,   nil,  4630,   238,
-   nil,  5746,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   179,    57,   241,   nil,   nil,  6004,  6497,  6197,  6244,
-  6291,   267,  1942,   209,   272,   nil,   nil,   270,  1822,   nil,
-   nil,   nil,   258,   nil,   nil,   nil,  6150,    18,   -15,   nil,
-  1642,   295,   276,   nil,   301,   305,   nil,   nil,   306,   nil,
-   nil,   994,   nil,   nil,   nil,   310,   280,   nil,   nil,   nil,
-   nil,   nil,   313,   nil,   nil,   nil,   nil,   910,   nil,   346,
-   178,   nil,   319,   nil,   nil,    58,   nil,   323,   nil,   324,
-   nil,   325,   nil,   nil,   nil,   296,   nil,   nil,   nil,   nil ]
+   nil,   245,   283,  1030,  1090,  1150,     9,  4979,    82,   nil,
+   nil,   nil,   nil,  1390,  1450,  1534,   nil,   nil,   nil,   nil,
+   nil,  1594,   nil,   204,   206,   nil,  1798,   nil,   nil,   276,
+  1918,   260,  2038,  2098,  2158,  2218,  2278,  2338,  2398,  2458,
+  2518,  2602,  2662,  2722,  2782,  2842,  2902,  2962,  3022,  3082,
+  3142,  3202,  3262,  3322,  3382,  3442,  3502,  3562,  3622,  3682,
+  3742,  3802,   216,   240,  3982,  4042,   236,   211,  4246,   187,
+   nil,   nil,   nil,   nil,   nil,  2600,   238,  1538,  1742,   118,
+   nil,   129,   264,  4786,  5548,   nil,  5491,  5434,    63,    66,
+   nil,    36,   nil,   nil,   nil,   nil,   nil,   nil,   -14,   nil,
+   117,   nil,   140,   nil,    90,   nil,   nil,   197,   nil,   144,
+   nil,   nil,   170,  1978,    80,  5790,  1738,   nil,   270,   nil,
+   nil,   nil,   nil,   283,   301,   305,   320,  6084,   329,  1654,
+    -9,     2,     5,  1330,   970,   406,   nil,   nil,     9,   188,
+   128,  5465,   210,    24,    -1,    -2,   nil,   nil,   nil,   nil,
+   nil,   nil,  6535,    83,   614,     2,   350,  6582,  6512,  5908,
+  5619,  6320,  6467,  6444,  6246,  6229,  6175,  6101,  6030,  6010,
+  5985,  5938,  5891,   nil,   nil,  1858,   268,   196,   nil,  6744,
+  5649,   206,   nil,   212,   188,  5602,   nil,   173,   nil,   268,
+   nil,   nil,  4870,   nil,   186,   nil,   nil,   nil,   nil,   nil,
+   181,   150,   -28,   149,   -11,   nil,  4954,  5038,  5302,   109,
+    72,   287,    -8,    -3,  5362,    11,    32,   nil,  5242,  5158,
+   nil,   nil,   nil,   nil,  5098,   nil,   nil,   nil,   nil,    80,
+   nil,   nil,   nil,   nil,    92,    96,  6636,   103,  6690,  4726,
+  4666,  4606,   nil,  4546,  4486,   153,   nil,   143,   nil,   165,
+   nil,   167,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   173,  4426,  6579,   189,
+   nil,    68,   nil,   192,   197,   nil,   137,    90,  4366,   nil,
+   nil,  4306,  4186,   nil,   216,   -15,   222,   200,     0,  4126,
+   nil,  3922,   241,   nil,  4895,   nil,   nil,  3862,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   187,   -11,   257,   nil,   nil,
+  5696,  5743,  5837,  6158,  6303,   272,  1270,   213,   275,   nil,
+   nil,   278,  1210,   nil,   nil,   nil,   270,   nil,   nil,   nil,
+  6350,    18,    52,   nil,   910,   311,   289,   nil,   314,   315,
+   nil,   nil,   317,   nil,   nil,   610,   nil,   320,   nil,   nil,
+   323,   292,   nil,   nil,   nil,   nil,   nil,   328,   nil,   nil,
+   nil,   nil,   346,   nil,   262,   178,   nil,   344,   nil,   nil,
+   nil,    58,   nil,   349,   nil,   350,   nil,   353,   nil,   nil,
+   nil,   322,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -3,  -243,    -1,    -2,    -4,    -5,    -8,   -10,   -16,   -21,
-  -243,  -243,  -243,   -33,   -34,  -243,  -243,  -243,  -243,   -61,
+    -3,  -244,    -1,    -2,    -4,    -5,    -8,   -10,   -16,   -21,
+  -244,  -244,  -244,   -33,   -34,  -244,  -244,  -244,  -244,   -61,
    -62,   -63,   -64,   -65,   -66,   -67,   -68,   -69,   -70,   -71,
    -72,   -73,   -74,   -75,   -76,   -77,   -78,   -79,   -80,   -81,
-   -86,   -90,  -243,  -243,  -243,  -243,  -243,  -176,  -177,  -178,
-  -179,  -180,  -243,  -243,  -243,  -191,  -192,  -193,  -194,  -195,
-  -243,  -197,  -243,  -210,  -213,  -243,  -218,  -219,  -243,  -243,
-    -7,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -126,
-  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,
-  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,  -243,
-  -243,  -243,  -121,  -242,  -242,   -22,   -23,  -243,  -242,  -136,
-  -157,  -158,  -159,  -160,   -46,  -243,   -47,   -54,  -243,   -87,
-  -243,  -243,  -243,  -243,   -97,  -243,  -243,  -242,  -220,  -145,
-  -147,  -148,  -149,  -150,  -151,  -153,  -154,   -14,  -220,  -182,
-  -220,  -184,  -243,  -187,  -188,  -243,  -196,  -243,  -201,  -204,
-  -243,  -208,  -243,  -243,  -243,   420,    -6,    -9,   -11,   -12,
-   -13,   -17,   -18,   -19,   -20,  -243,  -220,  -243,   -79,   -80,
-   -81,  -231,  -237,  -225,  -127,  -130,  -243,  -228,  -226,  -234,
-  -177,  -178,  -179,  -180,  -224,  -229,  -230,  -232,  -233,  -235,
-   -59,  -243,   -36,   -37,   -38,   -39,   -40,   -41,   -42,   -43,
-   -44,   -45,   -48,   -49,   -50,   -51,   -52,   -53,   -55,   -56,
-  -243,   -57,  -115,  -243,  -220,   -83,   -91,  -126,  -125,  -243,
-  -124,  -243,  -222,  -243,   -28,  -242,  -161,  -243,   -58,   -92,
-  -243,   -95,  -220,  -164,  -166,  -167,  -168,  -169,  -171,  -243,
-  -243,  -174,  -243,   -89,  -243,  -243,  -243,  -243,  -242,  -221,
-  -243,  -221,  -243,  -243,  -185,  -243,  -243,  -198,  -199,  -200,
-  -202,  -243,  -205,  -206,  -207,  -209,  -220,  -211,  -214,  -216,
-  -217,    -8,  -243,  -126,  -243,  -221,  -243,  -243,  -243,   -35,
-  -243,  -243,  -220,  -117,  -243,   -85,  -220,  -129,  -243,  -225,
-  -226,  -227,  -228,  -231,  -234,  -236,  -237,  -238,  -239,  -240,
-  -241,  -122,  -123,  -243,  -223,  -126,  -243,  -139,  -243,  -162,
-  -220,  -243,   -94,  -243,  -221,  -243,  -172,  -173,  -243,  -243,
-   -88,  -243,  -100,  -243,  -106,  -243,  -243,  -110,  -242,  -243,
-  -155,  -243,  -146,  -152,   -15,  -181,  -183,  -186,  -189,  -190,
-  -203,  -243,  -243,  -220,   -26,  -128,  -133,  -131,  -132,   -60,
-  -119,  -243,  -221,   -82,  -243,   -25,   -29,  -220,  -242,  -140,
-  -141,  -142,  -243,   -93,   -96,  -165,  -170,  -243,  -100,   -99,
-  -243,  -243,  -106,  -105,  -243,  -243,  -109,  -111,  -243,  -137,
-  -138,  -243,  -156,  -212,  -215,  -243,   -30,  -116,  -118,   -84,
-  -120,   -27,  -243,  -163,  -175,   -98,  -101,  -243,  -104,  -243,
-  -242,  -134,  -243,  -144,   -24,   -31,  -135,  -243,  -103,  -243,
-  -108,  -243,  -113,  -114,  -143,  -222,  -102,  -107,  -112,   -32 ]
+   -82,   -87,   -91,  -244,  -244,  -244,  -244,  -244,  -244,  -178,
+  -179,  -180,  -181,  -244,  -244,  -244,  -192,  -193,  -194,  -195,
+  -196,  -244,  -198,  -244,  -211,  -214,  -244,  -219,  -220,  -244,
+  -244,    -7,  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,
+  -127,  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,
+  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,  -244,
+  -244,  -244,  -244,  -122,  -243,  -243,   -22,   -23,  -244,  -243,
+  -137,  -159,  -160,  -161,  -162,   -46,  -244,   -47,   -54,  -244,
+   -88,  -244,  -244,  -244,  -244,   -98,  -244,  -244,  -243,  -221,
+  -146,  -148,  -149,  -150,  -151,  -152,  -154,  -155,  -243,   -14,
+  -221,  -183,  -221,  -185,  -244,  -188,  -189,  -244,  -197,  -244,
+  -202,  -205,  -244,  -209,  -244,  -244,  -244,   426,    -6,    -9,
+   -11,   -12,   -13,   -17,   -18,   -19,   -20,  -244,  -221,  -244,
+   -80,   -81,   -82,  -232,  -238,  -226,  -128,  -131,  -244,  -229,
+  -227,  -235,  -241,  -179,  -180,  -181,  -225,  -230,  -231,  -233,
+  -234,  -236,   -59,  -244,   -36,   -37,   -38,   -39,   -40,   -41,
+   -42,   -43,   -44,   -45,   -48,   -49,   -50,   -51,   -52,   -53,
+   -55,   -56,  -244,   -57,  -116,  -244,  -221,   -84,   -92,  -127,
+  -126,  -244,  -125,  -244,  -223,  -244,   -28,  -243,  -163,  -244,
+   -58,   -93,  -244,   -96,  -221,  -166,  -168,  -169,  -170,  -171,
+  -173,  -244,  -244,  -176,  -244,   -90,  -244,  -244,  -244,  -244,
+  -243,  -222,  -244,  -244,  -222,  -244,  -244,  -186,  -244,  -244,
+  -199,  -200,  -201,  -203,  -244,  -206,  -207,  -208,  -210,  -221,
+  -212,  -215,  -217,  -218,    -8,  -244,  -127,  -244,  -222,  -244,
+  -244,  -244,   -35,  -244,  -244,  -221,  -118,  -244,   -86,  -221,
+  -130,  -244,  -226,  -227,  -228,  -229,  -232,  -235,  -237,  -238,
+  -239,  -240,  -241,  -242,  -123,  -124,  -244,  -224,  -127,  -244,
+  -140,  -244,  -164,  -221,  -244,   -95,  -244,  -222,  -244,  -174,
+  -175,  -244,  -244,   -89,  -244,  -101,  -244,  -107,  -244,  -244,
+  -111,  -243,  -244,  -156,  -244,  -147,  -153,  -243,   -15,  -182,
+  -184,  -187,  -190,  -191,  -204,  -244,  -244,  -221,   -26,  -129,
+  -134,  -132,  -133,   -60,  -120,  -244,  -222,   -83,  -244,   -25,
+   -29,  -221,  -243,  -141,  -142,  -143,  -244,   -94,   -97,  -167,
+  -172,  -244,  -101,  -100,  -244,  -244,  -107,  -106,  -244,  -244,
+  -110,  -112,  -244,  -138,  -139,  -244,  -157,  -244,  -213,  -216,
+  -244,   -30,  -117,  -119,   -85,  -121,   -27,  -244,  -165,  -177,
+   -99,  -102,  -244,  -105,  -244,  -243,  -135,  -244,  -145,  -158,
+   -24,   -31,  -136,  -244,  -104,  -244,  -109,  -244,  -114,  -115,
+  -144,  -223,  -103,  -108,  -113,   -32 ]
 
 racc_goto_table = [
-     2,   114,   116,   117,   119,   118,   226,   222,   127,   131,
-   133,   191,   212,   146,   166,   268,   303,   332,   241,   232,
-   327,    70,   378,   411,   248,   226,   225,   326,   123,   125,
-   126,   219,   221,   282,   252,   396,   253,   105,   106,   137,
-   137,   145,   369,   138,   140,   247,   373,   148,   345,   241,
-   266,   153,   392,   229,   211,   356,   306,   359,   157,   158,
-   159,   160,   274,   329,   385,   165,   190,   192,   193,   194,
-   195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-   205,   206,   207,   208,   209,   210,   156,   137,   395,   218,
-   218,   214,   333,   223,   398,   365,   317,   316,   338,   382,
-   377,   262,   161,   162,   163,   164,   263,     3,   260,   137,
-   284,   261,   259,   242,   149,   151,   264,     1,   nil,   nil,
-   nil,   nil,   nil,   307,   241,   310,   283,   nil,   313,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   127,   271,   131,   133,   nil,   nil,   330,   nil,   nil,   nil,
-   nil,   265,   286,   116,   272,   nil,   nil,   123,   125,   126,
-   nil,   nil,   341,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   351,   285,
-   nil,   nil,   354,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   210,
-   nil,   nil,   nil,   nil,   384,   nil,   362,   nil,   343,   419,
-   nil,   241,   131,   133,   340,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   380,   nil,   nil,   nil,
-   311,   nil,   190,   nil,   nil,   nil,   nil,   nil,   334,   386,
-   357,   nil,   145,   339,   321,   323,   nil,   nil,   148,   367,
-   nil,   nil,   nil,   391,   nil,   nil,   380,   nil,   nil,   nil,
-   nil,   nil,   346,   347,   348,   388,   349,   350,   nil,   nil,
-   nil,   360,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     2,   115,   117,   118,   120,   224,   214,   132,   134,   168,
+   193,   128,   148,   138,   377,   243,   222,   222,   271,   306,
+   330,   335,   234,   250,   227,   417,    71,   221,   223,   124,
+   126,   127,   329,   285,   255,   401,   256,   349,   231,   140,
+   142,   373,   213,   249,   360,   309,   363,   243,   332,   390,
+   336,   369,   155,   253,   269,   320,   319,   106,   107,   342,
+   119,   265,   277,   403,   266,     3,   167,   192,   194,   195,
+   196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+   206,   207,   208,   209,   210,   211,   212,   216,   400,   263,
+   220,   220,   158,   264,   225,   139,   139,   147,   262,   382,
+   151,   381,   153,   150,   386,   387,   267,     1,   nil,   244,
+   287,   nil,   nil,   nil,   159,   160,   161,   162,   nil,   nil,
+   nil,   286,   243,   163,   164,   165,   166,   nil,   316,   313,
+   397,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   310,
+   nil,   132,   134,   139,   128,   nil,   nil,   138,   289,   nil,
+   nil,   nil,   nil,   268,   nil,   117,   275,   nil,   nil,   124,
+   126,   127,   333,   345,   nil,   139,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   355,
+   288,   nil,   nil,   358,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   274,   nil,
+   nil,   212,   nil,   nil,   nil,   347,   nil,   366,   nil,   389,
+   243,   132,   134,   nil,   nil,   344,   425,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   223,   nil,   nil,   nil,   131,   133,   nil,   nil,   412,   nil,
-   nil,   366,   nil,   nil,   190,   415,   334,   nil,   nil,   nil,
-   nil,   nil,   190,   nil,   nil,   nil,   nil,   389,   nil,   nil,
+   nil,   nil,   314,   nil,   192,   nil,   nil,   361,   nil,   nil,
+   nil,   391,   nil,   384,   nil,   nil,   324,   326,   nil,   384,
+   371,   nil,   nil,   nil,   nil,   396,   nil,   nil,   nil,   nil,
+   nil,   nil,   393,   nil,   nil,   350,   351,   352,   nil,   353,
+   354,   nil,   nil,   nil,   384,   nil,   364,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   210,   nil,
+   nil,   nil,   nil,   225,   132,   134,   338,   nil,   nil,   nil,
+   147,   343,   nil,   nil,   370,   nil,   150,   192,   421,   nil,
+   nil,   nil,   nil,   nil,   nil,   192,   nil,   418,   nil,   nil,
+   394,   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,   123,   nil,   nil,   nil,
+   nil,   nil,   212,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   124,   nil,   nil,   nil,   338,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   402,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   223,   nil,   nil,   nil,   nil,   nil,   407,   nil,   409,
-   413 ]
+   nil,   nil,   nil,   nil,   nil,   407,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   225,   nil,   nil,
+   nil,   nil,   413,   nil,   415,   419 ]
 
 racc_goto_check = [
-     2,    10,    10,    10,    37,     6,    49,    13,    57,    35,
-    34,    19,    50,    80,    11,    88,    14,    65,    36,    42,
-    47,     5,    59,    48,    15,    49,    58,    46,    10,    10,
-    10,    53,    53,    51,    15,    43,    15,     9,     9,     6,
-     6,     6,    44,     8,     8,    58,    45,     6,    54,    36,
-    42,    10,    59,    41,    20,    16,    61,    62,     6,     6,
-     6,     6,    15,    64,    12,    10,    10,    10,    10,    10,
+     2,    10,    10,    10,    38,    13,    51,    36,    35,    11,
+    19,    58,    81,    58,    46,    37,    50,    50,    89,    14,
+    48,    66,    43,    15,    59,    49,     5,    54,    54,    10,
+    10,    10,    47,    52,    15,    44,    15,    55,    42,     8,
+     8,    45,    20,    59,    16,    62,    63,    37,    65,    12,
+    68,    69,    10,    59,    43,    70,    72,     9,     9,    76,
+     6,    77,    15,    46,    78,     3,    10,    10,    10,    10,
     10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-    10,    10,    10,    10,    10,    10,     5,     6,    44,    10,
-    10,     8,    67,    10,    45,    68,    69,    71,    75,    65,
-    47,    76,     9,     9,     9,     9,    77,     3,    81,     6,
-    15,    82,    84,     8,    85,    86,    87,     1,   nil,   nil,
-   nil,   nil,   nil,    49,    36,    42,    50,   nil,    15,   nil,
+    10,    10,    10,    10,    10,    10,    10,     8,    45,    82,
+    10,    10,     5,    83,    10,     6,     6,     6,    85,    60,
+    86,    48,    87,     6,    66,    60,    88,     1,   nil,     8,
+    15,   nil,   nil,   nil,     6,     6,     6,     6,   nil,   nil,
+   nil,    51,    37,     9,     9,     9,     9,   nil,    15,    43,
+    60,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    50,
+   nil,    36,    35,     6,    58,   nil,   nil,    58,    11,   nil,
+   nil,   nil,   nil,     2,   nil,    10,     2,   nil,   nil,    10,
+    10,    10,    50,    15,   nil,     6,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,
+    38,   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,   nil,
+   nil,    10,   nil,   nil,   nil,    11,   nil,    15,   nil,    89,
+    37,    36,    35,   nil,   nil,    81,    14,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    57,     6,    35,    34,   nil,   nil,    49,   nil,   nil,   nil,
-   nil,     2,    11,    10,     2,   nil,   nil,    10,    10,    10,
-   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,    37,
-   nil,   nil,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,
-   nil,   nil,   nil,   nil,    88,   nil,    15,   nil,    11,    14,
-   nil,    36,    35,    34,    80,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    49,   nil,   nil,   nil,
-     2,   nil,    10,   nil,   nil,   nil,   nil,   nil,     6,    15,
-    11,   nil,     6,     6,     2,     2,   nil,   nil,     6,    19,
-   nil,   nil,   nil,    15,   nil,   nil,    49,   nil,   nil,   nil,
-   nil,   nil,    10,    10,    10,    50,    10,    10,   nil,   nil,
-   nil,    57,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     2,   nil,    10,   nil,   nil,    11,   nil,   nil,
+   nil,    15,   nil,    50,   nil,   nil,     2,     2,   nil,    50,
+    19,   nil,   nil,   nil,   nil,    15,   nil,   nil,   nil,   nil,
+   nil,   nil,    51,   nil,   nil,    10,    10,    10,   nil,    10,
+    10,   nil,   nil,   nil,    50,   nil,    58,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    10,   nil,   nil,   nil,    35,    34,   nil,   nil,    49,   nil,
-   nil,    10,   nil,   nil,    10,    13,     6,   nil,   nil,   nil,
-   nil,   nil,    10,   nil,   nil,   nil,   nil,    37,   nil,   nil,
+   nil,   nil,   nil,    10,    36,    35,     6,   nil,   nil,   nil,
+     6,     6,   nil,   nil,    10,   nil,     6,    10,    13,   nil,
+   nil,   nil,   nil,   nil,   nil,    10,   nil,    50,   nil,   nil,
+    38,   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,    10,   nil,
+   nil,   nil,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,   nil,
+    10,   nil,   nil,   nil,     6,   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,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    10,   nil,   nil,   nil,   nil,   nil,     2,   nil,     2,
-     2 ]
+   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,
+   nil,   nil,     2,   nil,     2,     2 ]
 
 racc_goto_pointer = [
-   nil,   117,     0,   107,   nil,    17,   -13,   nil,    -9,    27,
-   -14,   -65,  -279,  -100,  -206,  -104,  -249,   nil,   nil,   -69,
-   -45,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   -36,   -37,  -103,   -36,   nil,   nil,
-   nil,   -67,  -102,  -335,  -280,  -278,  -219,  -226,  -377,  -102,
-   -87,  -180,   nil,   -72,  -227,   nil,   nil,   -37,   -82,  -306,
-   nil,  -169,  -251,   nil,  -185,  -232,   nil,  -158,  -219,  -144,
-   nil,  -142,   nil,   nil,   nil,  -157,   -49,   -44,   nil,   nil,
-   -47,   -39,   -36,   nil,   -35,    52,    52,   -35,  -138 ]
+   nil,   107,     0,    65,   nil,    22,    42,   nil,   -14,    47,
+   -14,   -71,  -298,  -103,  -205,  -106,  -263,   nil,   nil,   -71,
+   -58,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   -39,   -40,  -107,   -37,   nil,
+   nil,   nil,   -83,  -100,  -339,  -284,  -313,  -216,  -228,  -380,
+   -88,   -94,  -182,   nil,   -77,  -241,   nil,   nil,   -35,   -85,
+  -232,   nil,  -182,  -265,   nil,  -202,  -230,   nil,  -202,  -266,
+  -187,   nil,  -185,   nil,   nil,   nil,  -199,   -91,   -88,   nil,
+   nil,   -49,   -60,   -56,   nil,   -51,    37,    38,   -47,  -137 ]
 
 racc_goto_default = [
-   nil,   nil,   379,   nil,     4,     5,     6,     7,   nil,     8,
-     9,   nil,   nil,   nil,   nil,   nil,   224,    13,    14,   325,
+   nil,   nil,   383,   nil,     4,     5,     6,     7,   nil,     8,
+     9,   nil,   nil,   nil,   nil,   nil,   226,    13,    14,   328,
    nil,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-    28,    29,    30,    31,    32,    33,    34,   nil,    40,    41,
-   120,   nil,   nil,   124,   nil,   nil,   nil,   nil,   nil,   220,
-   nil,   nil,   102,   nil,   174,   176,   175,   109,   nil,   nil,
-   108,   nil,   nil,   128,   nil,   129,   130,   134,   233,   234,
-   235,   236,   237,   240,   142,   144,    55,    56,    57,    60,
-   nil,   nil,   nil,   147,   nil,   nil,   nil,   nil,   nil ]
+    28,    29,    30,    31,    32,    33,    34,    35,   nil,    41,
+    42,   121,   nil,   nil,   125,   nil,   nil,   nil,   nil,   nil,
+   228,   nil,   nil,   103,   nil,   176,   178,   177,   110,   nil,
+   nil,   109,   nil,   nil,   129,   nil,   130,   131,   135,   235,
+   236,   237,   238,   239,   242,   144,   146,    56,    57,    58,
+    61,   nil,   nil,   nil,   149,   nil,   nil,   nil,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -770,176 +778,177 @@ racc_reduce_table = [
   1, 108, :_reduce_none,
   1, 108, :_reduce_none,
   1, 108, :_reduce_none,
-  1, 108, :_reduce_77,
+  1, 108, :_reduce_none,
   1, 108, :_reduce_78,
   1, 108, :_reduce_79,
   1, 108, :_reduce_80,
   1, 108, :_reduce_81,
-  5, 109, :_reduce_82,
-  3, 109, :_reduce_83,
-  6, 109, :_reduce_84,
-  4, 109, :_reduce_85,
-  1, 113, :_reduce_86,
-  2, 113, :_reduce_87,
-  4, 129, :_reduce_88,
-  3, 129, :_reduce_89,
-  1, 129, :_reduce_90,
-  3, 130, :_reduce_91,
-  2, 128, :_reduce_92,
-  3, 132, :_reduce_93,
-  2, 132, :_reduce_94,
-  2, 131, :_reduce_95,
-  4, 131, :_reduce_96,
-  2, 116, :_reduce_97,
-  5, 134, :_reduce_98,
-  4, 134, :_reduce_99,
-  0, 135, :_reduce_none,
-  2, 135, :_reduce_101,
-  4, 135, :_reduce_102,
-  3, 135, :_reduce_103,
-  6, 117, :_reduce_104,
-  5, 117, :_reduce_105,
+  1, 108, :_reduce_82,
+  5, 109, :_reduce_83,
+  3, 109, :_reduce_84,
+  6, 109, :_reduce_85,
+  4, 109, :_reduce_86,
+  1, 113, :_reduce_87,
+  2, 113, :_reduce_88,
+  4, 130, :_reduce_89,
+  3, 130, :_reduce_90,
+  1, 130, :_reduce_91,
+  3, 131, :_reduce_92,
+  2, 129, :_reduce_93,
+  3, 133, :_reduce_94,
+  2, 133, :_reduce_95,
+  2, 132, :_reduce_96,
+  4, 132, :_reduce_97,
+  2, 116, :_reduce_98,
+  5, 135, :_reduce_99,
+  4, 135, :_reduce_100,
   0, 136, :_reduce_none,
-  4, 136, :_reduce_107,
-  3, 136, :_reduce_108,
-  5, 115, :_reduce_109,
-  1, 137, :_reduce_110,
-  2, 137, :_reduce_111,
-  5, 138, :_reduce_112,
-  1, 139, :_reduce_none,
-  1, 139, :_reduce_none,
+  2, 136, :_reduce_102,
+  4, 136, :_reduce_103,
+  3, 136, :_reduce_104,
+  6, 117, :_reduce_105,
+  5, 117, :_reduce_106,
+  0, 137, :_reduce_none,
+  4, 137, :_reduce_108,
+  3, 137, :_reduce_109,
+  5, 115, :_reduce_110,
+  1, 138, :_reduce_111,
+  2, 138, :_reduce_112,
+  5, 139, :_reduce_113,
+  1, 140, :_reduce_none,
+  1, 140, :_reduce_none,
   1, 111, :_reduce_none,
-  4, 111, :_reduce_116,
-  1, 142, :_reduce_117,
-  3, 142, :_reduce_118,
-  3, 141, :_reduce_119,
-  6, 114, :_reduce_120,
-  2, 114, :_reduce_121,
-  3, 143, :_reduce_122,
-  3, 143, :_reduce_123,
-  1, 144, :_reduce_none,
-  1, 144, :_reduce_none,
-  0, 102, :_reduce_126,
-  1, 102, :_reduce_127,
-  3, 102, :_reduce_128,
-  1, 146, :_reduce_none,
-  1, 146, :_reduce_none,
-  3, 145, :_reduce_131,
-  3, 145, :_reduce_132,
-  3, 145, :_reduce_133,
-  6, 118, :_reduce_134,
-  7, 119, :_reduce_135,
-  1, 151, :_reduce_136,
-  1, 150, :_reduce_none,
-  1, 150, :_reduce_none,
-  1, 152, :_reduce_none,
-  2, 152, :_reduce_140,
-  1, 153, :_reduce_none,
+  4, 111, :_reduce_117,
+  1, 143, :_reduce_118,
+  3, 143, :_reduce_119,
+  3, 142, :_reduce_120,
+  6, 114, :_reduce_121,
+  2, 114, :_reduce_122,
+  3, 144, :_reduce_123,
+  3, 144, :_reduce_124,
+  1, 145, :_reduce_none,
+  1, 145, :_reduce_none,
+  0, 102, :_reduce_127,
+  1, 102, :_reduce_128,
+  3, 102, :_reduce_129,
+  1, 147, :_reduce_none,
+  1, 147, :_reduce_none,
+  3, 146, :_reduce_132,
+  3, 146, :_reduce_133,
+  3, 146, :_reduce_134,
+  6, 118, :_reduce_135,
+  7, 119, :_reduce_136,
+  1, 152, :_reduce_137,
+  1, 151, :_reduce_none,
+  1, 151, :_reduce_none,
   1, 153, :_reduce_none,
-  7, 120, :_reduce_143,
-  6, 120, :_reduce_144,
-  1, 154, :_reduce_145,
-  3, 154, :_reduce_146,
-  1, 156, :_reduce_none,
-  1, 156, :_reduce_none,
-  1, 156, :_reduce_149,
-  1, 156, :_reduce_none,
-  1, 157, :_reduce_151,
-  3, 157, :_reduce_152,
-  1, 158, :_reduce_none,
-  1, 158, :_reduce_none,
-  1, 155, :_reduce_none,
-  2, 155, :_reduce_156,
-  1, 148, :_reduce_none,
-  1, 148, :_reduce_none,
-  1, 148, :_reduce_none,
-  1, 148, :_reduce_160,
-  1, 149, :_reduce_161,
-  2, 149, :_reduce_162,
-  4, 149, :_reduce_163,
-  1, 133, :_reduce_164,
-  3, 133, :_reduce_165,
+  2, 153, :_reduce_141,
+  1, 154, :_reduce_none,
+  1, 154, :_reduce_none,
+  7, 120, :_reduce_144,
+  6, 120, :_reduce_145,
+  1, 155, :_reduce_146,
+  3, 155, :_reduce_147,
+  1, 157, :_reduce_none,
+  1, 157, :_reduce_none,
+  1, 157, :_reduce_150,
+  1, 157, :_reduce_none,
+  1, 158, :_reduce_152,
+  3, 158, :_reduce_153,
   1, 159, :_reduce_none,
   1, 159, :_reduce_none,
+  1, 156, :_reduce_none,
+  2, 156, :_reduce_157,
+  6, 122, :_reduce_158,
+  1, 149, :_reduce_none,
+  1, 149, :_reduce_none,
+  1, 149, :_reduce_none,
+  1, 149, :_reduce_162,
+  1, 150, :_reduce_163,
+  2, 150, :_reduce_164,
+  4, 150, :_reduce_165,
+  1, 134, :_reduce_166,
+  3, 134, :_reduce_167,
   1, 160, :_reduce_none,
   1, 160, :_reduce_none,
-  3, 162, :_reduce_170,
-  1, 162, :_reduce_171,
-  2, 163, :_reduce_172,
-  2, 161, :_reduce_173,
-  1, 164, :_reduce_174,
-  4, 164, :_reduce_175,
-  1, 112, :_reduce_176,
-  1, 122, :_reduce_177,
-  1, 122, :_reduce_178,
-  1, 122, :_reduce_179,
-  1, 122, :_reduce_180,
-  4, 123, :_reduce_181,
-  2, 123, :_reduce_182,
-  4, 123, :_reduce_183,
-  2, 123, :_reduce_184,
-  3, 124, :_reduce_185,
-  4, 124, :_reduce_186,
-  2, 124, :_reduce_187,
-  1, 165, :_reduce_188,
-  3, 165, :_reduce_189,
+  1, 161, :_reduce_none,
+  1, 161, :_reduce_none,
+  3, 163, :_reduce_172,
+  1, 163, :_reduce_173,
+  2, 164, :_reduce_174,
+  2, 162, :_reduce_175,
+  1, 165, :_reduce_176,
+  4, 165, :_reduce_177,
+  1, 112, :_reduce_178,
+  1, 123, :_reduce_179,
+  1, 123, :_reduce_180,
+  1, 123, :_reduce_181,
+  4, 124, :_reduce_182,
+  2, 124, :_reduce_183,
+  4, 124, :_reduce_184,
+  2, 124, :_reduce_185,
+  3, 125, :_reduce_186,
+  4, 125, :_reduce_187,
+  2, 125, :_reduce_188,
+  1, 166, :_reduce_189,
   3, 166, :_reduce_190,
-  1, 126, :_reduce_none,
-  1, 126, :_reduce_none,
-  1, 126, :_reduce_none,
-  1, 167, :_reduce_194,
-  1, 167, :_reduce_195,
-  2, 168, :_reduce_196,
-  1, 170, :_reduce_197,
-  1, 172, :_reduce_198,
+  3, 167, :_reduce_191,
+  1, 127, :_reduce_none,
+  1, 127, :_reduce_none,
+  1, 127, :_reduce_none,
+  1, 168, :_reduce_195,
+  1, 168, :_reduce_196,
+  2, 169, :_reduce_197,
+  1, 171, :_reduce_198,
   1, 173, :_reduce_199,
-  2, 171, :_reduce_200,
-  1, 174, :_reduce_201,
+  1, 174, :_reduce_200,
+  2, 172, :_reduce_201,
   1, 175, :_reduce_202,
-  2, 175, :_reduce_203,
-  2, 169, :_reduce_204,
-  2, 176, :_reduce_205,
-  2, 176, :_reduce_206,
-  3, 94, :_reduce_207,
-  0, 178, :_reduce_none,
-  1, 178, :_reduce_none,
-  0, 177, :_reduce_210,
-  2, 177, :_reduce_211,
-  4, 177, :_reduce_212,
-  1, 121, :_reduce_213,
-  3, 121, :_reduce_214,
-  5, 121, :_reduce_215,
-  1, 179, :_reduce_none,
+  1, 176, :_reduce_203,
+  2, 176, :_reduce_204,
+  2, 170, :_reduce_205,
+  2, 177, :_reduce_206,
+  2, 177, :_reduce_207,
+  3, 94, :_reduce_208,
+  0, 179, :_reduce_none,
   1, 179, :_reduce_none,
-  1, 127, :_reduce_218,
-  1, 125, :_reduce_219,
+  0, 178, :_reduce_211,
+  2, 178, :_reduce_212,
+  4, 178, :_reduce_213,
+  1, 121, :_reduce_214,
+  3, 121, :_reduce_215,
+  5, 121, :_reduce_216,
+  1, 180, :_reduce_none,
+  1, 180, :_reduce_none,
+  1, 128, :_reduce_219,
+  1, 126, :_reduce_220,
   0, 106, :_reduce_none,
-  1, 106, :_reduce_221,
+  1, 106, :_reduce_222,
   0, 105, :_reduce_none,
   1, 105, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  1, 147, :_reduce_none,
-  0, 140, :_reduce_242 ]
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  1, 148, :_reduce_none,
+  0, 141, :_reduce_243 ]
 
-racc_reduce_n = 243
+racc_reduce_n = 244
 
-racc_shift_n = 420
+racc_shift_n = 426
 
 racc_token_table = {
   false => 0,
@@ -1177,6 +1186,7 @@ Racc_token_to_s_table = [
   "hostclass_expression",
   "node_definition_expression",
   "epp_render_expression",
+  "function_definition",
   "reserved_word",
   "array",
   "hash",
@@ -1242,63 +1252,63 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 65)
+module_eval(<<'.,.,', 'egrammar.ra', 66)
   def _reduce_1(val, _values, result)
      result = create_program(Factory.block_or_expression(*val[0])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 66)
+module_eval(<<'.,.,', 'egrammar.ra', 67)
   def _reduce_2(val, _values, result)
      result = create_program(Factory.block_or_expression(*val[0])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 67)
+module_eval(<<'.,.,', 'egrammar.ra', 68)
   def _reduce_3(val, _values, result)
      result = create_empty_program() 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 71)
+module_eval(<<'.,.,', 'egrammar.ra', 72)
   def _reduce_4(val, _values, result)
      result = transform_calls(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 78)
+module_eval(<<'.,.,', 'egrammar.ra', 79)
   def _reduce_5(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 79)
+module_eval(<<'.,.,', 'egrammar.ra', 80)
   def _reduce_6(val, _values, result)
      result = val[0].push val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 80)
+module_eval(<<'.,.,', 'egrammar.ra', 81)
   def _reduce_7(val, _values, result)
      result = val[0].push val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 87)
+module_eval(<<'.,.,', 'egrammar.ra', 88)
   def _reduce_8(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 88)
+module_eval(<<'.,.,', 'egrammar.ra', 89)
   def _reduce_9(val, _values, result)
      result = aryfy(val[0]).push(val[1]).push(val[2]) 
     result
@@ -1307,35 +1317,35 @@ module_eval(<<'.,.,', 'egrammar.ra', 88)
 
 # reduce 10 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 93)
+module_eval(<<'.,.,', 'egrammar.ra', 94)
   def _reduce_11(val, _values, result)
      result = val[0].set(val[2])      ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 94)
+module_eval(<<'.,.,', 'egrammar.ra', 95)
   def _reduce_12(val, _values, result)
      result = val[0].plus_set(val[2]) ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 95)
+module_eval(<<'.,.,', 'egrammar.ra', 96)
   def _reduce_13(val, _values, result)
      result = val[0].minus_set(val[2]); loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 98)
+module_eval(<<'.,.,', 'egrammar.ra', 99)
   def _reduce_14(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 99)
+module_eval(<<'.,.,', 'egrammar.ra', 100)
   def _reduce_15(val, _values, result)
      result = val[0].push(val[2]) 
     result
@@ -1344,28 +1354,28 @@ module_eval(<<'.,.,', 'egrammar.ra', 99)
 
 # reduce 16 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 103)
+module_eval(<<'.,.,', 'egrammar.ra', 104)
   def _reduce_17(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 104)
+module_eval(<<'.,.,', 'egrammar.ra', 105)
   def _reduce_18(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 105)
+module_eval(<<'.,.,', 'egrammar.ra', 106)
   def _reduce_19(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 106)
+module_eval(<<'.,.,', 'egrammar.ra', 107)
   def _reduce_20(val, _values, result)
      result = val[0].relop(val[1][:value], val[2]); loc result, val[1] 
     result
@@ -1374,7 +1384,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 106)
 
 # reduce 21 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 115)
+module_eval(<<'.,.,', 'egrammar.ra', 116)
   def _reduce_22(val, _values, result)
           result = val[1]
       unless Factory.set_resource_form(result, :virtual)
@@ -1388,7 +1398,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 115)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 126)
+module_eval(<<'.,.,', 'egrammar.ra', 127)
   def _reduce_23(val, _values, result)
           result = val[1]
       unless Factory.set_resource_form(result, :exported)
@@ -1402,7 +1412,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 126)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 137)
+module_eval(<<'.,.,', 'egrammar.ra', 138)
   def _reduce_24(val, _values, result)
           bodies = [Factory.RESOURCE_BODY(val[2], val[4])] + val[5]
       result = Factory.RESOURCE(val[0], bodies)
@@ -1412,7 +1422,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 137)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 144)
+module_eval(<<'.,.,', 'egrammar.ra', 145)
   def _reduce_25(val, _values, result)
             result = Factory.RESOURCE(Factory.fqn(token_text(val[0])), val[2])
         loc result, val[0], val[4]
@@ -1421,7 +1431,7 @@ module_eval(<<'.,.,', 'egrammar.ra', 144)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 153)
+module_eval(<<'.,.,', 'egrammar.ra', 154)
   def _reduce_26(val, _values, result)
            result = case Factory.resource_shape(val[0])
        when :resource, :class
@@ -1447,42 +1457,42 @@ module_eval(<<'.,.,', 'egrammar.ra', 153)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 175)
+module_eval(<<'.,.,', 'egrammar.ra', 176)
   def _reduce_27(val, _values, result)
      result = Factory.RESOURCE_BODY(val[0], val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 178)
+module_eval(<<'.,.,', 'egrammar.ra', 179)
   def _reduce_28(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 179)
+module_eval(<<'.,.,', 'egrammar.ra', 180)
   def _reduce_29(val, _values, result)
      result = val[0].push val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 185)
+module_eval(<<'.,.,', 'egrammar.ra', 186)
   def _reduce_30(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 186)
+module_eval(<<'.,.,', 'egrammar.ra', 187)
   def _reduce_31(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 187)
+module_eval(<<'.,.,', 'egrammar.ra', 188)
   def _reduce_32(val, _values, result)
      result = val[2] 
     result
@@ -1493,182 +1503,182 @@ module_eval(<<'.,.,', 'egrammar.ra', 187)
 
 # reduce 34 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 194)
+module_eval(<<'.,.,', 'egrammar.ra', 195)
   def _reduce_35(val, _values, result)
      result = val[0][*val[2]]         ; loc result, val[0], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 195)
+module_eval(<<'.,.,', 'egrammar.ra', 196)
   def _reduce_36(val, _values, result)
      result = val[0].in val[2]        ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 196)
+module_eval(<<'.,.,', 'egrammar.ra', 197)
   def _reduce_37(val, _values, result)
      result = val[0] =~  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 197)
+module_eval(<<'.,.,', 'egrammar.ra', 198)
   def _reduce_38(val, _values, result)
      result = val[0].mne val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 198)
+module_eval(<<'.,.,', 'egrammar.ra', 199)
   def _reduce_39(val, _values, result)
      result = val[0] +   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 199)
+module_eval(<<'.,.,', 'egrammar.ra', 200)
   def _reduce_40(val, _values, result)
      result = val[0] -   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 200)
+module_eval(<<'.,.,', 'egrammar.ra', 201)
   def _reduce_41(val, _values, result)
      result = val[0] /   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 201)
+module_eval(<<'.,.,', 'egrammar.ra', 202)
   def _reduce_42(val, _values, result)
      result = val[0] *   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 202)
+module_eval(<<'.,.,', 'egrammar.ra', 203)
   def _reduce_43(val, _values, result)
      result = val[0] %   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 203)
+module_eval(<<'.,.,', 'egrammar.ra', 204)
   def _reduce_44(val, _values, result)
      result = val[0] <<  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 204)
+module_eval(<<'.,.,', 'egrammar.ra', 205)
   def _reduce_45(val, _values, result)
      result = val[0] >>  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 205)
+module_eval(<<'.,.,', 'egrammar.ra', 206)
   def _reduce_46(val, _values, result)
      result = val[1].minus()          ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 206)
+module_eval(<<'.,.,', 'egrammar.ra', 207)
   def _reduce_47(val, _values, result)
      result = val[1].unfold()         ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 207)
+module_eval(<<'.,.,', 'egrammar.ra', 208)
   def _reduce_48(val, _values, result)
      result = val[0].ne  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 208)
+module_eval(<<'.,.,', 'egrammar.ra', 209)
   def _reduce_49(val, _values, result)
      result = val[0] ==  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 209)
+module_eval(<<'.,.,', 'egrammar.ra', 210)
   def _reduce_50(val, _values, result)
      result = val[0] >   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 210)
+module_eval(<<'.,.,', 'egrammar.ra', 211)
   def _reduce_51(val, _values, result)
      result = val[0] >=  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 211)
+module_eval(<<'.,.,', 'egrammar.ra', 212)
   def _reduce_52(val, _values, result)
      result = val[0] <   val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 212)
+module_eval(<<'.,.,', 'egrammar.ra', 213)
   def _reduce_53(val, _values, result)
      result = val[0] <=  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 213)
+module_eval(<<'.,.,', 'egrammar.ra', 214)
   def _reduce_54(val, _values, result)
      result = val[1].not              ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 214)
+module_eval(<<'.,.,', 'egrammar.ra', 215)
   def _reduce_55(val, _values, result)
      result = val[0].and val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 215)
+module_eval(<<'.,.,', 'egrammar.ra', 216)
   def _reduce_56(val, _values, result)
      result = val[0].or  val[2]       ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 216)
+module_eval(<<'.,.,', 'egrammar.ra', 217)
   def _reduce_57(val, _values, result)
      result = val[0].select(*val[2])  ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 217)
+module_eval(<<'.,.,', 'egrammar.ra', 218)
   def _reduce_58(val, _values, result)
      result = val[1].paren()          ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 227)
+module_eval(<<'.,.,', 'egrammar.ra', 228)
   def _reduce_59(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 228)
+module_eval(<<'.,.,', 'egrammar.ra', 229)
   def _reduce_60(val, _values, result)
      result = val[0].push(val[2]) 
     result
@@ -1707,43 +1717,45 @@ module_eval(<<'.,.,', 'egrammar.ra', 228)
 
 # reduce 76 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 247)
-  def _reduce_77(val, _values, result)
+# reduce 77 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 249)
+  def _reduce_78(val, _values, result)
      result = Factory.NUMBER(val[0][:value])          ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 248)
-  def _reduce_78(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 250)
+  def _reduce_79(val, _values, result)
      result = Factory.literal(val[0][:value])         ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 249)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 251)
+  def _reduce_80(val, _values, result)
      result = Factory.literal(:default)               ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 250)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 252)
+  def _reduce_81(val, _values, result)
      result = Factory.literal(:undef)                 ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 251)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 253)
+  def _reduce_82(val, _values, result)
      result = Factory.QNAME_OR_NUMBER(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 260)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 262)
+  def _reduce_83(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, val[2])
       loc result, val[0], val[4]
     
@@ -1751,8 +1763,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 260)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 264)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 266)
+  def _reduce_84(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, [])
       loc result, val[0], val[2]
     
@@ -1760,8 +1772,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 264)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 268)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 270)
+  def _reduce_85(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, val[2])
       loc result, val[0], val[4]
       result.lambda = val[5]
@@ -1770,8 +1782,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 268)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 273)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 275)
+  def _reduce_86(val, _values, result)
           result = Factory.CALL_NAMED(val[0], true, [])
       loc result, val[0], val[2]
       result.lambda = val[3]
@@ -1780,43 +1792,43 @@ module_eval(<<'.,.,', 'egrammar.ra', 273)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 281)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 283)
+  def _reduce_87(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 282)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 284)
+  def _reduce_88(val, _values, result)
      result = val[0]; val[0].lambda = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 285)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 287)
+  def _reduce_89(val, _values, result)
      result = Factory.CALL_METHOD(val[0], val[2]); loc result, val[1], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 286)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 288)
+  def _reduce_90(val, _values, result)
      result = Factory.CALL_METHOD(val[0], []); loc result, val[1], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 287)
-  def _reduce_90(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 289)
+  def _reduce_91(val, _values, result)
      result = Factory.CALL_METHOD(val[0], []); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 291)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 293)
+  def _reduce_92(val, _values, result)
             result = val[0].dot(Factory.fqn(val[2][:value]))
         loc result, val[1], val[2]
       
@@ -1824,8 +1836,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 291)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 299)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 301)
+  def _reduce_93(val, _values, result)
           result = Factory.LAMBDA(val[0][:value], val[1][:value])
       loc result, val[0][:start], val[1][:end]
     
@@ -1833,36 +1845,36 @@ module_eval(<<'.,.,', 'egrammar.ra', 299)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 304)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 306)
+  def _reduce_94(val, _values, result)
      result = {:end => val[2], :value =>val[1] } 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 305)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 307)
+  def _reduce_95(val, _values, result)
      result = {:end => val[1], :value => nil } 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 309)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 311)
+  def _reduce_96(val, _values, result)
      result = {:start => val[0], :value => [] } 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 310)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 312)
+  def _reduce_97(val, _values, result)
      result = {:start => val[0], :value => val[1] } 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 318)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 320)
+  def _reduce_98(val, _values, result)
           result = val[1]
       loc(result, val[0], val[1])
     
@@ -1870,8 +1882,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 318)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 325)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 327)
+  def _reduce_99(val, _values, result)
             result = Factory.IF(val[0], Factory.block_or_expression(*val[2]), val[4])
         loc(result, val[0], (val[4] ? val[4] : val[3]))
       
@@ -1879,8 +1891,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 325)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 329)
-  def _reduce_99(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 331)
+  def _reduce_100(val, _values, result)
             result = Factory.IF(val[0], nil, val[3])
         loc(result, val[0], (val[3] ? val[3] : val[2]))
       
@@ -1888,10 +1900,10 @@ module_eval(<<'.,.,', 'egrammar.ra', 329)
   end
 .,.,
 
-# reduce 100 omitted
+# reduce 101 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 337)
-  def _reduce_101(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 339)
+  def _reduce_102(val, _values, result)
             result = val[1]
         loc(result, val[0], val[1])
       
@@ -1899,8 +1911,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 337)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 341)
-  def _reduce_102(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 343)
+  def _reduce_103(val, _values, result)
             result = Factory.block_or_expression(*val[2])
         loc result, val[0], val[3]
       
@@ -1908,16 +1920,16 @@ module_eval(<<'.,.,', 'egrammar.ra', 341)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 345)
-  def _reduce_103(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 347)
+  def _reduce_104(val, _values, result)
             result = nil # don't think a nop is needed here either
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 352)
-  def _reduce_104(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 354)
+  def _reduce_105(val, _values, result)
           result = Factory.UNLESS(val[1], Factory.block_or_expression(*val[3]), val[5])
       loc result, val[0], val[4]
     
@@ -1925,19 +1937,19 @@ module_eval(<<'.,.,', 'egrammar.ra', 352)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 356)
-  def _reduce_105(val, _values, result)
-          result = Factory.UNLESS(val[1], nil, nil)
+module_eval(<<'.,.,', 'egrammar.ra', 358)
+  def _reduce_106(val, _values, result)
+          result = Factory.UNLESS(val[1], nil, val[4])
       loc result, val[0], val[4]
     
     result
   end
 .,.,
 
-# reduce 106 omitted
+# reduce 107 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 366)
-  def _reduce_107(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 368)
+  def _reduce_108(val, _values, result)
             result = Factory.block_or_expression(*val[2])
         loc result, val[0], val[3]
       
@@ -1945,16 +1957,16 @@ module_eval(<<'.,.,', 'egrammar.ra', 366)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 370)
-  def _reduce_108(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 372)
+  def _reduce_109(val, _values, result)
             result = nil # don't think a nop is needed here either
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 377)
-  def _reduce_109(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 379)
+  def _reduce_110(val, _values, result)
           result = Factory.CASE(val[1], *val[3])
       loc result, val[0], val[4]
     
@@ -1962,65 +1974,65 @@ module_eval(<<'.,.,', 'egrammar.ra', 377)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 383)
-  def _reduce_110(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 385)
+  def _reduce_111(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 384)
-  def _reduce_111(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 386)
+  def _reduce_112(val, _values, result)
      result = val[0].push val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 389)
-  def _reduce_112(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 391)
+  def _reduce_113(val, _values, result)
             result = Factory.WHEN(val[0], val[3]); loc result, val[1], val[4]
       
     result
   end
 .,.,
 
-# reduce 113 omitted
-
 # reduce 114 omitted
 
 # reduce 115 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 405)
-  def _reduce_116(val, _values, result)
+# reduce 116 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 407)
+  def _reduce_117(val, _values, result)
             result = val[1]
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 410)
-  def _reduce_117(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 412)
+  def _reduce_118(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 411)
-  def _reduce_118(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 413)
+  def _reduce_119(val, _values, result)
      result = val[0].push val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 416)
-  def _reduce_119(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 418)
+  def _reduce_120(val, _values, result)
      result = Factory.MAP(val[0], val[2]) ; loc result, val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 426)
-  def _reduce_120(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 428)
+  def _reduce_121(val, _values, result)
           result = Factory.COLLECT(val[0], val[1], val[3])
       loc result, val[0], val[5]
     
@@ -2028,8 +2040,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 426)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 430)
-  def _reduce_121(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 432)
+  def _reduce_122(val, _values, result)
           result = Factory.COLLECT(val[0], val[1], [])
       loc result, val[0], val[1]
     
@@ -2037,51 +2049,51 @@ module_eval(<<'.,.,', 'egrammar.ra', 430)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 435)
-  def _reduce_122(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 437)
+  def _reduce_123(val, _values, result)
      result = Factory.VIRTUAL_QUERY(val[1])   ; loc result, val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 436)
-  def _reduce_123(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 438)
+  def _reduce_124(val, _values, result)
      result = Factory.EXPORTED_QUERY(val[1])  ; loc result, val[0], val[2] 
     result
   end
 .,.,
 
-# reduce 124 omitted
-
 # reduce 125 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 445)
-  def _reduce_126(val, _values, result)
+# reduce 126 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 447)
+  def _reduce_127(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 446)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 448)
+  def _reduce_128(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 447)
-  def _reduce_128(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 449)
+  def _reduce_129(val, _values, result)
      result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 129 omitted
-
 # reduce 130 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 463)
-  def _reduce_131(val, _values, result)
+# reduce 131 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 465)
+  def _reduce_132(val, _values, result)
             result = Factory.ATTRIBUTE_OP(val[0][:value], :'=>', val[2])
         loc result, val[0], val[2]
       
@@ -2089,8 +2101,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 463)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 467)
-  def _reduce_132(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 469)
+  def _reduce_133(val, _values, result)
             result = Factory.ATTRIBUTE_OP(val[0][:value], :'+>', val[2])
         loc result, val[0], val[2]
       
@@ -2098,16 +2110,16 @@ module_eval(<<'.,.,', 'egrammar.ra', 467)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 471)
-  def _reduce_133(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 473)
+  def _reduce_134(val, _values, result)
           result = Factory.ATTRIBUTES_OP(val[2]) ; loc result, val[0], val[2]
    
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 480)
-  def _reduce_134(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 482)
+  def _reduce_135(val, _values, result)
           result = add_definition(Factory.DEFINITION(classname(val[1][:value]), val[2], val[4]))
       loc result, val[0], val[5]
       # New lexer does not keep track of this, this is done in validation
@@ -2119,8 +2131,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 480)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 494)
-  def _reduce_135(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 496)
+  def _reduce_136(val, _values, result)
           # Remove this class' name from the namestack as all nested classes have been parsed
       namepop
       result = add_definition(Factory.HOSTCLASS(classname(val[1][:value]), val[2], token_text(val[3]), val[5]))
@@ -2130,32 +2142,32 @@ module_eval(<<'.,.,', 'egrammar.ra', 494)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 504)
-  def _reduce_136(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 506)
+  def _reduce_137(val, _values, result)
      namestack(val[0][:value]) ; result = val[0] 
     result
   end
 .,.,
 
-# reduce 137 omitted
-
 # reduce 138 omitted
 
 # reduce 139 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 513)
-  def _reduce_140(val, _values, result)
+# reduce 140 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 515)
+  def _reduce_141(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-# reduce 141 omitted
-
 # reduce 142 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 530)
-  def _reduce_143(val, _values, result)
+# reduce 143 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 532)
+  def _reduce_144(val, _values, result)
           result = add_definition(Factory.NODE(val[1], val[3], val[5]))
       loc result, val[0], val[6]
     
@@ -2163,8 +2175,8 @@ module_eval(<<'.,.,', 'egrammar.ra', 530)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 534)
-  def _reduce_144(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 536)
+  def _reduce_145(val, _values, result)
           result = add_definition(Factory.NODE(val[1], val[3], nil))
       loc result, val[0], val[5]
     
@@ -2172,442 +2184,442 @@ module_eval(<<'.,.,', 'egrammar.ra', 534)
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 544)
-  def _reduce_145(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 546)
+  def _reduce_146(val, _values, result)
      result = [result] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 545)
-  def _reduce_146(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 547)
+  def _reduce_147(val, _values, result)
      result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 147 omitted
-
 # reduce 148 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 552)
-  def _reduce_149(val, _values, result)
+# reduce 149 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 554)
+  def _reduce_150(val, _values, result)
      result = Factory.literal(:default); loc result, val[0] 
     result
   end
 .,.,
 
-# reduce 150 omitted
+# reduce 151 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 556)
-  def _reduce_151(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 558)
+  def _reduce_152(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 557)
-  def _reduce_152(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 559)
+  def _reduce_153(val, _values, result)
      result = Factory.concat(val[0], '.', val[2][:value]); loc result, val[0], val[2] 
     result
   end
 .,.,
 
-# reduce 153 omitted
-
 # reduce 154 omitted
 
 # reduce 155 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 566)
-  def _reduce_156(val, _values, result)
+# reduce 156 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 568)
+  def _reduce_157(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-# reduce 157 omitted
-
-# reduce 158 omitted
+module_eval(<<'.,.,', 'egrammar.ra', 574)
+  def _reduce_158(val, _values, result)
+          result = add_definition(Factory.FUNCTION(val[1][:value], val[2], val[4]))
+      loc result, val[0], val[5]
+    
+    result
+  end
+.,.,
 
 # reduce 159 omitted
 
+# reduce 160 omitted
+
+# reduce 161 omitted
+
 module_eval(<<'.,.,', 'egrammar.ra', 585)
-  def _reduce_160(val, _values, result)
+  def _reduce_162(val, _values, result)
      error val[0], "'class' is not a valid classname" 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 589)
-  def _reduce_161(val, _values, result)
+  def _reduce_163(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 590)
-  def _reduce_162(val, _values, result)
+  def _reduce_164(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 591)
-  def _reduce_163(val, _values, result)
+  def _reduce_165(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 595)
-  def _reduce_164(val, _values, result)
+  def _reduce_166(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 596)
-  def _reduce_165(val, _values, result)
+  def _reduce_167(val, _values, result)
      result = val[0].push(val[2]) 
     result
   end
 .,.,
 
-# reduce 166 omitted
-
-# reduce 167 omitted
-
 # reduce 168 omitted
 
 # reduce 169 omitted
 
+# reduce 170 omitted
+
+# reduce 171 omitted
+
 module_eval(<<'.,.,', 'egrammar.ra', 608)
-  def _reduce_170(val, _values, result)
+  def _reduce_172(val, _values, result)
      result = Factory.PARAM(val[0][:value], val[2]) ; loc result, val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 609)
-  def _reduce_171(val, _values, result)
+  def _reduce_173(val, _values, result)
      result = Factory.PARAM(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 612)
-  def _reduce_172(val, _values, result)
+  def _reduce_174(val, _values, result)
      result = val[1]; val[1].captures_rest() 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 615)
-  def _reduce_173(val, _values, result)
+  def _reduce_175(val, _values, result)
      val[1].type_expr(val[0]) ; result = val[1] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 618)
-  def _reduce_174(val, _values, result)
+  def _reduce_176(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 619)
-  def _reduce_175(val, _values, result)
+  def _reduce_177(val, _values, result)
      result = val[0][*val[2]] ; loc result, val[0], val[3] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 624)
-  def _reduce_176(val, _values, result)
+  def _reduce_178(val, _values, result)
      result = Factory.fqn(val[0][:value]).var ; loc result, val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 629)
-  def _reduce_177(val, _values, result)
+  def _reduce_179(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 630)
-  def _reduce_178(val, _values, result)
+  def _reduce_180(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'egrammar.ra', 631)
-  def _reduce_179(val, _values, result)
-     result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'egrammar.ra', 632)
-  def _reduce_180(val, _values, result)
+  def _reduce_181(val, _values, result)
      result = Factory.RESERVED(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 638)
-  def _reduce_181(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 637)
+  def _reduce_182(val, _values, result)
      result = Factory.LIST(val[1]); loc result, val[0], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 639)
-  def _reduce_182(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 638)
+  def _reduce_183(val, _values, result)
      result = Factory.literal([]) ; loc result, val[0], val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 640)
-  def _reduce_183(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 639)
+  def _reduce_184(val, _values, result)
      result = Factory.LIST(val[1]); loc result, val[0], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 641)
-  def _reduce_184(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 640)
+  def _reduce_185(val, _values, result)
      result = Factory.literal([]) ; loc result, val[0], val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 644)
-  def _reduce_185(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 643)
+  def _reduce_186(val, _values, result)
      result = Factory.HASH(val[1]); loc result, val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 645)
-  def _reduce_186(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 644)
+  def _reduce_187(val, _values, result)
      result = Factory.HASH(val[1]); loc result, val[0], val[3] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 646)
-  def _reduce_187(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 645)
+  def _reduce_188(val, _values, result)
      result = Factory.literal({}) ; loc result, val[0], val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 649)
-  def _reduce_188(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 648)
+  def _reduce_189(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 650)
-  def _reduce_189(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 649)
+  def _reduce_190(val, _values, result)
      result = val[0].push val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 653)
-  def _reduce_190(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 652)
+  def _reduce_191(val, _values, result)
      result = Factory.KEY_ENTRY(val[0], val[2]); loc result, val[1] 
     result
   end
 .,.,
 
-# reduce 191 omitted
-
 # reduce 192 omitted
 
 # reduce 193 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 661)
-  def _reduce_194(val, _values, result)
-     result = Factory.literal(val[0][:value]) ; loc result, val[0] 
-    result
-  end
-.,.,
+# reduce 194 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 662)
+module_eval(<<'.,.,', 'egrammar.ra', 660)
   def _reduce_195(val, _values, result)
      result = Factory.literal(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 664)
+module_eval(<<'.,.,', 'egrammar.ra', 661)
   def _reduce_196(val, _values, result)
-     result = Factory.string(val[0], *val[1]) ; loc result, val[0], val[1][-1] 
+     result = Factory.literal(val[0][:value]) ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 665)
+module_eval(<<'.,.,', 'egrammar.ra', 663)
   def _reduce_197(val, _values, result)
-     result = Factory.literal(val[0][:value]); loc result, val[0] 
+     result = Factory.string(val[0], *val[1]) ; loc result, val[0], val[1][-1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 666)
+module_eval(<<'.,.,', 'egrammar.ra', 664)
   def _reduce_198(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 667)
+module_eval(<<'.,.,', 'egrammar.ra', 665)
   def _reduce_199(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 668)
+module_eval(<<'.,.,', 'egrammar.ra', 666)
   def _reduce_200(val, _values, result)
-     result = [val[0]] + val[1] 
+     result = Factory.literal(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 669)
+module_eval(<<'.,.,', 'egrammar.ra', 667)
   def _reduce_201(val, _values, result)
-     result = Factory.TEXT(val[0]) 
+     result = [val[0]] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 672)
+module_eval(<<'.,.,', 'egrammar.ra', 668)
   def _reduce_202(val, _values, result)
-     result = [val[0]] 
+     result = Factory.TEXT(val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 673)
+module_eval(<<'.,.,', 'egrammar.ra', 671)
   def _reduce_203(val, _values, result)
-     result = [val[0]] + val[1] 
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 676)
+module_eval(<<'.,.,', 'egrammar.ra', 672)
   def _reduce_204(val, _values, result)
-     result = Factory.HEREDOC(val[0][:value], val[1]); loc result, val[0] 
+     result = [val[0]] + val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 679)
+module_eval(<<'.,.,', 'egrammar.ra', 675)
   def _reduce_205(val, _values, result)
-     result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0] 
+     result = Factory.HEREDOC(val[0][:value], val[1]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 680)
+module_eval(<<'.,.,', 'egrammar.ra', 678)
   def _reduce_206(val, _values, result)
      result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 683)
+module_eval(<<'.,.,', 'egrammar.ra', 679)
   def _reduce_207(val, _values, result)
-     result = Factory.EPP(val[1], val[2]); loc result, val[0] 
+     result = Factory.SUBLOCATE(val[0], val[1]); loc result, val[0] 
     result
   end
 .,.,
 
-# reduce 208 omitted
+module_eval(<<'.,.,', 'egrammar.ra', 682)
+  def _reduce_208(val, _values, result)
+     result = Factory.EPP(val[1], val[2]); loc result, val[0] 
+    result
+  end
+.,.,
 
 # reduce 209 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 690)
-  def _reduce_210(val, _values, result)
+# reduce 210 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 689)
+  def _reduce_211(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 691)
-  def _reduce_211(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 690)
+  def _reduce_212(val, _values, result)
      result = [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 692)
-  def _reduce_212(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 691)
+  def _reduce_213(val, _values, result)
      result = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 695)
-  def _reduce_213(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 694)
+  def _reduce_214(val, _values, result)
      result = Factory.RENDER_STRING(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 696)
-  def _reduce_214(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 695)
+  def _reduce_215(val, _values, result)
      result = Factory.RENDER_EXPR(val[1]); loc result, val[0], val[2] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 697)
-  def _reduce_215(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 696)
+  def _reduce_216(val, _values, result)
      result = Factory.RENDER_EXPR(Factory.block_or_expression(*val[2])); loc result, val[0], val[4] 
     result
   end
 .,.,
 
-# reduce 216 omitted
-
 # reduce 217 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 703)
-  def _reduce_218(val, _values, result)
+# reduce 218 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 702)
+  def _reduce_219(val, _values, result)
      result = Factory.QREF(val[0][:value])  ; loc result, val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'egrammar.ra', 706)
-  def _reduce_219(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 705)
+  def _reduce_220(val, _values, result)
      result = Factory.literal(val[0][:value]); loc result, val[0] 
     result
   end
 .,.,
 
-# reduce 220 omitted
+# reduce 221 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 712)
-  def _reduce_221(val, _values, result)
+module_eval(<<'.,.,', 'egrammar.ra', 711)
+  def _reduce_222(val, _values, result)
      result = nil 
     result
   end
 .,.,
 
-# reduce 222 omitted
-
 # reduce 223 omitted
 
 # reduce 224 omitted
@@ -2646,8 +2658,10 @@ module_eval(<<'.,.,', 'egrammar.ra', 712)
 
 # reduce 241 omitted
 
-module_eval(<<'.,.,', 'egrammar.ra', 739)
-  def _reduce_242(val, _values, result)
+# reduce 242 omitted
+
+module_eval(<<'.,.,', 'egrammar.ra', 738)
+  def _reduce_243(val, _values, result)
      result = nil
     result
   end