ruby-next-core 0.11.0 → 0.13.1

data/lib/ruby-next/core/constants/frozen_error.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+RubyNext::Core.patch Object,
+  name: "FrozenError",
+  method: nil,
+  refineable: [],
+  version: "2.5",
+  # avoid defining the constant twice, 'causae it's already included in core
+  # we only use the contents in `ruby-next core_ext`.
+  supported: true,
+  location: [__FILE__, __LINE__ + 2] do
+  <<-RUBY
+FrozenError ||= RuntimeError
+  RUBY
+end

data/lib/ruby-next/core/enumerable/tally.rb

@@ -1,12 +1,51 @@
 # frozen_string_literal: true
 
-# Refine Array seprately, 'cause refining modules is vulnerable to prepend:
-# - https://bugs.ruby-lang.org/issues/13446
-RubyNext::Core.patch Enumerable, method: :tally, version: "2.7", refineable: [Enumerable, Array] do
-  <<-RUBY
-def tally
-  each_with_object({}) do |v, acc|
-    acc[v] ||= 0
+# Ruby 3.1 adds an ability to pass a hash as accumulator.
+#
+# NOTE: We have separate patches for MRI 3.0+ and others due to the unsupported refinements vs modules behaviour.
+if Enumerable.method_defined?(:tally) && ([].method(:tally).arity == 0) && !(defined?(JRUBY_VERSION) || defined?(TruffleRuby))
+  RubyNext::Core.patch name: "TallyWithHash", supported: false, native: nil, method: :tally, version: "3.1", refineable: [Enumerable] do
+    <<-'RUBY'
+  def tally(*attrs)
+    return super() if attrs.size.zero?
+
+    raise ArgumentError, "wrong number of arguments (given #{attrs.size}, expected 0..1)" if attrs.size > 1
+
+    hash = attrs.size.zero? ? {} : attrs[0].to_hash
+    raise FrozenError, "can't modify frozen #{hash.class}: #{hash}" if hash.frozen?
+
+    each_with_object(hash) do |v, acc|
+      acc[v] = 0 unless acc.key?(v)
+      acc[v] += 1
+    end
+  end
+    RUBY
+  end
+else
+  RubyNext::Core.patch Enumerable, method: :tally, version: "3.1", refineable: [Enumerable, Array] do
+    <<-'RUBY'
+  def tally(acc = {})
+    hash = acc.to_hash
+    raise FrozenError, "can't modify frozen #{hash.class}: #{hash}" if hash.frozen?
+
+    each_with_object(hash) do |v, acc|
+      acc[v] = 0 unless acc.key?(v)
+      acc[v] += 1
+    end
+  end
+    RUBY
+  end
+end
+
+# This patch is intended for core extensions only (since we can not use prepend here)
+RubyNext::Core.patch Enumerable, name: "TallyWithHashCoreExt", version: "3.1", supported: Enumerable.method_defined?(:tally) && ([].method(:tally).arity != 0), method: :tally, refineable: [] do
+  <<-'RUBY'
+def tally(acc = {})
+  hash = acc.to_hash
+  raise FrozenError, "can't modify frozen #{hash.class}: #{hash}" if hash.frozen?
+
+  each_with_object(hash) do |v, acc|
+    acc[v] = 0 unless acc.key?(v)
     acc[v] += 1
   end
 end

data/lib/ruby-next/core.rb

@@ -181,6 +181,7 @@ unless defined?(NoMatchingPatternError)
 end
 
 require "ruby-next/core/constants/no_matching_pattern_error"
+require "ruby-next/core/constants/frozen_error"
 require "ruby-next/core/array/deconstruct"
 require "ruby-next/core/hash/deconstruct_keys"
 require "ruby-next/core/struct/deconstruct"
@@ -188,6 +189,8 @@ require "ruby-next/core/struct/deconstruct_keys"
 
 require "ruby-next/core/hash/except"
 
+require "ruby-next/core/array/intersect"
+
 # Generate refinements
 RubyNext.module_eval do
   RubyNext::Core.patches.refined.each do |mod, patches|

data/lib/ruby-next/core_ext.rb

@@ -10,7 +10,7 @@ RubyNext::Core.patches.extensions.each do |mod, patches|
     next if patch.supported?
 
     if patch.prepend?
-      mod.prepend(patch.to_module)
+      mod.send(:prepend, patch.to_module)
     else
       mod.module_eval(patch.body, *patch.location)
     end

data/lib/ruby-next/language/parser.rb

@@ -19,9 +19,6 @@ module RubyNext
     class Builder < ::Parser::Builders::Default
       modernize
 
-      # Unparser doesn't support kwargs node yet
-      self.emit_kwargs = false if respond_to?(:emit_kwargs=)
-
       unless method_defined?(:match_pattern_p)
         include BuilderExt
       end

data/lib/ruby-next/language/rewriters/args_forward.rb

@@ -11,16 +11,20 @@ module RubyNext
         REST = :__rest__
         BLOCK = :__block__
 
-        def on_forward_arg(node)
+        def on_args(node)
+          farg = node.children.find { |child| child.is_a?(::Parser::AST::Node) && child.type == :forward_arg }
+          return unless farg
+
           context.track! self
 
           node = super(node)
 
-          replace(node.loc.expression, "*#{REST}, &#{BLOCK}")
+          replace(farg.loc.expression, "*#{REST}, &#{BLOCK}")
 
           node.updated(
             :args,
             [
+              *node.children.slice(0, node.children.index(farg)),
               s(:restarg, REST),
               s(:blockarg, BLOCK)
             ]

data/lib/ruby-next/language/rewriters/args_forward_leading.rb

@@ -23,7 +23,7 @@ module RubyNext
           super
         end
 
-        def on_forward_arg(node)
+        def on_args(node)
           return super if leading_farg?
 
           node

data/lib/ruby-next/language/rewriters/method_reference.rb

@@ -6,7 +6,7 @@ module RubyNext
       class MethodReference < Base
         NAME = "method-reference"
         SYNTAX_PROBE = "Language.:transform"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
+        MIN_SUPPORTED_VERSION = Gem::Version.new(RubyNext::NEXT_VERSION)
 
         def on_meth_ref(node)
           context.track! self

data/lib/ruby-next/language/rewriters/numeric_literals.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class NumericLiterals < Base
+        using RubyNext
+
+        NAME = "numeric-literals"
+        SYNTAX_PROBE = "2i + 1/2r"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.1.0")
+
+        def on_rational(node)
+          context.track! self
+
+          val = node.children.first
+
+          parts = [s(:int, val.numerator)]
+
+          parts << s(:int, val.denominator) unless val.denominator == 1
+
+          s(:send, nil, :Rational, *parts).tap do |new_node|
+            replace(node.loc.expression, new_node)
+          end
+        end
+
+        def on_complex(node)
+          context.track! self
+
+          val = node.children.first
+
+          s(:send, nil, :Complex,
+            s(:int, val.real),
+            s(:int, val.imaginary)).tap do |new_node|
+            replace(node.loc.expression, new_node)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby-next/language/rewriters/pattern_matching.rb

@@ -353,7 +353,7 @@ module RubyNext
 
           else_clause = (else_clause || no_matching_pattern).then do |node|
             next node unless node.type == :empty_else
-            s(:empty)
+            nil
           end
 
           clauses << else_clause

data/lib/ruby-next/language/rewriters/required_kwargs.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RubyNext
+  module Language
+    module Rewriters
+      class RequiredKwargs < Base
+        using RubyNext
+
+        NAME = "required-kwargs"
+        SYNTAX_PROBE = "obj = Object.new; def obj.foo(x:, y: 1); end"
+        MIN_SUPPORTED_VERSION = Gem::Version.new("2.1.0")
+
+        def on_kwarg(node)
+          context.track! self
+
+          name = node.children[0]
+
+          new_node = node.updated(
+            :kwoptarg,
+            [name, raise_missing_keyword(name)]
+          )
+
+          replace(node.loc.expression, "#{name}: ::Kernel.raise(::ArgumentError, \"missing keyword: #{name}\")")
+
+          new_node
+        end
+
+        private
+
+        def raise_missing_keyword(name)
+          s(:send,
+            s(:const, s(:cbase), :Kernel), :raise,
+            s(:const, s(:cbase), :ArgumentError),
+            s(:str, "missing keyword: #{name}"))
+        end
+      end
+    end
+  end
+end

data/lib/ruby-next/language/rewriters/safe_navigation.rb

@@ -8,6 +8,8 @@ module RubyNext
         SYNTAX_PROBE = "nil&.x&.nil?"
         MIN_SUPPORTED_VERSION = Gem::Version.new("2.3.0")
 
+        SAFE_LVAR = :__safe_lvar__
+
         def on_csend(node)
           node = super(node)
 
@@ -20,7 +22,7 @@ module RubyNext
               :and,
               [
                 process(safe_navigation(receiver)),
-                s(:send, decsendize(receiver), *args)
+                s(:send, safe_lvar, *args)
               ]
             ))
 
@@ -34,18 +36,15 @@ module RubyNext
 
           context.track!(self)
 
-          new_node = s(:begin,
-            super(node.updated(
-              :and,
-              [
-                process(safe_navigation(node.children[0].children[0])),
-                process(node.updated(nil, node.children.map(&method(:decsendize))))
-              ]
-            )))
+          super(decsendize(node))
+        end
 
-          replace(node.loc.expression, new_node)
+        def on_numblock(node)
+          return super(node) unless node.children[0].type == :csend
 
-          new_node
+          context.track!(self)
+
+          super(decsendize(node))
         end
 
         def on_op_asgn(node)
@@ -53,37 +52,51 @@ module RubyNext
 
           context.track!(self)
 
+          super(decsendize(node))
+        end
+
+        private
+
+        def decsendize(node)
+          csend, *children = node.children
+
+          receiver, *other = csend.children
+
+          new_csend = csend.updated(:send, [safe_lvar, *other])
+
           new_node = s(:begin,
-            super(node.updated(
+            node.updated(
               :and,
               [
-                process(safe_navigation(node.children[0].children[0])),
-                process(node.updated(nil, node.children.map(&method(:decsendize))))
+                process(safe_navigation(receiver)),
+                process(node.updated(nil, [new_csend, *children]))
               ]
-            )))
+            ))
 
           replace(node.loc.expression, new_node)
 
           new_node
         end
 
-        private
-
-        def decsendize(node)
-          return node unless node.is_a?(::Parser::AST::Node) && node.type == :csend
-
-          node.updated(:send, node.children.map(&method(:decsendize)))
-        end
-
-        # Transform: x&.y -> (!x.nil? && x.y) || nil
+        # Transform: x&.y -> ((_tmp_ = x) || true) && (!_tmp_.nil? || nil) && _tmp_.y
         # This allows us to handle `false&.to_s == "false"`
         def safe_navigation(node)
           s(:begin,
-            s(:or,
-              s(:send,
-                s(:send, node, :nil?),
-                :!),
-              s(:nil)))
+            s(:and,
+              s(:begin,
+                s(:or,
+                  s(:begin, s(:lvasgn, SAFE_LVAR, node)),
+                  s(:true))),
+              s(:begin,
+                s(:or,
+                  s(:send,
+                    s(:send, safe_lvar, :nil?),
+                    :!),
+                  s(:nil)))))
+        end
+
+        def safe_lvar
+          s(:lvar, SAFE_LVAR)
         end
       end
     end

data/lib/ruby-next/language/rewriters/shorthand_hash.rb

@@ -6,7 +6,7 @@ module RubyNext
       class ShorthandHash < Base
         NAME = "shorthand-hash"
         SYNTAX_PROBE = "data = {x}"
-        MIN_SUPPORTED_VERSION = Gem::Version.new("3.0.0")
+        MIN_SUPPORTED_VERSION = Gem::Version.new(RubyNext::NEXT_VERSION)
 
         def on_ipair(node)
           context.track! self

data/lib/ruby-next/language/setup.rb

@@ -30,7 +30,7 @@ module RubyNext
 
       def setup_gem_load_path(lib_dir = "lib", rbnext_dir: RUBY_NEXT_DIR, transpile: false)
         called_from = caller_locations(1, 1).first.path
-        dirname = File.dirname(called_from)
+        dirname = File.realpath(File.dirname(called_from))
 
         loop do
           basename = File.basename(dirname)
@@ -50,7 +50,8 @@ module RubyNext
         GemTranspiler.maybe_transpile(File.dirname(dirname), lib_dir, next_dirname) if transpile
 
         current_index = $LOAD_PATH.find_index do |load_path|
-          Pathname.new(load_path).cleanpath.to_s == dirname
+          pn = Pathname.new(load_path)
+          pn.exist? && pn.realpath.to_s == dirname
         end
 
         raise "Gem's lib is not in the $LOAD_PATH: #{dirname}" if current_index.nil?

data/lib/ruby-next/language/unparser.rb

@@ -7,12 +7,7 @@ $VERBOSE = save_verbose
 
 require "unparser"
 
-# PR: https://github.com/mbj/unparser/pull/230
-if defined? Unparser::Emitter::InPattern
-  Unparser::Emitter::InPattern.prepend(Module.new do
-    def dispatch
-      super
-      nl unless branch
-    end
-  end)
+# For backward compatibility with older Unparser
+if RubyNext::Language::Builder.respond_to?(:emit_kwargs=) && !defined?(Unparser::Emitter::Kwargs)
+  RubyNext::Language::Builder.emit_kwargs = false
 end

data/lib/ruby-next/language.rb

@@ -94,53 +94,29 @@ module RubyNext
         @runtime
       end
 
-      def transform(*args, **kwargs)
-        if mode == :rewrite
-          rewrite(*args, **kwargs)
-        else
-          regenerate(*args, **kwargs)
-        end
-      rescue Unparser::UnknownNodeError
-        if Gem::Version.new(::RubyNext.current_ruby_version) >= Gem::Version.new("3.0.0")
-          RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since Unparser doesn't support 3.0+ AST yet.\n" \
-            "See https://github.com/mbj/unparser/issues/168"
+      def transform(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
+        retried = 0
+        new_source = nil
+        begin
+          new_source =
+            if mode == :rewrite
+              rewrite(source, rewriters: rewriters, using: using, context: context)
+            else
+              regenerate(source, rewriters: rewriters, using: using, context: context)
+            end
+        rescue Unparser::UnknownNodeError => err
+          RubyNext.warn "Ruby Next fallbacks to \"rewrite\" transpiling mode since the version of Unparser you use doesn't support some syntax yet: #{err.message}.\n" \
+            "Try upgrading the Unparser or set transpiling mode to \"rewrite\" in case you use some edge or experimental syntax."
           self.mode = :rewrite
+          retried += 1
+          retry unless retried > 1
+          raise
         end
-        rewrite(*args, **kwargs)
-      end
-
-      def regenerate(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
-        parse_with_comments(source).then do |(ast, comments)|
-          rewriters.inject(ast) do |tree, rewriter|
-            rewriter.new(context).process(tree)
-          end.then do |new_ast|
-            next source unless context.dirty?
-
-            Unparser.unparse(new_ast, comments)
-          end.then do |source|
-            next source unless RubyNext::Core.refine?
-            next source unless using && context.use_ruby_next?
-
-            Core.inject! source.dup
-          end
-        end
-      end
-
-      def rewrite(source, rewriters: self.rewriters, using: RubyNext::Core.refine?, context: TransformContext.new)
-        rewriters.inject(source) do |src, rewriter|
-          buffer = Parser::Source::Buffer.new("<dynamic>")
-          buffer.source = src
 
-          rewriter.new(context).rewrite(buffer, parse(src))
-        end.then do |new_source|
-          next source unless context.dirty?
-          new_source
-        end.then do |source|
-          next source unless RubyNext::Core.refine?
-          next source unless using && context.use_ruby_next?
+        return new_source unless RubyNext::Core.refine?
+        return new_source unless using && context.use_ruby_next?
 
-          Core.inject! source.dup
-        end
+        Core.inject! new_source.dup
       end
 
       def transformable?(path)
@@ -164,6 +140,31 @@ module RubyNext
 
       private
 
+      def regenerate(source, rewriters:, using:, context:)
+        parse_with_comments(source).then do |(ast, comments)|
+          rewriters.inject(ast) do |tree, rewriter|
+            rewriter.new(context).process(tree)
+          end.then do |new_ast|
+            next source unless context.dirty?
+
+            Unparser.unparse(new_ast, comments)
+          end
+        end
+      end
+
+      def rewrite(source, rewriters:, using:, context:)
+        rewriters.inject(source) do |src, rewriter|
+          buffer = Parser::Source::Buffer.new("<dynamic>")
+          buffer.source = src
+
+          rewriter.new(context).rewrite(buffer, parse(src))
+        end.then do |new_source|
+          next source unless context.dirty?
+
+          new_source
+        end
+      end
+
       attr_writer :watch_dirs
     end
 
@@ -179,6 +180,12 @@ module RubyNext
     require "ruby-next/language/rewriters/safe_navigation"
     rewriters << Rewriters::SafeNavigation
 
+    require "ruby-next/language/rewriters/numeric_literals"
+    rewriters << Rewriters::NumericLiterals
+
+    require "ruby-next/language/rewriters/required_kwargs"
+    rewriters << Rewriters::RequiredKwargs
+
     require "ruby-next/language/rewriters/args_forward"
     rewriters << Rewriters::ArgsForward
 

data/lib/ruby-next/setup_self.rb

@@ -6,7 +6,9 @@
 version = RubyNext.next_ruby_version
 next_dirname = File.join(__dir__, "..", ".rbnext")
 lib_path = File.realpath(File.join(__dir__, ".."))
-current_index = $LOAD_PATH.index(lib_path)
+current_index = $LOAD_PATH.find_index do |load_path|
+  File.exist?(load_path) && File.realpath(load_path) == lib_path
+end
 
 loop do
   break unless version

data/lib/ruby-next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyNext
-  VERSION = "0.11.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-next-core
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-next-parser
@@ -28,20 +28,14 @@ dependencies:
   name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 description: "\n    Ruby Next Core is a zero deps version of Ruby Next meant to be
@@ -62,6 +56,8 @@ files:
 - bin/reparse
 - bin/ruby-next
 - bin/transform
+- lib/.rbnext/2.1/ruby-next/core.rb
+- lib/.rbnext/2.1/ruby-next/language.rb
 - lib/.rbnext/2.3/ruby-next/commands/core_ext.rb
 - lib/.rbnext/2.3/ruby-next/commands/nextify.rb
 - lib/.rbnext/2.3/ruby-next/language/eval.rb
@@ -79,6 +75,8 @@ files:
 - lib/ruby-next/core.rb
 - lib/ruby-next/core/array/deconstruct.rb
 - lib/ruby-next/core/array/difference_union_intersection.rb
+- lib/ruby-next/core/array/intersect.rb
+- lib/ruby-next/core/constants/frozen_error.rb
 - lib/ruby-next/core/constants/no_matching_pattern_error.rb
 - lib/ruby-next/core/enumerable/filter.rb
 - lib/ruby-next/core/enumerable/filter_map.rb
@@ -114,7 +112,9 @@ files:
 - lib/ruby-next/language/rewriters/in_pattern.rb
 - lib/ruby-next/language/rewriters/method_reference.rb
 - lib/ruby-next/language/rewriters/numbered_params.rb
+- lib/ruby-next/language/rewriters/numeric_literals.rb
 - lib/ruby-next/language/rewriters/pattern_matching.rb
+- lib/ruby-next/language/rewriters/required_kwargs.rb
 - lib/ruby-next/language/rewriters/runtime.rb
 - lib/ruby-next/language/rewriters/runtime/dir.rb
 - lib/ruby-next/language/rewriters/safe_navigation.rb
@@ -138,7 +138,7 @@ metadata:
   documentation_uri: http://github.com/ruby-next/ruby-next/blob/master/README.md
   homepage_uri: http://github.com/ruby-next/ruby-next
   source_code_uri: http://github.com/ruby-next/ruby-next
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Ruby Next core functionality
 test_files: []