tinygql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65e2106ae71f78971f49cbb5d1f718a0d17bcf7071d8cca8e15c7ca261e3deab
-  data.tar.gz: 5e5799f7ee255b306928caaacde79f803af0d5672a36da7404097ff4bd518b77
+  metadata.gz: fbe2d05150ba3c665c9d4fe81ee632a870d4420776a7b77736d124fd7036081b
+  data.tar.gz: 3e3ef634a539c8345a0701c18a0d61fd158dacaca505ca17506f16e2287ed144
 SHA512:
-  metadata.gz: 3e52942d40f93c438e5702bbca34b93d5a5156dd3ac939e0cdfb0459d37b163575f76e66c95a5873a2a0409c11d1e7df24bea02f8af91490ad34ed1b9e0b016c
-  data.tar.gz: e4d9add489df9f33191d4684de2550a578ff333879a28e333666b2d4cfe20ff2fda98a1729be0aa7ddd934dd0cc62a01522911b50336e9382e161f04e6325ed9
+  metadata.gz: 9605f20a8c7fed57279b8632315b689135cac81d44bcdfe014ec72bf48cc564f0c4f1c35b02de098a3dabaf4cc5b97af90dd10a07ec6170a5bb0a84ac8597afc
+  data.tar.gz: 046db3a78e16f1f08c7c66cebf2a17c9e46a014e8d9e9f9f9faeb4c67aa6a74f7fab3b392e67dc9db43e6cf4b47cc784b0f9667d6caec1663ecd674a27d02210

data/lib/tinygql/lexer.rb

@@ -4,38 +4,41 @@ require "strscan"
 
 module TinyGQL
   class Lexer
-    IDENTIFIER =    /[_A-Za-z][_0-9A-Za-z]*/
+    IDENTIFIER =    /[_A-Za-z][_0-9A-Za-z]*\b/
     IGNORE   =       %r{
       (?:
         [, \c\r\n\t]+ |
         \#.*$
-      )
+      )*
     }x
     INT =           /[-]?(?:[0]|[1-9][0-9]*)/
     FLOAT_DECIMAL = /[.][0-9]+/
     FLOAT_EXP =     /[eE][+-]?[0-9]+/
-    FLOAT =         /#{INT}(#{FLOAT_DECIMAL}#{FLOAT_EXP}|#{FLOAT_DECIMAL}|#{FLOAT_EXP})/
+    NUMERIC =  /#{INT}(#{FLOAT_DECIMAL}#{FLOAT_EXP}|#{FLOAT_DECIMAL}|#{FLOAT_EXP})?/
+
+    KEYWORDS = {
+      "on" => :ON,
+      "fragment" => :FRAGMENT,
+      "true" => :TRUE,
+      "false" => :FALSE,
+      "null" => :NULL,
+      "query" => :QUERY,
+      "mutation" => :MUTATION,
+      "subscription" => :SUBSCRIPTION,
+      "schema" => :SCHEMA,
+      "scalar" => :SCALAR,
+      "type" => :TYPE,
+      "extend" => :EXTEND,
+      "implements" => :IMPLEMENTS,
+      "interface" => :INTERFACE,
+      "union" => :UNION,
+      "enum" => :ENUM,
+      "input" => :INPUT,
+      "directive" => :DIRECTIVE,
+      "repeatable" => :REPEATABLE
+    }.freeze
 
     module Literals
-      ON =            /on\b/
-      FRAGMENT =      /fragment\b/
-      TRUE =          /true\b/
-      FALSE =         /false\b/
-      NULL =          /null\b/
-      QUERY =         /query\b/
-      MUTATION =      /mutation\b/
-      SUBSCRIPTION =  /subscription\b/
-      SCHEMA =        /schema\b/
-      SCALAR =        /scalar\b/
-      TYPE =          /type\b/
-      EXTEND =        /extend\b/
-      IMPLEMENTS =    /implements\b/
-      INTERFACE =     /interface\b/
-      UNION =         /union\b/
-      ENUM =          /enum\b/
-      INPUT =         /input\b/
-      DIRECTIVE =     /directive\b/
-      REPEATABLE =    /repeatable\b/
       LCURLY =        '{'
       RCURLY =        '}'
       LPAREN =        '('
@@ -66,9 +69,7 @@ module TinyGQL
     STRING_CHAR = /#{ESCAPED_QUOTE}|[^"\\]|#{UNICODE_ESCAPE}|#{STRING_ESCAPE}/
 
     LIT_NAME_LUT = Literals.constants.each_with_object({}) { |n, o|
-      key = Literals.const_get(n)
-      key = key.is_a?(Regexp) ? key.source.gsub(/(\\b|\\)/, '') : key
-      o[key] = n
+      o[Literals.const_get(n)] = n
     }
 
     LIT = Regexp.union(Literals.constants.map { |n| Literals.const_get(n) })
@@ -86,9 +87,6 @@ module TinyGQL
         #{BLOCK_QUOTE}
     }xm
 
-    # # catch-all for anything else. must be at the bottom for precedence.
-    UNKNOWN_CHAR =         /./
-
     def initialize string
       raise unless string.valid_encoding?
 
@@ -106,25 +104,17 @@ module TinyGQL
     end
 
     def advance
-      while true
-        if @scan.eos?
-          emit nil, nil
-          return false
-        end
-
-        case
-        when @scan.skip(IGNORE)              then redo
-        when str = @scan.scan(FLOAT)         then return emit(:FLOAT, str)
-        when str = @scan.scan(INT)           then return emit(:INT, str)
-        when str = @scan.scan(LIT)           then return emit(LIT_NAME_LUT[str], str)
-        when str = @scan.scan(IDENTIFIER)    then return emit(:IDENTIFIER, str)
-        when @scan.skip(BLOCK_STRING)        then return emit_block(@scan[1])
-        when @scan.skip(QUOTED_STRING)       then return emit_string(@scan[1])
-        when str = @scan.scan(UNKNOWN_CHAR)  then return emit(:UNKNOWN_CHAR, str)
-        else
-          # This should never happen since `UNKNOWN_CHAR` ensures we make progress
-          raise "Unknown string?"
-        end
+      @scan.skip(IGNORE)
+
+      case
+      when str = @scan.scan(LIT)           then return emit(LIT_NAME_LUT[str], str)
+      when str = @scan.scan(IDENTIFIER)    then return emit(KEYWORDS.fetch(str, :IDENTIFIER), str)
+      when @scan.skip(BLOCK_STRING)        then return emit_block(@scan[1])
+      when @scan.skip(QUOTED_STRING)       then return emit_string(@scan[1])
+      when str = @scan.scan(NUMERIC)       then return emit(@scan[1] ? :FLOAT : :INT, str)
+      when @scan.eos?                      then emit(nil, nil) and return false
+      else
+        emit(:UNKNOWN_CHAR, @scan.getch)
       end
     end
 

data/lib/tinygql/nodes.rb

@@ -3,48 +3,48 @@ module TinyGQL
     class Node
       include Enumerable
 
-      def document? = false
-      def operation_definition? = false
-      def variable? = false
-      def named_type? = false
-      def not_null_type? = false
-      def list_type? = false
-      def variable_definition? = false
-      def value? = false
-      def argument? = false
-      def field? = false
-      def object_field? = false
-      def int_value? = false
-      def float_value? = false
-      def string_value? = false
-      def boolean_value? = false
-      def null_value? = false
-      def enum_value? = false
-      def list_value? = false
-      def object_value? = false
-      def directive? = false
-      def type_condition? = false
-      def inline_fragment? = false
-      def fragment_spread? = false
-      def fragment_definition? = false
-      def root_operation_type_definition? = false
-      def schema_definition? = false
-      def field_definition? = false
-      def input_value_definition? = false
-      def object_type_definition? = false
-      def interface_type_definition? = false
-      def union_type_definition? = false
-      def scalar_type_definition? = false
-      def enum_value_definition? = false
-      def enum_type_definition? = false
-      def input_object_type_definition? = false
-      def object_type_extension? = false
-      def executable_directive_location? = false
-      def type_system_directive_location? = false
-      def directive_definition? = false
+    def document?; false; end
+    def operation_definition?; false; end
+    def variable?; false; end
+    def named_type?; false; end
+    def not_null_type?; false; end
+    def list_type?; false; end
+    def variable_definition?; false; end
+    def value?; false; end
+    def argument?; false; end
+    def field?; false; end
+    def object_field?; false; end
+    def int_value?; false; end
+    def float_value?; false; end
+    def string_value?; false; end
+    def boolean_value?; false; end
+    def null_value?; false; end
+    def enum_value?; false; end
+    def list_value?; false; end
+    def object_value?; false; end
+    def directive?; false; end
+    def type_condition?; false; end
+    def inline_fragment?; false; end
+    def fragment_spread?; false; end
+    def fragment_definition?; false; end
+    def root_operation_type_definition?; false; end
+    def schema_definition?; false; end
+    def field_definition?; false; end
+    def input_value_definition?; false; end
+    def object_type_definition?; false; end
+    def interface_type_definition?; false; end
+    def union_type_definition?; false; end
+    def scalar_type_definition?; false; end
+    def enum_value_definition?; false; end
+    def enum_type_definition?; false; end
+    def input_object_type_definition?; false; end
+    def object_type_extension?; false; end
+    def executable_directive_location?; false; end
+    def type_system_directive_location?; false; end
+    def directive_definition?; false; end
       def each(&blk)
         yield self
-        children.each { _1.each(&blk) }
+        children.each { |v| v.each(&blk) }
       end
     end
 
@@ -63,7 +63,7 @@ module TinyGQL
         viz.handle_document self, seed
       end
 
-      def document? = true
+      def document?; true; end
 
       def children
         ary = []; ary.concat(definitions); ary
@@ -88,7 +88,7 @@ module TinyGQL
         viz.handle_operation_definition self, seed
       end
 
-      def operation_definition? = true
+      def operation_definition?; true; end
 
       def children
         ary = []; ary.concat(variable_definitions) if variable_definitions; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -109,7 +109,7 @@ module TinyGQL
         viz.handle_variable self, seed
       end
 
-      def variable? = true
+      def variable?; true; end
 
       def children
         ary = []; ary
@@ -130,7 +130,7 @@ module TinyGQL
         viz.handle_named_type self, seed
       end
 
-      def named_type? = true
+      def named_type?; true; end
 
       def children
         ary = []; ary
@@ -151,7 +151,7 @@ module TinyGQL
         viz.handle_not_null_type self, seed
       end
 
-      def not_null_type? = true
+      def not_null_type?; true; end
 
       def children
         ary = []; ary << type; ary
@@ -172,7 +172,7 @@ module TinyGQL
         viz.handle_list_type self, seed
       end
 
-      def list_type? = true
+      def list_type?; true; end
 
       def children
         ary = []; ary << type; ary
@@ -195,7 +195,7 @@ module TinyGQL
         viz.handle_variable_definition self, seed
       end
 
-      def variable_definition? = true
+      def variable_definition?; true; end
 
       def children
         ary = []; ary << variable; ary << type; ary << default_value if default_value; ary
@@ -216,7 +216,7 @@ module TinyGQL
         viz.handle_value self, seed
       end
 
-      def value? = true
+      def value?; true; end
 
       def children
         ary = []; ary
@@ -238,7 +238,7 @@ module TinyGQL
         viz.handle_argument self, seed
       end
 
-      def argument? = true
+      def argument?; true; end
 
       def children
         ary = []; ary << value; ary
@@ -263,7 +263,7 @@ module TinyGQL
         viz.handle_field self, seed
       end
 
-      def field? = true
+      def field?; true; end
 
       def children
         ary = []; ary.concat(arguments) if arguments; ary.concat(directives) if directives; ary.concat(selection_set) if selection_set; ary
@@ -285,7 +285,7 @@ module TinyGQL
         viz.handle_object_field self, seed
       end
 
-      def object_field? = true
+      def object_field?; true; end
 
       def children
         ary = []; ary << value; ary
@@ -301,7 +301,7 @@ module TinyGQL
         viz.handle_int_value self, seed
       end
 
-      def int_value? = true
+      def int_value?; true; end
 
     end
     class FloatValue < Value
@@ -314,7 +314,7 @@ module TinyGQL
         viz.handle_float_value self, seed
       end
 
-      def float_value? = true
+      def float_value?; true; end
 
     end
     class StringValue < Value
@@ -327,7 +327,7 @@ module TinyGQL
         viz.handle_string_value self, seed
       end
 
-      def string_value? = true
+      def string_value?; true; end
 
     end
     class BooleanValue < Value
@@ -340,7 +340,7 @@ module TinyGQL
         viz.handle_boolean_value self, seed
       end
 
-      def boolean_value? = true
+      def boolean_value?; true; end
 
     end
     class NullValue < Value
@@ -353,7 +353,7 @@ module TinyGQL
         viz.handle_null_value self, seed
       end
 
-      def null_value? = true
+      def null_value?; true; end
 
     end
     class EnumValue < Value
@@ -366,7 +366,7 @@ module TinyGQL
         viz.handle_enum_value self, seed
       end
 
-      def enum_value? = true
+      def enum_value?; true; end
 
     end
     class ListValue < Value
@@ -379,7 +379,7 @@ module TinyGQL
         viz.handle_list_value self, seed
       end
 
-      def list_value? = true
+      def list_value?; true; end
 
     end
     class ObjectValue < Node
@@ -397,7 +397,7 @@ module TinyGQL
         viz.handle_object_value self, seed
       end
 
-      def object_value? = true
+      def object_value?; true; end
 
       def children
         ary = []; ary.concat(values); ary
@@ -419,7 +419,7 @@ module TinyGQL
         viz.handle_directive self, seed
       end
 
-      def directive? = true
+      def directive?; true; end
 
       def children
         ary = []; ary.concat(arguments); ary
@@ -440,7 +440,7 @@ module TinyGQL
         viz.handle_type_condition self, seed
       end
 
-      def type_condition? = true
+      def type_condition?; true; end
 
       def children
         ary = []; ary << named_type; ary
@@ -463,7 +463,7 @@ module TinyGQL
         viz.handle_inline_fragment self, seed
       end
 
-      def inline_fragment? = true
+      def inline_fragment?; true; end
 
       def children
         ary = []; ary << type_condition if type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -485,7 +485,7 @@ module TinyGQL
         viz.handle_fragment_spread self, seed
       end
 
-      def fragment_spread? = true
+      def fragment_spread?; true; end
 
       def children
         ary = []; ary << fragment_name; ary.concat(directives) if directives; ary
@@ -509,7 +509,7 @@ module TinyGQL
         viz.handle_fragment_definition self, seed
       end
 
-      def fragment_definition? = true
+      def fragment_definition?; true; end
 
       def children
         ary = []; ary << fragment_name; ary << type_condition; ary.concat(directives) if directives; ary.concat(selection_set); ary
@@ -531,7 +531,7 @@ module TinyGQL
         viz.handle_root_operation_type_definition self, seed
       end
 
-      def root_operation_type_definition? = true
+      def root_operation_type_definition?; true; end
 
       def children
         ary = []; ary << operation_type; ary << named_type; ary
@@ -553,7 +553,7 @@ module TinyGQL
         viz.handle_schema_definition self, seed
       end
 
-      def schema_definition? = true
+      def schema_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(root_operation_definitions); ary
@@ -578,7 +578,7 @@ module TinyGQL
         viz.handle_field_definition self, seed
       end
 
-      def field_definition? = true
+      def field_definition?; true; end
 
       def children
         ary = []; ary.concat(arguments_definition) if arguments_definition; ary << type; ary.concat(directives) if directives; ary
@@ -603,7 +603,7 @@ module TinyGQL
         viz.handle_input_value_definition self, seed
       end
 
-      def input_value_definition? = true
+      def input_value_definition?; true; end
 
       def children
         ary = []; ary << type; ary << default_value if default_value; ary.concat(directives) if directives; ary
@@ -628,7 +628,7 @@ module TinyGQL
         viz.handle_object_type_definition self, seed
       end
 
-      def object_type_definition? = true
+      def object_type_definition?; true; end
 
       def children
         ary = []; ary.concat(implements_interfaces) if implements_interfaces; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -652,7 +652,7 @@ module TinyGQL
         viz.handle_interface_type_definition self, seed
       end
 
-      def interface_type_definition? = true
+      def interface_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -676,7 +676,7 @@ module TinyGQL
         viz.handle_union_type_definition self, seed
       end
 
-      def union_type_definition? = true
+      def union_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(union_member_types) if union_member_types; ary
@@ -699,7 +699,7 @@ module TinyGQL
         viz.handle_scalar_type_definition self, seed
       end
 
-      def scalar_type_definition? = true
+      def scalar_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary
@@ -722,7 +722,7 @@ module TinyGQL
         viz.handle_enum_value_definition self, seed
       end
 
-      def enum_value_definition? = true
+      def enum_value_definition?; true; end
 
       def children
         ary = []; ary << enum_value; ary.concat(directives) if directives; ary
@@ -746,7 +746,7 @@ module TinyGQL
         viz.handle_enum_type_definition self, seed
       end
 
-      def enum_type_definition? = true
+      def enum_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(enum_value_definition) if enum_value_definition; ary
@@ -770,7 +770,7 @@ module TinyGQL
         viz.handle_input_object_type_definition self, seed
       end
 
-      def input_object_type_definition? = true
+      def input_object_type_definition?; true; end
 
       def children
         ary = []; ary.concat(directives) if directives; ary.concat(input_fields_definition) if input_fields_definition; ary
@@ -794,7 +794,7 @@ module TinyGQL
         viz.handle_object_type_extension self, seed
       end
 
-      def object_type_extension? = true
+      def object_type_extension?; true; end
 
       def children
         ary = []; ary.concat(implements_interfaces) if implements_interfaces; ary.concat(directives) if directives; ary.concat(fields_definition) if fields_definition; ary
@@ -815,7 +815,7 @@ module TinyGQL
         viz.handle_executable_directive_location self, seed
       end
 
-      def executable_directive_location? = true
+      def executable_directive_location?; true; end
 
       def children
         ary = []; ary
@@ -836,7 +836,7 @@ module TinyGQL
         viz.handle_type_system_directive_location self, seed
       end
 
-      def type_system_directive_location? = true
+      def type_system_directive_location?; true; end
 
       def children
         ary = []; ary
@@ -860,7 +860,7 @@ module TinyGQL
         viz.handle_directive_definition self, seed
       end
 
-      def directive_definition? = true
+      def directive_definition?; true; end
 
       def children
         ary = []; ary.concat(arguments_definition) if arguments_definition; ary.concat(directive_locations); ary

data/lib/tinygql/nodes.rb.erb

@@ -4,7 +4,7 @@ module TinyGQL
       include Enumerable
 
 <%- nodes.each do |node| -%>
-      def <%= node.human_name %>? = false
+    def <%= node.human_name %>?; false; end
 <%- end -%>
       def each(&blk)
         yield self
@@ -32,7 +32,7 @@ module TinyGQL
         viz.handle_<%= node.human_name %> self, seed
       end
 
-      def <%= node.human_name %>? = true
+      def <%= node.human_name %>?; true; end
 
       <%- if node.has_children? -%>
       def children

data/lib/tinygql/version.rb

@@ -1,3 +1,3 @@
 module TinyGQL
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/tinygql/visitors.rb

@@ -2,16 +2,16 @@ module TinyGQL
   module Visitors
     module Visitor
       def handle_document obj
-            obj.definitions.each { _1.accept self }
+            obj.definitions.each { |v| v.accept self }
       end
       def handle_operation_definition obj
         if obj.variable_definitions
-            obj.variable_definitions.each { _1.accept self }
+            obj.variable_definitions.each { |v| v.accept self }
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
-            obj.selection_set.each { _1.accept self }
+            obj.selection_set.each { |v| v.accept self }
       end
       def handle_variable obj
       end
@@ -37,13 +37,13 @@ module TinyGQL
       end
       def handle_field obj
         if obj.arguments
-            obj.arguments.each { _1.accept self }
+            obj.arguments.each { |v| v.accept self }
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.selection_set
-            obj.selection_set.each { _1.accept self }
+            obj.selection_set.each { |v| v.accept self }
         end
       end
       def handle_object_field obj
@@ -64,10 +64,10 @@ module TinyGQL
       def handle_list_value obj
       end
       def handle_object_value obj
-            obj.values.each { _1.accept self }
+            obj.values.each { |v| v.accept self }
       end
       def handle_directive obj
-            obj.arguments.each { _1.accept self }
+            obj.arguments.each { |v| v.accept self }
       end
       def handle_type_condition obj
             obj.named_type.accept self
@@ -77,23 +77,23 @@ module TinyGQL
             obj.type_condition.accept self
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
-            obj.selection_set.each { _1.accept self }
+            obj.selection_set.each { |v| v.accept self }
       end
       def handle_fragment_spread obj
             obj.fragment_name.accept self
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
       end
       def handle_fragment_definition obj
             obj.fragment_name.accept self
             obj.type_condition.accept self
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
-            obj.selection_set.each { _1.accept self }
+            obj.selection_set.each { |v| v.accept self }
       end
       def handle_root_operation_type_definition obj
             obj.operation_type.accept self
@@ -101,17 +101,17 @@ module TinyGQL
       end
       def handle_schema_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
-            obj.root_operation_definitions.each { _1.accept self }
+            obj.root_operation_definitions.each { |v| v.accept self }
       end
       def handle_field_definition obj
         if obj.arguments_definition
-            obj.arguments_definition.each { _1.accept self }
+            obj.arguments_definition.each { |v| v.accept self }
         end
             obj.type.accept self
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
       end
       def handle_input_value_definition obj
@@ -120,72 +120,72 @@ module TinyGQL
             obj.default_value.accept self
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
       end
       def handle_object_type_definition obj
         if obj.implements_interfaces
-            obj.implements_interfaces.each { _1.accept self }
+            obj.implements_interfaces.each { |v| v.accept self }
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.fields_definition
-            obj.fields_definition.each { _1.accept self }
+            obj.fields_definition.each { |v| v.accept self }
         end
       end
       def handle_interface_type_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.fields_definition
-            obj.fields_definition.each { _1.accept self }
+            obj.fields_definition.each { |v| v.accept self }
         end
       end
       def handle_union_type_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.union_member_types
-            obj.union_member_types.each { _1.accept self }
+            obj.union_member_types.each { |v| v.accept self }
         end
       end
       def handle_scalar_type_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
       end
       def handle_enum_value_definition obj
             obj.enum_value.accept self
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
       end
       def handle_enum_type_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.enum_value_definition
-            obj.enum_value_definition.each { _1.accept self }
+            obj.enum_value_definition.each { |v| v.accept self }
         end
       end
       def handle_input_object_type_definition obj
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.input_fields_definition
-            obj.input_fields_definition.each { _1.accept self }
+            obj.input_fields_definition.each { |v| v.accept self }
         end
       end
       def handle_object_type_extension obj
         if obj.implements_interfaces
-            obj.implements_interfaces.each { _1.accept self }
+            obj.implements_interfaces.each { |v| v.accept self }
         end
         if obj.directives
-            obj.directives.each { _1.accept self }
+            obj.directives.each { |v| v.accept self }
         end
         if obj.fields_definition
-            obj.fields_definition.each { _1.accept self }
+            obj.fields_definition.each { |v| v.accept self }
         end
       end
       def handle_executable_directive_location obj
@@ -194,25 +194,25 @@ module TinyGQL
       end
       def handle_directive_definition obj
         if obj.arguments_definition
-            obj.arguments_definition.each { _1.accept self }
+            obj.arguments_definition.each { |v| v.accept self }
         end
-            obj.directive_locations.each { _1.accept self }
+            obj.directive_locations.each { |v| v.accept self }
       end
     end
 
     module Fold
       def handle_document obj, seed
-            obj.definitions.each { seed = _1.fold(self, seed) }
+            obj.definitions.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_operation_definition obj, seed
         if obj.variable_definitions
-            obj.variable_definitions.each { seed = _1.fold(self, seed) }
+            obj.variable_definitions.each { |v| seed = v.fold(self, seed) }
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
-            obj.selection_set.each { seed = _1.fold(self, seed) }
+            obj.selection_set.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_variable obj, seed
@@ -246,13 +246,13 @@ module TinyGQL
       end
       def handle_field obj, seed
         if obj.arguments
-            obj.arguments.each { seed = _1.fold(self, seed) }
+            obj.arguments.each { |v| seed = v.fold(self, seed) }
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.selection_set
-            obj.selection_set.each { seed = _1.fold(self, seed) }
+            obj.selection_set.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
@@ -282,11 +282,11 @@ module TinyGQL
         seed
       end
       def handle_object_value obj, seed
-            obj.values.each { seed = _1.fold(self, seed) }
+            obj.values.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_directive obj, seed
-            obj.arguments.each { seed = _1.fold(self, seed) }
+            obj.arguments.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_type_condition obj, seed
@@ -298,15 +298,15 @@ module TinyGQL
             seed = obj.type_condition.fold self, seed
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
-            obj.selection_set.each { seed = _1.fold(self, seed) }
+            obj.selection_set.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_fragment_spread obj, seed
             seed = obj.fragment_name.fold self, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
@@ -314,9 +314,9 @@ module TinyGQL
             seed = obj.fragment_name.fold self, seed
             seed = obj.type_condition.fold self, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
-            obj.selection_set.each { seed = _1.fold(self, seed) }
+            obj.selection_set.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_root_operation_type_definition obj, seed
@@ -326,18 +326,18 @@ module TinyGQL
       end
       def handle_schema_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
-            obj.root_operation_definitions.each { seed = _1.fold(self, seed) }
+            obj.root_operation_definitions.each { |v| seed = v.fold(self, seed) }
         seed
       end
       def handle_field_definition obj, seed
         if obj.arguments_definition
-            obj.arguments_definition.each { seed = _1.fold(self, seed) }
+            obj.arguments_definition.each { |v| seed = v.fold(self, seed) }
         end
             seed = obj.type.fold self, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
@@ -347,80 +347,80 @@ module TinyGQL
             seed = obj.default_value.fold self, seed
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_object_type_definition obj, seed
         if obj.implements_interfaces
-            obj.implements_interfaces.each { seed = _1.fold(self, seed) }
+            obj.implements_interfaces.each { |v| seed = v.fold(self, seed) }
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.fields_definition
-            obj.fields_definition.each { seed = _1.fold(self, seed) }
+            obj.fields_definition.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_interface_type_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.fields_definition
-            obj.fields_definition.each { seed = _1.fold(self, seed) }
+            obj.fields_definition.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_union_type_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.union_member_types
-            obj.union_member_types.each { seed = _1.fold(self, seed) }
+            obj.union_member_types.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_scalar_type_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_enum_value_definition obj, seed
             seed = obj.enum_value.fold self, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_enum_type_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.enum_value_definition
-            obj.enum_value_definition.each { seed = _1.fold(self, seed) }
+            obj.enum_value_definition.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_input_object_type_definition obj, seed
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.input_fields_definition
-            obj.input_fields_definition.each { seed = _1.fold(self, seed) }
+            obj.input_fields_definition.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
       def handle_object_type_extension obj, seed
         if obj.implements_interfaces
-            obj.implements_interfaces.each { seed = _1.fold(self, seed) }
+            obj.implements_interfaces.each { |v| seed = v.fold(self, seed) }
         end
         if obj.directives
-            obj.directives.each { seed = _1.fold(self, seed) }
+            obj.directives.each { |v| seed = v.fold(self, seed) }
         end
         if obj.fields_definition
-            obj.fields_definition.each { seed = _1.fold(self, seed) }
+            obj.fields_definition.each { |v| seed = v.fold(self, seed) }
         end
         seed
       end
@@ -432,9 +432,9 @@ module TinyGQL
       end
       def handle_directive_definition obj, seed
         if obj.arguments_definition
-            obj.arguments_definition.each { seed = _1.fold(self, seed) }
+            obj.arguments_definition.each { |v| seed = v.fold(self, seed) }
         end
-            obj.directive_locations.each { seed = _1.fold(self, seed) }
+            obj.directive_locations.each { |v| seed = v.fold(self, seed) }
         seed
       end
     end

data/test/lexer_test.rb

@@ -40,6 +40,18 @@ module TinyGQL
       assert_equal [:IDENTIFIER, "lol"], lexer.next_token
     end
 
+    def test_int
+      str = "1"
+      lexer = Lexer.new str
+      assert_equal [:INT, "1"], lexer.next_token
+    end
+
+    def test_float
+      str = "1.2"
+      lexer = Lexer.new str
+      assert_equal [:FLOAT, "1.2"], lexer.next_token
+    end
+
     def test_block_string
       doc = <<-eos
 """

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinygql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aaron Patterson