prism 0.19.0 → 0.20.0

data/lib/prism/node_ext.rb

@@ -81,7 +81,7 @@ module Prism
   class RationalNode < Node
     # Returns the value of the node as a Ruby Rational.
     def value
-      Rational(slice.chomp("r"))
+      Rational(numeric.is_a?(IntegerNode) ? numeric.value : slice.chomp("r"))
     end
   end
 
@@ -118,7 +118,7 @@ module Prism
         current = current.parent
       end
 
-      unless current.is_a?(ConstantReadNode)
+      if !current.is_a?(ConstantReadNode) && !current.nil?
         raise DynamicPartsInConstantPathError, "Constant path contains dynamic parts. Cannot compute full name"
       end
 

data/lib/prism/parse_result.rb

@@ -312,20 +312,24 @@ module Prism
     # A Location object representing the location of this error in the source.
     attr_reader :location
 
+    # The level of this error.
+    attr_reader :level
+
     # Create a new error object with the given message and location.
-    def initialize(message, location)
+    def initialize(message, location, level)
       @message = message
       @location = location
+      @level = level
     end
 
     # Implement the hash pattern matching interface for ParseError.
     def deconstruct_keys(keys)
-      { message: message, location: location }
+      { message: message, location: location, level: level }
     end
 
     # Returns a string representation of this error.
     def inspect
-      "#<Prism::ParseError @message=#{@message.inspect} @location=#{@location.inspect}>"
+      "#<Prism::ParseError @message=#{@message.inspect} @location=#{@location.inspect} @level=#{@level.inspect}>"
     end
   end
 
@@ -337,20 +341,24 @@ module Prism
     # A Location object representing the location of this warning in the source.
     attr_reader :location
 
+    # The level of this warning.
+    attr_reader :level
+
     # Create a new warning object with the given message and location.
-    def initialize(message, location)
+    def initialize(message, location, level)
       @message = message
       @location = location
+      @level = level
     end
 
     # Implement the hash pattern matching interface for ParseWarning.
     def deconstruct_keys(keys)
-      { message: message, location: location }
+      { message: message, location: location, level: level }
     end
 
     # Returns a string representation of this warning.
     def inspect
-      "#<Prism::ParseWarning @message=#{@message.inspect} @location=#{@location.inspect}>"
+      "#<Prism::ParseWarning @message=#{@message.inspect} @location=#{@location.inspect} @level=#{@level.inspect}>"
     end
   end
 
@@ -369,9 +377,9 @@ module Prism
     # The list of magic comments that were encountered during parsing.
     attr_reader :magic_comments
 
-    # An optional location that represents the location of the content after the
-    # __END__ marker. This content is loaded into the DATA constant when the
-    # file being parsed is the main file being executed.
+    # An optional location that represents the location of the __END__ marker
+    # and the rest of the content of the file. This content is loaded into the
+    # DATA constant when the file being parsed is the main file being executed.
     attr_reader :data_loc
 
     # The list of errors that were generated during parsing.

data/lib/prism/serialize.rb

@@ -27,7 +27,7 @@ module Prism
 
     # The minor version of prism that we are expecting to find in the serialized
     # strings.
-    MINOR_VERSION = 19
+    MINOR_VERSION = 20
 
     # The patch version of prism that we are expecting to find in the serialized
     # strings.
@@ -103,8 +103,8 @@ module Prism
         comments = load_comments
         magic_comments = load_varuint.times.map { MagicComment.new(load_location, load_location) }
         data_loc = load_optional_location
-        errors = load_varuint.times.map { ParseError.new(load_embedded_string, load_location) }
-        warnings = load_varuint.times.map { ParseWarning.new(load_embedded_string, load_location) }
+        errors = load_varuint.times.map { ParseError.new(load_embedded_string, load_location, load_error_level) }
+        warnings = load_varuint.times.map { ParseWarning.new(load_embedded_string, load_location, load_warning_level) }
         [comments, magic_comments, data_loc, errors, warnings]
       end
 
@@ -218,9 +218,9 @@ module Prism
 
           constant =
             if start.nobits?(1 << 31)
-              input.byteslice(start, length).to_sym
+              input.byteslice(start, length).force_encoding(@encoding).to_sym
             else
-              serialized.byteslice(start & ((1 << 31) - 1), length).to_sym
+              serialized.byteslice(start & ((1 << 31) - 1), length).force_encoding(@encoding).to_sym
             end
 
           constant_pool[index] = constant
@@ -238,6 +238,30 @@ module Prism
         load_constant(index - 1) if index != 0
       end
 
+      def load_error_level
+        level = io.getbyte
+
+        case level
+        when 0
+          :fatal
+        else
+          raise "Unknown level: #{level}"
+        end
+      end
+
+      def load_warning_level
+        level = io.getbyte
+
+        case level
+        when 0
+          :default
+        when 1
+          :verbose
+        else
+          raise "Unknown level: #{level}"
+        end
+      end
+
       if RUBY_ENGINE == 'ruby'
         def load_node
           type = io.getbyte
@@ -259,7 +283,7 @@ module Prism
           when 7 then
             ArrayPatternNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 8 then
-            AssocNode.new(load_node, load_optional_node, load_optional_location, location)
+            AssocNode.new(load_node, load_node, load_optional_location, location)
           when 9 then
             AssocSplatNode.new(load_optional_node, load_location, location)
           when 10 then
@@ -269,11 +293,11 @@ module Prism
           when 12 then
             BlockArgumentNode.new(load_optional_node, load_location, location)
           when 13 then
-            BlockLocalVariableNode.new(load_required_constant, location)
+            BlockLocalVariableNode.new(load_varuint, load_required_constant, location)
           when 14 then
-            BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_optional_node, load_optional_node, load_location, load_location, location)
+            BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
           when 15 then
-            BlockParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            BlockParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
           when 16 then
             BlockParametersNode.new(load_optional_node, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_location, location)
           when 17 then
@@ -334,7 +358,7 @@ module Prism
             ConstantWriteNode.new(load_required_constant, load_location, load_node, load_location, location)
           when 45 then
             load_serialized_length
-            DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
+            DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
           when 46 then
             DefinedNode.new(load_optional_location, load_node, load_optional_location, load_location, location)
           when 47 then
@@ -422,9 +446,9 @@ module Prism
           when 88 then
             KeywordHashNode.new(load_varuint, Array.new(load_varuint) { load_node }, location)
           when 89 then
-            KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            KeywordRestParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
           when 90 then
-            LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+            LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
           when 91 then
             LocalVariableAndWriteNode.new(load_location, load_location, load_node, load_required_constant, load_varuint, location)
           when 92 then
@@ -464,9 +488,9 @@ module Prism
           when 109 then
             NumberedReferenceReadNode.new(load_varuint, location)
           when 110 then
-            OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
+            OptionalKeywordParameterNode.new(load_varuint, load_required_constant, load_location, load_node, location)
           when 111 then
-            OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
+            OptionalParameterNode.new(load_varuint, load_required_constant, load_location, load_location, load_node, location)
           when 112 then
             OrNode.new(load_node, load_node, load_location, location)
           when 113 then
@@ -492,15 +516,15 @@ module Prism
           when 123 then
             RegularExpressionNode.new(load_varuint, load_location, load_location, load_location, load_string, location)
           when 124 then
-            RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
+            RequiredKeywordParameterNode.new(load_varuint, load_required_constant, load_location, location)
           when 125 then
-            RequiredParameterNode.new(load_required_constant, location)
+            RequiredParameterNode.new(load_varuint, load_required_constant, location)
           when 126 then
             RescueModifierNode.new(load_node, load_location, load_node, location)
           when 127 then
             RescueNode.new(load_location, Array.new(load_varuint) { load_node }, load_optional_location, load_optional_node, load_optional_node, load_optional_node, location)
           when 128 then
-            RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+            RestParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
           when 129 then
             RetryNode.new(location)
           when 130 then
@@ -582,7 +606,7 @@ module Prism
             },
             -> {
               location = load_location
-              AssocNode.new(load_node, load_optional_node, load_optional_location, location)
+              AssocNode.new(load_node, load_node, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -602,15 +626,15 @@ module Prism
             },
             -> {
               location = load_location
-              BlockLocalVariableNode.new(load_required_constant, location)
+              BlockLocalVariableNode.new(load_varuint, load_required_constant, location)
             },
             -> {
               location = load_location
-              BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_optional_node, load_optional_node, load_location, load_location, location)
+              BlockNode.new(Array.new(load_varuint) { load_required_constant }, load_optional_node, load_optional_node, load_location, load_location, location)
             },
             -> {
               location = load_location
-              BlockParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+              BlockParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
             },
             -> {
               location = load_location
@@ -731,7 +755,7 @@ module Prism
             -> {
               location = load_location
               load_serialized_length
-              DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
+              DefNode.new(load_required_constant, load_location, load_optional_node, load_optional_node, load_optional_node, Array.new(load_varuint) { load_required_constant }, load_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, load_optional_location, location)
             },
             -> {
               location = load_location
@@ -907,11 +931,11 @@ module Prism
             },
             -> {
               location = load_location
-              KeywordRestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+              KeywordRestParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
             },
             -> {
               location = load_location
-              LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_varuint, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
+              LambdaNode.new(Array.new(load_varuint) { load_required_constant }, load_location, load_location, load_location, load_optional_node, load_optional_node, location)
             },
             -> {
               location = load_location
@@ -991,11 +1015,11 @@ module Prism
             },
             -> {
               location = load_location
-              OptionalKeywordParameterNode.new(load_required_constant, load_location, load_node, location)
+              OptionalKeywordParameterNode.new(load_varuint, load_required_constant, load_location, load_node, location)
             },
             -> {
               location = load_location
-              OptionalParameterNode.new(load_required_constant, load_location, load_location, load_node, location)
+              OptionalParameterNode.new(load_varuint, load_required_constant, load_location, load_location, load_node, location)
             },
             -> {
               location = load_location
@@ -1047,11 +1071,11 @@ module Prism
             },
             -> {
               location = load_location
-              RequiredKeywordParameterNode.new(load_required_constant, load_location, location)
+              RequiredKeywordParameterNode.new(load_varuint, load_required_constant, load_location, location)
             },
             -> {
               location = load_location
-              RequiredParameterNode.new(load_required_constant, location)
+              RequiredParameterNode.new(load_varuint, load_required_constant, location)
             },
             -> {
               location = load_location
@@ -1063,7 +1087,7 @@ module Prism
             },
             -> {
               location = load_location
-              RestParameterNode.new(load_optional_constant, load_optional_location, load_location, location)
+              RestParameterNode.new(load_varuint, load_optional_constant, load_optional_location, load_location, location)
             },
             -> {
               location = load_location