graphql 1.1.0 → 1.2.0

data/lib/graphql/field/resolve.rb

@@ -16,6 +16,7 @@ module GraphQL
         end
       end
 
+      # These only require `obj` as input
       class BuiltInResolve
       end
 

data/lib/graphql/input_object_type.rb

@@ -29,9 +29,11 @@ module GraphQL
       argument: GraphQL::Define::AssignArgument
     )
 
-    lazy_defined_attr_accessor :mutation, :arguments
+    attr_accessor :mutation, :arguments
     alias :input_fields :arguments
 
+    ensure_defined(:mutation, :arguments)
+
     # @!attribute mutation
     #   @return [GraphQL::Relay::Mutation, nil] The mutation this field was derived from, if it was derived from a mutation
 
@@ -75,16 +77,14 @@ module GraphQL
 
       arguments.each do |input_key, input_field_defn|
         field_value = value[input_key]
-        field_value = input_field_defn.type.coerce_input(field_value)
 
-        # Try getting the default value
-        if field_value.nil?
-          field_value = input_field_defn.default_value
+        if value.key?(input_key)
+          coerced_value = input_field_defn.type.coerce_input(field_value)
+        else
+          coerced_value = input_field_defn.default_value
         end
 
-        if !field_value.nil?
-          input_values[input_key] = field_value
-        end
+        input_values[input_key] = coerced_value if coerced_value || value.key?(input_key)
       end
 
       GraphQL::Query::Arguments.new(input_values, argument_definitions: arguments)
@@ -98,7 +98,7 @@ module GraphQL
 
       arguments.each do |input_key, input_field_defn|
         input_value = value[input_key]
-        result[input_key] = input_value.nil? ? nil : input_field_defn.type.coerce_result(input_value)
+        result[input_key] = input_value.nil? ? nil : input_field_defn.type.coerce_result(input_value) if value.key?(input_key)
       end
 
       result

data/lib/graphql/interface_type.rb

@@ -24,7 +24,8 @@ module GraphQL
   class InterfaceType < GraphQL::BaseType
     accepts_definitions :fields, field: GraphQL::Define::AssignObjectField
 
-    lazy_defined_attr_accessor :fields
+    attr_accessor :fields
+    ensure_defined :fields
 
     def initialize
       @fields = {}

data/lib/graphql/internal_representation.rb

@@ -1,2 +1,3 @@
 require "graphql/internal_representation/node"
 require "graphql/internal_representation/rewrite"
+require "graphql/internal_representation/selections"

data/lib/graphql/internal_representation/node.rb

@@ -3,20 +3,25 @@ require "set"
 module GraphQL
   module InternalRepresentation
     class Node
-      def initialize(parent:, ast_node: nil, return_type: nil, name: nil, definition_name: nil, definitions: {}, children: {}, spreads: [], directives: Set.new, included: true)
-        # Make sure these are kept in sync with #dup
+      def initialize(parent:, ast_node: nil, return_type: nil, owner_type: nil, name: nil, definition_name: nil, definition: nil, spreads: [], directives: Set.new, included: true, typed_children: Hash.new {|h, k| h[k] = {} }, definitions: {}, children: {})
         @ast_node = ast_node
         @return_type = return_type
+        @owner_type = owner_type
         @name = name
         @definition_name = definition_name
+        @definition = definition
         @parent = parent
-        @definitions = definitions
-        @children = children
         @spreads = spreads
         @directives = directives
         @included = included
+        @typed_children = typed_children
+        @children = children
+        @definitions = definitions
       end
 
+      # @return [Hash{GraphQL::BaseType => Hash{String => Node}] Children for each type condition
+      attr_reader :typed_children
+
       # Note: by the time this gets out of the Rewrite phase, this will be empty -- it's emptied out when fragments are merged back in
       # @return [Array<GraphQL::InternalRepresentation::Node>] Fragment names that were spread in this node
       attr_reader :spreads
@@ -28,7 +33,9 @@ module GraphQL
       # @return [String] the name for this node's definition ({#name} may be a field's alias, this is always the name)
       attr_reader :definition_name
 
-      # A cache of type-field pairs for executing & analyzing this node
+      # A _shallow_ cache of type-field pairs for executing & analyzing this node.
+      #
+      # Known to be buggy: some fields are deeply merged when they shouldn't be.
       #
       # @example On-type from previous return value
       # {
@@ -44,9 +51,13 @@ module GraphQL
       #     }
       #   }
       # }
+      # @deprecated use {#typed_children} to find matching children, the use the node's {#definition}
       # @return [Hash<GraphQL::BaseType => GraphQL::Field>] definitions to use for each possible type
       attr_reader :definitions
 
+      # @return [GraphQL::Field, GraphQL::Directive] the static definition for this field (it might be an interface field definition even though an object field definition will be used at runtime)
+      attr_reader :definition
+
       # @return [String] the name to use for the result in the response hash
       attr_reader :name
 
@@ -56,7 +67,13 @@ module GraphQL
       # @return [GraphQL::BaseType]
       attr_reader :return_type
 
-      # @return [Array<GraphQL::Query::Node>]
+      # @return [GraphQL::BaseType]
+      attr_reader :owner_type
+
+      # Returns leaf selections on this node.
+      # Known to be buggy: deeply nested selections are not handled properly
+      # @deprecated use {#typed_children} instead
+      # @return [Array<Node>]
       attr_reader :children
 
       # @return [Boolean] false if every field for this node included `@skip(if: true)`
@@ -82,6 +99,7 @@ module GraphQL
       end
 
       def path
+        warn("InternalRepresentation::Node#path is deprecated, use Query::Context#path instead")
         if parent
           path = parent.path
           path << name
@@ -96,9 +114,13 @@ module GraphQL
 
       def inspect(indent = 0)
         own_indent = " " * indent
-        self_inspect = "#{own_indent}<Node #{name} #{skipped? ? "(skipped)" : ""}(#{definition_name}: {#{definitions.keys.join("|")}} -> #{return_type})>"
-        if children.any?
-          self_inspect << " {\n#{children.values.map { |n| n.inspect(indent + 2)}.join("\n")}\n#{own_indent}}"
+        self_inspect = "#{own_indent}<Node #{name} #{skipped? ? "(skipped)" : ""}(#{definition_name} -> #{return_type})>"
+        if typed_children.any?
+          self_inspect << " {"
+          typed_children.each do |type_defn, children|
+            self_inspect << "\n#{own_indent}  #{type_defn} => (#{children.keys.join(",")})"
+          end
+          self_inspect << "\n#{own_indent}}"
         end
         self_inspect
       end

data/lib/graphql/internal_representation/rewrite.rb

@@ -45,21 +45,20 @@ module GraphQL
         visitor[Nodes::Field].enter << ->(ast_node, prev_ast_node) {
           parent_node = @nodes.last
           node_name = ast_node.alias || ast_node.name
+          owner_type = context.parent_type_definition.unwrap
           # This node might not be novel, eg inside an inline fragment
-          # but it could contain new type information, which is captured below.
-          # (StaticValidation ensures that merging fields is fair game)
-          node = parent_node.children[node_name] ||= begin
-            Node.new(
-              return_type: context.type_definition && context.type_definition.unwrap,
-              ast_node: ast_node,
-              name: node_name,
-              definition_name: ast_node.name,
-              parent: parent_node,
-              included: false, # may be set to true on leaving the node
-            )
-          end
-          object_type = context.parent_type_definition.unwrap
-          node.definitions[object_type] = context.field_definition
+          node = parent_node.typed_children[owner_type][node_name] ||= Node.new(
+            return_type: context.type_definition && context.type_definition.unwrap,
+            ast_node: ast_node,
+            name: node_name,
+            definition_name: ast_node.name,
+            definition: context.field_definition,
+            parent: parent_node,
+            owner_type: owner_type,
+            included: false, # may be set to true on leaving the node
+          )
+          parent_node.children[node_name] ||= node
+          node.definitions[owner_type] = context.field_definition
           @nodes.push(node)
           @parent_directives.push([])
         }
@@ -75,6 +74,7 @@ module GraphQL
               name: ast_node.name,
               definition_name: ast_node.name,
               ast_node: ast_node,
+              definition: context.directive_definition,
               definitions: {context.directive_definition => context.directive_definition},
               # This isn't used, the directive may have many parents in the case of inline fragment
               parent: nil,
@@ -176,8 +176,10 @@ module GraphQL
       # Merge the children from `fragment_node` into `parent_node`.
       # This is an implementation of "fragment inlining"
       def deep_merge(parent_node, fragment_node, included)
-        fragment_node.children.each do |name, child_node|
-          deep_merge_child(parent_node, name, child_node, included)
+        fragment_node.typed_children.each do |type_defn, children|
+          children.each do |name, child_node|
+            deep_merge_child(parent_node, type_defn, name, child_node, included)
+          end
         end
       end
 
@@ -186,29 +188,27 @@ module GraphQL
       # - If the spread was included, first-level children should be included if _either_ node was included
       # - If the spread was _not_ included, first-level children should be included if _a pre-existing_ node was included
       #   (A copied node should be excluded)
-      def deep_merge_child(parent_node, name, node, extra_included)
-        child_node = parent_node.children[name]
+      def deep_merge_child(parent_node, type_defn, name, node, extra_included)
+        child_node = parent_node.typed_children[type_defn][name]
         previously_included = child_node.nil? ? false : child_node.included?
         next_included = extra_included ? (previously_included || node.included?) : previously_included
 
         if child_node.nil?
-          child_node = parent_node.children[name] = node.dup
+          child_node = parent_node.typed_children[type_defn][name] = node.dup
         end
 
-        child_node.definitions.merge!(node.definitions)
-
         child_node.included = next_included
 
-
-
-        node.children.each do |merge_child_name, merge_child_node|
-          deep_merge_child(child_node, merge_child_name, merge_child_node, node.included)
+        node.typed_children.each do |type_defn, children|
+          children.each do |merge_child_name, merge_child_node|
+            deep_merge_child(child_node, type_defn, merge_child_name, merge_child_node, node.included)
+          end
         end
       end
 
       # return true if node or _any_ children have a fragment spread
       def any_fragment_spreads?(node)
-        node.spreads.any? || node.children.any? { |name, node| any_fragment_spreads?(node) }
+        node.spreads.any? || node.typed_children.any? { |type_defn, children| children.any? { |name, node| any_fragment_spreads?(node) } }
       end
 
       # pop off own directives,

data/lib/graphql/internal_representation/selections.rb

@@ -0,0 +1,41 @@
+module GraphQL
+  module InternalRepresentation
+    module Selections
+      def self.build(query, nodes)
+        # { type => { name => nodes } }
+        selections = Hash.new { |h, k| h[k] = Hash.new { |h2, k2| h2[k2] = [] } }
+        object_types = Set.new
+
+        warden = query.warden
+        ctx = query.context
+
+        nodes.each do |node|
+          node.typed_children.each_key do |type_cond|
+            object_types.merge(warden.possible_types(type_cond))
+          end
+        end
+
+        nodes.each do |node|
+          node.typed_children.each do |type_cond, children|
+            object_types.each do |obj_type|
+              obj_selections = selections[obj_type]
+              skipped = []
+              if GraphQL::Execution::Typecast.compatible?(obj_type, type_cond, ctx)
+                children.each do |name, irep_node|
+                  if irep_node.skipped?
+                    skipped << name
+                  else
+                    obj_selections[name] << irep_node
+                  end
+                end
+              end
+              skipped.each { |k| obj_selections.delete(k) }
+            end
+          end
+        end
+
+        selections
+      end
+    end
+  end
+end

data/lib/graphql/introspection/input_value_type.rb

@@ -8,8 +8,12 @@ GraphQL::Introspection::InputValueType = GraphQL::ObjectType.define do
   field :type, !GraphQL::Introspection::TypeType
   field :defaultValue, types.String, "A GraphQL-formatted string representing the default value for this input value." do
     resolve ->(obj, args, ctx) {
-      value = obj.default_value
-      value.nil? ? nil : JSON.generate(obj.type.coerce_result(value), quirks_mode: true)
+      if obj.default_value?
+        value = obj.default_value
+        value.nil? ? 'null' : JSON.generate(obj.type.coerce_result(value), quirks_mode: true)
+      else
+        nil
+      end
     }
   end
 end

data/lib/graphql/language/generation.rb

@@ -26,6 +26,8 @@ module GraphQL
           out
         when Nodes::Enum
           "#{node.name}"
+        when Nodes::NullValue
+          "null"
         when Nodes::Field
           out = "#{indent}"
           out << "#{node.alias}: " if node.alias

data/lib/graphql/language/lexer.rl

@@ -109,6 +109,7 @@ module GraphQL
       # To avoid allocating more strings, this modifies the string passed into it
       def self.replace_escaped_characters_in_place(raw_string)
         raw_string.gsub!(ESCAPES, ESCAPES_REPLACE)
+        raw_string.gsub!(UTF_8, &UTF_8_REPLACE)
         nil
       end
 
@@ -177,6 +178,9 @@ module GraphQL
         "\\t" => "\t",
       }
 
+      UTF_8 = /\\u[\dAa-f]{4}/i
+      UTF_8_REPLACE = ->(m) { [m[-4..-1].to_i(16)].pack('U'.freeze) }
+
       def self.emit_string(ts, te, meta)
         value = meta[:data][ts...te].pack("c*").force_encoding("UTF-8")
         if value =~ /\\u|\\./ && value !~ ESCAPES

data/lib/graphql/language/nodes.rb

@@ -179,6 +179,9 @@ module GraphQL
       # An enum value. The string is available as {#name}.
       class Enum < NameOnlyNode; end
 
+      # A null value literal.
+      class NullValue < NameOnlyNode; end
+
       # A single selection in a GraphQL query.
       class Field < AbstractNode
         attr_accessor :name, :alias, :arguments, :directives, :selections

data/lib/graphql/language/parser.rb

@@ -12,7 +12,7 @@ module GraphQL
   module Language
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 344)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 346)
 
 def initialize(query_string)
   @query_string = query_string
@@ -94,44 +94,31 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    10,    11,    12,   138,    81,   138,   212,   138,   212,   138,
-   138,    32,    53,    37,    38,    39,    40,    41,    42,    43,
+    10,    11,    12,   128,   100,    78,   138,   138,    77,   138,
+    81,    78,    53,    37,    38,    39,    40,    41,    42,    43,
     44,    45,    46,    47,    48,    49,    50,    10,    11,    12,
-    81,    60,    81,    81,    78,    63,   138,    77,   180,    74,
+    81,    81,    60,    81,   138,   138,   136,   214,   214,    74,
     37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-    47,    48,    49,    50,    10,    11,    12,    70,    60,    10,
-    11,    12,   128,   100,    71,    73,    85,    83,    38,    39,
+    47,    48,    49,    50,    10,    11,    12,    78,    13,    60,
+    10,    11,    12,   138,    13,   182,   125,    83,    38,    39,
     40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-    50,    10,    11,    12,    81,    81,   175,    91,    81,   176,
-   213,    81,   177,    81,   152,    38,    39,    40,    41,    42,
+    50,    10,    11,    12,   162,    81,   177,   163,    81,   178,
+   215,   124,   179,    13,   152,    38,    39,    40,    41,    42,
     43,    44,    45,    46,   150,   151,   169,   170,   166,   167,
-   168,    10,    11,    12,    81,    81,   175,   100,    81,   176,
-    81,    81,   177,    13,   152,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,   150,   151,   169,   170,   166,   167,
-   168,    10,    11,    12,   117,    81,   175,   121,   122,   176,
-   199,   123,   177,   124,   152,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,   150,   151,   169,   170,   166,   167,
-   168,    10,    11,    12,   125,    13,   175,    13,    78,   176,
-   136,    78,   177,   143,   152,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,   150,   151,   169,   170,   166,   167,
-   168,    10,    11,    12,   162,   163,   175,    81,    13,   176,
-    13,   125,   177,   186,   152,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,   150,   151,   169,   170,   166,   167,
-   168,    10,    11,    12,    81,   190,    13,   207,   210,   112,
-   217,   nil,   nil,   nil,    37,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,    47,    48,    49,    50,    10,    11,
-    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-    46,    47,    48,    49,    50,    10,    11,    12,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   185,    37,    38,
-    39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
-    49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
-   112,   nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,
-    42,    43,    44,    45,    46,    47,    48,    49,    50,    10,
-    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    37,    38,    39,    40,    41,    42,    43,    44,
-    45,    46,    47,    48,    49,    50,    10,    11,    12,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,
+   168,   176,    10,    11,    12,   123,    13,   177,   122,   125,
+   178,   201,   121,   179,   188,   152,    38,    39,    40,    41,
+    42,    43,    44,    45,    46,   150,   151,   169,   170,   166,
+   167,   168,   176,    10,    11,    12,   143,    81,   177,   192,
+   117,   178,    13,    81,   179,    81,   152,    38,    39,    40,
+    41,    42,    43,    44,    45,    46,   150,   151,   169,   170,
+   166,   167,   168,   176,    10,    11,    12,    13,    81,   177,
+   100,    81,   178,    81,   209,   179,    81,   152,    38,    39,
+    40,    41,    42,    43,    44,    45,    46,   150,   151,   169,
+   170,   166,   167,   168,   176,    10,    11,    12,    81,   212,
+   177,    81,    91,   178,    81,   219,   179,    85,   152,    38,
+    39,    40,    41,    42,    43,    44,    45,    46,   150,   151,
+   169,   170,   166,   167,   168,   176,    10,    11,    12,    73,
+    71,    70,    63,    32,    81,   nil,   nil,   nil,   nil,    37,
     38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
     48,    49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,
@@ -144,7 +131,7 @@ racc_action_table = [
     47,    48,    49,    50,    10,    11,    12,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,
     40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-    50,    10,    11,    12,   nil,   103,   nil,   nil,   nil,   nil,
+    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,    42,
     43,    44,    45,    46,    47,    48,    49,    50,    10,    11,
     12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
@@ -153,7 +140,7 @@ racc_action_table = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,
     39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
     49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
-   112,   nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,
+   nil,   nil,   nil,   nil,   nil,   nil,    38,    39,    40,    41,
     42,    43,    44,    45,    46,    47,    48,    49,    50,    10,
     11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    37,    38,    39,    40,    41,    42,    43,    44,
@@ -161,12 +148,12 @@ racc_action_table = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,
     38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
     48,    49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,
+   nil,   112,   nil,   nil,   nil,   nil,    37,    38,    39,    40,
     41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   112,   nil,
    nil,   nil,   nil,    37,    38,    39,    40,    41,    42,    43,
     44,    45,    46,    47,    48,    49,    50,    10,    11,    12,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   217,
     37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
     47,    48,    49,    50,    10,    11,    12,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,
@@ -174,42 +161,42 @@ racc_action_table = [
     50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,    42,
     43,    44,    45,    46,    47,    48,    49,    50,    10,    11,
-    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    12,   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,   nil,
    nil,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-    46,    47,    48,    49,    50,    10,    11,    12,   nil,   134,
+    46,    47,    48,    49,    50,    10,    11,    12,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,
     39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
     49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    38,    39,    40,    41,
+   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,
     42,    43,    44,    45,    46,    47,    48,    49,    50,    10,
-    11,    12,   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,
+    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    37,    38,    39,    40,    41,    42,    43,    44,
     45,    46,    47,    48,    49,    50,    10,    11,    12,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   204,    37,
     38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-    48,    49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   192,    37,    38,    39,    40,
+    48,    49,    50,    10,    11,    12,   nil,   134,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,
     41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-    10,    11,    12,   nil,   193,   nil,   nil,   nil,   nil,   nil,
+    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,    37,    38,    39,    40,    41,    42,    43,
     44,    45,    46,    47,    48,    49,    50,    10,    11,    12,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
     37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-    47,    48,    49,    50,    10,    11,    12,   nil,   nil,   nil,
-   nil,   nil,   112,   nil,   nil,   nil,   nil,    37,    38,    39,
+    47,    48,    49,    50,    10,    11,    12,   nil,   103,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,
     40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,
+    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   112,
    nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,    42,
     43,    44,    45,    46,    47,    48,    49,    50,    10,    11,
     12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   202,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+   nil,    37,    38,    39,    40,    41,    42,    43,    44,    45,
     46,    47,    48,    49,    50,    10,    11,    12,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   206,    37,    38,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,
     39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
     49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,
+   112,   nil,   nil,   nil,   nil,    37,    38,    39,    40,    41,
     42,    43,    44,    45,    46,    47,    48,    49,    50,    10,
-    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    11,    12,   nil,   195,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,    37,    38,    39,    40,    41,    42,    43,    44,
     45,    46,    47,    48,    49,    50,    10,    11,    12,   nil,
    nil,   nil,   nil,   nil,   112,   nil,   nil,   nil,   nil,    37,
@@ -218,412 +205,429 @@ racc_action_table = [
    nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,    40,
     41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
     10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   215,    37,    38,    39,    40,    41,    42,    43,
+   nil,   nil,   194,    37,    38,    39,    40,    41,    42,    43,
     44,    45,    46,    47,    48,    49,    50,    10,    11,    12,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+    47,    48,    49,    50,    10,    11,    12,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,    38,    39,
+    40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   187,    37,    38,    39,    40,    41,    42,
+    43,    44,    45,    46,    47,    48,    49,    50,    10,    11,
+    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+    46,    47,    48,    49,    50,    10,    11,    12,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   208,    37,    38,
+    39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+    49,    50,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   191,   152,    38,    39,    40,    41,
+    42,    43,    44,    45,    46,   150,   151,    10,    11,    12,
    nil,   nil,    10,    11,    12,   nil,   nil,   nil,    13,   nil,
    nil,    18,    25,    26,   115,    27,    28,    29,    30,    31,
    nil,    14,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   152,    38,    39,    40,    41,
     42,    43,    44,    45,    46,   150,   151,    10,    11,    12,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   189,
-   152,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-   150,   151,    10,    11,    12,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    13,   nil,   nil,    18,    25,    26,   nil,
-    27,    28,    29,    30,    31,   nil,    14 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,
+   nil,    18,    25,    26,   nil,    27,    28,    29,    30,    31,
+   nil,    14 ]
 
 racc_action_check = [
-    13,    13,    13,   196,   219,   209,   196,   111,   209,   218,
-   114,     1,    13,    13,    13,    13,    13,    13,    13,    13,
+    13,    13,    13,    98,    98,    59,   111,   114,    59,   220,
+   155,   108,    13,    13,    13,    13,    13,    13,    13,    13,
     13,    13,    13,    13,    13,    13,    13,    54,    54,    54,
-   111,    13,   218,   114,    59,    18,   140,    59,   140,    54,
+   111,   114,    13,   220,   211,   198,   106,   211,   198,    54,
     54,    54,    54,    54,    54,    54,    54,    54,    54,    54,
-    54,    54,    54,    54,    60,    60,    60,    31,    54,    63,
-    63,    63,    98,    98,    32,    34,    61,    60,    60,    60,
+    54,    54,    54,    54,    60,    60,    60,   102,   101,    54,
+    63,    63,    63,   140,    97,   140,    96,    60,    60,    60,
     60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-    60,   200,   200,   200,    60,    64,   200,    65,    66,   200,
-   200,    67,   200,    68,   200,   200,   200,   200,   200,   200,
-   200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-   200,   212,   212,   212,    69,    72,   212,    73,    76,   212,
-    79,    82,   212,    84,   212,   212,   212,   212,   212,   212,
-   212,   212,   212,   212,   212,   212,   212,   212,   212,   212,
-   212,   176,   176,   176,    88,    90,   176,    92,    93,   176,
-   176,    94,   176,    95,   176,   176,   176,   176,   176,   176,
-   176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
-   176,   136,   136,   136,    96,    97,   136,   101,   102,   136,
-   106,   108,   136,   118,   136,   136,   136,   136,   136,   136,
+    60,   202,   202,   202,   126,    60,   202,   130,   133,   202,
+   202,    95,   202,   139,   202,   202,   202,   202,   202,   202,
+   202,   202,   202,   202,   202,   202,   202,   202,   202,   202,
+   202,   202,   178,   178,   178,    94,   141,   178,    93,   145,
+   178,   178,    92,   178,   149,   178,   178,   178,   178,   178,
+   178,   178,   178,   178,   178,   178,   178,   178,   178,   178,
+   178,   178,   178,   136,   136,   136,   118,    90,   136,   158,
+    88,   136,    84,    82,   136,    79,   136,   136,   136,   136,
    136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-   136,   217,   217,   217,   126,   130,   217,   133,   139,   217,
-   141,   145,   217,   149,   217,   217,   217,   217,   217,   217,
-   217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-   217,    83,    83,    83,   155,   158,   164,   183,   194,    83,
-   205,   nil,   nil,   nil,    83,    83,    83,    83,    83,    83,
-    83,    83,    83,    83,    83,    83,    83,    83,   143,   143,
-   143,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-   143,   143,   143,   143,   143,   147,   147,   147,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   147,   147,   147,
-   147,   147,   147,   147,   147,   147,   147,   147,   147,   147,
-   147,   147,    85,    85,    85,   nil,   nil,   nil,   nil,   nil,
-    85,   nil,   nil,   nil,   nil,    85,    85,    85,    85,    85,
-    85,    85,    85,    85,    85,    85,    85,    85,    85,   117,
-   117,   117,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   117,   117,   117,   117,   117,   117,   117,   117,
-   117,   117,   117,   117,   117,   117,   120,   120,   120,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   120,
-   120,   120,   120,   120,   120,   120,   120,   120,   120,   120,
-   120,   120,   120,   121,   121,   121,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   121,   121,   121,   121,
-   121,   121,   121,   121,   121,   121,   121,   121,   121,   121,
-   122,   122,   122,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   122,   122,   122,   122,   122,   122,   122,
-   122,   122,   122,   122,   122,   122,   122,   124,   124,   124,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   124,   124,   124,   124,   124,   124,   124,   124,   124,   124,
-   124,   124,   124,   124,   125,   125,   125,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   125,   125,   125,
-   125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-   125,    78,    78,    78,   nil,    78,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    78,    78,    78,    78,    78,    78,
-    78,    78,    78,    78,    78,    78,    78,    78,    81,    81,
-    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    81,    81,    81,    81,    81,    81,    81,    81,    81,
-    81,    81,    81,    81,    81,    26,    26,    26,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,    26,
-    26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
-    26,    26,   207,   207,   207,   nil,   nil,   nil,   nil,   nil,
-   207,   nil,   nil,   nil,   nil,   207,   207,   207,   207,   207,
-   207,   207,   207,   207,   207,   207,   207,   207,   207,   210,
-   210,   210,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   210,   210,   210,   210,   210,   210,   210,   210,
-   210,   210,   210,   210,   210,   210,    27,    27,    27,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,
+   136,   136,   136,   136,   219,   219,   219,   164,    76,   219,
+    73,    72,   219,    69,   185,   219,    68,   219,   219,   219,
+   219,   219,   219,   219,   219,   219,   219,   219,   219,   219,
+   219,   219,   219,   219,   219,   214,   214,   214,    67,   196,
+   214,    66,    65,   214,    64,   207,   214,    61,   214,   214,
+   214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+   214,   214,   214,   214,   214,   214,   117,   117,   117,    34,
+    32,    31,    18,     1,   221,   nil,   nil,   nil,   nil,   117,
+   117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
+   117,   117,   117,    27,    27,    27,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    27,    27,    27,    27,
     27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
-    27,    27,    27,    28,    28,    28,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    28,    28,    28,    28,
-    28,    28,    28,    28,    28,    28,    28,    28,    28,    28,
-    29,    29,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    29,    29,    29,    29,    29,    29,    29,
-    29,    29,    29,    29,    29,    29,    29,    30,    30,    30,
+    28,    28,    28,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    28,    28,    28,    28,    28,    28,    28,
+    28,    28,    28,    28,    28,    28,    28,    29,    29,    29,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    29,    29,    29,    29,    29,    29,    29,    29,    29,    29,
+    29,    29,    29,    29,    30,    30,    30,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    30,    30,    30,
     30,    30,    30,    30,    30,    30,    30,    30,    30,    30,
-    30,    30,    30,    30,   100,   100,   100,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   100,   100,   100,
-   100,   100,   100,   100,   100,   100,   100,   100,   100,   100,
-   100,    70,    70,    70,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    70,    70,    70,    70,    70,    70,
-    70,    70,    70,    70,    70,    70,    70,    70,     8,     8,
-     8,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,     8,     8,     8,     8,     8,     8,     8,     8,     8,
-     8,     8,     8,     8,     8,   104,   104,   104,   nil,   104,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   104,   104,
-   104,   104,   104,   104,   104,   104,   104,   104,   104,   104,
-   104,   104,    14,    14,    14,   nil,   nil,   nil,   nil,   nil,
+    30,    25,    25,    25,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    25,    25,    25,    25,    25,    25,
+    25,    25,    25,    25,    25,    25,    25,    25,   212,   212,
+   212,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   212,   212,   212,   212,   212,   212,   212,   212,   212,
+   212,   212,   212,   212,   212,   122,   122,   122,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   122,   122,
+   122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+   122,   122,    14,    14,    14,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,    14,    14,    14,    14,
-    14,    14,    14,    14,    14,    14,    14,    14,    14,   112,
-   112,   112,   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,
-   nil,   nil,   112,   112,   112,   112,   112,   112,   112,   112,
-   112,   112,   112,   112,   112,   112,    77,    77,    77,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    77,
-    77,    77,    77,    77,    77,    77,    77,    77,    77,    77,
-    77,    77,    77,   160,   160,   160,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   160,   160,   160,   160,   160,
-   160,   160,   160,   160,   160,   160,   160,   160,   160,   160,
-   161,   161,   161,   nil,   161,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   161,   161,   161,   161,   161,   161,   161,
-   161,   161,   161,   161,   161,   161,   161,   162,   162,   162,
+    14,    14,    14,    14,    14,    14,    14,    14,    14,   124,
+   124,   124,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   124,   124,   124,   124,   124,   124,   124,   124,
+   124,   124,   124,   124,   124,   124,     8,     8,     8,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     8,
+     8,     8,     8,     8,     8,     8,     8,     8,     8,     8,
+     8,     8,     8,   209,   209,   209,   nil,   nil,   nil,   nil,
+   nil,   209,   nil,   nil,   nil,   nil,   209,   209,   209,   209,
+   209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
+   112,   112,   112,   nil,   nil,   nil,   nil,   nil,   112,   nil,
+   nil,   nil,   nil,   112,   112,   112,   112,   112,   112,   112,
+   112,   112,   112,   112,   112,   112,   112,   205,   205,   205,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   205,
+   205,   205,   205,   205,   205,   205,   205,   205,   205,   205,
+   205,   205,   205,   205,    26,    26,    26,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    26,    26,    26,
+    26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
+    26,   125,   125,   125,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   125,   125,   125,   125,   125,   125,
+   125,   125,   125,   125,   125,   125,   125,   125,   192,   192,
+   192,   nil,   nil,   nil,   nil,   nil,   192,   nil,   nil,   nil,
+   nil,   192,   192,   192,   192,   192,   192,   192,   192,   192,
+   192,   192,   192,   192,   192,   188,   188,   188,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   188,   188,
+   188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+   188,   188,   121,   121,   121,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   121,   121,   121,   121,   121,
+   121,   121,   121,   121,   121,   121,   121,   121,   121,    70,
+    70,    70,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    70,    70,    70,    70,    70,    70,    70,    70,
+    70,    70,    70,    70,    70,    70,   179,   179,   179,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   179,   179,
+   179,   179,   179,   179,   179,   179,   179,   179,   179,   179,
+   179,   179,   179,   104,   104,   104,   nil,   104,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   104,   104,   104,   104,
+   104,   104,   104,   104,   104,   104,   104,   104,   104,   104,
+   177,   177,   177,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   177,   177,   177,   177,   177,   177,   177,
+   177,   177,   177,   177,   177,   177,   177,    77,    77,    77,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    77,    77,    77,    77,    77,    77,    77,    77,    77,    77,
+    77,    77,    77,    77,    78,    78,    78,   nil,    78,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    78,    78,    78,
+    78,    78,    78,    78,    78,    78,    78,    78,    78,    78,
+    78,   163,   163,   163,   nil,   nil,   nil,   nil,   nil,   163,
+   nil,   nil,   nil,   nil,   163,   163,   163,   163,   163,   163,
+   163,   163,   163,   163,   163,   163,   163,   163,    81,    81,
+    81,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    81,    81,    81,    81,    81,    81,    81,    81,    81,
+    81,    81,    81,    81,    81,   162,   162,   162,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   162,   162,
    162,   162,   162,   162,   162,   162,   162,   162,   162,   162,
-   162,   162,   162,   162,   163,   163,   163,   nil,   nil,   nil,
-   nil,   nil,   163,   nil,   nil,   nil,   nil,   163,   163,   163,
-   163,   163,   163,   163,   163,   163,   163,   163,   163,   163,
-   163,   175,   175,   175,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   175,   175,   175,   175,   175,   175,
-   175,   175,   175,   175,   175,   175,   175,   175,   177,   177,
-   177,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
-   177,   177,   177,   177,   177,   182,   182,   182,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   182,   182,   182,
-   182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-   182,   182,    91,    91,    91,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    91,    91,    91,    91,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    91,   186,
-   186,   186,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   186,   186,   186,   186,   186,   186,   186,   186,
-   186,   186,   186,   186,   186,   186,   190,   190,   190,   nil,
-   nil,   nil,   nil,   nil,   190,   nil,   nil,   nil,   nil,   190,
-   190,   190,   190,   190,   190,   190,   190,   190,   190,   190,
-   190,   190,   190,    25,    25,    25,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    25,    25,    25,    25,
-    25,    25,    25,    25,    25,    25,    25,    25,    25,    25,
-   203,   203,   203,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   203,   203,   203,   203,   203,   203,   203,   203,
-   203,   203,   203,   203,   203,   203,   203,     0,     0,     0,
-   nil,   nil,    86,    86,    86,   nil,   nil,   nil,     0,   nil,
-   nil,     0,     0,     0,    86,     0,     0,     0,     0,     0,
-   nil,     0,   123,   123,   123,   nil,   nil,   nil,   nil,   nil,
+   162,   162,    83,    83,    83,   nil,   nil,   nil,   nil,   nil,
+    83,   nil,   nil,   nil,   nil,    83,    83,    83,    83,    83,
+    83,    83,    83,    83,    83,    83,    83,    83,    83,   161,
+   161,   161,   nil,   161,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   161,   161,   161,   161,   161,   161,   161,   161,
+   161,   161,   161,   161,   161,   161,    85,    85,    85,   nil,
+   nil,   nil,   nil,   nil,    85,   nil,   nil,   nil,   nil,    85,
+    85,    85,    85,    85,    85,    85,    85,    85,    85,    85,
+    85,    85,    85,   120,   120,   120,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   120,   120,   120,   120,
+   120,   120,   120,   120,   120,   120,   120,   120,   120,   120,
+   160,   160,   160,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   160,   160,   160,   160,   160,   160,   160,   160,
+   160,   160,   160,   160,   160,   160,   160,   100,   100,   100,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   100,   100,   100,   100,   100,   100,   100,   100,   100,   100,
+   100,   100,   100,   100,    91,    91,    91,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    91,    91,    91,
+    91,    91,    91,    91,    91,    91,    91,    91,    91,    91,
+    91,   147,   147,   147,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   147,   147,   147,   147,   147,   147,   147,
+   147,   147,   147,   147,   147,   147,   147,   147,   143,   143,
+   143,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   143,   143,   143,   143,   143,   143,   143,   143,   143,
+   143,   143,   143,   143,   143,   184,   184,   184,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   184,   184,   184,
+   184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
+   184,   184,   157,   157,   157,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   157,   157,   157,   157,   157,   157,
+   157,   157,   157,   157,   157,   157,   157,     3,     3,     3,
+   nil,   nil,    86,    86,    86,   nil,   nil,   nil,     3,   nil,
+   nil,     3,     3,     3,    86,     3,     3,     3,     3,     3,
+   nil,     3,   123,   123,   123,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   123,   123,   123,   123,   123,
-   123,   123,   123,   123,   123,   123,   123,   157,   157,   157,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   157,
-   157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-   157,   157,     3,     3,     3,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     3,   nil,   nil,     3,     3,     3,   nil,
-     3,     3,     3,     3,     3,   nil,     3 ]
+   123,   123,   123,   123,   123,   123,   123,     0,     0,     0,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     0,   nil,
+   nil,     0,     0,     0,   nil,     0,     0,     0,     0,     0,
+   nil,     0 ]
 
 racc_action_pointer = [
-  1255,    11,   nil,  1330,   nil,   nil,   nil,   nil,   796,   nil,
-   nil,   nil,   nil,    -2,   850,   nil,   nil,   nil,    22,   nil,
-   nil,   nil,   nil,   nil,   nil,  1201,   553,   634,   661,   688,
-   715,    25,    64,   nil,    60,   nil,   nil,   nil,   nil,   nil,
+  1335,   243,   nil,  1285,   nil,   nil,   nil,   nil,   504,   nil,
+   nil,   nil,   nil,    -2,   450,   nil,   nil,   nil,   229,   nil,
+   nil,   nil,   nil,   nil,   nil,   369,   612,   261,   288,   315,
+   342,   208,   240,   nil,   234,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,    29,
-    52,    51,   nil,    57,    53,    68,    56,    59,    61,    82,
-   769,   nil,    83,   110,   nil,   nil,    86,   904,   499,    88,
-   nil,   526,    89,   229,   110,   310,  1260,   nil,   136,   nil,
-   113,  1120,   134,   136,   138,   140,   169,   162,    56,   nil,
-   742,   164,   173,   nil,   823,   nil,   172,   nil,   176,   nil,
-   nil,    -2,   877,   nil,     1,   nil,   nil,   337,   170,   nil,
-   364,   391,   418,  1280,   445,   472,   189,   nil,   nil,   nil,
-   197,   nil,   nil,   175,   nil,   nil,   169,   nil,   nil,   195,
-    27,   197,   nil,   256,   nil,   206,   nil,   283,   nil,   179,
-   nil,   nil,   nil,   nil,   nil,   202,   nil,  1305,   227,   nil,
-   931,   958,   985,  1012,   223,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,  1039,   139,  1066,   nil,   nil,
-   nil,   nil,  1093,   229,   nil,   nil,  1147,   nil,   nil,   nil,
-  1174,   nil,   nil,   nil,   204,   nil,    -6,   nil,   nil,   nil,
-    79,   nil,   nil,  1228,   nil,   232,   nil,   580,   nil,    -4,
-   607,   nil,   109,   nil,   nil,   nil,   nil,   199,     0,   -28,
-   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   nil,    25,   nil,   nil,   nil,   nil,     0,
+    52,   202,   nil,    58,   181,   193,   178,   175,   153,   150,
+   747,   nil,   148,   173,   nil,   nil,   145,   855,   882,   122,
+   nil,   936,   120,   990,   139,  1044,  1290,   nil,   142,   nil,
+   114,  1152,   109,   106,   102,    78,    61,    51,    -3,   nil,
+  1125,    45,    52,   nil,   801,   nil,    28,   nil,     6,   nil,
+   nil,    -3,   558,   nil,    -2,   nil,   nil,   234,   133,   nil,
+  1071,   720,   423,  1310,   477,   639,    69,   nil,   nil,   nil,
+    79,   nil,   nil,    55,   nil,   nil,   141,   nil,   nil,    80,
+    54,   103,   nil,  1206,   nil,   114,   nil,  1179,   nil,    89,
+   nil,   nil,   nil,   nil,   nil,   -23,   nil,  1260,   141,   nil,
+  1098,  1017,   963,   909,   164,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   828,   110,   774,
+   nil,   nil,   nil,   nil,  1233,   176,   nil,   nil,   693,   nil,
+   nil,   nil,   666,   nil,   nil,   nil,   174,   nil,    26,   nil,
+   nil,   nil,    79,   nil,   nil,   585,   nil,   207,   nil,   531,
+   nil,    25,   396,   nil,   203,   nil,   nil,   nil,   nil,   172,
+     0,   211,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -134,  -134,    -1,    -2,    -3,    -5,    -6,    -7,   -13,    -9,
-   -10,   -11,   -12,  -134,   -98,  -100,  -101,  -102,  -134,  -107,
-  -108,  -109,  -110,  -111,  -112,  -134,  -134,  -134,  -134,  -134,
-  -134,  -134,  -134,    -4,   -15,   -14,   -36,   -37,   -38,   -39,
+  -136,  -136,    -1,    -2,    -3,    -5,    -6,    -7,   -13,    -9,
+   -10,   -11,   -12,  -136,  -100,  -102,  -103,  -104,  -136,  -109,
+  -110,  -111,  -112,  -113,  -114,  -136,  -136,  -136,  -136,  -136,
+  -136,  -136,  -136,    -4,   -15,   -14,   -36,   -37,   -38,   -39,
    -40,   -41,   -42,   -43,   -44,   -45,   -46,   -47,   -48,   -49,
-   -50,   -51,   -52,   -25,  -134,   -29,   -31,   -32,   -33,   -63,
-   -89,  -134,   -99,  -134,   -89,  -115,   -89,   -89,   -89,   -89,
-  -134,   225,   -89,  -134,   -26,   -30,   -89,  -134,  -134,   -90,
-   -91,  -134,   -89,  -134,  -134,  -134,  -134,  -104,  -134,  -113,
-   -89,  -134,  -134,  -134,  -134,  -134,  -120,  -134,  -134,   -17,
-  -134,   -27,   -63,   -64,  -134,   -66,  -134,   -92,   -63,   -94,
-   -20,   -89,  -134,   -96,   -89,  -103,  -105,  -134,  -134,   -58,
-  -116,  -134,  -134,  -134,  -134,  -134,  -134,    -8,   -16,   -18,
-  -134,   -28,   -34,   -89,   -65,   -67,  -134,   -93,   -21,  -134,
-  -134,  -134,  -106,  -134,   -59,  -120,  -123,  -134,  -126,  -128,
-   -53,   -54,   -55,   -56,   -57,   -89,   -61,  -134,  -134,  -118,
-  -134,  -134,  -134,  -134,   -27,   -68,   -69,   -70,   -71,   -72,
-   -73,   -74,   -75,   -76,   -77,  -134,  -134,  -134,   -88,   -95,
-   -22,   -97,  -134,  -134,  -124,  -125,  -134,   -60,   -62,  -129,
-  -134,  -119,  -130,  -121,  -131,  -132,   -23,   -35,   -78,   -79,
-  -134,   -81,   -83,  -134,   -85,  -134,  -114,  -134,  -127,   -23,
-  -134,   -19,  -134,   -80,   -82,   -84,   -86,  -134,   -89,   -89,
-  -133,   -24,   -87,  -122,  -117 ]
+   -50,   -51,   -52,   -25,  -136,   -29,   -31,   -32,   -33,   -63,
+   -91,  -136,  -101,  -136,   -91,  -117,   -91,   -91,   -91,   -91,
+  -136,   227,   -91,  -136,   -26,   -30,   -91,  -136,  -136,   -92,
+   -93,  -136,   -91,  -136,  -136,  -136,  -136,  -106,  -136,  -115,
+   -91,  -136,  -136,  -136,  -136,  -136,  -122,  -136,  -136,   -17,
+  -136,   -27,   -63,   -64,  -136,   -66,  -136,   -94,   -63,   -96,
+   -20,   -91,  -136,   -98,   -91,  -105,  -107,  -136,  -136,   -58,
+  -118,  -136,  -136,  -136,  -136,  -136,  -136,    -8,   -16,   -18,
+  -136,   -28,   -34,   -91,   -65,   -67,  -136,   -95,   -21,  -136,
+  -136,  -136,  -108,  -136,   -59,  -122,  -125,  -136,  -128,  -130,
+   -53,   -54,   -55,   -56,   -57,   -91,   -61,  -136,  -136,  -120,
+  -136,  -136,  -136,  -136,   -27,   -68,   -69,   -70,   -71,   -72,
+   -73,   -74,   -75,   -76,   -77,   -78,   -79,  -136,  -136,  -136,
+   -90,   -97,   -22,   -99,  -136,  -136,  -126,  -127,  -136,   -60,
+   -62,  -131,  -136,  -121,  -132,  -123,  -133,  -134,   -23,   -35,
+   -80,   -81,  -136,   -83,   -85,  -136,   -87,  -136,  -116,  -136,
+  -129,   -23,  -136,   -19,  -136,   -82,   -84,   -86,   -88,  -136,
+   -91,   -91,  -135,   -24,   -89,  -124,  -119 ]
 
 racc_goto_table = [
-     8,    62,   111,     8,   114,   132,   126,   211,    35,    76,
-   184,   165,    99,    59,   194,   156,    55,   147,   105,   154,
-   219,     4,   160,   161,    33,    64,    65,    66,    67,    68,
-    69,   140,   154,   155,    84,     2,   204,   129,    89,   182,
-    92,    93,    94,    95,   135,   184,    97,    82,   113,   188,
-   101,   201,   133,   154,    59,   183,   109,    75,   137,     3,
-    87,   127,   216,    88,   118,   131,    34,   155,   197,    72,
-    96,    98,   154,   191,   191,   214,    54,   102,   106,   120,
-   157,   108,   196,   116,   104,   139,    88,   221,   141,   200,
-   203,   119,   222,   107,    61,    86,   154,    90,   149,     1,
-   130,   nil,   nil,   179,   106,   181,   nil,   164,   154,   209,
-   nil,   nil,   nil,   154,   nil,   nil,   nil,   142,   nil,   nil,
-   144,   145,   148,   153,   158,   158,   218,   nil,   131,   187,
+     8,    62,   111,     8,   114,   154,   132,    55,    35,   165,
+   126,   155,    76,    59,    87,   186,   193,   193,   154,   113,
+   213,     1,   147,   156,    99,    64,    65,    66,    67,    68,
+    69,   140,   127,   221,    84,   104,   131,   116,    89,   154,
+    92,    93,    94,    95,   184,   155,    97,    82,    75,   129,
+   101,   203,   186,   105,    59,   133,   109,   190,   120,   185,
+   154,   137,     4,    88,   118,    33,   202,   206,   205,   199,
+    96,   160,   161,   157,   181,   216,   183,   102,   106,   135,
+   107,   108,   198,    61,   154,   139,    88,   223,   141,    86,
+    54,   119,   224,   218,    90,    98,   154,    72,    34,   131,
+   130,   154,     3,     2,   106,   149,   196,   164,   nil,   nil,
+   nil,   211,   nil,   nil,   nil,   nil,   nil,   142,   nil,   nil,
+   144,   145,   148,   153,   158,   158,   nil,   nil,   220,   189,
    nil,   nil,   nil,   nil,   nil,   nil,   153,   nil,   nil,   nil,
    nil,   nil,   nil,   145,   nil,   nil,   nil,   145,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   153,   nil,   nil,
-   158,   158,   195,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   198,   153,   205,   nil,   nil,
-   nil,   nil,   145,   nil,   nil,   nil,   208,   nil,   nil,   nil,
-   nil,   nil,   223,   224,   nil,   nil,   nil,   nil,   nil,   nil,
-   153,   nil,   nil,   205,   nil,   nil,   nil,   nil,   nil,   nil,
-   220,   nil,   153,   nil,   nil,   nil,   nil,   153 ]
+   158,   158,   197,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   200,   153,   207,
+   nil,   nil,   nil,   nil,   145,   nil,   nil,   nil,   210,   nil,
+   nil,   nil,   nil,   nil,   225,   226,   nil,   nil,   nil,   nil,
+   nil,   nil,   153,   nil,   nil,   207,   nil,   nil,   nil,   nil,
+   nil,   nil,   222,   nil,   153,   nil,   nil,   nil,   nil,   153 ]
 
 racc_goto_check = [
-     8,    26,    16,     8,    16,    20,    59,    17,    13,    25,
-    60,    18,    15,    13,    62,    30,    21,    56,    33,    27,
-    17,     4,    58,    58,     4,    13,    13,    13,    13,    13,
-    13,    16,    27,    28,    11,     2,    40,    15,    11,    56,
-    11,    11,    11,    11,    33,    60,    11,    26,    12,    30,
-    11,    18,    25,    27,    13,    59,    11,    21,    25,     3,
-    48,    12,    40,     8,    11,    12,     9,    28,    20,    10,
-    13,    14,    27,    57,    57,    18,    19,    13,    13,    29,
-    31,    13,    16,    48,    32,    11,     8,    18,    11,    38,
-    39,    13,    18,    42,    43,    47,    27,    55,    61,     1,
-    13,   nil,   nil,    12,    13,    12,   nil,    11,    27,    16,
-   nil,   nil,   nil,    27,   nil,   nil,   nil,    13,   nil,   nil,
-    13,    13,    13,     8,    13,    13,    16,   nil,    12,    11,
+     8,    26,    16,     8,    16,    27,    20,    21,    13,    18,
+    60,    28,    25,    13,    49,    61,    58,    58,    27,    12,
+    17,     1,    57,    30,    15,    13,    13,    13,    13,    13,
+    13,    16,    12,    17,    11,    32,    12,    49,    11,    27,
+    11,    11,    11,    11,    57,    28,    11,    26,    21,    15,
+    11,    18,    61,    33,    13,    25,    11,    30,    29,    60,
+    27,    25,     4,     8,    11,     4,    39,    41,    40,    20,
+    13,    59,    59,    31,    12,    18,    12,    13,    13,    33,
+    43,    13,    16,    44,    27,    11,     8,    18,    11,    48,
+    19,    13,    18,    41,    56,    14,    27,    10,     9,    12,
+    13,    27,     3,     2,    13,    62,    63,    11,   nil,   nil,
+   nil,    16,   nil,   nil,   nil,   nil,   nil,    13,   nil,   nil,
+    13,    13,    13,     8,    13,    13,   nil,   nil,    16,    11,
    nil,   nil,   nil,   nil,   nil,   nil,     8,   nil,   nil,   nil,
    nil,   nil,   nil,    13,   nil,   nil,   nil,    13,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,     8,   nil,   nil,
     13,    13,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    13,     8,    13,   nil,   nil,
-   nil,   nil,    13,   nil,   nil,   nil,    13,   nil,   nil,   nil,
-   nil,   nil,    11,    11,   nil,   nil,   nil,   nil,   nil,   nil,
-     8,   nil,   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,
-    13,   nil,     8,   nil,   nil,   nil,   nil,     8 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,     8,    13,
+   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,    13,   nil,
+   nil,   nil,   nil,   nil,    11,    11,   nil,   nil,   nil,   nil,
+   nil,   nil,     8,   nil,   nil,    13,   nil,   nil,   nil,   nil,
+   nil,   nil,    13,   nil,     8,   nil,   nil,   nil,   nil,     8 ]
 
 racc_goto_pointer = [
-   nil,    99,    35,    59,    21,   nil,   nil,   nil,     0,    58,
-    35,   -26,   -36,     0,    -2,   -61,   -81,  -189,  -125,    63,
-   -96,     3,   nil,   nil,   nil,   -50,   -13,  -104,   -90,   -12,
-  -108,   -43,     6,   -60,   nil,   nil,   nil,   nil,   -87,   -87,
-  -141,   nil,    14,    80,   nil,   nil,   nil,    32,    -3,   nil,
-   nil,   nil,   nil,   nil,   nil,    32,  -104,   -87,  -102,   -90,
-  -137,   -24,  -148 ]
+   nil,    21,   103,   102,    62,   nil,   nil,   nil,     0,    90,
+    63,   -26,   -65,     0,    22,   -49,   -81,  -178,  -127,    77,
+   -95,    -6,   nil,   nil,   nil,   -47,   -13,  -118,  -112,   -33,
+  -100,   -50,   -43,   -25,   nil,   nil,   nil,   nil,   nil,  -112,
+  -111,  -112,   nil,     1,    69,   nil,   nil,   nil,    26,   -49,
+   nil,   nil,   nil,   nil,   nil,   nil,    29,   -99,  -144,   -53,
+   -86,  -132,   -17,   -56 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,     5,     6,     7,    51,   nil,
    nil,   nil,     9,   110,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    56,    57,    58,   nil,    36,    52,   178,   nil,
-   nil,   nil,   nil,   nil,   171,   172,   173,   174,   nil,   nil,
-   nil,    79,    80,   nil,    15,    16,    17,   nil,   nil,    19,
-    20,    21,    22,    23,    24,   nil,   nil,   159,   nil,   nil,
-   146,   nil,   nil ]
+   nil,   nil,    56,    57,    58,   nil,    36,    52,   180,   nil,
+   nil,   nil,   nil,   nil,   171,   172,   173,   174,   175,   nil,
+   nil,   nil,    79,    80,   nil,    15,    16,    17,   nil,   nil,
+    19,    20,    21,    22,    23,    24,   nil,   nil,   159,   nil,
+   nil,   146,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 36, :_reduce_none,
-  1, 37, :_reduce_2,
-  1, 38, :_reduce_3,
-  2, 38, :_reduce_4,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  1, 39, :_reduce_none,
-  5, 40, :_reduce_8,
-  1, 40, :_reduce_9,
-  1, 43, :_reduce_none,
-  1, 43, :_reduce_none,
-  1, 43, :_reduce_none,
-  0, 44, :_reduce_13,
+  1, 37, :_reduce_none,
+  1, 38, :_reduce_2,
+  1, 39, :_reduce_3,
+  2, 39, :_reduce_4,
+  1, 40, :_reduce_none,
+  1, 40, :_reduce_none,
+  1, 40, :_reduce_none,
+  5, 41, :_reduce_8,
+  1, 41, :_reduce_9,
   1, 44, :_reduce_none,
-  0, 45, :_reduce_15,
-  3, 45, :_reduce_16,
-  1, 49, :_reduce_17,
-  2, 49, :_reduce_18,
-  5, 50, :_reduce_19,
-  1, 51, :_reduce_20,
-  2, 51, :_reduce_21,
-  3, 51, :_reduce_22,
-  0, 52, :_reduce_23,
-  2, 52, :_reduce_24,
-  2, 47, :_reduce_25,
-  3, 47, :_reduce_26,
-  0, 55, :_reduce_27,
-  1, 55, :_reduce_28,
-  1, 54, :_reduce_29,
-  2, 54, :_reduce_30,
-  1, 56, :_reduce_none,
-  1, 56, :_reduce_none,
-  1, 56, :_reduce_none,
-  4, 57, :_reduce_34,
-  6, 57, :_reduce_35,
-  1, 48, :_reduce_none,
-  1, 48, :_reduce_none,
-  1, 62, :_reduce_none,
-  1, 62, :_reduce_none,
-  1, 62, :_reduce_none,
+  1, 44, :_reduce_none,
+  1, 44, :_reduce_none,
+  0, 45, :_reduce_13,
+  1, 45, :_reduce_none,
+  0, 46, :_reduce_15,
+  3, 46, :_reduce_16,
+  1, 50, :_reduce_17,
+  2, 50, :_reduce_18,
+  5, 51, :_reduce_19,
+  1, 52, :_reduce_20,
+  2, 52, :_reduce_21,
+  3, 52, :_reduce_22,
+  0, 53, :_reduce_23,
+  2, 53, :_reduce_24,
+  2, 48, :_reduce_25,
+  3, 48, :_reduce_26,
+  0, 56, :_reduce_27,
+  1, 56, :_reduce_28,
+  1, 55, :_reduce_29,
+  2, 55, :_reduce_30,
+  1, 57, :_reduce_none,
+  1, 57, :_reduce_none,
+  1, 57, :_reduce_none,
+  4, 58, :_reduce_34,
+  6, 58, :_reduce_35,
+  1, 49, :_reduce_none,
+  1, 49, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
+  1, 63, :_reduce_none,
   1, 62, :_reduce_none,
   1, 62, :_reduce_none,
   1, 62, :_reduce_none,
   1, 62, :_reduce_none,
   1, 62, :_reduce_none,
   1, 62, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 61, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 63, :_reduce_none,
-  1, 64, :_reduce_58,
-  2, 64, :_reduce_59,
-  2, 65, :_reduce_60,
-  1, 66, :_reduce_61,
-  2, 66, :_reduce_62,
-  0, 60, :_reduce_63,
-  2, 60, :_reduce_64,
-  3, 60, :_reduce_65,
-  1, 67, :_reduce_66,
-  2, 67, :_reduce_67,
-  3, 68, :_reduce_68,
-  1, 53, :_reduce_69,
-  1, 53, :_reduce_70,
-  1, 53, :_reduce_71,
-  1, 53, :_reduce_72,
-  1, 53, :_reduce_73,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  1, 53, :_reduce_none,
-  2, 69, :_reduce_78,
-  2, 70, :_reduce_79,
-  3, 70, :_reduce_80,
-  1, 73, :_reduce_81,
-  2, 73, :_reduce_82,
-  2, 71, :_reduce_83,
-  3, 71, :_reduce_84,
-  1, 74, :_reduce_85,
-  2, 74, :_reduce_86,
-  3, 75, :_reduce_87,
-  1, 72, :_reduce_88,
-  0, 46, :_reduce_89,
-  1, 46, :_reduce_none,
-  1, 76, :_reduce_91,
-  2, 76, :_reduce_92,
-  3, 77, :_reduce_93,
-  3, 58, :_reduce_94,
-  5, 59, :_reduce_95,
+  1, 64, :_reduce_none,
+  1, 64, :_reduce_none,
+  1, 64, :_reduce_none,
+  1, 64, :_reduce_none,
+  1, 64, :_reduce_none,
+  1, 65, :_reduce_58,
+  2, 65, :_reduce_59,
+  2, 66, :_reduce_60,
+  1, 67, :_reduce_61,
+  2, 67, :_reduce_62,
+  0, 61, :_reduce_63,
+  2, 61, :_reduce_64,
+  3, 61, :_reduce_65,
+  1, 68, :_reduce_66,
+  2, 68, :_reduce_67,
+  3, 69, :_reduce_68,
+  1, 54, :_reduce_69,
+  1, 54, :_reduce_70,
+  1, 54, :_reduce_71,
+  1, 54, :_reduce_72,
+  1, 54, :_reduce_73,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 70, :_reduce_79,
+  2, 71, :_reduce_80,
+  2, 72, :_reduce_81,
+  3, 72, :_reduce_82,
+  1, 75, :_reduce_83,
+  2, 75, :_reduce_84,
+  2, 73, :_reduce_85,
+  3, 73, :_reduce_86,
+  1, 76, :_reduce_87,
+  2, 76, :_reduce_88,
+  3, 77, :_reduce_89,
+  1, 74, :_reduce_90,
+  0, 47, :_reduce_91,
+  1, 47, :_reduce_none,
+  1, 78, :_reduce_93,
+  2, 78, :_reduce_94,
+  3, 79, :_reduce_95,
   3, 59, :_reduce_96,
-  6, 41, :_reduce_97,
-  0, 78, :_reduce_98,
-  1, 78, :_reduce_none,
-  1, 42, :_reduce_none,
-  1, 42, :_reduce_none,
-  1, 42, :_reduce_none,
-  4, 79, :_reduce_103,
-  1, 82, :_reduce_none,
-  2, 82, :_reduce_105,
-  3, 83, :_reduce_106,
-  1, 80, :_reduce_none,
+  5, 60, :_reduce_97,
+  3, 60, :_reduce_98,
+  6, 42, :_reduce_99,
+  0, 80, :_reduce_100,
   1, 80, :_reduce_none,
-  1, 80, :_reduce_none,
-  1, 80, :_reduce_none,
-  1, 80, :_reduce_none,
-  1, 80, :_reduce_none,
-  3, 84, :_reduce_113,
-  7, 85, :_reduce_114,
-  0, 90, :_reduce_115,
-  2, 90, :_reduce_116,
-  5, 92, :_reduce_117,
-  1, 93, :_reduce_118,
-  2, 93, :_reduce_119,
-  0, 94, :_reduce_120,
-  3, 94, :_reduce_121,
-  5, 95, :_reduce_122,
-  1, 91, :_reduce_123,
-  2, 91, :_reduce_124,
-  6, 86, :_reduce_125,
-  1, 96, :_reduce_126,
-  3, 96, :_reduce_127,
-  5, 87, :_reduce_128,
-  6, 88, :_reduce_129,
-  6, 89, :_reduce_130,
-  6, 81, :_reduce_131,
-  1, 97, :_reduce_132,
-  3, 97, :_reduce_133 ]
-
-racc_reduce_n = 134
-
-racc_shift_n = 225
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  1, 43, :_reduce_none,
+  4, 81, :_reduce_105,
+  1, 84, :_reduce_none,
+  2, 84, :_reduce_107,
+  3, 85, :_reduce_108,
+  1, 82, :_reduce_none,
+  1, 82, :_reduce_none,
+  1, 82, :_reduce_none,
+  1, 82, :_reduce_none,
+  1, 82, :_reduce_none,
+  1, 82, :_reduce_none,
+  3, 86, :_reduce_115,
+  7, 87, :_reduce_116,
+  0, 92, :_reduce_117,
+  2, 92, :_reduce_118,
+  5, 94, :_reduce_119,
+  1, 95, :_reduce_120,
+  2, 95, :_reduce_121,
+  0, 96, :_reduce_122,
+  3, 96, :_reduce_123,
+  5, 97, :_reduce_124,
+  1, 93, :_reduce_125,
+  2, 93, :_reduce_126,
+  6, 88, :_reduce_127,
+  1, 98, :_reduce_128,
+  3, 98, :_reduce_129,
+  5, 89, :_reduce_130,
+  6, 90, :_reduce_131,
+  6, 91, :_reduce_132,
+  6, 83, :_reduce_133,
+  1, 99, :_reduce_134,
+  3, 99, :_reduce_135 ]
+
+racc_reduce_n = 136
+
+racc_shift_n = 227
 
 racc_token_table = {
   false => 0,
@@ -658,11 +662,12 @@ racc_token_table = {
   :FLOAT => 29,
   :INT => 30,
   :STRING => 31,
-  :DIR_SIGN => 32,
-  :ELLIPSIS => 33,
-  :PIPE => 34 }
+  :NULL => 32,
+  :DIR_SIGN => 33,
+  :ELLIPSIS => 34,
+  :PIPE => 35 }
 
-racc_nt_base = 35
+racc_nt_base = 36
 
 racc_use_result_var = true
 
@@ -715,6 +720,7 @@ Racc_token_to_s_table = [
   "FLOAT",
   "INT",
   "STRING",
+  "NULL",
   "DIR_SIGN",
   "ELLIPSIS",
   "PIPE",
@@ -752,6 +758,7 @@ Racc_token_to_s_table = [
   "enum_value_definitions",
   "arguments_list",
   "argument",
+  "null_value",
   "variable",
   "list_value",
   "object_value",
@@ -1183,122 +1190,131 @@ module_eval(<<'.,.,', 'parser.y', 173)
 
 # reduce 77 omitted
 
-module_eval(<<'.,.,', 'parser.y', 179)
-  def _reduce_78(val, _values, result)
+# reduce 78 omitted
+
+module_eval(<<'.,.,', 'parser.y', 180)
+  def _reduce_79(val, _values, result)
+     return make_node(:NullValue, name: val[0], position_source: val[0]) 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 181)
+  def _reduce_80(val, _values, result)
      return make_node(:VariableIdentifier, name: val[1], position_source: val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 182)
-  def _reduce_79(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 184)
+  def _reduce_81(val, _values, result)
      return [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 183)
-  def _reduce_80(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 185)
+  def _reduce_82(val, _values, result)
      return val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 186)
-  def _reduce_81(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 188)
+  def _reduce_83(val, _values, result)
      return [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 187)
-  def _reduce_82(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 189)
+  def _reduce_84(val, _values, result)
      val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 190)
-  def _reduce_83(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 192)
+  def _reduce_85(val, _values, result)
      return make_node(:InputObject, arguments: [], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 191)
-  def _reduce_84(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 193)
+  def _reduce_86(val, _values, result)
      return make_node(:InputObject, arguments: val[1], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 194)
-  def _reduce_85(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 196)
+  def _reduce_87(val, _values, result)
      return [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 195)
-  def _reduce_86(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 197)
+  def _reduce_88(val, _values, result)
      val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 198)
-  def _reduce_87(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 200)
+  def _reduce_89(val, _values, result)
      return make_node(:Argument, name: val[0], value: val[2], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 200)
-  def _reduce_88(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 202)
+  def _reduce_90(val, _values, result)
      return make_node(:Enum, name: val[0], position_source: val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 203)
-  def _reduce_89(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 205)
+  def _reduce_91(val, _values, result)
      return [] 
     result
   end
 .,.,
 
-# reduce 90 omitted
+# reduce 92 omitted
 
-module_eval(<<'.,.,', 'parser.y', 207)
-  def _reduce_91(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 209)
+  def _reduce_93(val, _values, result)
      return [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 208)
-  def _reduce_92(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 210)
+  def _reduce_94(val, _values, result)
      val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 210)
-  def _reduce_93(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 212)
+  def _reduce_95(val, _values, result)
      return make_node(:Directive, name: val[1], arguments: val[2], position_source: val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 213)
-  def _reduce_94(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 215)
+  def _reduce_96(val, _values, result)
      return make_node(:FragmentSpread, name: val[1], directives: val[2], position_source: val[0]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 217)
-  def _reduce_95(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 219)
+  def _reduce_97(val, _values, result)
             return make_node(:InlineFragment, {
           type: val[2],
           directives: val[3],
@@ -1310,8 +1326,8 @@ module_eval(<<'.,.,', 'parser.y', 217)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 225)
-  def _reduce_96(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 227)
+  def _reduce_98(val, _values, result)
             return make_node(:InlineFragment, {
           type: nil,
           directives: val[1],
@@ -1323,8 +1339,8 @@ module_eval(<<'.,.,', 'parser.y', 225)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 235)
-  def _reduce_97(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 237)
+  def _reduce_99(val, _values, result)
           return make_node(:FragmentDefinition, {
           name:       val[1],
           type:       val[3],
@@ -1338,48 +1354,44 @@ module_eval(<<'.,.,', 'parser.y', 235)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 246)
-  def _reduce_98(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 248)
+  def _reduce_100(val, _values, result)
      return nil 
     result
   end
 .,.,
 
-# reduce 99 omitted
-
-# reduce 100 omitted
-
 # reduce 101 omitted
 
 # reduce 102 omitted
 
-module_eval(<<'.,.,', 'parser.y', 255)
-  def _reduce_103(val, _values, result)
+# reduce 103 omitted
+
+# reduce 104 omitted
+
+module_eval(<<'.,.,', 'parser.y', 257)
+  def _reduce_105(val, _values, result)
      return make_node(:SchemaDefinition, val[2]) 
     result
   end
 .,.,
 
-# reduce 104 omitted
+# reduce 106 omitted
 
-module_eval(<<'.,.,', 'parser.y', 259)
-  def _reduce_105(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 261)
+  def _reduce_107(val, _values, result)
      return val[0].merge(val[1]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 262)
-  def _reduce_106(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 264)
+  def _reduce_108(val, _values, result)
      return { val[0].to_s.to_sym => val[2] } 
     result
   end
 .,.,
 
-# reduce 107 omitted
-
-# reduce 108 omitted
-
 # reduce 109 omitted
 
 # reduce 110 omitted
@@ -1388,156 +1400,160 @@ module_eval(<<'.,.,', 'parser.y', 262)
 
 # reduce 112 omitted
 
-module_eval(<<'.,.,', 'parser.y', 272)
-  def _reduce_113(val, _values, result)
+# reduce 113 omitted
+
+# reduce 114 omitted
+
+module_eval(<<'.,.,', 'parser.y', 274)
+  def _reduce_115(val, _values, result)
      return make_node(:ScalarTypeDefinition, name: val[1], directives: val[2], description: get_description(val[0])) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 276)
-  def _reduce_114(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 278)
+  def _reduce_116(val, _values, result)
             return make_node(:ObjectTypeDefinition, name: val[1], interfaces: val[2], directives: val[3], fields: val[5], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 280)
-  def _reduce_115(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 282)
+  def _reduce_117(val, _values, result)
      return [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 281)
-  def _reduce_116(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 283)
+  def _reduce_118(val, _values, result)
      return val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 285)
-  def _reduce_117(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 287)
+  def _reduce_119(val, _values, result)
             return make_node(:InputValueDefinition, name: val[0], type: val[2], default_value: val[3], directives: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 289)
-  def _reduce_118(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 291)
+  def _reduce_120(val, _values, result)
      return [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 290)
-  def _reduce_119(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 292)
+  def _reduce_121(val, _values, result)
      val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 293)
-  def _reduce_120(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 295)
+  def _reduce_122(val, _values, result)
      return [] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 294)
-  def _reduce_121(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 296)
+  def _reduce_123(val, _values, result)
      return val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 298)
-  def _reduce_122(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 300)
+  def _reduce_124(val, _values, result)
             return make_node(:FieldDefinition, name: val[0], arguments: val[1], type: val[3], directives: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 302)
-  def _reduce_123(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 304)
+  def _reduce_125(val, _values, result)
      return [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 303)
-  def _reduce_124(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 305)
+  def _reduce_126(val, _values, result)
      val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 307)
-  def _reduce_125(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 309)
+  def _reduce_127(val, _values, result)
             return make_node(:InterfaceTypeDefinition, name: val[1], directives: val[2], fields: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 311)
-  def _reduce_126(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 313)
+  def _reduce_128(val, _values, result)
      return [make_node(:TypeName, name: val[0])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 312)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 314)
+  def _reduce_129(val, _values, result)
      val[0] << make_node(:TypeName, name: val[2]) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 316)
-  def _reduce_128(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 318)
+  def _reduce_130(val, _values, result)
             return make_node(:UnionTypeDefinition, name: val[1], directives: val[2], types: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 321)
-  def _reduce_129(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 323)
+  def _reduce_131(val, _values, result)
              return make_node(:EnumTypeDefinition, name: val[1], directives: val[2], values: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 326)
-  def _reduce_130(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 328)
+  def _reduce_132(val, _values, result)
             return make_node(:InputObjectTypeDefinition, name: val[1], directives: val[2], fields: val[4], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 331)
-  def _reduce_131(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 333)
+  def _reduce_133(val, _values, result)
             return make_node(:DirectiveDefinition, name: val[2], arguments: val[3], locations: val[5], description: get_description(val[0]))
       
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 335)
-  def _reduce_132(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 337)
+  def _reduce_134(val, _values, result)
      return [val[0].to_s] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 336)
-  def _reduce_133(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 338)
+  def _reduce_135(val, _values, result)
      val[0] << val[2].to_s 
     result
   end