Merge pull request #2724 from ruby/consolidate-reflection

Consolidate integer fields into a single reflection class

Author: kddnewton

rbi/prism/reflection.rbi

@@ -4,11 +4,11 @@ module Prism::Reflection
 end
 
 class Prism::Reflection::Field
-  sig { returns(Symbol) }
-  def name; end
-
   sig { params(name: Symbol).void }
   def initialize(name); end
+
+  sig { returns(Symbol) }
+  def name; end
 end
 
 class Prism::Reflection::NodeField < Prism::Reflection::Field
@@ -38,24 +38,18 @@ end
 class Prism::Reflection::OptionalLocationField < Prism::Reflection::Field
 end
 
-class Prism::Reflection::UInt8Field < Prism::Reflection::Field
+class Prism::Reflection::IntegerField < Prism::Reflection::Field
 end
 
-class Prism::Reflection::UInt32Field < Prism::Reflection::Field
+class Prism::Reflection::FloatField < Prism::Reflection::Field
 end
 
 class Prism::Reflection::FlagsField < Prism::Reflection::Field
-  sig { returns(T::Array[Symbol]) }
-  def flags; end
-
   sig { params(name: Symbol, flags: T::Array[Symbol]).void }
   def initialize(name, flags); end
-end
-
-class Prism::Reflection::IntegerField < Prism::Reflection::Field
-end
 
-class Prism::Reflection::DoubleField < Prism::Reflection::Field
+  sig { returns(T::Array[Symbol]) }
+  def flags; end
 end
 
 module Prism::Reflection

sig/prism/reflection.rbs

@@ -33,10 +33,10 @@ module Prism
     class OptionalLocationField < Field
     end
 
-    class UInt8Field < Field
+    class IntegerField < Field
     end
 
-    class UInt32Field < Field
+    class FloatField < Field
     end
 
     class FlagsField < Field
@@ -45,12 +45,6 @@ module Prism
       def initialize: (Symbol name, Array[Symbol] flags) -> void
     end
 
-    class IntegerField < Field
-    end
-
-    class DoubleField < Field
-    end
-
     def self.fields_for: (node_singleton node) -> Array[Field]
   end
 end

templates/lib/prism/reflection.rb.erb

@@ -65,14 +65,16 @@ module Prism
     class OptionalLocationField < Field
     end
 
-    # A uint8 field represents an unsigned 8-bit integer value on a node. It
-    # resolves to an Integer in Ruby.
-    class UInt8Field < Field
+    # An integer field represents an integer value. It is used to represent the
+    # value of an integer literal, the depth of local variables, and the number
+    # of a numbered reference. It resolves to an Integer in Ruby.
+    class IntegerField < Field
     end
 
-    # A uint32 field represents an unsigned 32-bit integer value on a node. It
-    # resolves to an Integer in Ruby.
-    class UInt32Field < Field
+    # A float field represents a double-precision floating point value. It is
+    # used exclusively to represent the value of a floating point literal. It
+    # resolves to a Float in Ruby.
+    class FloatField < Field
     end
 
     # A flags field represents a bitset of flags on a node. It resolves to an
@@ -90,18 +92,6 @@ module Prism
       end
     end
 
-    # An integer field represents an arbitrarily-sized integer value. It is used
-    # exclusively to represent the value of an integer literal. It resolves to
-    # an Integer in Ruby.
-    class IntegerField < Field
-    end
-
-    # A double field represents a double-precision floating point value. It is
-    # used exclusively to represent the value of a floating point literal. It
-    # resolves to a Float in Ruby.
-    class DoubleField < Field
-    end
-
     # Returns the fields for the given node.
     def self.fields_for(node)
       case node.type
@@ -127,17 +117,13 @@ module Prism
             "LocationField.new(:#{field.name})"
           when Prism::Template::OptionalLocationField
             "OptionalLocationField.new(:#{field.name})"
-          when Prism::Template::UInt8Field
-            "UInt8Field.new(:#{field.name})"
-          when Prism::Template::UInt32Field
-            "UInt32Field.new(:#{field.name})"
+          when Prism::Template::UInt8Field, Prism::Template::UInt32Field, Prism::Template::IntegerField
+            "Integer.new(:#{field.name})"
+          when Prism::Template::DoubleField
+            "FloatField.new(:#{field.name})"
           when Prism::Template::FlagsField
             found = flags.find { |flag| flag.name == field.kind }.tap { |found| raise "Expected to find #{field.kind}" unless found }
             "FlagsField.new(:#{field.name}, [#{found.values.map { |value| ":#{value.name.downcase}?" }.join(", ")}])"
-          when Prism::Template::IntegerField
-            "IntegerField.new(:#{field.name})"
-          when Prism::Template::DoubleField
-            "DoubleField.new(:#{field.name})"
           else
             raise field.class.name
           end