prism 0.26.0 → 0.28.0

data/include/prism/static_literals.h

@@ -8,8 +8,7 @@
 
 #include "prism/defines.h"
 #include "prism/ast.h"
-#include "prism/node.h"
-#include "prism/parser.h"
+#include "prism/util/pm_newline_list.h"
 
 #include <assert.h>
 #include <stdbool.h>
@@ -92,12 +91,13 @@ typedef struct {
 /**
  * Add a node to the set of static literals.
  *
- * @param parser The parser that created the node.
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
  * @param literals The set of static literals to add the node to.
  * @param node The node to add to the set.
  * @return A pointer to the node that is being overwritten, if there is one.
  */
-pm_node_t * pm_static_literals_add(const pm_parser_t *parser, pm_static_literals_t *literals, pm_node_t *node);
+pm_node_t * pm_static_literals_add(const pm_newline_list_t *newline_list, int32_t start_line, pm_static_literals_t *literals, pm_node_t *node);
 
 /**
  * Free the internal memory associated with the given static literals set.
@@ -110,9 +110,11 @@ void pm_static_literals_free(pm_static_literals_t *literals);
  * Create a string-based representation of the given static literal.
  *
  * @param buffer The buffer to write the string to.
- * @param parser The parser that created the node.
+ * @param newline_list The list of newline offsets to use to calculate lines.
+ * @param start_line The line number that the parser starts on.
+ * @param encoding_name The name of the encoding of the source being parsed.
  * @param node The node to create a string representation of.
  */
-PRISM_EXPORTED_FUNCTION void pm_static_literal_inspect(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *node);
+PRISM_EXPORTED_FUNCTION void pm_static_literal_inspect(pm_buffer_t *buffer, const pm_newline_list_t *newline_list, int32_t start_line, const char *encoding_name, const pm_node_t *node);
 
 #endif

data/include/prism/version.h

@@ -14,7 +14,7 @@
 /**
  * The minor version of the Prism library as an int.
  */
-#define PRISM_VERSION_MINOR 26
+#define PRISM_VERSION_MINOR 28
 
 /**
  * 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.26.0"
+#define PRISM_VERSION "0.28.0"
 
 #endif

data/lib/prism/dot_visitor.rb

@@ -1287,13 +1287,15 @@ module Prism
         digraph.edge("#{id}:parent -> #{node_id(parent)};")
       end
 
-      # child
-      table.field("child", port: true)
-      digraph.edge("#{id}:child -> #{node_id(node.child)};")
+      # name
+      table.field("name", node.name.inspect)
 
       # delimiter_loc
       table.field("delimiter_loc", location_inspect(node.delimiter_loc))
 
+      # name_loc
+      table.field("name_loc", location_inspect(node.name_loc))
+
       digraph.nodes << <<~DOT
         #{id} [
           label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
@@ -1367,13 +1369,15 @@ module Prism
         digraph.edge("#{id}:parent -> #{node_id(parent)};")
       end
 
-      # child
-      table.field("child", port: true)
-      digraph.edge("#{id}:child -> #{node_id(node.child)};")
+      # name
+      table.field("name", node.name.inspect)
 
       # delimiter_loc
       table.field("delimiter_loc", location_inspect(node.delimiter_loc))
 
+      # name_loc
+      table.field("name_loc", location_inspect(node.name_loc))
+
       digraph.nodes << <<~DOT
         #{id} [
           label=<#{table.to_dot.gsub(/\n/, "\n  ")}>
@@ -3999,6 +4003,9 @@ module Prism
       table = Table.new("ReturnNode")
       id = node_id(node)
 
+      # flags
+      table.field("flags", return_node_flags_inspect(node))
+
       # keyword_loc
       table.field("keyword_loc", location_inspect(node.keyword_loc))
 
@@ -4569,6 +4576,7 @@ module Prism
     # comma-separated list.
     def arguments_node_flags_inspect(node)
       flags = [] #: Array[String]
+      flags << "contains_keywords" if node.contains_keywords?
       flags << "contains_keyword_splat" if node.contains_keyword_splat?
       flags.join(", ")
     end
@@ -4671,6 +4679,14 @@ module Prism
       flags.join(", ")
     end
 
+    # Inspect a node that has return_node_flags flags to display the flags as a
+    # comma-separated list.
+    def return_node_flags_inspect(node)
+      flags = [] #: Array[String]
+      flags << "redundant" if node.redundant?
+      flags.join(", ")
+    end
+
     # Inspect a node that has shareable_constant_node_flags flags to display the flags as a
     # comma-separated list.
     def shareable_constant_node_flags_inspect(node)

data/lib/prism/dsl.rb

@@ -10,7 +10,7 @@ module Prism
   # The DSL module provides a set of methods that can be used to create prism
   # nodes in a more concise manner. For example, instead of writing:
   #
-  #     source = Prism::Source.new("[1]")
+  #     source = Prism::Source.for("[1]")
   #
   #     Prism::ArrayNode.new(
   #       [
@@ -28,7 +28,7 @@ module Prism
   #
   # you could instead write:
   #
-  #     source = Prism::Source.new("[1]")
+  #     source = Prism::Source.for("[1]")
   #
   #     ArrayNode(
   #       IntegerNode(Prism::IntegerBaseFlags::DECIMAL, 1, Location(source, 1, 1)), source),
@@ -228,8 +228,8 @@ module Prism
     end
 
     # Create a new ConstantPathNode node
-    def ConstantPathNode(parent, child, delimiter_loc, source = nil, location = Location())
-      ConstantPathNode.new(source, parent, child, delimiter_loc, location)
+    def ConstantPathNode(parent, name, delimiter_loc, name_loc, source = nil, location = Location())
+      ConstantPathNode.new(source, parent, name, delimiter_loc, name_loc, location)
     end
 
     # Create a new ConstantPathOperatorWriteNode node
@@ -243,8 +243,8 @@ module Prism
     end
 
     # Create a new ConstantPathTargetNode node
-    def ConstantPathTargetNode(parent, child, delimiter_loc, source = nil, location = Location())
-      ConstantPathTargetNode.new(source, parent, child, delimiter_loc, location)
+    def ConstantPathTargetNode(parent, name, delimiter_loc, name_loc, source = nil, location = Location())
+      ConstantPathTargetNode.new(source, parent, name, delimiter_loc, name_loc, location)
     end
 
     # Create a new ConstantPathWriteNode node
@@ -698,8 +698,8 @@ module Prism
     end
 
     # Create a new ReturnNode node
-    def ReturnNode(keyword_loc, arguments, source = nil, location = Location())
-      ReturnNode.new(source, keyword_loc, arguments, location)
+    def ReturnNode(flags, keyword_loc, arguments, source = nil, location = Location())
+      ReturnNode.new(source, flags, keyword_loc, arguments, location)
     end
 
     # Create a new SelfNode node

data/lib/prism/ffi.rb

@@ -317,7 +317,7 @@ module Prism
         buffer.read
       end
 
-      Serialize.load_tokens(Source.new(code), serialized)
+      Serialize.load_tokens(Source.for(code), serialized)
     end
 
     def parse_common(string, code, options) # :nodoc:
@@ -329,7 +329,7 @@ module Prism
       LibRubyParser::PrismBuffer.with do |buffer|
         LibRubyParser.pm_serialize_parse_comments(buffer.pointer, string.pointer, string.length, dump_options(options))
 
-        source = Source.new(code)
+        source = Source.for(code)
         loader = Serialize::Loader.new(source, buffer.read)
 
         loader.load_header
@@ -343,14 +343,14 @@ module Prism
       LibRubyParser::PrismBuffer.with do |buffer|
         LibRubyParser.pm_serialize_parse_lex(buffer.pointer, string.pointer, string.length, dump_options(options))
 
-        source = Source.new(code)
+        source = Source.for(code)
         loader = Serialize::Loader.new(source, buffer.read)
 
         tokens = loader.load_tokens
         node, comments, magic_comments, data_loc, errors, warnings = loader.load_nodes
         tokens.each { |token,| token.value.force_encoding(loader.encoding) }
 
-        ParseResult.new([node, tokens], comments, magic_comments, data_loc, errors, warnings, source)
+        ParseLexResult.new([node, tokens], comments, magic_comments, data_loc, errors, warnings, source)
       end
     end