graphql 1.13.12 → 2.0.21

data/lib/graphql/language/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
+# This file is automatically generated by Racc 1.6.2
 # from Racc grammar file "".
 #
 
@@ -12,26 +12,26 @@ module GraphQL
   module Language
     class Parser < Racc::Parser
 
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 444)
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 452)
 
 EMPTY_ARRAY = [].freeze
 
-def initialize(query_string, filename:, tracer: Tracing::NullTracer)
+def initialize(query_string, filename:, trace: Tracing::NullTrace)
   raise GraphQL::ParseError.new("No query string was present", nil, nil, query_string) if query_string.nil?
   @query_string = query_string
   @filename = filename
-  @tracer = tracer
+  @trace = trace
   @reused_next_token = [nil, nil]
 end
 
 def parse_document
   @document ||= begin
     # Break the string into tokens
-    @tracer.trace("lex", {query_string: @query_string}) do
-      @tokens ||= GraphQL.scan(@query_string)
+    @trace.lex(query_string: @query_string) do
+      @tokens ||= GraphQL::Language::Lexer.tokenize(@query_string)
     end
     # From the tokens, build an AST
-    @tracer.trace("parse", {query_string: @query_string}) do
+    @trace.parse(query_string: @query_string) do
       if @tokens.empty?
         raise GraphQL::ParseError.new("Unexpected end of document", nil, nil, @query_string)
       else
@@ -44,17 +44,17 @@ end
 class << self
   attr_accessor :cache
 
-  def parse(query_string, filename: nil, tracer: GraphQL::Tracing::NullTracer)
-    new(query_string, filename: filename, tracer: tracer).parse_document
+  def parse(query_string, filename: nil, trace: GraphQL::Tracing::NullTrace)
+    new(query_string, filename: filename, trace: trace).parse_document
   end
 
-  def parse_file(filename, tracer: GraphQL::Tracing::NullTracer)
+  def parse_file(filename, trace: GraphQL::Tracing::NullTrace)
     if cache
       cache.fetch(filename) do
-        parse(File.read(filename), filename: filename, tracer: tracer)
+        parse(File.read(filename), filename: filename, trace: trace)
       end
     else
-      parse(File.read(filename), filename: filename, tracer: tracer)
+      parse(File.read(filename), filename: filename, trace: trace)
     end
   end
 end
@@ -66,7 +66,7 @@ def next_token
   if lexer_token.nil?
     nil
   else
-    @reused_next_token[0] = lexer_token.name
+    @reused_next_token[0] = lexer_token[0]
     @reused_next_token[1] = lexer_token
     @reused_next_token
   end
@@ -77,13 +77,13 @@ def get_description(token)
 
   loop do
     prev_token = token
-    token = token.prev_token
+    token = token[4]
 
     break if token.nil?
-    break if token.name != :COMMENT
-    break if prev_token.line != token.line + 1
+    break if token[0] != :COMMENT
+    break if prev_token[1] != token[1] + 1
 
-    comments.unshift(token.to_s.sub(/^#\s*/, ""))
+    comments.unshift(token[3].sub(/^#\s*/, ""))
   end
 
   return nil if comments.empty?
@@ -99,11 +99,12 @@ def on_error(parser_token_id, lexer_token, vstack)
     if parser_token_name.nil?
       raise GraphQL::ParseError.new("Parse Error on unknown token: {token_id: #{parser_token_id}, lexer_token: #{lexer_token}} from #{@query_string}", nil, nil, @query_string, filename: @filename)
     else
-      line, col = lexer_token.line_and_column
-      if lexer_token.name == :BAD_UNICODE_ESCAPE
-        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+      line = lexer_token[1]
+      col = lexer_token[2]
+      if lexer_token[0] == :BAD_UNICODE_ESCAPE
+        raise GraphQL::ParseError.new("Parse error on bad Unicode escape sequence: #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       else
-        raise GraphQL::ParseError.new("Parse error on #{lexer_token.to_s.inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
+        raise GraphQL::ParseError.new("Parse error on #{lexer_token[3].inspect} (#{parser_token_name}) at [#{line}, #{col}]", line, col, @query_string, filename: @filename)
       end
     end
   end
@@ -111,8 +112,8 @@ end
 
 def make_node(node_name, assigns)
   assigns.each do |key, value|
-    if key != :position_source && value.is_a?(GraphQL::Language::Token)
-      assigns[key] = value.to_s
+    if key != :position_source && value.is_a?(Array) && value[0].is_a?(Symbol)
+      assigns[key] = value[3]
     end
   end
 
@@ -124,65 +125,65 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    -2,  -168,    11,   284,    12,    13,    14,    11,  -101,    12,
-    13,    14,    95,   267,  -168,    94,    19,    38,    74,    75,
-    76,    19,    77,    78,    79,    80,    15,    35,   161,   121,
-    35,    15,    35,    12,    13,    14,    28,    35,   179,  -168,
+    -2,  -172,    11,   282,    12,    13,    14,    11,  -101,    12,
+    13,    14,    95,   270,   276,    94,    19,    38,    74,    75,
+    76,    19,    77,    78,    79,    80,    15,    35,   162,   122,
+    35,    15,    35,    12,    13,    14,    28,    35,   181,   277,
     72,    28,    35,    35,    43,    44,    45,    46,    47,    48,
     49,    50,    51,    52,    53,    54,    55,    56,    57,    61,
-    12,    13,    14,  -101,  -101,  -101,   182,    72,    35,    88,
-  -154,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+    12,    13,    14,  -101,  -101,   280,   184,    72,    35,    88,
+  -156,    43,    44,    45,    46,    47,    48,    49,    50,    51,
     52,    53,    54,    55,    56,    57,    91,    12,    13,    14,
-  -101,    67,   276,    90,   277,    72,    72,    72,    43,    44,
+   281,    67,    90,    99,    35,    72,    72,  -101,    43,    44,
     45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-    55,    56,    57,   226,    12,    13,    14,  -168,    67,  -168,
-   282,    35,    72,    35,  -101,    43,    44,    45,    46,    47,
+    55,    56,    57,   228,    12,    13,    14,    72,    67,    35,
+   176,    12,    13,    14,    72,    43,    44,    45,    46,    47,
     48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    12,    13,    14,   283,    72,    67,    35,    99,    35,    35,
-    72,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-    52,    53,    54,    55,    56,    57,   222,   102,    12,    13,
-    14,    67,    35,   220,   298,   299,   221,   303,   304,   203,
-    44,    45,    46,    47,    48,    49,    50,    51,    52,   200,
-   201,   202,   210,   211,   207,   208,   209,   219,   222,    72,
-    12,    13,    14,    35,    35,   220,    35,    35,   221,   258,
-   117,   203,    44,    45,    46,    47,    48,    49,    50,    51,
-    52,   200,   201,   202,   210,   211,   207,   208,   209,   219,
-   222,    72,    12,    13,    14,   121,    72,   220,    72,   132,
-   221,   288,    95,   203,    44,    45,    46,    47,    48,    49,
-    50,    51,    52,   200,   201,   202,   210,   211,   207,   208,
-   209,   219,   308,   139,    12,    13,    14,   175,    12,    13,
-    14,    72,   221,   143,   143,   203,    44,    45,    46,    47,
-    48,    49,    50,    51,    52,   200,   201,   202,   210,   211,
-   207,   208,   209,   219,   222,    72,    12,    13,    14,    72,
-    72,   220,    72,   143,   221,   143,    72,   203,    44,    45,
-    46,    47,    48,    49,    50,    51,    52,   200,   201,   202,
-   210,   211,   207,   208,   209,   219,   222,    72,    12,    13,
-    14,    72,   132,   220,   132,    95,   221,   169,   170,   203,
-    44,    45,    46,    47,    48,    49,    50,    51,    52,   200,
-   201,   202,   210,   211,   207,   208,   209,   219,   308,    72,
-    12,    13,    14,   229,    12,    13,    14,    72,   221,   177,
-    72,   203,    44,    45,    46,    47,    48,    49,    50,    51,
-    52,   200,   201,   202,   210,   211,   207,   208,   209,   219,
-    12,    13,    14,    81,    82,    72,    83,    84,    85,    86,
-    87,    97,    44,    45,    46,    47,    48,    49,    50,    51,
-    52,    53,    54,    55,    56,    57,   261,    12,    13,    14,
-    72,    12,    13,    14,    12,    13,    14,    72,    43,    44,
+    12,    13,    14,    81,    82,    67,    83,    84,    85,    86,
+    87,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+    52,    53,    54,    55,    56,    57,   224,   103,    12,    13,
+    14,    67,    72,   222,   118,    72,   223,   122,    72,   205,
+    44,    45,    46,    47,    48,    49,    50,    51,    52,   202,
+   203,   204,   212,   213,   209,   210,   211,   221,   224,    72,
+    12,    13,    14,   133,    95,   222,   140,    72,   223,   260,
+   144,   205,    44,    45,    46,    47,    48,    49,    50,    51,
+    52,   202,   203,   204,   212,   213,   209,   210,   211,   221,
+   224,   144,    12,    13,    14,    72,    72,   222,    72,    72,
+   223,   286,   144,   205,    44,    45,    46,    47,    48,    49,
+    50,    51,    52,   202,   203,   204,   212,   213,   209,   210,
+   211,   221,   302,   144,    12,    13,    14,   231,    12,    13,
+    14,    72,   223,    72,    72,   205,    44,    45,    46,    47,
+    48,    49,    50,    51,    52,   202,   203,   204,   212,   213,
+   209,   210,   211,   221,   224,   133,    12,    13,    14,   133,
+    95,   222,   170,   171,   223,    72,    72,   205,    44,    45,
+    46,    47,    48,    49,    50,    51,    52,   202,   203,   204,
+   212,   213,   209,   210,   211,   221,   224,   178,    12,    13,
+    14,    72,    72,   222,    72,  -156,   223,   190,   191,   205,
+    44,    45,    46,    47,    48,    49,    50,    51,    52,   202,
+   203,   204,   212,   213,   209,   210,   211,   221,   302,   192,
+    12,    13,    14,    12,    13,    14,    72,    72,   223,   195,
+   196,   205,    44,    45,    46,    47,    48,    49,    50,    51,
+    52,   202,   203,   204,   212,   213,   209,   210,   211,   221,
+    12,    13,    14,    12,    13,    14,   197,   198,   200,    72,
+   226,    97,    44,    45,    46,    47,    48,    49,    50,    51,
+    52,    53,    54,    55,    56,    57,   263,    12,    13,    14,
+    72,   133,   133,    72,   181,   238,    72,   181,    43,    44,
     45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-    55,    56,    57,   290,    12,    13,    14,  -154,   188,   189,
-   190,    72,    72,   193,   194,    43,    44,    45,    46,    47,
+    55,    56,    57,   288,    12,    13,    14,    35,    35,   181,
+   181,    35,    35,    35,   256,    43,    44,    45,    46,    47,
     48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-   294,    12,    13,    14,   195,   196,   198,    72,   224,   132,
-   132,   233,    43,    44,    45,    46,    47,    48,    49,    50,
-    51,    52,    53,    54,    55,    56,    57,   316,    12,    13,
-    14,   236,   238,    35,    35,   247,   248,    35,    35,    43,
+   292,    12,    13,    14,   133,   238,   273,   273,   283,   285,
+   291,   198,    43,    44,    45,    46,    47,    48,    49,    50,
+    51,    52,    53,    54,    55,    56,    57,   310,    12,    13,
+    14,    72,   298,   303,   306,   307,   309,   285,    72,    43,
     44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
-    54,    55,    56,    57,    12,    13,    14,    35,   254,   132,
-   236,   273,   273,   285,   287,    43,    44,    45,    46,    47,
+    54,    55,    56,    57,    12,    13,    14,    72,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    43,    44,    45,    46,    47,
     48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    12,    13,    14,   293,   196,    72,   302,   309,   312,   313,
-   315,   287,    44,    45,    46,    47,    48,    49,    50,    51,
-    52,    53,    54,    55,    56,    57,    12,    13,    14,    72,
-    72,   nil,   nil,   nil,   nil,   nil,   nil,    43,    44,    45,
+    12,    13,    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    44,    45,    46,    47,    48,    49,    50,    51,
+    52,    53,    54,    55,    56,    57,    12,    13,    14,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    44,    45,
     46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
     56,    57,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
@@ -221,20 +222,20 @@ racc_action_table = [
     12,    13,    14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,    43,    44,    45,    46,    47,    48,    49,    50,    51,
     52,    53,    54,    55,    56,    57,    12,    13,    14,   nil,
-   nil,   nil,   nil,   nil,   130,   nil,   nil,    43,    44,    45,
+   nil,   nil,   nil,   nil,   131,   nil,   nil,    43,    44,    45,
     46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
     56,    57,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,
-   130,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
+   131,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
     50,    51,    52,    53,    54,    55,    56,    57,    12,    13,
     14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,
     44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
     54,    55,    56,    57,    12,    13,    14,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,    43,    44,    45,    46,    47,
     48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    12,    13,    14,   nil,   167,   nil,   nil,   nil,   nil,   nil,
+    12,    13,    14,   nil,   168,   nil,   nil,   nil,   nil,   nil,
    nil,    43,    44,    45,    46,    47,    48,    49,    50,    51,
     52,    53,    54,    55,    56,    57,    12,    13,    14,   nil,
-   nil,   nil,   nil,   nil,   130,   nil,   nil,    43,    44,    45,
+   nil,   nil,   nil,   nil,   131,   nil,   nil,    43,    44,    45,
     46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
     56,    57,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
@@ -250,7 +251,7 @@ racc_action_table = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    44,    45,
     46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
     56,    57,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,
-   130,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
+   131,   nil,   nil,    43,    44,    45,    46,    47,    48,    49,
     50,    51,    52,    53,    54,    55,    56,    57,    12,    13,
     14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,
     44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
@@ -268,79 +269,79 @@ racc_action_table = [
     14,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,
     44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
     54,    55,    56,    57,    12,    13,    14,   nil,   nil,   nil,
-   nil,   nil,   130,   nil,   nil,    43,    44,    45,    46,    47,
+   nil,   nil,   131,   nil,   nil,    43,    44,    45,    46,    47,
     48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-    12,    13,    14,   nil,   nil,   nil,   nil,   nil,   130,   nil,
+    12,    13,    14,   nil,   nil,   nil,   nil,   nil,   131,   nil,
    nil,    43,    44,    45,    46,    47,    48,    49,    50,    51,
     52,    53,    54,    55,    56,    57,    12,    13,    14,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    44,    45,
     46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
     56,    57,    12,    13,    14,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   203,    44,    45,    46,    47,    48,    49,
-    50,    51,    52,   200,   201,   202,  -160,   nil,   nil,   nil,
-  -160,   nil,   nil,   nil,   nil,   nil,  -160,   nil,  -160,  -160,
-  -160 ]
+   nil,   nil,   nil,   205,    44,    45,    46,    47,    48,    49,
+    50,    51,    52,   202,   203,   204,  -162,   nil,   nil,   nil,
+  -162,   nil,   nil,   nil,   nil,   nil,  -162,   nil,  -162,  -162,
+  -162 ]
 
 racc_action_check = [
-     3,   179,     3,   252,     3,     3,     3,     0,   103,     0,
-     0,     0,    66,   230,   233,    66,     3,     1,    28,    28,
-    28,     0,    28,    28,    28,    28,     3,   252,   119,   119,
-   179,     0,     3,   143,   143,   143,     3,     0,   141,   238,
-   103,     0,   230,   233,   143,   143,   143,   143,   143,   143,
-   143,   143,   143,   143,   143,   143,   143,   143,   143,    11,
-    11,    11,    11,   148,   150,   180,   143,    19,   238,    38,
-   141,    11,    11,    11,    11,    11,    11,    11,    11,    11,
+     3,   181,     3,   254,     3,     3,     3,     0,   104,     0,
+     0,     0,    66,   233,   245,    66,     3,     1,    28,    28,
+    28,     0,    28,    28,    28,    28,     3,   254,   120,   120,
+   181,     0,     3,   144,   144,   144,     3,     0,   142,   246,
+   104,     0,   233,   245,   144,   144,   144,   144,   144,   144,
+   144,   144,   144,   144,   144,   144,   144,   144,   144,    11,
+    11,    11,    11,   149,   151,   252,   144,    19,   246,    38,
+   142,    11,    11,    11,    11,    11,    11,    11,    11,    11,
     11,    11,    11,    11,    11,    11,    60,    60,    60,    60,
-   186,    11,   243,    40,   244,   148,   150,   180,    60,    60,
+   253,    11,    40,    68,   252,   149,   151,   147,    60,    60,
     60,    60,    60,    60,    60,    60,    60,    60,    60,    60,
-    60,    60,    60,   173,   173,   173,   173,   247,    60,   248,
-   250,   243,   186,   244,   146,   173,   173,   173,   173,   173,
-   173,   173,   173,   173,   173,   173,   173,   173,   173,   173,
-   132,   132,   132,   251,   146,   173,   247,    68,   248,   250,
-    70,   132,   132,   132,   132,   132,   132,   132,   132,   132,
-   132,   132,   132,   132,   132,   132,   169,    73,   169,   169,
-   169,   132,   251,   169,   270,   272,   169,   280,   281,   169,
-   169,   169,   169,   169,   169,   169,   169,   169,   169,   169,
-   169,   169,   169,   169,   169,   169,   169,   169,   221,    74,
-   221,   221,   221,   270,   272,   221,   280,   281,   221,   221,
-    87,   221,   221,   221,   221,   221,   221,   221,   221,   221,
-   221,   221,   221,   221,   221,   221,   221,   221,   221,   221,
-   259,    89,   259,   259,   259,    90,    93,   259,    96,    98,
-   259,   259,   101,   259,   259,   259,   259,   259,   259,   259,
-   259,   259,   259,   259,   259,   259,   259,   259,   259,   259,
-   259,   259,   287,   104,   287,   287,   287,   136,   136,   136,
-   136,   105,   287,   106,   107,   287,   287,   287,   287,   287,
-   287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
-   287,   287,   287,   287,   293,   108,   293,   293,   293,   109,
-   110,   293,   111,   112,   293,   113,   114,   293,   293,   293,
-   293,   293,   293,   293,   293,   293,   293,   293,   293,   293,
-   293,   293,   293,   293,   293,   293,   309,   115,   309,   309,
-   309,   116,   118,   309,   122,   123,   309,   126,   128,   309,
-   309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
-   309,   309,   309,   309,   309,   309,   309,   309,   312,   131,
-   312,   312,   312,   178,   178,   178,   178,   134,   312,   138,
-   140,   312,   312,   312,   312,   312,   312,   312,   312,   312,
-   312,   312,   312,   312,   312,   312,   312,   312,   312,   312,
-    67,    67,    67,    37,    37,   142,    37,    37,    37,    37,
-    37,    67,    67,    67,    67,    67,    67,    67,    67,    67,
-    67,    67,    67,    67,    67,    67,   222,   222,   222,   222,
-    67,   102,   102,   102,   139,   139,   139,   144,   222,   222,
-   222,   222,   222,   222,   222,   222,   222,   222,   222,   222,
-   222,   222,   222,   262,   262,   262,   262,   145,   147,   149,
-   151,   153,   155,   156,   157,   262,   262,   262,   262,   262,
-   262,   262,   262,   262,   262,   262,   262,   262,   262,   262,
-   265,   265,   265,   265,   158,   159,   163,   166,   171,   172,
-   174,   181,   265,   265,   265,   265,   265,   265,   265,   265,
-   265,   265,   265,   265,   265,   265,   265,   308,   308,   308,
-   308,   183,   187,   189,   190,   191,   192,   194,   195,   308,
-   308,   308,   308,   308,   308,   308,   308,   308,   308,   308,
-   308,   308,   308,   308,    10,    10,    10,   196,   197,   199,
-   234,   239,   249,   253,   255,    10,    10,    10,    10,    10,
+    60,    60,    60,   174,   174,   174,   174,   147,    60,   253,
+   137,   137,   137,   137,    70,   174,   174,   174,   174,   174,
+   174,   174,   174,   174,   174,   174,   174,   174,   174,   174,
+   133,   133,   133,    37,    37,   174,    37,    37,    37,    37,
+    37,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+   133,   133,   133,   133,   133,   133,   170,    73,   170,   170,
+   170,   133,    74,   170,    87,    89,   170,    90,    93,   170,
+   170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+   170,   170,   170,   170,   170,   170,   170,   170,   223,    96,
+   223,   223,   223,    98,   101,   223,   105,   106,   223,   223,
+   107,   223,   223,   223,   223,   223,   223,   223,   223,   223,
+   223,   223,   223,   223,   223,   223,   223,   223,   223,   223,
+   261,   108,   261,   261,   261,   109,   110,   261,   111,   112,
+   261,   261,   113,   261,   261,   261,   261,   261,   261,   261,
+   261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+   261,   261,   285,   114,   285,   285,   285,   179,   179,   179,
+   179,   115,   285,   116,   117,   285,   285,   285,   285,   285,
+   285,   285,   285,   285,   285,   285,   285,   285,   285,   285,
+   285,   285,   285,   285,   291,   119,   291,   291,   291,   123,
+   124,   291,   127,   129,   291,   132,   135,   291,   291,   291,
+   291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+   291,   291,   291,   291,   291,   291,   303,   139,   303,   303,
+   303,   141,   143,   303,   145,   146,   303,   148,   150,   303,
+   303,   303,   303,   303,   303,   303,   303,   303,   303,   303,
+   303,   303,   303,   303,   303,   303,   303,   303,   306,   152,
+   306,   306,   306,   103,   103,   103,   154,   156,   306,   157,
+   158,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+   306,   306,   306,   306,   306,   306,   306,   306,   306,   306,
+    67,    67,    67,   140,   140,   140,   159,   160,   164,   167,
+   172,    67,    67,    67,    67,    67,    67,    67,    67,    67,
+    67,    67,    67,    67,    67,    67,   224,   224,   224,   224,
+    67,   173,   175,   182,   183,   185,   188,   189,   224,   224,
+   224,   224,   224,   224,   224,   224,   224,   224,   224,   224,
+   224,   224,   224,   264,   264,   264,   264,   191,   192,   193,
+   194,   196,   197,   198,   199,   264,   264,   264,   264,   264,
+   264,   264,   264,   264,   264,   264,   264,   264,   264,   264,
+   267,   267,   267,   267,   201,   236,   241,   251,   255,   257,
+   266,   269,   267,   267,   267,   267,   267,   267,   267,   267,
+   267,   267,   267,   267,   267,   267,   267,   302,   302,   302,
+   302,   274,   279,   290,   294,   295,   299,   308,   312,   302,
+   302,   302,   302,   302,   302,   302,   302,   302,   302,   302,
+   302,   302,   302,   302,    10,    10,    10,   313,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    10,    10,    10,    10,    10,
     10,    10,    10,    10,    10,    10,    10,    10,    10,    10,
-    15,    15,    15,   264,   269,   274,   279,   292,   296,   297,
-   305,   314,    15,    15,    15,    15,    15,    15,    15,    15,
-    15,    15,    15,    15,    15,    15,    72,    72,    72,   318,
-   319,   nil,   nil,   nil,   nil,   nil,   nil,    72,    72,    72,
+    15,    15,    15,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    15,    15,    15,    15,    15,    15,    15,    15,
+    15,    15,    15,    15,    15,    15,    72,    72,    72,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    72,    72,    72,
     72,    72,    72,    72,    72,    72,    72,    72,    72,    72,
     72,    72,    75,    75,    75,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,    75,    75,    75,    75,    75,    75,    75,
@@ -383,225 +384,219 @@ racc_action_check = [
     97,    97,    97,    97,    97,    97,    97,    97,    97,    97,
     97,    97,    99,    99,    99,   nil,   nil,   nil,   nil,   nil,
     99,   nil,   nil,    99,    99,    99,    99,    99,    99,    99,
-    99,    99,    99,    99,    99,    99,    99,    99,   117,   117,
-   117,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   117,
-   117,   117,   117,   117,   117,   117,   117,   117,   117,   117,
-   117,   117,   117,   117,   121,   121,   121,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   121,   121,   121,   121,   121,
-   121,   121,   121,   121,   121,   121,   121,   121,   121,   121,
-   124,   124,   124,   nil,   124,   nil,   nil,   nil,   nil,   nil,
-   nil,   124,   124,   124,   124,   124,   124,   124,   124,   124,
-   124,   124,   124,   124,   124,   124,   130,   130,   130,   nil,
-   nil,   nil,   nil,   nil,   130,   nil,   nil,   130,   130,   130,
-   130,   130,   130,   130,   130,   130,   130,   130,   130,   130,
-   130,   130,   177,   177,   177,   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,   182,
-   182,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-   182,   182,   182,   182,   184,   184,   184,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   184,   184,   184,   184,   184,
+    99,    99,    99,    99,    99,    99,    99,    99,   118,   118,
+   118,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   118,
+   118,   118,   118,   118,   118,   118,   118,   118,   118,   118,
+   118,   118,   118,   118,   122,   122,   122,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   122,   122,   122,   122,   122,
+   122,   122,   122,   122,   122,   122,   122,   122,   122,   122,
+   125,   125,   125,   nil,   125,   nil,   nil,   nil,   nil,   nil,
+   nil,   125,   125,   125,   125,   125,   125,   125,   125,   125,
+   125,   125,   125,   125,   125,   125,   131,   131,   131,   nil,
+   nil,   nil,   nil,   nil,   131,   nil,   nil,   131,   131,   131,
+   131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+   131,   131,   178,   178,   178,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   178,   178,   178,   178,   178,   178,   178,
+   178,   178,   178,   178,   178,   178,   178,   178,   184,   184,
+   184,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   184,
    184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-   188,   188,   188,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   188,   188,   188,   188,   188,   188,   188,   188,   188,
-   188,   188,   188,   188,   188,   188,   193,   193,   193,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   193,   193,   193,
-   193,   193,   193,   193,   193,   193,   193,   193,   193,   193,
-   193,   193,   198,   198,   198,   nil,   nil,   nil,   nil,   nil,
-   198,   nil,   nil,   198,   198,   198,   198,   198,   198,   198,
-   198,   198,   198,   198,   198,   198,   198,   198,   220,   220,
-   220,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   220,
-   220,   220,   220,   220,   220,   220,   220,   220,   220,   220,
-   220,   220,   220,   220,   231,   231,   231,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   231,   231,   231,   231,   231,
-   231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
-   236,   236,   236,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   236,   236,   236,   236,   236,   236,   236,   236,   236,
-   236,   236,   236,   236,   236,   236,   245,   245,   245,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   245,   245,   245,
-   245,   245,   245,   245,   245,   245,   245,   245,   245,   245,
-   245,   245,   273,   273,   273,   nil,   nil,   nil,   nil,   nil,
+   184,   184,   184,   184,   186,   186,   186,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   186,   186,   186,   186,   186,
+   186,   186,   186,   186,   186,   186,   186,   186,   186,   186,
+   190,   190,   190,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   190,   190,   190,   190,   190,   190,   190,   190,   190,
+   190,   190,   190,   190,   190,   190,   195,   195,   195,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   195,   195,   195,
+   195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
+   195,   195,   200,   200,   200,   nil,   nil,   nil,   nil,   nil,
+   200,   nil,   nil,   200,   200,   200,   200,   200,   200,   200,
+   200,   200,   200,   200,   200,   200,   200,   200,   222,   222,
+   222,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   222,
+   222,   222,   222,   222,   222,   222,   222,   222,   222,   222,
+   222,   222,   222,   222,   232,   232,   232,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   232,   232,   232,   232,   232,
+   232,   232,   232,   232,   232,   232,   232,   232,   232,   232,
+   238,   238,   238,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   238,   238,   238,   238,   238,   238,   238,   238,   238,
+   238,   238,   238,   238,   238,   238,   247,   247,   247,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   247,   247,   247,
+   247,   247,   247,   247,   247,   247,   247,   247,   247,   247,
+   247,   247,   273,   273,   273,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   273,   273,   273,   273,   273,   273,   273,
-   273,   273,   273,   273,   273,   273,   273,   273,   285,   285,
-   285,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   285,
-   285,   285,   285,   285,   285,   285,   285,   285,   285,   285,
-   285,   285,   285,   285,   302,   302,   302,   nil,   nil,   nil,
-   nil,   nil,   302,   nil,   nil,   302,   302,   302,   302,   302,
-   302,   302,   302,   302,   302,   302,   302,   302,   302,   302,
-   313,   313,   313,   nil,   nil,   nil,   nil,   nil,   313,   nil,
-   nil,   313,   313,   313,   313,   313,   313,   313,   313,   313,
-   313,   313,   313,   313,   313,   313,   315,   315,   315,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   315,   315,   315,
-   315,   315,   315,   315,   315,   315,   315,   315,   315,   315,
-   315,   315,   241,   241,   241,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   241,   241,   241,   241,   241,   241,   241,
-   241,   241,   241,   241,   241,   241,   185,   nil,   nil,   nil,
-   185,   nil,   nil,   nil,   nil,   nil,   185,   nil,   185,   185,
-   185 ]
+   273,   273,   273,   273,   273,   273,   273,   273,   283,   283,
+   283,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   283,
+   283,   283,   283,   283,   283,   283,   283,   283,   283,   283,
+   283,   283,   283,   283,   298,   298,   298,   nil,   nil,   nil,
+   nil,   nil,   298,   nil,   nil,   298,   298,   298,   298,   298,
+   298,   298,   298,   298,   298,   298,   298,   298,   298,   298,
+   307,   307,   307,   nil,   nil,   nil,   nil,   nil,   307,   nil,
+   nil,   307,   307,   307,   307,   307,   307,   307,   307,   307,
+   307,   307,   307,   307,   307,   307,   309,   309,   309,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   309,   309,   309,
+   309,   309,   309,   309,   309,   309,   309,   309,   309,   309,
+   309,   309,   243,   243,   243,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   243,   243,   243,   243,   243,   243,   243,
+   243,   243,   243,   243,   243,   243,   187,   nil,   nil,   nil,
+   187,   nil,   nil,   nil,   nil,   nil,   187,   nil,   187,   187,
+   187 ]
 
 racc_action_pointer = [
      5,    17,   nil,     0,   nil,   nil,   nil,   nil,   nil,   nil,
    520,    56,   nil,   nil,   nil,   546,   nil,   nil,   nil,    33,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     2,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   376,    69,   nil,
-    86,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    83,   nil,   nil,   nil,   nil,   nil,     5,   386,   132,   nil,
-   116,   nil,   572,   165,   165,   598,   624,   650,   676,   702,
-   728,   754,   780,   806,   832,   858,   884,   176,   nil,   197,
-   226,   nil,   nil,   202,   910,   936,   204,   962,   237,   988,
-   nil,   235,   417,     6,   261,   237,   254,   255,   261,   265,
-   266,   268,   284,   286,   272,   293,   297,  1014,   330,    20,
-   nil,  1040,   332,   328,  1066,   nil,   327,   nil,   327,   nil,
-  1092,   325,   136,   nil,   333,   nil,   264,   nil,   359,   420,
-   336,    36,   361,    29,   393,   413,   110,   434,    61,   447,
-    62,   448,   nil,   417,   nil,   418,   439,   452,   472,   468,
-   nil,   nil,   nil,   466,   nil,   nil,   443,   nil,   nil,   164,
-   nil,   465,   477,   110,   478,   nil,   nil,  1118,   360,    -2,
-    63,   479,  1144,   464,  1170,  1521,    88,   500,  1196,   471,
-   472,   503,   504,  1222,   475,   476,   495,   501,  1248,   527,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   126,    69,   nil,
+    85,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+    83,   nil,   nil,   nil,   nil,   nil,     5,   386,    78,   nil,
+    90,   nil,   572,   165,   138,   598,   624,   650,   676,   702,
+   728,   754,   780,   806,   832,   858,   884,   140,   nil,   141,
+   168,   nil,   nil,   144,   910,   936,   165,   962,   201,   988,
+   nil,   197,   nil,   359,     6,   204,   173,   191,   212,   201,
+   202,   204,   205,   223,   244,   237,   239,   240,  1014,   293,
+    20,   nil,  1040,   297,   293,  1066,   nil,   292,   nil,   292,
+   nil,  1092,   271,   136,   nil,   272,   nil,   117,   nil,   317,
+   389,   297,    36,   298,    29,   300,   301,    83,   323,    61,
+   336,    62,   357,   nil,   332,   nil,   333,   355,   368,   394,
+   390,   nil,   nil,   nil,   388,   nil,   nil,   365,   nil,   nil,
+   164,   nil,   387,   419,   110,   420,   nil,   nil,  1118,   264,
+   nil,    -2,   389,   422,  1144,   388,  1170,  1521,   392,   425,
+  1196,   415,   416,   447,   448,  1222,   419,   420,   421,   427,
+  1248,   472,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-  1274,   196,   413,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    10,  1300,   nil,    11,   493,   nil,  1326,   nil,    36,   493,
-   nil,  1508,   nil,    89,    91,  1352,   nil,   114,   116,   494,
-   117,   140,    -5,   518,   nil,   520,   nil,   nil,   nil,   228,
-   nil,   nil,   440,   nil,   543,   467,   nil,   nil,   nil,   547,
-   171,   nil,   172,  1378,   521,   nil,   nil,   nil,   nil,   546,
-   174,   175,   nil,   nil,   nil,  1404,   nil,   260,   nil,   nil,
-   nil,   nil,   547,   292,   nil,   nil,   548,   549,   nil,   nil,
-   nil,   nil,  1430,   nil,   nil,   522,   nil,   nil,   494,   324,
-   nil,   nil,   356,  1456,   547,  1482,   nil,   nil,   545,   546,
-   nil,   nil,   nil ]
+   nil,   nil,  1274,   196,   413,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,  1300,    10,   nil,   nil,   438,   nil,  1326,   nil,
+   nil,   438,   nil,  1508,   nil,    11,    36,  1352,   nil,   nil,
+   nil,   439,    62,    87,    -5,   463,   nil,   465,   nil,   nil,
+   nil,   228,   nil,   nil,   440,   nil,   470,   467,   nil,   474,
+   nil,   nil,   nil,  1378,   467,   nil,   nil,   nil,   nil,   492,
+   nil,   nil,   nil,  1404,   nil,   260,   nil,   nil,   nil,   nil,
+   493,   292,   nil,   nil,   494,   495,   nil,   nil,  1430,   468,
+   nil,   nil,   494,   324,   nil,   nil,   356,  1456,   493,  1482,
+   nil,   nil,   474,   493,   nil,   nil,   nil ]
 
 racc_action_default = [
-  -149,  -182,    -1,  -149,    -3,    -5,    -6,    -7,    -8,    -9,
-   -16,  -182,   -13,   -14,   -15,  -109,  -111,  -112,  -113,  -100,
-  -118,  -119,  -120,  -121,  -122,  -123,  -124,  -125,  -182,  -128,
-  -129,  -130,  -131,  -132,  -133,  -148,  -150,  -182,  -182,    -4,
+  -151,  -186,    -1,  -151,    -3,    -5,    -6,    -7,    -8,    -9,
+   -16,  -186,   -13,   -14,   -15,  -109,  -111,  -112,  -113,  -100,
+  -120,  -121,  -122,  -123,  -124,  -125,  -126,  -127,  -186,  -130,
+  -131,  -132,  -133,  -134,  -135,  -150,  -152,  -186,  -186,    -4,
    -18,   -17,   -39,   -40,   -41,   -42,   -43,   -44,   -45,   -46,
    -47,   -48,   -49,   -50,   -51,   -52,   -53,   -54,   -55,   -56,
-  -182,   -12,   -32,   -34,   -35,   -36,   -66,  -100,  -182,  -110,
-  -101,  -102,  -182,  -182,  -100,  -182,  -182,  -182,  -182,  -182,
-  -182,  -182,  -182,  -182,  -182,  -182,  -182,  -182,   323,  -100,
-  -182,   -11,   -33,  -100,  -182,  -182,  -100,  -182,  -182,  -182,
-  -103,   -66,  -182,  -127,  -182,  -182,  -153,  -153,  -100,  -100,
-  -100,  -100,  -153,  -153,  -100,  -100,  -100,  -182,  -182,  -182,
-   -20,  -182,   -30,   -66,  -182,   -68,  -182,  -105,   -23,   -25,
-  -182,  -100,  -182,  -107,  -100,  -104,  -182,  -115,  -182,  -182,
-  -134,  -138,  -100,  -182,  -100,  -141,  -143,  -182,  -145,  -182,
-  -147,  -182,  -151,  -100,  -154,  -100,  -182,  -182,  -182,  -165,
-   -10,   -19,   -21,  -182,   -31,   -37,  -100,   -67,   -69,  -182,
-   -24,  -182,  -182,  -182,  -182,  -114,  -116,  -182,  -182,  -149,
-  -137,  -182,  -182,  -156,  -157,  -158,  -140,  -182,  -182,  -149,
-  -149,  -182,  -182,  -182,  -149,  -149,  -149,  -178,  -182,   -30,
-   -57,   -58,   -59,   -60,   -61,   -62,   -70,   -71,   -72,   -73,
-   -74,   -75,   -76,   -77,   -78,   -79,   -80,   -81,   -82,   -83,
-  -182,  -182,  -182,   -99,   -26,  -106,   -29,  -108,  -117,  -126,
-  -149,  -182,  -169,  -149,  -155,  -158,  -182,  -161,  -149,  -142,
-  -172,  -182,   -64,  -149,  -149,  -182,  -163,  -149,  -149,  -174,
-  -149,  -149,  -149,  -182,  -179,   -27,   -38,   -84,   -85,  -182,
-   -87,   -89,  -182,   -91,  -182,  -182,   -96,  -135,  -170,  -165,
-  -149,  -159,  -149,  -182,  -100,   -65,  -144,  -146,  -164,  -182,
-  -149,  -149,  -175,  -176,  -166,  -182,   -22,  -182,   -86,   -88,
-   -90,   -92,  -182,  -182,   -95,   -97,  -182,  -182,  -136,  -139,
-  -173,   -63,  -182,  -152,  -171,  -177,  -180,   -28,  -182,  -182,
-   -80,   -93,  -182,  -182,   -27,  -182,   -94,   -98,  -100,  -100,
-  -181,  -167,  -162 ]
+  -186,   -12,   -32,   -34,   -35,   -36,   -66,  -100,  -186,  -110,
+  -101,  -102,  -186,  -115,  -100,  -186,  -186,  -186,  -186,  -186,
+  -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,   317,  -100,
+  -186,   -11,   -33,  -100,  -186,  -186,  -100,  -186,  -186,  -186,
+  -103,   -66,  -114,  -186,  -129,  -186,  -186,  -155,  -155,  -100,
+  -100,  -100,  -100,  -155,  -155,  -100,  -100,  -100,  -186,  -186,
+  -186,   -20,  -186,   -30,   -66,  -186,   -68,  -186,  -105,   -23,
+   -25,  -186,  -100,  -186,  -107,  -100,  -104,  -186,  -117,  -186,
+  -186,  -136,  -140,  -100,  -186,  -100,  -143,  -145,  -186,  -147,
+  -186,  -149,  -186,  -153,  -100,  -156,  -100,  -186,  -186,  -186,
+  -167,   -10,   -19,   -21,  -186,   -31,   -37,  -100,   -67,   -69,
+  -186,   -24,  -186,  -186,  -186,  -186,  -116,  -118,  -186,  -186,
+  -137,  -151,  -101,  -170,  -186,  -158,  -159,  -160,  -101,  -170,
+  -186,  -151,  -151,  -170,  -170,  -186,  -151,  -151,  -151,  -182,
+  -186,   -30,   -57,   -58,   -59,   -60,   -61,   -62,   -70,   -71,
+   -72,   -73,   -74,   -75,   -76,   -77,   -78,   -79,   -80,   -81,
+   -82,   -83,  -186,  -186,  -186,   -99,   -26,  -106,   -29,  -108,
+  -119,  -128,  -186,  -151,  -173,  -138,  -157,  -160,  -186,  -163,
+  -141,  -144,  -176,  -186,   -64,  -151,  -151,  -186,  -165,  -154,
+  -175,  -178,  -151,  -151,  -151,  -186,  -183,   -27,   -38,   -84,
+   -85,  -186,   -87,   -89,  -186,   -91,  -186,  -186,   -96,  -167,
+  -171,  -174,  -161,  -186,  -100,   -65,  -146,  -148,  -166,  -186,
+  -179,  -180,  -168,  -186,   -22,  -186,   -86,   -88,   -90,   -92,
+  -186,  -186,   -95,   -97,  -186,  -186,  -177,   -63,  -186,  -181,
+  -184,   -28,  -186,  -186,   -80,   -93,  -186,  -186,   -27,  -186,
+   -94,   -98,  -100,  -100,  -185,  -169,  -164 ]
 
 racc_goto_table = [
-    10,    41,    66,    10,   131,    92,   134,   197,    60,   206,
-   103,    37,   165,    69,    37,   176,   263,   136,   133,   183,
-   286,   120,   307,   125,    93,   278,     4,   275,   310,    39,
-   243,   205,   278,   278,   275,   250,    73,   171,   160,   141,
-   145,   140,   142,   144,   146,   148,   150,   317,   153,   155,
-   162,    66,   168,     1,   178,   239,   291,   176,   234,   135,
-   249,   260,     2,   101,     3,    96,   105,   106,   107,   108,
-   109,   110,   111,   112,   113,   114,   115,   116,   180,   319,
-   186,   166,    40,   205,    98,   123,   126,   100,    89,   256,
-   119,   104,   225,   274,   227,   268,   124,   259,   262,   289,
-   295,    68,   138,   205,   184,   255,   118,   253,   159,   305,
-   122,   nil,   163,   127,   nil,   126,   nil,   297,    92,   nil,
-   100,   205,   230,    66,   nil,   147,   149,   151,   152,   173,
-   nil,   156,   157,   158,   185,   268,   138,   268,   244,   138,
-   nil,   nil,   nil,   251,   252,   268,   268,   nil,   172,   205,
-   nil,   174,   nil,   nil,   nil,   205,   nil,   100,   nil,   181,
-   nil,   187,   nil,   100,    66,   100,   nil,   100,   228,   204,
-   191,   205,   192,   235,   205,   237,   270,   nil,   138,   240,
-   nil,   272,   nil,   199,   240,   nil,   nil,   nil,   nil,   nil,
-   280,   281,   nil,   nil,   nil,   nil,   nil,   100,   nil,   nil,
-   241,   245,   nil,   100,   nil,   241,   245,   245,   nil,   314,
-   nil,   257,   nil,   264,   nil,   nil,   nil,   nil,   nil,   nil,
-   318,   204,   269,   nil,   nil,   nil,   nil,   271,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   279,   nil,   nil,   nil,
-   nil,   204,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   292,   241,   245,   296,   nil,   nil,   204,
-   nil,   241,   245,   245,   300,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   306,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   204,   nil,   nil,
-   nil,   301,   nil,   204,   nil,   nil,   nil,   nil,   nil,   296,
-   nil,   nil,   nil,   nil,   nil,   nil,   320,   nil,   nil,   204,
-   nil,   nil,   204,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   321,   322 ]
+    10,    69,    60,    10,    37,    93,   208,    37,    41,    66,
+   166,    92,   199,   207,   132,   234,   135,    73,   284,   177,
+   265,   134,   185,   301,   278,   121,   126,   137,   275,   304,
+     1,   278,   278,   246,     4,   275,   245,    39,   253,   254,
+   136,   252,   161,     2,   311,   143,   145,     3,   172,   142,
+   146,   154,   156,    96,   180,   163,   169,    40,    66,   262,
+   289,   177,   236,   167,   179,    98,   207,   271,    89,   313,
+   101,   120,   105,   106,   107,   108,   109,   110,   111,   112,
+   113,   114,   115,   116,   117,   100,   207,   119,   258,   274,
+   125,   123,   124,   127,   128,   235,   227,   287,   229,   261,
+   264,   240,   293,   139,   207,   249,   250,   148,   150,   152,
+   153,    68,   102,   157,   158,   159,   160,   257,   186,   100,
+   164,   295,   241,   127,   174,    92,   233,   251,   207,   255,
+   173,    66,   299,   175,   207,   nil,   nil,   139,   nil,   nil,
+   139,   183,   187,   189,   nil,   nil,   207,   nil,   nil,   207,
+   nil,   nil,   193,   nil,   194,   nil,   100,   nil,   nil,   nil,
+   nil,   nil,   100,   nil,   100,   201,   100,   nil,   nil,   104,
+   206,   nil,    66,   nil,   nil,   nil,   230,   nil,   nil,   139,
+   nil,   nil,   237,   nil,   239,   232,   nil,   nil,   242,   nil,
+   nil,   nil,   nil,   242,   nil,   243,   nil,   100,   nil,   nil,
+   243,   141,   nil,   100,   147,   149,   151,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   308,   nil,   nil,   nil,   nil,
+   259,   nil,   266,   206,   312,   nil,   nil,   nil,   nil,   nil,
+   269,   nil,   nil,   nil,   nil,   nil,   272,   232,   182,   nil,
+   188,   nil,   nil,   206,   nil,   279,   nil,   nil,   nil,   243,
+   nil,   nil,   nil,   nil,   nil,   nil,   243,   nil,   nil,   nil,
+   nil,   206,   290,   nil,   nil,   294,   nil,   nil,   nil,   nil,
+   nil,   296,   297,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   300,   nil,   nil,   nil,   206,   nil,   nil,   nil,   nil,
+   nil,   206,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   294,   nil,   nil,   206,   nil,   nil,   206,   314,   nil,   nil,
+   315,   316 ]
 
 racc_goto_check = [
-    10,    16,    16,    10,    19,    24,    19,    80,    15,    37,
-    49,    33,    23,    29,    33,    56,    46,    55,    14,    77,
-    20,    18,    22,    36,    28,    79,     4,    32,    22,     4,
-    34,    30,    79,    79,    32,    34,    13,    19,    14,    71,
-    71,    49,    73,    73,    49,    49,    49,    22,    73,    73,
-    18,    16,    36,     1,    55,    74,    46,    56,    77,    28,
-    74,    37,     2,    16,     3,    29,    16,    16,    16,    16,
-    16,    16,    16,    16,    16,    16,    16,    16,    49,    20,
-    49,    28,    11,    30,    13,    16,    16,    50,    12,    23,
-    17,    13,    14,    31,    14,    81,    35,    44,    45,    37,
-    48,    51,    10,    30,    78,    19,    13,    82,    16,    83,
-    13,   nil,    16,    13,   nil,    16,   nil,    80,    24,   nil,
-    50,    30,    72,    16,   nil,    13,    13,    13,    13,    15,
-   nil,    13,    13,    13,    16,    81,    10,    81,    75,    10,
-   nil,   nil,   nil,    75,    75,    81,    81,   nil,    13,    30,
-   nil,    13,   nil,   nil,   nil,    30,   nil,    50,   nil,    13,
-   nil,    13,   nil,    50,    16,    50,   nil,    50,    16,    10,
-    13,    30,    13,    16,    30,    16,    72,   nil,    10,    16,
-   nil,    72,   nil,    13,    16,   nil,   nil,   nil,   nil,   nil,
-    72,    72,   nil,   nil,   nil,   nil,   nil,    50,   nil,   nil,
-    33,    33,   nil,    50,   nil,    33,    33,    33,   nil,    19,
-   nil,    16,   nil,    16,   nil,   nil,   nil,   nil,   nil,   nil,
-    19,    10,    16,   nil,   nil,   nil,   nil,    16,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,   nil,
+    10,    29,    15,    10,    33,    28,    37,    33,    16,    16,
+    23,    24,    81,    30,    19,    82,    19,    13,    20,    57,
+    46,    14,    78,    22,    80,    18,    36,    56,    32,    22,
+     1,    80,    80,    76,     4,    32,    34,     4,    76,    76,
+    28,    34,    14,     2,    22,    74,    74,     3,    19,    72,
+    72,    74,    74,    29,    73,    18,    36,    11,    16,    37,
+    46,    57,    78,    28,    56,    13,    30,    82,    12,    20,
+    16,    17,    13,    16,    16,    16,    16,    16,    16,    16,
+    16,    16,    16,    16,    16,    50,    30,    13,    23,    31,
+    35,    13,    16,    16,    13,    73,    14,    37,    14,    44,
+    45,    73,    48,    10,    30,    73,    73,    13,    13,    13,
+    13,    51,    55,    13,    13,    13,    16,    19,    79,    50,
+    16,    81,    75,    16,    15,    24,    83,    75,    30,    84,
+    13,    16,    85,    13,    30,   nil,   nil,    10,   nil,   nil,
+    10,    13,    16,    13,   nil,   nil,    30,   nil,   nil,    30,
+   nil,   nil,    13,   nil,    13,   nil,    50,   nil,   nil,   nil,
+   nil,   nil,    50,   nil,    50,    13,    50,   nil,   nil,    49,
+    10,   nil,    16,   nil,   nil,   nil,    16,   nil,   nil,    10,
+   nil,   nil,    16,   nil,    16,    33,   nil,   nil,    16,   nil,
+   nil,   nil,   nil,    16,   nil,    33,   nil,    50,   nil,   nil,
+    33,    49,   nil,    50,    49,    49,    49,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    19,   nil,   nil,   nil,   nil,
+    16,   nil,    16,    10,    19,   nil,   nil,   nil,   nil,   nil,
+    16,   nil,   nil,   nil,   nil,   nil,    16,    33,    49,   nil,
+    49,   nil,   nil,    10,   nil,    16,   nil,   nil,   nil,    33,
+   nil,   nil,   nil,   nil,   nil,   nil,    33,   nil,   nil,   nil,
+   nil,    10,    16,   nil,   nil,    16,   nil,   nil,   nil,   nil,
+   nil,    16,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    16,   nil,   nil,   nil,    10,   nil,   nil,   nil,   nil,
    nil,    10,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    16,    33,    33,    16,   nil,   nil,    10,
-   nil,    33,    33,    33,    16,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,   nil,
-   nil,    13,   nil,    10,   nil,   nil,   nil,   nil,   nil,    16,
-   nil,   nil,   nil,   nil,   nil,   nil,    16,   nil,   nil,    10,
-   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,    13,    13 ]
+    16,   nil,   nil,    10,   nil,   nil,    10,    16,   nil,   nil,
+    13,    13 ]
 
 racc_goto_pointer = [
-   nil,    53,    62,    64,    26,   nil,   nil,   nil,   nil,   nil,
-     0,    72,    48,    17,   -80,    -3,    -9,     0,   -69,   -93,
-  -235,   nil,  -265,  -110,   -55,   nil,   nil,   nil,   -42,    -2,
-  -138,  -148,  -216,    11,  -159,     1,   -72,  -160,   nil,   nil,
-   nil,   nil,   nil,   nil,  -124,  -124,  -206,   nil,  -165,   -64,
-    17,    86,   nil,   nil,   nil,   -85,  -121,   nil,   nil,   nil,
+   nil,    30,    43,    47,    34,   nil,   nil,   nil,   nil,   nil,
+     0,    47,    28,    -2,   -77,    -9,    -2,   -19,   -65,   -83,
+  -239,   nil,  -262,  -113,   -49,   nil,   nil,   nil,   -61,   -14,
+  -157,  -154,  -217,     4,  -155,    -5,   -69,  -164,   nil,   nil,
+   nil,   nil,   nil,   nil,  -124,  -124,  -204,   nil,  -165,    95,
+    15,    96,   nil,   nil,   nil,    39,   -76,  -118,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   -67,   -57,   -64,  -133,   -52,   nil,  -124,   -39,  -219,
-  -152,  -135,   -90,  -176 ]
+   nil,   nil,   -58,   -88,   -62,   -68,  -159,   nil,  -122,   -26,
+  -222,  -148,  -166,   -55,   -70,  -151 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,     5,     6,     7,     8,     9,
-    58,   nil,   nil,   nil,   164,   nil,   129,   nil,   nil,   nil,
-   nil,   128,   216,   nil,    62,    63,    64,    65,   nil,    42,
-    59,   223,   242,   231,   nil,   nil,   nil,   311,   212,   213,
-   214,   215,   217,   218,   nil,   nil,   nil,   265,   266,    70,
-    71,   nil,    16,    17,    18,   nil,   137,    20,    21,    22,
-    23,    24,    25,    26,    27,    29,    30,    31,    32,    33,
-    34,   154,   nil,   nil,   nil,   nil,    36,   nil,   nil,   246,
-   nil,   232,   nil,   nil ]
+    58,   nil,   nil,   nil,   165,   nil,   130,   nil,   nil,   nil,
+   nil,   129,   218,   nil,    62,    63,    64,    65,   nil,    42,
+    59,   225,   244,   247,   nil,   nil,   nil,   305,   214,   215,
+   216,   217,   219,   220,   nil,   nil,   nil,   267,   268,    70,
+    71,   nil,    16,    17,    18,   nil,   nil,   138,    20,    21,
+    22,    23,    24,    25,    26,    27,    29,    30,    31,    32,
+    33,    34,   155,   nil,   nil,   nil,   nil,    36,   nil,   nil,
+   248,   nil,   nil,   nil,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -718,10 +713,12 @@ racc_reduce_table = [
   1, 45, :_reduce_none,
   1, 45, :_reduce_none,
   1, 45, :_reduce_none,
-  5, 91, :_reduce_114,
-  1, 94, :_reduce_none,
-  2, 94, :_reduce_116,
-  3, 95, :_reduce_117,
+  3, 91, :_reduce_114,
+  0, 94, :_reduce_115,
+  3, 94, :_reduce_116,
+  1, 95, :_reduce_none,
+  2, 95, :_reduce_118,
+  3, 96, :_reduce_119,
   1, 92, :_reduce_none,
   1, 92, :_reduce_none,
   1, 92, :_reduce_none,
@@ -730,66 +727,68 @@ racc_reduce_table = [
   1, 92, :_reduce_none,
   1, 46, :_reduce_none,
   1, 46, :_reduce_none,
-  6, 102, :_reduce_126,
-  3, 102, :_reduce_127,
-  1, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  1, 103, :_reduce_none,
-  4, 104, :_reduce_134,
-  7, 105, :_reduce_135,
-  8, 105, :_reduce_136,
-  5, 105, :_reduce_137,
-  4, 105, :_reduce_138,
-  8, 106, :_reduce_139,
-  5, 106, :_reduce_140,
-  4, 106, :_reduce_141,
-  6, 107, :_reduce_142,
+  6, 103, :_reduce_128,
+  3, 103, :_reduce_129,
+  1, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  1, 104, :_reduce_none,
+  4, 105, :_reduce_136,
+  5, 106, :_reduce_137,
+  6, 106, :_reduce_138,
+  5, 106, :_reduce_139,
+  4, 106, :_reduce_140,
+  6, 107, :_reduce_141,
+  5, 107, :_reduce_142,
   4, 107, :_reduce_143,
-  7, 108, :_reduce_144,
+  6, 108, :_reduce_144,
   4, 108, :_reduce_145,
   7, 109, :_reduce_146,
   4, 109, :_reduce_147,
-  1, 115, :_reduce_none,
+  7, 110, :_reduce_148,
+  4, 110, :_reduce_149,
+  1, 116, :_reduce_none,
   0, 72, :_reduce_none,
   1, 72, :_reduce_none,
-  4, 96, :_reduce_151,
-  8, 97, :_reduce_152,
-  0, 112, :_reduce_153,
-  1, 112, :_reduce_none,
-  3, 110, :_reduce_155,
-  2, 110, :_reduce_156,
-  2, 110, :_reduce_157,
-  1, 116, :_reduce_158,
-  3, 116, :_reduce_159,
+  4, 97, :_reduce_153,
+  6, 98, :_reduce_154,
+  0, 113, :_reduce_155,
+  1, 113, :_reduce_none,
+  3, 111, :_reduce_157,
+  2, 111, :_reduce_158,
+  2, 111, :_reduce_159,
   1, 117, :_reduce_160,
-  2, 117, :_reduce_161,
-  6, 118, :_reduce_162,
-  1, 114, :_reduce_163,
-  2, 114, :_reduce_164,
-  0, 119, :_reduce_165,
-  3, 119, :_reduce_166,
-  6, 120, :_reduce_167,
-  0, 111, :_reduce_168,
-  1, 111, :_reduce_169,
-  2, 111, :_reduce_170,
-  8, 98, :_reduce_171,
-  1, 113, :_reduce_172,
-  3, 113, :_reduce_173,
-  6, 99, :_reduce_174,
-  7, 100, :_reduce_175,
-  7, 101, :_reduce_176,
-  8, 93, :_reduce_177,
-  0, 121, :_reduce_none,
-  1, 121, :_reduce_none,
-  1, 122, :_reduce_180,
-  3, 122, :_reduce_181 ]
-
-racc_reduce_n = 182
-
-racc_shift_n = 323
+  3, 117, :_reduce_161,
+  1, 118, :_reduce_162,
+  2, 118, :_reduce_163,
+  6, 119, :_reduce_164,
+  1, 115, :_reduce_165,
+  2, 115, :_reduce_166,
+  0, 120, :_reduce_167,
+  3, 120, :_reduce_168,
+  6, 121, :_reduce_169,
+  0, 112, :_reduce_170,
+  3, 112, :_reduce_171,
+  0, 122, :_reduce_172,
+  1, 122, :_reduce_173,
+  2, 122, :_reduce_174,
+  6, 99, :_reduce_175,
+  1, 114, :_reduce_176,
+  3, 114, :_reduce_177,
+  6, 100, :_reduce_178,
+  7, 101, :_reduce_179,
+  7, 102, :_reduce_180,
+  8, 93, :_reduce_181,
+  0, 123, :_reduce_none,
+  1, 123, :_reduce_none,
+  1, 124, :_reduce_184,
+  3, 124, :_reduce_185 ]
+
+racc_reduce_n = 186
+
+racc_shift_n = 317
 
 racc_token_table = {
   false => 0,
@@ -947,6 +946,7 @@ Racc_token_to_s_table = [
   "schema_definition",
   "type_definition",
   "directive_definition",
+  "operation_type_definition_list_opt",
   "operation_type_definition_list",
   "operation_type_definition",
   "scalar_type_definition",
@@ -964,7 +964,7 @@ Racc_token_to_s_table = [
   "enum_type_extension",
   "input_object_type_extension",
   "implements",
-  "field_definition_list",
+  "field_definition_list_opt",
   "implements_opt",
   "union_members",
   "input_value_definition_list",
@@ -974,6 +974,7 @@ Racc_token_to_s_table = [
   "input_value_definition",
   "arguments_definitions_opt",
   "field_definition",
+  "field_definition_list",
   "directive_repeatable_opt",
   "directive_locations" ]
 
@@ -1283,7 +1284,7 @@ module_eval(<<'.,.,', 'parser.y', 119)
 
 module_eval(<<'.,.,', 'parser.y', 164)
   def _reduce_63(val, _values, result)
-     result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+     result = make_node(:EnumValueDefinition, name: val[1], directives: val[2], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
     result
   end
 .,.,
@@ -1339,21 +1340,21 @@ module_eval(<<'.,.,', 'parser.y', 179)
 
 module_eval(<<'.,.,', 'parser.y', 182)
   def _reduce_71(val, _values, result)
-     result = val[0].to_f
+     result = val[0][3].to_f
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 183)
   def _reduce_72(val, _values, result)
-     result = val[0].to_i
+     result = val[0][3].to_i
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 184)
   def _reduce_73(val, _values, result)
-     result = val[0].to_s
+     result = val[0][3]
     result
   end
 .,.,
@@ -1600,30 +1601,40 @@ module_eval(<<'.,.,', 'parser.y', 277)
 
 module_eval(<<'.,.,', 'parser.y', 286)
   def _reduce_114(val, _values, result)
-     result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0].line, directives: val[1], **val[3])
+     result = make_node(:SchemaDefinition, position_source: val[0], definition_line: val[0][1], directives: val[1], **val[2])
     result
   end
 .,.,
 
-# reduce 115 omitted
+module_eval(<<'.,.,', 'parser.y', 289)
+  def _reduce_115(val, _values, result)
+     result = {}
+    result
+  end
+.,.,
 
 module_eval(<<'.,.,', 'parser.y', 290)
   def _reduce_116(val, _values, result)
-     result = val[0].merge(val[1])
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 293)
-  def _reduce_117(val, _values, result)
-     result = { val[0].to_s.to_sym => val[2] }
+# reduce 117 omitted
+
+module_eval(<<'.,.,', 'parser.y', 294)
+  def _reduce_118(val, _values, result)
+     result = val[0].merge(val[1])
     result
   end
 .,.,
 
-# reduce 118 omitted
-
-# reduce 119 omitted
+module_eval(<<'.,.,', 'parser.y', 297)
+  def _reduce_119(val, _values, result)
+     result = { val[0][3].to_sym => val[2] }
+    result
+  end
+.,.,
 
 # reduce 120 omitted
 
@@ -1637,24 +1648,24 @@ module_eval(<<'.,.,', 'parser.y', 293)
 
 # reduce 125 omitted
 
-module_eval(<<'.,.,', 'parser.y', 308)
-  def _reduce_126(val, _values, result)
+# reduce 126 omitted
+
+# reduce 127 omitted
+
+module_eval(<<'.,.,', 'parser.y', 312)
+  def _reduce_128(val, _values, result)
      result = make_node(:SchemaExtension, position_source: val[0], directives: val[2], **val[4])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 309)
-  def _reduce_127(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 313)
+  def _reduce_129(val, _values, result)
      result = make_node(:SchemaExtension, position_source: val[0], directives: val[2])
     result
   end
 .,.,
 
-# reduce 128 omitted
-
-# reduce 129 omitted
-
 # reduce 130 omitted
 
 # reduce 131 omitted
@@ -1663,166 +1674,156 @@ module_eval(<<'.,.,', 'parser.y', 309)
 
 # reduce 133 omitted
 
-module_eval(<<'.,.,', 'parser.y', 319)
-  def _reduce_134(val, _values, result)
-     result = make_node(:ScalarTypeExtension, name: val[2], directives: val[3], position_source: val[0])
-    result
-  end
-.,.,
+# reduce 134 omitted
 
-module_eval(<<'.,.,', 'parser.y', 323)
-  def _reduce_135(val, _values, result)
-     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: val[5], position_source: val[0])
-    result
-  end
-.,.,
+# reduce 135 omitted
 
-module_eval(<<'.,.,', 'parser.y', 324)
+module_eval(<<'.,.,', 'parser.y', 323)
   def _reduce_136(val, _values, result)
-     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], position_source: val[0])
+     result = make_node(:ScalarTypeExtension, name: val[2], directives: val[3], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 325)
+module_eval(<<'.,.,', 'parser.y', 327)
   def _reduce_137(val, _values, result)
-     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: [], position_source: val[0])
+     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: val[4], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 326)
+module_eval(<<'.,.,', 'parser.y', 328)
   def _reduce_138(val, _values, result)
-     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: [], position_source: val[0])
+     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 329)
   def _reduce_139(val, _values, result)
-     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], position_source: val[0])
+     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: [], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 330)
   def _reduce_140(val, _values, result)
-     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: [], position_source: val[0])
+     result = make_node(:ObjectTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: [], position_source: val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 331)
+module_eval(<<'.,.,', 'parser.y', 333)
   def _reduce_141(val, _values, result)
-     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: [], position_source: val[0])
+     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 334)
   def _reduce_142(val, _values, result)
-     result = make_node(:UnionTypeExtension, name: val[2], directives: val[3], types: val[5], position_source: val[0])
+     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: val[4], fields: [], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 335)
   def _reduce_143(val, _values, result)
-     result = make_node(:UnionTypeExtension, name: val[2], directives: val[3], types: [], position_source: val[0])
+     result = make_node(:InterfaceTypeExtension, name: val[2], interfaces: val[3], directives: [], fields: [], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 338)
   def _reduce_144(val, _values, result)
-     result = make_node(:EnumTypeExtension, name: val[2], directives: val[3], values: val[5], position_source: val[0])
+     result = make_node(:UnionTypeExtension, name: val[2], directives: val[3], types: val[5], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 339)
   def _reduce_145(val, _values, result)
-     result = make_node(:EnumTypeExtension, name: val[2], directives: val[3], values: [], position_source: val[0])
+     result = make_node(:UnionTypeExtension, name: val[2], directives: val[3], types: [], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 342)
   def _reduce_146(val, _values, result)
-     result = make_node(:InputObjectTypeExtension, name: val[2], directives: val[3], fields: val[5], position_source: val[0])
+     result = make_node(:EnumTypeExtension, name: val[2], directives: val[3], values: val[5], position_source: val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 343)
   def _reduce_147(val, _values, result)
-     result = make_node(:InputObjectTypeExtension, name: val[2], directives: val[3], fields: [], position_source: val[0])
+     result = make_node(:EnumTypeExtension, name: val[2], directives: val[3], values: [], position_source: val[0])
     result
   end
 .,.,
 
-# reduce 148 omitted
+module_eval(<<'.,.,', 'parser.y', 346)
+  def _reduce_148(val, _values, result)
+     result = make_node(:InputObjectTypeExtension, name: val[2], directives: val[3], fields: val[5], position_source: val[0])
+    result
+  end
+.,.,
 
-# reduce 149 omitted
+module_eval(<<'.,.,', 'parser.y', 347)
+  def _reduce_149(val, _values, result)
+     result = make_node(:InputObjectTypeExtension, name: val[2], directives: val[3], fields: [], position_source: val[0])
+    result
+  end
+.,.,
 
 # reduce 150 omitted
 
-module_eval(<<'.,.,', 'parser.y', 353)
-  def _reduce_151(val, _values, result)
-            result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+# reduce 151 omitted
 
-    result
-  end
-.,.,
+# reduce 152 omitted
 
-module_eval(<<'.,.,', 'parser.y', 358)
-  def _reduce_152(val, _values, result)
-            result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+module_eval(<<'.,.,', 'parser.y', 357)
+  def _reduce_153(val, _values, result)
+            result = make_node(:ScalarTypeDefinition, name: val[2], directives: val[3], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 362)
-  def _reduce_153(val, _values, result)
-     result = EMPTY_ARRAY
+  def _reduce_154(val, _values, result)
+            result = make_node(:ObjectTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
+
     result
   end
 .,.,
 
-# reduce 154 omitted
-
 module_eval(<<'.,.,', 'parser.y', 366)
   def _reduce_155(val, _values, result)
-     result = val[2]
+     result = EMPTY_ARRAY
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 367)
-  def _reduce_156(val, _values, result)
-     result = val[1]
-    result
-  end
-.,.,
+# reduce 156 omitted
 
-module_eval(<<'.,.,', 'parser.y', 368)
+module_eval(<<'.,.,', 'parser.y', 370)
   def _reduce_157(val, _values, result)
-     result = val[1]
+     result = val[2]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 371)
   def _reduce_158(val, _values, result)
-     result = [make_node(:TypeName, name: val[0], position_source: val[0])]
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 372)
   def _reduce_159(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[2], position_source: val[2])
+     result = val[1]
     result
   end
 .,.,
@@ -1836,144 +1837,172 @@ module_eval(<<'.,.,', 'parser.y', 375)
 
 module_eval(<<'.,.,', 'parser.y', 376)
   def _reduce_161(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[1], position_source: val[1])
+     val[0] << make_node(:TypeName, name: val[2], position_source: val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 380)
+module_eval(<<'.,.,', 'parser.y', 379)
   def _reduce_162(val, _values, result)
-            result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
-
+     result = [make_node(:TypeName, name: val[0], position_source: val[0])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 384)
+module_eval(<<'.,.,', 'parser.y', 380)
   def _reduce_163(val, _values, result)
-     result = [val[0]]
+     val[0] << make_node(:TypeName, name: val[1], position_source: val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 385)
+module_eval(<<'.,.,', 'parser.y', 384)
   def _reduce_164(val, _values, result)
-     val[0] << val[1]
+            result = make_node(:InputValueDefinition, name: val[1], type: val[3], default_value: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
+
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 388)
   def _reduce_165(val, _values, result)
-     result = EMPTY_ARRAY
+     result = [val[0]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 389)
   def _reduce_166(val, _values, result)
-     result = val[1]
+     val[0] << val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 393)
+module_eval(<<'.,.,', 'parser.y', 392)
   def _reduce_167(val, _values, result)
-            result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
-
+     result = EMPTY_ARRAY
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 397)
+module_eval(<<'.,.,', 'parser.y', 393)
   def _reduce_168(val, _values, result)
-     result = EMPTY_ARRAY
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 398)
+module_eval(<<'.,.,', 'parser.y', 397)
   def _reduce_169(val, _values, result)
-     result = [val[0]]
+            result = make_node(:FieldDefinition, name: val[1], arguments: val[2], type: val[4], directives: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 399)
+module_eval(<<'.,.,', 'parser.y', 401)
   def _reduce_170(val, _values, result)
-     val[0] << val[1]
+     result = EMPTY_ARRAY
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 403)
+module_eval(<<'.,.,', 'parser.y', 402)
   def _reduce_171(val, _values, result)
-            result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[6], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
-
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 407)
+module_eval(<<'.,.,', 'parser.y', 405)
   def _reduce_172(val, _values, result)
-     result = [make_node(:TypeName, name: val[0], position_source: val[0])]
+     result = EMPTY_ARRAY
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 408)
+module_eval(<<'.,.,', 'parser.y', 406)
   def _reduce_173(val, _values, result)
-     val[0] << make_node(:TypeName, name: val[2], position_source: val[2])
+     result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 412)
+module_eval(<<'.,.,', 'parser.y', 407)
   def _reduce_174(val, _values, result)
-            result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
-
+     val[0] << val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 417)
+module_eval(<<'.,.,', 'parser.y', 411)
   def _reduce_175(val, _values, result)
-             result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+            result = make_node(:InterfaceTypeDefinition, name: val[2], interfaces: val[3], directives: val[4], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 422)
+module_eval(<<'.,.,', 'parser.y', 415)
   def _reduce_176(val, _values, result)
-            result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
-
+     result = [make_node(:TypeName, name: val[0], position_source: val[0])]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 427)
+module_eval(<<'.,.,', 'parser.y', 416)
   def _reduce_177(val, _values, result)
-            result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1].line, position_source: val[0] || val[1])
+     val[0] << make_node(:TypeName, name: val[2], position_source: val[2])
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 420)
+  def _reduce_178(val, _values, result)
+            result = make_node(:UnionTypeDefinition, name: val[2], directives: val[3], types: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
     result
   end
 .,.,
 
-# reduce 178 omitted
+module_eval(<<'.,.,', 'parser.y', 425)
+  def _reduce_179(val, _values, result)
+             result = make_node(:EnumTypeDefinition, name: val[2], directives: val[3], values: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
 
-# reduce 179 omitted
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'parser.y', 435)
+module_eval(<<'.,.,', 'parser.y', 430)
   def _reduce_180(val, _values, result)
-     result = [make_node(:DirectiveLocation, name: val[0].to_s, position_source: val[0])]
+            result = make_node(:InputObjectTypeDefinition, name: val[2], directives: val[3], fields: val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
+
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 436)
+module_eval(<<'.,.,', 'parser.y', 435)
   def _reduce_181(val, _values, result)
-     val[0] << make_node(:DirectiveLocation, name: val[2].to_s, position_source: val[2])
+            result = make_node(:DirectiveDefinition, name: val[3], arguments: val[4], locations: val[7], repeatable: !!val[5], description: val[0] || get_description(val[1]), definition_line: val[1][1], position_source: val[0] || val[1])
+
+    result
+  end
+.,.,
+
+# reduce 182 omitted
+
+# reduce 183 omitted
+
+module_eval(<<'.,.,', 'parser.y', 443)
+  def _reduce_184(val, _values, result)
+     result = [make_node(:DirectiveLocation, name: val[0][3], position_source: val[0])]
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 444)
+  def _reduce_185(val, _values, result)
+     val[0] << make_node(:DirectiveLocation, name: val[2][3], position_source: val[2])
     result
   end
 .,.,