prism 0.29.0 → 0.30.0

data/include/prism/util/pm_integer.h

@@ -48,6 +48,9 @@ typedef struct {
  * from the string itself.
  */
 typedef enum {
+    /** The default decimal base, with no prefix. Leading 0s will be ignored. */
+    PM_INTEGER_BASE_DEFAULT,
+
     /** The binary base, indicated by a 0b or 0B prefix. */
     PM_INTEGER_BASE_BINARY,
 
@@ -79,15 +82,7 @@ typedef enum {
  * @param start The start of the string.
  * @param end The end of the string.
  */
-PRISM_EXPORTED_FUNCTION void pm_integer_parse(pm_integer_t *integer, pm_integer_base_t base, const uint8_t *start, const uint8_t *end);
-
-/**
- * Return the memory size of the integer.
- *
- * @param integer The integer to get the memory size of.
- * @return The size of the memory associated with the integer.
- */
-size_t pm_integer_memsize(const pm_integer_t *integer);
+void pm_integer_parse(pm_integer_t *integer, pm_integer_base_t base, const uint8_t *start, const uint8_t *end);
 
 /**
  * Compare two integers. This function returns -1 if the left integer is less
@@ -100,6 +95,18 @@ size_t pm_integer_memsize(const pm_integer_t *integer);
  */
 int pm_integer_compare(const pm_integer_t *left, const pm_integer_t *right);
 
+/**
+ * Reduce a ratio of integers to its simplest form.
+ *
+ * If either the numerator or denominator do not fit into a 32-bit integer, then
+ * this function is a no-op. In the future, we may consider reducing even the
+ * larger numbers, but for now we're going to keep it simple.
+ *
+ * @param numerator The numerator of the ratio.
+ * @param denominator The denominator of the ratio.
+ */
+void pm_integers_reduce(pm_integer_t *numerator, pm_integer_t *denominator);
+
 /**
  * Convert an integer to a decimal string.
  *

data/include/prism/util/pm_string.h

@@ -120,14 +120,6 @@ PRISM_EXPORTED_FUNCTION bool pm_string_mapped_init(pm_string_t *string, const ch
  */
 PRISM_EXPORTED_FUNCTION bool pm_string_file_init(pm_string_t *string, const char *filepath);
 
-/**
- * Returns the memory size associated with the string.
- *
- * @param string The string to get the memory size of.
- * @return The size of the memory associated with the string.
- */
-size_t pm_string_memsize(const pm_string_t *string);
-
 /**
  * Ensure the string is owned. If it is not, then reinitialize it as owned and
  * copy over the previous source.

data/include/prism/version.h

@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 29
+#define PRISM_VERSION_MINOR 30
 
 /**
  * The patch version of the Prism library as an int.
@@ -24,6 +24,6 @@
 /**
  * The version of the Prism library as a constant string.
  */
-#define PRISM_VERSION "0.29.0"
+#define PRISM_VERSION "0.30.0"
 
 #endif

data/include/prism.h

@@ -219,17 +219,6 @@ PRISM_EXPORTED_FUNCTION const char * pm_token_type_name(pm_token_type_t token_ty
  */
 const char * pm_token_type_human(pm_token_type_t token_type);
 
-/**
- * Format the errors on the parser into the given buffer.
- *
- * @param parser The parser to format the errors for.
- * @param error_list The list of errors to format.
- * @param buffer The buffer to format the errors into.
- * @param colorize Whether or not to colorize the errors with ANSI escape sequences.
- * @param inline_messages Whether or not to inline the messages with the source.
- */
-PRISM_EXPORTED_FUNCTION void pm_parser_errors_format(const pm_parser_t *parser, const pm_list_t *error_list, pm_buffer_t *buffer, bool colorize, bool inline_messages);
-
 // We optionally support dumping to JSON. For systems that don't want or need
 // this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.
 #ifndef PRISM_EXCLUDE_JSON

data/lib/prism/compiler.rb

@@ -301,6 +301,9 @@ module Prism
     # Compile a InterpolatedXStringNode node
     alias visit_interpolated_x_string_node visit_child_nodes
 
+    # Compile a ItLocalVariableReadNode node
+    alias visit_it_local_variable_read_node visit_child_nodes
+
     # Compile a ItParametersNode node
     alias visit_it_parameters_node visit_child_nodes
 

data/lib/prism/dispatcher.rb

@@ -762,6 +762,14 @@ module Prism
       listeners[:on_interpolated_x_string_node_leave]&.each { |listener| listener.on_interpolated_x_string_node_leave(node) }
     end
 
+    # Dispatch enter and leave events for ItLocalVariableReadNode nodes and continue
+    # walking the tree.
+    def visit_it_local_variable_read_node(node)
+      listeners[:on_it_local_variable_read_node_enter]&.each { |listener| listener.on_it_local_variable_read_node_enter(node) }
+      super
+      listeners[:on_it_local_variable_read_node_leave]&.each { |listener| listener.on_it_local_variable_read_node_leave(node) }
+    end
+
     # Dispatch enter and leave events for ItParametersNode nodes and continue
     # walking the tree.
     def visit_it_parameters_node(node)
@@ -1795,6 +1803,12 @@ module Prism
         listeners[:on_interpolated_x_string_node_leave]&.each { |listener| listener.on_interpolated_x_string_node_leave(node) }
       end
 
+      # Dispatch enter and leave events for ItLocalVariableReadNode nodes.
+      def visit_it_local_variable_read_node(node)
+        listeners[:on_it_local_variable_read_node_enter]&.each { |listener| listener.on_it_local_variable_read_node_enter(node) }
+        listeners[:on_it_local_variable_read_node_leave]&.each { |listener| listener.on_it_local_variable_read_node_leave(node) }
+      end
+
       # Dispatch enter and leave events for ItParametersNode nodes.
       def visit_it_parameters_node(node)
         listeners[:on_it_parameters_node_enter]&.each { |listener| listener.on_it_parameters_node_enter(node) }

data/lib/prism/dot_visitor.rb

@@ -2780,6 +2780,20 @@ module Prism
       super
     end
 
+    # Visit a ItLocalVariableReadNode node.
+    def visit_it_local_variable_read_node(node)
+      table = Table.new("ItLocalVariableReadNode")
+      id = node_id(node)
+
+      digraph.nodes << <<~DOT
+        #{id} [
+          label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
+        ];
+      DOT
+
+      super
+    end
+
     # Visit a ItParametersNode node.
     def visit_it_parameters_node(node)
       table = Table.new("ItParametersNode")
@@ -3779,9 +3793,14 @@ module Prism
       table = Table.new("RationalNode")
       id = node_id(node)
 
-      # numeric
-      table.field("numeric", port: true)
-      digraph.edge("#{id}:numeric -> #{node_id(node.numeric)};")
+      # flags
+      table.field("flags", integer_base_flags_inspect(node))
+
+      # numerator
+      table.field("numerator", node.numerator.inspect)
+
+      # denominator
+      table.field("denominator", node.denominator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [

data/lib/prism/dsl.rb

@@ -482,6 +482,11 @@ module Prism
       InterpolatedXStringNode.new(source, opening_loc, parts, closing_loc, location)
     end
 
+    # Create a new ItLocalVariableReadNode node
+    def ItLocalVariableReadNode(source = nil, location = Location())
+      ItLocalVariableReadNode.new(source, location)
+    end
+
     # Create a new ItParametersNode node
     def ItParametersNode(source = nil, location = Location())
       ItParametersNode.new(source, location)
@@ -653,8 +658,8 @@ module Prism
     end
 
     # Create a new RationalNode node
-    def RationalNode(numeric, source = nil, location = Location())
-      RationalNode.new(source, numeric, location)
+    def RationalNode(flags, numerator, denominator, source = nil, location = Location())
+      RationalNode.new(source, flags, numerator, denominator, location)
     end
 
     # Create a new RedoNode node

data/lib/prism/ffi.rb

@@ -200,8 +200,8 @@ module Prism
 
   class << self
     # Mirror the Prism.dump API by using the serialization API.
-    def dump(code, **options)
-      LibRubyParser::PrismString.with_string(code) { |string| dump_common(string, options) }
+    def dump(source, **options)
+      LibRubyParser::PrismString.with_string(source) { |string| dump_common(string, options) }
     end
 
     # Mirror the Prism.dump_file API by using the serialization API.
@@ -302,6 +302,27 @@ module Prism
       !parse_file_success?(filepath, **options)
     end
 
+    # Mirror the Prism.profile API by using the serialization API.
+    def profile(source, **options)
+      LibRubyParser::PrismString.with_string(source) do |string|
+        LibRubyParser::PrismBuffer.with do |buffer|
+          LibRubyParser.pm_serialize_parse(buffer.pointer, string.pointer, string.length, dump_options(options))
+          nil
+        end
+      end
+    end
+
+    # Mirror the Prism.profile_file API by using the serialization API.
+    def profile_file(filepath, **options)
+      LibRubyParser::PrismString.with_file(filepath) do |string|
+        LibRubyParser::PrismBuffer.with do |buffer|
+          options[:filepath] = filepath
+          LibRubyParser.pm_serialize_parse(buffer.pointer, string.pointer, string.length, dump_options(options))
+          nil
+        end
+      end
+    end
+
     private
 
     def dump_common(string, options) # :nodoc:
@@ -394,7 +415,7 @@ module Prism
 
       template << "L"
       if (encoding = options[:encoding])
-        name = encoding.name
+        name = encoding.is_a?(Encoding) ? encoding.name : encoding
         values.push(name.bytesize, name.b)
         template << "A*"
       else

data/lib/prism/inspect_visitor.rb

@@ -1310,6 +1310,11 @@ module Prism
       commands << ["└── closing_loc: #{inspect_location(node.closing_loc)}\n", indent]
     end
 
+    # Inspect a ItLocalVariableReadNode node.
+    def visit_it_local_variable_read_node(node)
+      commands << [inspect_node("ItLocalVariableReadNode", node), indent]
+    end
+
     # Inspect a ItParametersNode node.
     def visit_it_parameters_node(node)
       commands << [inspect_node("ItParametersNode", node), indent]
@@ -1777,8 +1782,10 @@ module Prism
     # Inspect a RationalNode node.
     def visit_rational_node(node)
       commands << [inspect_node("RationalNode", node), indent]
-      commands << ["└── numeric:\n", indent]
-      commands << [node.numeric, "#{indent}    "]
+      flags = [("binary" if node.binary?), ("decimal" if node.decimal?), ("octal" if node.octal?), ("hexadecimal" if node.hexadecimal?)].compact
+      commands << ["├── flags: #{flags.empty? ? "∅" : flags.join(", ")}\n", indent]
+      commands << ["├── numerator: #{node.numerator.inspect}\n", indent]
+      commands << ["└── denominator: #{node.denominator.inspect}\n", indent]
     end
 
     # Inspect a RedoNode node.
@@ -2135,13 +2142,8 @@ module Prism
 
     # Compose a header for the given node.
     def inspect_node(name, node)
-      result = +"@ #{name} ("
-
       location = node.location
-      result << "location: (#{location.start_line},#{location.start_column})-(#{location.end_line},#{location.end_column})"
-      result << ", newline: true" if node.newline?
-
-      result << ")\n"
+      "@ #{name} (location: (#{location.start_line},#{location.start_column})-(#{location.end_line},#{location.end_column}))\n"
     end
 
     # Compose a string representing the given inner location field.

data/lib/prism/mutation_compiler.rb

@@ -446,6 +446,11 @@ module Prism
       node.copy(parts: visit_all(node.parts))
     end
 
+    # Copy a ItLocalVariableReadNode node
+    def visit_it_local_variable_read_node(node)
+      node.copy
+    end
+
     # Copy a ItParametersNode node
     def visit_it_parameters_node(node)
       node.copy
@@ -618,7 +623,7 @@ module Prism
 
     # Copy a RationalNode node
     def visit_rational_node(node)
-      node.copy(numeric: visit(node.numeric))
+      node.copy
     end
 
     # Copy a RedoNode node