prism 2.0.0.rc1-x86_64-linux-gnu → 2.0.0.rc2-x86_64-linux-gnu

data/lib/prism/parse_result.rb

@@ -34,15 +34,18 @@ module Prism
     # empty when the source is created by the parser and filled in afterward,
     # because the comments themselves refer to the source.
     #
-    #: (String source, Integer start_line, Array[Integer] offsets, ?Array[Comment] comments, ?Array[Comment] comment_attachments, ?Array[Integer?] comment_ranges) -> Source
-    def self.for(source, start_line, offsets, comments = [], comment_attachments = [], comment_ranges = [])
+    # The checksum parameter is the value described by the attribute of the same
+    # name. It is nil when the source is not created by the parser.
+    #
+    #: (String source, Integer start_line, Array[Integer] offsets, ?Array[Comment] comments, ?Array[Comment] comment_attachments, ?Array[Integer?] comment_ranges, ?Integer? checksum) -> Source
+    def self.for(source, start_line, offsets, comments = [], comment_attachments = [], comment_ranges = [], checksum = nil)
       if source.ascii_only?
-        ASCIISource.new(source, start_line, offsets, comments, comment_attachments, comment_ranges)
+        ASCIISource.new(source, start_line, offsets, comments, comment_attachments, comment_ranges, checksum)
       elsif source.encoding == Encoding::BINARY
         source.force_encoding(Encoding::UTF_8)
 
         if source.valid_encoding?
-          new(source, start_line, offsets, comments, comment_attachments, comment_ranges)
+          new(source, start_line, offsets, comments, comment_attachments, comment_ranges, checksum)
         else
           # This is an extremely niche use case where the file is marked as
           # binary, contains multi-byte characters, and those characters are not
@@ -51,10 +54,10 @@ module Prism
           # problems when asking for code units, but it appears to be the
           # cleanest solution at the moment.
           source.force_encoding(Encoding::BINARY)
-          ASCIISource.new(source, start_line, offsets, comments, comment_attachments, comment_ranges)
+          ASCIISource.new(source, start_line, offsets, comments, comment_attachments, comment_ranges, checksum)
         end
       else
-        new(source, start_line, offsets, comments, comment_attachments, comment_ranges)
+        new(source, start_line, offsets, comments, comment_attachments, comment_ranges, checksum)
       end
     end
 
@@ -64,6 +67,10 @@ module Prism
     # The line number where this source starts.
     attr_reader :start_line #: Integer
 
+    # The checksum of the source code which can be used to quickly determine if
+    # the source has changed.
+    attr_reader :checksum #: Integer?
+
     # The list of comments that were encountered during parsing. When the source
     # is parsed with the attach_comments option, these are sorted by start
     # offset.
@@ -95,10 +102,11 @@ module Prism
     # parameter can be either an Array of Integer byte offsets or a packed
     # binary string of uint32_t values (from the C extension).
     #
-    #: (String source, Integer start_line, Array[Integer] | String offsets, ?Array[Comment] comments, ?Array[Comment] comment_attachments, ?Array[Integer?] comment_ranges) -> void
-    def initialize(source, start_line, offsets, comments = [], comment_attachments = [], comment_ranges = [])
+    #: (String source, Integer start_line, Array[Integer] | String offsets, ?Array[Comment] comments, ?Array[Comment] comment_attachments, ?Array[Integer?] comment_ranges, ?Integer? checksum) -> void
+    def initialize(source, start_line, offsets, comments = [], comment_attachments = [], comment_ranges = [], checksum = nil)
       @source = source
       @start_line = start_line
+      @checksum = checksum
       @offsets = offsets
       @comments = comments
       @comment_attachments = comment_attachments
@@ -112,6 +120,13 @@ module Prism
       @start_line = start_line
     end
 
+    # Replace the value of checksum with the given value.
+    #
+    #: (Integer checksum) -> void
+    def replace_checksum(checksum)
+      @checksum = checksum
+    end
+
     # Replace the value of offsets with the given value.
     #
     #: (Array[Integer] offsets) -> void

data/lib/prism/serialize.rb

@@ -44,9 +44,11 @@ module Prism
                        loader.load_header
       encoding =       loader.load_encoding
       start_line =     loader.load_varsint
+      checksum =       loader.load_uint64
       offsets =        loader.load_line_offsets(freeze)
 
       source.replace_start_line(start_line)
+      source.replace_checksum(checksum)
       source.replace_offsets(offsets)
 
                        loader.load_comments(source.comments, freeze)
@@ -100,9 +102,11 @@ module Prism
       tokens =         loader.load_tokens
       encoding =       loader.load_encoding
       start_line =     loader.load_varsint
+      checksum =       loader.load_uint64
       offsets =        loader.load_line_offsets(freeze)
 
       source.replace_start_line(start_line)
+      source.replace_checksum(checksum)
       source.replace_offsets(offsets)
 
                        loader.load_comments(source.comments, freeze)
@@ -145,16 +149,18 @@ module Prism
       source = Source.for(input, 1, [])
       loader = Loader.new(source, serialized)
 
-                   loader.load_header
-                   loader.load_encoding
-      start_line = loader.load_varsint
-      offsets    = loader.load_line_offsets(freeze)
+                    loader.load_header
+                    loader.load_encoding
+      start_line =  loader.load_varsint
+      checksum =    loader.load_uint64
+      offsets =     loader.load_line_offsets(freeze)
 
       source.replace_start_line(start_line)
+      source.replace_checksum(checksum)
       source.replace_offsets(offsets)
 
-      result =     loader.load_comments(source.comments, freeze)
-      raise unless loader.eof?
+      result =      loader.load_comments(source.comments, freeze)
+      raise unless  loader.eof?
 
       source.deep_freeze if freeze
       result
@@ -175,9 +181,11 @@ module Prism
                        loader.load_header
       encoding =       loader.load_encoding
       start_line =     loader.load_varsint
+      checksum =       loader.load_uint64
       offsets =        loader.load_line_offsets(freeze)
 
       source.replace_start_line(start_line)
+      source.replace_checksum(checksum)
       source.replace_offsets(offsets)
 
                        loader.load_comments(source.comments, freeze)
@@ -863,6 +871,11 @@ module Prism
         (io.read(4) or raise).unpack1("L") #: Integer
       end
 
+      #: () -> Integer
+      def load_uint64
+        (io.read(8) or raise).unpack1("Q") #: Integer
+      end
+
       #: (ConstantPool constant_pool, Encoding encoding, bool freeze) -> node?
       def load_optional_node(constant_pool, encoding, freeze)
         if io.getbyte != 0

data/lib/prism/string_query.rb

@@ -11,6 +11,7 @@ module Prism
     #    def self.local?: (String string) -> bool
     #    def self.constant?: (String string) -> bool
     #    def self.method_name?: (String string) -> bool
+    #    def self.keyword?: (String string) -> bool
 
     # The string that this query is wrapping.
     attr_reader :string #: String
@@ -42,5 +43,12 @@ module Prism
     def method_name?
       StringQuery.method_name?(string)
     end
+
+    # Whether or not this string is a valid keyword.
+    #
+    #: () -> bool
+    def keyword?
+      StringQuery.keyword?(string)
+    end
   end
 end

data/prism.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |spec|
   spec.name = "prism"
-  spec.version = "2.0.0.rc1"
-  spec.authors = ["Shopify"]
-  spec.email = ["ruby@shopify.com"]
+  spec.version = "2.0.0.rc2"
+  spec.authors = ["Ruby developers"]
+  spec.email = ["ruby-core@ruby-lang.org"]
 
   spec.summary = "Prism Ruby parser"
   spec.homepage = "https://github.com/ruby/prism"
@@ -49,6 +49,8 @@ Gem::Specification.new do |spec|
     "include/prism/compiler/accel.h",
     "include/prism/compiler/align.h",
     "include/prism/compiler/assume.h",
+    "include/prism/compiler/bswap.h",
+    "include/prism/compiler/endianness.h",
     "include/prism/compiler/exported.h",
     "include/prism/compiler/fallthrough.h",
     "include/prism/compiler/filesystem.h",
@@ -86,6 +88,7 @@ Gem::Specification.new do |spec|
     "include/prism/internal/stringy.h",
     "include/prism/internal/strpbrk.h",
     "include/prism/internal/tokens.h",
+    "include/prism/internal/xxh3.h",
     "include/prism/arena.h",
     "include/prism/ast.h",
     "include/prism/buffer.h",
@@ -224,7 +227,8 @@ Gem::Specification.new do |spec|
     "src/stringy.c",
     "src/strncasecmp.c",
     "src/strpbrk.c",
-    "src/tokens.c"
+    "src/tokens.c",
+    "src/xxh3.c"
   ]
 
   spec.extensions = ["ext/prism/extconf.rb"]