prism 1.1.0 → 1.3.0

data/sig/prism/relocation.rbs

@@ -0,0 +1,185 @@
+module Prism
+  module Relocation
+    interface _Value
+      def start_line: () -> Integer
+      def end_line: () -> Integer
+      def start_offset: () -> Integer
+      def end_offset: () -> Integer
+      def start_character_offset: () -> Integer
+      def end_character_offset: () -> Integer
+      def cached_start_code_units_offset: (_CodeUnitsCache cache) -> Integer
+      def cached_end_code_units_offset: (_CodeUnitsCache cache) -> Integer
+      def start_column: () -> Integer
+      def end_column: () -> Integer
+      def start_character_column: () -> Integer
+      def end_character_column: () -> Integer
+      def cached_start_code_units_column: (_CodeUnitsCache cache) -> Integer
+      def cached_end_code_units_column: (_CodeUnitsCache cache) -> Integer
+      def leading_comments: () -> Array[Comment]
+      def trailing_comments: () -> Array[Comment]
+    end
+
+    interface _Field
+      def fields: (_Value value) -> entry_values
+    end
+
+    type entry_value = untyped
+    type entry_values = Hash[Symbol, entry_value]
+
+    class Entry
+      class MissingValueError < StandardError
+      end
+
+      def initialize: (Repository repository) -> void
+
+      def filepath: () -> String
+
+      def start_line: () -> Integer
+      def end_line: () -> Integer
+
+      def start_offset: () -> Integer
+      def end_offset: () -> Integer
+      def start_character_offset: () -> Integer
+      def end_character_offset: () -> Integer
+      def start_code_units_offset: () -> Integer
+      def end_code_units_offset: () -> Integer
+
+      def start_column: () -> Integer
+      def end_column: () -> Integer
+      def start_character_column: () -> Integer
+      def end_character_column: () -> Integer
+      def start_code_units_column: () -> Integer
+      def end_code_units_column: () -> Integer
+
+      def leading_comments: () -> Array[CommentsField::Comment]
+      def trailing_comments: () -> Array[CommentsField::Comment]
+      def comments: () -> Array[CommentsField::Comment]
+
+      private
+
+      def fetch_value: (Symbol name) -> entry_value
+      def values: () -> entry_values
+    end
+
+    class Source
+      attr_reader value: untyped
+
+      def initialize: (untyped value) -> void
+
+      def result: () -> ParseResult
+      def code_units_cache: (Encoding encoding) -> _CodeUnitsCache
+    end
+
+    class SourceFilepath < Source
+      def result: () -> ParseResult
+    end
+
+    class SourceString < Source
+      def result: () -> ParseResult
+    end
+
+    class FilepathField
+      attr_reader value: String
+
+      def initialize: (String value) -> void
+
+      def fields: (_Value value) -> entry_values
+    end
+
+    class LinesField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class OffsetsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class CharacterOffsetsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class CodeUnitOffsetsField
+      attr_reader repository: Repository
+      attr_reader encoding: Encoding
+
+      def initialize: (Repository repository, Encoding encoding) -> void
+      def fields: (_Value value) -> entry_values
+
+      private
+
+      def cache: () -> _CodeUnitsCache
+    end
+
+    class ColumnsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class CharacterColumnsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class CodeUnitColumnsField
+      attr_reader repository: Repository
+      attr_reader encoding: Encoding
+
+      def initialize: (Repository repository, Encoding encoding) -> void
+      def fields: (_Value value) -> entry_values
+
+      private
+
+      def cache: () -> _CodeUnitsCache
+    end
+
+    class CommentsField
+      class Comment
+        attr_reader slice: String
+
+        def initialize: (String slice) -> void
+      end
+
+      private
+
+      def comments: (entry_value value) -> Array[Comment]
+    end
+
+    class LeadingCommentsField < CommentsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class TrailingCommentsField < CommentsField
+      def fields: (_Value value) -> entry_values
+    end
+
+    class Repository
+      class ConfigurationError < StandardError
+      end
+
+      attr_reader source: Source
+      attr_reader fields: Hash[Symbol, _Field]
+      attr_reader entries: Hash[Integer, Hash[Symbol, Entry]]
+
+      def initialize: (Source source) -> void
+
+      def code_units_cache: (Encoding encoding) -> _CodeUnitsCache
+
+      def filepath: () -> self
+      def lines: () -> self
+      def offsets: () -> self
+      def character_offsets: () -> self
+      def code_unit_offsets: (Encoding encoding) -> self
+      def columns: () -> self
+      def character_columns: () -> self
+      def code_unit_columns: (Encoding encoding) -> self
+      def leading_comments: () -> self
+      def trailing_comments: () -> self
+      def comments: () -> self
+
+      private
+
+      def field: (Symbol name, _Field) -> self
+    end
+
+    def self.filepath: (String value) -> Repository
+    def self.string: (String value) -> Repository
+  end
+end

data/sig/prism/string_query.rbs

@@ -0,0 +1,11 @@
+module Prism
+  class StringQuery
+    attr_reader string: String
+
+    def initialize: (String string) -> void
+
+    def local?: () -> bool
+    def constant?: () -> bool
+    def method_name?: () -> bool
+  end
+end

data/src/diagnostic.c

@@ -8,7 +8,7 @@
 
 #include "prism/diagnostic.h"
 
-#define PM_DIAGNOSTIC_ID_MAX 318
+#define PM_DIAGNOSTIC_ID_MAX 319
 
 /** This struct holds the data for each diagnostic. */
 typedef struct {
@@ -231,6 +231,7 @@ static const pm_diagnostic_data_t diagnostic_messages[PM_DIAGNOSTIC_ID_MAX] = {
     [PM_ERR_INCOMPLETE_VARIABLE_INSTANCE]       = { "'%.*s' is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INSTANCE_VARIABLE_BARE]             = { "'@' without identifiers is not allowed as an instance variable name", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_BLOCK_EXIT]                 = { "Invalid %s", PM_ERROR_LEVEL_SYNTAX },
+    [PM_ERR_INVALID_COMMA]                      = { "invalid comma", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_ESCAPE_CHARACTER]           = { "Invalid escape character syntax", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_FLOAT_EXPONENT]             = { "invalid exponent", PM_ERROR_LEVEL_SYNTAX },
     [PM_ERR_INVALID_LOCAL_VARIABLE_READ]        = { "identifier %.*s is not valid to get", PM_ERROR_LEVEL_SYNTAX },
@@ -558,6 +559,7 @@ pm_diagnostic_id_human(pm_diagnostic_id_t diag_id) {
         case PM_ERR_INSTANCE_VARIABLE_BARE: return "instance_variable_bare";
         case PM_ERR_INVALID_BLOCK_EXIT: return "invalid_block_exit";
         case PM_ERR_INVALID_CHARACTER: return "invalid_character";
+        case PM_ERR_INVALID_COMMA: return "invalid_comma";
         case PM_ERR_INVALID_ENCODING_MAGIC_COMMENT: return "invalid_encoding_magic_comment";
         case PM_ERR_INVALID_ESCAPE_CHARACTER: return "invalid_escape_character";
         case PM_ERR_INVALID_FLOAT_EXPONENT: return "invalid_float_exponent";

data/src/node.c

@@ -8418,6 +8418,15 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"keyword_loc\":", 14);
             pm_dump_json_location(buffer, parser, &cast->keyword_loc);
 
+            // Dump the do_keyword_loc field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"do_keyword_loc\":", 17);
+            if (cast->do_keyword_loc.start != NULL) {
+                pm_dump_json_location(buffer, parser, &cast->do_keyword_loc);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
+
             // Dump the closing_loc field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"closing_loc\":", 14);
@@ -8511,6 +8520,15 @@ pm_dump_json(pm_buffer_t *buffer, const pm_parser_t *parser, const pm_node_t *no
             pm_buffer_append_string(buffer, "\"keyword_loc\":", 14);
             pm_dump_json_location(buffer, parser, &cast->keyword_loc);
 
+            // Dump the do_keyword_loc field
+            pm_buffer_append_byte(buffer, ',');
+            pm_buffer_append_string(buffer, "\"do_keyword_loc\":", 17);
+            if (cast->do_keyword_loc.start != NULL) {
+                pm_dump_json_location(buffer, parser, &cast->do_keyword_loc);
+            } else {
+                pm_buffer_append_string(buffer, "null", 4);
+            }
+
             // Dump the closing_loc field
             pm_buffer_append_byte(buffer, ',');
             pm_buffer_append_string(buffer, "\"closing_loc\":", 14);

data/src/prettyprint.c

@@ -8521,6 +8521,22 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 pm_buffer_append_string(output_buffer, "\"\n", 2);
             }
 
+            // do_keyword_loc
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- do_keyword_loc:", 19);
+                pm_location_t *location = &cast->do_keyword_loc;
+                if (location->start == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_location(output_buffer, parser, location);
+                    pm_buffer_append_string(output_buffer, " = \"", 4);
+                    pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                    pm_buffer_append_string(output_buffer, "\"\n", 2);
+                }
+            }
+
             // closing_loc
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);
@@ -8672,6 +8688,22 @@ prettyprint_node(pm_buffer_t *output_buffer, const pm_parser_t *parser, const pm
                 pm_buffer_append_string(output_buffer, "\"\n", 2);
             }
 
+            // do_keyword_loc
+            {
+                pm_buffer_concat(output_buffer, prefix_buffer);
+                pm_buffer_append_string(output_buffer, "+-- do_keyword_loc:", 19);
+                pm_location_t *location = &cast->do_keyword_loc;
+                if (location->start == NULL) {
+                    pm_buffer_append_string(output_buffer, " nil\n", 5);
+                } else {
+                    pm_buffer_append_byte(output_buffer, ' ');
+                    prettyprint_location(output_buffer, parser, location);
+                    pm_buffer_append_string(output_buffer, " = \"", 4);
+                    pm_buffer_append_source(output_buffer, location->start, (size_t) (location->end - location->start), PM_BUFFER_ESCAPING_RUBY);
+                    pm_buffer_append_string(output_buffer, "\"\n", 2);
+                }
+            }
+
             // closing_loc
             {
                 pm_buffer_concat(output_buffer, prefix_buffer);