prism 0.28.0 → 0.29.0

data/include/prism/diagnostic.h

@@ -36,13 +36,16 @@ typedef enum {
     PM_ERR_ARGUMENT_BARE_HASH,
     PM_ERR_ARGUMENT_BLOCK_FORWARDING,
     PM_ERR_ARGUMENT_BLOCK_MULTI,
+    PM_ERR_ARGUMENT_CONFLICT_AMPERSAND,
+    PM_ERR_ARGUMENT_CONFLICT_STAR,
+    PM_ERR_ARGUMENT_CONFLICT_STAR_STAR,
     PM_ERR_ARGUMENT_FORMAL_CLASS,
     PM_ERR_ARGUMENT_FORMAL_CONSTANT,
     PM_ERR_ARGUMENT_FORMAL_GLOBAL,
     PM_ERR_ARGUMENT_FORMAL_IVAR,
     PM_ERR_ARGUMENT_FORWARDING_UNBOUND,
     PM_ERR_ARGUMENT_IN,
-    PM_ERR_ARGUMENT_NO_FORWARDING_AMP,
+    PM_ERR_ARGUMENT_NO_FORWARDING_AMPERSAND,
     PM_ERR_ARGUMENT_NO_FORWARDING_ELLIPSES,
     PM_ERR_ARGUMENT_NO_FORWARDING_STAR,
     PM_ERR_ARGUMENT_NO_FORWARDING_STAR_STAR,
@@ -124,6 +127,7 @@ typedef enum {
     PM_ERR_EXPECT_EXPRESSION_AFTER_SPLAT_HASH,
     PM_ERR_EXPECT_EXPRESSION_AFTER_STAR,
     PM_ERR_EXPECT_IDENT_REQ_PARAMETER,
+    PM_ERR_EXPECT_IN_DELIMITER,
     PM_ERR_EXPECT_LPAREN_REQ_PARAMETER,
     PM_ERR_EXPECT_MESSAGE,
     PM_ERR_EXPECT_RBRACKET,
@@ -163,6 +167,7 @@ typedef enum {
     PM_ERR_INVALID_BLOCK_EXIT,
     PM_ERR_INVALID_CHARACTER,
     PM_ERR_INVALID_ENCODING_MAGIC_COMMENT,
+    PM_ERR_INVALID_ESCAPE_CHARACTER,
     PM_ERR_INVALID_FLOAT_EXPONENT,
     PM_ERR_INVALID_LOCAL_VARIABLE_READ,
     PM_ERR_INVALID_LOCAL_VARIABLE_WRITE,
@@ -171,6 +176,7 @@ typedef enum {
     PM_ERR_INVALID_MULTIBYTE_ESCAPE,
     PM_ERR_INVALID_NUMBER_BINARY,
     PM_ERR_INVALID_NUMBER_DECIMAL,
+    PM_ERR_INVALID_NUMBER_FRACTION,
     PM_ERR_INVALID_NUMBER_HEXADECIMAL,
     PM_ERR_INVALID_NUMBER_OCTAL,
     PM_ERR_INVALID_NUMBER_UNDERSCORE_INNER,
@@ -216,6 +222,7 @@ typedef enum {
     PM_ERR_PARAMETER_ASSOC_SPLAT_MULTI,
     PM_ERR_PARAMETER_BLOCK_MULTI,
     PM_ERR_PARAMETER_CIRCULAR,
+    PM_ERR_PARAMETER_FORWARDING_AFTER_REST,
     PM_ERR_PARAMETER_METHOD_NAME,
     PM_ERR_PARAMETER_NAME_DUPLICATED,
     PM_ERR_PARAMETER_NO_DEFAULT,
@@ -238,8 +245,10 @@ typedef enum {
     PM_ERR_PATTERN_EXPRESSION_AFTER_PIPE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_REST,
+    PM_ERR_PATTERN_HASH_IMPLICIT,
     PM_ERR_PATTERN_HASH_KEY,
     PM_ERR_PATTERN_HASH_KEY_DUPLICATE,
+    PM_ERR_PATTERN_HASH_KEY_INTERPOLATED,
     PM_ERR_PATTERN_HASH_KEY_LABEL,
     PM_ERR_PATTERN_HASH_KEY_LOCALS,
     PM_ERR_PATTERN_IDENT_AFTER_HROCKET,
@@ -316,6 +325,7 @@ typedef enum {
     PM_WARN_KEYWORD_EOL,
     PM_WARN_LITERAL_IN_CONDITION_DEFAULT,
     PM_WARN_LITERAL_IN_CONDITION_VERBOSE,
+    PM_WARN_SHAREABLE_CONSTANT_VALUE_LINE,
     PM_WARN_SHEBANG_CARRIAGE_RETURN,
     PM_WARN_UNEXPECTED_CARRIAGE_RETURN,
     PM_WARN_UNREACHABLE_STATEMENT,

data/include/prism/version.h

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

data/lib/prism/desugar_compiler.rb

@@ -73,7 +73,7 @@ module Prism
 
     # Desugar `x += y` to `x = x + y`
     def compile
-      operator_loc = node.operator_loc.chop
+      binary_operator_loc = node.binary_operator_loc.chop
 
       write_class.new(
         source,
@@ -84,15 +84,15 @@ module Prism
           0,
           read_class.new(source, *arguments, node.name_loc),
           nil,
-          operator_loc.slice.to_sym,
-          operator_loc,
+          binary_operator_loc.slice.to_sym,
+          binary_operator_loc,
           nil,
           ArgumentsNode.new(source, 0, [node.value], node.value.location),
           nil,
           nil,
           node.location
         ),
-        node.operator_loc.copy(start_offset: node.operator_loc.end_offset - 1, length: 1),
+        node.binary_operator_loc.copy(start_offset: node.binary_operator_loc.end_offset - 1, length: 1),
         node.location
       )
     end

data/lib/prism/dot_visitor.rb

@@ -765,11 +765,11 @@ module Prism
       # write_name
       table.field("write_name", node.write_name.inspect)
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -1060,15 +1060,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1205,15 +1205,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1314,15 +1314,15 @@ module Prism
       table.field("target", port: true)
       digraph.edge("#{id}:target -> #{node_id(node.target)};")
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -1916,15 +1916,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -2322,11 +2322,11 @@ module Prism
         digraph.edge("#{id}:block -> #{node_id(block)};")
       end
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -2471,15 +2471,15 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
       digraph.edge("#{id}:value -> #{node_id(node.value)};")
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       digraph.nodes << <<~DOT
         #{id} [
@@ -2928,8 +2928,8 @@ module Prism
       # name_loc
       table.field("name_loc", location_inspect(node.name_loc))
 
-      # operator_loc
-      table.field("operator_loc", location_inspect(node.operator_loc))
+      # binary_operator_loc
+      table.field("binary_operator_loc", location_inspect(node.binary_operator_loc))
 
       # value
       table.field("value", port: true)
@@ -2938,8 +2938,8 @@ module Prism
       # name
       table.field("name", node.name.inspect)
 
-      # operator
-      table.field("operator", node.operator.inspect)
+      # binary_operator
+      table.field("binary_operator", node.binary_operator.inspect)
 
       # depth
       table.field("depth", node.depth.inspect)

data/lib/prism/dsl.rb

@@ -143,8 +143,8 @@ module Prism
     end
 
     # Create a new CallOperatorWriteNode node
-    def CallOperatorWriteNode(flags, receiver, call_operator_loc, message_loc, read_name, write_name, operator, operator_loc, value, source = nil, location = Location())
-      CallOperatorWriteNode.new(source, flags, receiver, call_operator_loc, message_loc, read_name, write_name, operator, operator_loc, value, location)
+    def CallOperatorWriteNode(flags, receiver, call_operator_loc, message_loc, read_name, write_name, binary_operator, binary_operator_loc, value, source = nil, location = Location())
+      CallOperatorWriteNode.new(source, flags, receiver, call_operator_loc, message_loc, read_name, write_name, binary_operator, binary_operator_loc, value, location)
     end
 
     # Create a new CallOrWriteNode node
@@ -183,8 +183,8 @@ module Prism
     end
 
     # Create a new ClassVariableOperatorWriteNode node
-    def ClassVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      ClassVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def ClassVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ClassVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ClassVariableOrWriteNode node
@@ -213,8 +213,8 @@ module Prism
     end
 
     # Create a new ConstantOperatorWriteNode node
-    def ConstantOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      ConstantOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def ConstantOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ConstantOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ConstantOrWriteNode node
@@ -233,8 +233,8 @@ module Prism
     end
 
     # Create a new ConstantPathOperatorWriteNode node
-    def ConstantPathOperatorWriteNode(target, operator_loc, value, operator, source = nil, location = Location())
-      ConstantPathOperatorWriteNode.new(source, target, operator_loc, value, operator, location)
+    def ConstantPathOperatorWriteNode(target, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      ConstantPathOperatorWriteNode.new(source, target, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new ConstantPathOrWriteNode node
@@ -343,8 +343,8 @@ module Prism
     end
 
     # Create a new GlobalVariableOperatorWriteNode node
-    def GlobalVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      GlobalVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def GlobalVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      GlobalVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new GlobalVariableOrWriteNode node
@@ -408,8 +408,8 @@ module Prism
     end
 
     # Create a new IndexOperatorWriteNode node
-    def IndexOperatorWriteNode(flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, operator, operator_loc, value, source = nil, location = Location())
-      IndexOperatorWriteNode.new(source, flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, operator, operator_loc, value, location)
+    def IndexOperatorWriteNode(flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, binary_operator, binary_operator_loc, value, source = nil, location = Location())
+      IndexOperatorWriteNode.new(source, flags, receiver, call_operator_loc, opening_loc, arguments, closing_loc, block, binary_operator, binary_operator_loc, value, location)
     end
 
     # Create a new IndexOrWriteNode node
@@ -428,8 +428,8 @@ module Prism
     end
 
     # Create a new InstanceVariableOperatorWriteNode node
-    def InstanceVariableOperatorWriteNode(name, name_loc, operator_loc, value, operator, source = nil, location = Location())
-      InstanceVariableOperatorWriteNode.new(source, name, name_loc, operator_loc, value, operator, location)
+    def InstanceVariableOperatorWriteNode(name, name_loc, binary_operator_loc, value, binary_operator, source = nil, location = Location())
+      InstanceVariableOperatorWriteNode.new(source, name, name_loc, binary_operator_loc, value, binary_operator, location)
     end
 
     # Create a new InstanceVariableOrWriteNode node
@@ -508,8 +508,8 @@ module Prism
     end
 
     # Create a new LocalVariableOperatorWriteNode node
-    def LocalVariableOperatorWriteNode(name_loc, operator_loc, value, name, operator, depth, source = nil, location = Location())
-      LocalVariableOperatorWriteNode.new(source, name_loc, operator_loc, value, name, operator, depth, location)
+    def LocalVariableOperatorWriteNode(name_loc, binary_operator_loc, value, name, binary_operator, depth, source = nil, location = Location())
+      LocalVariableOperatorWriteNode.new(source, name_loc, binary_operator_loc, value, name, binary_operator, depth, location)
     end
 
     # Create a new LocalVariableOrWriteNode node

data/lib/prism/ffi.rb

@@ -408,7 +408,7 @@ module Prism
       values << dump_options_command_line(options)
 
       template << "C"
-      values << { nil => 0, "3.3.0" => 1, "3.4.0" => 0, "latest" => 0 }.fetch(options[:version])
+      values << { nil => 0, "3.3.0" => 1, "3.3.1" => 1, "3.4.0" => 0, "latest" => 0 }.fetch(options[:version])
 
       template << "L"
       if (scopes = options[:scopes])

data/lib/prism/inspect_visitor.rb

@@ -396,8 +396,8 @@ module Prism
       commands << ["├── message_loc: #{inspect_location(node.message_loc)}\n", indent]
       commands << ["├── read_name: #{node.read_name.inspect}\n", indent]
       commands << ["├── write_name: #{node.write_name.inspect}\n", indent]
-      commands << ["├── operator: #{node.operator.inspect}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator: #{node.binary_operator.inspect}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["└── value:\n", indent]
       commands << [node.value, "#{indent}    "]
     end
@@ -539,10 +539,10 @@ module Prism
       commands << [inspect_node("ClassVariableOperatorWriteNode", node), indent]
       commands << ["├── name: #{node.name.inspect}\n", indent]
       commands << ["├── name_loc: #{inspect_location(node.name_loc)}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
-      commands << ["└── operator: #{node.operator.inspect}\n", indent]
+      commands << ["└── binary_operator: #{node.binary_operator.inspect}\n", indent]
     end
 
     # Inspect a ClassVariableOrWriteNode node.
@@ -592,10 +592,10 @@ module Prism
       commands << [inspect_node("ConstantOperatorWriteNode", node), indent]
       commands << ["├── name: #{node.name.inspect}\n", indent]
       commands << ["├── name_loc: #{inspect_location(node.name_loc)}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
-      commands << ["└── operator: #{node.operator.inspect}\n", indent]
+      commands << ["└── binary_operator: #{node.binary_operator.inspect}\n", indent]
     end
 
     # Inspect a ConstantOrWriteNode node.
@@ -641,10 +641,10 @@ module Prism
       commands << [inspect_node("ConstantPathOperatorWriteNode", node), indent]
       commands << ["├── target:\n", indent]
       commands << [node.target, "#{indent}│   "]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
-      commands << ["└── operator: #{node.operator.inspect}\n", indent]
+      commands << ["└── binary_operator: #{node.binary_operator.inspect}\n", indent]
     end
 
     # Inspect a ConstantPathOrWriteNode node.
@@ -908,10 +908,10 @@ module Prism
       commands << [inspect_node("GlobalVariableOperatorWriteNode", node), indent]
       commands << ["├── name: #{node.name.inspect}\n", indent]
       commands << ["├── name_loc: #{inspect_location(node.name_loc)}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
-      commands << ["└── operator: #{node.operator.inspect}\n", indent]
+      commands << ["└── binary_operator: #{node.binary_operator.inspect}\n", indent]
     end
 
     # Inspect a GlobalVariableOrWriteNode node.
@@ -1103,8 +1103,8 @@ module Prism
         commands << ["├── block:\n", indent]
         commands << [block, "#{indent}│   "]
       end
-      commands << ["├── operator: #{node.operator.inspect}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator: #{node.binary_operator.inspect}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["└── value:\n", indent]
       commands << [node.value, "#{indent}    "]
     end
@@ -1178,10 +1178,10 @@ module Prism
       commands << [inspect_node("InstanceVariableOperatorWriteNode", node), indent]
       commands << ["├── name: #{node.name.inspect}\n", indent]
       commands << ["├── name_loc: #{inspect_location(node.name_loc)}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
-      commands << ["└── operator: #{node.operator.inspect}\n", indent]
+      commands << ["└── binary_operator: #{node.binary_operator.inspect}\n", indent]
     end
 
     # Inspect a InstanceVariableOrWriteNode node.
@@ -1381,11 +1381,11 @@ module Prism
     def visit_local_variable_operator_write_node(node)
       commands << [inspect_node("LocalVariableOperatorWriteNode", node), indent]
       commands << ["├── name_loc: #{inspect_location(node.name_loc)}\n", indent]
-      commands << ["├── operator_loc: #{inspect_location(node.operator_loc)}\n", indent]
+      commands << ["├── binary_operator_loc: #{inspect_location(node.binary_operator_loc)}\n", indent]
       commands << ["├── value:\n", indent]
       commands << [node.value, "#{indent}│   "]
       commands << ["├── name: #{node.name.inspect}\n", indent]
-      commands << ["├── operator: #{node.operator.inspect}\n", indent]
+      commands << ["├── binary_operator: #{node.binary_operator.inspect}\n", indent]
       commands << ["└── depth: #{node.depth.inspect}\n", indent]
     end