prism 0.17.1 → 0.18.0

data/lib/prism/parse_result.rb

@@ -25,40 +25,50 @@ module Prism
 
     # Perform a byteslice on the source code using the given byte offset and
     # byte length.
-    def slice(offset, length)
-      source.byteslice(offset, length)
+    def slice(byte_offset, length)
+      source.byteslice(byte_offset, length)
     end
 
     # Binary search through the offsets to find the line number for the given
     # byte offset.
-    def line(value)
-      start_line + find_line(value)
+    def line(byte_offset)
+      start_line + find_line(byte_offset)
     end
 
     # Return the byte offset of the start of the line corresponding to the given
     # byte offset.
-    def line_offset(value)
-      offsets[find_line(value)]
+    def line_start(byte_offset)
+      offsets[find_line(byte_offset)]
     end
 
     # Return the column number for the given byte offset.
-    def column(value)
-      value - offsets[find_line(value)]
+    def column(byte_offset)
+      byte_offset - line_start(byte_offset)
+    end
+
+    # Return the character offset for the given byte offset.
+    def character_offset(byte_offset)
+      source.byteslice(0, byte_offset).length
+    end
+
+    # Return the column number in characters for the given byte offset.
+    def character_column(byte_offset)
+      character_offset(byte_offset) - character_offset(line_start(byte_offset))
     end
 
     private
 
     # Binary search through the offsets to find the line number for the given
     # byte offset.
-    def find_line(value)
+    def find_line(byte_offset)
       left = 0
       right = offsets.length - 1
 
       while left <= right
         mid = left + (right - left) / 2
-        return mid if offsets[mid] == value
+        return mid if offsets[mid] == byte_offset
 
-        if offsets[mid] < value
+        if offsets[mid] < byte_offset
           left = mid + 1
         else
           right = mid - 1
@@ -121,11 +131,23 @@ module Prism
       source.slice(start_offset, length)
     end
 
+    # The character offset from the beginning of the source where this location
+    # starts.
+    def start_character_offset
+      source.character_offset(start_offset)
+    end
+
     # The byte offset from the beginning of the source where this location ends.
     def end_offset
       start_offset + length
     end
 
+    # The character offset from the beginning of the source where this location
+    # ends.
+    def end_character_offset
+      source.character_offset(end_offset)
+    end
+
     # The line number where this location starts.
     def start_line
       source.line(start_offset)
@@ -133,7 +155,7 @@ module Prism
 
     # The content of the line where this location starts before this location.
     def start_line_slice
-      offset = source.line_offset(start_offset)
+      offset = source.line_start(start_offset)
       source.slice(offset, start_offset - offset)
     end
 
@@ -148,12 +170,24 @@ module Prism
       source.column(start_offset)
     end
 
+    # The column number in characters where this location ends from the start of
+    # the line.
+    def start_character_column
+      source.character_column(start_offset)
+    end
+
     # The column number in bytes where this location ends from the start of the
     # line.
     def end_column
       source.column(end_offset)
     end
 
+    # The column number in characters where this location ends from the start of
+    # the line.
+    def end_character_column
+      source.character_column(end_offset)
+    end
+
     # Implement the hash pattern matching interface for Location.
     def deconstruct_keys(keys)
       { start_offset: start_offset, end_offset: end_offset }

data/lib/prism/serialize.rb

@@ -27,11 +27,11 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 17
+    MINOR_VERSION = 18
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
-    PATCH_VERSION = 1
+    PATCH_VERSION = 0
 
     # Deserialize the AST represented by the given string into a parse result.
     def self.load(input, serialized)
@@ -80,12 +80,9 @@ module Prism
       end
 
       def load_encoding
-        Encoding.find(io.read(load_varint))
-      end
-
-      def load_force_encoding
-        @encoding = load_encoding
+        @encoding = Encoding.find(io.read(load_varint))
         @input = input.force_encoding(@encoding).freeze
+        @encoding
       end
 
       def load_start_line
@@ -128,10 +125,7 @@ module Prism
         encoding = load_encoding
         load_start_line
         comments, magic_comments, errors, warnings = load_metadata
-
-        if encoding != @encoding
-          tokens.each { |token,| token.value.force_encoding(encoding) }
-        end
+        tokens.each { |token,| token.value.force_encoding(encoding) }
 
         raise "Expected to consume all bytes while deserializing" unless @io.eof?
         Prism::ParseResult.new(tokens, comments, magic_comments, errors, warnings, @source)
@@ -139,7 +133,7 @@ module Prism
 
       def load_nodes
         load_header
-        load_force_encoding
+        load_encoding
         load_start_line
 
         comments, magic_comments, errors, warnings = load_metadata
@@ -289,228 +283,228 @@ module Prism
           when 22 then
             CapturePatternNode.new(load_node, load_node, load_location, location)
           when 23 then
-            CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
+            CaseMatchNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
           when 24 then
-            ClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
+            CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
           when 25 then
-            ClassVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_location, load_required_constant, location)
           when 26 then
-            ClassVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            ClassVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 27 then
-            ClassVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ClassVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 28 then
-            ClassVariableReadNode.new(load_required_constant, location)
+            ClassVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 29 then
-            ClassVariableTargetNode.new(load_required_constant, location)
+            ClassVariableReadNode.new(load_required_constant, location)
           when 30 then
-            ClassVariableWriteNode.new(load_required_constant, load_location, load_node, load_optional_location, location)
+            ClassVariableTargetNode.new(load_required_constant, location)
           when 31 then
-            ConstantAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ClassVariableWriteNode.new(load_required_constant, load_location, load_node, load_optional_location, location)
           when 32 then
-            ConstantOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            ConstantAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 33 then
-            ConstantOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ConstantOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 34 then
-            ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
+            ConstantOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 35 then
-            ConstantPathNode.new(load_optional_node, load_node, load_location, location)
+            ConstantPathAndWriteNode.new(load_node, load_location, load_node, location)
           when 36 then
-            ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_required_constant, location)
+            ConstantPathNode.new(load_optional_node, load_node, load_location, location)
           when 37 then
-            ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
+            ConstantPathOperatorWriteNode.new(load_node, load_location, load_node, load_required_constant, location)
           when 38 then
-            ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
+            ConstantPathOrWriteNode.new(load_node, load_location, load_node, location)
           when 39 then
-            ConstantPathWriteNode.new(load_node, load_location, load_node, location)
+            ConstantPathTargetNode.new(load_optional_node, load_node, load_location, location)
           when 40 then
-            ConstantReadNode.new(load_required_constant, location)
+            ConstantPathWriteNode.new(load_node, load_location, load_node, location)
           when 41 then
-            ConstantTargetNode.new(load_required_constant, location)
+            ConstantReadNode.new(load_required_constant, location)
           when 42 then
-            ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            ConstantTargetNode.new(load_required_constant, location)
           when 43 then
+            ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+          when 44 then
             load_serialized_length
             DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varint) { load_required_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
-          when 44 then
-            DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
           when 45 then
-            ElseNode.new(load_location, load_optional_node, load_optional_location, location)
+            DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
           when 46 then
-            EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
+            ElseNode.new(load_location, load_optional_node, load_optional_location, location)
           when 47 then
-            EmbeddedVariableNode.new(load_location, load_node, location)
+            EmbeddedStatementsNode.new(load_location, load_optional_node, load_location, location)
           when 48 then
-            EnsureNode.new(load_location, load_optional_node, load_location, location)
+            EmbeddedVariableNode.new(load_location, load_node, location)
           when 49 then
-            FalseNode.new(location)
+            EnsureNode.new(load_location, load_optional_node, load_location, location)
           when 50 then
-            FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
+            FalseNode.new(location)
           when 51 then
-            FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+            FindPatternNode.new(load_optional_node, load_node, Array.new(load_varint) { load_node }, load_node, load_optional_location, load_optional_location, location)
           when 52 then
-            FloatNode.new(location)
+            FlipFlopNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
           when 53 then
-            ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
+            FloatNode.new(location)
           when 54 then
-            ForwardingArgumentsNode.new(location)
+            ForNode.new(load_node, load_node, load_optional_node, load_location, load_location, load_optional_location, load_location, location)
           when 55 then
-            ForwardingParameterNode.new(location)
+            ForwardingArgumentsNode.new(location)
           when 56 then
-            ForwardingSuperNode.new(load_optional_node, location)
+            ForwardingParameterNode.new(location)
           when 57 then
-            GlobalVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            ForwardingSuperNode.new(load_optional_node, location)
           when 58 then
-            GlobalVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            GlobalVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 59 then
-            GlobalVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            GlobalVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 60 then
-            GlobalVariableReadNode.new(load_required_constant, location)
+            GlobalVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 61 then
-            GlobalVariableTargetNode.new(load_required_constant, location)
+            GlobalVariableReadNode.new(load_required_constant, location)
           when 62 then
-            GlobalVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            GlobalVariableTargetNode.new(load_required_constant, location)
           when 63 then
-            HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+            GlobalVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 64 then
-            HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
+            HashNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
           when 65 then
-            IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+            HashPatternNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_optional_location, load_optional_location, location)
           when 66 then
-            ImaginaryNode.new(load_node, location)
+            IfNode.new(load_optional_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
           when 67 then
-            ImplicitNode.new(load_node, location)
+            ImaginaryNode.new(load_node, location)
           when 68 then
-            InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
+            ImplicitNode.new(load_node, location)
           when 69 then
-            IndexAndWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+            InNode.new(load_node, load_optional_node, load_location, load_optional_location, location)
           when 70 then
-            IndexOperatorWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_required_constant, load_location, load_node, location)
+            IndexAndWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
           when 71 then
-            IndexOrWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
+            IndexOperatorWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_required_constant, load_location, load_node, location)
           when 72 then
-            InstanceVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            IndexOrWriteNode.new(load_optional_node, load_optional_location, load_location, load_optional_node, load_location, load_optional_node, load_varint, load_location, load_node, location)
           when 73 then
-            InstanceVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
+            InstanceVariableAndWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 74 then
-            InstanceVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
+            InstanceVariableOperatorWriteNode.new(load_required_constant, load_location, load_location, load_node, load_required_constant, location)
           when 75 then
-            InstanceVariableReadNode.new(load_required_constant, location)
+            InstanceVariableOrWriteNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 76 then
-            InstanceVariableTargetNode.new(load_required_constant, location)
+            InstanceVariableReadNode.new(load_required_constant, location)
           when 77 then
-            InstanceVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
+            InstanceVariableTargetNode.new(load_required_constant, location)
           when 78 then
-            IntegerNode.new(load_varint, location)
+            InstanceVariableWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 79 then
-            InterpolatedMatchLastLineNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+            IntegerNode.new(load_varint, location)
           when 80 then
-            InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
+            InterpolatedMatchLastLineNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
           when 81 then
-            InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+            InterpolatedRegularExpressionNode.new(load_location, Array.new(load_varint) { load_node }, load_location, load_varint, location)
           when 82 then
-            InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
+            InterpolatedStringNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
           when 83 then
-            InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
+            InterpolatedSymbolNode.new(load_optional_location, Array.new(load_varint) { load_node }, load_optional_location, location)
           when 84 then
-            KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
+            InterpolatedXStringNode.new(load_location, Array.new(load_varint) { load_node }, load_location, location)
           when 85 then
-            KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            KeywordHashNode.new(Array.new(load_varint) { load_node }, location)
           when 86 then
-            LambdaNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+            KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
           when 87 then
-            LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+            LambdaNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
           when 88 then
-            LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varint, location)
+            LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
           when 89 then
-            LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
+            LocalVariableOperatorWriteNode.new(load_location, load_location, load_node, load_required_constant, load_required_constant, load_varint, location)
           when 90 then
-            LocalVariableReadNode.new(load_required_constant, load_varint, location)
+            LocalVariableOrWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varint, location)
           when 91 then
-            LocalVariableTargetNode.new(load_required_constant, load_varint, location)
+            LocalVariableReadNode.new(load_required_constant, load_varint, location)
           when 92 then
-            LocalVariableWriteNode.new(load_required_constant, load_varint, load_location, load_node, load_location, location)
+            LocalVariableTargetNode.new(load_required_constant, load_varint, location)
           when 93 then
-            MatchLastLineNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+            LocalVariableWriteNode.new(load_required_constant, load_varint, load_location, load_node, load_location, location)
           when 94 then
-            MatchPredicateNode.new(load_node, load_node, load_location, location)
+            MatchLastLineNode.new(load_location, load_location, load_location, load_string, load_varint, location)
           when 95 then
-            MatchRequiredNode.new(load_node, load_node, load_location, location)
+            MatchPredicateNode.new(load_node, load_node, load_location, location)
           when 96 then
-            MatchWriteNode.new(load_node, Array.new(load_varint) { load_required_constant }, location)
+            MatchRequiredNode.new(load_node, load_node, load_location, location)
           when 97 then
-            MissingNode.new(location)
+            MatchWriteNode.new(load_node, Array.new(load_varint) { load_node }, location)
           when 98 then
-            ModuleNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
+            MissingNode.new(location)
           when 99 then
-            MultiTargetNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
+            ModuleNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_node, load_optional_node, load_location, load_required_constant, location)
           when 100 then
-            MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
+            MultiTargetNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, location)
           when 101 then
-            NextNode.new(load_optional_node, load_location, location)
+            MultiWriteNode.new(Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, load_optional_location, load_optional_location, load_location, load_node, location)
           when 102 then
-            NilNode.new(location)
+            NextNode.new(load_optional_node, load_location, location)
           when 103 then
-            NoKeywordsParameterNode.new(load_location, load_location, location)
+            NilNode.new(location)
           when 104 then
-            NumberedReferenceReadNode.new(load_varint, location)
+            NoKeywordsParameterNode.new(load_location, load_location, location)
           when 105 then
-            OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
+            NumberedReferenceReadNode.new(load_varint, location)
           when 106 then
-            OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
+            OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
           when 107 then
-            OrNode.new(load_node, load_node, load_location, location)
+            OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
           when 108 then
-            ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
+            OrNode.new(load_node, load_node, load_location, location)
           when 109 then
-            ParenthesesNode.new(load_optional_node, load_location, load_location, location)
+            ParametersNode.new(Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, Array.new(load_varint) { load_node }, Array.new(load_varint) { load_node }, load_optional_node, load_optional_node, location)
           when 110 then
-            PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
+            ParenthesesNode.new(load_optional_node, load_location, load_location, location)
           when 111 then
-            PinnedVariableNode.new(load_node, load_location, location)
+            PinnedExpressionNode.new(load_node, load_location, load_location, load_location, location)
           when 112 then
-            PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+            PinnedVariableNode.new(load_node, load_location, location)
           when 113 then
-            PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
+            PostExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
           when 114 then
-            ProgramNode.new(Array.new(load_varint) { load_required_constant }, load_node, location)
+            PreExecutionNode.new(load_optional_node, load_location, load_location, load_location, location)
           when 115 then
-            RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
+            ProgramNode.new(Array.new(load_varint) { load_required_constant }, load_node, location)
           when 116 then
-            RationalNode.new(load_node, location)
+            RangeNode.new(load_optional_node, load_optional_node, load_location, load_varint, location)
           when 117 then
-            RedoNode.new(location)
+            RationalNode.new(load_node, location)
           when 118 then
-            RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
+            RedoNode.new(location)
           when 119 then
-            RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
+            RegularExpressionNode.new(load_location, load_location, load_location, load_string, load_varint, location)
           when 120 then
-            RequiredParameterNode.new(load_required_constant, location)
+            RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
           when 121 then
-            RescueModifierNode.new(load_node, load_location, load_node, location)
+            RequiredParameterNode.new(load_required_constant, location)
           when 122 then
-            RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
+            RescueModifierNode.new(load_node, load_location, load_node, location)
           when 123 then
-            RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            RescueNode.new(load_location, Array.new(load_varint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
           when 124 then
-            RetryNode.new(location)
+            RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
           when 125 then
-            ReturnNode.new(load_location, load_optional_node, location)
+            RetryNode.new(location)
           when 126 then
-            SelfNode.new(location)
+            ReturnNode.new(load_location, load_optional_node, location)
           when 127 then
-            SingletonClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
+            SelfNode.new(location)
           when 128 then
-            SourceEncodingNode.new(location)
+            SingletonClassNode.new(Array.new(load_varint) { load_required_constant }, load_location, load_location, load_node, load_optional_node, load_location, location)
           when 129 then
-            SourceFileNode.new(load_string, location)
+            SourceEncodingNode.new(location)
           when 130 then
-            SourceLineNode.new(location)
+            SourceFileNode.new(load_string, location)
           when 131 then
-            SplatNode.new(load_location, load_optional_node, location)
+            SourceLineNode.new(location)
           when 132 then
-            StatementsNode.new(Array.new(load_varint) { load_node }, location)
+            SplatNode.new(load_location, load_optional_node, location)
           when 133 then
-            StringConcatNode.new(load_node, load_node, location)
+            StatementsNode.new(Array.new(load_varint) { load_node }, location)
           when 134 then
             StringNode.new(load_varint, load_optional_location, load_location, load_optional_location, load_string, location)
           when 135 then
@@ -522,7 +516,7 @@ module Prism
           when 138 then
             UndefNode.new(Array.new(load_varint) { load_node }, load_location, location)
           when 139 then
-            UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+            UnlessNode.new(load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
           when 140 then
             UntilNode.new(load_location, load_optional_location, load_node, load_optional_node, load_varint, location)
           when 141 then
@@ -632,6 +626,10 @@ module Prism
               location = load_location
               CapturePatternNode.new(load_node, load_node, load_location, location)
             },
+            -> {
+              location = load_location
+              CaseMatchNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
+            },
             -> {
               location = load_location
               CaseNode.new(load_optional_node, Array.new(load_varint) { load_node }, load_optional_node, load_location, load_location, location)
@@ -803,7 +801,7 @@ module Prism
             },
             -> {
               location = load_location
-              IfNode.new(load_optional_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+              IfNode.new(load_optional_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -927,7 +925,7 @@ module Prism
             },
             -> {
               location = load_location
-              MatchWriteNode.new(load_node, Array.new(load_varint) { load_required_constant }, location)
+              MatchWriteNode.new(load_node, Array.new(load_varint) { load_node }, location)
             },
             -> {
               location = load_location
@@ -1073,10 +1071,6 @@ module Prism
               location = load_location
               StatementsNode.new(Array.new(load_varint) { load_node }, location)
             },
-            -> {
-              location = load_location
-              StringConcatNode.new(load_node, load_node, location)
-            },
             -> {
               location = load_location
               StringNode.new(load_varint, load_optional_location, load_location, load_optional_location, load_string, location)
@@ -1099,7 +1093,7 @@ module Prism
             },
             -> {
               location = load_location
-              UnlessNode.new(load_location, load_node, load_optional_node, load_optional_node, load_optional_location, location)
+              UnlessNode.new(load_location, load_node, load_optional_location, load_optional_node, load_optional_node, load_optional_location, location)
             },
             -> {
               location = load_location

data/lib/prism/visitor.rb

@@ -114,6 +114,9 @@ module Prism
     # Visit a CapturePatternNode node
     alias visit_capture_pattern_node visit_child_nodes
 
+    # Visit a CaseMatchNode node
+    alias visit_case_match_node visit_child_nodes
+
     # Visit a CaseNode node
     alias visit_case_node visit_child_nodes
 
@@ -444,9 +447,6 @@ module Prism
     # Visit a StatementsNode node
     alias visit_statements_node visit_child_nodes
 
-    # Visit a StringConcatNode node
-    alias visit_string_concat_node visit_child_nodes
-
     # Visit a StringNode node
     alias visit_string_node visit_child_nodes
 

data/lib/prism.rb

@@ -16,6 +16,7 @@ module Prism
   autoload :Debug, "prism/debug"
   autoload :DesugarCompiler, "prism/desugar_compiler"
   autoload :Dispatcher, "prism/dispatcher"
+  autoload :DotVisitor, "prism/dot_visitor"
   autoload :DSL, "prism/dsl"
   autoload :LexCompat, "prism/lex_compat"
   autoload :LexRipper, "prism/lex_compat"

data/prism.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "prism"
-  spec.version = "0.17.1"
+  spec.version = "0.18.0"
   spec.authors = ["Shopify"]
   spec.email = ["ruby@shopify.com"]
 
@@ -67,6 +67,7 @@ Gem::Specification.new do |spec|
     "lib/prism/debug.rb",
     "lib/prism/desugar_compiler.rb",
     "lib/prism/dispatcher.rb",
+    "lib/prism/dot_visitor.rb",
     "lib/prism/dsl.rb",
     "lib/prism/ffi.rb",
     "lib/prism/lex_compat.rb",
@@ -84,6 +85,7 @@ Gem::Specification.new do |spec|
     "lib/prism/visitor.rb",
     "src/diagnostic.c",
     "src/enc/pm_big5.c",
+    "src/enc/pm_cp51932.c",
     "src/enc/pm_euc_jp.c",
     "src/enc/pm_gbk.c",
     "src/enc/pm_shift_jis.c",
@@ -118,4 +120,6 @@ Gem::Specification.new do |spec|
 
   spec.extensions = ["ext/prism/extconf.rb"]
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["source_code_uri"] = "https://github.com/ruby/prism"
+  spec.metadata["changelog_uri"] = "https://github.com/ruby/prism/blob/main/CHANGELOG.md"
 end